From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 24 Mar 2007 09:05:31 +0000 (+0000)
Subject: old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d8a944e357b4fae24628113c8c2a0da8b673f72a;p=gentoo.git

old
---

diff --git a/sys-apps/lshw/files/02.00b-cpuid-PIC.patch b/sys-apps/lshw/files/02.00b-cpuid-PIC.patch
deleted file mode 100644
index 1223660668ea..000000000000
--- a/sys-apps/lshw/files/02.00b-cpuid-PIC.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-The 'cpuid' assembly instruction is notorious for hating PIC.
-
-Here we code two different versions of the cpuid instruction ...
-the first will work when dealing with PIC, while the second is 
-slightly faster and can be used with non-PIC.
-
-http://bugs.gentoo.org/show_bug.cgi?id=61947
-
---- src/core/cpuid.cc.orig	2005-01-03 15:21:57.034862112 -0500
-+++ src/core/cpuid.cc	2005-01-03 16:07:00.131928896 -0500
-@@ -68,9 +68,6 @@
- 
- #ifdef __i386__
- 
--#define cpuid_up(in,a,b,c,d)\
--  asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
--
- static void cpuid(int cpunumber,
- 		  unsigned long idx,
- 		  unsigned long &eax,
-@@ -96,7 +93,18 @@
-     edx = (*(unsigned long *) (buffer + 12));
-   }
-   else
--    cpuid_up(idx, eax, ebx, ecx, edx);
-+    asm(
-+#ifdef __PIC__
-+        "pushl %%ebx\n"
-+        "cpuid\n"
-+        "movl %%ebx,%3\n"
-+        "popl %%ebx\n"
-+        : "=a" (eax), "=c" (ecx), "=d" (edx), "=m" (ebx)
-+#else
-+        "cpuid\n"
-+        : "=a" (eax), "=c" (ecx), "=d" (edx), "=b" (ebx)
-+#endif
-+        : "a" (idx));
- }
- 
- /* Decode Intel TLB and cache info descriptors */
diff --git a/sys-apps/lshw/files/digest-lshw-02.05.01b b/sys-apps/lshw/files/digest-lshw-02.05.01b
deleted file mode 100644
index 58767e60d9f9..000000000000
--- a/sys-apps/lshw/files/digest-lshw-02.05.01b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e73e10536c3366410d98f3f675c122a lshw-B.02.05.01.tar.gz 974316
-RMD160 4c935fa50ee876e3f95b45366de0ab6392f2f513 lshw-B.02.05.01.tar.gz 974316
-SHA256 06f7ab25ecf9a019444031ebb3066d02b643f44cf4f7fc29e8534efcb30011de lshw-B.02.05.01.tar.gz 974316
diff --git a/sys-apps/lshw/files/digest-lshw-02.06b b/sys-apps/lshw/files/digest-lshw-02.06b
deleted file mode 100644
index fce1c3eb4dc3..000000000000
--- a/sys-apps/lshw/files/digest-lshw-02.06b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 370e10e3dad089be3f24f1cdf3874a52 lshw-B.02.06.tar.gz 996420
-RMD160 7da2061a38987926147a1eaf88dcea3a48ee70b1 lshw-B.02.06.tar.gz 996420
-SHA256 7692d8a8fd5f31b79abcf240ad4cd87522a338936ad0816e3fb98ebda51866bb lshw-B.02.06.tar.gz 996420
diff --git a/sys-apps/lshw/files/digest-lshw-02.07b b/sys-apps/lshw/files/digest-lshw-02.07b
deleted file mode 100644
index 7f21c1ddf315..000000000000
--- a/sys-apps/lshw/files/digest-lshw-02.07b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e03d7a7ff97691ca1c5710bf02d256a lshw-B.02.07.tar.gz 1041510
-RMD160 ebe292c546de86128cebeb97ea2dc4d5c18a0a5c lshw-B.02.07.tar.gz 1041510
-SHA256 35c2248effdea0f9e7fcd7c216757523219778f0bd600b34c7749526e777cda5 lshw-B.02.07.tar.gz 1041510
diff --git a/sys-apps/lshw/files/lshw-02.06b-build.patch b/sys-apps/lshw/files/lshw-02.06b-build.patch
deleted file mode 100644
index ad97346c5e3f..000000000000
--- a/sys-apps/lshw/files/lshw-02.06b-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- lshw-B.02.06/src/Makefile
-+++ lshw-B.02.06/src/Makefile
-@@ -13,11 +13,13 @@
- export MANDIR
- export DATADIR
- 
--CXX=c++
-+CXX ?= c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
--LDFLAGS=-L./core/ -Os -s
-+CXXFLAGS ?= -g -Os
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
-+LDFLAGS ?= -Os -s
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
---- lshw-B.02.06/src/core/Makefile
-+++ lshw-B.02.06/src/core/Makefile
-@@ -1,9 +1,10 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX ?= c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
-+CXXFLAGS ?= -g -Os
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
- LDFLAGS=
- LDSTATIC=
- LIBS=
---- lshw-B.02.06/src/gui/Makefile
-+++ lshw-B.02.06/src/gui/Makefile
-@@ -1,16 +1,18 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
--CC=cc
-+CXX ?= c++
-+CC ?= cc
- 
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall -Os $(INCLUDES) $(DEFINES)
--CFLAGS=$(CXXFLAGS) $(DEFINES)
-+CXXFLAGS ?= -g -Os
-+CFLAGS ?= $(CXXFLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
-+CFLAGS += -Wall $(INCLUDES) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
- LIBS=-L../core -llshw $(GTKLIBS)
--LDFLAGS= -Os -s
-+LDFLAGS ?= -Os -s
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- 	LDFLAGS+= -Wl,--as-needed
- endif
diff --git a/sys-apps/lshw/lshw-02.05.01b.ebuild b/sys-apps/lshw/lshw-02.05.01b.ebuild
deleted file mode 100644
index ae38884a88f1..000000000000
--- a/sys-apps/lshw/lshw-02.05.01b.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.05.01b.ebuild,v 1.8 2006/02/14 00:28:16 vapier Exp $
-
-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.sourceforge.net/"
-SRC_URI="http://ezix.sourceforge.net/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="gtk static"
-
-DEPEND="gtk? ( >=x11-libs/gtk+-2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use static && append-ldflags -static
-	sed -i \
-		-e "/^CXXFLAGS/s:-Os:${CXXFLAGS}:" \
-		-e '/^LDFLAGS=/s:-Os -s::' \
-		-e '/^CXX=/d' -e '/^CC=/d' \
-		src/{gui/,core/,}/Makefile \
-		|| die "sed failed"
-	sed -i \
-		-e "/^LDFLAGS=/s:$: ${LDFLAGS}:" \
-		src/Makefile || die "sed ldflags failed"
-
-	epatch "${FILESDIR}"/02.00b-cpuid-PIC.patch #61947
-}
-
-src_compile() {
-	tc-export CC CXX AR
-	emake || die "make failed"
-	if use gtk ; then
-		emake gui || die "make gui failed"
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	if use gtk ; then
-		make DESTDIR="${D}" install-gui || die "install gui failed"
-	fi
-
-	dodoc README docs/*
-}
diff --git a/sys-apps/lshw/lshw-02.06b.ebuild b/sys-apps/lshw/lshw-02.06b.ebuild
deleted file mode 100644
index 1ab235a5efb7..000000000000
--- a/sys-apps/lshw/lshw-02.06b.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.06b.ebuild,v 1.7 2006/11/25 18:49:03 kloeri Exp $
-
-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.sourceforge.net/"
-SRC_URI="http://ezix.sourceforge.net/software/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc 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.06b-build.patch
-	epatch "${FILESDIR}"/${PN}-02.06b-cpuid-PIC.patch #61947
-}
-
-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() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	if use gtk ; then
-		make DESTDIR="${D}" install-gui || die "install gui failed"
-	fi
-
-	dodoc README docs/*
-}
diff --git a/sys-apps/lshw/lshw-02.07b.ebuild b/sys-apps/lshw/lshw-02.07b.ebuild
deleted file mode 100644
index e5419aa4682e..000000000000
--- a/sys-apps/lshw/lshw-02.07b.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.07b.ebuild,v 1.1 2006/04/25 05:55:20 vapier Exp $
-
-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 ~ppc ~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.06b-build.patch
-	epatch "${FILESDIR}"/${PN}-02.06b-cpuid-PIC.patch #61947
-}
-
-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() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	if use gtk ; then
-		make DESTDIR="${D}" install-gui || die "install gui failed"
-	fi
-
-	dodoc README docs/*
-}