Unify autoconf-2.67 and autoconf-9999 versions.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 54 insertions, 24 deletions

diff --git a/sys-devel/autoconf/ChangeLog b/sys-devel/autoconf/ChangeLog
index e6b25e6cd0c5..9f352ce25742 100644
--- a/sys-devel/autoconf/ChangeLog
+++ b/sys-devel/autoconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/autoconf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.152 2010/09/15 03:02:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/ChangeLog,v 1.153 2010/09/19 22:28:55 vapier Exp $
+
+  19 Sep 2010; Mike Frysinger <vapier@gentoo.org> autoconf-2.67.ebuild,
+  autoconf-9999.ebuild:
+  Unify autoconf-2.67 and autoconf-9999 versions.
 
   15 Sep 2010; Jeroen Roovers <jer@gentoo.org> autoconf-2.65-r1.ebuild:
   Stable for HPPA (bug #336381).
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 1c4490ed7e08..00d627338eda 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX autoconf-2.13-destdir.patch 677 RMD160 ff71fb18c1676455e267dfd8f3059e8c9384fe19 SHA1 5ef1905e271e078cecea3424560207585868e9cd SHA256 67c3eaf2f8aaf3acbcff387bc3fc6d46688b56a6b51043344e301bfaf16186a0
 AUX autoconf-2.13-gentoo.patch 898 RMD160 c39068cd8477188cde4818049c32b4142689ca0d SHA1 17bdf4d77c8a0c738f20378f0b281fd6ecf57ddd SHA256 5d6a4b9d8d789684b44addf565200a90ee92140d58bebf087373ae82c4d89ea8
 AUX autoconf-2.13-test-fixes.patch 547 RMD160 4f8713f9a046c496c813fc52f5fccbb8d616f97c SHA1 95dcffbc29c8355f11c191d6626b54f1db9403ea SHA256 43929d95e6050642385530df91084d4c073cec5cca727918d5ff84bc1e3059f5
@@ -25,7 +28,14 @@ EBUILD autoconf-2.63-r1.ebuild 1309 RMD160 9b8dc1c85f0e9997915b990bb252003095651
 EBUILD autoconf-2.64.ebuild 1265 RMD160 198cc7c6e170c0202acf3e7403aec0e446bfebb4 SHA1 138586af69e0fd9ca6b5993492654f6b89bb4c77 SHA256 0f3cb30fbf863bc186108a71a685f62c7f59a5decd803f18e95daa038e5c2691
 EBUILD autoconf-2.65-r1.ebuild 1373 RMD160 e59a421c6665977ba7ec3d8f7ebc4618a79e2c0d SHA1 754f648240ca421a1493b742a413678f63542f32 SHA256 5c112c4a81addfdbf852b494ab69319c21267e88a8fd9b84481542acb9b4105f
 EBUILD autoconf-2.65.ebuild 1256 RMD160 fbe00b3192f017731d7f833af0cd797102a5729b SHA1 e2fe74bf897fba5ddcce559b1be235e1985b5361 SHA256 24f1e5a18918c578f7c5f6a57c1985e533b843e52e1ecefa5600248b55ffbc05
-EBUILD autoconf-2.67.ebuild 1189 RMD160 4bfc475633d73a6408d0eda6f477924e4e724f9d SHA1 11dde471de22b3983ea49e899223ad82210d28fa SHA256 3af62be93725fba4300468891a4ca573edbc86a2e3549c2b1eb1f3e6ab4454c4
-EBUILD autoconf-9999.ebuild 1262 RMD160 46da23705fa4033b0a420507aaba52eeb3364af1 SHA1 b64c10c9fbd1cf34e2802474e021576e712d78c8 SHA256 0fc59822d4289bbd38a6f0a55374b7cc5c3ff61fafeb25301728e6cd11d68d31
-MISC ChangeLog 20947 RMD160 47fec6b73f3233ee1bee539e1049c86a625b979a SHA1 942e08e40d9bba3e76c7245280b363560243edab SHA256 8926393b7bf7a0627864d672ce8c66e646219d5f98a96f3376ecedb50c49a356
+EBUILD autoconf-2.67.ebuild 1411 RMD160 9fe3b2be26861b6def0bf31292310da3b1523502 SHA1 f659364b9ca7879b418e0c67e0bf298711a879da SHA256 707423d0973348c29bf376042fccfaedfe59f2df4c2e20ac53c6e779c26d0e7a
+EBUILD autoconf-9999.ebuild 1411 RMD160 b23eb9753a11a861018cdffefe7fe608b01f8399 SHA1 eff0c8318cdc6317735ccf23e4d81f01351b10cc SHA256 6c9689bff252ff4cba322992b4887c99c5151d2f06d810d2cd0b697cd57c7d7a
+MISC ChangeLog 21097 RMD160 2f9dcfff66fe33816d54de9ed12e2ac31f206e81 SHA1 c1a69e1cacce5a7b6792cc1c72c314ef5e9e301c SHA256 3d00cb4b338c162a8c9fd989c744210782ae258e73d26a72ee6fa7f03d8eaf57
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iF4EAREIAAYFAkyWjpUACgkQTwhj9JtAlp5mlgD/RjjVcmEtlABFtJRh1eQD99MY
+q/TdPZvr38vxjYOt9vsBAL3ECpOpkxnyi9E6yRWHAjOa1KnUpUdFBnTCXuZHsUJD
+=N9AV
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/autoconf/autoconf-2.67.ebuild b/sys-devel/autoconf/autoconf-2.67.ebuild
index 390141ac2d1b..3a68fd9d4024 100644
--- a/sys-devel/autoconf/autoconf-2.67.ebuild
+++ b/sys-devel/autoconf/autoconf-2.67.ebuild
@@ -1,17 +1,25 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.3 2010/09/07 19:30:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-2.67.ebuild,v 1.4 2010/09/19 22:28:55 vapier Exp $
 
 EAPI="2"
 
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git"
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+fi
+
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
-	ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="emacs"
 
 DEPEND=">=sys-apps/texinfo-4.3
@@ -21,6 +29,12 @@ RDEPEND="${DEPEND}
 	>=sys-devel/autoconf-wrapper-9-r1"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		autoreconf -f -i || die
+	fi
+}
+
 src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
