Added patch/symlinks for linux{32,64} to work with the same exec name as sys-apps/linux32... makes env-switching scripts play nicer cross platform.

5 files changed, 67 insertions, 11 deletions

diff --git a/sys-devel/sparc32/ChangeLog b/sys-devel/sparc32/ChangeLog
index 2f9f6b689676..d7185e0f590e 100644
--- a/sys-devel/sparc32/ChangeLog
+++ b/sys-devel/sparc32/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/sparc32
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.9 2004/10/02 15:38:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.10 2004/12/19 11:18:02 eradicator Exp $
+
+*sparc32-1.1-r3 (19 Dec 2004)
+
+  19 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sparc32-1.1-linux32.patch, +sparc32-1.1-r3.ebuild:
+  Added patch/symlinks for linux{32,64} to work with the same exec name as
+  sys-apps/linux32... makes env-switching scripts play nicer cross platform.
 
   02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sparc32-1.1-r1.ebuild, sparc32-1.1-r2.ebuild:
diff --git a/sys-devel/sparc32/Manifest b/sys-devel/sparc32/Manifest
index 7239611276e4..a3ea95410eab 100644
--- a/sys-devel/sparc32/Manifest
+++ b/sys-devel/sparc32/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 99763ba0132dc9b381f5f3f95f6ea163 ChangeLog 1603
 MD5 a3aba6d4a459cd3452dab3ee616b6dd9 metadata.xml 412
 MD5 5dff3c3ba6dbb74e18ae379820f33dc9 sparc32-1.1-r1.ebuild 642
 MD5 d88451a7ab108ee9c506834bf7b72f50 sparc32-1.1-r2.ebuild 659
 MD5 22291591eb38a3620021c01017449090 sparc32-1.1.ebuild 591
+MD5 ba78e4bcf8fc318443f3820cfc6d10fc sparc32-1.1-r3.ebuild 856
 MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1 58
 MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r1 58
 MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r2 58
 MD5 b76985155a715ac1a94ec01f6415f54f files/sparc32-1.1-fhs.patch 748
 MD5 5ea48e6b729c050e570294ab64cdb34c files/sparc32-1.1-include.patch 1169
 MD5 90dd145372baffc21ee0bae867fe79ea files/sparc32-1.1-no-kern-headers.patch 665
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD4DBQFBXstwI1lqEGTUzyQRAr5UAKC41Hi5gkODq9wnyAXTWZ6pipk6KQCWMV3N
-gOSILNEE5H+1KNBpCqYY0w==
-=samC
------END PGP SIGNATURE-----
+MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r3 58
diff --git a/sys-devel/sparc32/files/digest-sparc32-1.1-r3 b/sys-devel/sparc32/files/digest-sparc32-1.1-r3
new file mode 100644
index 000000000000..44a30ae91c6d
--- /dev/null
+++ b/sys-devel/sparc32/files/digest-sparc32-1.1-r3
@@ -0,0 +1 @@
+MD5 1e6dc2f7102f53cd7e5f90acbe8232e8 sparc32-1.1.tgz 1545
diff --git a/sys-devel/sparc32/files/sparc32-1.1-linux32.patch b/sys-devel/sparc32/files/sparc32-1.1-linux32.patch
new file mode 100644
index 000000000000..22a73e891f60
--- /dev/null
+++ b/sys-devel/sparc32/files/sparc32-1.1-linux32.patch
@@ -0,0 +1,18 @@
+diff -Naur sparc32-1.1.orig/sparc32.c sparc32-1.1/sparc32.c
+--- sparc32-1.1.orig/sparc32.c	2004-12-19 03:05:42.145931000 -0800
++++ sparc32-1.1/sparc32.c	2004-12-19 03:07:31.235929096 -0800
+@@ -28,12 +28,12 @@
+ 		argv++;
+ 		argc--;
+ 	}
+-	if (!strcmp (p, "sparc32")) {
++	if (!strcmp (p, "sparc32") || !strcmp (p, "linux32")) {
+ 		if (personality(PER_LINUX32) == -1) {
+ 			if (!quiet) perror ("Error setting personality");
+ 			exit(1);
+ 		}
+-	} else if (!strcmp (p, "sparc64")) {
++	} else if (!strcmp (p, "sparc64") || !strcmp (p, "linux64")) {
+ 		struct utsname un;
+ 
+ 		if (personality(PER_LINUX_32BIT) == -1 ||
diff --git a/sys-devel/sparc32/sparc32-1.1-r3.ebuild b/sys-devel/sparc32/sparc32-1.1-r3.ebuild
new file mode 100644
index 000000000000..7f07535743e6
--- /dev/null
+++ b/sys-devel/sparc32/sparc32-1.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r3.ebuild,v 1.1 2004/12/19 11:18:02 eradicator Exp $
+
+inherit eutils
+
+DESCRIPTION="A SPARC32 compilation environment."
+HOMEPAGE=""
+SRC_URI="ftp://ftp.auxio.org/pub/linux/SOURCES/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-no-kern-headers.patch
+	epatch ${FILESDIR}/${P}-linux32.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install () {
+	dobin sparc32
+	dosym sparc32 /usr/bin/sparc64
+	dosym sparc32 /usr/bin/linux32
+	dosym sparc32 /usr/bin/linux64
+	doman sparc32.8
+	dosym sparc32.8.gz /usr/share/man/man8/linux32.8.gz
+	doman sparc64.8
+	dosym sparc64.8.gz /usr/share/man/man8/linux64.8.gz
+}