Version bump, EAPI1 fixups

(Portage version: 2.1.4_rc9)

7 files changed, 14 insertions, 120 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 2593e7148c2c..69b04314fa03 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.45 2007/12/06 20:57:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.46 2007/12/15 21:34:08 jokey Exp $
+
+*pkgcore-0.3.3 (15 Dec 2007)
+
+  15 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/pkgcore-0.3.1-pmerge-unmerge-ask.patch, -pkgcore-0.3.1.ebuild,
+  -pkgcore-0.3.2.ebuild, +pkgcore-0.3.3.ebuild:
+  Version bump, EAPI1 fixups
 
 *pkgcore-0.3.2-r1 (06 Dec 2007)
 
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3.1 b/sys-apps/pkgcore/files/digest-pkgcore-0.3.1
deleted file mode 100644
index 95d943b3ba3c..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df01730a5977dfb3ba82d70724ae5073 pkgcore-0.3.1.tar.bz2 499091
-RMD160 2347a5fcfcba23892cde4f93fcb69875b24e4afa pkgcore-0.3.1.tar.bz2 499091
-SHA256 d5d610c61dfa49333721ac42e1290c8d25fb02f124f72c7a516c58b877d2ef9c pkgcore-0.3.1.tar.bz2 499091
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3.2 b/sys-apps/pkgcore/files/digest-pkgcore-0.3.2
deleted file mode 100644
index 373040543360..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.3.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47fbdede637459d0618b5515ed873681 pkgcore-0.3.2.tar.bz2 518727
-RMD160 777097f4c2af8f80fb4fd5205a393f9f822751b0 pkgcore-0.3.2.tar.bz2 518727
-SHA256 663a2d5d5ac736d96db6f67fd633ad53c9c1a6bc31542a6e0b613f4048344f2a pkgcore-0.3.2.tar.bz2 518727
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3.3 b/sys-apps/pkgcore/files/digest-pkgcore-0.3.3
new file mode 100644
index 000000000000..fe36ed1895f6
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.3.3
@@ -0,0 +1,3 @@
+MD5 d3565a6be39ab05a7b5047e28bc0b4b6 pkgcore-0.3.3.tar.bz2 521033
+RMD160 866879bc5d25640bc6bc2fc34eeb30ae6595887e pkgcore-0.3.3.tar.bz2 521033
+SHA256 8faa0697601f56c6b866901c5cedaaa2348a4a3e7b528ec14e0ee5d508ba7331 pkgcore-0.3.3.tar.bz2 521033
diff --git a/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch b/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch
deleted file mode 100644
index 541be270a5bd..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'pkgcore/scripts/pmerge.py'
---- pkgcore/scripts/pmerge.py	2007-06-06 21:01:31 +0000
-+++ pkgcore/scripts/pmerge.py	2007-06-06 21:03:03 +0000
-@@ -174,7 +174,7 @@
-     """Raised internally to indicate an "expected" failure condition."""
- 
- 
--def unmerge(out, err, vdb, tokens, options, world_set=None):
-+def unmerge(out, err, vdb, tokens, options, formatter, world_set=None):
-     """Unmerge tokens. hackish, should be rolled back into the resolver"""
-     all_matches = set()
-     for token in tokens:
-@@ -311,7 +311,7 @@
-                 return 1
-         try:
-             unmerge(
--                out, err, vdb, options.targets, options, world_set)
-+                out, err, vdb, options.targets, options, formatter, world_set)
-         except (parserestrict.ParseError, Failure), e:
-             out.error(str(e))
-             return 1
-
diff --git a/sys-apps/pkgcore/pkgcore-0.3.1.ebuild b/sys-apps/pkgcore/pkgcore-0.3.1.ebuild
deleted file mode 100644
index 66f30a375850..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.3.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.1.ebuild,v 1.1 2007/06/28 07:20:34 tsunam Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="pkgcore package manager"
-HOMEPAGE="http://www.pkgcore.org"
-SRC_URI="http://www.pkgcore.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/python-2.4
-	dev-python/snakeoil
-	>=app-shells/bash-3.0
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/docutils-0.4 )"
-
-DOCS="AUTHORS NEWS"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-pmerge-unmerge-ask.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, so you can remove it now."
-	fi
-
-	# This is left behind by pkgcore 0.2.
-	rm -f "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/pkgcore/plugins/plugincache
-
-	elog "If the new layman sync support causes problems you can disable it"
-	elog "with FEATURES=-layman-sync. If you cannot sync a layman overlay"
-	elog "using pkgcore, file a bug in pkgcore.org trac instead of complaining"
-	elog "to the layman or overlay maintainer."
-}
-
-pkg_postrm() {
-	python_version
-	# Careful not to remove this on up/downgrades.
-	local sitep="${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages
-	if [[ -e "${sitep}/pkgcore/plugins/plugincache2" ]] &&
-		! [[ -e "${sitep}/pkgcore/plugin.py" ]]; then
-		rm "${sitep}/pkgcore/plugins/plugincache2"
-	fi
-	distutils_pkg_postrm
-}
-
-src_test() {
-	"${python}" setup.py test || die "testing returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.3.2.ebuild b/sys-apps/pkgcore/pkgcore-0.3.3.ebuild
index c5acc76abe4b..854ed4737808 100644
--- a/sys-apps/pkgcore/pkgcore-0.3.2.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.2.ebuild,v 1.4 2007/11/06 17:51:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.3.ebuild,v 1.1 2007/12/15 21:34:08 jokey Exp $
 
 inherit distutils eutils
 
@@ -49,16 +49,12 @@ pkg_postinst() {
 
 	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, so you can remove it now."
+		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}"usr/$(get_libdir)/python${PYVER}/site-packages/pkgcore/plugins/plugincache
-
-	elog "If the new layman sync support causes problems you can disable it"
-	elog "with FEATURES=-layman-sync. If you cannot sync a layman overlay"
-	elog "using pkgcore, file a bug in pkgcore.org trac instead of complaining"
-	elog "to the layman or overlay maintainer."
 }
 
 pkg_postrm() {