oops, version bump the right one ...

(Portage version: 2.1.3.7)

4 files changed, 117 insertions, 3 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/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
+}