[gentoo-commits] gentoo-x86 commit in dev-python/PyQt4: PyQt4-4.5.4.ebuild ChangeLog

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/08/02 05:17:58

  Modified:             PyQt4-4.5.4.ebuild ChangeLog
  Log:
  Set SUPPORT_PYTHON_ABIS.
  (Portage version: 13874-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-python/PyQt4/PyQt4-4.5.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild?r1=1.1&r2=1.2

Index: PyQt4-4.5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PyQt4-4.5.4.ebuild	31 Jul 2009 07:09:45 -0000	1.1
+++ PyQt4-4.5.4.ebuild	2 Aug 2009 05:17:58 -0000	1.2
@@ -1,10 +1,11 @@
 # 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.5.4.ebuild,v 1.1 2009/07/31 07:09:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.5.4.ebuild,v 1.2 2009/08/02 05:17:58 arfrever Exp $
 
 EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit distutils python qt4
+inherit python qt4
 
 MY_P=PyQt-x11-gpl-${PV}
 QTVER="4.5.1"
@@ -56,56 +57,70 @@
 	fi
 	qt4_src_prepare
 
-	# Remove this code after removing Python 2 from the tree.
-	python_version
-	if [[ "${PYVER:0:1}" == "3" ]]; then
-		rm -fr pyuic/uic/port_v2
-	else
-		rm -fr pyuic/uic/port_v3
-	fi
+	python_copy_sources
+
+	prepare_package() {
+		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 prepare_package
 }
 
 src_configure() {
-	distutils_python_version
+	configure_package() {
+		local myconf="$(get_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 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)"
+		echo ${myconf}
+		${myconf} || exit 1
+
+		# Fix insecure runpath.
+		if use X ; then
+			for pkg in QtDesigner QtGui QtCore; do
+				sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}-${PYTHON_ABI}/qpy/${pkg}::" ${pkg}/Makefile || die "failed to fix rpath issues"
+			done
+		fi
+	}
+	python_execute_function -s configure_package
+}
 
-	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 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)"
-	echo ${myconf}
-	${myconf} || die "configuration failed"
-
-	# Fix insecure runpath
-	if use X ; then
-		for pkg in QtDesigner QtGui QtCore; do
-			sed -i -e "/^LFLAGS/s:-Wl,-rpath,${S}/qpy/${pkg}::" \
-				"${S}"/${pkg}/Makefile || die "failed to fix rpath issues"
-		done
-	fi
+src_compile() {
+	build_package() {
+		emake
+	}
+	python_execute_function -s build_package
 }
 
 src_install() {
 	python_need_rebuild
-	# INSTALL_ROOT is needed for the QtDesigner module,
-	# the other Makefiles use DESTDIR.
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "installation failed"
+
+	install_package() {
+		# INSTALL_ROOT is needed for the QtDesigner module,
+		# the other Makefiles use DESTDIR.
+		emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	}
+	python_execute_function -s install_package
 
 	dodoc ChangeLog NEWS THANKS || die
 
@@ -118,3 +133,11 @@
 		doins -r examples || die
 	fi
 }
+
+pkg_postinst() {
+	python_mod_optimize PyQt4
+}
+
+pkg_postrm() {
+	python_mod_cleanup PyQt4
+}



1.76                 dev-python/PyQt4/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.76&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?rev=1.76&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/PyQt4/ChangeLog?r1=1.75&r2=1.76

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- ChangeLog	31 Jul 2009 07:09:45 -0000	1.75
+++ ChangeLog	2 Aug 2009 05:17:58 -0000	1.76
@@ -1,6 +1,10 @@
 # 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.75 2009/07/31 07:09:45 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.76 2009/08/02 05:17:58 arfrever Exp $
+
+  02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  PyQt4-4.5.4.ebuild:
+  Set SUPPORT_PYTHON_ABIS.
 
 *PyQt4-4.5.4 (31 Jul 2009)