7 files changed, 82 insertions, 11 deletions
diff --git a/sys-devel/sparc32/ChangeLog b/sys-devel/sparc32/ChangeLog
index c772fdde2139..ba4d6c67d006 100644
--- a/sys-devel/sparc32/ChangeLog
+++ b/sys-devel/sparc32/ChangeLog
@@ -1,5 +1,14 @@
 # ChangeLog for sys-devel/sparc32
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.6 2003/10/07 19:18:03 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/ChangeLog,v 1.7 2004/05/05 08:05:38 kumba Exp $
+
+*sparc32-1.1-r2 (05 May 2004)
+
+  05 May 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/sparc32-1.1-no-kern-headers.patch, sparc32-1.1-r1.ebuild,
+  +sparc32-1.1-r2.ebuild, sparc32-1.1.ebuild:
+  Keyword/Copyright date cleanups for -r0 and -r1. -r2 has a new patch that
+  avoids the use of kernel headers and uses the personality calls provided by
+  glibc itself.
 
 *sparc32-1.1-r1 (07 Oct 2003)
 
diff --git a/sys-devel/sparc32/Manifest b/sys-devel/sparc32/Manifest
index 4426a33b0292..c7affd5c78f5 100644
--- a/sys-devel/sparc32/Manifest
+++ b/sys-devel/sparc32/Manifest
@@ -1,8 +1,11 @@
-MD5 7c0b2861e998c5ef0d20bc08cd04822b sparc32-1.1-r1.ebuild 657
-MD5 d05ad85b6632be2fcc1eed5d77c82133 sparc32-1.1.ebuild 618
 MD5 941fe950b43f4bd671bcd65a35ffbaa7 ChangeLog 1030
 MD5 a3aba6d4a459cd3452dab3ee616b6dd9 metadata.xml 412
-MD5 b76985155a715ac1a94ec01f6415f54f files/sparc32-1.1-fhs.patch 748
-MD5 5ea48e6b729c050e570294ab64cdb34c files/sparc32-1.1-include.patch 1169
+MD5 7c0b2861e998c5ef0d20bc08cd04822b sparc32-1.1-r1.ebuild 657
+MD5 d05ad85b6632be2fcc1eed5d77c82133 sparc32-1.1.ebuild 618
+MD5 43745c6d15f4b09ca207214411c7816f sparc32-1.1-r2.ebuild 667
 MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1 58
 MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r1 58
+MD5 b76985155a715ac1a94ec01f6415f54f files/sparc32-1.1-fhs.patch 748
+MD5 5ea48e6b729c050e570294ab64cdb34c files/sparc32-1.1-include.patch 1169
+MD5 1eee7426cb56176b09fbf91cfdcd8157 files/digest-sparc32-1.1-r2 58
+MD5 90dd145372baffc21ee0bae867fe79ea files/sparc32-1.1-no-kern-headers.patch 665
diff --git a/sys-devel/sparc32/files/digest-sparc32-1.1-r2 b/sys-devel/sparc32/files/digest-sparc32-1.1-r2
new file mode 100644
index 000000000000..44a30ae91c6d
--- /dev/null
+++ b/sys-devel/sparc32/files/digest-sparc32-1.1-r2
@@ -0,0 +1 @@
+MD5 1e6dc2f7102f53cd7e5f90acbe8232e8 sparc32-1.1.tgz 1545
diff --git a/sys-devel/sparc32/files/sparc32-1.1-no-kern-headers.patch b/sys-devel/sparc32/files/sparc32-1.1-no-kern-headers.patch
new file mode 100644
index 000000000000..cc10662b3d08
--- /dev/null
+++ b/sys-devel/sparc32/files/sparc32-1.1-no-kern-headers.patch
@@ -0,0 +1,25 @@
+diff -Naurp sparc32-1.1.orig/sparc32.c sparc32-1.1/sparc32.c
+--- sparc32-1.1.orig/sparc32.c	1999-09-24 14:16:41.000000000 -0400
++++ sparc32-1.1/sparc32.c	2004-05-05 03:38:37.039139000 -0400
+@@ -1,10 +1,10 @@
+ /* (C) 1998,1999 Jakub Jelinek under terms of GPL */
+-#include <linux/personality.h>
+-#include <linux/unistd.h>
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/utsname.h>
++#include <sys/personality.h>
+ 
+ #ifndef PER_LINUX32
+ #define PER_LINUX32 8
+@@ -13,8 +13,6 @@
+ #define PER_LINUX_32BIT 0x0800000
+ #endif
+ 
+-_syscall1(int, personality, long, pers);
+-
+ int main(int argc, char **argv)
+ {
+ 	char *p = strrchr(argv[0], '/');
diff --git a/sys-devel/sparc32/sparc32-1.1-r1.ebuild b/sys-devel/sparc32/sparc32-1.1-r1.ebuild
index fb008707e403..a2adc1c33342 100644
--- a/sys-devel/sparc32/sparc32-1.1-r1.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r1.ebuild,v 1.2 2004/02/23 00:23:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r1.ebuild,v 1.3 2004/05/05 08:05:38 kumba Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.auxio.org/pub/linux/SOURCES/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="sparc -x86 -ppc"
+KEYWORDS="-* sparc"
 IUSE=""
 
 DEPEND="virtual/glibc"
diff --git a/sys-devel/sparc32/sparc32-1.1-r2.ebuild b/sys-devel/sparc32/sparc32-1.1-r2.ebuild
new file mode 100644
index 000000000000..d1952a2e5349
--- /dev/null
+++ b/sys-devel/sparc32/sparc32-1.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1-r2.ebuild,v 1.1 2004/05/05 08:05:38 kumba 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/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-no-kern-headers.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install () {
+	dobin sparc32
+	dosym sparc32 /usr/bin/sparc64
+	doman sparc32.8
+	doman sparc64.8
+}
diff --git a/sys-devel/sparc32/sparc32-1.1.ebuild b/sys-devel/sparc32/sparc32-1.1.ebuild
index 42995356e1b4..99354c22f891 100644
--- a/sys-devel/sparc32/sparc32-1.1.ebuild
+++ b/sys-devel/sparc32/sparc32-1.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1.ebuild,v 1.6 2004/02/23 00:23:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparc32/sparc32-1.1.ebuild,v 1.7 2004/05/05 08:05:38 kumba Exp $
 
 DESCRIPTION="A SPARC32 compilation environment."
 LICENSE="GPL-2"
 SRC_URI="ftp://ftp.auxio.org/pub/linux/SOURCES/${P}.tgz"
 SLOT="0"
 
-KEYWORDS="sparc -x86 -ppc"
+KEYWORDS="-* sparc"
 
 S=${WORKDIR}/${P}