[patch] PyQt4.diff for solution 1

PyQt4.diff (text/plain), 1.55 KB, created by Michał Górny on 2014-03-13 08:23:51 UTC

Index: PyQt4-4.10.3-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.10.3-r2.ebuild,v
retrieving revision 1.4
diff -u -B -r1.4 PyQt4-4.10.3-r2.ebuild
--- PyQt4-4.10.3-r2.ebuild	8 Mar 2014 08:31:20 -0000	1.4
+++ PyQt4-4.10.3-r2.ebuild	13 Mar 2014 08:23:31 -0000
@@ -5,7 +5,7 @@
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 
-inherit eutils python-r1 qmake-utils toolchain-funcs
+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/ http://pypi.python.org/pypi/PyQt"
@@ -42,7 +42,6 @@
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-lang/python-exec:2[${PYTHON_USEDEP}]
 	>=dev-python/sip-4.15.0:=[${PYTHON_USEDEP}]
 	>=dev-qt/qtcore-${QT_PV}
 	X? (
@@ -185,15 +184,18 @@
 
 src_install() {
 	installation() {
+		local tmp_root=${D}/tmp
 		# INSTALL_ROOT is used by designer/Makefile, other Makefiles use DESTDIR.
-		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-		mkdir -p "${ED}"/usr/lib/python-exec/${EPYTHON} || die
-		mv "${ED}"/usr/bin/pyuic4 "${ED}"/usr/lib/python-exec/${EPYTHON}/ || die
+		emake DESTDIR="${tmp_root}" INSTALL_ROOT="${tmp_root}" install
+
+		python_doexe "${tmp_root}"/usr/bin/pyuic4
+		rm "${tmp_root}"/usr/bin/pyuic4 || die
+
+		multibuild_merge_root "${tmp_root}" "${D}"
 		python_optimize
 	}
 	python_foreach_impl run_in_build_dir installation
 
-	dosym ../lib/python-exec/python-exec2 /usr/bin/pyuic4
 	dodoc NEWS THANKS
 
 	if use doc; then