Remove old.

(Portage version: 2.2.0_alpha62/cvs/Linux x86_64)

4 files changed, 6 insertions, 128 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/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
-}