diff --git a/sys-devel/autoconf/autoconf-9999.ebuild b/sys-devel/autoconf/autoconf-9999.ebuild
index e58b860ac97e..7094a701e6a6 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -1,45 +1,47 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.1 2007/11/02 06:30:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf/autoconf-9999.ebuild,v 1.2 2010/09/19 22:28:55 vapier Exp $
 
-EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git"
+EAPI="2"
 
-inherit git
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/autoconf.git"
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+fi
 
 DESCRIPTION="Used to create autoconfiguration files"
 HOMEPAGE="http://www.gnu.org/software/autoconf/autoconf.html"
-SRC_URI=""
 
 LICENSE="GPL-3"
 SLOT="2.5"
-KEYWORDS=""
 IUSE="emacs"
 
 DEPEND=">=sys-apps/texinfo-4.3
 	>=sys-devel/m4-1.4.6
 	dev-lang/perl"
 RDEPEND="${DEPEND}
-	>=sys-devel/autoconf-wrapper-4-r2"
+	>=sys-devel/autoconf-wrapper-9-r1"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
-src_unpack() {
-	git_src_unpack
-	cd "${S}"
-	if [[ ! -e configure ]] ; then
-		autoreconf || die
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		autoreconf -f -i || die
 	fi
 }
 
-src_compile() {
+src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
 	econf --program-suffix="-${PV}" || die
 	# econf updates config.{sub,guess} which forces the manpages
 	# to be regenerated which we dont want to do #146621
 	touch man/*.1
-	# From configure output:
-	# Parallel builds via `make -jN' do not work.
-	emake -j1 || die
 }
 
 src_install() {