diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2013-08-08 19:42:32 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-08-08 19:42:32 +0000 |
commit | 64a9dac0555d5d6e9485e017bed55c9feffc27c3 (patch) | |
tree | ca06aa566178371b989c528ea9751e06518ee5f8 /sys-apps/lshw | |
parent | version bump, remove old (diff) | |
download | gentoo-2-64a9dac0555d5d6e9485e017bed55c9feffc27c3.tar.gz gentoo-2-64a9dac0555d5d6e9485e017bed55c9feffc27c3.tar.bz2 gentoo-2-64a9dac0555d5d6e9485e017bed55c9feffc27c3.zip |
version bump; also fixes bug #402313
(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r-- | sys-apps/lshw/ChangeLog | 10 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.15b-build.patch | 15 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.16b-gentoo.patch | 10 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.17b-gentoo.patch | 159 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.16b-r2.ebuild | 15 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.17b.ebuild | 70 |
6 files changed, 258 insertions, 21 deletions
diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog index bff75c84036f..c499ccb8cf55 100644 --- a/sys-apps/lshw/ChangeLog +++ b/sys-apps/lshw/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-apps/lshw # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.114 2013/06/26 13:41:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.115 2013/08/08 19:42:32 mr_bones_ Exp $ + +*lshw-02.17b (08 Aug 2013) + + 08 Aug 2013; Michael Sterrett <mr_bones_@gentoo.org> + +files/lshw-02.17b-gentoo.patch, +lshw-02.17b.ebuild, + files/lshw-02.15b-build.patch, files/lshw-02.16b-gentoo.patch, + lshw-02.16b-r2.ebuild: + version bump; also fixes bug #402313 26 Jun 2013; Jeroen Roovers <jer@gentoo.org> lshw-02.16b-r2.ebuild: Stable for HPPA too. diff --git a/sys-apps/lshw/files/lshw-02.15b-build.patch b/sys-apps/lshw/files/lshw-02.15b-build.patch index b0ab9f850d19..af2b3893ae17 100644 --- a/sys-apps/lshw/files/lshw-02.15b-build.patch +++ b/sys-apps/lshw/files/lshw-02.15b-build.patch @@ -1,6 +1,5 @@ -diff -ur lshw-B.02.15.orig/src/core/Makefile lshw-B.02.15/src/core/Makefile ---- lshw-B.02.15.orig/src/core/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/core/Makefile 2010-10-27 22:52:25.417069825 -0700 +--- lshw-B.02.15.orig/src/core/Makefile ++++ lshw-B.02.15/src/core/Makefile @@ -1,10 +1,10 @@ PACKAGENAME?=lshw @@ -15,9 +14,8 @@ diff -ur lshw-B.02.15.orig/src/core/Makefile lshw-B.02.15/src/core/Makefile LDSTATIC= LIBS= -diff -ur lshw-B.02.15.orig/src/gui/Makefile lshw-B.02.15/src/gui/Makefile ---- lshw-B.02.15.orig/src/gui/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/gui/Makefile 2010-10-27 22:54:54.870258929 -0700 +--- lshw-B.02.15.orig/src/gui/Makefile ++++ lshw-B.02.15/src/gui/Makefile @@ -8,11 +8,11 @@ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) @@ -40,9 +38,8 @@ diff -ur lshw-B.02.15.orig/src/gui/Makefile lshw-B.02.15/src/gui/Makefile 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.15.orig/src/Makefile lshw-B.02.15/src/Makefile ---- lshw-B.02.15.orig/src/Makefile 2010-10-05 02:34:27.000000000 -0700 -+++ lshw-B.02.15/src/Makefile 2010-10-27 22:53:26.010552033 -0700 +--- lshw-B.02.15.orig/src/Makefile ++++ lshw-B.02.15/src/Makefile @@ -21,11 +21,13 @@ CXX?=c++ INCLUDES=-I./core/ diff --git a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch index c18d9954592d..4942950d20bc 100644 --- a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch +++ b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch @@ -1,5 +1,3 @@ -Index: lshw-B.02.16/src/core/Makefile -=================================================================== --- lshw-B.02.16.orig/src/core/Makefile +++ lshw-B.02.16/src/core/Makefile @@ -1,10 +1,9 @@ @@ -15,8 +13,6 @@ Index: lshw-B.02.16/src/core/Makefile LDSTATIC= LIBS= -Index: lshw-B.02.16/src/gui/Makefile -=================================================================== --- lshw-B.02.16.orig/src/gui/Makefile +++ lshw-B.02.16/src/gui/Makefile @@ -1,5 +1,7 @@ @@ -57,8 +53,6 @@ Index: lshw-B.02.16/src/gui/Makefile clean: rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak -Index: lshw-B.02.16/src/Makefile -=================================================================== --- lshw-B.02.16.orig/src/Makefile +++ lshw-B.02.16/src/Makefile @@ -21,11 +21,11 @@ export SQLITE @@ -143,8 +137,6 @@ Index: lshw-B.02.16/src/Makefile .timestamp: date --utc +%Y%m%d%H%M%S > $@ -Index: lshw-B.02.16/src/core/pci.cc -=================================================================== --- lshw-B.02.16.orig/src/core/pci.cc +++ lshw-B.02.16/src/core/pci.cc @@ -17,7 +17,7 @@ __ID("@(#) $Id: pci.cc 2433 2012-01-10 2 @@ -156,8 +148,6 @@ Index: lshw-B.02.16/src/core/pci.cc #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ #define PCI_VENDOR_ID 0x00 /* 16 bits */ -Index: lshw-B.02.16/src/core/usb.cc -=================================================================== --- lshw-B.02.16.orig/src/core/usb.cc +++ lshw-B.02.16/src/core/usb.cc @@ -27,7 +27,7 @@ diff --git a/sys-apps/lshw/files/lshw-02.17b-gentoo.patch b/sys-apps/lshw/files/lshw-02.17b-gentoo.patch new file mode 100644 index 000000000000..1d3d431ec806 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.17b-gentoo.patch @@ -0,0 +1,159 @@ +--- lshw-B.02.17.orig/src/Makefile ++++ lshw-B.02.17/src/Makefile +@@ -21,11 +21,11 @@ + CXX?=c++ + INCLUDES=-I./core/ + DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" +-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + ifeq ($(SQLITE), 1) + CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) + endif +-LDFLAGS=-L./core/ -g ++LDFLAGS += -L./core/ + ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) + LDFLAGS+= -Wl,--as-needed + endif +@@ -39,27 +39,25 @@ + export LIBS + export LDFLAGS + +-DATAFILES = pci.ids usb.ids oui.txt manuf.txt +- +-all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES) ++all: $(PACKAGENAME) $(PACKAGENAME).1 + + .cc.o: + $(CXX) $(CXXFLAGS) -c $< -o $@ + + .PHONY: core + core: +- +make -C core all ++ $(MAKE) -C core all + + $(PACKAGENAME): core $(PACKAGENAME).o + $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) + + .PHONY: po + po: +- +make -C po all ++ $(MAKE) -C po all + + .PHONY: gui + gui: core +- +make -C gui all ++ $(MAKE) -C gui all + + .PHONY: nologo + nologo: +@@ -70,7 +68,6 @@ + + $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o + $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) +- $(STRIP) $@ + + .PHONY: compressed + compressed: $(PACKAGENAME)-compressed +@@ -93,14 +90,13 @@ + manuf.txt: + wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf + +-install: all ++install: + $(INSTALL) -d -m 0755 $(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) +- $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) +- make -C po install ++ $(MAKE) -C po install + + install-gui: gui + $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) +@@ -112,8 +108,8 @@ + + clean: + rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed +- make -C core clean +- make -C gui clean ++ $(MAKE) -C core clean ++ $(MAKE) -C gui clean + + .timestamp: + date --utc +%Y%m%d%H%M%S > $@ +--- lshw-B.02.17.orig/src/core/Makefile ++++ lshw-B.02.17/src/core/Makefile +@@ -1,10 +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) +-LDFLAGS= ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + LDSTATIC= + LIBS= + +--- lshw-B.02.17.orig/src/core/pci.cc ++++ lshw-B.02.17/src/core/pci.cc +@@ -17,7 +17,7 @@ + + #define PROC_BUS_PCI "/proc/bus/pci" + #define SYS_BUS_PCI "/sys/bus/pci" +-#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids" ++#define PCIID_PATH "/usr/share/misc/pci.ids" + + #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ + #define PCI_VENDOR_ID 0x00 /* 16 bits */ +--- lshw-B.02.17.orig/src/core/usb.cc ++++ lshw-B.02.17/src/core/usb.cc +@@ -27,7 +27,7 @@ + + #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" + #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices" +-#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids" ++#define USBID_PATH "/usr/share/misc/usb.ids" + + #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ + #define USB_CLASS_AUDIO 1 +--- lshw-B.02.17.orig/src/gui/Makefile ++++ lshw-B.02.17/src/gui/Makefile +@@ -1,5 +1,7 @@ + PACKAGENAME?=lshw + ++SQLITE?=0 ++ + CXX?=c++ + CC?=cc + STRIP?=strip +@@ -8,13 +10,14 @@ + 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) ++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) + CFLAGS=$(CXXFLAGS) $(DEFINES) + GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) +-LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) +-LDFLAGS= +-ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) +- LDFLAGS+= -Wl,--as-needed ++LIBS=-L../core -llshw -lresolv $(GTKLIBS) ++ ++ifeq ($(SQLITE), 1) ++ CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) ++ LIBS+= $(shell pkg-config --libs sqlite3) + endif + + OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o +@@ -39,7 +42,6 @@ + $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) + + install: all +- $(STRIP) gtk-$(PACKAGENAME) + + clean: + rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak diff --git a/sys-apps/lshw/lshw-02.16b-r2.ebuild b/sys-apps/lshw/lshw-02.16b-r2.ebuild index e105e14390f0..1dac08b9d1d4 100644 --- a/sys-apps/lshw/lshw-02.16b-r2.ebuild +++ b/sys-apps/lshw/lshw-02.16b-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b-r2.ebuild,v 1.11 2013/06/26 13:41:19 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b-r2.ebuild,v 1.12 2013/08/08 19:42:32 mr_bones_ Exp $ EAPI=4 inherit flag-o-matic eutils toolchain-funcs @@ -33,6 +33,19 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}"/${P}-gentoo.patch + # correct gettext behavior + if [[ -n "${LINGUAS+x}" ]] ; then + local langs + + for i in $(cd po ; echo *.po | sed 's/\.po//') ; do + if has ${i} ${LINGUAS} ; then + langs += " ${i}" + fi + done + sed -i \ + -e "/^LANGUAGES =/ s/=.*/= $langs/" \ + src/po/Makefile || die + fi } src_compile() { diff --git a/sys-apps/lshw/lshw-02.17b.ebuild b/sys-apps/lshw/lshw-02.17b.ebuild new file mode 100644 index 000000000000..05e7b1d2fa78 --- /dev/null +++ b/sys-apps/lshw/lshw-02.17b.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.17b.ebuild,v 1.1 2013/08/08 19:42:32 mr_bones_ Exp $ + +EAPI=4 +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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +IUSE="gtk sqlite static" + +REQUIRED_USE="static? ( !gtk )" + +RDEPEND="gtk? ( x11-libs/gtk+:2 ) + sqlite? ( dev-db/sqlite:3 )" +DEPEND="${RDEPEND} + gtk? ( virtual/pkgconfig ) + sqlite? ( virtual/pkgconfig )" +RDEPEND="${RDEPEND} + sys-apps/hwids" + +S=${WORKDIR}/${MY_P} + +src_prepare() { + epatch "${FILESDIR}"/${P}-gentoo.patch + # correct gettext behavior + if [[ -n "${LINGUAS+x}" ]] ; then + local langs + + for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do + if has ${i} ${LINGUAS} ; then + langs += " ${i}" + fi + done + sed -i \ + -e "/^LANGUAGES =/ s/=.*/= $langs/" \ + src/po/Makefile || die + fi +} + +src_compile() { + tc-export CC CXX AR + use static && append-ldflags -static + + local sqlite=$(usex sqlite 1 0) + + emake SQLITE=$sqlite all + if use gtk ; then + emake SQLITE=$sqlite gui + fi +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc README docs/* + if use gtk ; then + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui + make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" + fi +} |