summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2008-05-31 10:02:35 +0000
committerMike Frysinger <vapier@gentoo.org>2008-05-31 10:02:35 +0000
commit117d6c8f4946fbbaec29f6b5134cc0a781e9ba17 (patch)
tree4219a2bc54e6a70e4ba22b1ee9d27a04fbc3f6f6 /sys-apps/lshw
parentarm stable (diff)
downloadhistorical-117d6c8f4946fbbaec29f6b5134cc0a781e9ba17.tar.gz
historical-117d6c8f4946fbbaec29f6b5134cc0a781e9ba17.tar.bz2
historical-117d6c8f4946fbbaec29f6b5134cc0a781e9ba17.zip
old
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r--sys-apps/lshw/files/lshw-02.08.01b-build.patch94
-rw-r--r--sys-apps/lshw/files/lshw-02.11.01b-build.patch63
-rw-r--r--sys-apps/lshw/lshw-02.10b.ebuild50
-rw-r--r--sys-apps/lshw/lshw-02.11.01b.ebuild49
4 files changed, 0 insertions, 256 deletions
diff --git a/sys-apps/lshw/files/lshw-02.08.01b-build.patch b/sys-apps/lshw/files/lshw-02.08.01b-build.patch
deleted file mode 100644
index 04b4b771d7bb..000000000000
--- a/sys-apps/lshw/files/lshw-02.08.01b-build.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- lshw-B.02.08.01/src/Makefile
-+++ lshw-B.02.08.01/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 -g $(INCLUDES) $(DEFINES)
--LDFLAGS=-L./core/ -g
-+CXXFLAGS ?= -g -Os
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES)
-+LDFLAGS ?= -s
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
- LDFLAGS+= -Wl,--as-needed
- endif
-@@ -48,7 +49,6 @@
-
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
- $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-- strip $@
-
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -73,7 +73,7 @@
-
- install: all
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-- $(INSTALL) -m 0755 -s $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
-+ $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
- $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
-@@ -81,7 +81,7 @@
-
- install-gui: gui
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-- $(INSTALL) -m 0755 -s gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
-+ $(INSTALL) -m 0755 gui/gtk-$(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
- $(INSTALL) -m 0644 gui/artwork/*.svg $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)/artwork
-
---- lshw-B.02.08.01/src/core/Makefile
-+++ lshw-B.02.08.01/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.08.01/src/gui/Makefile
-+++ lshw-B.02.08.01/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
-@@ -33,7 +35,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 --git a/sys-apps/lshw/files/lshw-02.11.01b-build.patch b/sys-apps/lshw/files/lshw-02.11.01b-build.patch
deleted file mode 100644
index 73cd5d59dcb3..000000000000
--- a/sys-apps/lshw/files/lshw-02.11.01b-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- lshw-B.02.11.01/src/core/Makefile
-+++ lshw-B.02.11.01/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 $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDFLAGS=
- LDSTATIC=
- LIBS=
---- lshw-B.02.11.01/src/gui/Makefile
-+++ lshw-B.02.11.01/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 $(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-B.02.11.01/src/Makefile
-+++ lshw-B.02.11.01/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/lshw-02.10b.ebuild b/sys-apps/lshw/lshw-02.10b.ebuild
deleted file mode 100644
index ec57bd680f0a..000000000000
--- a/sys-apps/lshw/lshw-02.10b.ebuild
+++ /dev/null
@@ -1,50 +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.10b.ebuild,v 1.3 2007/05/14 17:27:04 armin76 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.08.01b-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() {
- 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.11.01b.ebuild b/sys-apps/lshw/lshw-02.11.01b.ebuild
deleted file mode 100644
index 86ca201f53c3..000000000000
--- a/sys-apps/lshw/lshw-02.11.01b.ebuild
+++ /dev/null
@@ -1,49 +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.11.01b.ebuild,v 1.10 2007/11/25 01:24:38 ranger 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 ia64 ppc ~ppc64 sparc x86"
-IUSE="gtk static"
-RESTRICT="strip"
-
-DEPEND="gtk? ( >=x11-libs/gtk+-2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-02.11.01b-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"
- make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
- fi
-}