Remove old, stop installing oui.txt/manuf.txt (unused), don't use a full search path for pci and usb ids which are always at the same path for Gentoo.

(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key 1CD13C8AD4301342)

5 files changed, 50 insertions, 180 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index a28ad025a9d3..0d1d7e2f192d 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.103 2012/05/04 09:17:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.104 2012/12/02 07:00:28 flameeyes Exp $
+
+*lshw-02.16b-r2 (02 Dec 2012)
+
+  02 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/lshw-02.16b-gentoo.patch, +lshw-02.16b-r2.ebuild,
+  -files/lshw-02.16b-build-v2.patch, -files/lshw-02.16b-build.patch,
+  -lshw-02.16b-r1.ebuild, -lshw-02.16b.ebuild:
+  Remove old, stop installing oui.txt/manuf.txt (unused), don't use a full
+  search path for pci and usb ids which are always at the same path for Gentoo.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> lshw-02.15b.ebuild,
   lshw-02.16b.ebuild, lshw-02.16b-r1.ebuild:
@@ -383,4 +392,3 @@
   15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, lshw-01.00.ebuild:
   Adding initial ebuild submitted by Marc Hildebrand
   <marc.hildebrand@t-online.de> in #19200.
-
diff --git a/sys-apps/lshw/files/lshw-02.16b-build.patch b/sys-apps/lshw/files/lshw-02.16b-build.patch
deleted file mode 100644
index b0270c4e1363..000000000000
--- a/sys-apps/lshw/files/lshw-02.16b-build.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- lshw-B.02.16.orig/src/core/Makefile
-+++ lshw-B.02.16/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
---- lshw-B.02.16.orig/src/gui/Makefile
-+++ lshw-B.02.16/src/gui/Makefile
-@@ -8,11 +8,10 @@
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
- LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
--LDFLAGS=
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,7 +38,6 @@
- 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--	$(STRIP) gtk-$(PACKAGENAME)
- 	
- clean:
- 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak
---- lshw-B.02.16.orig/src/Makefile
-+++ lshw-B.02.16/src/Makefile
-@@ -21,11 +21,11 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
- 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -48,18 +48,18 @@
- 
- .PHONY: core
- core:
--	+make -C core all
-+	$(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
- 	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--	+make -C po all
-+	$(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--	+make -C gui all
-+	$(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +70,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--	$(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +92,14 @@
- manuf.txt:
- 	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
- 
--install: all
-+install:
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
- 	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--	make -C po install
-+	$(MAKE) -C po install
- 
- install-gui: gui
- 	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +111,8 @@
- 	
- clean:
- 	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
--	make -C core clean
--	make -C gui clean
-+	$(MAKE) -C core clean
-+	$(MAKE) -C gui clean
- 
- .timestamp:
- 	date --utc +%Y%m%d%H%M%S > $@
diff --git a/sys-apps/lshw/files/lshw-02.16b-build-v2.patch b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
index 81404be6974d..c18d9954592d 100644
--- a/sys-apps/lshw/files/lshw-02.16b-build-v2.patch
+++ b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
@@ -75,16 +75,17 @@ Index: lshw-B.02.16/src/Makefile
  ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
  	LDFLAGS+= -Wl,--as-needed
  endif
-@@ -39,7 +39,7 @@ export CXXFLAGS
+@@ -39,27 +39,25 @@ export CXXFLAGS
  export LIBS
  export LDFLAGS
  
 -DATAFILES = pci.ids usb.ids oui.txt manuf.txt
-+DATAFILES = oui.txt manuf.txt
+-
+-all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
++all: $(PACKAGENAME) $(PACKAGENAME).1
  
- all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
- 
-@@ -48,18 +48,18 @@ all: $(PACKAGENAME) $(PACKAGENAME).1 $(D
+ .cc.o:
+ 	$(CXX) $(CXXFLAGS) -c $< -o $@
  
  .PHONY: core
  core:
@@ -106,7 +107,7 @@ Index: lshw-B.02.16/src/Makefile
  
  .PHONY: nologo
  nologo:
-@@ -70,7 +70,6 @@ static: $(PACKAGENAME)-static
+@@ -70,7 +68,6 @@ static: $(PACKAGENAME)-static
  
  $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
  	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
@@ -114,7 +115,7 @@ Index: lshw-B.02.16/src/Makefile
  
  .PHONY: compressed
  compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +92,14 @@ oui.txt:
+@@ -93,14 +90,13 @@ oui.txt:
  manuf.txt:
  	wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
  
@@ -125,13 +126,13 @@ Index: lshw-B.02.16/src/Makefile
  	$(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
  	$(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
  	$(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
- 	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
+-	$(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
 -	make -C po install
 +	$(MAKE) -C po install
  
  install-gui: gui
  	$(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +111,8 @@ install-gui: gui
+@@ -112,8 +108,8 @@ install-gui: gui
  	
  clean:
  	rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed
@@ -142,3 +143,29 @@ Index: lshw-B.02.16/src/Makefile
  
  .timestamp:
  	date --utc +%Y%m%d%H%M%S > $@
+Index: lshw-B.02.16/src/core/pci.cc
+===================================================================
+--- lshw-B.02.16.orig/src/core/pci.cc
++++ lshw-B.02.16/src/core/pci.cc
+@@ -17,7 +17,7 @@ __ID("@(#) $Id: pci.cc 2433 2012-01-10 2
+ 
+ #define PROC_BUS_PCI "/proc/bus/pci"
+ #define SYS_BUS_PCI "/sys/bus/pci"
+-#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
++#define PCIID_PATH "/usr/share/misc/pci.ids"
+ 
+ #define PCI_CLASS_REVISION      0x08              /* High 24 bits are class, low 8 revision */
+ #define PCI_VENDOR_ID           0x00    /* 16 bits */
+Index: lshw-B.02.16/src/core/usb.cc
+===================================================================
+--- lshw-B.02.16.orig/src/core/usb.cc
++++ lshw-B.02.16/src/core/usb.cc
+@@ -27,7 +27,7 @@
+ 
+ #define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
+ #define SYSBUSUSBDEVICES "/sys/bus/usb/devices"
+-#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
++#define USBID_PATH "/usr/share/misc/usb.ids"
+ 
+ #define USB_CLASS_PER_INTERFACE         0         /* for DeviceClass */
+ #define USB_CLASS_AUDIO                 1
diff --git a/sys-apps/lshw/lshw-02.16b-r1.ebuild b/sys-apps/lshw/lshw-02.16b-r2.ebuild
index 0feaaef52136..4129d35ef45c 100644
--- a/sys-apps/lshw/lshw-02.16b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.16b-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b-r1.ebuild,v 1.4 2012/05/04 09:17:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b-r2.ebuild,v 1.1 2012/12/02 07:00:28 flameeyes Exp $
 
 EAPI=4
 inherit flag-o-matic eutils toolchain-funcs
@@ -26,12 +26,13 @@ RDEPEND="gtk? ( x11-libs/gtk+:2 )
 DEPEND="${RDEPEND}
 	gtk? ( virtual/pkgconfig )
 	sqlite? ( virtual/pkgconfig )"
-RDEPEND+=" sys-apps/hwids"
+RDEPEND="${RDEPEND}
+	sys-apps/hwids"
 
 S=${WORKDIR}/${MY_P}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build-v2.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/sys-apps/lshw/lshw-02.16b.ebuild b/sys-apps/lshw/lshw-02.16b.ebuild
deleted file mode 100644
index a00610e5104b..000000000000
--- a/sys-apps/lshw/lshw-02.16b.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b.ebuild,v 1.2 2012/05/04 09:17:30 jdhore Exp $
-
-EAPI=4
-inherit flag-o-matic eutils toolchain-funcs
-
-MAJ_PV=${PV:0:${#PV}-1}
-MIN_PVE=${PV:0-1}
-MIN_PV=${MIN_PVE/b/B}
-
-MY_P="$PN-$MIN_PV.$MAJ_PV"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-IUSE="gtk sqlite static"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	sqlite? ( dev-db/sqlite:3 )"
-DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )
-	sqlite? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	use static && append-ldflags -static
-
-	local sqlite=0
-	use sqlite && sqlite=1
-
-	emake SQLITE=$sqlite all
-	if use gtk ; then
-		emake SQLITE=$sqlite gui
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc README docs/*
-	if use gtk ; then
-		emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
-		make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
-	fi
-}