Version bump.

Package-Manager: portage-2.1.2.9

5 files changed, 143 insertions, 5 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/Manifest b/sys-apps/pkgcore/Manifest
index 73628dd88a33..a2b12b8b7852 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pkgcore-0.2-hppa-disable-filter-env.patch 679 RMD160 cb3ddbaba39d03cfcb3af8760ebca0e6b19c1151 SHA1 e33e27fb24c746a2e95d2f64b69bcf9361f33796 SHA256 0647ced79db1dbc3b28b9217f6ee6593b6b9b9f5e76ebc69aef61fa25363840b
 MD5 c1b0ae7e4d4c65ef50247ae4d6fce085 files/pkgcore-0.2-hppa-disable-filter-env.patch 679
 RMD160 cb3ddbaba39d03cfcb3af8760ebca0e6b19c1151 files/pkgcore-0.2-hppa-disable-filter-env.patch 679
@@ -6,10 +9,15 @@ AUX pkgcore-0.2.13-tweak_intercepts.patch 573 RMD160 844196783b46d5c53dab6d99f7a
 MD5 4259f21f99a98852b66da61797c9c48b files/pkgcore-0.2.13-tweak_intercepts.patch 573
 RMD160 844196783b46d5c53dab6d99f7a969ef174be716 files/pkgcore-0.2.13-tweak_intercepts.patch 573
 SHA256 79a4c939071881bf27cfd5316f2dcd807d07802c595565d2ce244df0581e423d files/pkgcore-0.2.13-tweak_intercepts.patch 573
+AUX pkgcore-0.3-pmerge-unmerge-ask.patch 859 RMD160 d053b4274a0ac1ff874b52444759d97a7fb0f25b SHA1 569938237d1d26c4c762210c4e891af09a429ebe SHA256 7fb52074a66fe2a9584f1766bd1e81a28ab62d458b334a6cc452679713cc375c
+MD5 32a909b8fc4a9d9eda3ae0942c0e1a80 files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
+RMD160 d053b4274a0ac1ff874b52444759d97a7fb0f25b files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
+SHA256 7fb52074a66fe2a9584f1766bd1e81a28ab62d458b334a6cc452679713cc375c files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
 DIST pkgcore-0.1.4.tar.bz2 389388 RMD160 a4eadddfc55afad5c82277ae18d751e9b8e21a2a SHA1 6ebe98b4c0e7f37f6a9a3d0b5568e9b87712f46c SHA256 0c9cbe841d189924502ad17a52a0c3336862464c796c8c9f6fbde15915163b53
 DIST pkgcore-0.2.12.tar.bz2 562501 RMD160 197aede719a5ec229a8503b52b25b02469e38479 SHA1 119b97522100583171cc3b5d5098b05f12d3cab3 SHA256 2d0fc5cd9b223053b9832266f9378363218022cf5d1d7af0472b433107071013
 DIST pkgcore-0.2.13.tar.bz2 563424 RMD160 a5c7b87af67bd0458950a21905df492256dcb68e SHA1 11a66e65965aea738dc8d08089333c8df47f61fb SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e
 DIST pkgcore-0.2.14.tar.bz2 563244 RMD160 3a4336840be6fabcde5681f965a632a74fb66743 SHA1 7f35198aa3fda08d8d26113e5932ff09d843b191 SHA256 eec7d1376c82bf6a754e3c7a6489c2553c757d80a41c3d5ebca12958829028e0
+DIST pkgcore-0.3.tar.bz2 526346 RMD160 da1ec4eecd0f392d81bbaf62b6d9594dd69ba755 SHA1 ce8d7733ac124df258c52c3caa1f44acc9dbc69e SHA256 aa3a098b78bacef39de7739d3a9aff900fe6053d60bae4e67dc3216e17aa925c
 EBUILD pkgcore-0.1.4.ebuild 1907 RMD160 921db31f95f2292a0c7b31de9a4c21e74c391b13 SHA1 639f501c6107a50b65b4b1f58ddeb0441ae392a6 SHA256 2ce23ed9f4a2d0be5d2c8831abd441ef525292dd155e4c0fb129fa78b83e3a2d
 MD5 b6ded34dc3c84d110bbdbeb5b628963f pkgcore-0.1.4.ebuild 1907
 RMD160 921db31f95f2292a0c7b31de9a4c21e74c391b13 pkgcore-0.1.4.ebuild 1907
