Clean up ebuild and add patch to fix includes #75168 by lukenshiro@ngi.it.

3 files changed, 59 insertions, 14 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 2fd68f9ccd89..36634158c5a4 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.13 2004/12/20 15:44:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.14 2004/12/21 22:15:01 vapier Exp $
+
+  21 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/02.00b-dev.patch,
+  lshw-02.00b.ebuild:
+  Clean up ebuild and add patch to fix includes #75168 by lukenshiro@ngi.it.
 
 *lshw-02.00b (21 Dec 2004)
 
diff --git a/sys-apps/lshw/files/02.00b-dev.patch b/sys-apps/lshw/files/02.00b-dev.patch
new file mode 100644
index 000000000000..4b381b350cd7
--- /dev/null
+++ b/sys-apps/lshw/files/02.00b-dev.patch
@@ -0,0 +1,27 @@
+No real reason to force including of kernel headers in order
+to get at the major/minor functions since libc provides them.
+
+http://bugs.gentoo.org/show_bug.cgi?id=75168
+
+--- lshw-B.02.00/src/core/osutils.cc.orig	2004-12-21 17:02:04.562016784 -0500
++++ lshw-B.02.00/src/core/osutils.cc	2004-12-21 17:02:24.910923280 -0500
+@@ -7,10 +7,6 @@
+ #include <limits.h>
+ #include <stdlib.h>
+ #include <ctype.h>
+-#include <linux/fs.h>
+-#ifndef MINOR
+-#include <linux/kdev_t.h>
+-#endif
+ 
+ static char *id =
+   "@(#) $Id: 02.00b-dev.patch,v 1.1 2004/12/21 22:15:01 vapier Exp $";
+@@ -250,7 +246,7 @@
+   {
+     char devid[80];
+                                                                                 
+-    snprintf(devid, sizeof(devid), "%ud:%ud", (unsigned int)MAJOR(buf.st_rdev), (unsigned int)MINOR(buf.st_rdev));
++    snprintf(devid, sizeof(devid), "%ud:%ud", (unsigned int)major(buf.st_rdev), (unsigned int)minor(buf.st_rdev));
+     return string(devid);
+   }
+   else
diff --git a/sys-apps/lshw/lshw-02.00b.ebuild b/sys-apps/lshw/lshw-02.00b.ebuild
index 4d09312e4d66..76cda61f6817 100644
--- a/sys-apps/lshw/lshw-02.00b.ebuild
+++ b/sys-apps/lshw/lshw-02.00b.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.00b.ebuild,v 1.1 2004/12/20 15:44:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.00b.ebuild,v 1.2 2004/12/21 22:15:01 vapier Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils toolchain-funcs
 
 MAJ_PV=${PV:0:5}
 MIN_PVE=${PV:5:7}
@@ -15,30 +15,44 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE="gtk2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gtk"
 
 DEPEND="virtual/libc
-	gtk2? ( >=x11-libs/gtk+-2 )"
+	gtk? ( >=x11-libs/gtk+-2 )"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "/^CXXFLAGS/s/-Os/${CXXFLAGS}/" \
+		-e '/^CXX=/d' -e '/^CC=/d' \
+		src/{gui/,core/,}/Makefile \
+		|| die "sed failed"
+
+	epatch ${FILESDIR}/${PV}-dev.patch #75168
+
 	# cpuid.cc uses inline asm and can not be linked when
 	# position independent code is desired.
 	filter-flags -fPIC
-	sed -i -e "/^CXXFLAGS/s/-Os/${CXXFLAGS}/" src/{gui/,core/,}/Makefile || die
-	emake || die
-	if use gtk2; then
-		emake gui || die
+}
+
+src_compile() {
+	tc-export CC CXX AR
+	emake || die "make failed"
+	if use gtk ; then
+		emake gui || die "make gui failed"
 	fi
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "install failed"
 
-	if use gtk2; then
-		make DESTDIR=${D} install-gui || die
+	if use gtk ; then
+		make DESTDIR="${D}" install-gui || die "install gui failed"
 	fi
 
 	dodoc TODO docs/proc_usb_info.txt