Don't install tests, bug 443658.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 47 insertions, 65 deletions

diff --git a/dev-python/pastescript/ChangeLog b/dev-python/pastescript/ChangeLog
index c19e120f42fe..85452f6802b5 100644
--- a/dev-python/pastescript/ChangeLog
+++ b/dev-python/pastescript/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pastescript
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.10 2012/02/20 07:51:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.11 2012/11/17 19:19:20 floppym Exp $
+
+*pastescript-1.7.5-r1 (17 Nov 2012)
+
+  17 Nov 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/pastescript-setup.py-exclude-tests.patch, +pastescript-1.7.5-r1.ebuild,
+  -pastescript-1.7.3.ebuild, -pastescript-1.7.5.ebuild:
+  Don't install tests, bug 443658.
 
 *pastescript-1.7.5 (20 Feb 2012)
 
@@ -46,4 +53,3 @@
   04 Feb 2007; Tiziano Müller <dev-zero@gentoo.org> pastescript-1.1.ebuild,
   +metadata.xml:
   Initial ebuild
-
diff --git a/dev-python/pastescript/Manifest b/dev-python/pastescript/Manifest
index 83e1203b9a65..3cb45e5037e0 100644
--- a/dev-python/pastescript/Manifest
+++ b/dev-python/pastescript/Manifest
@@ -1,6 +1,15 @@
-DIST PasteScript-1.7.3.tar.gz 127667 SHA256 a695b38001721a8a8a128b8566aa15566cb526d13015caa12a32384902179a16 SHA512 1758745bb1c2d54eaae5e04a89685656b5f20bb18f9fb9608e08d33b9e039649af55bb20ab52a11254768aa81d351a4a183db55502ffb0dbf236bc1f6260f75d WHIRLPOOL 8dc915f733fb57a26fc5ac22420971c7c4e3015ab3959a706dc7889c7aa91aca90f4b695fa299046b4e76aa032885465401bf259373d6492974c4d76f673455c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX pastescript-setup.py-exclude-tests.patch 657 SHA256 155c453c22be636b204dc342c8a65569812c71856f180ccde306e60445962fe4 SHA512 7e74fb60b387cfc8bb89f56c195274caa4cbe6dd16f13bc3b8e4cf98f7c14c82c2234477eccf1e1dd35602ec2b2fc48aea8dbb878e1fb38769e84dd377c09e11 WHIRLPOOL b6343e986cd4f4972466dc5b083aa4ba5f8c674a2d64aa2325f6d2728c2094301781bde031017d5e591ccc1240e84593faa1d08cabc47a5687fc4918ba64d828
 DIST PasteScript-1.7.5.tar.gz 129738 SHA256 2b685be69d6ac8bc0fe6f558f119660259db26a15e16a4943c515fbee8093539 SHA512 b4d308427bd36e2d84a5cd2c23e178db6edae5b468936ec3bb599598e1c331e77c232401a7f58752002d4b04924f11c545dab56256375296a86892d4b3cfd46c WHIRLPOOL 2e9cb23c408957e74f243c9eb1fad451172a0657d81758917c33a4e56441e3e1daf756d2aa4d6162a573996ef12694488dd8b733e4193a06a4571c033f7f9eef
