Update from qt overlay.

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

3 files changed, 63 insertions, 19 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index ebb4f6393f15..b2c15a98f33e 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.226 2012/10/12 01:00:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.227 2012/10/14 21:43:25 pesa Exp $
+
+  14 Oct 2012; Davide Pesavento <pesa@gentoo.org> sip-4.14.ebuild:
+  Update from qt overlay.
 
   12 Oct 2012; Mike Gilbert <floppym@gentoo.org> sip-4.14.ebuild:
   Set subslot. Backported from Progress Overlay. Patch by Arfrever.
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 5a659e16b93f..cc1955bec12d 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -11,13 +11,23 @@ DIST sip-4.14.tar.gz 742647 SHA256 52175dfd8d8a82b861bf698843e344a69c313f1fe80ba
 EBUILD sip-4.12.3-r2.ebuild 2237 SHA256 860611d9af5d7655735ff7c8bb2bb87e43337db520768a5aacaf0a616699f6b4 SHA512 6c05342b1d500d480c862d978784ab283dfbda833561563163bc15b500de7ded789594b217f8e4d3f22faeca09e7aae9b757c27307b93e817a4d31cb3e74617f WHIRLPOOL f9f39f23b59a2f771a5e05dbe91560a159c5b4cdce3d21f7a445d3f3bd4319e5cbe53c5ab096b41d6870e1c4f12c71d4b74eed3f6b0257971c8b51ce0d9c27a6
 EBUILD sip-4.13.2-r1.ebuild 2029 SHA256 c73207f301b9c7bf5abbe3c07881336a2c7a124489547f7b3b825ffbb0fabbf1 SHA512 7116bc609f823fe906a15c2a07b4ae221880bb4a4df75b4261e4d395b5e0811559f57d872ef0d5e9f97d93d00149c970593a454fbcd9ab7a3121c220cfda8893 WHIRLPOOL a7fe08569ed696b6c0ebcfda6c78b5b2d1f0a8d21563774902e1d3da3805738edbc8b7ca6a9fa6b411466131c2a61516e010be9cb6f87bc111e782cd9a9aa504
 EBUILD sip-4.13.3.ebuild 2024 SHA256 285e10638ad496fc6909d88f4e43046c1a4c963b45fbdb627dc58031078c03b7 SHA512 ce99dc1cb21f2092358eca75135d506f4c4d43512d05953a76b4cfb1353a901e21d9c2e250678f26050d58e78c29f116c7f8dfeeb0b6ac7bf4dfcad3d709c20f WHIRLPOOL eb11cdbc9b1ea96cbd3f3cbff4e4bf4f87662a33b9066c48580f0e8ce94593addfd60f913d93f3a9b3ff72b54e1746369a494d9d3521ed0965a9fc47c1a5564d
