Version bump #111500 by Daniel Webert.

Package-Manager: portage-2.0.53_rc7

6 files changed, 167 insertions, 8 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 3c9b44a540a9..46d5697b8f8d 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.24 2005/11/05 01:37:33 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.25 2005/11/05 04:28:07 vapier Exp $
+
+*lshw-02.06b (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/lshw-02.06b-build.patch, +files/lshw-02.06b-cpuid-PIC.patch,
+  +lshw-02.06b.ebuild:
+  Version bump #111500 by Daniel Webert.
 
   05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> lshw-02.05.01b.ebuild:
   Stable on x86; bug #111499
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index eefaae6763a8..94146bab3f48 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 98c756557647126bc8fb1b4a859a7604 ChangeLog 3200
+MD5 d9d64853267c0e7e7da5573e15230cd7 ChangeLog 3412
 MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
-MD5 e1b0c289650e6fc413a9001627b004a0 files/02.00b-dev.patch 966
-MD5 82aaf8441fb4eff63a536f97a4bfd9b5 files/digest-lshw-02.03b 64
 MD5 29a53d370bf1395481ea9d8528f410d1 files/digest-lshw-02.04b 64
 MD5 aa4eb15e3a195e90ce0bf111bcd37e2f files/digest-lshw-02.05.01b 67
-MD5 c3f7305f7029ae0433f991a43c09c55a lshw-02.03b.ebuild 1183
+MD5 83309023b708d6b03a2cc931a71e2352 files/digest-lshw-02.06b 64
+MD5 7fbeefb274e662632462f5a5465f24d9 files/lshw-02.06b-build.patch 1652
+MD5 fab2fbfdcae14bdfd177df3194e261ac files/lshw-02.06b-cpuid-PIC.patch 1023
 MD5 8acb70976be17c39d5349c85e31a76f8 lshw-02.04b.ebuild 1384
 MD5 ee4a0b25e41eafb85bfeae888844c924 lshw-02.05.01b.ebuild 1361
+MD5 f39283f94db7bdb2c0701974246853a1 lshw-02.06b.ebuild 1155
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDbAz3CRZPokWLroQRAnpyAJ4gRGSnkin5K4bYMyHmbaBoTO+kwQCguoyC
-urc3ziZ8piXUrA9UpGctXUY=
-=XnIn
+iD8DBQFDbDUcgIKl8Uu19MoRAmpVAJ4rDM9jZIJL1ilwUUU5Wc3b5SDUNQCfcKA8
+d/4YOvuj2juSjaxamJCWjy0=
+=F+qM
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/digest-lshw-02.06b b/sys-apps/lshw/files/digest-lshw-02.06b
new file mode 100644
index 000000000000..4609db9fe9ef
--- /dev/null
+++ b/sys-apps/lshw/files/digest-lshw-02.06b
@@ -0,0 +1 @@
+MD5 370e10e3dad089be3f24f1cdf3874a52 lshw-B.02.06.tar.gz 996420
diff --git a/sys-apps/lshw/files/lshw-02.06b-build.patch b/sys-apps/lshw/files/lshw-02.06b-build.patch
new file mode 100644
index 000000000000..ad97346c5e3f
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.06b-build.patch
@@ -0,0 +1,60 @@
+--- lshw-B.02.06/src/Makefile
++++ lshw-B.02.06/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 -Os $(INCLUDES) $(DEFINES)
+-LDFLAGS=-L./core/ -Os -s
++CXXFLAGS ?= -g -Os
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
++LDFLAGS ?= -Os -s
++LDFLAGS += -L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+ 	LDFLAGS+= -Wl,--as-needed
+ endif
+--- lshw-B.02.06/src/core/Makefile
++++ lshw-B.02.06/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.06/src/gui/Makefile
++++ lshw-B.02.06/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/files/lshw-02.06b-cpuid-PIC.patch b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
new file mode 100644
index 000000000000..524b2095780f
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.06b-cpuid-PIC.patch
@@ -0,0 +1,40 @@
+The 'cpuid' assembly instruction is notorious for hating PIC.
+
+Here we code two different versions of the cpuid instruction ...
+the first will work when dealing with PIC, while the second is 
+slightly faster and can be used with non-PIC.
+
+http://bugs.gentoo.org/61947
+
+--- src/core/cpuid.cc
++++ src/core/cpuid.cc
+@@ -68,9 +68,6 @@
+ 
+ #ifdef __i386__
+ 
+-#define cpuid_up(in,a,b,c,d)\
+-  asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
+-
+ static void cpuid(int cpunumber,
+ 		  unsigned long idx,
+ 		  unsigned long &eax,
+@@ -96,7 +93,18 @@
+     edx = (*(unsigned long *) (buffer + 12));
+   }
+   else
+-    cpuid_up(idx, eax, ebx, ecx, edx);
++    asm(
++#ifdef __PIC__
++        "movl %%ebx,%%edi\n"
++        "cpuid\n"
++        "movl %%ebx,%3\n"
++        "movl %%edi,%%ebx\n"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx), "edi"
++#else
++        "cpuid\n"
++        : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx)
++#endif
++        : "a" (idx));
+ }
+ 
+ /* Decode Intel TLB and cache info descriptors */
diff --git a/sys-apps/lshw/lshw-02.06b.ebuild b/sys-apps/lshw/lshw-02.06b.ebuild
new file mode 100644
index 000000000000..11192f8e4cd4
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.06b.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.06b.ebuild,v 1.1 2005/11/05 04:28:07 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.sourceforge.net/"
+SRC_URI="http://ezix.sourceforge.net/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 )
+	>=sys-devel/binutils-2.15"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-02.06b-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/*
+}