=dev-python/PyQt4-4.11-r1: revbump/merge

However, the package is currently masked upstream and thus far I am not
able to get it to work, so I'm leaving it masked.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

4 files changed, 272 insertions, 6 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index 003211c..b9953c8 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for dev-python/PyQt4
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.248 2013/12/28 18:46:22 nerdboy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.261 2014/05/30 18:30:07 pesa Exp $
+
+*PyQt4-4.11 (30 May 2014)
+
+  30 May 2014; Davide Pesavento <pesa@gentoo.org> +PyQt4-4.11.ebuild:
+  Version bump.
+
+  21 May 2014; Davide Pesavento <pesa@gentoo.org> PyQt4-4.10.3-r2.ebuild,
+  PyQt4-4.10.3-r3.ebuild, metadata.xml:
+  Update pypi identifier in HOMEPAGE and <upstream> metadata tag. Thanks to
+  Martin Walch in bug 510812.
+
+  19 May 2014; Michał Górny <mgorny@gentoo.org> -PyQt4-4.10.2.ebuild,
+  -PyQt4-4.10.3.ebuild:
+  Drop the old versions that required python-exec:0.
+
+  02 Apr 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml:
+  Remove python herd as discussed with them.
+
+*PyQt4-4.10.3-r3 (27 Mar 2014)
+
+  27 Mar 2014; Michał Górny <mgorny@gentoo.org> +PyQt4-4.10.3-r3.ebuild:
+  Replace manual Python wrapping with proper eclass functions, bug #484404.
+
+  23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for sparc, wrt bug #495638
+
+  23 Mar 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for x86, wrt bug #495638
+
+  19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for alpha, wrt bug #495638
+
+  18 Mar 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for ia64, wrt bug #495638
+
+  14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for ppc64, wrt bug #495638
+
+  08 Mar 2014; Pacho Ramos <pacho@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  amd64 stable, bug 495638
+
+  02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  Stable for ppc, wrt bug #495638
+
+  30 Jan 2014; Markus Meier <maekke@gentoo.org> PyQt4-4.10.3-r2.ebuild:
+  arm stable, bug #495638
 
   28 Dec 2013; Steve Arnold <nerdboy@gentoo.org>
   files/PyQt4-4.7.3-qreal_float_support.patch:
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 387d159..59de558 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,6 +1,8 @@
 AUX PyQt4-4.10.3-sip_4_15_5_compat.patch 5005 SHA256 3f205037802d8f2bd99f19f3b018b9dc79b4055174d41271241e1f2da3b59270 SHA512 05ba8caba59a4be9fe4fffcd01e926c6117d36bb0f0ceed2d4e0327748a62f74a81fdf24b594d28f9ea02e63505d2fc6efef63a3c39c9fd78f769c823cee2834 WHIRLPOOL 2c2d4c5bb60a5a8ac3893810fea1d41c3b84c921acb6a98987ecb396a7dea553ea604db1934fef1bf090d176a505e1cc38eefe155443549037f954008735b758
 AUX PyQt4-4.7.3-qreal_float_support.patch 5954 SHA256 e2f86905d0d648eda5bebf50b165120bcb0f4c83e99742eeb2ed17568a6429ec SHA512 5431778103c333c1f13850f4b5fe982f4fe8e04c6cabb013ab8fff7d6117f9d0d5b8c7bbc6d5ceaceaa84fa8984276dda373e989ef3a8d90d3a1ae2220a97af2 WHIRLPOOL 83f8c3d00fb92099414a03492d40ddbee362e53be75b180f3842980e0dec69e1a3094e3ea7d951140de028e75c36acb040ca159d710c4a20d20da9c04e6a31dd
 DIST PyQt-x11-gpl-4.10.3.tar.gz 11187362 SHA256 a713bebef394213b2c9e1fe0cad5699b869dc356bba50766e069013eba8bf630 SHA512 4edd3539e1855bc3358dcba866433e53d4b9444b867c14cc27115cf5a6c123b0af3bb0bae3085f6d71a31f0b6716da40809ac4ffcaaff415673ed7462f1a0420 WHIRLPOOL 675e324993e8f9a3b2a0a8975c9f1e2af9cd315073a68e6649a8de04e8e8a905d756be2c138a8c19b4ec16a75c7b118b32a3ffc27f8399953599a1b88ac76fad
+DIST PyQt-x11-gpl-4.11.tar.gz 11118078 SHA256 d91b942d2aa8115acb83f9aeae71a4afb4d042c1cd23a2a9ee75329a7c539366 SHA512 ba6e42afa5ea235d5b1e9be79ff57c458f1d0f11cd4bffff38c48c4c55692409c0750e7d6dd385fb811e874f308a2eaf3adce70e3d5aec70dfed0c540df65b58 WHIRLPOOL f71685defeddc3a182073b0ec9970b28416ed2bb61d4dafbd9dfdc887fa1e076426241e42a305cea744f17911ec0df9829c36fa5de30bb2881a0a40bdc1ead46
 EBUILD PyQt4-4.10.3-r4.ebuild 6136 SHA256 8270b600fd5f364cd86b803c934f0c234892baafc66aa5c2420ad5c1be4736fa SHA512 dcbb314a1fb26508335c7d3e735c947ecc985e78c07c59f2b1ab8f09ae6185db20adae49b34de8a3756afba3607e13d474989e7a042742ce3516a6346f97739b WHIRLPOOL f729394467054bf53f007b460b2895a6727f2ce0375d47cbfcb29986d7b09424da8d4a7496a7c628fc7966832760f18fb05fff00898c0703cba80020d8886b09
