add 0.7.3, remove old versions, drop pyparsing dep (pquery --expr only used it, and no longer is an option)

(Portage version: 2.1.10.19/cvs/Linux x86_64)

5 files changed, 12 insertions, 191 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 2a3f3eef562c..8d723d0f20d9 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.125 2011/09/28 04:00:18 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.126 2011/10/27 08:05:16 ferringb Exp $
+
+*pkgcore-0.7.3 (27 Oct 2011)
+
+  27 Oct 2011; Brian Harring <ferringb@gentoo.org>
+  -files/0.6.5-fix-screwup-in-incrementals-removal.patch,
+  -pkgcore-0.6.5-r1.ebuild, -pkgcore-0.6.6.ebuild, -pkgcore-0.7.1-r1.ebuild,
+  +pkgcore-0.7.3.ebuild:
+  remove old versions, add 0.7.3 w/ greater compatibility support
 
 *pkgcore-0.7.2 (28 Sep 2011)
 
diff --git a/sys-apps/pkgcore/files/0.6.5-fix-screwup-in-incrementals-removal.patch b/sys-apps/pkgcore/files/0.6.5-fix-screwup-in-incrementals-removal.patch
deleted file mode 100644
index e1e890ac9d20..000000000000
--- a/sys-apps/pkgcore/files/0.6.5-fix-screwup-in-incrementals-removal.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6ada9442149d881271afcf8560db4a1b74a5eeaf Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Fri, 24 Jun 2011 12:46:38 -0700
-Subject: [PATCH] fix screwup in incrementals removal
-
----
- pkgcore/ebuild/profiles.py |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pkgcore/ebuild/profiles.py b/pkgcore/ebuild/profiles.py
-index 1fa91c6..ba7f251 100644
---- a/pkgcore/ebuild/profiles.py
-+++ b/pkgcore/ebuild/profiles.py
-@@ -451,9 +451,9 @@ class UserProfile(OnDiskProfile):
-         typename='profile')
- 
-     def __init__(self, user_path, parent_path, parent_profile,
--        incrementals=const.incrementals, load_profiles_base=False):
-+        load_profiles_base=False):
-         OnDiskProfile.__init__(self, parent_path, parent_profile,
--            incrementals, load_profiles_base)
-+            load_profiles_base)
-         self.node = UserProfileNode(user_path, pjoin(parent_path, parent_profile))
- 
- 
--- 
-1.7.5.3
-
diff --git a/sys-apps/pkgcore/pkgcore-0.6.5-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.6.5-r1.ebuild
deleted file mode 100644
index 2b3002544c87..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.6.5-r1.ebuild,v 1.2 2011/08/06 08:59:27 ferringb Exp $
-
-EAPI="3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit eutils distutils
-
-DESCRIPTION="pkgcore package manager"
-HOMEPAGE="http://pkgcore.googlecode.com/"
-SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/snakeoil-0.4.1
-	dev-python/pyparsing
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/docutils-0.4 )"
-
-DOCS="AUTHORS NEWS"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/0.6.5-fix-screwup-in-incrementals-removal.patch"
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		./build_docs.py || die "doc building failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc dev-notes
-		doman man/*.1
-	fi
-
-	dodoc doc/*.rst man/*.rst
-	docinto dev-notes
-	dodoc dev-notes/*.rst
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	pplugincache
-
-	if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
-		elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
-		elog "It is unused by pkgcore >= 0.2, remove it now."
-		die "remove /etc/pkgcore/plugins from pkgcore 0.1"
-	fi
-
-	# This is left behind by pkgcore 0.2.
-	rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache
-}
-
-pkg_postrm() {
-	# Careful not to remove this on up/downgrades.
-	local sitep="${ROOT}"$(python_get_sitedir)/site-packages
-	if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
-		! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
-		rm "${sitep}/pkgcore/plugins/plugincache2"
-	fi
-	distutils_pkg_postrm
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.6.6.ebuild b/sys-apps/pkgcore/pkgcore-0.6.6.ebuild
deleted file mode 100644
index d017cd268bc6..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.6.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.6.6.ebuild,v 1.2 2011/08/06 08:59:27 ferringb Exp $
-
-EAPI="3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="pkgcore package manager"
-HOMEPAGE="http://pkgcore.googlecode.com/"
-SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/snakeoil-0.4.1
-	dev-python/pyparsing
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/docutils-0.4 )"
-
-DOCS="AUTHORS NEWS"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-	python_pkg_setup
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		./build_docs.py || die "doc building failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r doc dev-notes
-		doman man/*.1
-	fi
-
-	dodoc doc/*.rst man/*.rst
-	docinto dev-notes
-	dodoc dev-notes/*.rst
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	pplugincache
-
-	if [[ -d "${ROOT}etc/pkgcore/plugins" ]]; then
-		elog "You still have an /etc/pkgcore/plugins from pkgcore 0.1."
-		elog "It is unused by pkgcore >= 0.2, remove it now."
-		die "remove /etc/pkgcore/plugins from pkgcore 0.1"
-	fi
-
-	# This is left behind by pkgcore 0.2.
-	rm -f "${ROOT}"$(python_get_sitedir)/pkgcore/plugins/plugincache
-}
-
-pkg_postrm() {
-	# Careful not to remove this on up/downgrades.
-	local sitep="${ROOT}"$(python_get_sitedir)/site-packages
-	if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
-		! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
-		rm "${sitep}/pkgcore/plugins/plugincache2"
-	fi
-	distutils_pkg_postrm
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.7.3.ebuild
index 1ef53c1b7a24..809dc5ad5069 100644
--- a/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.1-r1.ebuild,v 1.1 2011/09/05 20:18:28 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.3.ebuild,v 1.1 2011/10/27 08:05:16 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
@@ -14,11 +14,10 @@ SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="-doc"
+IUSE="-doc build"
 
 RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/snakeoil-0.4.2
-	dev-python/pyparsing
+	>=dev-python/snakeoil-0.4.4
 	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"