Revbump: ebuild rewritten to support multiple python ABIs (bug #401549 by Rafał Mużyło), thanks to Ian Delaney for initial testing.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 156 insertions, 17 deletions

diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 7c1f427fbf54..dd7f80926f84 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyside
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.25 2012/02/23 18:56:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.26 2012/03/06 23:57:06 pesa Exp $
+
+*pyside-1.1.0-r1 (06 Mar 2012)
+
+  06 Mar 2012; Davide Pesavento <pesa@gentoo.org> +pyside-1.1.0-r1.ebuild,
+  metadata.xml:
+  Revbump: ebuild rewritten to support multiple python ABIs (bug #401549 by
+  Rafał Mużyło), thanks to Ian Delaney for initial testing.
 
   23 Feb 2012; Markos Chandras <hwoarang@gentoo.org> pyside-1.1.0.ebuild:
   Fix tests. Thanks to Ian Delaney <johneed@hotmail.com>. Bug #403061
diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 41f58ec0a3e0..b19309d94acb 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -3,23 +3,23 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<maintainer>
-	<email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
 	</maintainer>
 	<use>
-		<flag name="X">Build the QtGui and QtDesigner modules</flag>
-		<flag name="assistant">Build the QtHelp module</flag>
-		<flag name="declarative">Build the QtDeclarative module</flag>
-		<flag name="help">Build the QtHelp module</flag>
-		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as Phonon variant needed for KDE</flag>
-		<flag name="multimedia">Build the QtMultimedia module</flag>
-		<flag name="opengl">Build the QtOpenGL module</flag>
-		<flag name="phonon">Build the phonon module</flag>
-		<flag name="script">Build the QtScript module</flag>
-		<flag name="sql">Build the QtSql module</flag>
-		<flag name="svg">Build the QtSvg module</flag>
-		<flag name="test">Build the QtTest module</flag>
-		<flag name="webkit">Build the QtWebKit module</flag>
-		<flag name="xmlpatterns">Build the QtXmlPatterns module</flag>
+		<flag name="X">Build QtGui, QtDesigner, QtTest and QtUiTools modules</flag>
+		<flag name="assistant">Build QtHelp module</flag>
+		<flag name="declarative">Build QtDeclarative module</flag>
+		<flag name="help">Build QtHelp module</flag>
+		<flag name="kde">Select <pkg>media-sound/phonon</pkg> as phonon variant, needed for KDE4</flag>
+		<flag name="multimedia">Build QtMultimedia module</flag>
+		<flag name="opengl">Build QtOpenGL module</flag>
+		<flag name="phonon">Build phonon module</flag>
+		<flag name="script">Build QtScript module</flag>
+		<flag name="scripttools">Build QtScriptTools module</flag>
+		<flag name="sql">Build QtSql module</flag>
+		<flag name="svg">Build QtSvg module</flag>
+		<flag name="webkit">Build QtWebKit module</flag>
+		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-python/pyside/pyside-1.1.0-r1.ebuild b/dev-python/pyside/pyside-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..939b4ef837af
--- /dev/null
+++ b/dev-python/pyside/pyside-1.1.0-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.0-r1.ebuild,v 1.1 2012/03/06 23:57:06 pesa Exp $
+
+EAPI=4
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+PYTHON_DEPEND="2:2.6 3:3.2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
+
+VIRTUALX_COMMAND="cmake-utils_src_test"
+
+inherit multilib cmake-utils python virtualx
+
+MY_P="${PN}-qt4.7+${PV}"
+
+DESCRIPTION="Python bindings for the Qt framework"
+HOMEPAGE="http://www.pyside.org/"
+SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns"
+
+REQUIRED_USE="
+	declarative? ( X )
+	help? ( X )
+	multimedia? ( X )
+	opengl? ( X )
+	phonon? ( X )
+	scripttools? ( X script )
+	sql? ( X )
+	svg? ( X )
+	test? ( X )
+	webkit? ( X )
+"
+
+QT_PV="4.7.0:4"
+
+RDEPEND="
+	>=dev-python/shiboken-1.1.0-r1
+	>=x11-libs/qt-core-${QT_PV}
+	X? (
+		>=x11-libs/qt-gui-${QT_PV}[accessibility]
+		>=x11-libs/qt-test-${QT_PV}
+	)
+	declarative? ( >=x11-libs/qt-declarative-${QT_PV} )
+	help? ( >=x11-libs/qt-assistant-${QT_PV} )
+	multimedia? ( >=x11-libs/qt-multimedia-${QT_PV} )
+	opengl? ( >=x11-libs/qt-opengl-${QT_PV} )
+	phonon? (
+		kde? ( media-libs/phonon )
+		!kde? ( || (
+			>=x11-libs/qt-phonon-${QT_PV}
+			media-libs/phonon
+		) )
+	)
+	script? ( >=x11-libs/qt-script-${QT_PV} )
+	sql? ( >=x11-libs/qt-sql-${QT_PV} )
+	svg? ( >=x11-libs/qt-svg-${QT_PV}[accessibility] )
+	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
+	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-python/generatorrunner-0.6.16
+"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+	# Fix generated pkgconfig file to require the shiboken
+	# library suffixed with the correct python version.
+	sed -i -e '/^Requires:/ s/shiboken$/&@SHIBOKEN_PYTHON_SUFFIX@/' \
+		libpyside/pyside.pc.in || die
+
+	python_src_prepare
+}
+
+src_configure() {
+	configuration() {
+		local mycmakeargs=(
+			-DPYTHON_SUFFIX="-python${PYTHON_ABI}"
+			$(cmake-utils_use_build test TESTS)
+			$(cmake-utils_use_disable X QtGui)
+			$(cmake-utils_use_disable X QtDesigner)
+			$(cmake-utils_use_disable X QtTest)
+			$(cmake-utils_use_disable X QtUiTools)
+			$(cmake-utils_use_disable declarative QtDeclarative)
+			$(cmake-utils_use_disable help QtHelp)
+			$(cmake-utils_use_disable multimedia QtMultimedia)
+			$(cmake-utils_use_disable opengl QtOpenGL)
+			$(cmake-utils_use_disable phonon)
+			$(cmake-utils_use_disable script QtScript)
+			$(cmake-utils_use_disable scripttools QtScriptTools)
+			$(cmake-utils_use_disable sql QtSql)
+			$(cmake-utils_use_disable svg QtSvg)
+			$(cmake-utils_use_disable webkit QtWebKit)
+			$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
+		)
+		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
+	}
+	python_execute_function -s configuration
+}
+
+src_compile() {
+	compilation() {
+		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
+	}
+	python_execute_function -s compilation
+}
+
+src_test() {
+	testing() {
+		CMAKE_USE_DIR="${BUILDDIR}" virtualmake
+	}
+	python_enable_pyc
+	python_execute_function -s testing
+	python_disable_pyc
+}
+
+src_install() {
+	installation() {
+		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
+		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
+	}
+	python_execute_function -s installation
+}