Verison bumped. Removed old versions.

8 files changed, 30 insertions, 59 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 598e6b9240fc..2fd68f9ccd89 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.12 2004/09/06 12:19:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.13 2004/12/20 15:44:26 matsuu Exp $
+
+*lshw-02.00b (21 Dec 2004)
+
+  21 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> -lshw-01.06a.ebuild,
+  -lshw-01.07a.ebuild, lshw-01.08a.ebuild, +lshw-02.00b.ebuild:
+  Version bumped.
+  Removed old versions.
 
 *lshw-01.08a (06 Sep 2004)
 
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 34198faa211d..26e5593611b0 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,8 +1,6 @@
-MD5 001c08f22f75785c6c1f5b4f9deb823a lshw-01.06a.ebuild 845
-MD5 a8941518f499b11e1ad6d2bbb808ad83 lshw-01.08a.ebuild 849
+MD5 ba8fd1d8129a87763ce074f63dab520e lshw-01.08a.ebuild 845
+MD5 f596706f8dc74d465ff799e4ddf2d605 lshw-02.00b.ebuild 1010
 MD5 899b4e68e68f53eb6ce7250b0f7e71b8 ChangeLog 1562
-MD5 d1e0bce2f0e4a6d40ab45dee056a5a58 lshw-01.07a.ebuild 849
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 f9d23b7fa6a32b569f27eccc905c55c1 files/digest-lshw-01.06a 64
-MD5 0d14c82e2cce1010d3978d85c8375bb7 files/digest-lshw-01.07a 64
 MD5 7c020ad03172a84e510775b8a6b7d3ce files/digest-lshw-01.08a 64
+MD5 078518c848aac3fcee935427f1849647 files/digest-lshw-02.00b 64
diff --git a/sys-apps/lshw/files/digest-lshw-01.06a b/sys-apps/lshw/files/digest-lshw-01.06a
deleted file mode 100644
index 7aa32c211de1..000000000000
--- a/sys-apps/lshw/files/digest-lshw-01.06a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 456b4ffdf2adc94ef931ed824c85a5af lshw-A.01.06.tar.gz 161859
diff --git a/sys-apps/lshw/files/digest-lshw-01.07a b/sys-apps/lshw/files/digest-lshw-01.07a
deleted file mode 100644
index e9f7d8ac2a7d..000000000000
--- a/sys-apps/lshw/files/digest-lshw-01.07a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba23b34c4fbb2920d0da1ea8575c10b6 lshw-A.01.07.tar.gz 168637
diff --git a/sys-apps/lshw/files/digest-lshw-02.00b b/sys-apps/lshw/files/digest-lshw-02.00b
new file mode 100644
index 000000000000..02509abc909d
--- /dev/null
+++ b/sys-apps/lshw/files/digest-lshw-02.00b
@@ -0,0 +1 @@
+MD5 cb3d7d3ca1b44995ccb1b1948cb6c032 lshw-B.02.00.tar.gz 819978
diff --git a/sys-apps/lshw/lshw-01.06a.ebuild b/sys-apps/lshw/lshw-01.06a.ebuild
deleted file mode 100644
index c6244f36e32f..000000000000
--- a/sys-apps/lshw/lshw-01.06a.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.06a.ebuild,v 1.5 2004/06/30 02:50:39 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-01.08a.ebuild b/sys-apps/lshw/lshw-01.08a.ebuild
index 940d6b842bbe..82fa0979622e 100644
--- a/sys-apps/lshw/lshw-01.08a.ebuild
+++ b/sys-apps/lshw/lshw-01.08a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1 2004/09/06 12:19:07 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.08a.ebuild,v 1.2 2004/12/20 15:44:26 matsuu Exp $
 
 inherit flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/sys-apps/lshw/lshw-01.07a.ebuild b/sys-apps/lshw/lshw-02.00b.ebuild
index 0354ef847b24..4d09312e4d66 100644
--- a/sys-apps/lshw/lshw-01.07a.ebuild
+++ b/sys-apps/lshw/lshw-02.00b.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.07a.ebuild,v 1.3 2004/06/30 02:50:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.00b.ebuild,v 1.1 2004/12/20 15:44:26 matsuu Exp $
 
 inherit flag-o-matic
 
 MAJ_PV=${PV:0:5}
 MIN_PVE=${PV:5:7}
-MIN_PV=${MIN_PVE/a/A}
+MIN_PV=${MIN_PVE/b/B}
 
 MY_P="$PN-$MIN_PV.$MAJ_PV"
 DESCRIPTION="Hardware Lister"
@@ -16,24 +16,30 @@ SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
+IUSE="gtk2"
 
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	gtk2? ( >=x11-libs/gtk+-2 )"
 
 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
+	sed -i -e "/^CXXFLAGS/s/-Os/${CXXFLAGS}/" src/{gui/,core/,}/Makefile || die
+	emake || die
+	if use gtk2; then
+		emake gui || die
+	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
+
+	if use gtk2; then
+		make DESTDIR=${D} install-gui || die
+	fi
+
+	dodoc TODO docs/proc_usb_info.txt
 }