6 files changed, 23 insertions, 56 deletions
diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 8c2cbe0bd479..5f334b478bf8 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.16 2005/01/21 16:34:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.17 2005/02/03 13:38:21 solar Exp $
+
+  03 Feb 2005; <solar@gentoo.org> -lshw-01.08a.ebuild, lshw-02.00b.ebuild,
+  lshw-02.02b.ebuild:
+  - removing filter-flags -fPIC from ebuild now that the cpuid patch exists.
+  Removing broken lshw-01.08a
 
 *lshw-02.02b (22 Jan 2005)
 
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index a488213e288a..68b4b0c7e847 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,10 +1,20 @@
-MD5 ce540accd76c671a5a31cabfe4b8832a lshw-01.08a.ebuild 845
-MD5 d829f50ed10be03567368012e47eb965 lshw-02.00b.ebuild 1313
-MD5 bc9e5fca5bfb0f0a9d7184bc6e1d2f87 lshw-02.02b.ebuild 1310
-MD5 808de3623163763d6c8fb63160e58ebb ChangeLog 2206
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77da13ea7a4884c23e600060e7a436e1 lshw-02.00b.ebuild 1195
+MD5 fd4b9f1adceb4e7e601a71c3bdd9d3e4 lshw-02.02b.ebuild 1192
+MD5 28249a60e4aaee9b5ab4b2edbf55e191 ChangeLog 2410
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 555b9015ffbcc8fd484c63ab096069d7 files/02.00b-cpuid-PIC.patch 1098
-MD5 7c020ad03172a84e510775b8a6b7d3ce files/digest-lshw-01.08a 64
 MD5 078518c848aac3fcee935427f1849647 files/digest-lshw-02.00b 64
 MD5 7842b41ab472dcf4e60cb6e43c2079f1 files/digest-lshw-02.02b 64
 MD5 e1b0c289650e6fc413a9001627b004a0 files/02.00b-dev.patch 966
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iQCVAwUBQgIpM54WFLgrx1GWAQKSegQAmxckMO9S36gvWxYUEi9zAdlns3DTzM98
+8CSxjFXTHgQYFxsvrCsWVodP6wX9lJjzgSlFiw5ybmvdCXOLKXl+3L5gSp6soudA
+6nnpGEybpkPax5/1iuErfS/uAw+gvRVgONHpRL4yDlwUsm0T883heo438d2mHZUc
+XXkuNgMAZKc=
+=/DAU
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/digest-lshw-01.08a b/sys-apps/lshw/files/digest-lshw-01.08a
deleted file mode 100644
index 4e1a954d934e..000000000000
--- a/sys-apps/lshw/files/digest-lshw-01.08a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b637c794ecc24ffae67287b067c99e9 lshw-A.01.08.tar.gz 175737
diff --git a/sys-apps/lshw/lshw-01.08a.ebuild b/sys-apps/lshw/lshw-01.08a.ebuild
deleted file mode 100644
index 7ea3976c156c..000000000000
--- a/sys-apps/lshw/lshw-01.08a.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-01.08a.ebuild,v 1.3 2005/01/03 21:19:56 vapier Exp $
-
-inherit flag-o-matic
-
-MAJ_PV=${PV:0:5}
-MIN_PVE=${PV:5:7}
-MIN_PV=${MIN_PVE/a/A}
-
-MY_P="$PN-$MIN_PV.$MAJ_PV"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="http://ezix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	chmod a+r ${S}/lshw.1
-}
-
-src_compile() {
-	# cpuid.cc uses inline asm and can not be linked when
-	# position independent code is desired.
-	filter-flags -fPIC
-	emake CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/sys-apps/lshw/lshw-02.00b.ebuild b/sys-apps/lshw/lshw-02.00b.ebuild
index 40315a30825f..9a7486ee43f7 100644
--- a/sys-apps/lshw/lshw-02.00b.ebuild
+++ b/sys-apps/lshw/lshw-02.00b.ebuild
@@ -1,6 +1,6 @@
 # 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.00b.ebuild,v 1.4 2005/01/07 20:33:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.00b.ebuild,v 1.5 2005/02/03 13:38:21 solar Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -35,10 +35,6 @@ src_unpack() {
 
 	epatch ${FILESDIR}/${PV}-dev.patch #75168
 	epatch ${FILESDIR}/${PV}-cpuid-PIC.patch #61947
-
-	# cpuid.cc uses inline asm and can not be linked when
-	# position independent code is desired.
-	filter-flags -fPIC
 }
 
 src_compile() {
diff --git a/sys-apps/lshw/lshw-02.02b.ebuild b/sys-apps/lshw/lshw-02.02b.ebuild
index ccbd99d27a1d..156de6ef22ab 100644
--- a/sys-apps/lshw/lshw-02.02b.ebuild
+++ b/sys-apps/lshw/lshw-02.02b.ebuild
@@ -1,6 +1,6 @@
 # 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.02b.ebuild,v 1.1 2005/01/21 16:34:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.02b.ebuild,v 1.2 2005/02/03 13:38:21 solar Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -35,10 +35,6 @@ src_unpack() {
 
 	#epatch ${FILESDIR}/${PV}-dev.patch #75168
 	epatch ${FILESDIR}/02.00b-cpuid-PIC.patch #61947
-
-	# cpuid.cc uses inline asm and can not be linked when
-	# position independent code is desired.
-	filter-flags -fPIC
 }
 
 src_compile() {