Don't call python_need_rebuild() (bug #300517).

Package-Manager: portage-15191-svn/cvs/Linux x86_64

5 files changed, 19 insertions, 31 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 3ded2190e6a2..148f3e58e0be 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sip
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.152 2009/12/20 10:53:01 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.153 2010/01/11 17:37:55 arfrever Exp $
+
+  11 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  sip-4.8.2.ebuild, sip-4.8.2-r1.ebuild, sip-4.9.3-r1.ebuild:
+  Don't call python_need_rebuild() (bug #300517).
 
 *sip-4.9.3-r1 (20 Dec 2009)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 033d12a60902..d76804e0ca96 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,16 +1,9 @@
 AUX sip-4.8.2-python-3.patch 346 RMD160 5951487d2adc720d50926a2298c6db100832d56e SHA1 baef1a400518c1f0126e8e3da7ded76fac65215e SHA256 9b7b933c64da0cfd5cb9505a56a3911018735a6b10121193d42c54a59cae11df
 AUX sip-4.9.3-darwin.patch 1447 RMD160 adc8a4c56dbed79dc172467de5df4205fa071bc6 SHA1 c1ad08eff9c537068bd5af4782a7e570cc6c2552 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2
-DIST sip-4.7.9.tar.gz 471372 RMD160 719f7c7ae211ceb2bb7609c5e70d864054ccd23d SHA1 a8eabe3890a1fc42ec77ac82fa41344ad23abe09 SHA256 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 DIST sip-4.8.2.tar.gz 615394 RMD160 5b390d09a5b1a5e5fbf29d245aee8543397a1f19 SHA1 0364027c34eb69ce8c51d316c68f10a02a42d036 SHA256 2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
-DIST sip-4.9.1.tar.gz 660693 RMD160 aaee9bd22d6bfba9c8eeb2649cf14c5eaa089c96 SHA1 097b85511ce082d526fce8279fe48fa991f7cdf6 SHA256 d2d2201bc61bca258c024f45400fc445cc230cbebfdb516e4ec041dcd248990e
-DIST sip-4.9.2.tar.gz 661018 RMD160 d93cca58473899475e03ebcbe2de97fabdc6c64b SHA1 5063c80d624098568cee218951a6f078cb02b0f7 SHA256 0b3d11383291448246ae96ea55e5b0f96374110d03fd1a8bb766211151681bce
 DIST sip-4.9.3.tar.gz 661144 RMD160 fae89ea6ca770e96953dfab4bb1fe29cdc28eb9c SHA1 789be43920e8072a4d4d99fd40e4332fd63f54c4 SHA256 de93d68f367955725817dd68e9d028fe62ea5fb2ae6755acf0a592ebd223fd83
