Version bump to support kernels > 2.6.14, and to rename patch files to

reflect that patches are revision-neutral.  Change is required because
of kernel change in afb driver. (Thanks to Jurij Smakov and Debian Linux
for sparc.)
(Portage version: 2.1_pre4-r1)

7 files changed, 105 insertions, 7 deletions

diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 7a3c010793e9..d33353e44aa8 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/afbinit
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.10 2006/01/15 16:08:00 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.11 2006/01/31 17:04:43 fmccor Exp $
+
+*afbinit-1.0.1-r3 (31 Jan 2006)
+
+  31 Jan 2006; Ferris McCormick <fmccor@gentoo.org>
+  -files/rc.afb-1.0.1-r2.patch, +files/afbinit-mmap-1.0.1.patch,
+  +files/rc.afb-1.0.1.patch, afbinit-1.0.1-r2.ebuild,
+  +afbinit-1.0.1-r3.ebuild:
+  Version bump to support kernels > 2.6.14, and to rename patch files to
+  reflect that patches are revision-neutral.  Change is required because
+  of kernel change in afb driver. (Thanks to Jurij Smakov and Debian Linux
+  for sparc.)
 
   15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> -afbinit-1.0.1.ebuild,
   -afbinit-1.0.1-r1.ebuild:
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
index 979732170ce1..64f903f55916 100644
--- a/x11-misc/afbinit/Manifest
+++ b/x11-misc/afbinit/Manifest
@@ -1,6 +1,27 @@
-MD5 3659bb919107cdf93b5db26a85dab859 ChangeLog 1878
-MD5 567295d2515c5530fe088cdcb39f996f afbinit-1.0.1-r2.ebuild 1067
+MD5 1ce4f1bedd6522461752354ae07e37eb ChangeLog 2284
+RMD160 ff334d3201ec3569b0bde5dcae0619b36978e057 ChangeLog 2284
+SHA256 9e13f0d83e9301a89deb8e415b1d048953998162f70498d64109ad46a2c1e636 ChangeLog 2284
+MD5 abf68bbb855558d7c87962e396ac8323 afbinit-1.0.1-r2.ebuild 1066
+RMD160 a815223da9485d2402e246875f0526d9fb84e647 afbinit-1.0.1-r2.ebuild 1066
+SHA256 bb73aca0ebbec516c4f0f08e25f3702a11375571650512c33a1309c41df19180 afbinit-1.0.1-r2.ebuild 1066
+MD5 6e9b5e18a33f49061f0f284bdfd9be8c afbinit-1.0.1-r3.ebuild 1220
+RMD160 254dcd9691ccc582da7a7376e36519ec54a2c52e afbinit-1.0.1-r3.ebuild 1220
+SHA256 d623e1d0c31487ce832d40f0e76dca41bc094fd9f184610936782e8a916682a6 afbinit-1.0.1-r3.ebuild 1220
+MD5 163fa6473d133463880116d9d914a0a0 files/afbinit-mmap-1.0.1.patch 503
+RMD160 ee6b2ccd972f984b7b37894d8674f96696315925 files/afbinit-mmap-1.0.1.patch 503
+SHA256 db68c9c298f71ee5d00915bb866b02067d8297e1703187843d4fd5d470834be3 files/afbinit-mmap-1.0.1.patch 503
 MD5 34f493b78ca8cca867093f1be6860683 files/afbinit.init 354
+RMD160 476a6079dff99b3f72d9a16bfebe6f448385c3fa files/afbinit.init 354
+SHA256 facd9acc8c135c0aa95106ecc67dd771969d688bc3084a066d980839dd0e985a files/afbinit.init 354
 MD5 90bf5556bac035420dd69ae4466ff9a2 files/digest-afbinit-1.0.1-r2 64
-MD5 194a2423d8a3f0398f958d989f891c91 files/rc.afb-1.0.1-r2.patch 1594
+RMD160 838fbfc44b140a380b85ceeb9249f02832487721 files/digest-afbinit-1.0.1-r2 64
+SHA256 4dcc89d3f4741346c968cb1eac9b8712f24f73d9a849a89e591fe41c530361a0 files/digest-afbinit-1.0.1-r2 64
+MD5 a824a8f086f340320f503e743a9871c5 files/digest-afbinit-1.0.1-r3 238
+RMD160 6797b1248762351ad6fe871bf74e2ffe95a3efb9 files/digest-afbinit-1.0.1-r3 238
+SHA256 07dd403ce6923ae6af4fa3a219483c4413f1d3b2541975517b14de8af99cf138 files/digest-afbinit-1.0.1-r3 238
+MD5 194a2423d8a3f0398f958d989f891c91 files/rc.afb-1.0.1.patch 1594
+RMD160 8708a80f12cc4b43e413bb2ceb77f8c3c852811d files/rc.afb-1.0.1.patch 1594
+SHA256 914de2c94af9e0b74814a975167953b93eba573e0a29ecf93a7bff4d41f4b6de files/rc.afb-1.0.1.patch 1594
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
+RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc metadata.xml 165
+SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec metadata.xml 165
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild
index 12bd0e10c45d..01e70c1f5d20 100644
--- a/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild
+++ b/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild,v 1.5 2004/10/22 19:19:26 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/afbinit-1.0.1-r2.ebuild,v 1.6 2006/01/31 17:04:43 fmccor Exp $
 
 inherit eutils
 
