oops, version bump the right one ...

Package-Manager: portage-2.1.3.7

5 files changed, 136 insertions, 22 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 5e45840ebee7..e6fadd731a32 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.51 2007/08/25 15:35:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.52 2007/08/25 17:29:13 vapier Exp $
 
-*lshw-02.11b (25 Aug 2007)
+*lshw-02.11.01b (25 Aug 2007)
 
   25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
-  +files/lshw-02.11b-build.patch, +lshw-02.11b.ebuild:
+  +files/lshw-02.11.01b-build.patch, +lshw-02.11.01b.ebuild:
   Version bump #188624 by Daniel Pielmeier.
 
   14 May 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.10b.ebuild:
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 3ddfb8e260c9..300d19a5b23e 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -9,24 +9,24 @@ AUX lshw-02.09b-cpuid-PIC.patch 1058 RMD160 4c9a1234b31edc0840b7266a9cf72965b940
 MD5 d17ee131c27754ca5b6203f8f3795bad files/lshw-02.09b-cpuid-PIC.patch 1058
 RMD160 4c9a1234b31edc0840b7266a9cf72965b940fc87 files/lshw-02.09b-cpuid-PIC.patch 1058
 SHA256 69c32964a502f46ae16522bca28040ed91abe81b49889c3739ecd5708d92319d files/lshw-02.09b-cpuid-PIC.patch 1058
-AUX lshw-02.11b-build.patch 2707 RMD160 5770f6ae1f2271f771edac43b22a08098f89d140 SHA1 e70dc0bfe1eb6d06cd951565ca10fb52c345f8a0 SHA256 8060118dfe1ed805ad8b605eeb1b92cdc40f017a631ae13afe4a82998117a226
-MD5 ed39505a46d4b24adbdfc7ecf2dcfe66 files/lshw-02.11b-build.patch 2707
-RMD160 5770f6ae1f2271f771edac43b22a08098f89d140 files/lshw-02.11b-build.patch 2707
-SHA256 8060118dfe1ed805ad8b605eeb1b92cdc40f017a631ae13afe4a82998117a226 files/lshw-02.11b-build.patch 2707
+AUX lshw-02.11.01b-build.patch 2095 RMD160 abe5ce4eba439c2b7cc925769968fcd37e997885 SHA1 e152121cd2fed36ece5a70ad02a1b1da570ce16d SHA256 86e9a55153d30b56cd0b458f92d3f22fb17a74fe68359937b149e6eeb09aea48
+MD5 bac47241ae066a397378a6477789b2a8 files/lshw-02.11.01b-build.patch 2095
+RMD160 abe5ce4eba439c2b7cc925769968fcd37e997885 files/lshw-02.11.01b-build.patch 2095
+SHA256 86e9a55153d30b56cd0b458f92d3f22fb17a74fe68359937b149e6eeb09aea48 files/lshw-02.11.01b-build.patch 2095
 DIST lshw-B.02.10.tar.gz 1111483 RMD160 14f91939a144f48040e6d810b9585e3869720fbc SHA1 e1ce1a4dffcaaf667432cc644df1438932ad127f SHA256 5146b14583e3ecebc1f0af03037c7e1563ebaeb2f9689d0baa8029a1727bf503
-DIST lshw-B.02.11.tar.gz 1162501 RMD160 e452bb1282914010f7da6ff4654e0f8c73f06286 SHA1 2a4dbbbd2ce24a936ae17eee21e8f5997612bd84 SHA256 af64f837de41c15ada8f61298cb93b607fd9cb8c217506da55b584b7ca2cefe0
+DIST lshw-B.02.11.01.tar.gz 1165673 RMD160 6dc3913d04bc1cda0d44df99f1f48a8cc81ec7b7 SHA1 3a7e790b2912abb5d896a2de21c594009be52d78 SHA256 c90afa1097bc74bc980e79d4d8b49e60355753b5a04a5da49fb010bbb769b4e1
 EBUILD lshw-02.10b.ebuild 1152 RMD160 7bf951f5364725960d7c40d94d8c20fafb21e764 SHA1 f63dd40652ffba8cb666a350e31e393b581fd107 SHA256 12830b8c8349cb8a124fb756980de4dad7172f7b597370bc9bcb4372a24dd311
 MD5 70dc86917049d204dc55ac2b39415788 lshw-02.10b.ebuild 1152
 RMD160 7bf951f5364725960d7c40d94d8c20fafb21e764 lshw-02.10b.ebuild 1152
 SHA256 12830b8c8349cb8a124fb756980de4dad7172f7b597370bc9bcb4372a24dd311 lshw-02.10b.ebuild 1152
