pkgcore 0.6.5; fixup PMS/EAPI4 support, remove a fair number of user unfriendly behaviour

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 20 insertions, 48 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index fe7535bf06ab..72a9f2a50e6b 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.113 2011/06/06 01:29:59 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.114 2011/06/22 22:02:57 ferringb Exp $
+
+*pkgcore-0.6.5 (22 Jun 2011)
+
+  22 Jun 2011; Brian Harring <ferringb@gentoo.org>
+  -files/0.5.11.8-magic-compat.patch, -pkgcore-0.5.11.8-r1.ebuild,
+  +pkgcore-0.6.5.ebuild:
+  0.6.5; better user support, fixup PMS compliance, and eapi4 misbehaviour.
+  Finally, clean out 0.5.11.*; no longer supported in gentoo.
 
 *pkgcore-0.6.4 (06 Jun 2011)
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index fb92d98915a3..2e4c2a5cde9c 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.5.11.8-magic-compat.patch 990 RMD160 504db76e4ea42fc8361b473ab6d0e6aac947f1d7 SHA1 a6579b89e528c77d16be2b3562640b4e76a4c919 SHA256 d23ae6c73e4cab79aee153efd663f6c3e87b5d84a25e5a65fba966c002fbe83f
-DIST pkgcore-0.5.11.8.tar.bz2 425846 RMD160 0398dac501b413b4c274fafa80e2e3f25b19b1f5 SHA1 de7b9575f538a0644c7864371c6e22394bb8e7bb SHA256 640ba1a4743727e836548e339f71fe518632b26fab8ad689de211894ceb2fa1f
 DIST pkgcore-0.6.3.tar.bz2 447821 RMD160 1cb38f5c5abb7cdad7fad14b4dbeab92e3acdde6 SHA1 ca87d58178248fe1c9e019b07f009d932065b851 SHA256 b2d5cce4aba4e089dac6c94201faa6d1273d828a5999e5b00bc5572b2715c5be
 DIST pkgcore-0.6.4.tar.bz2 448076 RMD160 9e6390878689fbf094fb0d0246ee2ae4edb21f59 SHA1 1da89d68bdab2fa3cd72f258e9262f86df108489 SHA256 772403d1e10ade38a3c4b84cb085e145384ca6750585423d60b08ae2759f2e15
-EBUILD pkgcore-0.5.11.8-r1.ebuild 1917 RMD160 d862174de278f84b8552730d9139c068abb6bb55 SHA1 2cf82660add9023cf02186dc88b7cc5398e831fb SHA256 30b35db6db468486fbaafa3f5f2651060e0d4846e24f9c75daa84acbca068558
+DIST pkgcore-0.6.5.tar.bz2 449182 RMD160 cce8b8beab7428ab95d914f39610d4a1151d0a9a SHA1 7cc5fd3d0b2752b2b9060d2553a7d1bf8e977336 SHA256 a3552601a3bbae8d608f916a2595af5b7391306c894f4bc50e2ac45c10e72846
 EBUILD pkgcore-0.6.3.ebuild 1810 RMD160 757d6d112a0844e672dee08bf8750bc7a6b64c9f SHA1 202e08a00a629333fdde4a099b3075d3f80bfff3 SHA256 42fd9e293409ab72ccf08e5a8c11ecf30ff73672650bb8360831dba9632859f5
 EBUILD pkgcore-0.6.4.ebuild 1810 RMD160 4c41eea0da18373373df43abdc4f07b22fba4681 SHA1 3198701f7844787662eb98e53838e5c5604d4aa0 SHA256 e0d49ee7c18161710b6210cdabb050ff9843b28a16a5d04908b665b5a313968e