-EBUILD pastescript-1.7.3.ebuild 1439 SHA256 e6f8dc5f9be1297376e4d2ef0cde113f134ff3f3e26355f354cfe4ead3459c0e SHA512 356188bebcac407dc73784ead54e51e1fc35601b0751951de1299eda5955704f0c6f13f1fbfdf1f7bbec1979d81043c32c8e8ff14248c6950cdbfb55bc276090 WHIRLPOOL 31004f75bdf3612593fecc9e630dd0943e9adba758dadc5c6d52cae10b4fc282a1691b9da518ac37b9d7eee3ab48ee7b15a9d4cd5d643c37c32f25bbb9fb9564
-EBUILD pastescript-1.7.5.ebuild 1438 SHA256 029d1d2efc97e0037b41dd45dfbcaf661ebcf2d3c672e7698e0cae1912822b84 SHA512 d965864e2c5035088e47b8def173314fd9f22333ff7c7e510504bdc6370c30e52c31110a5f8517c0be2ee8585f213217b24840507407335a61caf820b030c8c3 WHIRLPOOL 278f14b07aeac48b9d246e4347ec15707d9e71cfe49c162de5366ba909df660916117e06138185e46055c65033c5b2e0e79982ba36caadd25e7e0b0cd8991f65
-MISC ChangeLog 1694 SHA256 67c472a76123322abe54df9bfac0215b076f1cd71078e5e445d206287b394258 SHA512 462e6148879f3e1c86422ccacf57e7663d5835c47952c6b95aaed7fdad374b3de2503d5c3345b786b1b91f8f9a1e7d7c6845b52917d8de3579f97fb9e74713b6 WHIRLPOOL 0182b8113ab462dfb1b61b9b825c53714857796f45b3d37e30e0c1416685d0f08ea1e4a76ad46d24784beb8aeeb8ba7b4ebe33602a5a1f514b33e96f2bfd1c95
+EBUILD pastescript-1.7.5-r1.ebuild 1547 SHA256 1fec96e7a9fe70ed20ce98bbc0fbac46386367228e02bdaa2060e4a496e2a4a5 SHA512 2be74398c29c12b2f0a16bfae3d108cf838fc1cf74f68e3daae12ed6c300faf45b5de996d2ab6d78e8940aefcdf6a484e012fcec5d2822f1f10e4fb17e7181c9 WHIRLPOOL 565c4703da1b43fa9cb141e741f3a4e6db9ff99812e17b1788b536bb2cddd88e14d024f617c067f459715d773941b5b762db2a063a8e7203eadd2aa5ec86d4bd
+MISC ChangeLog 1952 SHA256 64610112bbc1a8e8d4ace50d1c9d3d7e383e4c5a7e5b7b3bcf82c3b93c9edbaa SHA512 aa455eda02f2509078913d9f00e7c8223bbc84c4112b8a3aa06aaf31ecc64d60a97fa7c3072e6772f40c7d8c6d79b9956103f8c4ea498700f73f3ea2fc3bb51f WHIRLPOOL f09d2e32fe5205d93031a7fd5f04f3a02df9c4a183da9ec4f199e5e56757e4f0392056f7e68a60872fb5798f76c006d25d29c9da487bd29e99dd69f16821d1e8
 MISC metadata.xml 234 SHA256 9f102c4ddd1baf0909c9fcb29c9cb3a3032cfa5fad0c233dc09da0d5a5b57aa8 SHA512 cbdd056ee4fc39e87896f8fbee9010e12a89de9f588b391a3051ee32a5538501beeed81a57f44781162d7b6ea871e9b179451005814625fa91377d07fb8c5c54 WHIRLPOOL 03624afa9ae7acd92cfd11ea1b008a2db4712acadf3bd0d11da8618054398d6a1463678a4f509c06d5efb838b5e1f9c36332755d65097e81a32abfb6edf686c7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCn4zoACgkQC77qH+pIQ6TGgQEAxohP9eaVxPmg4r7+RK1SjOP+
+3XKSkoKrtMUd7aOaO7kBAKa2TKCKlg1MnsyDQB3lZhNA8wJbhKiQ8GZix8Hb1Rw7
+=rQg6
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch b/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch
new file mode 100644
index 000000000000..24190a783f06
--- /dev/null
+++ b/dev-python/pastescript/files/pastescript-setup.py-exclude-tests.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User Mike Gilbert <floppym@gentoo.org>
+# Date 1353179174 18000
+# Node ID 814fbc493e7a9999086127f64c2406ecb1794990
+# Parent  510ff7d7627750eb0dbbc0d36fa63c72ffa6b303
+Exclude subpackages of tests.
+
+diff --git a/setup.py b/setup.py
+--- a/setup.py
++++ b/setup.py
+@@ -61,7 +61,7 @@
+     url="http://pythonpaste.org/script/",
+     namespace_packages=['paste'],
+     license='MIT',
+-    packages=find_packages(exclude='tests'),
++    packages=find_packages(exclude=['tests','tests.*']),
+     package_data={
+       'paste.script': ['paster-templates/basic_package/setup.*',
+                        'paster-templates/basic_package/tests/*.py',
diff --git a/dev-python/pastescript/pastescript-1.7.3.ebuild b/dev-python/pastescript/pastescript-1.7.3.ebuild
deleted file mode 100644
index 1821272624d9..000000000000
--- a/dev-python/pastescript/pastescript-1.7.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.8 2010/09/22 20:49:36 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-#DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils
-
-MY_PN="PasteScript"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A pluggable command-line frontend, including commands to setup package file layouts"
-HOMEPAGE="http://pythonpaste.org/script/ http://pypi.python.org/pypi/PasteScript"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-RDEPEND="dev-python/cheetah
-	>=dev-python/paste-1.3
-	dev-python/pastedeploy
-	dev-python/setuptools"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/pygments dev-python/sphinx )"
-
-# Tests are broken.
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="paste/script"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		PYTHONPATH="." "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		pushd build/sphinx/html > /dev/null
-		docinto html
-		cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
-		popd > /dev/null
-	fi
-}
diff --git a/dev-python/pastescript/pastescript-1.7.5.ebuild b/dev-python/pastescript/pastescript-1.7.5-r1.ebuild
index 1471d5192a34..a26092c80bac 100644
--- a/dev-python/pastescript/pastescript-1.7.5.ebuild
+++ b/dev-python/pastescript/pastescript-1.7.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.5.ebuild,v 1.1 2012/02/20 07:51:35 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.5-r1.ebuild,v 1.1 2012/11/17 19:19:20 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 #DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="PasteScript"
 MY_P="${MY_PN}-${PV}"
@@ -36,6 +36,11 @@ S="${WORKDIR}/${MY_P}"
 
 PYTHON_MODNAME="paste/script"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-setup.py-exclude-tests.patch"
+	distutils_src_prepare
+}
+
 src_compile() {
 	distutils_src_compile