-EBUILD lshw-02.11b.ebuild 1148 RMD160 83a4cad86d54005771894b2dae7e23fe9034fd46 SHA1 80043554df382b5762c630b671ee55d1de4b88bf SHA256 4fab231f91594865047c8a2e21ef2d45aab9db4fbc7a67bf9d300bf38e69f2d5
-MD5 1468b5790dac0175915a2bb3693a6561 lshw-02.11b.ebuild 1148
-RMD160 83a4cad86d54005771894b2dae7e23fe9034fd46 lshw-02.11b.ebuild 1148
-SHA256 4fab231f91594865047c8a2e21ef2d45aab9db4fbc7a67bf9d300bf38e69f2d5 lshw-02.11b.ebuild 1148
-MISC ChangeLog 6375 RMD160 55f1a5e85897050799537c1904275925e234967b SHA1 af61e26edda96d6b47a1cbf2260b98fdfb579ec3 SHA256 c49f65304d89122ba9ba53b883901a52ee7c9673d1357d22cc547863748acd7e
-MD5 816ba9a286caa88732170d676c1488a3 ChangeLog 6375
-RMD160 55f1a5e85897050799537c1904275925e234967b ChangeLog 6375
-SHA256 c49f65304d89122ba9ba53b883901a52ee7c9673d1357d22cc547863748acd7e ChangeLog 6375
+EBUILD lshw-02.11.01b.ebuild 1154 RMD160 cfb0eaa4f92071fd659a08d908a26bc81178f02c SHA1 195034825a3665df53a7d059152c12c55aaebe8b SHA256 2e58586f087921f87d754ca5a1f9da7e8573368290e00e3cbc83650cf1bd2536
+MD5 7fd541a32fb02cd5d6273e200e32692e lshw-02.11.01b.ebuild 1154
+RMD160 cfb0eaa4f92071fd659a08d908a26bc81178f02c lshw-02.11.01b.ebuild 1154
+SHA256 2e58586f087921f87d754ca5a1f9da7e8573368290e00e3cbc83650cf1bd2536 lshw-02.11.01b.ebuild 1154
+MISC ChangeLog 6384 RMD160 5806410cf7d8816d3ea5f6660bcba295260df365 SHA1 d63431b8f1be73b50520aa6fe2d2237d95aef678 SHA256 40b16de9b97442bdbc0a4d54c3d043dedd1640a30cda79d62cd390d648a15822
+MD5 996735bc9316ef3e178e5670a59eae5b ChangeLog 6384
+RMD160 5806410cf7d8816d3ea5f6660bcba295260df365 ChangeLog 6384
+SHA256 40b16de9b97442bdbc0a4d54c3d043dedd1640a30cda79d62cd390d648a15822 ChangeLog 6384
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -34,13 +34,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 7680f9b9052e6140030ffb333526c60a files/digest-lshw-02.10b 241
 RMD160 bb849a74487d1f22cc8ebdb629a16338c950b49b files/digest-lshw-02.10b 241
 SHA256 7da355fb285fc310810d02e963df0201d6c4490738053e73f12eca153d111199 files/digest-lshw-02.10b 241
