Don't install tests, bug 443658.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 34 insertions, 61 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/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