From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- sys-apps/lshw/Manifest | 10 ++ sys-apps/lshw/files/lshw-02.16b-gentoo.patch | 161 +++++++++++++++++++++ sys-apps/lshw/files/lshw-02.18b-gentoo.patch | 161 +++++++++++++++++++++ .../lshw/files/lshw-02.18b-gettext-array.patch | 31 ++++ sys-apps/lshw/lshw-02.16b-r2.ebuild | 69 +++++++++ sys-apps/lshw/lshw-02.18b.ebuild | 72 +++++++++ sys-apps/lshw/metadata.xml | 8 + 7 files changed, 512 insertions(+) create mode 100644 sys-apps/lshw/Manifest create mode 100644 sys-apps/lshw/files/lshw-02.16b-gentoo.patch create mode 100644 sys-apps/lshw/files/lshw-02.18b-gentoo.patch create mode 100644 sys-apps/lshw/files/lshw-02.18b-gettext-array.patch create mode 100644 sys-apps/lshw/lshw-02.16b-r2.ebuild create mode 100644 sys-apps/lshw/lshw-02.18b.ebuild create mode 100644 sys-apps/lshw/metadata.xml (limited to 'sys-apps/lshw') diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest new file mode 100644 index 000000000000..3eb828fae180 --- /dev/null +++ b/sys-apps/lshw/Manifest @@ -0,0 +1,10 @@ +AUX lshw-02.16b-gentoo.patch 4972 SHA256 101e0bdc47a3deb489317454c66d2f3bfc5cf502f54e426c18a25b8c9fdf4203 SHA512 723a67b91972d3192a422fbead27fc6c3c7020bc0d0afb0d88792659e345f3379be423517f649eda7555d20bc26583ce8298ba101eba63ba6669e7bf213c8aef WHIRLPOOL 1f7c2ce9aa8644554573767048be837a1aa32c194eb702a7c72846bdc56269cef9ccd59196d3ebd39580a8dccd99c3e13fb1053e0a04f1533468ca3999c42e06 +AUX lshw-02.18b-gentoo.patch 4819 SHA256 a3dec0e5c310caea3d3fcfe45a8294f5ce03a5910901bcdd18be012d11e70044 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7 WHIRLPOOL e857417bddeaed9900138eae4196cfaac7f8914278bee5df2d470f5685f03f552b10cd3da681d506d50caf2c1b5767c3ee77532e57a30e4fe9ca772ddb3e4d48 +AUX lshw-02.18b-gettext-array.patch 924 SHA256 0a714fd5c4e106bdd87b321dc2c5b955870c8cd8d7ec9afc28649937ef319961 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee WHIRLPOOL 100a8d32f62b68ab342c9d80177f7c390741f4beaf50338805c6338414b0ce50ced064c994a3e97ff6c336dd6f033a15b4184d80342e0c6316d11d47b17a149b +DIST lshw-B.02.16.tar.gz 1845891 SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab WHIRLPOOL 8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d +DIST lshw-B.02.18.tar.gz 2322176 SHA256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 WHIRLPOOL 42a76daa9426dbca1f9acd9afc5e66542ea87e4e6cc53c2a125443d3338765ce55845981d1d50b380201dc10c8f0cae6fd1eb573573eb7262ce87c85d74f3e20 +EBUILD lshw-02.16b-r2.ebuild 1578 SHA256 f8e14606435cd2a8ea7b63ea20a0aa814a625fa25fc248604eb8059ac5c8fb51 SHA512 04bdbaab93a5afea433f2bda35b1254c3bbf3b6ce9f918acfdb2d7bf33f0f0d08df5473a7506efe10e04be8036d18e8d9e4ae0f7a37955d906893af546dc99a7 WHIRLPOOL 1c06cd8a5fc6cc3d7634582be3380e3b4f9179edbbd2ec1c14d5c40fcac7d2bfb1e96f175c32f8861db19bc9d7a39791c8d200b44c28fc7df621c2aa9a1119fa +EBUILD lshw-02.18b.ebuild 1733 SHA256 c132f4be4a6a683c1f132898574b920b20078aa3cfc23777566a4932cd1e91c5 SHA512 71ba3f14b2b0a074c4718cc8a01c96b81db4b848d1dbab6ae56ddb510f22c4118dbf3556afddcd966171f4be3c8ad70c840e29fb7374b213e826d6617f3f3dc5 WHIRLPOOL 31d7b44e52cd941cbfdfa0ece98d76c0f110c72d826429ca351583efa052a1409926d81dada6e891fb11520e93330c432541d2c3792d7ace22e3d42f275fb3e9 +MISC ChangeLog 3814 SHA256 0d1b50caaf76df36646baf5439f54572d6da1e16fd63d42aaf29aa7d91e01cb5 SHA512 c2c3507d1ca0e12cfc07c3a0dffd8865e264fefeed0ba2390e5be9c3df1874a782b546a5540be5fda081228931553c0c4da7bef8fc0cbe31ded9e721651bf6fe WHIRLPOOL 8efbb8e044d7171f32946bba36b8cbe376559ae1f5f748f351a322be268d64e8343152653a35b6989e2885766a05522d3cdfbf2b4ea46b7c47386197e6631a46 +MISC ChangeLog-2015 14670 SHA256 2ef10eddb9a1be131708ee0af8db0abf5d06d3179fe8f9887355a04499050f43 SHA512 5cc4886c2865cb99c5e90d60de96b861cf031fc4a0821c5c75f6b27ee098e980624e5ba78e12224b9ddf5dc54e33ae78939480d00327d0abdc59a994a28d045f WHIRLPOOL b0eab89bee9d39e40a7a8f22f3aa80347a1c9f138c2b3ddcf6fde670d020e9b9c4a65d9115385e0e89435307b0d07e9f14924f0cdcc9fca9b8d4e15d69f354c4 +MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 diff --git a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch new file mode 100644 index 000000000000..dfd2c8983704 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch @@ -0,0 +1,161 @@ +--- lshw-B.02.16.orig/src/core/Makefile ++++ lshw-B.02.16/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.16.orig/src/gui/Makefile ++++ lshw-B.02.16/src/gui/Makefile +@@ -1,5 +1,7 @@ + PACKAGENAME?=lshw + ++SQLITE?=0 ++ + CXX?=c++ + CC?=cc + STRIP?=strip +@@ -8,13 +10,14 @@ OBJCOPY?=objcopy + 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,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl + $(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 + +--- lshw-B.02.16.orig/src/Makefile ++++ lshw-B.02.16/src/Makefile +@@ -21,11 +21,11 @@ export SQLITE + 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 CXXFLAGS + 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 @@ static: $(PACKAGENAME)-static + + $(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 @@ oui.txt: + 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 @@ install-gui: gui + + 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.16.orig/src/core/pci.cc ++++ lshw-B.02.16/src/core/pci.cc +@@ -17,7 +17,7 @@ __ID("@(#) $Id + + #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.16.orig/src/core/usb.cc ++++ lshw-B.02.16/src/core/usb.cc +@@ -27,7 +27,7 @@ + + #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" + #define SYSBUSUSBDEVICES "/sys/bus/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 diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch new file mode 100644 index 000000000000..0a50e9dc868c --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch @@ -0,0 +1,161 @@ +--- lshw-B.02.18/src/Makefile ++++ lshw-B.02.18/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.18/src/core/Makefile ++++ lshw-B.02.18/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.18/src/core/pci.cc ++++ lshw-B.02.18/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.18/src/core/usb.cc ++++ lshw-B.02.18/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.18/src/gui/Makefile ++++ lshw-B.02.18/src/gui/Makefile +@@ -1,5 +1,7 @@ + PACKAGENAME?=lshw + ++SQLITE?=0 ++ + CXX?=c++ + CC?=cc + STRIP?=strip +@@ -8,14 +10,15 @@ + 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 $(GTKLIBS) +-LDFLAGS= +-ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) +- LDFLAGS+= -Wl,--as-needed +-endif ++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 + SRCS = $(OBJS:.o=.c) +@@ -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/files/lshw-02.18b-gettext-array.patch b/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch new file mode 100644 index 000000000000..4aea6420d7c1 --- /dev/null +++ b/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch @@ -0,0 +1,31 @@ +patch sent upstream + +From 1fb7ebed787ec1b73218c1f12cbb71b103433375 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger +Date: Tue, 14 Mar 2017 22:25:12 -0700 +Subject: [PATCH] fix array access with string translations + +The code forgot to rebase the num to 0 before indexing the string array. +It also provides 5 strings, but was only allowing 4 to be accessed. +--- + src/core/dmi.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/dmi.cc b/src/core/dmi.cc +index 250f48572d54..0db074975f2d 100644 +--- a/src/core/dmi.cc ++++ b/src/core/dmi.cc +@@ -510,8 +510,8 @@ static const char *dmi_memory_array_location(u8 num) + }; + if (num <= 0x0A) + return _(memory_array_location[num]); +- if (num >= 0xA0 && num < 0xA4) +- return _(jp_memory_array_location[num]); ++ if (num >= 0xA0 && num <= 0xA4) ++ return _(jp_memory_array_location[num - 0xA0]); + return ""; + } + +-- +2.12.0 + diff --git a/sys-apps/lshw/lshw-02.16b-r2.ebuild b/sys-apps/lshw/lshw-02.16b-r2.ebuild new file mode 100644 index 000000000000..36348d30564e --- /dev/null +++ b/sys-apps/lshw/lshw-02.16b-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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="https://www.ezix.org/project/wiki/HardwareLiSter" +SRC_URI="https://www.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 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 +} diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild new file mode 100644 index 000000000000..ce73d9167e88 --- /dev/null +++ b/sys-apps/lshw/lshw-02.18b.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +PLOCALES='fr' + +inherit flag-o-matic eutils toolchain-funcs l10n + +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="https://www.ezix.org/project/wiki/HardwareLiSter" +SRC_URI="https://www.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} + +PATCHES=( + "${FILESDIR}"/${PN}-02.18b-gentoo.patch + "${FILESDIR}"/${PN}-02.18b-gettext-array.patch +) + +src_prepare() { + epatch "${PATCHES[@]}" + + l10n_find_plocales_changes "src/po" "" ".po" || die + sed -i \ + -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \ + src/po/Makefile || die + sed -i \ + -e 's:\:${PKG_CONFIG}:' \ + src/Makefile src/gui/Makefile || die +} + +src_compile() { + tc-export CC CXX AR PKG_CONFIG + use static && append-ldflags -static + + # Need two sep make statements to avoid parallel build issues. #588174 + local sqlite=$(usex sqlite 1 0) + emake SQLITE=${sqlite} all + use gtk && emake SQLITE=${sqlite} gui +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') + dodoc README.md docs/* + if use gtk ; then + newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg + make_desktop_entry \ + "${EPREFIX}"/usr/sbin/gtk-lshw \ + "${DESCRIPTION}" + fi +} diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml new file mode 100644 index 000000000000..56c124413057 --- /dev/null +++ b/sys-apps/lshw/metadata.xml @@ -0,0 +1,8 @@ + + + + + base-system@gentoo.org + Gentoo Base System + + -- cgit v1.2.3