-MISC ChangeLog 17952 RMD160 30c0cd007309a725703213dbd843cccaa3d4e08e SHA1 6c4656f15677867d6e854bdaa400d2fae36ba85e SHA256 f68e6be36a94a1a5f1fe94aa2b0e72d98e538368eb93324b1102aafc964201a2
+EBUILD pkgcore-0.6.5.ebuild 1810 RMD160 8211fc7bbde7a79f694ce130e6a67979a35b6763 SHA1 8338ad66f62e1927b3a46cddaa67a5480683a172 SHA256 3ef4d21fb9a47aec9893e00206cc528ff981a995d9792ab48abfbcd40fdc85eb
+MISC ChangeLog 18264 RMD160 a6f076732d6c306af8489f34e20ca2483b0dcec7 SHA1 cfcb2bf94e4d0ed16c8d1e4cc1d9aaf479bf47c2 SHA256 aa687a34cf748ee40f2daf6d1fc2889f2c14b202f488bbc1a58c2d795aa17b8f
 MISC metadata.xml 256 RMD160 1b8dd3fe357cfae2f83a8f7ef896da5abc1ac433 SHA1 97e6ce21c6ec742e813e75e85de0c547ef233381 SHA256 27d03d721a47cce85175bcb7759cd0ed4ceee7633a1f62fff6626948de395509
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3sLcAACgkQsiLx3HvNzgfoKQCgrXYy4xkmV/MzaDrCUFEe/ZiX
-hxgAoJ/7xl7yjQl/FhF/J3wQF+ruevas
-=aIOT
+iEYEARECAAYFAk4CZpcACgkQsiLx3HvNzgfZCwCbBlXs66j4sd+JV/V05gjCNjzz
+XsAAn0nC98ZjQc3lNrVoNLr5XW1EGk7l
+=Qbei
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/files/0.5.11.8-magic-compat.patch b/sys-apps/pkgcore/files/0.5.11.8-magic-compat.patch
deleted file mode 100644
index 75bf861c1e9e..000000000000
--- a/sys-apps/pkgcore/files/0.5.11.8-magic-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d739669499bd04058f87f40e78405989b6a86dc1 Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Fri, 4 Feb 2011 02:10:38 -0800
-Subject: [PATCH] add compatibility for 5.05 of file
-
----
- pkgcore/util/file_type.py |    7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/pkgcore/util/file_type.py b/pkgcore/util/file_type.py
-index ee8ae7e..2557528 100644
---- a/pkgcore/util/file_type.py
-+++ b/pkgcore/util/file_type.py
-@@ -23,7 +23,12 @@ class file_identifier(object):
-             import magic
-         except ImportError:
-             return self._fallback_file
--        obj = magic.open(magic.MAGIC_NONE)
-+        if hasattr(magic, 'MAGIC_NONE'):
-+            # <5.05 of file
-+            magic_const = magic.MAGIC_NONE
-+        else:
-+            magic_const = magic.NONE
-+        obj = magic.open(magic_const)
-         ret = obj.load()
-         if ret != 0:
-             raise ValueError("non zero ret from loading magic: %s" % ret)
--- 
-1.7.4
-
diff --git a/sys-apps/pkgcore/pkgcore-0.5.11.8-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.6.5.ebuild
index d5fa19607d25..6a7f768a7ef3 100644
--- a/sys-apps/pkgcore/pkgcore-0.5.11.8-r1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.6.5.ebuild
@@ -1,11 +1,11 @@
 # 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.5.11.8-r1.ebuild,v 1.4 2011/04/25 15:24:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.6.5.ebuild,v 1.1 2011/06/22 22:02:57 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"
 
-inherit distutils eutils
+inherit distutils
 
 DESCRIPTION="pkgcore package manager"
 HOMEPAGE="http://www.pkgcore.org"
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/snakeoil-0.3.6.3
-	>=app-shells/bash-3.0
+	>=dev-python/snakeoil-0.4
+	dev-python/pyparsing
 	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/docutils-0.4 )"
@@ -31,11 +31,6 @@ pkg_setup() {
 	python_pkg_setup
 }
 
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-magic-compat.patch"
-	distutils_src_prepare
-}
-
 src_compile() {
 	distutils_src_compile