Backport some changes to older slot. Delete older ebuilds.

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

7 files changed, 34 insertions, 139 deletions

diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index cb2f9bf7b6d9..2502d81b0a91 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pycrypto-2.0.1-2.6_hashlib.patch 2814 RMD160 e7279be6ed13476eb3a124c765557ccae11c54b7 SHA1 b1f1307d4b428eb8da0283cc8c87096cef08e746 SHA256 cfbebb94fcc932e9dd6246f3285f6f6654f60a0b88594fd9c7c598a62c02946e
 AUX pycrypto-2.0.1-CVE-2009-0544.patch 571 RMD160 c5d62d442b24416a9bee9d9eb11820446fc3e792 SHA1 949fe75044260673b481bc9f8ac099599b024ece SHA256 0e3586c984c3e36969a02cc47ed41dc26a734f8814ceb1d60fed6922647793c2
 AUX pycrypto-2.0.1-bindist.patch 1561 RMD160 b0064385698a1cb9ed741b2e68ed682b4d395a61 SHA1 e3169e49281a1fca0ef5154bdb3b48ccc50e809d SHA256 c95a6b3628d5472f749004c5d9a95a812d1b9c1fc7bfa5a538fa64210a021d9a
@@ -13,13 +10,6 @@ DIST pycrypto-2.0.1.tar.gz 154292 RMD160 5ce938a24f77f414e42680c17ef9b6dc8de94a2
 EBUILD pycrypto-2.0.1-r5.ebuild 1501 RMD160 23fcf75215bacac43de0e254d216768a14aca7aa SHA1 882cfa951483f6c304984c75f541ef8488906fda SHA256 e1cfce80ae28225522ba830ed9062123a71fe8279f31ce9096d994f34a55d3b8
 EBUILD pycrypto-2.0.1-r6.ebuild 1532 RMD160 b96b870eceb138401f61bba45ef8021366da2e1c SHA1 d63f0abf22a9d3f59332e73a33fa3e1b03e7e5dc SHA256 d9fe3eac30683401eae64384b52653926c57c57945ad12ca59aba516e8fc5187
 EBUILD pycrypto-2.0.1-r7.ebuild 1628 RMD160 003756f506596bedd5cc76142b84e26c38221e34 SHA1 52692ec4cd6e0c8b50fd48ee50e40ce31ae4eac7 SHA256 4e9a1a631ef9e9c8c7f4e5ebcc0ad0e6ec443abcc2ac8b468dc71d4ccd037863
-EBUILD pycrypto-2.0.1-r8.ebuild 1698 RMD160 7d81a121c7726dc9ad1295356502e35b5fb44d7d SHA1 bb2290994beb5a12707a6c2f8d21bd413bfc143c SHA256 9fe0fceb141849a0e3762803b73e07db97a5add4335e7e4525e7fa56a0560b30
-MISC ChangeLog 9783 RMD160 95eb70310e1b0c8a59fadf4986674ab126a5054b SHA1 dc2f6f56aa45ff461e8d18c4f52d176a74fe4dfd SHA256 dec099eb293e57be2a2f721be885e78ce7045de0648e4c3031cfbd92277b9c34
+EBUILD pycrypto-2.0.1-r8.ebuild 1866 RMD160 94141792a5ef63c0db61c905078cb0b39b07999e SHA1 7a569c773c69d569bb7cb032bd48a527192c3736 SHA256 feb7dcbc8047c52cdcbd107cc280326a0df1d51ed862c24ee6a8047e966113d2
+MISC ChangeLog 9915 RMD160 a4ba7cd4363ce4be199c2ab5d56fa580ef434ec6 SHA1 b1167ff9fbe88eb69278ba171a2155a5150c43f1 SHA256 8a6ea8fb8aed5ae2ac85e1b424ec4f6179289f6983920e2aa5a47b6156bb7623
 MISC metadata.xml 1774 RMD160 b0aeda4d69c1dc4ec798f05f617a2d0ddf8c29ab SHA1 00da4a85672688868003fecd52b3a9497a3c433c SHA256 b4fe5bcbed977469f626a33c8b9c16d860e53e16b02f78ce931f6afa67c98ac2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEUEARECAAYFAkqkML4ACgkQixe2jn+ufTi19QCYlGejuAQ8pljQ9+WXW2iwFo1e
-swCfYYvLSlMoywLb+8DHjg7nL8V/SWU=
-=9GM6
------END PGP SIGNATURE-----
diff --git a/dev-python/sancho/ChangeLog b/dev-python/sancho/ChangeLog
index ac85ac91e27a..732cfccf5a65 100644
--- a/dev-python/sancho/ChangeLog
+++ b/dev-python/sancho/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/sancho
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/ChangeLog,v 1.34 2009/09/08 03:42:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/ChangeLog,v 1.35 2009/10/02 01:03:39 arfrever Exp $
+
+  02 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -sancho-0.11.ebuild, sancho-0.11-r1.ebuild, -sancho-2.1.ebuild,
+  -sancho-2.1-r1.ebuild:
+  Backport some changes to older slot. Delete older ebuilds.
 
 *sancho-2.4 (08 Sep 2009)
 
