Update patch so that USE=gtk won't fail if sqlite3 is not present. Make the ebuild depend on hwids and not install its own ids files.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 216 insertions, 11 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 6044d9225c69..a40765b65c44 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,13 @@
 # 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.99 2012/01/11 23:01:23 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.100 2012/04/08 22:04:23 flameeyes Exp $
+
+*lshw-02.16b-r1 (08 Apr 2012)
+
+  08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  +files/lshw-02.16b-build-v2.patch, +lshw-02.16b-r1.ebuild:
+  Update patch so that USE=gtk won't fail if sqlite3 is not present. Make the
+  ebuild depend on hwids and not install its own ids files.
 
 *lshw-02.16b (11 Jan 2012)
 
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 2da607d26a96..9da4d458df19 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87
+AUX lshw-02.16b-build-v2.patch 4223 RMD160 620930c1d345eb43654297230f8bdb8d52cfd367 SHA1 b93835d2fc7d89bea1dd1c25d99771183815981a SHA256 5ac734b5af5bd9171bd2bf17da6ed741671404754c7d3118b898a6777e2f7923
 AUX lshw-02.16b-build.patch 3226 RMD160 aed7ebd43f8090ab30f2964809522807d0bc24aa SHA1 4b4c6eafb3bd73dfc2165cec777ccb939ec480ff SHA256 7813d3df67e4f5566fb00bb78a41bef1e9e1dec871c0a624c65e555c12d3a07d
 DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6
 DIST lshw-B.02.16.tar.gz 1845891 RMD160 8e187990e501acc87208162f166d0671151fd82e SHA1 d2359c79c28568d8b717060314422542b7fd813c SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb
 EBUILD lshw-02.15b.ebuild 1414 RMD160 de01381b03e4744e86c64dcfdd16649d24761adc SHA1 96c676842e402b4e7e8db5e1f62bee547f2106ff SHA256 e7e164fdc6b0d13ee8541c1d4491defa6230b73d3f8f7898683c3166778f0572
+EBUILD lshw-02.16b-r1.ebuild 1322 RMD160 2219010c491adc16d97b58b820d85463006409a1 SHA1 435b34fcb09af14061dbc415d7fd3e4e0710c98f SHA256 46acb4bfb2c2fdf0d5443719922e2b5980e395a8737bda0612933321df9dc188
 EBUILD lshw-02.16b.ebuild 1316 RMD160 7f7b82be0076238abd63c43e7212fbf44c8771e0 SHA1 92bae56346b1647e569d21de98abd0e0c0ee71f3 SHA256 1393efc2098aed9ccb40afbe749999273343d41bcca1473012f6b7681ad4d45c
-MISC ChangeLog 11894 RMD160 02789d4c3f135da2a021d265cc000b9367f9eb7a SHA1 2b68cd2d22bc31fccf6c8f637c49d6ae6dac4104 SHA256 65d94f8e8e1cd15aa39e11da8efc99aa11cafe22e7f05828f9b6675345819b72
+MISC ChangeLog 12182 RMD160 1027a79e89fa1e7e2a36e0d715b9dd6dd78f1e57 SHA1 aaa98726ab3bf7b912e17032f80c27e7dd993eca SHA256 0368902c9ab009ee90bc53efcbbf003c9e1b85c3c1ccca061068c70005f89770
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPDhTJAAoJEEqz6FtPBkyj6SYH/iHN4jnMxbKCBZgJrd6u/81x
-cbiIPq2qKzO+ruDyfdSmuxCOL4bdUfPjZ8Cy3ZQtjyOpO9Idsn2ZlMCrt3y1NBmL
-vhszpatSNaFMG/KVnbM9cvTzhOkGqxHj4991dfJEvFOZVJZyNOHUXV3C6FvDTQbK
-MZI29crsO3JP8ZSwYkhgGktfRT+QbFQsgA1d3YNPPDL2xdf6KEdcBXZo3npBXNR9
-E8zGbFK8kLBGu2g2+I/xY4pPJetGEQpObj5JRqjn8mUr8r4kCi02QP4f3FgXnU7k
-JeU1fFc4FNVFSdXs1l3Yn2iZfvkggoQAWAADBPyL9oKE9lfqiv1+5HXrqnu++Jw=
-=aC8l
+iEYEARECAAYFAk+CC2oACgkQAiZjviIA2XgGNwCfcz+dYOcrORqP9YPOcGUbei8Q
+t7QAn1rHcbRM76qlQcpo+kh+aP2w3jVK
+=S6q0
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.16b-build-v2.patch b/sys-apps/lshw/files/lshw-02.16b-build-v2.patch
new file mode 100644
index 000000000000..81404be6974d
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.16b-build-v2.patch
@@ -0,0 +1,144 @@
+Index: lshw-B.02.16/src/core/Makefile
+===================================================================
+--- 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=
+ 
+Index: lshw-B.02.16/src/gui/Makefile
+===================================================================
+--- lshw-B.02.16.orig/src/gui/Makefile
++++ lshw-B.02.16/src/gui/Makefile
+@@ -1,5 +1,7 @@
+ PACKAGENAME?=lshw
+ 
++SQLITE?=0
++
+ CXX?=c++
+ CC?=cc
+ STRIP?=strip
+@@ -8,13 +10,14 @@ OBJCOPY?=objcopy
+ 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
++LIBS=-L../core -llshw -lresolv $(GTKLIBS)
++
++ifeq ($(SQLITE), 1)
++	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
++	LIBS+= $(shell pkg-config --libs sqlite3)
+ endif
+ 
+ OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
+@@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
+ 	$(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
+ 
+Index: lshw-B.02.16/src/Makefile
+===================================================================
+--- lshw-B.02.16.orig/src/Makefile
++++ lshw-B.02.16/src/Makefile
+@@ -21,11 +21,11 @@ export SQLITE
+ 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
+@@ -39,7 +39,7 @@ 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)
+ 
+@@ -48,18 +48,18 @@ all: $(PACKAGENAME) $(PACKAGENAME).1 $(D
+ 
+ .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 @@ static: $(PACKAGENAME)-static
+ 
+ $(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 @@ oui.txt:
+ 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 @@ install-gui: gui
+ 	
+ 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/lshw-02.16b-r1.ebuild b/sys-apps/lshw/lshw-02.16b-r1.ebuild
new file mode 100644
index 000000000000..64a1adc29e41
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.16b-r1.ebuild
@@ -0,0 +1,56 @@
+# 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.1 2012/04/08 22:04:23 flameeyes 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="~amd64"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+	sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+	gtk? ( dev-util/pkgconfig )
+	sqlite? ( dev-util/pkgconfig )"
+RDEPEND+=" sys-apps/hwids"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-v2.patch
+}
+
+src_compile() {
+	tc-export CC CXX AR
+	use static && append-ldflags -static
+
+	local sqlite=$(usex sqlite 1 0)
+
+	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
+}