-MISC ChangeLog 34292 SHA256 6917bb71bd9f2a9ea7f0ea5b63922924bfe6f4f4dc0382ae2051b0bf36802f42 SHA512 76e22a28f43a882a7002a11046e45d3ee7efb81800ec48d271ea943eba96f04c3d3cf5441461d7b520ec6c852298a3186a38982fd00395c65901b04d4ddebcb6 WHIRLPOOL d634fce36da5b5e8553719f595a2c46d6a837efd321bb0059dd7aa3ce9e934313787d64c2d9021f5c6e6512892c84362194f1c80d9d9dfae22511694e234310c
-MISC metadata.xml 1226 SHA256 546a210961a96d0a0872aa993643899a2becaf81a6c90f6eeb7cdab789f8e2f7 SHA512 f7cbfc11447e1ec407fce921e9dcc44a6a49f013fdce380d43845e15ea45ea88963f8c0a672fa77eeb1b3f2271477c0c740d81ec4c0061cf5f5b2e9d053ca035 WHIRLPOOL fd601eb093c494fcf0730d858a44f30e36403d1f9e046f5671c6ede591d617015ff05c4d8d014be767334daa81497e1bafc0960db50c1380d683324a884f62dc
+EBUILD PyQt4-4.11-r1.ebuild 5933 SHA256 60322551328e6a5f391190aabf6e29136fd0e497454ec0b7b02e170f5119fbba SHA512 7f56dd477de933003d7eb4eb28552a789c468e468c33353ca2d9018526f1c21fe7a0f39b4e256d5dd1aad9998ef961484868afaeb67c2c081e9ba980e1a4c312 WHIRLPOOL 05f982c8461a9dfdd10f51cd522555bad1c72a077f86644b53b94df42e754024262978c803e2b3b64d16857148f5dabe685cbdbb406b6e1ee218f7fe9d582353
+MISC ChangeLog 35926 SHA256 0128c602a46d8930a2b593773d0a0e11c33c308db1ca705ab31c9e17243d80ed SHA512 6b2fcbc70c4406f1f048330c3ad6ddffd96010b9019b26adaeb9c1ac6e104773fde8e2147fcb1ab3b6b80b174fef7acf744acf7a4e42889b1dc7c8de30237a57 WHIRLPOOL 9854f193030281884154b44fa04b30145c58854ef380ad2471da1fe56cc8e285b2e1104ba43ed1cc1034bdfa45ecd4629cd4587a1b19945762ce174ff2d78f0f
+MISC metadata.xml 1206 SHA256 1757eb7c7f29865aecd996948d3f6a2eb20986a3b938cddba4618e1eedfc69d3 SHA512 d94177fa61099360b74bdeb3e3f9667d8b1b5b7e5b055323524b325a655970bd61420ae76da59e8d519c3e020394f4174d0e50dc95e7bb57d3d7fca602932104 WHIRLPOOL 0c93eff1a6dad85699c198f0496695b88d01541ed35dce79a316360f123242e6daf8955e36bb848c92dd3210815065fc89a4d0e94438be169f2aa87f2e478b33
diff --git a/dev-python/PyQt4/PyQt4-4.11-r1.ebuild b/dev-python/PyQt4/PyQt4-4.11-r1.ebuild
new file mode 100644
index 0000000..0e1ef12
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.11-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils multibuild python-r1 qmake-utils toolchain-funcs
+
+DESCRIPTION="Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/ https://pypi.python.org/pypi/PyQt4"
+
+if [[ ${PV} == *_pre* ]]; then
+	MY_P="PyQt-x11-gpl-snapshot-${PV%_pre*}-${REVISION}"
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+else
+	MY_P="PyQt-x11-gpl-${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 webkit xmlpatterns"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	declarative? ( X )
+	designer? ( X )
+	help? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	scripttools? ( X script )
+	sql? ( X )
+	svg? ( X )
+	webkit? ( X )
+"
+
+# Minimal supported version of Qt.
+QT_PV="4.8.0:4"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.16:=[${PYTHON_USEDEP}]
+	>=dev-qt/qtcore-${QT_PV}
+	X? (
+		>=dev-qt/qtgui-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+	dbus? (
+		>=dev-python/dbus-python-0.80[${PYTHON_USEDEP}]
+		>=dev-qt/qtdbus-${QT_PV}
+	)
+	declarative? ( >=dev-qt/qtdeclarative-${QT_PV} )
+	designer? ( || ( dev-qt/designer:4 <dev-qt/qtgui-4.8.5:4 ) )
+	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} )
+	sql? ( >=dev-qt/qtsql-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${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"
+
+	# Allow building against KDE's phonon (bug 433944 and others).
+	sed -i \
+		-e "s:VideoWidget()\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/qt4/QtGui\"]:" \
+		-e "s:^\s\+generate_code(\"phonon\":&, extra_include_dirs=[\"${EPREFIX}/usr/include/phonon\"]:" \
+		configure.py || die
+
+	if ! use dbus; then
+		sed -i -e 's/^\(\s\+\)check_dbus()/\1pass/' configure.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
+}
+
+pyqt4_use_enable() {
+	use $1 && echo --enable=${2:-Qt$(tr 'a-z' 'A-Z' <<< ${1:0:1})${1:1}}
+}
+
+src_configure() {
+	configuration() {
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		local myconf=(
+			"${PYTHON}" configure.py
+			--confirm-license
+			--bindir="${EPREFIX}/usr/bin"
+			--destdir="$(python_get_sitedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			--assume-shared
+			--no-timestamp
+			--qsci-api
+			$(use debug && echo --debug)
+			--enable=QtCore
+			--enable=QtNetwork
+			--enable=QtXml
+			$(pyqt4_use_enable X QtGui)
+			$(pyqt4_use_enable X QtTest)
+			$(pyqt4_use_enable dbus QtDBus)
+			$(pyqt4_use_enable declarative)
+			$(pyqt4_use_enable designer) $(use designer || echo --no-designer-plugin)
+			$(pyqt4_use_enable help)
+			$(pyqt4_use_enable multimedia)
+			$(pyqt4_use_enable opengl QtOpenGL)
+			$(pyqt4_use_enable phonon phonon)
+			$(pyqt4_use_enable script)
+			$(pyqt4_use_enable scripttools QtScriptTools)
+			$(pyqt4_use_enable sql)
+			$(pyqt4_use_enable svg)
+			$(pyqt4_use_enable webkit QtWebKit)
+			$(pyqt4_use_enable xmlpatterns QtXmlPatterns)
+			AR="$(tc-getAR) cqs"
+			CC="$(tc-getCC)"
+			CFLAGS="${CFLAGS}"
+			CFLAGS_RELEASE=
+			CXX="$(tc-getCXX)"
+			CXXFLAGS="${CXXFLAGS}"
+			CXXFLAGS_RELEASE=
+			LINK="$(tc-getCXX)"
+			LINK_SHLIB="$(tc-getCXX)"
+			LFLAGS="${LDFLAGS}"
+			LFLAGS_RELEASE=
+			RANLIB=
+			STRIP=
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}" || die
+
+		local mod
+		for mod in QtCore \
+				$(use X && echo QtGui) \
+				$(use dbus && echo QtDBus) \
+				$(use declarative && echo QtDeclarative) \
+				$(use designer && echo QtDesigner) \
+				$(use opengl && echo QtOpenGL); do
+			# Run eqmake4 inside the qpy subdirectories to respect
+			# CC, CXX, CFLAGS, CXXFLAGS, LDFLAGS and avoid stripping.
+			pushd qpy/${mod} > /dev/null || return
+			eqmake4 $(ls w_qpy*.pro)
+			popd > /dev/null || return
+
+			# Fix insecure runpaths.
+			sed -i -e "/^LFLAGS\s*=/ s:-Wl,-rpath,${BUILD_DIR}/qpy/${mod}::" \
+				${mod}/Makefile || die "failed to fix rpath for ${mod}"
+		done
+
+		# Avoid stripping of libpythonplugin.so.
+		if use designer; then
+			pushd designer > /dev/null || return
+			eqmake4 python.pro
+			popd > /dev/null || return
+		fi
+	}
+	python_parallel_foreach_impl run_in_build_dir configuration
+}
+
+src_compile() {
+	compilation() {
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		default
+	}
+	python_foreach_impl run_in_build_dir compilation
+}
+
+src_install() {
+	installation() {
+		local tmp_root="${D%/}"/tmp
+
+		local CFLAGS="${CFLAGS} $(python_get_CFLAGS)" CXXFLAGS="${CXXFLAGS} $(python_get_CFLAGS)"
+		export CFLAGS CXXFLAGS
+		# 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
+		dohtml -r doc/html/*
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/dev-python/PyQt4/metadata.xml b/dev-python/PyQt4/metadata.xml
index 8dfc9b4..02d3937 100644
--- a/dev-python/PyQt4/metadata.xml
+++ b/dev-python/PyQt4/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
-	<herd>python</herd>
 	<use>
 		<flag name="X">Build QtGui and QtTest modules</flag>
 		<flag name="declarative">Build QtDeclarative module</flag>
@@ -25,6 +24,6 @@
 			<name>Phil Thompson</name>
 		</maintainer>
 		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
-		<remote-id type="pypi">PyQt</remote-id>
+		<remote-id type="pypi">PyQt4</remote-id>
 	</upstream>
 </pkgmetadata>