Closes #27062

5 files changed, 8 insertions, 39 deletions

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 52131df6fbda..2e074f2cd6a9 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,12 +1,8 @@
 MD5 e6af95021cbcac12227599a68fe3f1e0 ChangeLog 1031
 MD5 e9f0ac962a3e1d1b14c5df87302d6d85 lshw-01.00.ebuild 571
-MD5 461b8291c7047c479dd2785dd50cd95f lshw-01.03.ebuild 789
-MD5 a79299443bc80de63a7ea94686abb10f lshw-01.04.ebuild 790
 MD5 582823aa037795d47fc6561fb1c1cfb9 metadata.xml 626
-MD5 fb01c93bf0e26fd14078c567380f8573 lshw-01.04a.ebuild 879
+MD5 86a9eb0ee4be3c992c9eda3efc59701f lshw-01.04a.ebuild 879
 MD5 fb01c93bf0e26fd14078c567380f8573 lshw-01.05a.ebuild 879
 MD5 f85a623707b313b0bde6003e7a2f608c files/digest-lshw-01.00 63
-MD5 3d92a2d793681247d8469f267a3a1781 files/digest-lshw-01.03 63
-MD5 304310fc299278d4a54f3dea626ad245 files/digest-lshw-01.04 63
 MD5 3d2b798ff296de61b2446845273e4cfa files/digest-lshw-01.05a 63
 MD5 304310fc299278d4a54f3dea626ad245 files/digest-lshw-01.04a 63
diff --git a/sys-apps/lshw/files/digest-lshw-01.03 b/sys-apps/lshw/files/digest-lshw-01.03
deleted file mode 100644
index a92ce628914a..000000000000
--- a/sys-apps/lshw/files/digest-lshw-01.03
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aadd5db3ec104fa6bce24c7bf74b56ec lshw-A.01.03.tar.gz 67289
diff --git a/sys-apps/lshw/files/digest-lshw-01.04 b/sys-apps/lshw/files/digest-lshw-01.04a
index 8d1993a365ce..8d1993a365ce 100644
--- a/sys-apps/lshw/files/digest-lshw-01.04
+++ b/sys-apps/lshw/files/digest-lshw-01.04a
diff --git a/sys-apps/lshw/lshw-01.04.ebuild b/sys-apps/lshw/lshw-01.04.ebuild
deleted file mode 100644
index 789290f5f78e..000000000000
--- a/sys-apps/lshw/lshw-01.04.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.04.ebuild,v 1.1 2003/10/04 03:28:34 matsuu Exp $
-
-inherit flag-o-matic
-
-MY_P="${P/-/-A.}"
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="http://ezix.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ezix/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# cpuid.cc uses inline asm and can not be linked when
-	# position independent code is desired.
-	filter-flags -fPIC
-	has_version 'sys-devel/hardened-gcc' && append-flags -yet_exec
-	emake CXXFLAGS="${CXXFLAGS}" || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/sys-apps/lshw/lshw-01.03.ebuild b/sys-apps/lshw/lshw-01.04a.ebuild
index 04d6aaa89bdf..2be47776706d 100644
--- a/sys-apps/lshw/lshw-01.03.ebuild
+++ b/sys-apps/lshw/lshw-01.04a.ebuild
@@ -1,13 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.03.ebuild,v 1.2 2003/09/21 09:54:28 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-01.04a.ebuild,v 1.1 2003/11/04 23:54:12 mholzer Exp $
 
 inherit flag-o-matic
 
-MY_P="${P/-/-A.}"
+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"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"