diff --git a/dev-python/sancho/Manifest b/dev-python/sancho/Manifest
index dba974f0a568..d0fd2b60f032 100644
--- a/dev-python/sancho/Manifest
+++ b/dev-python/sancho/Manifest
@@ -1,11 +1,7 @@
 AUX sancho-0.11-rename-package.patch 1815 RMD160 78528d75e2ba9f87250e14473d9840ddc866208d SHA1 71ff4180e1facd9ec70171a12935a6756d69af6a SHA256 cbe7b5fa77d9a79130a140ed25bf7ab99b911b3d64e1598ecc43ffc44d6d3e17
 DIST Sancho-0.11.tar.gz 21577 RMD160 870b8c5a81b1750bd7241c8b410d96d85849a80a SHA1 066ebc6521743d11de0a5e44e60c72a9c1019b4e SHA256 2e5186565c77341b3866eeeff4849cf4bc0a2eb3c348c2c452adc215a4044942
-DIST Sancho-2.1.tar.gz 8372 RMD160 52096c125d65df22ef20665b4bf40d1868809746 SHA1 a19699a5646d022adae21ebda6cd7967adddc91d SHA256 c12596b8bff18644439c3c25a7f61c7fe6423c17f8133f0fb4e8d525fceb7e4c
 DIST Sancho-2.4.tar.gz 7962 RMD160 bc83e594ed810b62b9a708c42b6c3eec9df34125 SHA1 068d1cd08960f6e92937e350dfa058ad7e6a207b SHA256 52fdaa6e13e242d0b3be09bac733595a2d6602e0a975d00c72233505a14f35db
-EBUILD sancho-0.11-r1.ebuild 1558 RMD160 8c8faa3c4bdfff3ac59e7a81c22b39530968e3b0 SHA1 bc0dd3c2df1dbbb8969c5b515dc036e36f12d939 SHA256 ef4a130a30f45a280ddbe2fdd56b15380c450bae95ed93fa413274c513292df5
-EBUILD sancho-0.11.ebuild 659 RMD160 263785f23a9e8a5ef7123aa22efc502883454ab4 SHA1 6aa3f16c0830bc0992ee61ce1e14ee7577f71703 SHA256 9ba89c0fe877bf1eadb584223c41cabbe3bad829e8b8b95a06b076061d880a8d
-EBUILD sancho-2.1-r1.ebuild 1302 RMD160 6c75e9f9e7af39746d3a62b21e5addfce9d62e8e SHA1 335f88af52fd144dc6936bd05988ed0fdf30c666 SHA256 9abae82b5e06c0f33e7a2aa58d9760c295e60d60cd7d8e6b571d4a3994b53aad
-EBUILD sancho-2.1.ebuild 618 RMD160 fe6cb738cf44e530acbfaf2b5ad79b55cf68b9c8 SHA1 6f63d42e369705c6138869ea687ebe6275ffeb20 SHA256 7a27b6ee188e4313370e2788221275fcc94a2a51d9ef738db1d702a14c56498f
+EBUILD sancho-0.11-r1.ebuild 1489 RMD160 db27f55aef3de175fcdb041cc841c783efe86a4f SHA1 8f4348311232769b88ee6460a717f6d7b50b52a1 SHA256 786ceef96798b58c7bad198be6f445c4f6bfc76f0fea326e84b9fe14de0ae58c
 EBUILD sancho-2.4.ebuild 1296 RMD160 a49e767d7d13fdf5f1ef1843aa92e1abcd536c47 SHA1 a8ea2b67fe6735d5de41d859da7491435b500156 SHA256 8240f9ea079168a46f62ab076f3f5e3edf01310f284444741e9d1e4ab82e199c
-MISC ChangeLog 4118 RMD160 3064710d6b8b3f82a77e8bb24dc75b2e449de8ef SHA1 0bbae6a1d8e5fa2073d5998265a2fe2884a2e328 SHA256 ea487b9f1ffc696281beea9bc5a39bba98dd37c5ffdbcd67d4a003b3a40e2b23
+MISC ChangeLog 4344 RMD160 be1c3cc3d6ff223fb98c05de50a7c02617b7f791 SHA1 8c856130afd8cbbdd91072e94aed1b308e0ebae9 SHA256 0838719e6132480cb8f1f671ece418add5dc1b5ead594b9d70ef4ed97f47e24d
 MISC metadata.xml 221 RMD160 b87aa62e811f10d90f8ffc0e259c3dff0dca6b8f SHA1 88ff089a43abdbd83cdb281e573e2febdac2ca87 SHA256 2b6e0c5b8ee7907656acfcf1e8b19cd46195d7cd80659350bba96c8f1c9c28aa
diff --git a/dev-python/sancho/sancho-0.11-r1.ebuild b/dev-python/sancho/sancho-0.11-r1.ebuild
index 34a62da2342b..2ea41b74aa4f 100644
--- a/dev-python/sancho/sancho-0.11-r1.ebuild
+++ b/dev-python/sancho/sancho-0.11-r1.ebuild
@@ -1,10 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/sancho-0.11-r1.ebuild,v 1.21 2008/08/22 21:36:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/sancho-0.11-r1.ebuild,v 1.22 2009/10/02 01:03:39 arfrever Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils eutils
 
