Rewrite the ebuilds to not require autotools/newer EAPI to make upgrading simple.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

diff --git a/app-admin/eselect-python/ChangeLog b/app-admin/eselect-python/ChangeLog
index 7e4ede9a345c0b9adbf3f286931565a4a7453d89..868d8309f89015ccdf96df4a2f7365c3e826400c 100644 (file)
--- a/app-admin/eselect-python/ChangeLog
+++ b/app-admin/eselect-python/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/eselect-python
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.63 2010/06/19 17:06:00 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/ChangeLog,v 1.64 2011/11/08 23:55:51 vapier Exp $
+
+*eselect-python-20111108 (09 Nov 2011)
+
+  09 Nov 2011; Mike Frysinger <vapier@gentoo.org>
+  +eselect-python-20111108.ebuild, eselect-python-99999999.ebuild:
+  Rewrite the ebuilds to not require autotools/newer EAPI to make upgrading
+  simple.
 
   19 Jun 2010; Raúl Porcel <armin76@gentoo.org>
   eselect-python-20100321.ebuild:

diff --git a/app-admin/eselect-python/Manifest b/app-admin/eselect-python/Manifest
index a5a08b077a2de2ffb87f98946a1209294e7cbd2f..1d8c29298ac45b39d36eb0c7f631d91392bec207 100644 (file)
--- a/app-admin/eselect-python/Manifest
+++ b/app-admin/eselect-python/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST eselect-python-20091230.tar.bz2 5476 RMD160 33d2648f69c2b402e2e482a218d7a22e1c167aed SHA1 6294603bb921924ecb74b006c5ed313b48489065 SHA256 34df248d55f656b5bf251b087d64a81be985ca9a0b1444d221d65a975853c49e
 DIST eselect-python-20100321.tar.bz2 6006 RMD160 7c24095bcac681a1e4e048504ac38641bbd569df SHA1 ab5539e789825bdb131d02ba4bd756b535b9bbde SHA256 b287e910abd46b865ebeb303a4c61aa53dd70185efbe42a296af556559173523
+DIST eselect-python-20111108.tar.bz2 64959 RMD160 cdab063a3dad4c8ac9aaeb49c9bf00dce07df761 SHA1 e762805358ace163d76e677db1b1df60b744b772 SHA256 34d7618808a3c1d22e6763bc6c67d5ae47a1fa371f5e91de95a911da9aceba5e
 EBUILD eselect-python-20091230.ebuild 1347 RMD160 690c40bfe41c378f55e4198820b00c39ee6e3ea3 SHA1 aa4fffc25280b32f62b2369bd1fc4f9c8e847f76 SHA256 4ed3356749d4d28560a70b650911da6e390a051ab52d13af0ea4be00818b12f5
 EBUILD eselect-python-20100321.ebuild 1318 RMD160 db6bbd9c85c03034775d64f4bcd1279c085c8fdf SHA1 d7f04bea155f923e06c2a113b4d44e44987761db SHA256 7e668f3a823aabd9fa3d1b089a8ae523b62dafb487147f120f1c608a594703e1
-EBUILD eselect-python-99999999.ebuild 1343 RMD160 8e51565c8dc34cb9ef229dcbe92f8f298caf5708 SHA1 27978eb4ac76816dfe6da18edf2c14a760a8ca91 SHA256 f93b7a35b5ff56bcbb3eea0f3c9c5631077446f6590f2700f09d51c3a6ddfc72
-MISC ChangeLog 9673 RMD160 80b68050f07d6ba84093a3dd0c8d7467f1a7e8cb SHA1 a105c69d05b6b7ff980c7012a8e727c3cd0fba06 SHA256 ae8f8d1a7719656bfe1790d4f7f72d065122bca251c7d50688d6e2cae46d9950
+EBUILD eselect-python-20111108.ebuild 1526 RMD160 851d54ca71dcee6303e98b1492b95c6800e61707 SHA1 2071aacc34f610338b4b8aade47946be269a9d73 SHA256 376608f4721dd3ab7729533e3c7fab2ff9ac6a313a5446b81376e33201396d07
+EBUILD eselect-python-99999999.ebuild 1526 RMD160 39a52236ccb703f20082ddff04704a884af5956f SHA1 90674a8d1dfbbaf81c2171600060cecfe1808f95 SHA256 7dcfe7fad20236089fa85bdb79be926ffd31db142d22be4fd9d6e8bfbd90d7c2
+MISC ChangeLog 9916 RMD160 6233ea03336bcf284ed0f9e1f5b735ba09bc9e92 SHA1 731bc91c97ee0c17173e17725c1510a3204869ac SHA256 9c3aea0fdc91e9e5e370965fea7c4bf17ff890dd70e530d1d440df0bd73b203b
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk65z3kACgkQaC/OocHi7JYwkAD/cMhsP5XyOLOGV2VS63K/AHwS
+qhoiP67Mro3uPoNnIq0A/3S31RlYPytC3X1mp6ZmCkch3qulHg42dFGojfioIScM
+=qFG1
+-----END PGP SIGNATURE-----

