6 files changed, 37 insertions, 244 deletions
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 4cba2dc2fd09..3731ab7e5394 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,10 @@
 # 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.207 2012/02/20 10:13:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.208 2012/02/23 18:04:39 pesa Exp $
+
+  23 Feb 2012; Davide Pesavento <pesa@gentoo.org> -sip-4.12.4.ebuild,
+  -sip-4.13.1.ebuild, -sip-4.13.ebuild, metadata.xml:
+  Add <upstream> tag to metadata. Remove old ebuilds.
 
   20 Feb 2012; Patrick Lauer <patrick@gentoo.org> sip-4.11.2.ebuild,
   sip-4.12.3-r2.ebuild, sip-4.12.4.ebuild, sip-4.13.1.ebuild, sip-4.13.2.ebuild,
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index fba3bdb265dc..c47c16d059ff 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,17 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX sip-4.12.3-python-3.2.patch 2551 RMD160 d8cfbbb176954fa191eaabbc4aa17082b9dad11e SHA1 193d0139f873d640abda03a8aaea4cac52c55f98 SHA256 00017ccba0e3a95fd1fdc12603059c12a11dcc6302a50d04fe6f8fcd26ef9cbb
 AUX sip-4.12.3-sip_api_is_py_method.patch 758 RMD160 9ace74ec8bf8007b9150b616b34026ba43684f79 SHA1 d47330430ae61a48a93ed3f05bbd75a3145073dc SHA256 0c84e0451ee05ea31f97a4e75bd391a3deeda1ea1b247fc7f21784c16d2bf7de
 AUX sip-4.9.3-darwin.patch 1447 RMD160 adc8a4c56dbed79dc172467de5df4205fa071bc6 SHA1 c1ad08eff9c537068bd5af4782a7e570cc6c2552 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2
 DIST sip-4.11.2.tar.gz 665000 RMD160 755e4610f9e3359df0a7a9f009ad16a5592341f0 SHA1 586a86a55553617e39b1df8376166d03d697184c SHA256 ced00216488aa4dd0728d706a551c36c694a26c95e85103ccc21913a8090373c
 DIST sip-4.12.3.tar.gz 725415 RMD160 bc9e9be7036139f212dec5b307229a529267bf66 SHA1 99af6d4fb1ae5e29687bb0ab47dfbb23f36a79b7 SHA256 b452c822a4c05c5c69257143847503cfdca5a943ba5c23fc0714a2e240c0b77e
-DIST sip-4.12.4.tar.gz 753270 RMD160 174150da3513e2e240bd443551af0dfc765dac27 SHA1 3f80e5784233820fe42822ab9eb5ad743b4cbf81 SHA256 768c1f0ae7ccdc2a75cb4ca6dfd22a46832e06b3c96b1f0e8d3e955cbec047b3
-DIST sip-4.13.1.tar.gz 733021 RMD160 39b0dd321ea8f39af656c3f764440cbd5727467d SHA1 952dc53826dbeade2f99c709ea9e6f108c327ba0 SHA256 ee8b2465dbe756608326cc9a2cbcd8b98773743bdc59984ed082bddf19a0b226
 DIST sip-4.13.2.tar.gz 733120 RMD160 24a8e7c4bd36382594ea3f11317eb0f10e4e56ea SHA1 1c5df9182e8046f1c0d01603a2474fa2418bcea0 SHA256 4bc3f5353c75918e1c8499ec1474e7b3392c30513ea6d7a6334f88b88271eebf
-DIST sip-4.13.tar.gz 714023 RMD160 b7dae0b62b5b5eea433ebea3b13d31cd364c0715 SHA1 b20b0cc616078316507c2be23a0b770d03e1495e SHA256 b5a0231d06fe6e6a234b387ef0c6f526b40f22836937872f25211f6614ccc29f
 EBUILD sip-4.11.2.ebuild 2134 RMD160 bcfd2823b35fe05e1b281fd5d3b2aea6420e7d9e SHA1 8fed7c03669305d7a9287cfbddbe2787b32e5540 SHA256 fa37ff494a98ed6bd170727ae394c82987acaba71ac1539be3d073a27b36bb42
 EBUILD sip-4.12.3-r2.ebuild 2237 RMD160 911c002df19a3af59bf4518c3f674fe492a16d53 SHA1 895a4c3660d2812da0c77e39d0172e5eddf479af SHA256 87cce6d1d31dfbd2497f92e1981ea6f21ecab66a49d139f05ba69e3030dcab42
