pesa 14/10/13 19:27:07 Modified: metadata.xml ChangeLog Added: PyQt4-4.11.2-r1.ebuild Log: Switch to new upstream build system. Introduce USE=testlib to decouple QtTest from QtGui. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.17 dev-python/PyQt4/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/metadata.xml?r1=1.16&r2=1.17 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/metadata.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- metadata.xml 21 May 2014 21:29:32 -0000 1.16 +++ metadata.xml 13 Oct 2014 19:27:07 -0000 1.17 @@ -3,20 +3,22 @@ <pkgmetadata> <herd>qt</herd> <use> - <flag name="X">Build QtGui and QtTest modules</flag> - <flag name="declarative">Build QtDeclarative module</flag> - <flag name="designer">Build QtDesigner module</flag> - <flag name="help">Build QtHelp module</flag> + <flag name="X">Build bindings for the QtGui module</flag> + <flag name="dbus">Build bindings for the QtDBus module</flag> + <flag name="declarative">Build bindings for the QtDeclarative module</flag> + <flag name="designer">Build bindings for the QtDesigner module and enable the designer plugin</flag> + <flag name="help">Build bindings for the QtHelp module</flag> <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag> - <flag name="multimedia">Build QtMultimedia module</flag> - <flag name="opengl">Build QtOpenGL module</flag> - <flag name="phonon">Build phonon module</flag> - <flag name="script">Build QtScript module</flag> - <flag name="scripttools">Build QtScriptTools module</flag> - <flag name="sql">Build QtSql module</flag> - <flag name="svg">Build QtSvg module</flag> - <flag name="webkit">Build QtWebKit module</flag> - <flag name="xmlpatterns">Build QtXmlPatterns module</flag> + <flag name="multimedia">Build bindings for the QtMultimedia module</flag> + <flag name="opengl">Build bindings for the QtOpenGL module</flag> + <flag name="phonon">Build bindings for the phonon module</flag> + <flag name="script">Build bindings for the QtScript module</flag> + <flag name="scripttools">Build bindings for the QtScriptTools module</flag> + <flag name="sql">Build bindings for the QtSql module</flag> + <flag name="svg">Build bindings for the QtSvg module</flag> + <flag name="testlib">Build bindings for the QtTest module</flag> + <flag name="webkit">Build bindings for the QtWebKit module</flag> + <flag name="xmlpatterns">Build bindings for the QtXmlPatterns module</flag> </use> <upstream> <maintainer status="active"> 1.272 dev-python/PyQt4/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.272&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.272&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.271&r2=1.272 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- ChangeLog 9 Oct 2014 16:39:52 -0000 1.271 +++ ChangeLog 13 Oct 2014 19:27:07 -0000 1.272 @@ -1,6 +1,13 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.271 2014/10/09 16:39:52 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.272 2014/10/13 19:27:07 pesa Exp $ + +*PyQt4-4.11.2-r1 (13 Oct 2014) + + 13 Oct 2014; Davide Pesavento <[email protected]> +PyQt4-4.11.2-r1.ebuild, + metadata.xml: + Switch to new upstream build system. Introduce USE=testlib to decouple QtTest + from QtGui. 09 Oct 2014; Davide Pesavento <[email protected]> PyQt4-4.11.1.ebuild: Revert to ~amd64, see bug #523322 comment #4. 1.1 dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild?rev=1.1&content-type=text/plain Index: PyQt4-4.11.2-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.11.2-r1.ebuild,v 1.1 2014/10/13 19:27:07 pesa Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit eutils multibuild python-r1 qmake-utils DESCRIPTION="Python bindings for the Qt framework" HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"; MY_PN="PyQt-x11-gpl" if [[ ${PV} == *_pre* ]]; then MY_P=${MY_PN}-${PV%_pre*}-snapshot-${REVISION} SRC_URI="http://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"; else MY_P=${MY_PN}-${PV} SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz" fi LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="X dbus debug declarative designer doc examples help kde multimedia opengl phonon script scripttools sql svg testlib webkit xmlpatterns" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} sql? ( X ) testlib? ( X ) " # Minimal supported version of Qt. QT_PV="4.8.5:4" RDEPEND=" ${PYTHON_DEPS} >=dev-python/sip-4.16:=[${PYTHON_USEDEP}] >=dev-qt/qtcore-${QT_PV} X? ( >=dev-qt/qtgui-${QT_PV} ) dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] >=dev-qt/qtdbus-${QT_PV} ) declarative? ( >=dev-qt/qtdeclarative-${QT_PV} ) designer? ( >=dev-qt/designer-${QT_PV} ) help? ( >=dev-qt/qthelp-${QT_PV} ) multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) opengl? ( >=dev-qt/qtopengl-${QT_PV} ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon ) ) ) script? ( >=dev-qt/qtscript-${QT_PV} ) scripttools? ( >=dev-qt/qtgui-${QT_PV} ) sql? ( >=dev-qt/qtsql-${QT_PV} ) svg? ( >=dev-qt/qtsvg-${QT_PV} ) testlib? ( >=dev-qt/qttest-${QT_PV} ) webkit? ( >=dev-qt/qtwebkit-${QT_PV} ) xmlpatterns? ( >=dev-qt/qtxmlpatterns-${QT_PV} ) " DEPEND="${RDEPEND} dbus? ( virtual/pkgconfig ) " S=${WORKDIR}/${MY_P} src_prepare() { # Support qreal on arm architecture (bug 322349). use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" if ! use dbus; then sed -i -e '/^\s\+check_dbus(/d' configure-ng.py || die fi python_copy_sources preparation() { if [[ ${EPYTHON} == python3.* ]]; then rm -fr pyuic/uic/port_v2 else rm -fr pyuic/uic/port_v3 fi } python_foreach_impl run_in_build_dir preparation } pyqt_use_enable() { use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}} } src_configure() { configuration() { local myconf=( "${PYTHON}" configure-ng.py --confirm-license --qmake="${EPREFIX}/usr/bin/qmake" --destdir="$(python_get_sitedir)" --assume-shared --no-timestamp --qsci-api $(use debug && echo --debug) --enable=QtCore --enable=QtNetwork --enable=QtXml $(pyqt_use_enable X QtGui) $(pyqt_use_enable dbus QtDBus) $(pyqt_use_enable declarative) $(pyqt_use_enable designer) $(usex designer '' --no-designer-plugin) $(pyqt_use_enable help) $(pyqt_use_enable multimedia) $(pyqt_use_enable opengl QtOpenGL) $(pyqt_use_enable phonon phonon) $(pyqt_use_enable script) $(pyqt_use_enable scripttools QtScriptTools) $(pyqt_use_enable sql) $(pyqt_use_enable svg) $(pyqt_use_enable testlib QtTest) $(pyqt_use_enable webkit QtWebKit) $(pyqt_use_enable xmlpatterns QtXmlPatterns) ) echo "${myconf[@]}" "${myconf[@]}" || die # We need to specify the .pro file name when it doesn't follow # the subdirs naming convention or recursive qmake won't work. sed -i -e '/^SUBDIRS/ { s:pylupdate:pylupdate/pylupdate4.pro: s:pyrcc:pyrcc/pyrcc4.pro: }' ${PN}.pro || die eqmake4 -recursive ${PN}.pro } python_parallel_foreach_impl run_in_build_dir configuration } src_compile() { python_foreach_impl run_in_build_dir default } src_install() { installation() { local tmp_root=${D%/}/tmp # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR. emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install python_doexe "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 rm "${tmp_root}${EPREFIX}"/usr/bin/pyuic4 || die multibuild_merge_root "${tmp_root}" "${D}" python_optimize } python_foreach_impl run_in_build_dir installation dodoc NEWS THANKS if use doc; then dodoc -r doc/html fi if use examples; then insinto /usr/share/doc/${PF} doins -r examples fi }