diff --git a/app-admin/eselect-python/eselect-python-20111108.ebuild b/app-admin/eselect-python/eselect-python-20111108.ebuild
new file mode 100644 (file)
index 0000000..9f82be4
--- /dev/null
+++ b/app-admin/eselect-python/eselect-python-20111108.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-20111108.ebuild,v 1.1 2011/11/08 23:55:51 vapier Exp $
+
+# Keep the EAPI low here because everything else depends on it.
+# We want to make upgrading simpler.
+
+ESVN_PROJECT="eselect-python"
+ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/eselect-python/trunk"
+
+if [[ ${PV} == "99999999" ]] ; then
+       inherit autotools subversion
+else
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Python versions"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+# Avoid autotool deps for released versions for circ dep issues.
+if [[ ${PV} == "99999999" ]] ; then
+       DEPEND="sys-devel/autoconf"
+else
+       DEPEND=""
+fi
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       [[ -x configure ]] || eautoreconf
+}
+
+src_install() {
+       keepdir /etc/env.d/python
+       emake DESTDIR="${D}" install || die
+}
+
+pkg_preinst() {
+       if has_version "<${CATEGORY}/${PN}-20090804" || ! has_version "${CATEGORY}/${PN}"; then
+               run_eselect_python_update="1"
+       fi
+}
+
+pkg_postinst() {
+       if [[ "${run_eselect_python_update}" == "1" ]]; then
+               ebegin "Running \`eselect python update\`"
+               eselect python update --ignore 3.0 --ignore 3.1 --ignore 3.2 > /dev/null
+               eend "$?"
+       fi
+}

diff --git a/app-admin/eselect-python/eselect-python-99999999.ebuild b/app-admin/eselect-python/eselect-python-99999999.ebuild
index 4d2aa5571b8927536c301b00f3d3adedf13e03b1..7acb15afb6f3f77bc1ecd8020d846220823b99c6 100644 (file)
--- a/app-admin/eselect-python/eselect-python-99999999.ebuild
+++ b/app-admin/eselect-python/eselect-python-99999999.ebuild
@@ -1,41 +1,44 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.5 2009/12/31 01:10:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-python/eselect-python-99999999.ebuild,v 1.6 2011/11/08 23:55:51 vapier Exp $
 
-EAPI="2"
+# Keep the EAPI low here because everything else depends on it.
+# We want to make upgrading simpler.
 
-inherit subversion toolchain-funcs
+ESVN_PROJECT="eselect-python"
+ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/eselect-python/trunk"
+
+if [[ ${PV} == "99999999" ]] ; then
+       inherit autotools subversion
+else
+       SRC_URI="mirror://gentoo/${P}.tar.bz2"
+       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+fi
 
 DESCRIPTION="Eselect module for management of multiple Python versions"
 HOMEPAGE="http://www.gentoo.org"
-SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.3"
-DEPEND="${RDEPEND}
-       sys-devel/autoconf
-       >=sys-devel/gcc-3.4"
-
-ESVN_PROJECT="eselect-python"
-ESVN_REPO_URI="https://overlays.gentoo.org/svn/proj/python/projects/eselect-python/trunk"
-
-pkg_setup() {
-       if [[ $(gcc-major-version) -lt 3 || ($(gcc-major-version) -eq 3 && $(gcc-minor-version) -lt 4) ]]; then
-               die "GCC >=3.4 is required"
-       fi
-}
-
-src_prepare() {
-       ./autogen.sh || die "autogen.sh failed"
+# Avoid autotool deps for released versions for circ dep issues.
+if [[ ${PV} == "99999999" ]] ; then
+       DEPEND="sys-devel/autoconf"
+else
+       DEPEND=""
+fi
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       [[ -x configure ]] || eautoreconf
 }
 
 src_install() {
        keepdir /etc/env.d/python
-       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install || die
 }
 
 pkg_preinst() {