[gentoo-commits] proj/qt:master commit in: dev-python/PyQtMobility/

[Davide Pesavento]

commit:     afb453275f24e59ded1fcb8a6f2fd3e79699c360
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Feb 28 16:09:47 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 16:09:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=afb45327

[dev-python/PyQtMobility] Version bump with some enhancements.

---
 dev-python/PyQtMobility/Manifest                   |    2 +-
 ...bility-0.2.ebuild => PyQtMobility-1.0.1.ebuild} |   75 ++++++++++----------
 dev-python/PyQtMobility/metadata.xml               |    5 +-
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/dev-python/PyQtMobility/Manifest b/dev-python/PyQtMobility/Manifest
index 560cd73..52d3667 100644
--- a/dev-python/PyQtMobility/Manifest
+++ b/dev-python/PyQtMobility/Manifest
@@ -1 +1 @@
-DIST PyQtMobility-gpl-0.2.tar.gz 111981 RMD160 9104385644b6b79fe870a761f40f244b3f6610a2 SHA1 beb58ea29dc30a88ff2695edfdb75e8063a2afd5 SHA256 c2769c5ec5b3451cbe041308e363fca8b2881d163eb8bde0af90fbaa353e2b82
+DIST PyQtMobility-gpl-1.0.1.tar.gz 111999 SHA256 8496a47f5345ff547c04e8301cfcdf7862fe9557f56d0d93818c947060b442df SHA512 09bb77f348abe0caf174dea505f3a10ee2adf99698048c9fffc1da66a36dcb907cef7896ee92af7d9ec98a5b30f5229fd9eedc6a64e1476ca340c29b5d842770 WHIRLPOOL 49bbd93b79418f34872a76665d7d54d4a5adca0bdd44a31fe095bfd148d7a673671bc3b61015bc0489d91b7386dc23c57b462e10def00460cc448c165cfe4d8a

diff --git a/dev-python/PyQtMobility/PyQtMobility-0.2.ebuild b/dev-python/PyQtMobility/PyQtMobility-1.0.1.ebuild
similarity index 59%
rename from dev-python/PyQtMobility/PyQtMobility-0.2.ebuild
rename to dev-python/PyQtMobility/PyQtMobility-1.0.1.ebuild
index dba9271..b8c902b 100644
--- a/dev-python/PyQtMobility/PyQtMobility-0.2.ebuild
+++ b/dev-python/PyQtMobility/PyQtMobility-1.0.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 
 inherit python
 
@@ -20,42 +20,32 @@ SLOT="0"
 LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS="~amd64"
 
-PYQTM_MODULES="bearer contacts location messaging multimedia publishsubscribe serviceframework systeminfo versit"
+PYQTM_MODULES="contacts feedback gallery location messaging multimedia organizer
+		publishsubscribe sensors serviceframework systeminfo versit"
 IUSE="debug ${PYQTM_MODULES}"
 
