bump, remove old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

8 files changed, 16 insertions, 229 deletions

diff --git a/net-zope/zc-buildout/ChangeLog b/net-zope/zc-buildout/ChangeLog
index a68cb896116b..11342ca63e50 100644
--- a/net-zope/zc-buildout/ChangeLog
+++ b/net-zope/zc-buildout/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/zc-buildout
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/ChangeLog,v 1.12 2014/05/25 11:27:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/ChangeLog,v 1.13 2014/11/07 09:32:09 idella4 Exp $
+
+*zc-buildout-2.2.4 (07 Nov 2014)
+
+  07 Nov 2014; Ian Delaney <idella4@gentoo.org> +zc-buildout-2.2.4.ebuild,
+  -zc-buildout-1.4.4.ebuild, -zc-buildout-1.5.2.ebuild,
+  -zc-buildout-1.7.0.ebuild, -zc-buildout-2.0.1.ebuild,
+  -zc-buildout-2.1.0.ebuild, -zc-buildout-2.2.0.ebuild,
+  -zc-buildout-2.2.1.ebuild:
+  bump, remove old
 
 *zc-buildout-2.2.1 (25 May 2014)
 
diff --git a/net-zope/zc-buildout/zc-buildout-1.4.4.ebuild b/net-zope/zc-buildout/zc-buildout-1.4.4.ebuild
deleted file mode 100644
index 04f13c9aa7da..000000000000
--- a/net-zope/zc-buildout/zc-buildout-1.4.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-1.4.4.ebuild,v 1.1 2010/09/12 20:13:21 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES.txt todo.txt"
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-1.5.2.ebuild b/net-zope/zc-buildout/zc-buildout-1.5.2.ebuild
deleted file mode 100644
index b39ea847fb98..000000000000
--- a/net-zope/zc-buildout/zc-buildout-1.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-1.5.2.ebuild,v 1.1 2010/10/16 21:03:37 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES.txt todo.txt"
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-1.7.0.ebuild b/net-zope/zc-buildout/zc-buildout-1.7.0.ebuild
deleted file mode 100644
index dc2ecddb5d4d..000000000000
--- a/net-zope/zc-buildout/zc-buildout-1.7.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-1.7.0.ebuild,v 1.1 2013/02/02 03:47:28 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES.txt todo.txt"
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild b/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild
deleted file mode 100644
index 70a822a5bed3..000000000000
--- a/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.0.1.ebuild,v 1.1 2013/03/22 05:41:11 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES.rst todo.txt"
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-2.1.0.ebuild b/net-zope/zc-buildout/zc-buildout-2.1.0.ebuild
deleted file mode 100644
index 4c2ef5d07ff4..000000000000
--- a/net-zope/zc-buildout/zc-buildout-2.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.1.0.ebuild,v 1.1 2013/03/26 06:26:24 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS="CHANGES.rst todo.txt"
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-2.2.0.ebuild b/net-zope/zc-buildout/zc-buildout-2.2.0.ebuild
deleted file mode 100644
index 85373ed675d5..000000000000
--- a/net-zope/zc-buildout/zc-buildout-2.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.2.0.ebuild,v 1.2 2014/05/25 11:27:34 idella4 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PN="${PN/-/.}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="System for managing development buildouts"
-HOMEPAGE="http://pypi.python.org/pypi/zc.buildout"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="ZPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( README.rst doc/tutorial.txt )
-PYTHON_MODNAME="${PN/-//}"
-
-src_install() {
-	distutils_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
-}
diff --git a/net-zope/zc-buildout/zc-buildout-2.2.1.ebuild b/net-zope/zc-buildout/zc-buildout-2.2.4.ebuild
index 85e3e5a88d2c..f9da51cadff8 100644
--- a/net-zope/zc-buildout/zc-buildout-2.2.1.ebuild
+++ b/net-zope/zc-buildout/zc-buildout-2.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.2.1.ebuild,v 1.1 2014/05/25 11:27:34 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zc-buildout/zc-buildout-2.2.4.ebuild,v 1.1 2014/11/07 09:32:09 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -23,12 +23,12 @@ RDEPEND=">=dev-python/setuptools-0.7[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/${MY_P}
+
 DOCS=( README.rst doc/tutorial.txt )
 # Tests require zope packages absent from portage
 
-src_install() {
-	distutils-r1_src_install
-
-	# Remove README.txt installed in incorrect location.
-	rm -f "${D}usr/README.txt"
+# Prevent incorrect installation of data file
+python_prepare_all() {
+	sed -e '/^    include_package_data/d' -i setup.py || die
+	distutils-r1_python_prepare_all
 }