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

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

commit:     b2e047041f07511e20045c939be391dccd4cad9a
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Fri Oct 12 17:40:28 2012 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Oct 12 17:40:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b2e04704

[dev-python/sip] Sync with portage wrt EAPI 5 subslot.

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

---
 dev-python/sip/sip-4.14.1_pre20121010.ebuild |   12 +++++-------
 dev-python/sip/sip-4.9999.ebuild             |   14 ++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/dev-python/sip/sip-4.14.1_pre20121010.ebuild b/dev-python/sip/sip-4.14.1_pre20121010.ebuild
index 702ca29..d0a9e2d 100644
--- a/dev-python/sip/sip-4.14.1_pre20121010.ebuild
+++ b/dev-python/sip/sip-4.14.1_pre20121010.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 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"
@@ -18,7 +18,9 @@ HG_REVISION=fdc332e116b2
 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 )"
-SLOT="0"
+
+# Subslot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+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"
 
@@ -84,10 +86,6 @@ src_install() {
 
 pkg_postinst() {
 	python_mod_optimize sipconfig.py sipdistutils.py
-
-	ewarn "When updating dev-python/sip, you usually need to rebuild packages that depend on it,"
-	ewarn "such as PyQt4, qscintilla-python and pykde4. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/sip\`."
 }
 
 pkg_postrm() {

diff --git a/dev-python/sip/sip-4.9999.ebuild b/dev-python/sip/sip-4.9999.ebuild
index 29bd1e2..2d2134a 100644
--- a/dev-python/sip/sip-4.9999.ebuild
+++ b/dev-python/sip/sip-4.9999.ebuild
@@ -2,11 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
 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"
@@ -16,7 +16,9 @@ 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 )"
-SLOT="0"
+
+# Subslot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+SLOT="0/9"
 KEYWORDS=""
 IUSE="debug doc"
 
@@ -32,7 +34,7 @@ if [[ ${PV} == *9999* ]]; then
 elif [[ ${PV} == *_pre* ]]; then
 	# development snapshot
 	MY_P=${PN}-${PV%_pre*}-snapshot-${HG_REVISION}
-	SRC_URI="http://www.gentoo-el.org/~hwoarang/distfiles/${MY_P}.tar.gz"
+	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -82,10 +84,6 @@ src_install() {
 
 pkg_postinst() {
 	python_mod_optimize sipconfig.py sipdistutils.py
-
-	ewarn "When updating dev-python/sip, you usually need to rebuild packages that depend on it,"
-	ewarn "such as PyQt4, qscintilla-python and pykde4. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/sip\`."
 }
 
 pkg_postrm() {