7 files changed, 43 insertions, 68 deletions
diff --git a/sys-libs/libkudzu/ChangeLog b/sys-libs/libkudzu/ChangeLog
index 28ab24994d8f..9262c71b789f 100644
--- a/sys-libs/libkudzu/ChangeLog
+++ b/sys-libs/libkudzu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/libkudzu
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.38 2013/02/01 13:19:01 gmsoft Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/ChangeLog,v 1.39 2014/09/17 09:47:40 jer Exp $
+
+  17 Sep 2014; Jeroen Roovers <jer@gentoo.org> libkudzu-1.2.57.1.ebuild,
+  files/kudzu-1.2.57.1-sbusfix.patch,
+  files/kudzu-1.2.57.1-sparc-keyboard.patch, -files/ppc.patch,
+  -files/sunlance.patch, -files/typedef_byte.patch:
+  EAPI bump. perl -> sed. Clean up patches. Simplify setting ARCH.
 
   01 Feb 2013; Guy Martin <gmsoft@gentoo.org> libkudzu-1.2.57.1.ebuild:
   hppa stable
diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch
index a5a04551b34a..5c186ed631da 100644
--- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch
+++ b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sbusfix.patch
@@ -1,5 +1,5 @@
---- kudzu-1.2.57.1/sbus.c.BAD	2006-12-10 11:28:07.000000000 -0500
-+++ kudzu-1.2.57.1/sbus.c	2006-12-10 11:32:42.000000000 -0500
+--- a/sbus.c
++++ b/sbus.c
 @@ -162,6 +162,7 @@
  		    	devClass = CLASS_NETWORK;
  		} else if (!strcmp(prop, "le")) {
diff --git a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch
index 56fbe59c79fb..5626a357345d 100644
--- a/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch
+++ b/sys-libs/libkudzu/files/kudzu-1.2.57.1-sparc-keyboard.patch
@@ -1,5 +1,5 @@
---- kudzu-1.2.57.1/keyboard.c.BAD	2006-12-10 11:36:40.000000000 -0500
-+++ kudzu-1.2.57.1/keyboard.c	2006-12-10 11:44:58.000000000 -0500
+--- a/keyboard.c
++++ b/keyboard.c
 @@ -21,7 +21,6 @@
  #include "keyboard.h"
  
diff --git a/sys-libs/libkudzu/files/ppc.patch b/sys-libs/libkudzu/files/ppc.patch
deleted file mode 100644
index d3dcebea4d2e..000000000000
--- a/sys-libs/libkudzu/files/ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kudzu-1.1.62.orig/vio.c kudzu-1.1.62/vio.c
---- kudzu-1.1.62.orig/vio.c	2004-04-19 23:36:42.000000000 -0400
-+++ kudzu-1.1.62/vio.c	2005-09-06 17:58:19.000000000 -0400
-@@ -179,6 +179,7 @@
- 	}
- 
- vethdone:
-+		end = end;
-     } 
- 
-     if (probeClass & CLASS_CDROM) {
diff --git a/sys-libs/libkudzu/files/sunlance.patch b/sys-libs/libkudzu/files/sunlance.patch
deleted file mode 100644
index 0824f3fd54cf..000000000000
--- a/sys-libs/libkudzu/files/sunlance.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN kudzu-1.1.62.orig/sbus.c kudzu-1.1.62/sbus.c
---- kudzu-1.1.62.orig/sbus.c	2003-03-24 17:39:14.000000000 -0500
-+++ kudzu-1.1.62/sbus.c	2005-07-12 09:50:06.000000000 -0400
-@@ -162,7 +162,7 @@
- 		    	devClass = CLASS_NETWORK;
- 		} else if (!strcmp(prop, "le")) {
- 			type = "Sun Lance Ethernet";
--			module = "ignore";
-+			module = "sunlance";
- 		    	devClass = CLASS_NETWORK;
- 		} else if (!strcmp(prop, "qe")) {
- 			prop = prom_getproperty("channel#", &len);
diff --git a/sys-libs/libkudzu/files/typedef_byte.patch b/sys-libs/libkudzu/files/typedef_byte.patch
deleted file mode 100644
index 55a238a402cb..000000000000
--- a/sys-libs/libkudzu/files/typedef_byte.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN kudzu-1.1.62.orig/pci.c kudzu-1.1.62/pci.c
---- kudzu-1.1.62.orig/pci.c	2004-07-20 11:58:27.000000000 -0400
-+++ kudzu-1.1.62/pci.c	2005-11-16 09:38:31.000000000 -0500
-@@ -30,6 +30,7 @@
- static int numPciDevices = 0;
- static struct pci_access *pacc=NULL;
- static jmp_buf pcibuf;
-+typedef unsigned char byte;
- 
- static int devCmp(const void * a, const void * b) {
-     const struct pciDevice * one = a;
diff --git a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
index e3f743558982..89ccabdc5266 100644
--- a/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
+++ b/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild,v 1.16 2013/02/01 13:19:01 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild,v 1.17 2014/09/17 09:47:40 jer Exp $
 
-inherit eutils toolchain-funcs flag-o-matic
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="Red Hat Hardware detection tools"
 HOMEPAGE="http://rhlinux.redhat.com/kudzu/"
@@ -13,47 +14,49 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 -mips ppc ppc64 sparc x86"
 IUSE="zlib"
 
-DEPEND="dev-libs/popt
+DEPEND="
+	dev-libs/popt
+	>=sys-apps/pciutils-2.2.4[zlib?]
 	zlib? ( sys-libs/zlib )
-	>=sys-apps/pciutils-2.2.4"
-RDEPEND="${DEPEND}
+"
+RDEPEND="
+	${DEPEND}
 	sys-apps/hwdata-gentoo
-	!sys-apps/kudzu"
+	!sys-apps/kudzu
+"
 
 S=${WORKDIR}/kudzu-${PV}
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/kudzu-${PV}-sbusfix.patch \
 		"${FILESDIR}"/kudzu-${PV}-sparc-keyboard.patch
 }
 
-src_compile() {
-	tc-export CC
-	if use zlib
-	then
-		perl -pi -e 's| -lpci| -lz -lpci|g' Makefile
-	elif built_with_use --missing false sys-apps/pciutils zlib
-	then
-		die "You need to build with USE=zlib to match sys-apps/pcituils"
+src_configure() {
+	if use zlib; then
+		sed -i -e 's| -lpci| -lz -lpci|g' Makefile || die
 	fi
 	# Fix the modules directory to match Gentoo layout.
-	perl -pi -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.*
-
-	if use ppc && [ "$(tc-arch-kernel)" != "ppc" ]; then
-		emake libkudzu.a libkudzu_loader.a ARCH="ppc" \
-			RPM_OPT_FLAGS="${CFLAGS}" || die
-	else
-		emake libkudzu.a libkudzu_loader.a ARCH=$(tc-arch-kernel) \
-			RPM_OPT_FLAGS="${CFLAGS}" || die
-	fi
+	sed -i -e 's|/etc/modutils/kudzu|/etc/modules.d/kudzu|g' *.* || die
+
+	tc-export CC
+}
+
+src_compile() {
+	emake \
+		$( usex ppc ARCH='ppc' ARCH=$(tc-arch-kernel) ) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		RPM_OPT_FLAGS="${CFLAGS}" \
+		libkudzu.a libkudzu_loader.a
 }
 
 src_install() {
-	keepdir /etc/sysconfig
 	insinto /usr/include/kudzu
 	doins *.h
+
 	dolib.a libkudzu.a libkudzu_loader.a
+
+	keepdir /etc/sysconfig
 }