Remove old.

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

5 files changed, 16 insertions, 138 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index e52020e7ca49..88beeeecf3f5 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.96 2011/07/29 08:01:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.97 2011/10/08 05:02:54 radhermit Exp $
+
+  08 Oct 2011; Tim Harder <radhermit@gentoo.org>
+  -files/lshw-02.12.01b-build.patch, -lshw-02.14b.ebuild,
+  -files/lshw-02.14b-gcc45.patch:
+  Remove old.
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> lshw-02.15b.ebuild:
   Add ~x86-linux keyword.
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 53ca5a46bf66..32e84d57ef0a 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX lshw-02.12.01b-build.patch 2037 RMD160 df23c0e759652dc7fba719fa9655994e1b479a1a SHA1 7d173edc64e90dfe969c207e55206ebf398a0f81 SHA256 2e07b9e4f2b927bae14a547ecfb8f9447ffa7cc8370965033e2cd9bad56753f8
-AUX lshw-02.14b-gcc45.patch 471 RMD160 a1a9db9f950cf67930240b6926e20b51dcd87f4c SHA1 2723a297ae71d7df03579dd85a1ef4615332db85 SHA256 b5d1bfeef8dac9bc66397db229f4719d7fdf8f37aa0aa3e35ba5d60b84e614d5
 AUX lshw-02.15b-build.patch 3735 RMD160 1512c4bc7549c8847bc7beed3564caeaa3f9f9bf SHA1 8006e54aaf79235a2f7fcaba15d1f594dfaa6175 SHA256 1183485aa48e16a99b1a0d4aaa7c48a2d1f0056579334c78090eae2f35cd6a87
-DIST lshw-B.02.14.tar.gz 1368757 RMD160 55fdb91992f47e6d280074a4150e5b912f9ab12b SHA1 39d61aa218e0a8558417c7f95dcca90bad3d11c1 SHA256 c9a5959348b78f6e6aa4c02a1a0249e8efacb6189f6145756af74248b4315cd8
 DIST lshw-B.02.15.tar.gz 1384466 RMD160 565ea7849fc6ad4ba1368da560a0d1d2000d5b3e SHA1 488b5b014ac06c1d4448f0517f874bcb568c57c0 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6
-EBUILD lshw-02.14b.ebuild 1252 RMD160 efe77185846924e7e06da5c1d4172c01ad170734 SHA1 eb6a2740a48ebb78e40e1e5d3ee4a2dd1b5a666d SHA256 3278b9757fadb16930c3d87532b75035529651233348ed57c4f049a2dcca51f3
 EBUILD lshw-02.15b.ebuild 1397 RMD160 eb25ec6123a4b4fa7e49a97e47e1e4f5274b9e34 SHA1 224a1e66092c9d35db5b00dbca0c3337770036ef SHA256 26dd1db18a30bf0517eb585e5943d368daa7c977a9146477ac65cae6178ddfa8
-MISC ChangeLog 11448 RMD160 b22993a9b9144230adcb5c004c0a453c67a8a312 SHA1 249b1def6b726b0cc12b3c08c925037efca39f75 SHA256 225248b4679349a87611ed730ed6aa5fd5c89ba58e6d051bed6436624b78cc33
+MISC ChangeLog 11606 RMD160 fd08811b336fb7ab3cea93f1a9605600c424fb04 SHA1 96eab8a9ff692a6a9c277b0bd49d2fd4c5cdfce4 SHA256 8d4092db8f737053e9bd7b1577d8dd96c03544f60cf6a8459cd977f75a2111e2
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4yaMUACgkQ/ejvha5XGaNapQCgpX12OT6RKOUlX8lCqYl065k/
-zKgAoNBvTs6VaCRgxYrPefYlV87DVKhW
-=Kcsq
+iQEcBAEBCgAGBQJOj9mLAAoJEEqz6FtPBkyjUIsIAK2/i5jACPzJIi4oJ6w3Eek+
+O++CmsuT/ovKE6KpKkpyrTtgKayqLCA21wg2uUtq3gLfRPFzpJy/45e3sGBKYkeG
+uTR5sUmVLnbVysHS/+Xw8KCW4RLQb8Em9v0l5j1vvsomvZfkSXphMKawfIKeghlU
+jy3zBKD5AnU8w7i6QRa9zF7GltfiZ0RIwcj83eTuN9ZvMNKBjNloNA20u7QjzoJe
+TBoETndsnV3WEUyiHuzwad0GRDk7VygyQGD7WkAWd24pqjmaaNKBHF7+qeo9z3e7
+nNUB0i3JYxWxKtXKOmpWz0OHiXKWzrhBEyB1aD2LUn3G69/MCaldWbEHFFNIN3M=
+=qbYC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.12.01b-build.patch b/sys-apps/lshw/files/lshw-02.12.01b-build.patch
deleted file mode 100644
index 75ae23847e6f..000000000000
--- a/sys-apps/lshw/files/lshw-02.12.01b-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- lshw/src/core/Makefile
-+++ lshw/src/core/Makefile
-@@ -1,9 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
- LDSTATIC=
- LIBS=
---- lshw/src/gui/Makefile
-+++ lshw/src/gui/Makefile
-@@ -7,11 +7,11 @@
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--CFLAGS=$(CXXFLAGS) $(DEFINES)
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
- LIBS=-L../core -llshw -lresolv $(GTKLIBS)
--LDFLAGS=
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -34,7 +34,6 @@
- 	$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--	$(STRIP) gtk-$(PACKAGENAME)
- 	
- clean:
- 	rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak
---- lshw/src/Makefile
-+++ lshw/src/Makefile
-@@ -18,8 +18,10 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=-L./core/ -g
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+LDFLAGS ?= -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
-@@ -49,7 +51,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- 	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--	$(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
diff --git a/sys-apps/lshw/files/lshw-02.14b-gcc45.patch b/sys-apps/lshw/files/lshw-02.14b-gcc45.patch
deleted file mode 100644
index c52b312f5906..000000000000
--- a/sys-apps/lshw/files/lshw-02.14b-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://ezix.org/project/ticket/512
-http://ezix.org/project/changeset/2147
-http://bugs.gentoo.org/314201
-
---- src/core/scsi.cc
-+++ src/core/scsi.cc
-@@ -842,7 +842,7 @@
- 
-           if (!controller)
-           {
--            controller = node.addChild(hwNode::hwNode("scsi", hw::storage));
-+            controller = node.addChild(hwNode("scsi", hw::storage));
-             if (controller)
-             {
-               controller->setLogicalName(host_logicalname(number));
diff --git a/sys-apps/lshw/lshw-02.14b.ebuild b/sys-apps/lshw/lshw-02.14b.ebuild
deleted file mode 100644
index 87df9a10b38d..000000000000
--- a/sys-apps/lshw/lshw-02.14b.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.14b.ebuild,v 1.8 2011/03/30 11:10:39 angelos Exp $
-
-EAPI=1
-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 arm ia64 ppc ppc64 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.12.01b-build.patch
-	epatch "${FILESDIR}"/${P}-gcc45.patch # 314201 - fixed for 02.15b
-}
-
-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() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README docs/*
-	if use gtk ; then
-		emake DESTDIR="${D}" install-gui || die "install gui failed"
-		make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
-	fi
-}