added multilib patch wrt bug #283936

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 179 insertions, 2 deletions

diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index f119ddcb1664..26bba54ffd35 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt4
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.94 2009/10/28 15:49:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.95 2009/11/05 07:59:34 wired Exp $
+
+*PyQt4-4.6.1-r1 (05 Nov 2009)
+
+  05 Nov 2009; Alex Alexander <wired@gentoo.org> +PyQt4-4.6.1-r1.ebuild,
+  +files/PyQt4-4.6.1-configure-multilib.patch:
+  added multilib patch wrt bug #283936
 
 *PyQt4-4.6.1 (28 Oct 2009)
 
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 7e2940733400..07307f77506c 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1,5 +1,6 @@
 AUX PyQt4-4.4.4-qgraphicsproxywidget-avoid-event-callback-loop.patch 1004 RMD160 5fa5609d31b53978846999be8045c75b940c3dd1 SHA1 a7122535d44bd8a81984870e98322b14521d2ced SHA256 db539a666d834756013fc48012914dd181116df7f5d1d21485ff947e20441eed
 AUX PyQt4-4.5.4-qgraphicslinearlayout-fix.patch 572 RMD160 81e80c650ef118a7fe9b1a0c581117774552daa7 SHA1 90980166dbe91f4b8e32b82736c92761547c2126 SHA256 b489794c26b1884971dc4bebaec3a625a1827df7b9532965b321ba2c00472562
+AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c894c2494e9de29 SHA1 d0c9b214172b47537873e3fc1bd5fb34e815220c SHA256 6b33666a0b773122330d33a1b88ddd3b18d2d3b2c265e3fd4edc253f1bdfab1a
 AUX configure-4.6.1.py.patch 1409 RMD160 f8a2b0c92fc53756679cff39d366b34cfb5b6d72 SHA1 c2cb0478de7d4f29c4db656f824b4dfce742209d SHA256 c80ecf0323ba47e14ac7e9941cf640a6ae552ad558001984097a8a33861028bd
 AUX configure.py.patch 1727 RMD160 31802058d0b0488264cdbcfeebd7ce9aff250957 SHA1 df4fee27f1486422b25d0072cfc388b207814c8f SHA256 06ee44a9fe43615b6bfada4aa7294303c016fd7c378ddf537823e33546306926
 AUX fix_license_check.patch 643 RMD160 f8934e527bb8bf4f9edf98e068c07fc7b3380d97 SHA1 41fa9b3962add04c8196695c9d9b82b69d7d3ea8 SHA256 117025432a5db37375554577c66edbe7a6fdef6e120fb865b2f4304961dc2c42
@@ -12,6 +13,7 @@ EBUILD PyQt4-4.4.4-r5.ebuild 3020 RMD160 ba75cf1209d08d44e6d7de1f8b0731869ab46df
 EBUILD PyQt4-4.5.2.ebuild 3173 RMD160 8dc1fe362621b1f1eaa04769bea19f4643c2af95 SHA1 94f78aabbe3f9bf08753270ff4fb5af2c25f2bc5 SHA256 c92953611c34214330a63891d3d9a8cdfa9ae09978960e45d20cabc0650d680d
 EBUILD PyQt4-4.5.4-r3.ebuild 4020 RMD160 c1147777ef4210a831ecf1423ed5e3fbf8963be3 SHA1 7834d00f99c2d434b1d43fb543c0e600df63f2e3 SHA256 0db154a127761845d62e60e355e4ee4a96c105d5c659c1fdbfd81b3fdba689c5
 EBUILD PyQt4-4.5.4-r4.ebuild 4057 RMD160 38818215953d84f1f29cbcca8aa62ba3e789d7e2 SHA1 af41523ee6918cd96380dab2edcb1682af744392 SHA256 a1370703fbf20baa0d9b3942150ea724c0f1252264f28c1dcb3a8a21bd4e899e
