mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 17:09:10 -07:00
sys-apps/lshw: Drop old
Package-Manager: Portage-2.3.24, Repoman-2.3.6
This commit is contained in:
@@ -1,2 +1 @@
|
||||
DIST lshw-B.02.16.tar.gz 1845891 BLAKE2B 57d22af384b9f6f1878439f48ebd31163738744842a7682877126d6f914c1496442d79dc818e774f76ee04c4a284407c5ce53ba72af71571731bb4940f8a2338 SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
|
||||
DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
|
||||
|
||||
@@ -1,161 +0,0 @@
|
||||
--- 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
|
||||
@@ -1,69 +0,0 @@
|
||||
# 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
|
||||
}
|
||||
Reference in New Issue
Block a user