Sync live-git/normal ebuilds and dropped merged sh patch.

3 files changed, 24 insertions, 44 deletions

diff --git a/sys-devel/gnuconfig/ChangeLog b/sys-devel/gnuconfig/ChangeLog
index d1acaeb1dde7..12e707486733 100644
--- a/sys-devel/gnuconfig/ChangeLog
+++ b/sys-devel/gnuconfig/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gnuconfig
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/ChangeLog,v 1.36 2009/03/09 21:18:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/ChangeLog,v 1.37 2009/03/09 21:32:02 vapier Exp $
+
+  09 Mar 2009; Mike Frysinger <vapier@gentoo.org>
+  -files/99999999/0003-add-more-superh-targets-to-config.sub.patch,
+  gnuconfig-99999999.ebuild:
+  Sync live-git/normal ebuilds and dropped merged sh patch.
 
   09 Mar 2009; Mike Frysinger <vapier@gentoo.org> gnuconfig-20080928.ebuild:
   Stabilize all relevant arches.
diff --git a/sys-devel/gnuconfig/files/99999999/0003-add-more-superh-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0003-add-more-superh-targets-to-config.sub.patch
deleted file mode 100644
index 4b8ed906a7a0..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0003-add-more-superh-targets-to-config.sub.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1778a89105dbdbd11ffc7f44ead9996b7e32d5cf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 9 Oct 2008 15:51:49 -0400
-Subject: [PATCH] add more superh targets to config.sub
-
----
- config.sub |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config.sub b/config.sub
-index a31b87d..66f218c 100755
---- a/config.sub
-+++ b/config.sub
-@@ -279,7 +279,7 @@ case $basic_machine in
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
- 	| score \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -362,7 +362,7 @@ case $basic_machine in
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
- 	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--- 
-1.6.0.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index ca17649c7502..b30681bfa3b3 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -1,16 +1,21 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-99999999.ebuild,v 1.1 2008/01/30 01:38:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-99999999.ebuild,v 1.2 2009/03/09 21:32:02 vapier Exp $
 
-EGIT_REPO_URI="git://git.savannah.gnu.org/config.git"
-inherit eutils git
+inherit eutils
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="git://git.savannah.gnu.org/config.git"
+	inherit git
+else
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+fi
 
 DESCRIPTION="Updated config.sub and config.guess file from GNU"
 HOMEPAGE="http://savannah.gnu.org/projects/config"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
 IUSE=""
 
 S=${WORKDIR}
@@ -27,13 +32,17 @@ maint_pkg_create() {
 	tar -jcf ${tar} . || die "creating tar failed"
 	einfo "Packaged tar now available:"
 	einfo "$(du -b ${tar})"
-
-	epatch *.patch
 }
 
 src_unpack() {
-	git_src_unpack
-	maint_pkg_create
+	if [[ ${PV} == "99999999" ]] ; then
+		git_src_unpack
+		maint_pkg_create
+	else
+		unpack ${A}
+	fi
+	epatch "${WORKDIR}"/*.patch
+	use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
 }
 
 src_compile() { :;}