Fix #180922 and remove old

(Portage version: 2.1.2.7)

4 files changed, 8 insertions, 86 deletions

diff --git a/sys-apps/sparc-utils/ChangeLog b/sys-apps/sparc-utils/ChangeLog
index 844c286145e2..edd184a610b8 100644
--- a/sys-apps/sparc-utils/ChangeLog
+++ b/sys-apps/sparc-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sparc-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.24 2007/04/13 14:24:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/ChangeLog,v 1.25 2007/06/06 15:56:02 gustavoz Exp $
+
+  06 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  -sparc-utils-1.9-r3.ebuild, sparc-utils-1.9-r4.ebuild:
+  Fix #180922 and remove old
 
   13 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   sparc-utils-1.9-r4.ebuild:
diff --git a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3 b/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3
deleted file mode 100644
index 03d2c54b6bb3..000000000000
--- a/sys-apps/sparc-utils/files/digest-sparc-utils-1.9-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 50bd3e4749473b3effdb00981220f09f sparc-utils_1.9-2.diff.bz2 7992
-RMD160 5d6ed8c107897f2fa71613f7c3dd73c28f966193 sparc-utils_1.9-2.diff.bz2 7992
-SHA256 8124c0ac7d5269ecc4469b6cb0918e5f1797326025ab407822ce536af9f65829 sparc-utils_1.9-2.diff.bz2 7992
-MD5 08bf3f6d8433a1f4981a2afaa6b49a6c sparc-utils_1.9.orig.tar.gz 110080
-RMD160 9827d9ff7cb4f06d4fb3709593e341e6a3b71a2e sparc-utils_1.9.orig.tar.gz 110080
-SHA256 b652bc27f95dcf10a7626b1d2943a1084e1e0b7f9bd3a97f9a46b6688370fe4b sparc-utils_1.9.orig.tar.gz 110080
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild
deleted file mode 100644
index bb65e81bbaf1..000000000000
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r3.ebuild,v 1.3 2006/09/19 02:00:32 weeve Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Various sparc utilities from Debian GNU/Linux"
-HOMEPAGE="http://www.debian.org/"
-SRC_URI=" http://http.us.debian.org/debian/pool/main/s/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://gentoo/${PN}_${PV}-2.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* sparc"
-IUSE=""
-
-DEPEND="virtual/os-headers"
-RDEPEND="sys-apps/setarch"
-
-S=${WORKDIR}/${P}.orig
-
-# NOTE: If a system has >=sys-kernel/linux-headers-2.6.0, don't build audioctl
-#       as the SPARC sound drivers have been replaced by their ALSA equivalents
-
-pkg_setup() {
-	has_version '>=sys-kernel/linux-headers-2.6.0' && \
-		einfo "Linux 2.6 kernel headers detected, not building audioctl"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${PN}_${PV}-2.diff
-}
-
-src_compile() {
-	emake -C elftoaout-2.3 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C src piggyback piggyback64 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
-	emake -C prtconf-1.3 CC="$(tc-getCC)" all || die
-	has_version '>=sys-kernel/linux-headers-2.6.0'  || \
-		emake -C audioctl-1.3 CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	# since the debian/piggyback64.1 manpage is a pointer to the
-	# debian/piggyback.1 manpage, copy debian/piggyback.1 to
-	# debian/piggyback64.1
-
-	cp ${S}/debian/piggyback.1 ${S}/debian/piggyback64.1
-
-	dobin elftoaout-2.3/elftoaout || die
-	dobin src/piggyback || die
-	dobin src/piggyback64 || die
-	dosbin prtconf-1.3/prtconf || die
-	dosbin prtconf-1.3/eeprom || die
-
-	if ! has_version '>=sys-kernel/linux-headers-2.6.0'; then
-		dobin audioctl-1.3/audioctl || die
-		newinitd "${FILESDIR}"/audioctl.init audioctl || die
-		newconfd debian/audioctl.def audioctl || die
-		doman audioctl-1.3/audioctl.1
-	fi
-
-	doman elftoaout-2.3/elftoaout.1
-	doman prtconf-1.3/prtconf.8
-	doman prtconf-1.3/eeprom.8
-	doman debian/piggyback.1
-	doman debian/piggyback64.1
-}
-
-pkg_postinst() {
-	ewarn "In order to /usr/sbin/eeprom, make sure you build /dev/openprom"
-	ewarn "device support (CONFIG_SUN_OPENPROMIO) into the kernel, or as a"
-	ewarn "module (and that the module is loaded)."
-	ewarn ""
-	ewarn "If you are not using devfs, you can create /dev/openprom"
-	ewarn "with the following command:"
-	ewarn "\tcd /dev ; mknod openprom c 10 139"
-}
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
index 21959a41798f..0fb894a67c19 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild,v 1.2 2007/04/13 14:24:55 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sparc-utils/sparc-utils-1.9-r4.ebuild,v 1.3 2007/06/06 15:56:02 gustavoz Exp $
 
 inherit eutils toolchain-funcs
 
@@ -30,6 +30,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	epatch ${WORKDIR}/${PN}_${PV}-3.diff
+	sed -i -e 's:#include <linux/elf.h>:#include <elf.h>:' \
+	  ${S}/elftoaout*/elftoaout.c
 }
 
 src_compile() {