Version bump #133540 by Daniel Webert.

(Portage version: 2.1_rc1-r2)

4 files changed, 119 insertions, 1 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index b8d26da7d8e2..8243d8d1df91 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.34 2006/04/27 15:43:55 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.35 2006/05/17 03:09:17 vapier Exp $
+
+*lshw-02.08.01b (17 May 2006)
+
+  17 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/lshw-02.08.01b-build.patch, +lshw-02.08.01b.ebuild:
+  Version bump #133540 by Daniel Webert.
 
   27 Apr 2006; Daniel Gryniewicz <dang@gentoo.org> lshw-02.06b.ebuild:
   Marked stable on amd64 per bug #131184
diff --git a/sys-apps/lshw/files/digest-lshw-02.08.01b b/sys-apps/lshw/files/digest-lshw-02.08.01b
new file mode 100644
index 000000000000..6a011415775c
--- /dev/null
+++ b/sys-apps/lshw/files/digest-lshw-02.08.01b
@@ -0,0 +1,3 @@
+MD5 57c1bb0fec3543641c389726a8844307 lshw-B.02.08.01.tar.gz 1062265
+RMD160 7972640020f7a3e008b6640b76986d899b074f36 lshw-B.02.08.01.tar.gz 1062265
+SHA256 b5e43be355bb7192273a052704b20c4185bcbe8e3f8a66a7d55f75e246075848 lshw-B.02.08.01.tar.gz 1062265
diff --git a/sys-apps/lshw/files/lshw-02.08.01b-build.patch b/sys-apps/lshw/files/lshw-02.08.01b-build.patch
new file mode 100644
index 000000000000..b30dcf4410f2
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.08.01b-build.patch
@@ -0,0 +1,60 @@
+--- lshw-B.02.08.01/src/Makefile
++++ lshw-B.02.08.01/src/Makefile
+@@ -13,11 +13,13 @@
+ export MANDIR
+ export DATADIR
+ 
+-CXX=c++
++CXX ?= c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES)
+-LDFLAGS=-L./core/ -g
++CXXFLAGS ?= -g -Os
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
++LDFLAGS ?= -s
++LDFLAGS += -L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+--- lshw-B.02.08.01/src/core/Makefile
++++ lshw-B.02.08.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 -Os $(INCLUDES) $(DEFINES)
++CXXFLAGS ?= -g -Os
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
+ LDFLAGS=
+ LDSTATIC=
+ LIBS=
+--- lshw-B.02.08.01/src/gui/Makefile
++++ lshw-B.02.08.01/src/gui/Makefile
+@@ -1,16 +1,18 @@
+ PACKAGENAME?=lshw
+ 
+-CXX=c++
+-CC=cc
++CXX ?= c++
++CC ?= cc
+ 
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+ GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
+ INCLUDES=-I../core $(GTKINCLUDES)
+-CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
+-CFLAGS=$(CXXFLAGS) $(DEFINES)
++CXXFLAGS ?= -g -Os
++CFLAGS ?= $(CXXFLAGS)
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
++CFLAGS += -Wall $(INCLUDES) $(DEFINES)
+ GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
+ LIBS=-L../core -llshw $(GTKLIBS)
+-LDFLAGS= -Os -s
++LDFLAGS ?= -Os -s
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
diff --git a/sys-apps/lshw/lshw-02.08.01b.ebuild b/sys-apps/lshw/lshw-02.08.01b.ebuild
new file mode 100644
index 000000000000..9ca2bf0b5961
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.08.01b.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.08.01b.ebuild,v 1.1 2006/05/17 03:09:17 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~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.08.01b-build.patch
+	epatch "${FILESDIR}"/${PN}-02.06b-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() {
+	make DESTDIR="${D}" install || die "install failed"
+
+	if use gtk ; then
+		make DESTDIR="${D}" install-gui || die "install gui failed"
+	fi
+
+	dodoc README docs/*
+}