Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use src_prepare instead of src_unpack, and update build patch.

Package-Manager: portage-2.2_rc98/cvs/Linux x86_64

4 files changed, 191 insertions, 6 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 1e9c2db0f8f7..b76e45a2a7d7 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.82 2010/04/11 20:33:36 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.83 2010/10/28 06:12:54 radhermit Exp $
+
+*lshw-02.15b (28 Oct 2010)
+
+  28 Oct 2010; Tim Harder <radhermit@gentoo.org> +lshw-02.15b.ebuild,
+  +files/lshw-02.15b-build.patch:
+  Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use
+  src_prepare instead of src_unpack, and update build patch.
 
   11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> lshw-02.14b.ebuild,
   +files/lshw-02.14b-gcc45.patch:
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 6690591be961..8b36955eab6f 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -7,16 +7,23 @@ AUX lshw-02.12.01b-build.patch 2037 RMD160 df23c0e759652dc7fba719fa9655994e1b479
 AUX lshw-02.12.01b-gcc43.patch 7081 RMD160 d9076fe5937137231c7d94f4b708bac9896c5909 SHA1 2cfb5e81731ea905b1f380e1d4b9dfc87e9146a3 SHA256 663b203e675a9cd544fce04ad8fa90e35cfc5b4b8461cd63590c574fe394907e
 AUX lshw-02.13b-gcc43.patch 228 RMD160 689e8c788224202e206eeaf048dc5878f40e577a SHA1 5de3fed88eac9e3b2a29bf2dec9d3c023bb38328 SHA256 453c965f95da16585a877e3106e7ffc441d9b220d576a8cf1d3142f617e7edf6
 AUX lshw-02.14b-gcc45.patch 471 RMD160 a1a9db9f950cf67930240b6926e20b51dcd87f4c SHA1 2723a297ae71d7df03579dd85a1ef4615332db85 SHA256 b5d1bfeef8dac9bc66397db229f4719d7fdf8f37aa0aa3e35ba5d60b84e614d5
+AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87
 DIST lshw-B.02.13.tar.gz 1324217 RMD160 388b5f549320ed5758552a4d4d2850d3959ebbf4 SHA1 e27412d47de8efb4adb3646e46affffb95dd384f SHA256 8c6f8e13246cfa62e878f90d34dc02d40e477400e512e9e1df27c668404590d3
 DIST lshw-B.02.14.tar.gz 1368757 RMD160 55fdb91992f47e6d280074a4150e5b912f9ab12b SHA1 39d61aa218e0a8558417c7f95dcca90bad3d11c1 SHA256 c9a5959348b78f6e6aa4c02a1a0249e8efacb6189f6145756af74248b4315cd8
+DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6
 EBUILD lshw-02.13b.ebuild 1218 RMD160 108dcaa39bb5ff374ce8e1f352cfa35272df8ab7 SHA1 c8f9b921c7af7a32d575b746dad2593ed6574060 SHA256 bc9fed43ba5e4c782aa3341cefc8d92d7060dcec2dae85a4867fec545814d18b
 EBUILD lshw-02.14b.ebuild 1249 RMD160 514a46f2e55d748721452f11eca1039ba6968d97 SHA1 0377f70aa6e5b44fa0daaf3943daaef37935c718 SHA256 1a508b51afca3de5a23d82face784d50337b6ae107a4c959076d40a6ee58065c
