Sparc stable for best version; remove older version.

Package-Manager: portage-2.2_pre5

5 files changed, 10 insertions, 112 deletions

diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 89098ac68f4f..4e6dbc3c92b1 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/afbinit
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.26 2008/04/25 12:14:52 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.27 2008/04/25 13:31:00 fmccor Exp $
+
+  25 Apr 2008; Ferris McCormick <fmccor@gentoo.org>
+  -files/rc.afb-1.0.1-r4.patch, -afbinit-1.0.1-r4.ebuild,
+  afbinit-1.0.1-r7.ebuild:
+  Sparc stable for best version; remove older version.
 
   25 Apr 2008; Ferris McCormick <fmccor@gentoo.org> metadata.xml:
   Change herd to sparc, only sparc has a clue what to do with this.
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
index 66af9dfa7921..f3e00f7b5d8c 100644
--- a/x11-misc/afbinit/Manifest
+++ b/x11-misc/afbinit/Manifest
@@ -1,14 +1,12 @@
 AUX afbinit-mmap-1.0.1.patch 503 RMD160 ee6b2ccd972f984b7b37894d8674f96696315925 SHA1 c76f41befc54ac812a3e4ad01fa20f670242a703 SHA256 61e3d377bba7f04b0e0fb5c68505ccd953d4a644a2b2c5abc837f5b507eb5823
 AUX afbinit.init 354 RMD160 476a6079dff99b3f72d9a16bfebe6f448385c3fa SHA1 86f350b69d3eadaf06554ddc035c43c44bc10d22 SHA256 facd9acc8c135c0aa95106ecc67dd771969d688bc3084a066d980839dd0e985a
-AUX rc.afb-1.0.1-r4.patch 1595 RMD160 ef429c85d08e94691028a332ea6bc0cdac54203a SHA1 a7117e471b44b502d55e9e079fd5cbc2468a8225 SHA256 667105f3ef3b2b26baf4d2e52701e2e69fbcdc12a09119297538e5ade1a0bdb9
 AUX rc.afb-1.0.1-r5.patch 1593 RMD160 5a4359d05d6a0a1b98710028af58ddc9478ce332 SHA1 4858afab1b4b0673488a88d55d98f797ae356dc7 SHA256 0ef3ea485f801f737cbb2f860f8ed6a6cf02733b534f14bdb76eb19e99b0ece7
 AUX rc.afb-1.0.1-r6.patch 1588 RMD160 51675be34c50567020bc35cad3401b897e2a5901 SHA1 a9c9a78ebc59ea331b2970d73779ccbfe1a963b8 SHA256 c428d5349616522077c4e29240b63f6c88ddf119d4086c2bbbf68aef733a685f
 AUX rc.afb-1.0.1-r7.patch 1531 RMD160 b140b3a5db545d1039438ac41e44e172f05d05ce SHA1 e77ce6bb29a58b24ea7e1674c9ecbcacd188465e SHA256 4bedb8bdd965d5b8de2258c0a38e1298d1d6dff6726659d49a7966802cea88a4
 AUX rc.afb-1.0.1.patch 1594 RMD160 8708a80f12cc4b43e413bb2ceb77f8c3c852811d SHA1 ce9eff84486241f973e4102e0a93e9fc80a31047 SHA256 914de2c94af9e0b74814a975167953b93eba573e0a29ecf93a7bff4d41f4b6de
 DIST afbinit-1.0.1.tar.bz2 3288 RMD160 3b401ce48ad3f135c2548b293df906dc7ddd6068 SHA1 f6051c679aa4776fdabb1b5f012b935d31312519 SHA256 3a9b246b34f9b518f2e9a143e5c9faacd0197baa4e5dd13f82ce3c336a3c285c
-EBUILD afbinit-1.0.1-r4.ebuild 1244 RMD160 92e71139fb131fab4173c1dbf307d2b410ba2ba7 SHA1 b251b37398fd0ba38e22f6a3d7097852c415245f SHA256 3b37a9c380f82c68349c726e899c44a524ab3b26f76dfeb985ee0b1046da30d8
 EBUILD afbinit-1.0.1-r5.ebuild 1252 RMD160 2c5436d446a4188035943b59813c6228d15c7fdc SHA1 95462cb99a881afaac746704734d0f960233e1c4 SHA256 60b890805418f3e51811204cdb3ca3aaefc78118e6c31997fdf6a0182e2574fc
 EBUILD afbinit-1.0.1-r6.ebuild 1249 RMD160 b222a6d312c72e86fd331822b2c8d4554eef00a6 SHA1 9980aab471745845410650162addd055f1de78f3 SHA256 850b6959e481f0fe5336ba4579ef998df9b40ad3703829a61ae7abbf4d16b440
