| 1 |
commit: 209fbd0bc15fe7ff4c8eab6e578677db5628571d |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 18 14:08:01 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 18 14:15:05 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209fbd0b |
| 7 |
|
| 8 |
sys-apps/lshw: drop old |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-apps/lshw/Manifest | 1 - |
| 14 |
sys-apps/lshw/files/lshw-02.18b-gentoo.patch | 161 --------------------- |
| 15 |
.../lshw/files/lshw-02.18b-gettext-array.patch | 31 ---- |
| 16 |
sys-apps/lshw/files/lshw-02.18b-sgx.patch | 32 ---- |
| 17 |
sys-apps/lshw/lshw-02.18b-r1.ebuild | 73 ---------- |
| 18 |
sys-apps/lshw/lshw-02.18b.ebuild | 72 --------- |
| 19 |
6 files changed, 370 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest |
| 22 |
index 4ddd546f9aa..37b8ca7c4e8 100644 |
| 23 |
--- a/sys-apps/lshw/Manifest |
| 24 |
+++ b/sys-apps/lshw/Manifest |
| 25 |
@@ -1,3 +1,2 @@ |
| 26 |
-DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 |
| 27 |
DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 |
| 28 |
DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 |
| 29 |
|
| 30 |
diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch |
| 31 |
deleted file mode 100644 |
| 32 |
index dd42df9b528..00000000000 |
| 33 |
--- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,161 +0,0 @@ |
| 36 |
---- a/src/Makefile |
| 37 |
-+++ b/src/Makefile |
| 38 |
-@@ -21,11 +21,11 @@ |
| 39 |
- CXX?=c++ |
| 40 |
- INCLUDES=-I./core/ |
| 41 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 42 |
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 43 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 44 |
- ifeq ($(SQLITE), 1) |
| 45 |
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) |
| 46 |
- endif |
| 47 |
--LDFLAGS=-L./core/ -g |
| 48 |
-+LDFLAGS += -L./core/ |
| 49 |
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 50 |
- LDFLAGS+= -Wl,--as-needed |
| 51 |
- endif |
| 52 |
-@@ -39,27 +39,25 @@ |
| 53 |
- export LIBS |
| 54 |
- export LDFLAGS |
| 55 |
- |
| 56 |
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt |
| 57 |
-- |
| 58 |
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES) |
| 59 |
-+all: $(PACKAGENAME) $(PACKAGENAME).1 |
| 60 |
- |
| 61 |
- .cc.o: |
| 62 |
- $(CXX) $(CXXFLAGS) -c $< -o $@ |
| 63 |
- |
| 64 |
- .PHONY: core |
| 65 |
- core: |
| 66 |
-- +make -C core all |
| 67 |
-+ $(MAKE) -C core all |
| 68 |
- |
| 69 |
- $(PACKAGENAME): core $(PACKAGENAME).o |
| 70 |
- $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
| 71 |
- |
| 72 |
- .PHONY: po |
| 73 |
- po: |
| 74 |
-- +make -C po all |
| 75 |
-+ $(MAKE) -C po all |
| 76 |
- |
| 77 |
- .PHONY: gui |
| 78 |
- gui: core |
| 79 |
-- +make -C gui all |
| 80 |
-+ $(MAKE) -C gui all |
| 81 |
- |
| 82 |
- .PHONY: nologo |
| 83 |
- nologo: |
| 84 |
-@@ -70,7 +68,6 @@ |
| 85 |
- |
| 86 |
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o |
| 87 |
- $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
| 88 |
-- $(STRIP) $@ |
| 89 |
- |
| 90 |
- .PHONY: compressed |
| 91 |
- compressed: $(PACKAGENAME)-compressed |
| 92 |
-@@ -93,14 +90,13 @@ |
| 93 |
- manuf.txt: |
| 94 |
- wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf |
| 95 |
- |
| 96 |
--install: all |
| 97 |
-+install: |
| 98 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
| 99 |
- $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR) |
| 100 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1 |
| 101 |
- $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1 |
| 102 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
| 103 |
-- $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
| 104 |
-- make -C po install |
| 105 |
-+ $(MAKE) -C po install |
| 106 |
- |
| 107 |
- install-gui: gui |
| 108 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
| 109 |
-@@ -112,8 +108,8 @@ |
| 110 |
- |
| 111 |
- clean: |
| 112 |
- rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed |
| 113 |
-- make -C core clean |
| 114 |
-- make -C gui clean |
| 115 |
-+ $(MAKE) -C core clean |
| 116 |
-+ $(MAKE) -C gui clean |
| 117 |
- |
| 118 |
- .timestamp: |
| 119 |
- date --utc +%Y%m%d%H%M%S > $@ |
| 120 |
---- a/src/core/Makefile |
| 121 |
-+++ b/src/core/Makefile |
| 122 |
-@@ -1,10 +1,9 @@ |
| 123 |
- PACKAGENAME?=lshw |
| 124 |
- |
| 125 |
--CXX=c++ |
| 126 |
-+CXX?=c++ |
| 127 |
- INCLUDES= |
| 128 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 129 |
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 130 |
--LDFLAGS= |
| 131 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 132 |
- LDSTATIC= |
| 133 |
- LIBS= |
| 134 |
- |
| 135 |
---- a/src/core/pci.cc |
| 136 |
-+++ b/src/core/pci.cc |
| 137 |
-@@ -17,7 +17,7 @@ |
| 138 |
- |
| 139 |
- #define PROC_BUS_PCI "/proc/bus/pci" |
| 140 |
- #define SYS_BUS_PCI "/sys/bus/pci" |
| 141 |
--#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" |
| 142 |
-+#define PCIID_PATH "/usr/share/misc/pci.ids" |
| 143 |
- |
| 144 |
- #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ |
| 145 |
- #define PCI_VENDOR_ID 0x00 /* 16 bits */ |
| 146 |
---- a/src/core/usb.cc |
| 147 |
-+++ b/src/core/usb.cc |
| 148 |
-@@ -27,7 +27,7 @@ |
| 149 |
- |
| 150 |
- #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" |
| 151 |
- #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices" |
| 152 |
--#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" |
| 153 |
-+#define USBID_PATH "/usr/share/misc/usb.ids" |
| 154 |
- |
| 155 |
- #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ |
| 156 |
- #define USB_CLASS_AUDIO 1 |
| 157 |
---- a/src/gui/Makefile |
| 158 |
-+++ b/src/gui/Makefile |
| 159 |
-@@ -1,5 +1,7 @@ |
| 160 |
- PACKAGENAME?=lshw |
| 161 |
- |
| 162 |
-+SQLITE?=0 |
| 163 |
-+ |
| 164 |
- CXX?=c++ |
| 165 |
- CC?=cc |
| 166 |
- STRIP?=strip |
| 167 |
-@@ -8,14 +10,15 @@ |
| 168 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 169 |
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) |
| 170 |
- INCLUDES=-I../core $(GTKINCLUDES) |
| 171 |
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 172 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 173 |
- CFLAGS=$(CXXFLAGS) $(DEFINES) |
| 174 |
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) |
| 175 |
--LIBS=-L../core -llshw -lresolv $(GTKLIBS) |
| 176 |
--LDFLAGS= |
| 177 |
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 178 |
-- LDFLAGS+= -Wl,--as-needed |
| 179 |
--endif |
| 180 |
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS) |
| 181 |
-+ |
| 182 |
-+ifeq ($(SQLITE), 1) |
| 183 |
-+ CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) |
| 184 |
-+ LIBS+= $(shell pkg-config --libs sqlite3) |
| 185 |
-+endif |
| 186 |
- |
| 187 |
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o |
| 188 |
- SRCS = $(OBJS:.o=.c) |
| 189 |
-@@ -39,7 +42,6 @@ |
| 190 |
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 191 |
- |
| 192 |
- install: all |
| 193 |
-- $(STRIP) gtk-$(PACKAGENAME) |
| 194 |
- |
| 195 |
- clean: |
| 196 |
- rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak |
| 197 |
|
| 198 |
diff --git a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch b/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch |
| 199 |
deleted file mode 100644 |
| 200 |
index 4aea6420d7c..00000000000 |
| 201 |
--- a/sys-apps/lshw/files/lshw-02.18b-gettext-array.patch |
| 202 |
+++ /dev/null |
| 203 |
@@ -1,31 +0,0 @@ |
| 204 |
-patch sent upstream |
| 205 |
- |
| 206 |
-From 1fb7ebed787ec1b73218c1f12cbb71b103433375 Mon Sep 17 00:00:00 2001 |
| 207 |
-From: Mike Frysinger <vapier@g.o> |
| 208 |
-Date: Tue, 14 Mar 2017 22:25:12 -0700 |
| 209 |
-Subject: [PATCH] fix array access with string translations |
| 210 |
- |
| 211 |
-The code forgot to rebase the num to 0 before indexing the string array. |
| 212 |
-It also provides 5 strings, but was only allowing 4 to be accessed. |
| 213 |
---- |
| 214 |
- src/core/dmi.cc | 4 ++-- |
| 215 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 216 |
- |
| 217 |
-diff --git a/src/core/dmi.cc b/src/core/dmi.cc |
| 218 |
-index 250f48572d54..0db074975f2d 100644 |
| 219 |
---- a/src/core/dmi.cc |
| 220 |
-+++ b/src/core/dmi.cc |
| 221 |
-@@ -510,8 +510,8 @@ static const char *dmi_memory_array_location(u8 num) |
| 222 |
- }; |
| 223 |
- if (num <= 0x0A) |
| 224 |
- return _(memory_array_location[num]); |
| 225 |
-- if (num >= 0xA0 && num < 0xA4) |
| 226 |
-- return _(jp_memory_array_location[num]); |
| 227 |
-+ if (num >= 0xA0 && num <= 0xA4) |
| 228 |
-+ return _(jp_memory_array_location[num - 0xA0]); |
| 229 |
- return ""; |
| 230 |
- } |
| 231 |
- |
| 232 |
--- |
| 233 |
-2.12.0 |
| 234 |
- |
| 235 |
|
| 236 |
diff --git a/sys-apps/lshw/files/lshw-02.18b-sgx.patch b/sys-apps/lshw/files/lshw-02.18b-sgx.patch |
| 237 |
deleted file mode 100644 |
| 238 |
index 92bd6c23e2f..00000000000 |
| 239 |
--- a/sys-apps/lshw/files/lshw-02.18b-sgx.patch |
| 240 |
+++ /dev/null |
| 241 |
@@ -1,32 +0,0 @@ |
| 242 |
-patch from upstream: |
| 243 |
-https://ezix.org/src/pkg/lshw/commit/5e5744732b2dcdf83845919256388b3842033183 |
| 244 |
- |
| 245 |
-From 5e5744732b2dcdf83845919256388b3842033183 Mon Sep 17 00:00:00 2001 |
| 246 |
-From: Wenkai Du <wenkai.du@×××××.com> |
| 247 |
-Date: Fri, 22 Dec 2017 09:57:57 -0800 |
| 248 |
-Subject: [PATCH] lshw: fix segmentation fault when /dev/sgx is present |
| 249 |
- |
| 250 |
-When Intel SGX is enabled in kernel, /dev/sgx is created and is |
| 251 |
-picked up by "/dev/sg*" glob matching. |
| 252 |
- |
| 253 |
-Signed-off-by: Wenkai Du <wenkai.du@×××××.com> |
| 254 |
---- |
| 255 |
- src/core/scsi.cc | 2 +- |
| 256 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 257 |
- |
| 258 |
-diff --git a/src/core/scsi.cc b/src/core/scsi.cc |
| 259 |
-index b38dda2cd8a8..75061c0fb195 100644 |
| 260 |
---- a/src/core/scsi.cc |
| 261 |
-+++ b/src/core/scsi.cc |
| 262 |
-@@ -30,7 +30,7 @@ |
| 263 |
- |
| 264 |
- __ID("@(#) $Id$"); |
| 265 |
- |
| 266 |
--#define SG_X "/dev/sg*" |
| 267 |
-+#define SG_X "/dev/sg[0-9]*" |
| 268 |
- #define SG_MAJOR 21 |
| 269 |
- |
| 270 |
- #ifndef SCSI_IOCTL_GET_PCI |
| 271 |
--- |
| 272 |
-2.15.1 |
| 273 |
- |
| 274 |
|
| 275 |
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild |
| 276 |
deleted file mode 100644 |
| 277 |
index f3e16336e3f..00000000000 |
| 278 |
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild |
| 279 |
+++ /dev/null |
| 280 |
@@ -1,73 +0,0 @@ |
| 281 |
-# Copyright 1999-2021 Gentoo Authors |
| 282 |
-# Distributed under the terms of the GNU General Public License v2 |
| 283 |
- |
| 284 |
-EAPI="5" |
| 285 |
- |
| 286 |
-PLOCALES='fr' |
| 287 |
- |
| 288 |
-inherit desktop flag-o-matic toolchain-funcs l10n |
| 289 |
- |
| 290 |
-MAJ_PV=${PV:0:${#PV}-1} |
| 291 |
-MIN_PVE=${PV:0-1} |
| 292 |
-MIN_PV=${MIN_PVE/b/B} |
| 293 |
- |
| 294 |
-MY_P="${PN}-${MIN_PV}.${MAJ_PV}" |
| 295 |
-DESCRIPTION="Hardware Lister" |
| 296 |
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" |
| 297 |
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" |
| 298 |
- |
| 299 |
-LICENSE="GPL-2" |
| 300 |
-SLOT="0" |
| 301 |
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 302 |
-IUSE="gtk sqlite static" |
| 303 |
- |
| 304 |
-REQUIRED_USE="static? ( !gtk !sqlite )" |
| 305 |
- |
| 306 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 307 |
- sqlite? ( dev-db/sqlite:3 )" |
| 308 |
-DEPEND="${RDEPEND} |
| 309 |
- gtk? ( virtual/pkgconfig ) |
| 310 |
- sqlite? ( virtual/pkgconfig )" |
| 311 |
-RDEPEND="${RDEPEND} |
| 312 |
- sys-apps/hwids" |
| 313 |
- |
| 314 |
-S=${WORKDIR}/${MY_P} |
| 315 |
- |
| 316 |
-PATCHES=( |
| 317 |
- "${FILESDIR}"/${PN}-02.18b-gentoo.patch |
| 318 |
- "${FILESDIR}"/${PN}-02.18b-gettext-array.patch |
| 319 |
- "${FILESDIR}"/${PN}-02.18b-sgx.patch |
| 320 |
-) |
| 321 |
- |
| 322 |
-src_prepare() { |
| 323 |
- epatch "${PATCHES[@]}" |
| 324 |
- |
| 325 |
- l10n_find_plocales_changes "src/po" "" ".po" || die |
| 326 |
- sed -i \ |
| 327 |
- -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \ |
| 328 |
- src/po/Makefile || die |
| 329 |
- sed -i \ |
| 330 |
- -e 's:\<pkg-config\>:${PKG_CONFIG}:' \ |
| 331 |
- src/Makefile src/gui/Makefile || die |
| 332 |
-} |
| 333 |
- |
| 334 |
-src_compile() { |
| 335 |
- tc-export CC CXX AR PKG_CONFIG |
| 336 |
- use static && append-ldflags -static |
| 337 |
- |
| 338 |
- # Need two sep make statements to avoid parallel build issues. #588174 |
| 339 |
- local sqlite=$(usex sqlite 1 0) |
| 340 |
- emake SQLITE=${sqlite} all |
| 341 |
- use gtk && emake SQLITE=${sqlite} gui |
| 342 |
-} |
| 343 |
- |
| 344 |
-src_install() { |
| 345 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 346 |
- dodoc README.md docs/* |
| 347 |
- if use gtk ; then |
| 348 |
- newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg |
| 349 |
- make_desktop_entry \ |
| 350 |
- "${EPREFIX}"/usr/sbin/gtk-lshw \ |
| 351 |
- "${DESCRIPTION}" |
| 352 |
- fi |
| 353 |
-} |
| 354 |
|
| 355 |
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild |
| 356 |
deleted file mode 100644 |
| 357 |
index 8243b8bc20c..00000000000 |
| 358 |
--- a/sys-apps/lshw/lshw-02.18b.ebuild |
| 359 |
+++ /dev/null |
| 360 |
@@ -1,72 +0,0 @@ |
| 361 |
-# Copyright 1999-2021 Gentoo Authors |
| 362 |
-# Distributed under the terms of the GNU General Public License v2 |
| 363 |
- |
| 364 |
-EAPI="5" |
| 365 |
- |
| 366 |
-PLOCALES='fr' |
| 367 |
- |
| 368 |
-inherit desktop flag-o-matic toolchain-funcs l10n |
| 369 |
- |
| 370 |
-MAJ_PV=${PV:0:${#PV}-1} |
| 371 |
-MIN_PVE=${PV:0-1} |
| 372 |
-MIN_PV=${MIN_PVE/b/B} |
| 373 |
- |
| 374 |
-MY_P="${PN}-${MIN_PV}.${MAJ_PV}" |
| 375 |
-DESCRIPTION="Hardware Lister" |
| 376 |
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" |
| 377 |
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" |
| 378 |
- |
| 379 |
-LICENSE="GPL-2" |
| 380 |
-SLOT="0" |
| 381 |
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" |
| 382 |
-IUSE="gtk sqlite static" |
| 383 |
- |
| 384 |
-REQUIRED_USE="static? ( !gtk )" |
| 385 |
- |
| 386 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 387 |
- sqlite? ( dev-db/sqlite:3 )" |
| 388 |
-DEPEND="${RDEPEND} |
| 389 |
- gtk? ( virtual/pkgconfig ) |
| 390 |
- sqlite? ( virtual/pkgconfig )" |
| 391 |
-RDEPEND="${RDEPEND} |
| 392 |
- sys-apps/hwids" |
| 393 |
- |
| 394 |
-S=${WORKDIR}/${MY_P} |
| 395 |
- |
| 396 |
-PATCHES=( |
| 397 |
- "${FILESDIR}"/${PN}-02.18b-gentoo.patch |
| 398 |
- "${FILESDIR}"/${PN}-02.18b-gettext-array.patch |
| 399 |
-) |
| 400 |
- |
| 401 |
-src_prepare() { |
| 402 |
- epatch "${PATCHES[@]}" |
| 403 |
- |
| 404 |
- l10n_find_plocales_changes "src/po" "" ".po" || die |
| 405 |
- sed -i \ |
| 406 |
- -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \ |
| 407 |
- src/po/Makefile || die |
| 408 |
- sed -i \ |
| 409 |
- -e 's:\<pkg-config\>:${PKG_CONFIG}:' \ |
| 410 |
- src/Makefile src/gui/Makefile || die |
| 411 |
-} |
| 412 |
- |
| 413 |
-src_compile() { |
| 414 |
- tc-export CC CXX AR PKG_CONFIG |
| 415 |
- use static && append-ldflags -static |
| 416 |
- |
| 417 |
- # Need two sep make statements to avoid parallel build issues. #588174 |
| 418 |
- local sqlite=$(usex sqlite 1 0) |
| 419 |
- emake SQLITE=${sqlite} all |
| 420 |
- use gtk && emake SQLITE=${sqlite} gui |
| 421 |
-} |
| 422 |
- |
| 423 |
-src_install() { |
| 424 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 425 |
- dodoc README.md docs/* |
| 426 |
- if use gtk ; then |
| 427 |
- newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg |
| 428 |
- make_desktop_entry \ |
| 429 |
- "${EPREFIX}"/usr/sbin/gtk-lshw \ |
| 430 |
- "${DESCRIPTION}" |
| 431 |
- fi |
| 432 |
-} |
Archives