Restrict PyPy ABIs. Avoid warnings about insecure runpaths (bug #376483). Print usefu...

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 5ee2216f8b71e06e467fd99ead24456267f898e8..4759902e4832790cb0b8e0725986e7831bd90399 100644 (file)
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.159 2011/08/19 10:12:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.160 2011/08/24 16:28:35 hwoarang Exp $
+
+  24 Aug 2011; Markos Chandras <hwoarang@gentoo.org> PyQt4-4.8.5.ebuild:
+  Restrict PyPy ABIs. Avoid warnings about insecure runpaths (bug #376483).
+  Print useful warning in pkg_postinst(). Patch by Arfrever. Backported from
+  python overlay.
 
 *PyQt4-4.8.5 (19 Aug 2011)
 

diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 389705c1ad17eecf95495be871edbbbf847ba2a8..97b1432e883ca08cde35daf51708421037ee34fc 100644 (file)
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -20,23 +20,23 @@ EBUILD PyQt4-4.8.1.ebuild 4797 RMD160 421e76d1ffd040195e9792e0b44feb6d1eaef08a S
 EBUILD PyQt4-4.8.2.ebuild 4918 RMD160 5a0feedede8c46f0c263b9af7ef9993c1afed338 SHA1 c97586783414cde972dcb1e31c60dcd285561929 SHA256 f7054dc6acdf5209545cae873b60b6b9990f178a78e2c7aeec25515f29006f48
 EBUILD PyQt4-4.8.3.ebuild 5030 RMD160 03636343ee6364eba3601a0e554cc7314719322f SHA1 7e346093fd54025dc83e9fb04521a21ee8745b86 SHA256 eafaded9a0f4cccbfbf9d134053e414cb0414edd6309192e1f67c178d11070ae
 EBUILD PyQt4-4.8.4.ebuild 4978 RMD160 058c3089cc67edba707587b2b9f43e7ae64c9758 SHA1 4abe5d2d4d441b058e99bfcd0d27ea302e4fe2c2 SHA256 764b6cb8ed982e0d7616054e92654860acf8fb17a4e20b38cf6ea7c32f6324ea
-EBUILD PyQt4-4.8.5.ebuild 4980 RMD160 e6f05e42dbab8233ecc7bf448f575e27eef1c332 SHA1 11fd8396f0ad91424d1e8a31681e89fbf18bf649 SHA256 abedd87f070b8a85db832e1fe3e640bade7c94172dbcf27a7f5764022a0843a2
-MISC ChangeLog 21818 RMD160 2315a8e8c66c239b450d115fdf82349c5c9a015b SHA1 33efc4f3ff8743a1d359f5d64a92bf25a2aa9674 SHA256 968586b1521717c1b5b29e16c481c5d20e0b0385a6291b4a345ca5c061e17e6f
+EBUILD PyQt4-4.8.5.ebuild 5302 RMD160 1f0b5e8d355e8100d6b7e297bbd7f2a445aad76c SHA1 4fda85e3ae863d503c6a3015507c0ee0d452e0a7 SHA256 6b009aee13de0cb89d8171c0521dea562d15bae3ad9b6b791899851b7a011998
+MISC ChangeLog 22063 RMD160 fa0361b4bbdfef73cdf0840ddc23b7f7e932faad SHA1 174b526417ed03ba918b61c2b53566391f29ae5a SHA256 d638f6a39e2184c069d00fc5e7f45d00240b549c83d76d9625205e9775903f24
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOTjcRAAoJEPqDWhW0r/LCMbUQAKlCk97DAFU5NMvTMpG216cY
-rsfGp3wPCcTBYAIYyxc4q2FfqpiajU2WACxQef7PJvHrSvy5AnKs1UJf1KM5o3Sp
-J9cdVe2t6aeGsaz1fjPfNnxW2c7kpVJiGxNeaAI2iW/AqmXegNZfJBuBdLg7N/2d
-VArXu65P98DaKK2oK3kTTE9iEbiNTsSfZTDaykXL2OP8e7byFVj86e5n+OwmKdjX
-EM4und0GfkiZpbBX/AypFQj4EB7cOB52IeIbwwy1ElNTf1FgZLg6JwvgfiizUzym
-4/cERz5P7164r5DV9jnhBpTMJAYxDqsiF96iIHhP22BEdwamF0M0jTGY2wsPslmw
-N/lF+nIg3CE7m+v+w+ku6Vzgl/6vdVoTijdmSOTtbG+1yY7yaCHGbLQ1u875Ydch
-BvAcdITwugcQwt7yLIlEBQTuvHRwT3yClnYr4oeLQH/ag9g/lka19eDD5UT9pJI0
-2vFgjTUESZIGZNzQpT20Q2QOaLzIS6QX/scSomVAcxtr2KffZD594+B7kWC/3o9Q
-6ixPvzlwLg8BYIjwyKe8BJmBEj0jaHoCDNfnOcSuqrXeb95fkROQwbWjrGc2YRDZ
-kYh5KqYdf+TU7JeEjemAmEVNCD+MBmV+NIw92+D8jJ+6MQphrmpB6LqAtMwyx/uS
-qby5y7ujecYf5RRJKUYf
-=Ljkv
+iQIcBAEBCgAGBQJOVSaiAAoJEPqDWhW0r/LCAf4QAL31Be+uz4L3eqeNidDXZepb
+sFc4WISYo90lH82RPROQiXmqhJQ09GIf+oBBJDLXR1fiGL0UaSNViL7Fu7uabeRt
+OBj1pg5uNed7pYgw5QtHlrtm77o7xgEjtEaLx6RpK5m9YI3UxfXk6paVlP0A+qxj
+xqVhDdrN1bw5QPj7vKFfHJ8wbNeZrL+KY/5WEOvBE8Y/1YfKG1pq7VipQl1Oogo1
+UGV2zauJY7sxVOgB7g2e1DIZXKnpqTzFnNgUkAszgAbr5X4Mm7WOSdy8VuOGEg8U
+OHMUrXYuGTMdkL7PSHUiAltE1UeQoNHM1pEsAy9ZHU680XmxNyKmhUBqBL2+h/Qx
+WJNX/h46MEe/Vx5RbtSP4mMkuAQgeReQTbLSkDW3D8/OppXUb+gXM1D1uFcaxUkO
+31yJB6vRZqBJ/09NgsTwyMHjXS4qObLVZFu7x0gv2ITq0GlDB5aP6j5/TmEDG2eX
+JTJTEQnT2aEvDMiH/FfjD3E3FNOI3e2ae1exf2qk7kTlrum0G0K91sJVv8WC7Lu7
+E7RmU4renCWf6h2xhMbQa8UIalQczUJjDBbvL7bJoRxbv71ahOg+3f4xe3ruGYjU
+3DdLzCMKOI1T72Z9u3Hlzvq4Axo+wnj4zjhVnPbGpikfp2v72Xy1kPOeybSnPXFO
+zG8UYm0uhrZSb/kQPxt3
+=Xrnv
 -----END PGP SIGNATURE-----

diff --git a/dev-python/PyQt4/PyQt4-4.8.5.ebuild b/dev-python/PyQt4/PyQt4-4.8.5.ebuild
index f330f3d7dd5d6411c837b136d09359869c610e1e..b4ed3ee84b3d201536bf4882e15941f005853f49 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.8.5.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 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.1 2011/08/19 10:12:33 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.8.5.ebuild,v 1.2 2011/08/24 16:28:35 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
 
 inherit python qt4-r2 toolchain-funcs
 
@@ -47,7 +47,7 @@ DEPEND=">=dev-python/sip-4.12.2
        xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_VER}:4 )"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
        "${FILESDIR}/${PN}-4.7.2-configure.py.patch"
@@ -122,7 +122,7 @@ src_configure() {
                "${myconf[@]}" || return 1
 
                local mod
-               for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative); do
+               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)
@@ -167,6 +167,10 @@ src_install() {
 
 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() {