Enable versioning of /usr/bin/pyuic4. Run eqmake4() in qpy/QtDBus directory. Fixes...

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 1179061f9c6ec22e7d0839536e33f4ade7474559..9009beed0fd6f9496e431dd7e28d8051cd6690f1 100644 (file)
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,10 @@
 # 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.162 2011/12/24 08:55:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.163 2011/12/27 18:10:31 maksbotan Exp $
+
+  27 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> PyQt4-4.9.ebuild:
+  Enable versioning of /usr/bin/pyuic4. Run eqmake4() in qpy/QtDBus directory.
+  Fixes backported from Progress Overlay. Patch by Arfrever.
 
 *PyQt4-4.9 (24 Dec 2011)
 

diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 4d94e91baa3df4884817ef5f523349fa8caba160..5c7f6ad5432c461375256e5bf68d93ff9d81fae4 100644 (file)
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,6 +1,3 @@
------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
@@ -24,23 +21,6 @@ EBUILD PyQt4-4.8.3.ebuild 5030 RMD160 03636343ee6364eba3601a0e554cc7314719322f S
 EBUILD PyQt4-4.8.4.ebuild 4978 RMD160 058c3089cc67edba707587b2b9f43e7ae64c9758 SHA1 4abe5d2d4d441b058e99bfcd0d27ea302e4fe2c2 SHA256 764b6cb8ed982e0d7616054e92654860acf8fb17a4e20b38cf6ea7c32f6324ea
 EBUILD PyQt4-4.8.5.ebuild 5302 RMD160 1f0b5e8d355e8100d6b7e297bbd7f2a445aad76c SHA1 4fda85e3ae863d503c6a3015507c0ee0d452e0a7 SHA256 6b009aee13de0cb89d8171c0521dea562d15bae3ad9b6b791899851b7a011998
 EBUILD PyQt4-4.8.6.ebuild 5302 RMD160 946b9a419d0b08eb5201a235d4316a77750d7a85 SHA1 242f16dba6656a83bdd4d49b3e37fc566726d1aa SHA256 b7fd6c9456eca33ec1e6f4ed7b16bd6bef4bdfdfc2654de9f62564aadf3e7d7c
-EBUILD PyQt4-4.9.ebuild 5335 RMD160 48519228afd999e7c9d0c5eba1b4e5b182db9000 SHA1 1061eb1372dc5c715ae8d03a15d2e5bb69b28f67 SHA256 9d080ed17ff8c1c4f16658eebe04dc93c32e39eff05ebd1f821689608cd38c61
-MISC ChangeLog 22295 RMD160 f8fa0964ff11793f95f1ebe355b6ac2475d627ec SHA1 ae390a1f0bbe07a34b81bb706e215b1f4347b690 SHA256 cd583d3ff676d1352e5c27b950f262644267baf6066713d961bbe7995a5c290b
+EBUILD PyQt4-4.9.ebuild 5512 RMD160 8e4c798e0c5a680e0fcf117fe136e7a92244feee SHA1 65ad12e12f07c748dc3d6dd856588c54d4e71c91 SHA256 08a151992b98efcdfcc8b8f1fe67d1fca806d15af784030570355815d21b3d00
+MISC ChangeLog 22507 RMD160 fa73e1fb2a392177992f9af2ff67d3e75be86c73 SHA1 9700b22e2fffb9b6f66317b935833d83fef50a90 SHA256 e4468246ad42b262538963b8dcdf805641f9f3f9423ef45c996846f211420bd5
 MISC metadata.xml 878 RMD160 cdc42fae8ad9f67bbe0dcc949f7822cc72d0acf9 SHA1 f1907739ab33d27cd8276c57b4d062a3b44ae402 SHA256 89c99beeac252dc158fb953793675d0133b2daa91b22f4c5a016262348323afe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBCgAGBQJO9ZNgAAoJEPqDWhW0r/LC0qwP/0El+g5OAlfWb73vD/c0aSkq
-tMfg69vt4TMDEtv0KKlSL5XiGgh8l3hajAVgTGuNC3aUXjoaJkNSuO08eZwSONZE
-dDdVirkYH20+kpmsGJQo17JxVpvhBgHSVQn1AZ8kYgZvCN+fdxEnkpKumqiaPhWA
-SZNKGdV3isYshIbvKXEQBwB8WRsvWFeIlwXMZg9YEcUBtJJnbVdXgyBRldHZFK6c
-N965Hcu3Ew1O24RQZVMinQbT+C3jL5gxRjY/QX9auafM4S+02NHV27KfWAHk03Ab
-CRfphA8WFr38l9AV7VvR4SGCKZ4QkyJ0QKL+EhicvGkvrBFzGFo3BkGuBwX68bvh
-ifo3ACrOI2oss+zRhGT5zBkkqywwhtxlFwhtEQ5XVDfYZM4Cty8axi6C5LBt90O/
-lSyxT6jlVb2Kdmsj8CD78obDcAy9/FgEQrcm2HnsBpcQxHBi0DUb9+PyE77Z22Az
-Y5d8JKp8Fw+JHhRMnPkryxOAtWRgxqSFI+T3v0pV4eOxW4Tt81Y3rlzdla6+p2ZL
-u1i0eOc81CFW5wAE3MLYfvr4v8rtfYpTJMijWAoL0ahbyNp2bz1tYlh2S/GjUeOQ
-n51Qw+HBtiN60LNExM5UCx6VtTdurmgAR1603O45gB2D4zMXWaBccJlw/coVW9dT
-VhDFCz4jcPDnfkZe8Zb9
-=d1fr
------END PGP SIGNATURE-----

diff --git a/dev-python/PyQt4/PyQt4-4.9.ebuild b/dev-python/PyQt4/PyQt4-4.9.ebuild
index 9029424fb888395a211143de84d17e5e109d9d5e..5133c5c21dc106e7fc9e210902adeeaff1ad6d26 100644 (file)
--- a/dev-python/PyQt4/PyQt4-4.9.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.1 2011/12/24 08:55:10 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.ebuild,v 1.2 2011/12/27 18:10:31 maksbotan Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -53,6 +53,8 @@ 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"
@@ -69,7 +71,7 @@ src_prepare() {
        python_copy_sources
 
        preparation() {
-               if [[ "$(python_get_version --major)" == "3" ]]; then
+               if [[ "$(python_get_version -l --major)" == "3" ]]; then
                        rm -fr pyuic/uic/port_v2
                else
                        rm -fr pyuic/uic/port_v3
@@ -123,7 +125,7 @@ src_configure() {
                "${myconf[@]}" || return 1
 
                local mod
-               for mod in QtCore $(use X && echo QtDesigner QtGui) $(use declarative && echo QtDeclarative) $(use opengl && echo QtOpenGL); do
+               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)
@@ -149,10 +151,11 @@ src_compile() {
 
 src_install() {
        installation() {
-               # INSTALL_ROOT is needed for the QtDesigner module, other Makefiles use DESTDIR.
-               emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+               # 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"