-EBUILD sip-4.12.4.ebuild 2141 RMD160 2405ea8909e990a1f2abf4ff9ea5206871bcdc12 SHA1 7428a7eca2f648aa8dc6c4bc7e9174abd758617b SHA256 22d273bc2c84810e22bd9c75ab09906cb2d108cdeab068942daf9dd18a50f46a
-EBUILD sip-4.13.1.ebuild 2175 RMD160 b115c6c41fdc62a76789411c26a58418e9dae877 SHA1 318fc8e6c0cdb0b0804256a9dc7b64e800989bb0 SHA256 2c0eb7dc0b9877ca9368cfc7b8f32f8ab4334b6311a01754a9a0310dc3e18364
 EBUILD sip-4.13.2.ebuild 2175 RMD160 c01db3678beb24d052fb16d4ca83ac6a7ec5b588 SHA1 99e980db8bc6f64a9c3607eac11fd88e93f4eea4 SHA256 19ab4a4cd64bd3e2619080470809878b3f97d8157c053f31ab508dc05693b6dc
-EBUILD sip-4.13.ebuild 2173 RMD160 6e529f4841f29822c6159ff59bf82d4f47b3b353 SHA1 844395d1bb5750a8bca4d31df79e4e0f917b4d20 SHA256 a4e6cdba40f80f8053df011179a4ed3c91001d43a795700e42590898f86ca800
-MISC ChangeLog 25578 RMD160 edc246b09cfa26f0711d6c350b90fdb5791a1519 SHA1 8e3f51c664925bf109a35ab710f56e32bf083661 SHA256 b60abd5435b7b6cc993ff72e5db075441878300888645ae55295186c11625c25
-MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
+MISC ChangeLog 25754 RMD160 767f2b7048f1ce040bcd8e3b3003c940963b9f1b SHA1 afba86cff70735046852c689feb4bfb5f166dcc9 SHA256 5cc27aed3383b61d9aa11f219c0b494353d501552f85b5804f8d9de7367504a0
+MISC metadata.xml 422 RMD160 a63c3ea27347b7b832bc993bc7fa09040652914d SHA1 46a755b4a4943ce38b4352151c7d637f2ef1c4e4 SHA256 0b764c87331ecf4d27df1c5061739794f33164047f23221d746cc70ac777d248
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPRn+8AAoJENXLsxwXqFxyk7IP/0JTPyjx2UD5hPLG/3jdDbO3
+Hya08ST6DZcDsKkdpQct37HETUip5Ar0R3wTJV8FZWyAyiAxhMSqHbGm2fZiYlA3
+r0a+EvBz2EyBmImoHlHBFvDXKmgazdxku1m7eNQIaCM8Oz23z0UOIqh9gwJctgcq
+ewCfIaouKrpKsxstL8bEnQz6lLoqcjRIzkeZwR3lPKjZZDm5eYssoHVFTTO6z/rQ
+DEaRLu7dYqGpFaNw0a4y9dfcNGzgsyK9Oq0ehsP437O0mRhy0DdzKwMXLqmJ/A0S
+WRwRhM6NtXAgJ2s58iz5wkCHV25LDwQNpxRJO8Px1qN93iVV6I9baeaqVUH+CdU3
+kjHbHk1x5d5jeSFSN6HQKxJt9OPNpx97qTXt6sqLW1xEaC1yhN8g+5EHMvsO++TB
+HGLn66LI3lFpmrWrygIAH4eF6O930ENsxRLaROJrvIKPwmb5O85pLwlsTufoLuzp
+nb/71L2h/EyC8TKDa2yL1ZFa66MABySfcrSaMbXc7T4ut/EcGS6TbAKiC413Wko0
+42QjcIWqL0VyYhH5Cq8GuhbX1YiOh4mOhGvwjEOp/JqUB71qeDiafFt34+kuypZR
+PvD5r/w75mQSvTyXFwjlZuRQHJLK+SKwfSXsrwHwErNHGsJh2FRmaVW+aTySpDEE
+xMaJhBdEEq+6DQoWP8I6
+=cRlV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index a789e7bbe9ee..be46e1fdb9e6 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
-<herd>qt</herd>
+	<herd>python</herd>
+	<herd>qt</herd>
+	<upstream>
+		<maintainer status="active">
+			<email>phil@riverbankcomputing.com</email>
+			<name>Phil Thompson</name>
+		</maintainer>
+		<bugs-to>mailto:pyqt@riverbankcomputing.com</bugs-to>
+		<remote-id type="pypi">SIP</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-4.12.4.ebuild b/dev-python/sip/sip-4.12.4.ebuild
deleted file mode 100644
index 4d99ab47e515..000000000000
--- a/dev-python/sip/sip-4.12.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.12.4.ebuild,v 1.2 2012/02/20 10:13:40 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit eutils python toolchain-funcs
-
-MY_P="${P/_pre/-snapshot-}"
-
-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="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 sip )"
-SLOT="0"
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.9.3-darwin.patch"
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--incdir="${EPREFIX}$(python_get_includedir)"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/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=":")
-		echo "${myconf[@]}"
-		"${myconf[@]}"
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	python_src_install
-
-	dodoc NEWS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize sipconfig.py sipdistutils.py
-
-	ewarn "When updating dev-python/sip, you usually need to rebuild packages, which depend on dev-python/sip,"
-	ewarn "such as dev-python/PyQt4 and dev-python/qscintilla-python. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/sip dev-python/PyQt4\`."
-}
-
-pkg_postrm() {
-	python_mod_cleanup sipconfig.py sipdistutils.py
-}
diff --git a/dev-python/sip/sip-4.13.1.ebuild b/dev-python/sip/sip-4.13.1.ebuild
deleted file mode 100644
index 16b6cd59dd06..000000000000
--- a/dev-python/sip/sip-4.13.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.13.1.ebuild,v 1.2 2012/02/20 10:13:40 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit eutils python toolchain-funcs
-
-MY_P="${P/_pre/-snapshot-}"
-
-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="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 sip )"
-SLOT="0"
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.9.3-darwin.patch"
-	sed -i 's/-O2//g' specs/* || die
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--incdir="${EPREFIX}$(python_get_includedir)"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/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=":")
-		echo "${myconf[@]}"
-		"${myconf[@]}"
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	python_src_install
-
-	dodoc NEWS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize sipconfig.py sipdistutils.py
-
-	ewarn "When updating dev-python/sip, you usually need to rebuild packages, which depend on dev-python/sip,"
-	ewarn "such as dev-python/PyQt4 and dev-python/qscintilla-python. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/sip dev-python/PyQt4\`."
-}
-
-pkg_postrm() {
-	python_mod_cleanup sipconfig.py sipdistutils.py
-}
diff --git a/dev-python/sip/sip-4.13.ebuild b/dev-python/sip/sip-4.13.ebuild
deleted file mode 100644
index c93cfe5d82be..000000000000
--- a/dev-python/sip/sip-4.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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.13.ebuild,v 1.3 2012/02/20 10:13:40 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="*"
-PYTHON_EXPORT_PHASE_FUNCTIONS="1"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit eutils python toolchain-funcs
-
-MY_P="${P/_pre/-snapshot-}"
-
-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="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 sip )"
-SLOT="0"
-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"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.9.3-darwin.patch"
-	sed -i 's/-O2//g' specs/* || die
-	python_copy_sources
-}
-
-src_configure() {
-	configuration() {
-		local myconf=("$(PYTHON)"
-			configure.py
-			--bindir="${EPREFIX}/usr/bin"
-			--incdir="${EPREFIX}$(python_get_includedir)"
-			--destdir="${EPREFIX}$(python_get_sitedir)"
-			--sipdir="${EPREFIX}/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=":")
-		echo "${myconf[@]}"
-		"${myconf[@]}"
-	}
-	python_execute_function -s configuration
-}
-
-src_install() {
-	python_src_install
-
-	dodoc NEWS || die "dodoc failed"
-
-	if use doc; then
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
-
-pkg_postinst() {
-	python_mod_optimize sipconfig.py sipdistutils.py
-
-	ewarn "When updating dev-python/sip, you usually need to rebuild packages, which depend on dev-python/sip,"
-	ewarn "such as dev-python/PyQt4 and dev-python/qscintilla-python. If you have app-portage/gentoolkit"
-	ewarn "installed, you can find these packages with \`equery d dev-python/sip dev-python/PyQt4\`."
-}
-
-pkg_postrm() {
-	python_mod_cleanup sipconfig.py sipdistutils.py
-}