@@ -30,10 +38,14 @@ EBUILD pkgcore-0.2.14.ebuild 1688 RMD160 10419d21537d2a95690a84b1adf5f5f94bc55c6
 MD5 e012dfda449bde1fb4709f62de79562e pkgcore-0.2.14.ebuild 1688
 RMD160 10419d21537d2a95690a84b1adf5f5f94bc55c68 pkgcore-0.2.14.ebuild 1688
 SHA256 7696a46465ab0404ed8baaa62c8f0cd6f3f286489687c347e2aaece6b3077346 pkgcore-0.2.14.ebuild 1688
-MISC ChangeLog 4732 RMD160 7f2e6af5c16ef1529f83b111a09407f9f0650ab3 SHA1 c1f10b7d71cca35088a0f6a59b29744fabad4122 SHA256 1a2d8c4e625c42d71aa373f1dcc6e129b01fbf838df266a86b2050370edfe959
-MD5 7069e72ad36d79f97d115217c9790eec ChangeLog 4732
-RMD160 7f2e6af5c16ef1529f83b111a09407f9f0650ab3 ChangeLog 4732
-SHA256 1a2d8c4e625c42d71aa373f1dcc6e129b01fbf838df266a86b2050370edfe959 ChangeLog 4732
+EBUILD pkgcore-0.3.ebuild 2121 RMD160 6d2b941003a9d66aa1fe1483bf260f9cf9c6d790 SHA1 31df52d017d1cdec60c4180adb8740acf56dd4bc SHA256 4c1e8545aa5fea5b1c4ed6fa4881566b6d57ced5ebacc164d8c2d3c21244575f
+MD5 c75ee135a3ec698ce6e729de6a5729e5 pkgcore-0.3.ebuild 2121
+RMD160 6d2b941003a9d66aa1fe1483bf260f9cf9c6d790 pkgcore-0.3.ebuild 2121
+SHA256 4c1e8545aa5fea5b1c4ed6fa4881566b6d57ced5ebacc164d8c2d3c21244575f pkgcore-0.3.ebuild 2121
+MISC ChangeLog 4894 RMD160 022fe8c384488212763e29dc69d8d4b6aac6afdb SHA1 e5711d38cd17205ce186e3fac602af6f05f9e7cf SHA256 efab7d5988573b66384b15e2088ef348fa8fcd9ace7838ac4606bda400d26b39
+MD5 2321392217c5bb7621f36fb16a71def4 ChangeLog 4894
+RMD160 022fe8c384488212763e29dc69d8d4b6aac6afdb ChangeLog 4894
+SHA256 efab7d5988573b66384b15e2088ef348fa8fcd9ace7838ac4606bda400d26b39 ChangeLog 4894
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
@@ -53,3 +65,13 @@ SHA256 048b8f38680d0fd146b8740a5546eef08f0c939164fa7d24927e02d08756bd49 files/di
 MD5 9108402c30e0959f4d85a678571f8eaa files/digest-pkgcore-0.2.14 247
 RMD160 04135353e7d1388e68990b5733af18ce0dc837cc files/digest-pkgcore-0.2.14 247
 SHA256 6f33f762b5259ff7fbcd8edfa276839a3bb9f727542b0853baf0c495af8ed8de files/digest-pkgcore-0.2.14 247
+MD5 a9ac0662739fa3d6101b0ded164fe38c files/digest-pkgcore-0.3 238
+RMD160 03a922a5182ebd6049f8b629f89faff09d359e55 files/digest-pkgcore-0.3 238
+SHA256 7aa8a95aae082eb7a5f4d54ea9f96fa030898184646ea576525fc5fad63cf30f files/digest-pkgcore-0.3 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGZyK5UElL7eJpfEQRAtIpAJ9mMkSSTf/UDQtinFhMDnhscywe1QCgolNw
+sZogHsvOT1PXSeFXUz2E7s8=
+=2S70
+-----END PGP SIGNATURE-----
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"
+}