Allow installing 0.x and 2.x slotted (thanks to robbat2@gentoo.org for suggesting this). Add src_test.

Package-Manager: portage-2660-svn

5 files changed, 161 insertions, 2 deletions

diff --git a/dev-python/sancho/ChangeLog b/dev-python/sancho/ChangeLog
index 42d9133c060e..56cae7c247b4 100644
--- a/dev-python/sancho/ChangeLog
+++ b/dev-python/sancho/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/sancho
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/ChangeLog,v 1.5 2006/02/03 20:07:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sancho/ChangeLog,v 1.6 2006/02/13 21:21:59 marienz Exp $
+
+*sancho-0.11-r1 (13 Feb 2006)
+
+  13 Feb 2006; Marien Zwart <marienz@gentoo.org>
+  +files/sancho-0.11-rename-package.patch, +sancho-0.11-r1.ebuild:
+  Allow installing 0.x and 2.x slotted (thanks to robbat2@gentoo.org for
+  suggesting this). Add src_test.
 
   03 Feb 2006; Markus Rothe <corsair@gentoo.org> sancho-0.11.ebuild,
   sancho-2.1.ebuild:
diff --git a/dev-python/sancho/Manifest b/dev-python/sancho/Manifest
index 7a034aa26957..8adc03f82756 100644
--- a/dev-python/sancho/Manifest
+++ b/dev-python/sancho/Manifest
@@ -1,6 +1,37 @@
-MD5 a8039be3b66431724b82a3ee9d74875b ChangeLog 938
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb57fdef4381b55a6ae8567ee565b277 ChangeLog 1193
+RMD160 4fa0969ac6d426993123d084024d1b7ed474e84f ChangeLog 1193
+SHA256 81f739db5371ef401eb0f4551076dedb1a5545f1d095d56494a8761b75e9be11 ChangeLog 1193
 MD5 bca61ad6d9eb1aca0d32b522d1bd85c7 files/digest-sancho-0.11 232
+RMD160 850318e6d5165b8aa70ee9a6c2907f870218386e files/digest-sancho-0.11 232
+SHA256 580d4255591a58681a94cd7d5d87dd1a3b70cb7cf62294ddbcd81aa214ed1794 files/digest-sancho-0.11 232
+MD5 bca61ad6d9eb1aca0d32b522d1bd85c7 files/digest-sancho-0.11-r1 232
+RMD160 850318e6d5165b8aa70ee9a6c2907f870218386e files/digest-sancho-0.11-r1 232
+SHA256 580d4255591a58681a94cd7d5d87dd1a3b70cb7cf62294ddbcd81aa214ed1794 files/digest-sancho-0.11-r1 232
 MD5 2206393d3f046826d15332acd5af3a0a files/digest-sancho-2.1 226
+RMD160 a0466f4e55236c0291010d7bb1a17fcc4cd99512 files/digest-sancho-2.1 226
+SHA256 71bb9afe9be424498af64b16e976f071b73f573d1a1a53c373971ed8c9ead856 files/digest-sancho-2.1 226
+MD5 3228eaf8c0618baf8dce32f9fe76a937 files/sancho-0.11-rename-package.patch 1815
+RMD160 78528d75e2ba9f87250e14473d9840ddc866208d files/sancho-0.11-rename-package.patch 1815
+SHA256 cbe7b5fa77d9a79130a140ed25bf7ab99b911b3d64e1598ecc43ffc44d6d3e17 files/sancho-0.11-rename-package.patch 1815
 MD5 09f661a26e4a48f29e21e36b354b5285 metadata.xml 221
+RMD160 b87aa62e811f10d90f8ffc0e259c3dff0dca6b8f metadata.xml 221
+SHA256 2b6e0c5b8ee7907656acfcf1e8b19cd46195d7cd80659350bba96c8f1c9c28aa metadata.xml 221
+MD5 6b16a6f0f0cc69161e545f19852d55f6 sancho-0.11-r1.ebuild 1551
+RMD160 08648d8e31a98d93c0a06b274ee3c522e87b48bf sancho-0.11-r1.ebuild 1551
+SHA256 12976206b13fc4f0db63e59afa46f1ef866afc747d5f4786878ad4e42f421cd3 sancho-0.11-r1.ebuild 1551
 MD5 529d47d4f5fd9cd78152e6e54ede3aad sancho-0.11.ebuild 673
+RMD160 1cffccad9c59bd6d170e27bc8fe81a8663ecd267 sancho-0.11.ebuild 673
+SHA256 8e49bab4e1035e9485051c46db7c5110d5617d99cc3d18b7a2b0f4e8ad7c0a58 sancho-0.11.ebuild 673
 MD5 d51137f14b233b01d99e5bb759124609 sancho-2.1.ebuild 630