-MY_P=${P/s/S}
+MY_P="${P/s/S}"
+
 DESCRIPTION="Sancho is a unit testing framework"
 HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
 SRC_URI="http://cheeseshop.python.org/packages/source/S/Sancho/${MY_P}.tar.gz"
@@ -14,35 +18,34 @@ SLOT="0.0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.2"
+DEPEND=""
+RDEPEND=""
+RESTRICT_PYTHON_ABIS="3.*"
+
+S="${WORKDIR}/${MY_P}"
 
-S=${WORKDIR}/${MY_P}
+DOCS="CHANGES.txt"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-rename-package.patch"
 }
 
 src_test() {
-	mkdir "${T}/tests"
-	"${python}" setup.py install --home="${T}/tests" "$@" || die
-	pushd "${T}/tests"
-	PYTHONPATH=lib/python "${python}" "${S}/test/test_unittest.py" \
-		|| die "test failed"
-	popd
-	rm -rf "${T}/tests"
+	testing() {
+		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${S}/test/test_unittest.py"
+	}
+	python_execute_function testing
 }
 
 src_install() {
-	DOCS="CHANGES.txt"
 	distutils_src_install
 
-	python_version
-	insinto /usr/lib/python${PYVER}/site-packages/sancho-0
-	dosym /usr/lib/python${PYVER}/site-packages/sancho0 \
-		/usr/lib/python${PYVER}/site-packages/sancho-0/sancho
-	echo sancho-0 > "${D}/usr/lib/python${PYVER}/site-packages/sancho-0.pth"
+	create_symlinks() {
+		insinto $(python_get_sitedir)/sancho-0
+		dosym $(python_get_sitedir)/sancho0 $(python_get_sitedir)/sancho-0/sancho
+		echo sancho-0 > "${D}$(python_get_sitedir)/sancho-0.pth"
+	}
+	python_execute_function -q create_symlinks
 }
 
 pkg_postinst() {
diff --git a/dev-python/sancho/sancho-0.11.ebuild b/dev-python/sancho/sancho-0.11.ebuild
deleted file mode 100644
index b58773efd0ad..000000000000
--- a/dev-python/sancho/sancho-0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/sancho-0.11.ebuild,v 1.8 2007/10/15 14:22:58 corsair Exp $
-
-inherit distutils
-
-MY_P=${P/s/S}
-DESCRIPTION="Sancho is a unit testing framework"
-HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
-SRC_URI="http://cheeseshop.python.org/packages/source/S/Sancho/${MY_P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	DOCS="CHANGES.txt"
-	distutils_src_install
-}
diff --git a/dev-python/sancho/sancho-2.1-r1.ebuild b/dev-python/sancho/sancho-2.1-r1.ebuild
deleted file mode 100644
index 11058c865406..000000000000
--- a/dev-python/sancho/sancho-2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/sancho-2.1-r1.ebuild,v 1.6 2007/11/13 19:34:31 jer Exp $
-
-inherit distutils
-
-MY_P=${P/s/S}
-DESCRIPTION="Sancho is a unit testing framework"
-HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
-SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/python-2.3"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	DOCS="CHANGES.txt"
-	distutils_src_install
-}
-
-src_test() {
-	einfo "Setting up test env."
-	mkdir "${T}/tests"
-	"${python}" setup.py install --home="${T}/tests" "$@" \
-		|| die "Failed to install tests"
-	pushd "${T}/tests"
-	einfo "Running"
-	failcount=0
-	for tst in ${S}/test/*.py ; do
-		b="$(basename ${tst})"
-		o=${T}/tests/output-${b}
-		ebegin "Testing ${b}"
-		PYTHONPATH=lib/python "${python}" ${tst} >>${o}
-		egrep -qv "^.*/${b}: .*:\$" ${o}
-		rcv=$?
-		eend $rc
-		if [ $rcv -eq 0 ]; then
-			let failcount=${failcount}+1
-			eerror "Failure output for ${b}"
-			cat ${o}
-		fi
-	done;
-	[ $failcount -gt 0 ] && die "${failcount} tests failed"
-	einfo "Cleaning up test env."
-	popd
-	#rm -rf "${T}/tests"
-}
diff --git a/dev-python/sancho/sancho-2.1.ebuild b/dev-python/sancho/sancho-2.1.ebuild
deleted file mode 100644
index c80d25fa5b05..000000000000
--- a/dev-python/sancho/sancho-2.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/sancho-2.1.ebuild,v 1.6 2007/07/05 11:05:34 hawking Exp $
-
-inherit distutils
-
-MY_P=${P/s/S}
-DESCRIPTION="Sancho is a unit testing framework"
-HOMEPAGE="http://www.mems-exchange.org/software/sancho/"
-SRC_URI="http://www.mems-exchange.org/software/${PN}/${MY_P}.tar.gz"
-
-LICENSE="CNRI"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	DOCS="CHANGES.txt"
-	distutils_src_install
-}