-EBUILD afbinit-1.0.1-r7.ebuild 1250 RMD160 f96270d6e8ad8432468e3e6ad5f63fcb1a7ac199 SHA1 097f6a489ef89455e9314cbda5c2fa87a8504e2b SHA256 0e489fe0e846896910c4dc829d9cee01c9d72d5f40c8bd9bc89cfc005af412d6
-MISC ChangeLog 5896 RMD160 dd82b4edc9ea3197594120795c729fba64dfff69 SHA1 03c038f01f9505e4bbb45c3e3ebde97650b32c28 SHA256 0c0cf45807418c5f687aac29bbfb8d74ce4d0e54b2aab2cdf3b9e72daed8b851
+EBUILD afbinit-1.0.1-r7.ebuild 1249 RMD160 0cf002113fe456109545eea4020d61c562400d14 SHA1 eea00d5fa78d9dc1aead9f40024e5cf6d318c884 SHA256 d92e300a26e49ee7292e43227510e5512ad0d5ce11c6dac57a606d51d716909a
+MISC ChangeLog 6089 RMD160 c630666884d711d93d7b44c8b65fb2ff12e51b9d SHA1 37142214b17ebad328d7ae775e754ca8660787b7 SHA256 773ddde68baa5c51b5b2b39cecf2de066241e4cbd56acb89a9d454f8e74c2288
 MISC metadata.xml 226 RMD160 e3706f640aabd4bbc8a7f9c7b331d8a19419ca15 SHA1 2fc64d67bb136da4588257d982d0d9c64aed19c5 SHA256 3e8f9051415b50020f656bb800a3c919340e7c4d688fce8cadc7805e3a4e7df1
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r4.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r4.ebuild
deleted file mode 100644
index d2dec9f5a3fb..000000000000
--- a/x11-misc/afbinit/afbinit-1.0.1-r4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 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-r4.ebuild,v 1.5 2007/07/13 05:09:41 mr_bones_ 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"
-RDEPEND="${DEPEND}
-	sys-apps/util-linux"
-
-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-${PVR}.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
-	newinitd ${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/afbinit-1.0.1-r7.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
index aeea8c55e714..79f4103b826c 100644
--- a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
+++ b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r7.ebuild,v 1.1 2008/03/18 18:16:23 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild,v 1.2 2008/04/25 13:31:00 fmccor Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ IUSE=""
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="-* ~sparc"
+KEYWORDS="-* sparc"
 
 DEPEND="virtual/libc"
 RDEPEND="${DEPEND}
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r4.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r4.patch
deleted file mode 100644
index 845be28b35f0..000000000000
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r4.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- rc.afb-	2004-05-27 17:59:23.549406000 +0000
-+++ rc.afb	2004-05-27 18:32:34.709406000 +0000
-@@ -10,25 +10,44 @@
- 	exit 0
- fi
- 
--if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -eq 0 ]
-+# The microcode loader binary and the microcode
-+# itself must exist.
-+if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
- then
- 	exit 0
- fi
- 
--# The microcode loader binary and the microcode
--# itself must exist.
--if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
-+# Make FB device list, depending on which kind of kernel we have.
-+# First, try kernel 2.4.x
-+
-+if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -gt 0 ]
- then
-+
-+	afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
-+
-+	# Load microcode onto each card.
-+	for AFB in ${afb_devs}
-+	do
-+		echo -n "${AFB}: Loading Elite3D microcode... "
-+		/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
-+		echo "done."
-+	done
- 	exit 0
- fi
-+##
-+#	OK, we're not kernel 2.4.x
-+#	try kernel 2.6.x
- 
--# Make FB device list.
--afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
-+if [ `/bin/dmesg | /bin/grep -c "ffb: AFB"` -gt 0 ]
-+then
- 
--# Load microcode onto each card.
--for AFB in ${afb_devs}
--do
--	echo -n "${AFB}: Loading Elite3D microcode... "
--	/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
--	echo "done."
--done
-+	afb_devs=`/bin/more -s /proc/fb  | /bin/egrep -i "Elite 3D" | /bin/sed 's/\ .*//'`
-+	# Load microcode onto each card.
-+	for AFB in ${afb_devs}
-+	do
-+		echo -n "/dev/fb/${AFB}: Loading Elite3D microcode... "
-+		/usr/sbin/afbinit /dev/fb/${AFB} /usr/lib/afb.ucode
-+		echo "done."
-+	done
-+	exit 0
-+fi