+EBUILD PyQt4-4.6.1-r1.ebuild 4022 RMD160 a7db0d8004c7e98a7912a8dca2935afb94e2883b SHA1 02cc98f0ba4dcaed839bfae61df158734eee4cc7 SHA256 697f5a9083b593cf1c6d22356fa5a57d34aef22c15c54a4e20f6086b9a23fbce
 EBUILD PyQt4-4.6.1.ebuild 3977 RMD160 f9be066f031a84e1f9335ff884316388e0b6d034 SHA1 f4483696a1ad12d08259632c1f555c68fcda24af SHA256 ef36641f10375e070652cfdac4aa5f3bba000c1dc5bbd5378509642d4ad919fb
-MISC ChangeLog 12701 RMD160 6f3b96737c7641465fbe530a20e3bf4674601ca5 SHA1 cf642001dd02b84bb4a435b56fb1fbe7de7fa264 SHA256 3551b4eb7dae1711ef11961820dbf8f62716a01739c46eac2628137e842c07a6
+MISC ChangeLog 12889 RMD160 df963e0664463a706ea8e8db0715e6787d4cb15b SHA1 f6a68a9929723be204dca68a0395bc9278fed1e0 SHA256 5b0a3f22d7b82b3090df952cccdc3a829c92d2da5b6f64b8e1da9d1c5f4b0f8d
 MISC metadata.xml 859 RMD160 3da7dcc5dc212af8ed4f98e73c561f2365081c98 SHA1 f607feed53689fa15b62d474d6763bc674fbcb2a SHA256 00475be82d27e0e1dab95eafcea3751ae70ee39b53a268063772d76752556d8b
diff --git a/dev-python/PyQt4/PyQt4-4.6.1-r1.ebuild b/dev-python/PyQt4/PyQt4-4.6.1-r1.ebuild
new file mode 100644
index 000000000000..fd6abb214ada
--- /dev/null
+++ b/dev-python/PyQt4/PyQt4-4.6.1-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.6.1-r1.ebuild,v 1.1 2009/11/05 07:59:34 wired Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit python qt4 toolchain-funcs
+
+MY_P="PyQt-x11-gpl-${PV/_pre/-snapshot-}"
+QTVER="4.5.1"
+
+DESCRIPTION="A set of Python bindings for the Qt toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 GPL-3 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="X assistant +dbus debug doc examples kde opengl phonon sql svg webkit xmlpatterns"
+
+DEPEND=">=dev-python/sip-4.9
+	>=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
+	)
+	opengl? ( >=x11-libs/qt-opengl-${QTVER}:4 )
+	phonon? (
+		!kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
+		kde? ( media-sound/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}/configure-${PV}.py.patch"
+	"${FILESDIR}/${P}-configure-multilib.patch"
+)
+
+src_prepare() {
+	if ! use dbus; then
+		sed -i -e 's,^\([[:blank:]]\+\)check_dbus(),\1pass,' \
+			"${S}"/configure.py || die
+	fi
+	qt4_src_prepare
+
+	python_copy_sources
+
+	preparation() {
+		if [[ "${PYTHON_ABI:0:1}" == "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=/usr/bin
+				--destdir=$(python_get_sitedir)
+				--sipdir=/usr/share/sip
+				$(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 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_execute_function -d -s
+}
+
+src_install() {
+	python_need_rebuild
+
+	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 ChangeLog 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/files/PyQt4-4.6.1-configure-multilib.patch b/dev-python/PyQt4/files/PyQt4-4.6.1-configure-multilib.patch
new file mode 100644
index 000000000000..c187dcd4d1d9
--- /dev/null
+++ b/dev-python/PyQt4/files/PyQt4-4.6.1-configure-multilib.patch
@@ -0,0 +1,13 @@
+--- PyQt-x11-gpl-4.6.1~orig/configure.py	2009-11-04 22:28:05.000000000 +0100
++++ PyQt-x11-gpl-4.6.1/configure.py	2009-11-04 23:10:01.000000000 +0100
+@@ -854,8 +854,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" % (lib_dir_flag, py_major, py_minor)
+                 else:
+                     sipconfig.inform("Qt Designer plugin disabled because Python library is static")