-MISC ChangeLog 9853 RMD160 a0c273d25618ef143426df0e6d16cc2dfb51cc7c SHA1 cb3d1448c1cf134ef512ce5fcc7047b66efeeff5 SHA256 70c3dd9b13fa326ff5536b7247e017ec352c7d8f038d1e806da02dfd473bd04c
+EBUILD lshw-02.15b.ebuild 1278 RMD160 863aee638733376d41b364e8348e343e5334ec42 SHA1 6ab293a95e31a1fe474a743d4b5ccc72e7deccca SHA256 0b1a64e28c3a6b25309f33af69fea204fac3c0a180838614144e5ffbf5e099b6
+MISC ChangeLog 10121 RMD160 7403be53d80c0956b2c4e1d0eaa208b24e17822f SHA1 8539fa3a0ddc5dcb033c5eb066c87c3d80cf4e20 SHA256 b698731b18df535d3c9146a06ac5e6d306892eda3b9ef57cf3ee6a396283d52a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkvCMtgACgkQiqiDRvmkBmIxOQCfTrUI9ixwK1XtarSQIRQdQbE8
-bJ0AnRLaLLbCS7bdiYZpMsYBoWCDFuy0
-=RKZ9
+iQEcBAEBAgAGBQJMyRRwAAoJEEqz6FtPBkyjN8UH/jmozN9GDQdrkL2ed5Ih/xk7
+BBOuRFPY7rRq+SejZx31THRJd1LTQcPg6G8L7rVdxlXN94xbnnX5zebFturdZ+wG
+L3CuPcq/Wvp5q3+OKlsqwrc2ti60DBl9Pivlcjaf2y2U4N3dOtS0rxOCP8nayM6/
+MZh4jG00mxb5Pk84CGpTuTbRMRR+J8FWo19J5dUKFjrv1hEcZuq2dFQOMs8rVNHB
+u2aTgCH8JNa+VWqO+njg45n5Z2dyMYhPDFE8FF19ItAl67KGDRsEDl5/ApRm8ZC5
+OdwDjt3y2U2r8kJDkQBv6ZTZoBfPHpxSsirdHHb1NiCW3szOWLCjYa7Mu0mE98M=
+=VoJT
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.15b-build.patch b/sys-apps/lshw/files/lshw-02.15b-build.patch
new file mode 100644
index 000000000000..b0ab9f850d19
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.15b-build.patch
@@ -0,0 +1,119 @@
+diff -ur lshw-B.02.15.orig/src/core/Makefile lshw-B.02.15/src/core/Makefile
+--- lshw-B.02.15.orig/src/core/Makefile	2010-10-05 02:34:27.000000000 -0700
++++ lshw-B.02.15/src/core/Makefile	2010-10-27 22:52:25.417069825 -0700
+@@ -1,10 +1,10 @@
+ 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 ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ LDSTATIC=
+ LIBS=
+ 
+diff -ur lshw-B.02.15.orig/src/gui/Makefile lshw-B.02.15/src/gui/Makefile
+--- lshw-B.02.15.orig/src/gui/Makefile	2010-10-05 02:34:27.000000000 -0700
++++ lshw-B.02.15/src/gui/Makefile	2010-10-27 22:54:54.870258929 -0700
+@@ -8,11 +8,11 @@
+ 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 ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ CFLAGS=$(CXXFLAGS) $(DEFINES)
+ GTKLIBS=$(shell pkg-config gtk+-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 +39,6 @@
+ 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ install: all
+-	$(STRIP) gtk-$(PACKAGENAME)
+ 	
+ clean:
+ 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak
+diff -ur lshw-B.02.15.orig/src/Makefile lshw-B.02.15/src/Makefile
+--- lshw-B.02.15.orig/src/Makefile	2010-10-05 02:34:27.000000000 -0700
++++ lshw-B.02.15/src/Makefile	2010-10-27 22:53:26.010552033 -0700
+@@ -21,11 +21,13 @@
+ CXX?=c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++CXXFLAGS ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ ifeq ($(SQLITE), 1)
+ 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
+ endif
+-LDFLAGS=-L./core/ -g
++LDFLAGS ?= -g
++LDFLAGS += -L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+@@ -48,18 +50,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 +72,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 +94,14 @@
+ manuf.txt:
+ 	wget http://www.ethereal.com/distribution/manuf.txt
+ 
+-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)
+@@ -110,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/lshw-02.15b.ebuild b/sys-apps/lshw/lshw-02.15b.ebuild
new file mode 100644
index 000000000000..44b3256bb269
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.15b.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.15b.ebuild,v 1.1 2010/10/28 06:12:54 radhermit Exp $
+
+EAPI=3
+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"
+IUSE="gtk sqlite static"
+
+DEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	sqlite? ( dev-db/sqlite:3 )"
+RDEPEND="${DEPEND}"
+
+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 || die "emake failed"
+	if use gtk ; then
+		emake gui || die "emake gui failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README docs/*
+	if use gtk ; then
+		emake DESTDIR="${D}" install-gui || die "install gui failed"
+		make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
+	fi
+}