Backport some changes to older slot. Delete older ebuilds.

(Portage version: 14471-svn/cvs/Linux x86_64)

5 files changed, 30 insertions, 121 deletions

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/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
-}