-MD5 92bdcfc76af4ffd4a35426b74cffc216 files/digest-lshw-02.11b 241
-RMD160 ab0a0f75482845841c2da4fa520c0164f3906590 files/digest-lshw-02.11b 241
-SHA256 81c1bd925696b3325b214a6158f3df626632fc74228d8518408070d767411166 files/digest-lshw-02.11b 241
+MD5 952b3515c54b5965bbd899e1e88b2821 files/digest-lshw-02.11.01b 250
+RMD160 460aaccaa04a76a252ce07a7d4303e0fe941f691 files/digest-lshw-02.11.01b 250
+SHA256 1e8aa869852260986ac448040d49ca97af8f2ac703ce6106f638438782280d11 files/digest-lshw-02.11.01b 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG0Eytp/wUKkr7RBoRAkMmAJ9tBxaeMoRZ+Zv6loQYk5D3TsJSBgCfYMt4
-L4feQl3Vwxm3BV8hv2MFFJc=
-=GWxN
+iD8DBQFG0Gc8p/wUKkr7RBoRAq8ZAKCU3Q7DvI58WiEIOA+HK6jFurY8OwCdHvpW
+QZRnvmyTxe6sGb79j2K7VZE=
+=6zIS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/digest-lshw-02.11.01b b/sys-apps/lshw/files/digest-lshw-02.11.01b
new file mode 100644
index 000000000000..eb046c08bb32
--- /dev/null
+++ b/sys-apps/lshw/files/digest-lshw-02.11.01b
@@ -0,0 +1,3 @@
+MD5 23debbc3c0a719f301861cfc079b3f4b lshw-B.02.11.01.tar.gz 1165673
+RMD160 6dc3913d04bc1cda0d44df99f1f48a8cc81ec7b7 lshw-B.02.11.01.tar.gz 1165673
+SHA256 c90afa1097bc74bc980e79d4d8b49e60355753b5a04a5da49fb010bbb769b4e1 lshw-B.02.11.01.tar.gz 1165673
diff --git a/sys-apps/lshw/files/lshw-02.11.01b-build.patch b/sys-apps/lshw/files/lshw-02.11.01b-build.patch
new file mode 100644
index 000000000000..73cd5d59dcb3
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.11.01b-build.patch
@@ -0,0 +1,63 @@
+--- lshw-B.02.11.01/src/core/Makefile
++++ lshw-B.02.11.01/src/core/Makefile
+@@ -1,9 +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)
++CXXFLAGS ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ LDFLAGS=
+ LDSTATIC=
+ LIBS=
+--- lshw-B.02.11.01/src/gui/Makefile
++++ lshw-B.02.11.01/src/gui/Makefile
+@@ -7,11 +7,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)
+-CFLAGS=$(CXXFLAGS) $(DEFINES)
++CXXFLAGS ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++CFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
+ LIBS=-L../core -llshw $(GTKLIBS)
+-LDFLAGS=
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+@@ -34,7 +34,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
+--- lshw-B.02.11.01/src/Makefile
++++ lshw-B.02.11.01/src/Makefile
+@@ -18,8 +18,10 @@
+ CXX?=c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-LDFLAGS=-L./core/ -g
++CXXFLAGS ?= -g
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++LDFLAGS ?= -g
++LDFLAGS += -L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+@@ -49,7 +51,6 @@
+ 
+ $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
+ 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+-	$(STRIP) $@
+ 
+ .PHONY: compressed
+ compressed: $(PACKAGENAME)-compressed
diff --git a/sys-apps/lshw/lshw-02.11.01b.ebuild b/sys-apps/lshw/lshw-02.11.01b.ebuild
new file mode 100644
index 000000000000..1db5958db89b
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.11.01b.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.11.01b.ebuild,v 1.1 2007/08/25 17:29:13 vapier Exp $
+
+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"
+RESTRICT="strip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="gtk static"
+
+DEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-02.11.01b-build.patch
+	epatch "${FILESDIR}"/${PN}-02.09b-cpuid-PIC.patch #61947
+}
+
+src_compile() {
+	tc-export CC CXX AR
+	use static && append-ldflags -static
+	emake || die "make failed"
+	if use gtk ; then
+		emake gui || die "make 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"
+	fi
+}