diff options
author | Davide Pesavento <pesa@gentoo.org> | 2012-02-20 23:55:07 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2012-02-20 23:55:07 +0000 |
commit | 14e6c34cb71193d1608da20cbeecbca9c452362f (patch) | |
tree | e16a471db14812fde095577bcf57e4c914e54c50 /dev-python/PyQt4 | |
parent | Make portaudio and pulseaudio use flags mutually exclusive (fixes bug #404201). (diff) | |
download | historical-14e6c34cb71193d1608da20cbeecbca9c452362f.tar.gz historical-14e6c34cb71193d1608da20cbeecbca9c452362f.tar.bz2 historical-14e6c34cb71193d1608da20cbeecbca9c452362f.zip |
Add <upstream> tag to metadata. Cleanup old ebuilds and patches.
Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64
Diffstat (limited to 'dev-python/PyQt4')
-rw-r--r-- | dev-python/PyQt4/ChangeLog | 9 | ||||
-rw-r--r-- | dev-python/PyQt4/Manifest | 39 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild | 170 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild | 174 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.2.ebuild | 174 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.3.ebuild | 175 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.5.ebuild | 178 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.8.6.ebuild | 178 | ||||
-rw-r--r-- | dev-python/PyQt4/PyQt4-4.9.ebuild | 182 | ||||
-rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff | 40 | ||||
-rw-r--r-- | dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch | 13 | ||||
-rw-r--r-- | dev-python/PyQt4/metadata.xml | 30 |
12 files changed, 49 insertions, 1313 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog index 84f8c0c52dae..1cb5114ebd3f 100644 --- a/dev-python/PyQt4/ChangeLog +++ b/dev-python/PyQt4/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/PyQt4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.166 2012/02/20 14:24:02 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.167 2012/02/20 23:55:07 pesa Exp $ + + 20 Feb 2012; Davide Pesavento <pesa@gentoo.org> -PyQt4-4.7.7-r1.ebuild, + -PyQt4-4.8.1-r1.ebuild, -PyQt4-4.8.2.ebuild, -PyQt4-4.8.3.ebuild, + -PyQt4-4.8.5.ebuild, -PyQt4-4.8.6.ebuild, -PyQt4-4.9.ebuild, + -files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff, + -files/PyQt4-4.8.3-configure-multilib.patch, metadata.xml: + Add <upstream> tag to metadata. Cleanup old ebuilds and patches. 20 Feb 2012; Patrick Lauer <patrick@gentoo.org> PyQt4-4.7.3.ebuild, PyQt4-4.7.7-r1.ebuild, PyQt4-4.8.1-r1.ebuild, PyQt4-4.8.1.ebuild, diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest index 5c530f912c33..eb83214048bd 100644 --- a/dev-python/PyQt4/Manifest +++ b/dev-python/PyQt4/Manifest @@ -1,28 +1,33 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be AUX PyQt4-4.7.3-qreal_float_support.patch 6460 RMD160 f022dc75ccde5b923c689f82d169d02e8b066a19 SHA1 2e000133b482f5bb36a5795e375bfa3f60dd5c55 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16 -AUX PyQt4-4.7.7-fix-scpk-and-flag-issue.diff 1490 RMD160 0bfb92059ebf3518980ce5af432747ee01bf8540 SHA1 8e70a0a45757274ce92444054bd387abcb453022 SHA256 2f0b26dd0f725240378bd350303a97717f1a7c7bf37753ac5cc1d0717c013085 -AUX PyQt4-4.8.3-configure-multilib.patch 775 RMD160 b6248b0cd228db706de61da424ebc2e54d882ee5 SHA1 592083f3ed3b99b03392cee976cdc263ed56af22 SHA256 e637464097e81a26b0335715e04021acbba241685a853a0c66eba34660461b98 DIST PyQt-x11-gpl-4.7.3.tar.gz 7803557 RMD160 fb86bb4abc665e67620d6a77dcd37ad6c6f038c4 SHA1 7ad7ed37509f13b4975c50f5fbf557bd58815558 SHA256 574ad672b4171272028c49d5867087db04287c4dc7be8af17d71542db3a8225c -DIST PyQt-x11-gpl-4.7.7.tar.gz 7831682 RMD160 1d4b6f6dce48df968cfc4d85d49178abbea10b1b SHA1 8d710ec274f855a5f47fcf7d5d17c16ad11af3f8 SHA256 7b10b330a55c8e20d9a65ee315e662407f4133c7ce287180bfef03ac76b698d1 DIST PyQt-x11-gpl-4.8.1.tar.gz 9409175 RMD160 e5ba0d98359ce315432f479a5f44b2c1ae69b77a SHA1 e064ed38817bafde72f2a57679d80d40c7015afb SHA256 1feab80dc82dcd451233edeb1cde9cc75fa38b6e8f47780ec6dc317ebe0cf370 -DIST PyQt-x11-gpl-4.8.2.tar.gz 9605005 RMD160 ba9948dcd05964c6f27d24b0f2d224a3d6109258 SHA1 fd26aed89a6032c85a553bfd5228280ac982b85c SHA256 ea9f4643d090a4416daa745ecf527c04429b89614d4fde8143a2155f64300fe4 -DIST PyQt-x11-gpl-4.8.3.tar.gz 9770929 RMD160 b871a5937c5d1a1e4deded5e7c62c33e9c692fbf SHA1 b634467f803704fffa2ff94ad84311796c36d6b8 SHA256 8a59fe9dbb4d7f441dfa2e9405ebbf016aa3da838aa7ccfd429a429457c3d664 DIST PyQt-x11-gpl-4.8.4.tar.gz 9799081 RMD160 100d16e9005e3b83f0030e498a16d99636c9034c SHA1 747236d5dd103687cac54746af0a24a1adbc067c SHA256 fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98 -DIST PyQt-x11-gpl-4.8.5.tar.gz 9798545 RMD160 53d5a3032670b704581d0187b0e6077d1a31f31f SHA1 df253c6267c7bf80ddb33cd5357aadbc0629492d SHA256 c9e2df3a2fc7cba2f0c93e957bfaa8ee454f823c3032f688154976a3a3b36820 -DIST PyQt-x11-gpl-4.8.6.tar.gz 9661693 RMD160 9dc52e247c4242b1838c0cc6ebada8f4f62a8f4e SHA1 7454a270026f4b1a6c0d56899ae8234f0b6204e2 SHA256 3352a46c3a070e2509d0227db5cb2ba41060bfc1dff7b1fb79ed2c23d568eb07 DIST PyQt-x11-gpl-4.9.1.tar.gz 9742132 RMD160 056d6570ffc5ad873ef36d8181122cbb79d7b5ef SHA1 6aa0e64cdcca0f23946c5e6c244b19189c234306 SHA256 f283557f2190ffc00d72fe8451ac15536cab777c36a9b573031328f401629bb1 -DIST PyQt-x11-gpl-4.9.tar.gz 9741275 RMD160 b21bf092e46b6f7d1bfa87ca89f26be3547d8dad SHA1 0bd0b39abbc117e812863f37a63b7364904e754a SHA256 f9a806578f2b388d762438a39da3fc5a6ac109497b0b96fb49a7dd850cd08102 EBUILD PyQt4-4.7.3.ebuild 4669 RMD160 0208dafc83dcb892ac552c45e66b5cdb0c46cd1b SHA1 e510e9063228a6343f23d4d18fbc8ba7faf628e3 SHA256 4b281787c6524a485164d368d57de0487061fb50f1f565ce08123a09c0426fcd -EBUILD PyQt4-4.7.7-r1.ebuild 4643 RMD160 c008fdaac08402aa9523fe497fe83aac8e0ff995 SHA1 41cd5f8d903cec65c336f97d0e162047ae2002aa SHA256 48457028536b43e0f9debd2cf3be3b4fb9439d3a1874cb6227753053c30e334b -EBUILD PyQt4-4.8.1-r1.ebuild 4921 RMD160 893d833b5b38d082069df00336fcdcd48737f2dd SHA1 fb730c0565641c70817d7904eca922497f7d0279 SHA256 ca857248a9ff31624017b3bd912d989f8f82781b22c978b25eda14b3fb46e90c EBUILD PyQt4-4.8.1.ebuild 4795 RMD160 b4b8231a2db12262ad5de15a2f799b2acb59496a SHA1 8983bf93eb33c8a2eff9430f6e03d00c2423e3b7 SHA256 9885ed7e8c946135d4e548f329cb3bf0578cc46080632bdfe152f379c12582aa -EBUILD PyQt4-4.8.2.ebuild 4916 RMD160 703f8734692781fc3bb0d0f0f9bc79c9960a79fa SHA1 4b56144db4ed27c45ff8e3236a8b3ed4b53eee42 SHA256 268c915e00021516b9febba837a44d68aa8d3384b0fb5e485bf5243a9bd9ca0e -EBUILD PyQt4-4.8.3.ebuild 5027 RMD160 c50e0b2a7dcdf4098f17ec88c613ae8f1c88e732 SHA1 3b2e604bebc248b6b1086427d8ed8eb50d813f6c SHA256 a6590f5f81897c46c42883e882a72ea64f719ab6dc859ba95d7aa1fc4dd973d0 EBUILD PyQt4-4.8.4.ebuild 4975 RMD160 59478b9d7d484f4ac9f8f89bfff5e442a38fceb1 SHA1 b4520606a28122e65195c9b7c5e652b2306ed813 SHA256 4d7c965c31650d8d5bc2a5a8ceff8fd066a448cd0e4e7242df863d807d1841bc -EBUILD PyQt4-4.8.5.ebuild 5304 RMD160 09fbee8e0dd4b512021d1f4e5fd0162e7719ad52 SHA1 7ce6f735b9fec79b00bc9ead304cbcef4987dfa3 SHA256 99c49317ea5496501fe11b1aaa51971343766701caeeff00f2faf2a1be0785fb -EBUILD PyQt4-4.8.6.ebuild 5304 RMD160 b223f314ddf42258ee3c399fb4b4fe89e30ea370 SHA1 605a0926833ce7808bcf9893fb3721856e173c85 SHA256 3b9af39331eb3320ab7d2635b9952414ae08b8109898bdd3b9ce059571115584 EBUILD PyQt4-4.9.1.ebuild 5544 RMD160 584a8d38ed53307835ecf409292503da1d136972 SHA1 8af0829194b2aefa791548f3e570ef0895dbd615 SHA256 0e7609a3ec5ed34b4e96862bed04bc0f2c44f174dbded1760c2d550408165634 -EBUILD PyQt4-4.9.ebuild 5542 RMD160 69337336211136e1df5b763e4d31ad08a0950402 SHA1 72beca6e28c4b7e44092ac4b30ab081aba696c40 SHA256 1f9f49d0ac6a62db85acd6031d46b7fa00655930e400b9bf34ecaa46a76f0bad -MISC ChangeLog 23061 RMD160 cd1f092330ee142ce7455ec5b90f99101d649a31 SHA1 049fb7b14a6f8776ed0263214c3ad06169a2bf96 SHA256 f3231e70fc31fd48fa4304f97f5b10863c55cb2bfd460c2c3e5acf74e0c6c8a2 -MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe +MISC ChangeLog 23443 RMD160 fa32e2c1c8546b4985cfbb63ebc2e56af247a162 SHA1 3c78bc4cc706525c07d453599465cc3d7376bdde SHA256 a22c5abca9deca2d45f738bf6f2cd13fff8c90e689d490f110e3a1c7920874d0 +MISC metadata.xml 1101 RMD160 063bcdaa197bc36e68607dc1763db7632e9bf2a7 SHA1 0e0af73c38ef13195a610013895660d5b644156f SHA256 7cea702a27791d9fd0f1d8f4f220dfbbab50faad817f807df7a15bf7b3f8f470 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQIcBAEBCgAGBQJPQt1vAAoJENXLsxwXqFxyRXoP/3q59XEIHPb35uj0jxPsSILT +G9s24JZ1AB26zv6tb3c7u7SBgj7xXAILcd7zwn9HEuyijTNkTemg80j36Ou9nXC2 +kh+hFHPtmRZ3d1L54jUie23qYKRz64YKeW1oLcvOcKnYXC13S9IbH8LUEJ93Hs/W ++BecfDiZhHYXgi9H92TjsN1YDSWGCLqNSRmDbKPJjwckSIw7Lz5PtEqWh4NgYwEP +1wcd1PTPjiVkwNcE7AR1qTRL7St02EwTuHVhG1AUc0odIfKvAInKObbYThryr+Si +lcyZHQNSfm5K8VtqTNE1rjbjqBvcp7N1IX5bxTDfj+q7DVQu5rtDT7rvKeVkY7D/ +gS4WmtvgmCmjCaeZQv+Nd7aDHgXbWoYt2IHMxEyp4fv8ekO4py0OPmplStD47xEd +wHrPh/fAuA6Sotk/MLcwOiVuLSyxsLS0hf6YfvWWEBn36Bf3396fUuayY5K03aFG +1zvVQdjzoEU8ma4IgIJf/ZwHDt76dqjptxEGJYwBZj0XykIHNXNnBSVSTcBSoL4+ +SIE28TJ30GwwTFi0gsQVSh6zuaUi6rDmk42cFbuJdiGgpKSRJMxHEh+4dhHlgPqf +JxBXR9m5e7xA/P28iBZJ0BGgpGJ3/yrozSscJbVjqH+JahvV69Zs2PJJt7/XCUeX +G4oY18kPLCQWJChJm1eD +=V0yK +-----END PGP SIGNATURE----- diff --git a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild b/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild deleted file mode 100644 index 67c7cb9d1b67..000000000000 --- a/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.7.7-r1.ebuild,v 1.5 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit qt4-r2 python toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" -QTVER="4.6.2" # minimal Qt version this is supposed to work with - -DESCRIPTION="A set of Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -SLOT="0" -LICENSE="|| ( GPL-2 GPL-3 )" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.11 - >=x11-libs/qt-core-${QTVER}:4 - >=x11-libs/qt-script-${QTVER}:4 - >=x11-libs/qt-test-${QTVER}:4 - X? ( >=x11-libs/qt-gui-${QTVER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QTVER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QTVER}:4 - ) - multimedia? ( >=x11-libs/qt-multimedia-${QTVER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QTVER}:4 ) - svg? ( >=x11-libs/qt-svg-${QTVER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QTVER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QTVER}:4 )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch" - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" - "${FILESDIR}/${P}-fix-scpk-and-flag-issue.diff" -) - -src_prepare() { - if ! use dbus; then - sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \ - "${S}"/configure.py || die - fi - - # Patch to support qreal for arm architecture - # wrt bug #322349 - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include dir - sed -e "s|/usr/include|${EPREFIX}/usr/include|g" \ - -i configure.py - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf="$(PYTHON) configure.py - --confirm-license - --bindir="${EPREFIX}"/usr/bin - --destdir="${EPREFIX}"$(python_get_sitedir) - --sipdir="${EPREFIX}"/usr/share/sip - --qsci-api - $(use debug && echo '--debug') - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtScriptTools) - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC=$(tc-getCC) CXX=$(tc-getCXX) - LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX) - CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}' LFLAGS='${LDFLAGS}'" - echo ${myconf} - eval ${myconf} || return 1 - - for mod in QtCore $(use X && echo 'QtDesigner QtGui'); do - # Run eqmake4 inside the qpy subdirs to prevent - # stripping and many other QA issues - pushd qpy/${mod} > /dev/null || die - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || die - - # Fix insecure runpaths - sed -i -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" \ - ${mod}/Makefile || die "failed to fix rpath issues" - done - - # Fix pre-stripping of libpythonplugin.so - if use X; then - cd "${BUILDDIR}"/designer - eqmake4 python.pro - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, - # the other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc doc/pyqt4ref.txt NEWS THANKS || die - - if use doc; then - dohtml -r doc/* || die - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild deleted file mode 100644 index 7e03fe5e0eb3..000000000000 --- a/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.1-r1.ebuild,v 1.4 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.11.2 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch" - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui); do - # Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed" - done - - # Fix pre-stripping of libpythonplugin.so - if use X; then - cd "${BUILDDIR}/designer" - eqmake4 python.pro - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.8.2.ebuild b/dev-python/PyQt4/PyQt4-4.8.2.ebuild deleted file mode 100644 index bbd17ae26e0e..000000000000 --- a/dev-python/PyQt4/PyQt4-4.8.2.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.2.ebuild,v 1.5 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.12 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-4.6.1-configure-multilib.patch" - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui); do - # Run eqmake4 inside the qpy subdirectories to avoid stripping and many other QA issues. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of rpaths failed" - done - - # Fix pre-stripping of libpythonplugin.so - if use X; then - cd "${BUILDDIR}/designer" - eqmake4 python.pro - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc doc/pyqt4ref.txt NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.8.3.ebuild b/dev-python/PyQt4/PyQt4-4.8.3.ebuild deleted file mode 100644 index 9cd3bbeaeb1d..000000000000 --- a/dev-python/PyQt4/PyQt4-4.8.3.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.3.ebuild,v 1.8 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.12.1 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P} - -PATCHES=( - "${FILESDIR}/${PN}-4.8.3-configure-multilib.patch" - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative); do - # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" - done - - # Avoid stripping of libpythonplugin.so. - if use X; then - pushd designer > /dev/null || return 1 - eqmake4 python.pro - popd > /dev/null || return 1 - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/html/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.8.5.ebuild b/dev-python/PyQt4/PyQt4-4.8.5.ebuild deleted file mode 100644 index 4bc052ff2787..000000000000 --- a/dev-python/PyQt4/PyQt4-4.8.5.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.5.ebuild,v 1.3 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.12.2 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do - # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" - done - - # Avoid stripping of libpythonplugin.so. - if use X; then - pushd designer > /dev/null || return 1 - eqmake4 python.pro - popd > /dev/null || return 1 - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/html/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 - - ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on" - ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. If you have app-portage/gentoolkit" - ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`." -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.8.6.ebuild b/dev-python/PyQt4/PyQt4-4.8.6.ebuild deleted file mode 100644 index c64c04a32157..000000000000 --- a/dev-python/PyQt4/PyQt4-4.8.6.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.6.ebuild,v 1.2 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.12.2 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do - # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" - done - - # Avoid stripping of libpythonplugin.so. - if use X; then - pushd designer > /dev/null || return 1 - eqmake4 python.pro - popd > /dev/null || return 1 - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR. - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - } - python_execute_function -s installation - - dodoc NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/html/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 - - ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on" - ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. If you have app-portage/gentoolkit" - ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`." -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/PyQt4-4.9.ebuild b/dev-python/PyQt4/PyQt4-4.9.ebuild deleted file mode 100644 index 1eeb5eedf4cc..000000000000 --- a/dev-python/PyQt4/PyQt4-4.9.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.4 2012/02/20 14:24:02 patrick Exp $ - -EAPI="3" -PYTHON_DEPEND="*" -PYTHON_EXPORT_PHASE_FUNCTIONS="1" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-**" - -inherit python qt4-r2 toolchain-funcs - -MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}" - -# Minimal supported version of Qt. -QT_VER="4.6.2" - -DESCRIPTION="Python bindings for the Qt toolkit" -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt" -SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz" - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="X assistant +dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns" - -DEPEND=">=dev-python/sip-4.13.1 - >=x11-libs/qt-core-${QT_VER}:4 - >=x11-libs/qt-script-${QT_VER}:4 - >=x11-libs/qt-test-${QT_VER}:4 - X? ( >=x11-libs/qt-gui-${QT_VER}:4[dbus?] ) - assistant? ( >=x11-libs/qt-assistant-${QT_VER}:4 ) - dbus? ( - >=dev-python/dbus-python-0.80 - >=x11-libs/qt-dbus-${QT_VER}:4 - ) - declarative? ( >=x11-libs/qt-declarative-${QT_VER}:4 ) - multimedia? ( >=x11-libs/qt-multimedia-${QT_VER}:4 ) - opengl? ( >=x11-libs/qt-opengl-${QT_VER}:4 || ( >=x11-libs/qt-opengl-4.8.0:4 >=x11-libs/qt-opengl-4.7.0:4[-egl] <x11-libs/qt-opengl-4.7.0:4 ) ) - phonon? ( - !kde? ( || ( >=x11-libs/qt-phonon-${QT_VER}:4 media-libs/phonon ) ) - kde? ( media-libs/phonon ) - ) - sql? ( >=x11-libs/qt-sql-${QT_VER}:4 ) - svg? ( >=x11-libs/qt-svg-${QT_VER}:4 ) - webkit? ( >=x11-libs/qt-webkit-${QT_VER}:4 ) - xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.2-configure.py.patch" -) - -PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/pyuic4") - -src_prepare() { - if ! use dbus; then - sed -e "s/^\([[:blank:]]\+\)check_dbus()/\1pass/" -i configure.py || die "sed configure.py failed" - fi - - # Support qreal for arm architecture (bug #322349). - use arm && epatch "${FILESDIR}/${PN}-4.7.3-qreal_float_support.patch" - - qt4-r2_src_prepare - - # Use proper include directory. - sed -e "s:/usr/include:${EPREFIX}/usr/include:g" -i configure.py || die "sed configure.py failed" - - python_copy_sources - - preparation() { - if [[ "$(python_get_version -l --major)" == "3" ]]; then - rm -fr pyuic/uic/port_v2 - else - rm -fr pyuic/uic/port_v3 - fi - } - python_execute_function -s preparation -} - -pyqt4_use_enable() { - use $1 && echo "--enable=${2:-$1}" -} - -src_configure() { - configuration() { - local myconf=("$(PYTHON)" - configure.py - --confirm-license - --bindir="${EPREFIX}/usr/bin" - --destdir="${EPREFIX}$(python_get_sitedir)" - --sipdir="${EPREFIX}/usr/share/sip" - --qsci-api - $(use debug && echo --debug) - --enable=QtCore - --enable=QtNetwork - --enable=QtScript - --enable=QtTest - --enable=QtXml - $(pyqt4_use_enable X QtDesigner) - $(pyqt4_use_enable X QtGui) - $(pyqt4_use_enable X QtScriptTools) - # QtAssistant module is not available with Qt >=4.7.0. - $(pyqt4_use_enable assistant QtAssistant) - $(pyqt4_use_enable assistant QtHelp) - $(pyqt4_use_enable dbus QtDBus) - $(pyqt4_use_enable declarative QtDeclarative) - $(pyqt4_use_enable multimedia QtMultimedia) - $(pyqt4_use_enable opengl QtOpenGL) - $(pyqt4_use_enable phonon) - $(pyqt4_use_enable sql QtSql) - $(pyqt4_use_enable svg QtSvg) - $(pyqt4_use_enable webkit QtWebKit) - $(pyqt4_use_enable xmlpatterns QtXmlPatterns) - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LINK="$(tc-getCXX)" - LINK_SHLIB="$(tc-getCXX)" - CFLAGS="${CFLAGS}" - CXXFLAGS="${CXXFLAGS}" - LFLAGS="${LDFLAGS}") - echo "${myconf[@]}" - "${myconf[@]}" || return 1 - - local mod - for mod in QtCore $(use X && echo QtDesigner QtGui) $(use dbus && echo QtDBus) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do - # Run eqmake4 inside the qpy subdirectories to respect CC, CXX, CFLAGS, CXXFLAGS and LDFLAGS and avoid stripping. - pushd qpy/${mod} > /dev/null || return 1 - eqmake4 $(ls w_qpy*.pro) - popd > /dev/null || return 1 - - # Fix insecure runpaths. - sed -e "/^LFLAGS[[:space:]]*=/s:-Wl,-rpath,${BUILDDIR}/qpy/${mod}::" -i ${mod}/Makefile || die "Fixing of runpaths failed" - done - - # Avoid stripping of libpythonplugin.so. - if use X; then - pushd designer > /dev/null || return 1 - eqmake4 python.pro - popd > /dev/null || return 1 - fi - } - python_execute_function -s configuration -} - -src_compile() { - python_src_compile -} - -src_install() { - installation() { - # INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR. - emake DESTDIR="${T}/images/${PYTHON_ABI}" INSTALL_ROOT="${T}/images/${PYTHON_ABI}" install - } - python_execute_function -s installation - python_merge_intermediate_installation_images "${T}/images" - - dodoc NEWS THANKS || die "dodoc failed" - - if use doc; then - dohtml -r doc/html/* || die "dohtml failed" - fi - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples || die "doins failed" - fi -} - -pkg_postinst() { - python_mod_optimize PyQt4 - - ewarn "When updating dev-python/PyQt4, you usually need to rebuild packages, which depend on" - ewarn "dev-python/PyQt4, such as dev-python/qscintilla-python. If you have app-portage/gentoolkit" - ewarn "installed, you can find these packages with \`equery d dev-python/PyQt4\`." -} - -pkg_postrm() { - python_mod_cleanup PyQt4 -} diff --git a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff b/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff deleted file mode 100644 index 38083e76e523..000000000000 --- a/dev-python/PyQt4/files/PyQt4-4.7.7-fix-scpk-and-flag-issue.diff +++ /dev/null @@ -1,40 +0,0 @@ -Index: PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py -=================================================================== ---- PyQt-x11-gpl-4.7.7.orig/pyuic/uic/Loader/loader.py -+++ PyQt-x11-gpl-4.7.7/pyuic/uic/Loader/loader.py -@@ -1,3 +1,5 @@ -+import os.path -+ - from PyQt4 import QtGui, QtCore - from PyQt4.uic.uiparser import UIParser - from PyQt4.uic.Loader.qobjectcreator import LoaderCreatorPolicy -@@ -19,6 +21,7 @@ class DynamicUILoader(UIParser): - def loadUi(self, filename, toplevelInst=None): - self.toplevelInst = toplevelInst - -- # By using QFileInfo.path() rather than os.path.dirname() we allow -- # QString file names. -- return self.parse(filename, QtCore.QFileInfo(filename).path()) -+ # Allow the filename to be a QString. -+ filename = str(filename) -+ -+ return self.parse(filename, os.path.dirname(filename)) -Index: PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip -=================================================================== ---- PyQt-x11-gpl-4.7.7.orig/sip/QtCore/qglobal.sip -+++ PyQt-x11-gpl-4.7.7/sip/QtCore/qglobal.sip -@@ -312,12 +312,12 @@ public: - // Qt.Alignment class. - QFlags operator|(int f); - %MethodCode -- sipRes = new QFlags(*a0 | (ENUM(a1))); -+ sipRes = new QFlags(*a0 | a1); - %End - - QFlags operator^(int f); - %MethodCode -- sipRes = new QFlags(*a0 ^ (ENUM(a1))); -+ sipRes = new QFlags(*a0 ^ a1); - %End - - // These are necessary to prevent Python comparing object IDs. diff --git a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch b/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch deleted file mode 100644 index 2a463dcbd602..000000000000 --- a/dev-python/PyQt4/files/PyQt4-4.8.3-configure-multilib.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.py -+++ configure.py -@@ -941,8 +941,8 @@ - # version. - link = "-framework Python" - elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and -- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))): -- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) -+ glob.glob("%s/libpython%d.%d*" % (ducfg["LIBDIR"], py_major, py_minor))): -+ lib_dir_flag = quote("-L%s" % ducfg["LIBDIR"]) - link = "%s -lpython%d.%d%s" % (lib_dir_flag, py_major, py_minor, abi) - else: - sipconfig.inform("Qt Designer plugin disabled because Python library is static") diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml index 569523904e3d..be414dcdc307 100644 --- a/dev-python/PyQt4/metadata.xml +++ b/dev-python/PyQt4/metadata.xml @@ -4,16 +4,24 @@ <herd>python</herd> <herd>qt</herd> <use> - <flag name="X">Build the QtGui and QtDesigner modules</flag> - <flag name="assistant">Build the QtHelp and QtAssistant modules</flag> - <flag name="declarative">Build the QtDeclarative module</flag> - <flag name="kde">Select <pkg>media-sound/phonon</pkg> as Phonon variant needed for KDE</flag> - <flag name="multimedia">Build the QtMultimedia module</flag> - <flag name="opengl">Build the QtOpenGL module</flag> - <flag name="phonon">Build the phonon module</flag> - <flag name="sql">Build the QtSql module</flag> - <flag name="svg">Build the QtSvg module</flag> - <flag name="webkit">Build the QtWebKit module</flag> - <flag name="xmlpatterns">Build the QtXmlPatterns module</flag> + <flag name="X">Build QtGui, QtDesigner and QtScriptTools modules</flag> + <flag name="assistant">Build QtHelp and QtAssistant modules</flag> + <flag name="declarative">Build QtDeclarative module</flag> + <flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant, needed for KDE4</flag> + <flag name="multimedia">Build QtMultimedia module</flag> + <flag name="opengl">Build QtOpenGL module</flag> + <flag name="phonon">Build phonon 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> </use> + <upstream> + <maintainer status="active"> + <email>phil@riverbankcomputing.com</email> + <name>Phil Thompson</name> + </maintainer> + <bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to> + <remote-id type="pypi">PyQt</remote-id> + </upstream> </pkgmetadata> |