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

["Davide Pesavento" <pesa@gentoo.org>]

commit:     d5b3dcc789cc54f1b4866cac3a8fb3d43628d86e
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Oct 14 19:56:48 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 19:56:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d5b3dcc7

[dev-python/sip] Refactoring.

(Portage version: 2.2.0_alpha137/git/Linux x86_64)

---
 dev-python/sip/sip-4.14.1_pre20121013.ebuild |   36 +++++++++---------
 dev-python/sip/sip-4.9999.ebuild             |   50 ++++++++++++++++---------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/dev-python/sip/sip-4.14.1_pre20121013.ebuild b/dev-python/sip/sip-4.14.1_pre20121013.ebuild
index 7dc0a39..c69aa72 100644
--- a/dev-python/sip/sip-4.14.1_pre20121013.ebuild
+++ b/dev-python/sip/sip-4.14.1_pre20121013.ebuild
@@ -8,13 +8,26 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
-EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-[[ ${PV} == *9999* ]] && HG_ECLASS="mercurial"
-
-inherit eutils python toolchain-funcs ${HG_ECLASS}
+inherit eutils python toolchain-funcs
 
 HG_REVISION=3eba5b9842f0
 
+if [[ ${PV} == *9999* ]]; then
+	# live version from mercurial repo
+	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+	inherit mercurial
+	DEPEND="sys-devel/bison
+		sys-devel/flex"
+elif [[ ${PV} == *_pre* ]]; then
+	# development snapshot
+	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+	S=${WORKDIR}/${MY_P}
+else
+	# official release
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
+fi
+
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
 LICENSE="|| ( GPL-2 GPL-3 sip )"
@@ -24,22 +37,9 @@ SLOT="0/9"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="debug doc"
 
-DEPEND=""
+DEPEND+=""
 RDEPEND=""
 
-if [[ ${PV} == *9999* ]]; then
-	# live version from mercurial repo
-	DEPEND="${DEPEND}
-		sys-devel/bison
-		sys-devel/flex"
-	S=${WORKDIR}/${PN}
-elif [[ ${PV} == *_pre* ]]; then
-	# development snapshot
-	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
 src_prepare() {
 	# Sub-slot sanity check
 	local sub_slot=${SLOT#*/}

diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 2d2134a..3a9255b 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -8,37 +8,51 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
 PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 
-EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
-[[ ${PV} == *9999* ]] && HG_ECLASS="mercurial"
+inherit eutils python toolchain-funcs
 
-inherit eutils python toolchain-funcs ${HG_ECLASS}
-
-DESCRIPTION="Python extension module generator for C and C++ libraries"
-HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
-LICENSE="|| ( GPL-2 GPL-3 sip )"
-
-# Subslot based on SIP_API_MAJOR_NR from siplib/sip.h.in
-SLOT="0/9"
-KEYWORDS=""
-IUSE="debug doc"
-
-DEPEND=""
-RDEPEND=""
+HG_REVISION=
 
 if [[ ${PV} == *9999* ]]; then
 	# live version from mercurial repo
-	DEPEND="${DEPEND}
-		sys-devel/bison
+	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+	inherit mercurial
+	DEPEND="sys-devel/bison
 		sys-devel/flex"
-	S=${WORKDIR}/${PN}
 elif [[ ${PV} == *_pre* ]]; then
 	# development snapshot
 	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
 	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
+else
+	# official release
+	SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
 fi
 
+DESCRIPTION="Python extension module generator for C and C++ libraries"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"
+LICENSE="|| ( GPL-2 GPL-3 sip )"
+
+# Sub-slot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/9"
+KEYWORDS=""
+IUSE="debug doc"
+
+DEPEND+=""
+RDEPEND=""
+
 src_prepare() {
+	# Sub-slot sanity check
+	local sub_slot=${SLOT#*/}
+	local sip_api_major_nr=$(sed -nre 's:^#define SIP_API_MAJOR_NR\s+([0-9]+):\1:p' siplib/sip.h.in)
+	if [[ ${sub_slot} != ${sip_api_major_nr} ]]; then
+		eerror
+		eerror "Ebuild sub-slot (${sub_slot}) does not match SIP_API_MAJOR_NR (${sip_api_major_nr})"
+		eerror "Please update SLOT variable as follows:"
+		eerror "    SLOT=\"${SLOT%%/*}/${sip_api_major_nr}\""
+		eerror
+		die "sub-slot sanity check failed"
+	fi
+
 	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
 	sed -i -e 's/-O2//g' specs/* || die