pesa        14/09/13 01:07:02

  Modified:             metadata.xml ChangeLog
  Added:                qscintilla-2.8.4.ebuild
  Removed:              qscintilla-2.8.3.ebuild
  Log:
  Bump and finally fix bug #466120. Remove old.
  
  (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 
0xDADED6B2671CB57D!)

Revision  Changes    Path
1.3                  x11-libs/qscintilla/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/metadata.xml?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/metadata.xml?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml        18 Jul 2014 19:50:08 -0000      1.2
+++ metadata.xml        13 Sep 2014 01:07:02 -0000      1.3
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
-<herd>python</herd>
+       <herd>qt</herd>
+       <herd>python</herd>
+       <use>
+               <flag name="designer">Build plugin for Qt Designer</flag>
+       </use>
 </pkgmetadata>



1.102                x11-libs/qscintilla/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.102&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/ChangeLog?rev=1.102&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/ChangeLog?r1=1.101&r2=1.102

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog   18 Jul 2014 19:50:08 -0000      1.101
+++ ChangeLog   13 Sep 2014 01:07:02 -0000      1.102
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.101 
2014/07/18 19:50:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.102 
2014/09/13 01:07:02 pesa Exp $
+
+*qscintilla-2.8.4 (13 Sep 2014)
+
+  13 Sep 2014; Davide Pesavento <[email protected]>
+  +files/qscintilla-2.8.4-designer.patch, +qscintilla-2.8.4.ebuild,
+  -files/qscintilla-2.8.3-designer.patch, -qscintilla-2.8.3.ebuild,
+  metadata.xml:
+  Bump and finally fix bug #466120. Remove old.
 
 *qscintilla-2.8.3 (18 Jul 2014)
 



1.1                  x11-libs/qscintilla/qscintilla-2.8.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4.ebuild?rev=1.1&content-type=text/plain

Index: qscintilla-2.8.4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4.ebuild,v 1.1 
2014/09/13 01:07:02 pesa Exp $

EAPI=5

inherit eutils qmake-utils

MY_P=QScintilla-gpl-${PV}

DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro";
SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"

LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0/11"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
IUSE="designer doc"

DEPEND="
        >=dev-qt/qtcore-4.8.5:4
        >=dev-qt/qtgui-4.8.5:4
        designer? ( >=dev-qt/designer-4.8.5:4 )
"
RDEPEND="${DEPEND}"

S=${WORKDIR}/${MY_P}

PATCHES=(
        "${FILESDIR}/${PN}-2.8.4-designer.patch"
)

src_unpack() {
        default

        # Sub-slot sanity check
        local subslot=${SLOT#*/}
        local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' 
"${S}"/Qt4Qt5/qscintilla.pro)
        local major=${version%%.*}
        if [[ ${subslot} != ${major} ]]; then
                eerror
                eerror "Ebuild sub-slot (${subslot}) does not match QScintilla 
major version (${major})"
                eerror "Please update SLOT variable as follows:"
                eerror "    SLOT=\"${SLOT%%/*}/${major}\""
                eerror
                die "sub-slot sanity check failed"
        fi
}

src_prepare() {
        [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
}

src_configure() {
        pushd Qt4Qt5 > /dev/null
        eqmake4
        popd > /dev/null

        if use designer; then
                pushd designer-Qt4Qt5 > /dev/null
                eqmake4
                popd > /dev/null
        fi
}

src_compile() {
        pushd Qt4Qt5 > /dev/null
        emake
        popd > /dev/null

        if use designer; then
                pushd designer-Qt4Qt5 > /dev/null
                emake
                popd > /dev/null
        fi
}

src_install() {
        pushd Qt4Qt5 > /dev/null
        emake INSTALL_ROOT="${D}" install
        popd > /dev/null

        if use designer; then
                pushd designer-Qt4Qt5 > /dev/null
                emake INSTALL_ROOT="${D}" install
                popd > /dev/null
        fi

        dodoc NEWS

        if use doc; then
                docinto html
                dodoc -r doc/html-Qt4Qt5/*
        fi
}




Reply via email to