Version bump.

(Portage version: 2.1_pre7-r4)

5 files changed, 87 insertions, 2 deletions

diff --git a/sys-apps/setarch/ChangeLog b/sys-apps/setarch/ChangeLog
index e61bca93a5c4..763bf35d6f54 100644
--- a/sys-apps/setarch/ChangeLog
+++ b/sys-apps/setarch/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/setarch
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/setarch/ChangeLog,v 1.1 2006/02/21 03:36:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setarch/ChangeLog,v 1.2 2006/04/07 23:02:28 vapier Exp $
+
+*setarch-1.9 (07 Apr 2006)
+
+  07 Apr 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/setarch-1.9-links.patch, files/Makefile, +setarch-1.9.ebuild:
+  Version bump.
 
 *setarch-1.8 (20 Feb 2006)
 
diff --git a/sys-apps/setarch/files/Makefile b/sys-apps/setarch/files/Makefile
index ba22b66b4a9a..81193b8f8931 100644
--- a/sys-apps/setarch/files/Makefile
+++ b/sys-apps/setarch/files/Makefile
@@ -9,7 +9,7 @@ all: setarch links
 setarch.i: setarch.c
 	$(CC) $(CFLAGS) -E $< -o $@
 links: setarch.i Makefile
-	LC_ALL=C sed -n '/{PER_LINUX.* ,$$/{s:[^"]*, ::;s:,.*::;s:"::g;p}' $< > links
+	LC_ALL=C sed -n '/{PER_LINUX.*} ,$$/{s:[^"]*, ::;s:,.*::;s:"::g;p}' $< > links
 
 install: setarch
 	mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man8
diff --git a/sys-apps/setarch/files/digest-setarch-1.9 b/sys-apps/setarch/files/digest-setarch-1.9
new file mode 100644
index 000000000000..344938103e3f
--- /dev/null
+++ b/sys-apps/setarch/files/digest-setarch-1.9
@@ -0,0 +1,3 @@
+MD5 4c66c066f3c7a3ff1edc573b44e5b730 setarch-1.9.tar.gz 3826
+RMD160 d706f501209934dd9800b412ab48463ba92848c9 setarch-1.9.tar.gz 3826
+SHA256 0fded8c6db7fb1770bb57dce6dff6b3328784fb14fc6e68433c1859075383c52 setarch-1.9.tar.gz 3826
diff --git a/sys-apps/setarch/files/setarch-1.9-links.patch b/sys-apps/setarch/files/setarch-1.9-links.patch
new file mode 100644
index 000000000000..0b792d97894c
--- /dev/null
+++ b/sys-apps/setarch/files/setarch-1.9-links.patch
@@ -0,0 +1,44 @@
+--- setarch.c
++++ setarch.c
+@@ -59,12 +59,12 @@
+     int perval;
+     char *target_arch, *result_arch;
+   } transitions[] = {
+-    {PER_LINUX32, "linux32", NULL},
+-    {PER_LINUX, "linux64", NULL},
++    {PER_LINUX32, "linux32", NULL} ,
++    {PER_LINUX, "linux64", NULL} ,
+ #if defined(__powerpc__) || defined(__powerpc64__)
+-    {PER_LINUX32, "ppc32", "ppc"},
++    {PER_LINUX32, "ppc32", "ppc"} ,
+     {PER_LINUX32, "ppc", "ppc"},
+-    {PER_LINUX, "ppc64", "ppc64"},
++    {PER_LINUX, "ppc64", "ppc64"} ,
+     {PER_LINUX, "ppc64pseries", "ppc64"},
+     {PER_LINUX, "ppc64iseries", "ppc64"},
+ #endif
+@@ -82,18 +82,18 @@
+     {PER_LINUX, "ia64", "ia64"},
+ #endif
+ #if defined(__s390x__) || defined(__s390__)
+-    {PER_LINUX32, "s390", "s390"},
+-    {PER_LINUX, "s390x", "s390x"},
++    {PER_LINUX32, "s390", "s390"} ,
++    {PER_LINUX, "s390x", "s390x"} ,
+ #endif
+ #if defined(__sparc64__) || defined(__sparc__)
+     {PER_LINUX32, "sparc", "sparc"},
+-    {PER_LINUX32, "sparc32", "sparc"},
+-    {PER_LINUX, "sparc64", "sparc64"},
++    {PER_LINUX32, "sparc32", "sparc"} ,
++    {PER_LINUX, "sparc64", "sparc64"} ,
+ #endif
+ #if defined(__mips64__) || defined(__mips__)
+-    {PER_LINUX32, "mips32", "mips"},
++    {PER_LINUX32, "mips32", "mips"} ,
+     {PER_LINUX32, "mips", "mips"},
+-    {PER_LINUX, "mips64", "mips64"},
++    {PER_LINUX, "mips64", "mips64"} ,
+ #endif
+     {-1, NULL, NULL}
+   };
diff --git a/sys-apps/setarch/setarch-1.9.ebuild b/sys-apps/setarch/setarch-1.9.ebuild
new file mode 100644
index 000000000000..260574442073
--- /dev/null
+++ b/sys-apps/setarch/setarch-1.9.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/setarch/setarch-1.9.ebuild,v 1.1 2006/04/07 23:02:28 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="change reported architecture in new program environment and set personality flags"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!sys-apps/linux32
+	!sys-devel/mips32
+	!sys-devel/sparc32
+	!sys-devel/ppc32"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}"/Makefile . || die
+	epatch "${FILESDIR}"/${PN}-1.8-linux-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.8-better-error.patch
+	epatch "${FILESDIR}"/${PN}-1.9-links.patch
+}
+
+src_install() {
+	make install DESTDIR="${D}" || die
+}