diff options
author | Mike Frysinger <vapier@gentoo.org> | 2007-08-25 17:28:44 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2007-08-25 17:28:44 +0000 |
commit | b3cbb4bfdf7d1b1a02d5a6ef60d7c2905714f0f3 (patch) | |
tree | 4067e54c70ee2a05c2db9b92e96899cfc085d142 /sys-apps/lshw | |
parent | amd64 stable (diff) | |
download | gentoo-2-b3cbb4bfdf7d1b1a02d5a6ef60d7c2905714f0f3.tar.gz gentoo-2-b3cbb4bfdf7d1b1a02d5a6ef60d7c2905714f0f3.tar.bz2 gentoo-2-b3cbb4bfdf7d1b1a02d5a6ef60d7c2905714f0f3.zip |
old
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r-- | sys-apps/lshw/files/digest-lshw-02.11b | 3 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.11b-build.patch | 75 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.11b.ebuild | 48 |
3 files changed, 0 insertions, 126 deletions
diff --git a/sys-apps/lshw/files/digest-lshw-02.11b b/sys-apps/lshw/files/digest-lshw-02.11b deleted file mode 100644 index 2b7d3c37fe7f..000000000000 --- a/sys-apps/lshw/files/digest-lshw-02.11b +++ /dev/null @@ -1,3 +0,0 @@ -MD5 e88d3a3bfef80f998a18d80fe99b36e2 lshw-B.02.11.tar.gz 1162501 -RMD160 e452bb1282914010f7da6ff4654e0f8c73f06286 lshw-B.02.11.tar.gz 1162501 -SHA256 af64f837de41c15ada8f61298cb93b607fd9cb8c217506da55b584b7ca2cefe0 lshw-B.02.11.tar.gz 1162501 diff --git a/sys-apps/lshw/files/lshw-02.11b-build.patch b/sys-apps/lshw/files/lshw-02.11b-build.patch deleted file mode 100644 index 9bfec0f5a373..000000000000 --- a/sys-apps/lshw/files/lshw-02.11b-build.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -ur lshw-B.02.11.orig/src/core/Makefile lshw-B.02.11/src/core/Makefile ---- lshw-B.02.11.orig/src/core/Makefile 2007-07-19 18:42:20.000000000 -0400 -+++ lshw-B.02.11/src/core/Makefile 2007-08-25 11:31:01.000000000 -0400 -@@ -1,9 +1,10 @@ - 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= -diff -ur lshw-B.02.11.orig/src/gui/Makefile lshw-B.02.11/src/gui/Makefile ---- lshw-B.02.11.orig/src/gui/Makefile 2007-07-19 18:42:20.000000000 -0400 -+++ lshw-B.02.11/src/gui/Makefile 2007-08-25 11:31:52.000000000 -0400 -@@ -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 $(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 -diff -ur lshw-B.02.11.orig/src/Makefile lshw-B.02.11/src/Makefile ---- lshw-B.02.11.orig/src/Makefile 2007-07-19 18:42:20.000000000 -0400 -+++ lshw-B.02.11/src/Makefile 2007-08-25 11:32:27.000000000 -0400 -@@ -7,7 +7,7 @@ - SBINDIR=$(PREFIX)/sbin - MANDIR=$(PREFIX)/share/man - DATADIR=$(PREFIX)/share --INSTALL?=install -p -s -+INSTALL?=install -p - STRIP?=strip - export DESTDIR - export PREFIX -@@ -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/lshw-02.11b.ebuild b/sys-apps/lshw/lshw-02.11b.ebuild deleted file mode 100644 index b02807ef4ace..000000000000 --- a/sys-apps/lshw/lshw-02.11b.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.11b.ebuild,v 1.1 2007/08/25 15:35:55 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" -RESTRICT="strip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 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.11b-build.patch - epatch "${FILESDIR}"/${PN}-02.09b-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() { - emake DESTDIR="${D}" install || die "install failed" - dodoc README docs/* - if use gtk ; then - emake DESTDIR="${D}" install-gui || die "install gui failed" - fi -} |