-EBUILD sip-4.7.9.ebuild 1531 RMD160 e3bfbe9e14c20d5b469063beca78b27690672749 SHA1 4db43cead91e0479aaefd1f4e7d30119a8f8980a SHA256 1e489c58cd156a8ecbbc471e257ad523459d42667a69f72774c4bee1f4ede3e6
-EBUILD sip-4.8.2-r1.ebuild 1829 RMD160 91d84fb4b0ab0b657ce99efef083935dd0273310 SHA1 5ea41d737c934bfbfd2262a8e6f092455e668032 SHA256 c1c2626e969ba1d03a7499204f34db1968120c006d3d0ff0b509f2ffe4806c43
-EBUILD sip-4.8.2.ebuild 1522 RMD160 022696477be1ad50332dd72dae963aaefd9a32e8 SHA1 3777317429081fecec23cfa59e4aad256e0c39f1 SHA256 0a26460258340a17b565f7d920f6def1eb930e6290e36eb7f3cc5610f4b78e48
-EBUILD sip-4.9.1.ebuild 1846 RMD160 f057aaf976452ed76f86067b8c3f89df03ada437 SHA1 7a93fd48f5a2de8db5b1e53066e3e697d7e38d5b SHA256 dc01b59eada1011146887bcea6784dcd4fba93301b5c07691060ad0a6f69f345
-EBUILD sip-4.9.2.ebuild 1910 RMD160 ad1a0c10fc047e1c506aaae597a44d9791cca1c4 SHA1 3315030a4775fd28b74ddf150250ecab89319c38 SHA256 8e962b08d9b2ca40dfd0edfa3047dd79e51cf498f388c5b6c153e30e2c5eb220
-EBUILD sip-4.9.3-r1.ebuild 2058 RMD160 17615f91ae0959acfb362bcc8fc9c12c88678922 SHA1 b9025619eec433832baa7817fde459ca58fd0db4 SHA256 111b15b07148eff4a4b72f33f0694efdac94442c1c4e7d8ae84c6d33e04894b3
-EBUILD sip-4.9.3.ebuild 1910 RMD160 6a09d9c4180f2d262108de85b084fa606b93d7ee SHA1 104abe9c39278d0e2d75553d5068816df8b3a84a SHA256 86901e3b8b940a84a3bfd7b450415239dfb23618809040cae60819774775c0ef
-MISC ChangeLog 18535 RMD160 2ce1a01cb972f95cb063783a394f890a488e378c SHA1 2f35c92aa687e9ba71e25d59091287f052d3590f SHA256 08d51c6c37366b0d5f94964d939a4036d91d159dcc74d645e60b2ce05b9d74d2
+EBUILD sip-4.8.2-r1.ebuild 1809 RMD160 37c67562e8b0e010689f741c900e5c191bb91df0 SHA1 d19f1dc290f6c280816f9c35fc7da643c50d96ca SHA256 3edac1677fba517d5a617018dfabd521fcb39073e8cb43d8cc4364157132db52
+EBUILD sip-4.8.2.ebuild 1502 RMD160 8b1c2272c071bae38b6b5b3da63914f2b869dea9 SHA1 2fbf0ab2bf844f047791c3b74a8e0a01366609eb SHA256 b7dc515002a1090e30b12de53f11e97435b3a8022ce7417af46e5f188afaafe7
+EBUILD sip-4.9.3-r1.ebuild 2012 RMD160 08ee32f05d087e87ba65840c89def7d9a23c5634 SHA1 bc910783aea4ec677ffd1f558a37ff9b083d5db2 SHA256 3195e1c303a1d3bf90ae220ca192db2ac3c1c2ca8a20e78545a563301e851314
+MISC ChangeLog 18722 RMD160 9a11eee6ae071d38d530d5434b2deb4509bac913 SHA1 d63324622626643385c7ecef44e1739ee6930414 SHA256 dd13ec61c0fe089c5198ae7a9fffb00cb6b9bed78740c97c8f2fc694de19932c
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/dev-python/sip/sip-4.8.2-r1.ebuild b/dev-python/sip/sip-4.8.2-r1.ebuild
index b2707e7e5499..4370020197e6 100644
--- a/dev-python/sip/sip-4.8.2-r1.ebuild
+++ b/dev-python/sip/sip-4.8.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.8.2-r1.ebuild,v 1.3 2009/11/10 17:33:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.8.2-r1.ebuild,v 1.4 2010/01/11 17:37:55 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -52,8 +52,6 @@ src_compile() {
 }
 
 src_install() {
-	python_need_rebuild
-
 	python_execute_function -d -s
 
 	dodoc ChangeLog NEWS || die
diff --git a/dev-python/sip/sip-4.8.2.ebuild b/dev-python/sip/sip-4.8.2.ebuild
index c3d5f004e096..e7de31ae115d 100644
--- a/dev-python/sip/sip-4.8.2.ebuild
+++ b/dev-python/sip/sip-4.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.8.2.ebuild,v 1.12 2009/11/30 06:29:23 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.8.2.ebuild,v 1.13 2010/01/11 17:37:55 arfrever Exp $
 
 EAPI="2"
 NEED_PYTHON="2.3"
@@ -52,8 +52,6 @@ src_compile() {
 }
 
 src_install() {
-	python_need_rebuild
-
 	python_execute_function -d -s
 
 	dodoc ChangeLog NEWS || die
diff --git a/dev-python/sip/sip-4.9.3-r1.ebuild b/dev-python/sip/sip-4.9.3-r1.ebuild
index fdb9ae214910..036634034368 100644
--- a/dev-python/sip/sip-4.9.3-r1.ebuild
+++ b/dev-python/sip/sip-4.9.3-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.9.3-r1.ebuild,v 1.1 2009/12/20 10:53:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.9.3-r1.ebuild,v 1.2 2010/01/11 17:37:55 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEFINE_DEFAULT_FUNCTIONS="1"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit python toolchain-funcs eutils
+inherit eutils python toolchain-funcs
 
 MY_P=${P/_pre/-snapshot-}
 
@@ -47,14 +48,8 @@ src_configure() {
 	python_execute_function -s configuration
 }
 
-src_compile() {
-	python_execute_function -d -s
-}
-
 src_install() {
-	python_need_rebuild
-
-	python_execute_function -d -s
+	python_src_install
 
 	dodoc ChangeLog NEWS || die