-EBUILD sip-4.14.ebuild 2048 SHA256 72e8de2db7a6cb66b00404f706a95221b0e501e61143ee0114388ba9070ac0de SHA512 bdacfc64e1fe12920aa648be1c1e552bbc4253be18bcd1eb8393ccc09d43bffaa689e0d19bc981f1f42f505dd2135913366b643cf3f61536c0dcc932fc833a86 WHIRLPOOL 6d8c9b5ad2340d1ba149ba13f4efcfd7f27309b3194d2ec40580adc0cc1cb0631623a95282518a44195ec1f1ea0e98437d2977d8be83ec1365e65c9b97caf9e3
-MISC ChangeLog 27797 SHA256 e4b887732fad83813936225a97f6d26bffd73c333e7aeadb9ea1a58dbaff8ef0 SHA512 a4dcbbd715ee3b3ef5e537899fa92f15fa2cccf69860180cb9ab4ab915cd4f3e941087c199c03d60b4b1c2ddbca92a94e7a2339f8b392bf44e90da0e4d774aad WHIRLPOOL a1f6bdbfe397e4b8cb93b8936a5caa4d6a6eff54a86776ad842b5a07a01a32c8db5834d19785086e3248e8f478f1b7522e849cd9ec24d31bd19964826215c55f
+EBUILD sip-4.14.ebuild 2855 SHA256 58e0e73f2cf7c676311896c2bff221b3ad3e91778f408aa6ed176b90680ef63b SHA512 3f9fe4964dff9386b9ec84046d2483426e670b873e05bc4e03df77eac97402a983e856c141e942441642e2d637a2e370ab31893f217c2ff03c49e9ece57db231 WHIRLPOOL 9d7f9a93df670db9b7a3eb109860c077ae5d37b17b3d09e6c9e62c0454858f8950fa431644fc1a38a267119d998a453c72243207996ac726d835261b2d586510
+MISC ChangeLog 27888 SHA256 b22175640de22fd817d4a30339d5b6a9c1a8a26ca9dc59472fa394a697267089 SHA512 2c43692801273d077d997e4254244901c7615b49c835a654487da1194e5fca0c312e1001d7f4496d29d430708b0701607d860e011ec52b6a2b8f8be410e9d818 WHIRLPOOL e4a0eb22ac6e24cc82ef0c19b66a7d94e7bbfbb48a43185ddd773a488532f78212c7fcbd11b8a5a60bf937736a17d8948843f4ac6260bdbd9db5af1088238650
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB3a7QACgkQC77qH+pIQ6TcQgD+NNcflP70x6Yrw6YNsNqKZkz4
-RWJKCxPQuFaJVWqVpUoA/iMCdNC36wo1XImizXAnV9JRDGTeFAFZ1gDsFf1z8dak
-=FAQY
+iQIcBAEBCAAGBQJQezIAAAoJENXLsxwXqFxyTGwQAK6Ty1SReSAKjjP6Wm2ltG68
+3CE9/iQEyJO/ajHa2bwHe2LgFzGGVkaMsganTbBJcM4arpNngzz3TO7usyPjsIW1
+r9Y/Mfv5AgGg/sVS3r7uVcJ37w3aluXaFltsGiiw1EQk4lsGiuxSV0FAtnrMW6ge
+PWDb6vpRwwr30a+3jRp3SSPQmPAORK0FSwD6bWZMgru5+kE/YfMBbigDBUYipX3w
+QxUSsk10MyP4Q+MWn2Yxfj1QQuxWwdrP7zC30gR1Lv+hJW1ARepi0+OzI9yeCTMf
+YJ1o5hkclwrshrUR+FG979dshjJ8qaCExuNJ11l/bjyDX8zXd25i6xYYr/ukC7JW
+wum7pW2Z71VTXTKRp5QWDVMpXn6D/lHgiQq84w2JVbzVmCmqzs4B1Ip0xSVXTlcr
+JB1VnVERZjEdG9yPaS906eVmiVQaNKpahIr1F+xS1ooyzRaCxVn0CmW5JqjTqYcX
+CfZG6qxNtcg4KpKIHlAJBaGIod/arug/sDspUsZ6TwLMjWWg73BYDtFyJRPDFjRb
+HDL54wj3Yo/ATlh31q6RO8Rd8OWb/ehdtiwo6LirUfOh0sZHGKWuta/UbOaNMnUW
+nvtRwNVGD3Uc21cpm2+2ghBD54f0fvX7xaN6yGnMCDVWlkTiGep+v1x1ZC3e9EL5
+j68HAE60oQ6/C7B6kuLI
+=I7Yc
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/sip-4.14.ebuild b/dev-python/sip/sip-4.14.ebuild
index 58fa65424fa2..507261e9c6c2 100644
--- a/dev-python/sip/sip-4.14.ebuild
+++ b/dev-python/sip/sip-4.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.ebuild,v 1.2 2012/10/12 01:00:35 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.14.ebuild,v 1.3 2012/10/14 21:43:25 pesa Exp $
 
 EAPI="5"
 PYTHON_DEPEND="*"
@@ -12,18 +12,56 @@ inherit eutils python toolchain-funcs
 
 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"
-SRC_URI="mirror://sourceforge/pyqt/${P}.tar.gz"
-
 LICENSE="|| ( GPL-2 GPL-3 sip )"
-# Subslot based on SIP_API_MAJOR_NR from siplib/sip.h.in
+
+if [[ ${PV} == *9999* ]]; then
+	# live version from mercurial repo
+	EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
+	inherit mercurial
+elif [[ ${PV} == *_pre* ]]; then
+	# development snapshot
+	HG_REVISION=
+	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
+
+# Sub-slot 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"
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="${DEPEND}"
+[[ ${PV} == *9999* ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-python/sphinx )
+"
 
 src_prepare() {
+	if [[ ${PV} == *9999* ]]; then
+		$(PYTHON -2) build.py prepare || die
+		if use doc; then
+			$(PYTHON -2) build.py doc || die
+		fi
+	fi
+
+	# 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
 
@@ -57,18 +95,11 @@ src_install() {
 	python_src_install
 
 	dodoc NEWS
-
-	if use doc; then
-		dohtml -r doc/html/
-	fi
+	use doc && dohtml -r doc/html/*
 }
 
 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() {