Add fix for ebuilds that error out on unknown src_configure error

(Portage version: 2.1.4_rc7)

4 files changed, 119 insertions, 1 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index a623a1459ff1..2593e7148c2c 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.44 2007/11/06 17:51:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.45 2007/12/06 20:57:22 jokey Exp $
+
+*pkgcore-0.3.2-r1 (06 Dec 2007)
+
+  06 Dec 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/pkgcore-0.3.2-eapi.patch, +pkgcore-0.3.2-r1.ebuild:
+  Add fix for ebuilds that error out on unknown src_configure error
 
   06 Nov 2007; Raúl Porcel <armin76@gentoo.org> pkgcore-0.3.2.ebuild:
   Add ~alpha
diff --git a/sys-apps/pkgcore/files/digest-pkgcore-0.3.2-r1 b/sys-apps/pkgcore/files/digest-pkgcore-0.3.2-r1
new file mode 100644
index 000000000000..373040543360
--- /dev/null
+++ b/sys-apps/pkgcore/files/digest-pkgcore-0.3.2-r1
@@ -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.3.2-eapi.patch b/sys-apps/pkgcore/files/pkgcore-0.3.2-eapi.patch
new file mode 100644
index 000000000000..0706ffa279e7
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.3.2-eapi.patch
@@ -0,0 +1,26 @@
+--- pkgcore-0.3.2/pkgcore/bin/ebuild-env/ebuild-functions.sh	2007-08-16 16:30:43 +0000
++++ pkgcore-0.3.2/pkgcore/bin/ebuild-env/ebuild-functions.sh	2007-11-02 11:44:59 +0000
+@@ -234,7 +234,9 @@
+ 
+ src_compile()
+ {
+-    if [ -x ./configure ]; then
++    if [ "${EAPI:-0}" == 0 ] ; then
++        [ -x ./configure ] && econf
++    elif [ -x ${ECONF_SOURCE}/configure ]; then
+         econf || die "econf failed"
+     fi
+     if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+
+--- pkgcore-0.3.2/pkgcore/ebuild/ebd.py	2007-11-02 01:56:46 +0000
++++ pkgcore-0.3.2/pkgcore/ebuild/ebd.py	2007-11-08 23:35:41 +0000
+@@ -599,7 +599,7 @@
+         does nothing if the pkg is EAPI=0 (that spec lacks a seperated
+         configure phase).
+         """
+-        if self.eapi > 0:
++        if self.eapi > 1:
+             return self._generic_phase("configure", True, True, False)
+         return True
+ 
+
diff --git a/sys-apps/pkgcore/pkgcore-0.3.2-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..4c1198120592
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.3.2-r1.ebuild
@@ -0,0 +1,83 @@
+# 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-r1.ebuild,v 1.1 2007/12/06 20:57:22 jokey 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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/python-2.4
+	>=dev-python/snakeoil-0.1
+	>=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}-eapi.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"
+}