@@ -21,7 +21,7 @@ src_unpack() {
 	# Patch rc.afb to handle both kernels 2.4.x and 2.6.x
 	einfo "Patching to handle both kernel 2.4.x and 2.6.x style afb identification"
 	cd ${S}
-	epatch ${FILESDIR}/rc.afb-${PVR}.patch || die "Cannot patch rc.afb init script"
+	epatch ${FILESDIR}/rc.afb-${PV}.patch || die "Cannot patch rc.afb init script"
 }
 
 src_compile() {
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r3.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r3.ebuild
new file mode 100644
index 000000000000..2c7fc7b7ba36
--- /dev/null
+++ b/x11-misc/afbinit/afbinit-1.0.1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/afbinit-1.0.1-r3.ebuild,v 1.1 2006/01/31 17:04:43 fmccor Exp $
+
+inherit eutils
+
+DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
+HOMEPAGE="I dont have a home :("
+SRC_URI="http://cvs.gentoo.org/~weeve/files/${P}.tar.bz2"
+IUSE=""
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	##
+	# Patch rc.afb to handle both kernels 2.4.x and 2.6.x
+	einfo "Patching to handle both kernel 2.4.x and 2.6.x style afb identification"
+	cd ${S}
+	epatch ${FILESDIR}/rc.afb-${PV}.patch || die "Cannot patch rc.afb init script"
+	einfo 'Patching afbinit.c to use MMAP_PUBLIC (needed for kernels > 2.6.14)'
+	epatch ${FILESDIR}/afbinit-mmap-${PV}.patch || die "Cannot patch for mmap"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	dosbin afbinit
+	dosbin rc.afb
+	exeinto /etc/init.d ; newexe ${FILESDIR}/afbinit.init afbinit
+}
+
+pkg_postinst() {
+	einfo "To use afbinit, you'll need the AFB microcode."
+	einfo "This is available via a Solaris install at /usr/lib/afb.ucode"
+	einfo "or via sun.com"
+}
diff --git a/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch b/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
new file mode 100644
index 000000000000..43a16c0cbf49
--- /dev/null
+++ b/x11-misc/afbinit/files/afbinit-mmap-1.0.1.patch
@@ -0,0 +1,20 @@
+--- afbinit.c-	2006-01-31 15:21:31.000000000 +0000
++++ afbinit.c	2006-01-31 15:22:23.000000000 +0000
+@@ -236,7 +236,7 @@
+ 	/* MMAP the registers. */
+ 	uregs = mmap(0, 0x2000,
+ 		     PROT_READ | PROT_WRITE,
+-		     MAP_PRIVATE,
++		     MAP_SHARED,
+ 		     afb_fd,
+ 		     0x04000000);
+ 	if (uregs == (void *)-1L) {
+@@ -246,7 +246,7 @@
+ 
+ 	kregs = mmap(0, 0x2000,
+ 		     PROT_READ | PROT_WRITE,
+-		     MAP_PRIVATE,
++		     MAP_SHARED,
+ 		     afb_fd,
+ 		     0x0bc04000);
+ 	if (kregs == (void *)-1L) {
diff --git a/x11-misc/afbinit/files/digest-afbinit-1.0.1-r3 b/x11-misc/afbinit/files/digest-afbinit-1.0.1-r3
new file mode 100644
index 000000000000..2463ee5c7015
--- /dev/null
+++ b/x11-misc/afbinit/files/digest-afbinit-1.0.1-r3
@@ -0,0 +1,3 @@
+MD5 e8fe8ac0fc16d942ff3b1508e8324e6a afbinit-1.0.1.tar.bz2 3288
+RMD160 3b401ce48ad3f135c2548b293df906dc7ddd6068 afbinit-1.0.1.tar.bz2 3288
+SHA256 3a9b246b34f9b518f2e9a143e5c9faacd0197baa4e5dd13f82ce3c336a3c285c afbinit-1.0.1.tar.bz2 3288
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r2.patch b/x11-misc/afbinit/files/rc.afb-1.0.1.patch
index 6244a4f2e40c..6244a4f2e40c 100644
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r2.patch
+++ b/x11-misc/afbinit/files/rc.afb-1.0.1.patch