+RMD160 b11c1b5afbb5dc3ddc31efaaf4ab2d3b4f09341a sancho-2.1.ebuild 630
+SHA256 69f30365f8e4e8815d6c54335970e736380c23021d96940b0102636c486563fc sancho-2.1.ebuild 630
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD8PiIW78445TWHXcRAo+6AKCK6Usb1H17bV82NmZ6zZyetuchtwCfTZNq
+H5qLDpnyt03LUrMOTxk/AQ0=
+=GA+c
+-----END PGP SIGNATURE-----
diff --git a/dev-python/sancho/files/digest-sancho-0.11-r1 b/dev-python/sancho/files/digest-sancho-0.11-r1
new file mode 100644
index 000000000000..46ce9b6a5eb6
--- /dev/null
+++ b/dev-python/sancho/files/digest-sancho-0.11-r1
@@ -0,0 +1,3 @@
+MD5 be6a03637c2a21cc28be3956b5b8f055 Sancho-0.11.tar.gz 21577
+RMD160 870b8c5a81b1750bd7241c8b410d96d85849a80a Sancho-0.11.tar.gz 21577
+SHA256 2e5186565c77341b3866eeeff4849cf4bc0a2eb3c348c2c452adc215a4044942 Sancho-0.11.tar.gz 21577
diff --git a/dev-python/sancho/files/sancho-0.11-rename-package.patch b/dev-python/sancho/files/sancho-0.11-rename-package.patch
new file mode 100644
index 000000000000..27a92fcfe038
--- /dev/null
+++ b/dev-python/sancho/files/sancho-0.11-rename-package.patch
@@ -0,0 +1,65 @@
+=== modified file 'examples/test_simple.py'
+--- examples/test_simple.py	
++++ examples/test_simple.py	
+@@ -1,4 +1,4 @@
+-from sancho.unittest import TestScenario, parse_args, run_scenarios
++from sancho0.unittest import TestScenario, parse_args, run_scenarios
+ 
+ import simple
+ 
+
+=== modified file 'scripts/run_sancho_tests'
+--- scripts/run_sancho_tests	
++++ scripts/run_sancho_tests	
+@@ -13,8 +13,8 @@
+ import sys, os
+ import getopt
+ 
+-from sancho.util import find_test_scripts, run_all_scripts
+-from sancho.unittest import TestOptions
++from sancho0.util import find_test_scripts, run_all_scripts
++from sancho0.unittest import TestOptions
+ 
+ USAGE = """\
+ usage: %(prog)s [ -i ] [ -c ] [ -q ] [ -v ] [start_dir | test_script] ...
+
+=== modified file 'setup.py'
+--- setup.py	
++++ setup.py	
+@@ -14,7 +14,7 @@
+       maintainer_email = "akuchlin@mems-exchange.org",
+       url = "http://www.mems-exchange.org/software/sancho/",
+ 
+-      package_dir = {"sancho": "."},
+-      packages = ["sancho"],
++      package_dir = {"sancho0": "."},
++      packages = ["sancho0"],
+       scripts = ["scripts/run_sancho_tests"],
+      )
+
+=== modified file 'test/test_unittest.py'
+--- test/test_unittest.py	
++++ test/test_unittest.py	
+@@ -12,7 +12,7 @@
+ 
+ __revision__ = "$Id: sancho-0.11-rename-package.patch,v 1.1 2006/02/13 21:21:59 marienz Exp $"
+ 
+-from sancho.unittest import TestScenario, parse_args, run_scenarios
++from sancho0.unittest import TestScenario, parse_args, run_scenarios
+ 
+ tested_modules = [ "sancho.unittest" ]
+ 
+
+=== modified file 'util.py'
+--- util.py	
++++ util.py	
+@@ -14,7 +14,7 @@
+ import sys, os, re
+ import new
+ 
+-from sancho.unittest import TestOptions, TestResults, \
++from sancho0.unittest import TestOptions, TestResults, \
+         find_scenarios, run_scenarios
+ 
+ def find_test_scripts (start_dir):
+
diff --git a/dev-python/sancho/sancho-0.11-r1.ebuild b/dev-python/sancho/sancho-0.11-r1.ebuild
new file mode 100644
index 000000000000..9ec42635a45f
--- /dev/null
+++ b/dev-python/sancho/sancho-0.11-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 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.1 2006/02/13 21:21:59 marienz Exp $
+
+inherit distutils eutils
+
+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.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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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"
+}
+
+src_install() {
+	mydoc="CHANGES.txt README.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"
+}
+
+pkg_postinst() {
+	einfo "This version of sancho is modified to allow parallel installation"
+	einfo "with sancho-2.x. \"import sancho0\" will always give you this"
+	einfo "version. \"import sancho\" will give you sancho 2.x if that is"
+	einfo "installed, this version otherwise."
+}