+REQUIRED_USE="
+	|| ( ${PYQTM_MODULES} )
+	versit? ( contacts )
+"
+
 QTM_USE_DEPS=
 for mod in ${PYQTM_MODULES//+}; do
 	QTM_USE_DEPS+="${mod}?,"
 done
 unset mod
 
-DEPEND=">=dev-python/sip-4.12
-	>=dev-python/PyQt4-4.8.2[X]
-	>=x11-libs/qt-mobility-1.1.0[${QTM_USE_DEPS%,}]"
+DEPEND="
+	>=dev-python/sip-4.12.2
+	>=dev-python/PyQt4-4.8.4[X]
+	>=x11-libs/qt-mobility-1.2.0[${QTM_USE_DEPS%,}]
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	python_pkg_setup
-
-	# figure out which modules to build
-	local modules=( $(pyqtm_use_enable bearer)
-			$(pyqtm_use_enable contacts)
-			$(pyqtm_use_enable location)
-			$(pyqtm_use_enable messaging)
-			$(pyqtm_use_enable multimedia QtMultimediaKit)
-			$(pyqtm_use_enable publishsubscribe QtPublishSubscribe)
-			$(pyqtm_use_enable serviceframework QtServiceFramework)
-			$(pyqtm_use_enable systeminfo QtSystemInfo)
-			$(pyqtm_use_enable versit) )
-	if [[ ${#modules[@]} -eq 0 ]]; then
-		ewarn "At least one module must be selected for building, but you have selected none."
-		ewarn "The QtContacts module will be automatically enabled."
-		myconf="--enable=QtContacts"
-	else
-		myconf="${modules[@]}"
-	fi
+pyqtm_use_enable() {
+	use $1 && echo --enable=${2:-Qt$(echo ${1:0:1} | tr '[:lower:]' '[:upper:]')${1:1}}
 }
 
 src_prepare() {
@@ -67,13 +57,26 @@ src_prepare() {
 
 src_configure() {
 	configuration() {
-		set -- "$(PYTHON)" configure.py \
-			--destdir="${EPREFIX}$(python_get_sitedir)" \
-			--sipdir="${EPREFIX}/usr/share/sip" \
-			$(use debug && echo --debug) \
-			${myconf}
-		echo "$@"
-		"$@" || die "configure.py failed"
+		local myconf=("$(PYTHON)"
+			configure.py
+			--destdir="${EPREFIX}$(python_get_sitedir)"
+			--sipdir="${EPREFIX}/usr/share/sip"
+			$(use debug && echo --debug)
+			$(pyqtm_use_enable contacts)
+			$(pyqtm_use_enable feedback)
+			$(pyqtm_use_enable gallery)
+			$(pyqtm_use_enable location)
+			$(pyqtm_use_enable messaging)
+			$(pyqtm_use_enable multimedia QtMultimediaKit)
+			$(pyqtm_use_enable organizer)
+			$(pyqtm_use_enable publishsubscribe QtPublishSubscribe)
+			$(pyqtm_use_enable sensors)
+			$(pyqtm_use_enable serviceframework QtServiceFramework)
+			$(pyqtm_use_enable systeminfo QtSystemInfo)
+			$(pyqtm_use_enable versit)
+		)
+		echo "${myconf[@]}"
+		"${myconf[@]}"
 	}
 	python_execute_function -s configuration
 }
@@ -85,7 +88,3 @@ pkg_postinst() {
 pkg_postrm() {
 	python_mod_cleanup QtMobility
 }
-
-pyqtm_use_enable() {
-	use $1 && echo --enable=${2:-Qt$(echo ${1:0:1} | tr '[:lower:]' '[:upper:]')${1:1}}
-}

diff --git a/dev-python/PyQtMobility/metadata.xml b/dev-python/PyQtMobility/metadata.xml
index f84354a..4a09006 100644
--- a/dev-python/PyQtMobility/metadata.xml
+++ b/dev-python/PyQtMobility/metadata.xml
@@ -3,12 +3,15 @@
 <pkgmetadata>
 <herd>qt</herd>
 <use>
-	<flag name="bearer">Build bindings for the QtBearer module</flag>
 	<flag name="contacts">Build bindings for the QtContacts module</flag>
+	<flag name="feedback">Build bindings for the QtFeedback module</flag>
+	<flag name="gallery">Build bindings for the QtGallery module</flag>
 	<flag name="location">Build bindings for the QtLocation module</flag>
 	<flag name="messaging">Build bindings for the QtMessaging module</flag>
 	<flag name="multimedia">Build bindings for the QtMultimediaKit module</flag>
+	<flag name="organizer">Build bindings for the QtOrganizer module</flag>
 	<flag name="publishsubscribe">Build bindings for the QtPublishSubscribe module</flag>
+	<flag name="sensors">Build bindings for the QtSensors module</flag>
 	<flag name="serviceframework">Build bindings for the QtServiceFramework module</flag>
 	<flag name="systeminfo">Build bindings for the QtSystemInfo module</flag>
 	<flag name="versit">Build bindings for the QtVersit module</flag>