Version bump #133540 by Daniel Webert.

Package-Manager: portage-2.1_rc1-r2

5 files changed, 139 insertions, 9 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/Manifest b/sys-apps/lshw/Manifest
index 110f21e0a69b..b077a2e161df 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -13,9 +13,14 @@ AUX lshw-02.06b-cpuid-PIC.patch 1060 RMD160 4c0b55fd372c00d9d98669ca01814876d7ae
 MD5 5ba7b6610d3d3fa5450d59a99e96694c files/lshw-02.06b-cpuid-PIC.patch 1060
 RMD160 4c0b55fd372c00d9d98669ca01814876d7ae44a4 files/lshw-02.06b-cpuid-PIC.patch 1060
 SHA256 ade3c2861b315dd0ddea2cf0eada042798e596e2bff893256541b8cf2e882769 files/lshw-02.06b-cpuid-PIC.patch 1060
+AUX lshw-02.08.01b-build.patch 1661 RMD160 581c54474136d5aeb2ff36270588dd91c2ce15ec SHA1 52e759bb94a7437181b862e8a0886e0e2eccd99a SHA256 a13c57bf1a7fd298d75f9f30359326c16a3f04ec4985eaeeeb5b6c82ce40ad43 size 1661
+MD5 68e0b6c85f159426293f690d3b1b80c4 files/lshw-02.08.01b-build.patch 1661
+RMD160 581c54474136d5aeb2ff36270588dd91c2ce15ec files/lshw-02.08.01b-build.patch 1661
+SHA256 a13c57bf1a7fd298d75f9f30359326c16a3f04ec4985eaeeeb5b6c82ce40ad43 files/lshw-02.08.01b-build.patch 1661
 DIST lshw-B.02.05.01.tar.gz 974316 RMD160 4c935fa50ee876e3f95b45366de0ab6392f2f513 SHA256 06f7ab25ecf9a019444031ebb3066d02b643f44cf4f7fc29e8534efcb30011de size 974316
 DIST lshw-B.02.06.tar.gz 996420 RMD160 7da2061a38987926147a1eaf88dcea3a48ee70b1 SHA256 7692d8a8fd5f31b79abcf240ad4cd87522a338936ad0816e3fb98ebda51866bb size 996420
 DIST lshw-B.02.07.tar.gz 1041510 RMD160 ebe292c546de86128cebeb97ea2dc4d5c18a0a5c SHA256 35c2248effdea0f9e7fcd7c216757523219778f0bd600b34c7749526e777cda5 size 1041510
+DIST lshw-B.02.08.01.tar.gz 1062265 RMD160 7972640020f7a3e008b6640b76986d899b074f36 SHA256 b5e43be355bb7192273a052704b20c4185bcbe8e3f8a66a7d55f75e246075848 size 1062265
 EBUILD lshw-02.05.01b.ebuild 1329 RMD160 7931b557e849e2e7ac25228eade59a9ecbd0a38e SHA1 9022ad91c32f5ef9633fc7d0205dbfdd6804fb3d SHA256 6c38d5e373f6b6b14d3bf2cf83596c9d17e0bdabb39ad066a25770d61dbd9a15 size 1329
 MD5 9fc17a631054c8a60f3dbb36b494feb2 lshw-02.05.01b.ebuild 1329
 RMD160 7931b557e849e2e7ac25228eade59a9ecbd0a38e lshw-02.05.01b.ebuild 1329
@@ -28,10 +33,14 @@ EBUILD lshw-02.07b.ebuild 1131 RMD160 50c78ae3353dce1e568ddedb608354ec83047c40 S
 MD5 b34a7fbda1ada642d0dc14d64745922c lshw-02.07b.ebuild 1131
 RMD160 50c78ae3353dce1e568ddedb608354ec83047c40 lshw-02.07b.ebuild 1131
 SHA256 e6cc4a9402aa35204f95f55b263ff8de179cc6a9bea38a7bc0c33bc3977c45e8 lshw-02.07b.ebuild 1131
-MISC ChangeLog 4370 RMD160 a2f842978e40471dbc239e1d736c457c7d644435 SHA1 7e2dd45f6b691dfdfaf3b06d0557387c776c92a1 SHA256 b1d898f14718d2fd2b3cd1b5105fa40ca882f3bd91b644bd22fbd3447ffdea72 size 4370
-MD5 467d307fcfeea43762901d6fb57c9b9a ChangeLog 4370
-RMD160 a2f842978e40471dbc239e1d736c457c7d644435 ChangeLog 4370
-SHA256 b1d898f14718d2fd2b3cd1b5105fa40ca882f3bd91b644bd22fbd3447ffdea72 ChangeLog 4370
+EBUILD lshw-02.08.01b.ebuild 1137 RMD160 9832a2149e166ab9daf9d85d164c621509928c01 SHA1 1cf114183a725f1cb213c4f5914a5003d429abea SHA256 f7975e924524b43a39151be26103dded5a7d14ff4e36c05c2c4b85269465cb0d size 1137
+MD5 f1c14cb515a409e141b834d106bc9c99 lshw-02.08.01b.ebuild 1137
+RMD160 9832a2149e166ab9daf9d85d164c621509928c01 lshw-02.08.01b.ebuild 1137
+SHA256 f7975e924524b43a39151be26103dded5a7d14ff4e36c05c2c4b85269465cb0d lshw-02.08.01b.ebuild 1137
+MISC ChangeLog 4556 RMD160 cd823adfa6aadd955f65d6e48db5b4250cc0a301 SHA1 977b2ede69269d36654d1606b609a71ba4c3387f SHA256 fa144fef7129dfe20c0e415e8fc50d0ec98fedbdf987af352058cf346f9abd0f size 4556
+MD5 800bc1472d1055a64ce2ef4c0dcd6824 ChangeLog 4556
+RMD160 cd823adfa6aadd955f65d6e48db5b4250cc0a301 ChangeLog 4556
+SHA256 fa144fef7129dfe20c0e415e8fc50d0ec98fedbdf987af352058cf346f9abd0f ChangeLog 4556
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -45,10 +54,13 @@ SHA256 c4b73b447d04a3e242629efe27cc03b8868160bc4b318cd7f03f34cb4f9c8c06 files/di
 MD5 27e2d4ae9a7b5d0cee50aaa9bd23eabc files/digest-lshw-02.07b 241
 RMD160 c6006303eebe0705923063ad705a1f2aad57226f files/digest-lshw-02.07b 241
 SHA256 eb8e5b51419ba149d738e4110a1c285b5d894dc79e0da56602525af45069b388 files/digest-lshw-02.07b 241
+MD5 8b270685a3e42b8ee8b18ecc5046e7f0 files/digest-lshw-02.08.01b 250
+RMD160 5f3887e53433a6d5363e04aeb15063219182e8c4 files/digest-lshw-02.08.01b 250
+SHA256 539f5925a13e350adcfa06cafc2082ab0ec300c0995c344c71ca82f71c026a63 files/digest-lshw-02.08.01b 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUOaZomPajV0RnrERAof5AJ4x6ioDeuIdcr1jOsTw58lStqbP0wCeJOlH
-TTOSRSfqprVLe6Lg1MxNq6Y=
-=9n3Q
+iD8DBQFEapRc2+ySkm8kpY0RApt9AKC/AghdX/nt9TwY8W5rLVtbLxEIiQCeK4OD
+LP9XY17vhcGY10nu3DmYgKE=
+=xMwa
 -----END PGP SIGNATURE-----
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/*
+}