6 files changed, 6 insertions, 269 deletions
diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 70a3a088d378..b7c1158fda89 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/afbinit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.30 2014/07/22 20:29:17 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.31 2014/08/05 11:13:03 armin76 Exp $
+
+  05 Aug 2014; Raúl Porcel <armin76@gentoo.org> -afbinit-1.0.1-r5.ebuild,
+  -afbinit-1.0.1-r6.ebuild, -files/rc.afb-1.0.1-r5.patch,
+  -files/rc.afb-1.0.1-r6.patch, -files/rc.afb-1.0.1.patch:
+  old
 
   22 Jul 2014; Manuel Rüger <mrueg@gentoo.org> afbinit-1.0.1-r5.ebuild,
   afbinit-1.0.1-r6.ebuild, afbinit-1.0.1-r7.ebuild:
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r5.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r5.ebuild
deleted file mode 100644
index 9e3f32a079b8..000000000000
--- a/x11-misc/afbinit/afbinit-1.0.1-r5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 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-r5.ebuild,v 1.6 2014/07/22 20:29:17 mrueg Exp $
-
-inherit eutils
-
-DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-IUSE=""
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="-* sparc"
-
-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-r6.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r6.ebuild
deleted file mode 100644
index 22909e528385..000000000000
--- a/x11-misc/afbinit/afbinit-1.0.1-r6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 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-r6.ebuild,v 1.4 2014/07/22 20:29:17 mrueg Exp $
-
-inherit eutils
-
-DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-IUSE=""
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="-* sparc"
-
-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/files/rc.afb-1.0.1-r5.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r5.patch
deleted file mode 100644
index 33d8f5b4c420..000000000000
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r5.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
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r6.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r6.patch
deleted file mode 100644
index d02a0732cea4..000000000000
--- a/x11-misc/afbinit/files/rc.afb-1.0.1-r6.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 "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
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1.patch b/x11-misc/afbinit/files/rc.afb-1.0.1.patch
deleted file mode 100644
index 6244a4f2e40c..000000000000
--- a/x11-misc/afbinit/files/rc.afb-1.0.1.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/cat -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