Version bump, many bug fixes

(Portage version: 2.1.3.16)

17 files changed, 15 insertions, 424 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 180b60481f9b..bb8c11e33432 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,16 @@
 # 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.40 2007/06/28 08:12:37 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.41 2007/11/03 16:05:07 jokey Exp $
+
+*pkgcore-0.3.2 (03 Nov 2007)
+
+  03 Nov 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/pkgcore-0.2.13-tweak_intercepts.patch,
+  -files/pkgcore-0.2-hppa-disable-filter-env.patch,
+  -files/pkgcore-0.3-pmerge-unmerge-ask.patch, -pkgcore-0.1.4.ebuild,
+  -pkgcore-0.2.12.ebuild, -pkgcore-0.2.13.ebuild, -pkgcore-0.2.13-r1.ebuild,
+  -pkgcore-0.2.14.ebuild, -pkgcore-0.3.ebuild, +pkgcore-0.3.2.ebuild:
+  Version bump, many bug fixes
 
   28 Jun 2007; Joshua Jackson <tsunam@gentoo.org>
   +files/pkgcore-0.3.1-pmerge-unmerge-ask.patch:
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.1.4 b/sys-apps/pkgcore/files/digest-pkgcore-0.1.4
deleted file mode 100644
index a535dc90b891..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5e770ee8b5cf682000a2a8c11dec2c1 pkgcore-0.1.4.tar.bz2 389388
-RMD160 a4eadddfc55afad5c82277ae18d751e9b8e21a2a pkgcore-0.1.4.tar.bz2 389388
-SHA256 0c9cbe841d189924502ad17a52a0c3336862464c796c8c9f6fbde15915163b53 pkgcore-0.1.4.tar.bz2 389388
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.12 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.12
deleted file mode 100644
index a8b761d04633..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.2.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9d549bd39cbce0905b625f8e7cbd1996 pkgcore-0.2.12.tar.bz2 562501
-RMD160 197aede719a5ec229a8503b52b25b02469e38479 pkgcore-0.2.12.tar.bz2 562501
-SHA256 2d0fc5cd9b223053b9832266f9378363218022cf5d1d7af0472b433107071013 pkgcore-0.2.12.tar.bz2 562501
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.13 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.13
deleted file mode 100644
index 6954718495e1..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.2.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15100146996accc508c697ab5291f0a9 pkgcore-0.2.13.tar.bz2 563424
-RMD160 a5c7b87af67bd0458950a21905df492256dcb68e pkgcore-0.2.13.tar.bz2 563424
-SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e pkgcore-0.2.13.tar.bz2 563424
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1
deleted file mode 100644
index 6954718495e1..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.2.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15100146996accc508c697ab5291f0a9 pkgcore-0.2.13.tar.bz2 563424
-RMD160 a5c7b87af67bd0458950a21905df492256dcb68e pkgcore-0.2.13.tar.bz2 563424
-SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e pkgcore-0.2.13.tar.bz2 563424
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.2.14 b/sys-apps/pkgcore/files/digest-pkgcore-0.2.14
deleted file mode 100644
index 505e9047188d..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.2.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 546454ecd39ef03abf9bccb50fe2d46c pkgcore-0.2.14.tar.bz2 563244
-RMD160 3a4336840be6fabcde5681f965a632a74fb66743 pkgcore-0.2.14.tar.bz2 563244
-SHA256 eec7d1376c82bf6a754e3c7a6489c2553c757d80a41c3d5ebca12958829028e0 pkgcore-0.2.14.tar.bz2 563244
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3 b/sys-apps/pkgcore/files/digest-pkgcore-0.3
deleted file mode 100644
index cad632581493..000000000000
--- a/sys-apps/pkgcore/files/digest-pkgcore-0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-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/digest-pkgcore-0.3.2 b/sys-apps/pkgcore/files/digest-pkgcore-0.3.2
new file mode 100644
index 000000000000..373040543360
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.3.2
@@ -0,0 +1,3 @@
+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/pkgcore-0.2-hppa-disable-filter-env.patch b/sys-apps/pkgcore/files/pkgcore-0.2-hppa-disable-filter-env.patch
deleted file mode 100644
index e8adb4fc491a..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.2-hppa-disable-filter-env.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pkgcore-0.2/setup.py	2007-01-22 00:05:46.000000000 -0500
-+++ pkgcore-0.2-hppa/setup.py	2007-01-22 02:58:58.181908408 -0500
-@@ -329,10 +329,6 @@
-             'pkgcore.restrictions._restrictions', ['src/restrictions.c'],
-             extra_compile_args=extra_flags, depends=common_includes),
-         core.Extension(
--            'pkgcore.ebuild._filter_env', [
--                'src/filter_env.c', 'src/bmh_search.c'],
--            extra_compile_args=extra_flags, depends=common_includes),
--        core.Extension(
-             'pkgcore.util.osutils._readdir', ['src/readdir.c'],
-             extra_compile_args=extra_flags, depends=common_includes),
-         ] + extensions,
diff --git a/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch b/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch
deleted file mode 100644
index f788bb247856..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.2.13-tweak_intercepts.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-=== modified file 'pkgcore/bin/ebuild-env/ebuild.sh'
---- pkgcore/bin/ebuild-env/ebuild.sh	2007-03-29 16:27:43 +0000
-+++ pkgcore/bin/ebuild-env/ebuild.sh	2007-04-01 15:08:43 +0000
-@@ -350,10 +350,10 @@
-             fi
-         };
-         function export() {
--            PKGCORE_ATTRS_EXPORTED="${PKGCORE_ATTRS_EXPORTED} $*"
-+            declare -x "$@"
-         };
-         function readonly() {
--            PKGCORE_ATTRS_READONLY="${PKGCORE_ATTRS_READONLY} $*"
-+            declare -r "$@"
-         };
-         function shopt() {
-             if [ "$1" == "-s" ]; then
-
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
deleted file mode 100644
index 541be270a5bd..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.3-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.1.4.ebuild b/sys-apps/pkgcore/pkgcore-0.1.4.ebuild
deleted file mode 100644
index 49167acd4aa3..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.1.4.ebuild
+++ /dev/null
@@ -1,68 +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.1.4.ebuild,v 1.3 2007/01/22 11:03:41 jokey Exp $
-
-inherit distutils toolchain-funcs
-
-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 ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.4"
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
-	>=app-shells/bash-3.0
-	doc? ( >=dev-python/docutils-0.4 )"
-
-src_compile() {
-	# The CC export is used by the filter-env build
-	CC=$(tc-getCC) distutils_src_compile
-
-	if use doc; then
-		./build_docs.py || die "doc building failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	# This wrapper is not useful when called directly.
-	rm "${D}/usr/bin/pwrapper"
-
-	if use doc; then
-		dohtml -r doc dev-notes
-	fi
-
-	dodoc doc/*.rst
-	docinto dev-notes
-	dodoc dev-notes/*.rst
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-
-	einfo "Registering plugins..."
-	register_plugin.py -s fs_ops copyfile 1 pkgcore.fs.ops.default_copyfile
-	register_plugin.py -s fs_ops ensure_perms 1 \
-		pkgcore.fs.ops.default_ensure_perms
-	register_plugin.py -s fs_ops mkdir 1 pkgcore.fs.ops.default_mkdir
-	register_plugin.py -s fs_ops merge_contents 1 \
-		pkgcore.fs.ops.merge_contents
-	register_plugin.py -s fs_ops unmerge_contents 1 \
-		pkgcore.fs.ops.unmerge_contents
-	register_plugin.py -s format ebuild_built 0.0 \
-		pkgcore.ebuild.ebuild_built.generate_new_factory
-	register_plugin.py -s format ebuild_src 0.0 \
-		pkgcore.ebuild.ebuild_src.generate_new_factory
-}
-
-src_test() {
-	"${python}" setup.py build_ext --force --inplace || \
-		die "failed building extensions in src dir for testing"
-	"${python}" ./sandbox/test.py || die "tested returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.2.12.ebuild b/sys-apps/pkgcore/pkgcore-0.2.12.ebuild
deleted file mode 100644
index 8ba3f5f942c6..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.2.12.ebuild
+++ /dev/null
@@ -1,69 +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.2.12.ebuild,v 1.1 2007/03/29 17:54:44 marienz Exp $
-
-inherit distutils
-
-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 ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.4"
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
-	>=app-shells/bash-3.0
-	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"
-}
-
-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
-	echo "updating pkgcore plugin cache"
-	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
-
-	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."
-}
-
-src_test() {
-	"${python}" setup.py test || die "testing returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild
deleted file mode 100644
index ffe2f10b55af..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.2.13-r1.ebuild
+++ /dev/null
@@ -1,70 +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.2.13-r1.ebuild,v 1.2 2007/04/05 00:19:07 robbat2 Exp $
-
-inherit distutils
-
-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 ~ppc64 ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.4"
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
-	>=app-shells/bash-3.0
-	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}-tweak_intercepts.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
-	echo "updating pkgcore plugin cache"
-	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
-
-	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."
-}
-
-src_test() {
-	"${python}" setup.py test || die "testing returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.2.13.ebuild b/sys-apps/pkgcore/pkgcore-0.2.13.ebuild
deleted file mode 100644
index 6e49477f3512..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.2.13.ebuild
+++ /dev/null
@@ -1,69 +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.2.13.ebuild,v 1.1 2007/03/30 18:33:52 marienz Exp $
-
-inherit distutils
-
-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 ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.4"
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
-	>=app-shells/bash-3.0
-	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"
-}
-
-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
-	echo "updating pkgcore plugin cache"
-	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
-
-	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."
-}
-
-src_test() {
-	"${python}" setup.py test || die "testing returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.2.14.ebuild b/sys-apps/pkgcore/pkgcore-0.2.14.ebuild
deleted file mode 100644
index 137e9dd3fbcd..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.2.14.ebuild
+++ /dev/null
@@ -1,69 +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.2.14.ebuild,v 1.2 2007/04/10 10:00:20 armin76 Exp $
-
-inherit distutils
-
-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 ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/python-2.4"
-RDEPEND=">=dev-lang/python-2.4
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )
-	>=app-shells/bash-3.0
-	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"
-}
-
-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
-	echo "updating pkgcore plugin cache"
-	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
-
-	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."
-}
-
-src_test() {
-	"${python}" setup.py test || die "testing returned non zero"
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.3.ebuild b/sys-apps/pkgcore/pkgcore-0.3.2.ebuild
index 6c224d52f82b..e8f0baf5c7a0 100644
--- a/sys-apps/pkgcore/pkgcore-0.3.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.3.2.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.ebuild,v 1.8 2007/06/16 11:20:13 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.3.2.ebuild,v 1.1 2007/11/03 16:05:07 jokey Exp $
 
 inherit distutils eutils
 
@@ -22,13 +22,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS NEWS"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-pmerge-unmerge-ask.patch"
-}
-
 src_compile() {
 	distutils_src_compile