Version bump.

(Portage version: 2.1.2.9)

4 files changed, 117 insertions, 1 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 7635795efcae..724de084c392 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2007/04/10 10:00:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.31 2007/06/06 21:09:31 marienz Exp $
+
+*pkgcore-0.3 (06 Jun 2007)
+
+  06 Jun 2007; Marien Zwart <marienz@gentoo.org>
+  +files/pkgcore-0.3-pmerge-unmerge-ask.patch, +pkgcore-0.3.ebuild:
+  Version bump.
 
   10 Apr 2007; Raúl Porcel <armin76@gentoo.org> pkgcore-0.2.14.ebuild:
   Add ~ia64
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3 b/sys-apps/pkgcore/files/digest-pkgcore-0.3
new file mode 100644
index 000000000000..cad632581493
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.3
@@ -0,0 +1,3 @@
+MD5 3b502bac283a1a0f3bff78bed57d96ba pkgcore-0.3.tar.bz2 526346
+RMD160 da1ec4eecd0f392d81bbaf62b6d9594dd69ba755 pkgcore-0.3.tar.bz2 526346
+SHA256 aa3a098b78bacef39de7739d3a9aff900fe6053d60bae4e67dc3216e17aa925c pkgcore-0.3.tar.bz2 526346
diff --git a/sys-apps/pkgcore/files/pkgcore-0.3-pmerge-unmerge-ask.patch b/sys-apps/pkgcore/files/pkgcore-0.3-pmerge-unmerge-ask.patch
new file mode 100644
index 000000000000..541be270a5bd
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.3-pmerge-unmerge-ask.patch
@@ -0,0 +1,22 @@
+=== 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.ebuild b/sys-apps/pkgcore/pkgcore-0.3.ebuild
new file mode 100644
index 000000000000..d896b3a655b8
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.3.ebuild
@@ -0,0 +1,85 @@
+# 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.ebuild,v 1.1 2007/06/06 21:09:31 marienz 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="~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}"
+	use hppa && epatch "${FILESDIR}/${PN}-0.2-hppa-disable-filter-env.patch"
+
+	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/lib/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/lib/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"
+}