[gentoo-commits] proj/qt:master commit in: dev-python/generatorrunner/, dev-python/pyside/, dev-python/shiboken/, ...

[Davide Pesavento]

commit:     c92bce613d36db88be8b09acaa67cb8c72a47daf
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Apr 28 19:30:28 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 28 19:30:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=c92bce61

Sync pyside & shiboken with portage.

---
 dev-python/apiextractor/apiextractor-9999.ebuild   |   41 --------------------
 dev-python/apiextractor/metadata.xml               |    5 --
 .../generatorrunner/generatorrunner-9999.ebuild    |   37 ------------------
 dev-python/generatorrunner/metadata.xml            |    5 --
 dev-python/pyside/pyside-9999.ebuild               |   26 ++++--------
 dev-python/shiboken/shiboken-9999.ebuild           |   33 +++++++++-------
 6 files changed, 27 insertions(+), 120 deletions(-)

diff --git a/dev-python/apiextractor/apiextractor-9999.ebuild b/dev-python/apiextractor/apiextractor-9999.ebuild
deleted file mode 100644
index 2ce84a7..0000000
--- a/dev-python/apiextractor/apiextractor-9999.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils git-2
-
-DESCRIPTION="Library used to create an internal representation of an API in order to create Python bindings"
-HOMEPAGE="http://www.pyside.org/"
-EGIT_REPO_URI="git://gitorious.org/pyside/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug test"
-
-QT_PV="4.7.0:4"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.32
-	>=dev-libs/libxslt-1.1.19
-	>=x11-libs/qt-core-${QT_PV}
-	>=x11-libs/qt-xmlpatterns-${QT_PV}
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=x11-libs/qt-gui-${QT_PV}
-		>=x11-libs/qt-test-${QT_PV}
-	)"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTS)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-python/apiextractor/metadata.xml b/dev-python/apiextractor/metadata.xml
deleted file mode 100644
index dc439f7..0000000
--- a/dev-python/apiextractor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>qt</herd>
-</pkgmetadata>

diff --git a/dev-python/generatorrunner/generatorrunner-9999.ebuild b/dev-python/generatorrunner/generatorrunner-9999.ebuild
deleted file mode 100644
index 1ae091d..0000000
--- a/dev-python/generatorrunner/generatorrunner-9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit cmake-utils git-2
-
-DESCRIPTION="A tool to control bindings generation"
-HOMEPAGE="http://www.pyside.org/"
-EGIT_REPO_URI="git://gitorious.org/pyside/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug test"
-
-QT_PV="4.7.0:4"
-
-RDEPEND="
-	~dev-python/apiextractor-${PV}
-	>=x11-libs/qt-core-${QT_PV}
-"
-DEPEND="${RDEPEND}
-	test? ( >=x11-libs/qt-test-${QT_PV} )
-"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build test TESTS)
-	)
-	cmake-utils_src_configure
-}

diff --git a/dev-python/generatorrunner/metadata.xml b/dev-python/generatorrunner/metadata.xml
deleted file mode 100644
index dc439f7..0000000
--- a/dev-python/generatorrunner/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>qt</herd>
-</pkgmetadata>

diff --git a/dev-python/pyside/pyside-9999.ebuild b/dev-python/pyside/pyside-9999.ebuild
index d375237..64ecd83 100644
--- a/dev-python/pyside/pyside-9999.ebuild
+++ b/dev-python/pyside/pyside-9999.ebuild
@@ -4,8 +4,6 @@
 
 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-*"
@@ -62,9 +60,7 @@ RDEPEND="
 	webkit? ( >=x11-libs/qt-webkit-${QT_PV} )
 	xmlpatterns? ( >=x11-libs/qt-xmlpatterns-${QT_PV} )
 "
-DEPEND="${RDEPEND}
-	~dev-python/generatorrunner-${PV}
-"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
@@ -73,8 +69,6 @@ src_prepare() {
 	# 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() {
@@ -98,31 +92,29 @@ src_configure() {
 			$(cmake-utils_use_disable webkit QtWebKit)
 			$(cmake-utils_use_disable xmlpatterns QtXmlPatterns)
 		)
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_configure
 	}
-	python_execute_function -s configuration
+	python_execute_function configuration
 }
 
 src_compile() {
 	compilation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_make
 	}
-	python_execute_function -s compilation
+	python_execute_function compilation
 }
 
 src_test() {
 	testing() {
-		CMAKE_USE_DIR="${BUILDDIR}" virtualmake
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" virtualmake
 	}
-	python_enable_pyc
-	python_execute_function -s testing
-	python_disable_pyc
+	python_execute_function testing
 }
 
 src_install() {
 	installation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_install
 		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
 	}
-	python_execute_function -s installation
+	python_execute_function installation
 }

diff --git a/dev-python/shiboken/shiboken-9999.ebuild b/dev-python/shiboken/shiboken-9999.ebuild
index a97f8ae..f078161 100644
--- a/dev-python/shiboken/shiboken-9999.ebuild
+++ b/dev-python/shiboken/shiboken-9999.ebuild
@@ -4,8 +4,6 @@
 
 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-*"
@@ -22,11 +20,18 @@ KEYWORDS=""
 IUSE="test"
 
 RDEPEND="
-	~dev-python/apiextractor-${PV}
-	~dev-python/generatorrunner-${PV}
+	>=dev-libs/libxml2-2.6.32
+	>=dev-libs/libxslt-1.1.19
 	>=x11-libs/qt-core-4.7.0:4
+	>=x11-libs/qt-xmlpatterns-4.7.0:4
+	!dev-python/apiextractor
+	!dev-python/generatorrunner
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? (
+		>=x11-libs/qt-gui-4.7.0:4
+		>=x11-libs/qt-test-4.7.0:4
+	)"
 
 S=${WORKDIR}/${PN}
 
@@ -35,8 +40,6 @@ src_prepare() {
 	# caused by the usage of a different version suffix with python >= 3.2
 	sed -i -e "/get_config_var('SOABI')/d" \
 		cmake/Modules/FindPython3InterpWithDebug.cmake || die
-
-	python_src_prepare
 }
 
 src_configure() {
@@ -55,29 +58,29 @@ src_configure() {
 			)
 		fi
 
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_configure
 	}
-	python_execute_function -s configuration
+	python_execute_function configuration
 }
 
 src_compile() {
 	compilation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_make
 	}
-	python_execute_function -s compilation
+	python_execute_function compilation
 }
 
 src_test() {
 	testing() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_test
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_test
 	}
-	python_execute_function -s testing
+	python_execute_function testing
 }
 
 src_install() {
 	installation() {
-		CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install
+		CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_install
 		mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
 	}
-	python_execute_function -s installation
+	python_execute_function installation
 }