Add new revision to ensure that dev-python/sip is installed by default for Python 2 and Python 3. Fix compatibility with Python 3.

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

4 files changed, 96 insertions, 2 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index c5969b8c6f99..f8e8aa333318 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,13 @@
 # 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.143 2009/09/27 18:21:03 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.144 2009/10/02 22:03:11 arfrever Exp $
+
+*sip-4.8.2-r1 (02 Oct 2009)
+
+  02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +sip-4.8.2-r1.ebuild, +files/sip-4.8.2-python-3.patch:
+  Add new revision to ensure that dev-python/sip is installed by default for
+  Python 2 and Python 3. Fix compatibility with Python 3.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> sip-4.8.2.ebuild:
   ppc stable #284707
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 91da9c21ee62..b6a8a76613db 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,8 +1,10 @@
+AUX sip-4.8.2-python-3.patch 346 RMD160 5951487d2adc720d50926a2298c6db100832d56e SHA1 baef1a400518c1f0126e8e3da7ded76fac65215e SHA256 9b7b933c64da0cfd5cb9505a56a3911018735a6b10121193d42c54a59cae11df
 DIST sip-4.7.9.tar.gz 471372 RMD160 719f7c7ae211ceb2bb7609c5e70d864054ccd23d SHA1 a8eabe3890a1fc42ec77ac82fa41344ad23abe09 SHA256 7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1
 DIST sip-4.8.1.tar.gz 614105 RMD160 8639f793bcfe7d07ebd5c27bfd0a55a004ea7245 SHA1 7e1b0899994fc7a20e26f4aa861979de3ea85f70 SHA256 92094172e5deb00b78e6906945f26fec15963b933315837f9b646bf5044e58e3
 DIST sip-4.8.2.tar.gz 615394 RMD160 5b390d09a5b1a5e5fbf29d245aee8543397a1f19 SHA1 0364027c34eb69ce8c51d316c68f10a02a42d036 SHA256 2ebb29deb2bbcdb99f47866e59deea7c6d98be0c835547b043eefd151516d9a9
 EBUILD sip-4.7.9.ebuild 1531 RMD160 e3bfbe9e14c20d5b469063beca78b27690672749 SHA1 4db43cead91e0479aaefd1f4e7d30119a8f8980a SHA256 1e489c58cd156a8ecbbc471e257ad523459d42667a69f72774c4bee1f4ede3e6
 EBUILD sip-4.8.1.ebuild 1465 RMD160 85ec91076ecf5582ddd8a5ac3d7171b5308490e6 SHA1 ce1bb135954d2a7c143d73bd5ff8dcae3f82946d SHA256 9748b41c95df4bdebff6f0379c56f7c70c77ad7ea7a7e8e3e5c3b9833dc56f39
+EBUILD sip-4.8.2-r1.ebuild 1736 RMD160 2433101906ac52089b61daf2a7963a7eed121462 SHA1 07edb010920d47887059e9c4e4921c94440733b1 SHA256 7598e05dd23e02626ea5b9d2480b02539165e0d3669cf856187eabad98524328
 EBUILD sip-4.8.2.ebuild 1575 RMD160 5959b36ac53e4a91d5efc77f8923684856c847a1 SHA1 0e3d513b1bd68c65a20bb92da7e3bb1c6cae90bf SHA256 cbe652ee3c31d8c16c1a8fc1fc7bc5caee0742169cae7b68b0e6498746d24f4f
-MISC ChangeLog 17215 RMD160 052d6e7ea501ba970b47737929f566d4c4f9a592 SHA1 2ceba699b268f9c850f65100421fc9c994fd3d8d SHA256 6bb1d8e9df404f9a68ede7deedd13378e6d1fea9cb570666fb321fb9a6fc45df
+MISC ChangeLog 17512 RMD160 f217c38c1b3be1023eb538c3eeadb47421746085 SHA1 1851ab0b0a780b99bf6cf549df00942c65641cf8 SHA256 ebcf24081d295a14729ccf5687188c2d691708edb072f09a15888a1df6124d85
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/dev-python/sip/files/sip-4.8.2-python-3.patch b/dev-python/sip/files/sip-4.8.2-python-3.patch
new file mode 100644
index 000000000000..344026641f69
--- /dev/null
+++ b/dev-python/sip/files/sip-4.8.2-python-3.patch
@@ -0,0 +1,11 @@
+--- sipdistutils.py
++++ sipdistutils.py
+@@ -29,7 +29,7 @@
+                     out.append(os.path.join(self.build_temp, o))
+                 return out
+ 
+-        raise RuntimeError, "cannot parse SIP-generated '%s'" % sbf
++        raise RuntimeError("cannot parse SIP-generated '%s'" % sbf)
+ 
+     def _find_sip(self):
+         import sipconfig
diff --git a/dev-python/sip/sip-4.8.2-r1.ebuild b/dev-python/sip/sip-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..e2f4dd1181ac
--- /dev/null
+++ b/dev-python/sip/sip-4.8.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 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.1 2009/10/02 22:03:11 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils python toolchain-funcs
+
+MY_P=${P/_pre/-snapshot-}
+
+DESCRIPTION="A tool for generating bindings for C++ classes so that they can be used by Python"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz"
+
+LICENSE="sip"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc"
+
+S="${WORKDIR}/${MY_P}"
+
+DEPEND=""
+# Ensure that dev-python/sip is installed by default for Python 2 and Python 3.
+RDEPEND="=dev-lang/python-2*
+		=dev-lang/python-3*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-python-3.patch"
+	python_copy_sources
+}
+
+src_configure() {
+	configuration() {
+		local myconf="$(PYTHON) configure.py
+				--bindir=/usr/bin
+				--destdir=$(python_get_sitedir)
+				--incdir=$(python_get_includedir)
+				--sipdir=/usr/share/sip
+				$(use debug && echo '--debug')
+				CC=$(tc-getCC) CXX=$(tc-getCXX)
+				LINK=$(tc-getCXX) LINK_SHLIB=$(tc-getCXX)
+				CFLAGS='${CFLAGS}' CXXFLAGS='${CXXFLAGS}'
+				LFLAGS='${LDFLAGS}'
+				STRIP=true"
+		echo ${myconf}
+		eval ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_install() {
+	python_need_rebuild
+
+	python_execute_function -d -s
+
+	dodoc ChangeLog NEWS || die
+
+	if use doc; then
+		dohtml -r doc/html/* || die
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize sipconfig.py sipdistutils.py
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}