| 1 |
commit: c6e928d9d154ce3c86d89e961bf5afcb1200a440 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 1 02:19:32 2017 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 1 02:21:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e928d9 |
| 7 |
|
| 8 |
sys-apps/lshw: remove old |
| 9 |
|
| 10 |
sys-apps/lshw/Manifest | 1 - |
| 11 |
sys-apps/lshw/files/lshw-02.17b-fat.patch | 10 -- |
| 12 |
sys-apps/lshw/files/lshw-02.17b-gentoo.patch | 159 ----------------------- |
| 13 |
sys-apps/lshw/files/lshw-02.17b-musl.patch | 186 --------------------------- |
| 14 |
sys-apps/lshw/lshw-02.17b-r1.ebuild | 71 ---------- |
| 15 |
sys-apps/lshw/lshw-02.17b-r2.ebuild | 67 ---------- |
| 16 |
sys-apps/lshw/lshw-02.17b.ebuild | 69 ---------- |
| 17 |
7 files changed, 563 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest |
| 20 |
index 5170bcc0535..675dc5e69f3 100644 |
| 21 |
--- a/sys-apps/lshw/Manifest |
| 22 |
+++ b/sys-apps/lshw/Manifest |
| 23 |
@@ -1,3 +1,2 @@ |
| 24 |
DIST lshw-B.02.16.tar.gz 1845891 SHA256 809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab WHIRLPOOL 8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d |
| 25 |
-DIST lshw-B.02.17.tar.gz 2005737 SHA256 eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c SHA512 868899dce98e786a08a2134d6e132c388d71ab0f03fa6e10881e14d7a882c1882b46bbc6bd6ddb021cfab87ad6c9fd369453c3916f0b3353027eb2d470e55d9b WHIRLPOOL 5b18df2732e50f38dd8d9168adb6083e9a637cf9596f692a7e6806cda2ad05c777babdbeab470d948604f45bbbf1282be6d9fc68bf5c70741acf2d884e93e749 |
| 26 |
DIST lshw-B.02.18.tar.gz 2322176 SHA256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 WHIRLPOOL 42a76daa9426dbca1f9acd9afc5e66542ea87e4e6cc53c2a125443d3338765ce55845981d1d50b380201dc10c8f0cae6fd1eb573573eb7262ce87c85d74f3e20 |
| 27 |
|
| 28 |
diff --git a/sys-apps/lshw/files/lshw-02.17b-fat.patch b/sys-apps/lshw/files/lshw-02.17b-fat.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 08654fd5af6..00000000000 |
| 31 |
--- a/sys-apps/lshw/files/lshw-02.17b-fat.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,10 +0,0 @@ |
| 34 |
-http://bugs.gentoo.org/485496 |
| 35 |
- |
| 36 |
---- src/core/fat.cc |
| 37 |
-+++ src/core/fat.cc |
| 38 |
-@@ -82,4 +82,5 @@ |
| 39 |
- uint8_t pmagic[2]; |
| 40 |
- } __attribute__((__packed__)) fat32; |
| 41 |
-+ char sector[512]; // to make sure the whole struct is at least 512 bytes long |
| 42 |
- } __attribute__((__packed__)) type; |
| 43 |
- } __attribute__((__packed__)); |
| 44 |
|
| 45 |
diff --git a/sys-apps/lshw/files/lshw-02.17b-gentoo.patch b/sys-apps/lshw/files/lshw-02.17b-gentoo.patch |
| 46 |
deleted file mode 100644 |
| 47 |
index 1d3d431ec80..00000000000 |
| 48 |
--- a/sys-apps/lshw/files/lshw-02.17b-gentoo.patch |
| 49 |
+++ /dev/null |
| 50 |
@@ -1,159 +0,0 @@ |
| 51 |
---- lshw-B.02.17.orig/src/Makefile |
| 52 |
-+++ lshw-B.02.17/src/Makefile |
| 53 |
-@@ -21,11 +21,11 @@ |
| 54 |
- CXX?=c++ |
| 55 |
- INCLUDES=-I./core/ |
| 56 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 57 |
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 58 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 59 |
- ifeq ($(SQLITE), 1) |
| 60 |
- CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) |
| 61 |
- endif |
| 62 |
--LDFLAGS=-L./core/ -g |
| 63 |
-+LDFLAGS += -L./core/ |
| 64 |
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 65 |
- LDFLAGS+= -Wl,--as-needed |
| 66 |
- endif |
| 67 |
-@@ -39,27 +39,25 @@ |
| 68 |
- export LIBS |
| 69 |
- export LDFLAGS |
| 70 |
- |
| 71 |
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt |
| 72 |
-- |
| 73 |
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES) |
| 74 |
-+all: $(PACKAGENAME) $(PACKAGENAME).1 |
| 75 |
- |
| 76 |
- .cc.o: |
| 77 |
- $(CXX) $(CXXFLAGS) -c $< -o $@ |
| 78 |
- |
| 79 |
- .PHONY: core |
| 80 |
- core: |
| 81 |
-- +make -C core all |
| 82 |
-+ $(MAKE) -C core all |
| 83 |
- |
| 84 |
- $(PACKAGENAME): core $(PACKAGENAME).o |
| 85 |
- $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
| 86 |
- |
| 87 |
- .PHONY: po |
| 88 |
- po: |
| 89 |
-- +make -C po all |
| 90 |
-+ $(MAKE) -C po all |
| 91 |
- |
| 92 |
- .PHONY: gui |
| 93 |
- gui: core |
| 94 |
-- +make -C gui all |
| 95 |
-+ $(MAKE) -C gui all |
| 96 |
- |
| 97 |
- .PHONY: nologo |
| 98 |
- nologo: |
| 99 |
-@@ -70,7 +68,6 @@ |
| 100 |
- |
| 101 |
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o |
| 102 |
- $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS) |
| 103 |
-- $(STRIP) $@ |
| 104 |
- |
| 105 |
- .PHONY: compressed |
| 106 |
- compressed: $(PACKAGENAME)-compressed |
| 107 |
-@@ -93,14 +90,13 @@ |
| 108 |
- manuf.txt: |
| 109 |
- wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf |
| 110 |
- |
| 111 |
--install: all |
| 112 |
-+install: |
| 113 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
| 114 |
- $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR) |
| 115 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1 |
| 116 |
- $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1 |
| 117 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
| 118 |
-- $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME) |
| 119 |
-- make -C po install |
| 120 |
-+ $(MAKE) -C po install |
| 121 |
- |
| 122 |
- install-gui: gui |
| 123 |
- $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR) |
| 124 |
-@@ -112,8 +108,8 @@ |
| 125 |
- |
| 126 |
- clean: |
| 127 |
- rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static $(PACKAGENAME)-compressed |
| 128 |
-- make -C core clean |
| 129 |
-- make -C gui clean |
| 130 |
-+ $(MAKE) -C core clean |
| 131 |
-+ $(MAKE) -C gui clean |
| 132 |
- |
| 133 |
- .timestamp: |
| 134 |
- date --utc +%Y%m%d%H%M%S > $@ |
| 135 |
---- lshw-B.02.17.orig/src/core/Makefile |
| 136 |
-+++ lshw-B.02.17/src/core/Makefile |
| 137 |
-@@ -1,10 +1,9 @@ |
| 138 |
- PACKAGENAME?=lshw |
| 139 |
- |
| 140 |
--CXX=c++ |
| 141 |
-+CXX?=c++ |
| 142 |
- INCLUDES= |
| 143 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 144 |
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 145 |
--LDFLAGS= |
| 146 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 147 |
- LDSTATIC= |
| 148 |
- LIBS= |
| 149 |
- |
| 150 |
---- lshw-B.02.17.orig/src/core/pci.cc |
| 151 |
-+++ lshw-B.02.17/src/core/pci.cc |
| 152 |
-@@ -17,7 +17,7 @@ |
| 153 |
- |
| 154 |
- #define PROC_BUS_PCI "/proc/bus/pci" |
| 155 |
- #define SYS_BUS_PCI "/sys/bus/pci" |
| 156 |
--#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" |
| 157 |
-+#define PCIID_PATH "/usr/share/misc/pci.ids" |
| 158 |
- |
| 159 |
- #define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */ |
| 160 |
- #define PCI_VENDOR_ID 0x00 /* 16 bits */ |
| 161 |
---- lshw-B.02.17.orig/src/core/usb.cc |
| 162 |
-+++ lshw-B.02.17/src/core/usb.cc |
| 163 |
-@@ -27,7 +27,7 @@ |
| 164 |
- |
| 165 |
- #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" |
| 166 |
- #define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices" |
| 167 |
--#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" |
| 168 |
-+#define USBID_PATH "/usr/share/misc/usb.ids" |
| 169 |
- |
| 170 |
- #define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */ |
| 171 |
- #define USB_CLASS_AUDIO 1 |
| 172 |
---- lshw-B.02.17.orig/src/gui/Makefile |
| 173 |
-+++ lshw-B.02.17/src/gui/Makefile |
| 174 |
-@@ -1,5 +1,7 @@ |
| 175 |
- PACKAGENAME?=lshw |
| 176 |
- |
| 177 |
-+SQLITE?=0 |
| 178 |
-+ |
| 179 |
- CXX?=c++ |
| 180 |
- CC?=cc |
| 181 |
- STRIP?=strip |
| 182 |
-@@ -8,13 +10,14 @@ |
| 183 |
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\" |
| 184 |
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags) |
| 185 |
- INCLUDES=-I../core $(GTKINCLUDES) |
| 186 |
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 187 |
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) |
| 188 |
- CFLAGS=$(CXXFLAGS) $(DEFINES) |
| 189 |
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) |
| 190 |
--LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS) |
| 191 |
--LDFLAGS= |
| 192 |
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) |
| 193 |
-- LDFLAGS+= -Wl,--as-needed |
| 194 |
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS) |
| 195 |
-+ |
| 196 |
-+ifeq ($(SQLITE), 1) |
| 197 |
-+ CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3) |
| 198 |
-+ LIBS+= $(shell pkg-config --libs sqlite3) |
| 199 |
- endif |
| 200 |
- |
| 201 |
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o |
| 202 |
-@@ -39,7 +42,6 @@ |
| 203 |
- $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) |
| 204 |
- |
| 205 |
- install: all |
| 206 |
-- $(STRIP) gtk-$(PACKAGENAME) |
| 207 |
- |
| 208 |
- clean: |
| 209 |
- rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak callbacks.c.bak callbacks.h.bak Makefile.bak |
| 210 |
|
| 211 |
diff --git a/sys-apps/lshw/files/lshw-02.17b-musl.patch b/sys-apps/lshw/files/lshw-02.17b-musl.patch |
| 212 |
deleted file mode 100644 |
| 213 |
index 3fb3cef087f..00000000000 |
| 214 |
--- a/sys-apps/lshw/files/lshw-02.17b-musl.patch |
| 215 |
+++ /dev/null |
| 216 |
@@ -1,186 +0,0 @@ |
| 217 |
---- a/src/core/osutils.cc 2016-02-04 23:47:31.071246925 +0000 |
| 218 |
-+++ b/src/core/osutils.cc 2016-02-04 23:54:17.125253018 +0000 |
| 219 |
-@@ -9,6 +9,7 @@ |
| 220 |
- #include <dirent.h> |
| 221 |
- #include <limits.h> |
| 222 |
- #include <stdlib.h> |
| 223 |
-+#include <stdint.h> |
| 224 |
- #include <string.h> |
| 225 |
- #include <regex.h> |
| 226 |
- #include <ctype.h> |
| 227 |
-@@ -496,48 +497,48 @@ |
| 228 |
- |
| 229 |
- unsigned short be_short(const void * from) |
| 230 |
- { |
| 231 |
-- __uint8_t *p = (__uint8_t*)from; |
| 232 |
-+ uint8_t *p = (uint8_t*)from; |
| 233 |
- |
| 234 |
-- return ((__uint16_t)(p[0]) << 8) + |
| 235 |
-- (__uint16_t)p[1]; |
| 236 |
-+ return ((uint16_t)(p[0]) << 8) + |
| 237 |
-+ (uint16_t)p[1]; |
| 238 |
- } |
| 239 |
- |
| 240 |
- |
| 241 |
- unsigned short le_short(const void * from) |
| 242 |
- { |
| 243 |
-- __uint8_t *p = (__uint8_t*)from; |
| 244 |
-+ uint8_t *p = (uint8_t*)from; |
| 245 |
- |
| 246 |
-- return ((__uint16_t)(p[1]) << 8) + |
| 247 |
-- (__uint16_t)p[0]; |
| 248 |
-+ return ((uint16_t)(p[1]) << 8) + |
| 249 |
-+ (uint16_t)p[0]; |
| 250 |
- } |
| 251 |
- |
| 252 |
- |
| 253 |
- unsigned long be_long(const void * from) |
| 254 |
- { |
| 255 |
-- __uint8_t *p = (__uint8_t*)from; |
| 256 |
-+ uint8_t *p = (uint8_t*)from; |
| 257 |
- |
| 258 |
-- return ((__uint32_t)(p[0]) << 24) + |
| 259 |
-- ((__uint32_t)(p[1]) << 16) + |
| 260 |
-- ((__uint32_t)(p[2]) << 8) + |
| 261 |
-- (__uint32_t)p[3]; |
| 262 |
-+ return ((uint32_t)(p[0]) << 24) + |
| 263 |
-+ ((uint32_t)(p[1]) << 16) + |
| 264 |
-+ ((uint32_t)(p[2]) << 8) + |
| 265 |
-+ (uint32_t)p[3]; |
| 266 |
- } |
| 267 |
- |
| 268 |
- |
| 269 |
- unsigned long le_long(const void * from) |
| 270 |
- { |
| 271 |
-- __uint8_t *p = (__uint8_t*)from; |
| 272 |
-+ uint8_t *p = (uint8_t*)from; |
| 273 |
- |
| 274 |
-- return ((__uint32_t)(p[3]) << 24) + |
| 275 |
-- ((__uint32_t)(p[2]) << 16) + |
| 276 |
-- ((__uint32_t)(p[1]) << 8) + |
| 277 |
-- (__uint32_t)p[0]; |
| 278 |
-+ return ((uint32_t)(p[3]) << 24) + |
| 279 |
-+ ((uint32_t)(p[2]) << 16) + |
| 280 |
-+ ((uint32_t)(p[1]) << 8) + |
| 281 |
-+ (uint32_t)p[0]; |
| 282 |
- |
| 283 |
- } |
| 284 |
- |
| 285 |
- |
| 286 |
- unsigned long long be_longlong(const void * from) |
| 287 |
- { |
| 288 |
-- __uint8_t *p = (__uint8_t*)from; |
| 289 |
-+ uint8_t *p = (uint8_t*)from; |
| 290 |
- |
| 291 |
- return ((unsigned long long)(p[0]) << 56) + |
| 292 |
- ((unsigned long long)(p[1]) << 48) + |
| 293 |
-@@ -552,7 +553,7 @@ |
| 294 |
- |
| 295 |
- unsigned long long le_longlong(const void * from) |
| 296 |
- { |
| 297 |
-- __uint8_t *p = (__uint8_t*)from; |
| 298 |
-+ uint8_t *p = (uint8_t*)from; |
| 299 |
- |
| 300 |
- return ((unsigned long long)(p[7]) << 56) + |
| 301 |
- ((unsigned long long)(p[6]) << 48) + |
| 302 |
---- a/src/core/device-tree.cc 2016-02-05 00:02:15.539260197 +0000 |
| 303 |
-+++ b/src/core/device-tree.cc 2016-02-05 00:38:50.523293133 +0000 |
| 304 |
-@@ -16,6 +16,7 @@ |
| 305 |
- #include <sys/stat.h> |
| 306 |
- #include <fcntl.h> |
| 307 |
- #include <stdlib.h> |
| 308 |
-+#include <stdint.h> |
| 309 |
- #include <stdio.h> |
| 310 |
- #include <string.h> |
| 311 |
- #include <unistd.h> |
| 312 |
-@@ -24,13 +25,13 @@ |
| 313 |
- __ID("@(#) $Id: device-tree.cc 2433 2012-01-10 22:01:30Z lyonel $"); |
| 314 |
- |
| 315 |
- #define DIMMINFOSIZE 0x80 |
| 316 |
--typedef __uint8_t dimminfo_buf[DIMMINFOSIZE]; |
| 317 |
-+typedef uint8_t dimminfo_buf[DIMMINFOSIZE]; |
| 318 |
- |
| 319 |
- struct dimminfo |
| 320 |
- { |
| 321 |
-- __uint8_t version3; |
| 322 |
-+ uint8_t version3; |
| 323 |
- char serial[16]; |
| 324 |
-- __uint16_t version1, version2; |
| 325 |
-+ uint16_t version1, version2; |
| 326 |
- }; |
| 327 |
- |
| 328 |
- #define DEVICETREE "/proc/device-tree" |
| 329 |
---- a/src/core/pci.cc 2016-02-05 06:02:38.744584655 +0000 |
| 330 |
-+++ b/src/core/pci.cc 2016-02-05 06:02:20.471584381 +0000 |
| 331 |
-@@ -7,6 +7,7 @@ |
| 332 |
- #include <sys/stat.h> |
| 333 |
- #include <fcntl.h> |
| 334 |
- #include <stdint.h> |
| 335 |
-+#include <libgen.h> |
| 336 |
- #include <unistd.h> |
| 337 |
- #include <stdio.h> |
| 338 |
- #include <string.h> |
| 339 |
-@@ -1131,9 +1132,9 @@ |
| 340 |
- string drivername = readlink(string(devices[i]->d_name)+"/driver"); |
| 341 |
- string modulename = readlink(string(devices[i]->d_name)+"/driver/module"); |
| 342 |
- |
| 343 |
-- device->setConfig("driver", basename(drivername.c_str())); |
| 344 |
-+ device->setConfig("driver", basename(const_cast<char *>(drivername.c_str()))); |
| 345 |
- if(exists(modulename)) |
| 346 |
-- device->setConfig("module", basename(modulename.c_str())); |
| 347 |
-+ device->setConfig("module", basename(const_cast<char *>(modulename.c_str()))); |
| 348 |
- |
| 349 |
- if(exists(string(devices[i]->d_name)+"/rom")) |
| 350 |
- { |
| 351 |
---- a/src/core/network.cc 2016-02-05 02:20:31.174384674 +0000 |
| 352 |
-+++ b/src/core/network.cc 2016-02-05 02:21:27.940385526 +0000 |
| 353 |
-@@ -31,6 +31,7 @@ |
| 354 |
- #include <fcntl.h> |
| 355 |
- #include <unistd.h> |
| 356 |
- #include <stdio.h> |
| 357 |
-+#include <stdint.h> |
| 358 |
- #include <string.h> |
| 359 |
- #include <string> |
| 360 |
- #include <sys/types.h> |
| 361 |
-@@ -49,9 +50,9 @@ |
| 362 |
- #define SIOCETHTOOL 0x8946 |
| 363 |
- #endif |
| 364 |
- typedef unsigned long long u64; |
| 365 |
--typedef __uint32_t u32; |
| 366 |
--typedef __uint16_t u16; |
| 367 |
--typedef __uint8_t u8; |
| 368 |
-+typedef uint32_t u32; |
| 369 |
-+typedef uint16_t u16; |
| 370 |
-+typedef uint8_t u8; |
| 371 |
- |
| 372 |
- struct ethtool_cmd |
| 373 |
- { |
| 374 |
---- a/src/core/cpufreq.cc 2016-02-05 02:24:29.199388245 +0000 |
| 375 |
-+++ b/src/core/cpufreq.cc 2016-02-05 02:26:03.283389657 +0000 |
| 376 |
-@@ -14,6 +14,7 @@ |
| 377 |
- #include <sys/types.h> |
| 378 |
- #include <sys/stat.h> |
| 379 |
- #include <fcntl.h> |
| 380 |
-+#include <limits.h> |
| 381 |
- #include <stdio.h> |
| 382 |
- #include <unistd.h> |
| 383 |
- #include <dirent.h> |
| 384 |
---- a/src/core/abi.cc 2016-02-05 06:13:46.072594669 +0000 |
| 385 |
-+++ b/src/core/abi.cc 2016-02-05 06:14:19.320595168 +0000 |
| 386 |
-@@ -11,6 +11,7 @@ |
| 387 |
- #include <unistd.h> |
| 388 |
- #include <stdlib.h> |
| 389 |
- #include <dirent.h> |
| 390 |
-+#include <limits.h> |
| 391 |
- |
| 392 |
- __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); |
| 393 |
- |
| 394 |
-@@ -19,7 +20,7 @@ |
| 395 |
- bool scan_abi(hwNode & system) |
| 396 |
- { |
| 397 |
- // are we compiled as 32- or 64-bit process ? |
| 398 |
-- system.setWidth(sysconf(_SC_LONG_BIT)); |
| 399 |
-+ system.setWidth(sysconf(LONG_BIT)); |
| 400 |
- |
| 401 |
- pushd(PROC_SYS); |
| 402 |
- |
| 403 |
|
| 404 |
diff --git a/sys-apps/lshw/lshw-02.17b-r1.ebuild b/sys-apps/lshw/lshw-02.17b-r1.ebuild |
| 405 |
deleted file mode 100644 |
| 406 |
index 75c7fccc514..00000000000 |
| 407 |
--- a/sys-apps/lshw/lshw-02.17b-r1.ebuild |
| 408 |
+++ /dev/null |
| 409 |
@@ -1,71 +0,0 @@ |
| 410 |
-# Copyright 1999-2014 Gentoo Foundation |
| 411 |
-# Distributed under the terms of the GNU General Public License v2 |
| 412 |
- |
| 413 |
-EAPI=5 |
| 414 |
-inherit flag-o-matic eutils toolchain-funcs |
| 415 |
- |
| 416 |
-MAJ_PV=${PV:0:${#PV}-1} |
| 417 |
-MIN_PVE=${PV:0-1} |
| 418 |
-MIN_PV=${MIN_PVE/b/B} |
| 419 |
- |
| 420 |
-MY_P="$PN-$MIN_PV.$MAJ_PV" |
| 421 |
-DESCRIPTION="Hardware Lister" |
| 422 |
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter" |
| 423 |
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz" |
| 424 |
- |
| 425 |
-LICENSE="GPL-2" |
| 426 |
-SLOT="0" |
| 427 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
| 428 |
-IUSE="gtk sqlite static" |
| 429 |
- |
| 430 |
-REQUIRED_USE="static? ( !gtk )" |
| 431 |
- |
| 432 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 433 |
- sqlite? ( dev-db/sqlite:3 )" |
| 434 |
-DEPEND="${RDEPEND} |
| 435 |
- gtk? ( virtual/pkgconfig ) |
| 436 |
- sqlite? ( virtual/pkgconfig )" |
| 437 |
-RDEPEND="${RDEPEND} |
| 438 |
- sys-apps/hwids" |
| 439 |
- |
| 440 |
-S=${WORKDIR}/${MY_P} |
| 441 |
- |
| 442 |
-src_prepare() { |
| 443 |
- epatch \ |
| 444 |
- "${FILESDIR}"/${P}-gentoo.patch \ |
| 445 |
- "${FILESDIR}"/${P}-fat.patch |
| 446 |
- # correct gettext behavior |
| 447 |
- if [[ -n "${LINGUAS+x}" ]] ; then |
| 448 |
- local langs |
| 449 |
- |
| 450 |
- for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do |
| 451 |
- if has ${i} ${LINGUAS} ; then |
| 452 |
- langs+=" ${i}" |
| 453 |
- fi |
| 454 |
- done |
| 455 |
- sed -i \ |
| 456 |
- -e "/^LANGUAGES =/ s/=.*/= $langs/" \ |
| 457 |
- src/po/Makefile || die |
| 458 |
- fi |
| 459 |
-} |
| 460 |
- |
| 461 |
-src_compile() { |
| 462 |
- tc-export CC CXX AR |
| 463 |
- use static && append-ldflags -static |
| 464 |
- |
| 465 |
- local sqlite=$(usex sqlite 1 0) |
| 466 |
- |
| 467 |
- emake SQLITE=$sqlite all |
| 468 |
- if use gtk ; then |
| 469 |
- emake SQLITE=$sqlite gui |
| 470 |
- fi |
| 471 |
-} |
| 472 |
- |
| 473 |
-src_install() { |
| 474 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
| 475 |
- dodoc README docs/* |
| 476 |
- if use gtk ; then |
| 477 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui |
| 478 |
- make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" |
| 479 |
- fi |
| 480 |
-} |
| 481 |
|
| 482 |
diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild b/sys-apps/lshw/lshw-02.17b-r2.ebuild |
| 483 |
deleted file mode 100644 |
| 484 |
index 74fc33cfafa..00000000000 |
| 485 |
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild |
| 486 |
+++ /dev/null |
| 487 |
@@ -1,67 +0,0 @@ |
| 488 |
-# Copyright 1999-2014 Gentoo Foundation |
| 489 |
-# Distributed under the terms of the GNU General Public License v2 |
| 490 |
- |
| 491 |
-EAPI=5 |
| 492 |
- |
| 493 |
-PLOCALES='fr' |
| 494 |
- |
| 495 |
-inherit flag-o-matic eutils toolchain-funcs l10n |
| 496 |
- |
| 497 |
-MAJ_PV=${PV:0:${#PV}-1} |
| 498 |
-MIN_PVE=${PV:0-1} |
| 499 |
-MIN_PV=${MIN_PVE/b/B} |
| 500 |
- |
| 501 |
-MY_P="$PN-$MIN_PV.$MAJ_PV" |
| 502 |
-DESCRIPTION="Hardware Lister" |
| 503 |
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter" |
| 504 |
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz" |
| 505 |
- |
| 506 |
-LICENSE="GPL-2" |
| 507 |
-SLOT="0" |
| 508 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
| 509 |
-IUSE="gtk sqlite static" |
| 510 |
- |
| 511 |
-REQUIRED_USE="static? ( !gtk )" |
| 512 |
- |
| 513 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 514 |
- sqlite? ( dev-db/sqlite:3 )" |
| 515 |
-DEPEND="${RDEPEND} |
| 516 |
- gtk? ( virtual/pkgconfig ) |
| 517 |
- sqlite? ( virtual/pkgconfig )" |
| 518 |
-RDEPEND="${RDEPEND} |
| 519 |
- sys-apps/hwids" |
| 520 |
- |
| 521 |
-S=${WORKDIR}/${MY_P} |
| 522 |
- |
| 523 |
-src_prepare() { |
| 524 |
- epatch \ |
| 525 |
- "${FILESDIR}"/${P}-gentoo.patch \ |
| 526 |
- "${FILESDIR}"/${P}-fat.patch \ |
| 527 |
- "${FILESDIR}"/${P}-musl.patch |
| 528 |
- |
| 529 |
- l10n_find_plocales_changes "src/po" "" ".po" || die |
| 530 |
- sed -i \ |
| 531 |
- -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \ |
| 532 |
- src/po/Makefile || die |
| 533 |
- sed -i \ |
| 534 |
- -e 's:\<pkg-config\>:${PKG_CONFIG}:' \ |
| 535 |
- src/Makefile src/gui/Makefile || die |
| 536 |
-} |
| 537 |
- |
| 538 |
-src_compile() { |
| 539 |
- tc-export CC CXX AR PKG_CONFIG |
| 540 |
- use static && append-ldflags -static |
| 541 |
- |
| 542 |
- # Need two sep make statements to avoid parallel build issues. #588174 |
| 543 |
- local sqlite=$(usex sqlite 1 0) |
| 544 |
- emake SQLITE=${sqlite} all |
| 545 |
- use gtk && emake SQLITE=${sqlite} gui |
| 546 |
-} |
| 547 |
- |
| 548 |
-src_install() { |
| 549 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 550 |
- dodoc README docs/* |
| 551 |
- if use gtk ; then |
| 552 |
- make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" |
| 553 |
- fi |
| 554 |
-} |
| 555 |
|
| 556 |
diff --git a/sys-apps/lshw/lshw-02.17b.ebuild b/sys-apps/lshw/lshw-02.17b.ebuild |
| 557 |
deleted file mode 100644 |
| 558 |
index 1ce460e3b86..00000000000 |
| 559 |
--- a/sys-apps/lshw/lshw-02.17b.ebuild |
| 560 |
+++ /dev/null |
| 561 |
@@ -1,69 +0,0 @@ |
| 562 |
-# Copyright 1999-2013 Gentoo Foundation |
| 563 |
-# Distributed under the terms of the GNU General Public License v2 |
| 564 |
- |
| 565 |
-EAPI=4 |
| 566 |
-inherit flag-o-matic eutils toolchain-funcs |
| 567 |
- |
| 568 |
-MAJ_PV=${PV:0:${#PV}-1} |
| 569 |
-MIN_PVE=${PV:0-1} |
| 570 |
-MIN_PV=${MIN_PVE/b/B} |
| 571 |
- |
| 572 |
-MY_P="$PN-$MIN_PV.$MAJ_PV" |
| 573 |
-DESCRIPTION="Hardware Lister" |
| 574 |
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter" |
| 575 |
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz" |
| 576 |
- |
| 577 |
-LICENSE="GPL-2" |
| 578 |
-SLOT="0" |
| 579 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
| 580 |
-IUSE="gtk sqlite static" |
| 581 |
- |
| 582 |
-REQUIRED_USE="static? ( !gtk )" |
| 583 |
- |
| 584 |
-RDEPEND="gtk? ( x11-libs/gtk+:2 ) |
| 585 |
- sqlite? ( dev-db/sqlite:3 )" |
| 586 |
-DEPEND="${RDEPEND} |
| 587 |
- gtk? ( virtual/pkgconfig ) |
| 588 |
- sqlite? ( virtual/pkgconfig )" |
| 589 |
-RDEPEND="${RDEPEND} |
| 590 |
- sys-apps/hwids" |
| 591 |
- |
| 592 |
-S=${WORKDIR}/${MY_P} |
| 593 |
- |
| 594 |
-src_prepare() { |
| 595 |
- epatch "${FILESDIR}"/${P}-gentoo.patch |
| 596 |
- # correct gettext behavior |
| 597 |
- if [[ -n "${LINGUAS+x}" ]] ; then |
| 598 |
- local langs |
| 599 |
- |
| 600 |
- for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do |
| 601 |
- if has ${i} ${LINGUAS} ; then |
| 602 |
- langs+=" ${i}" |
| 603 |
- fi |
| 604 |
- done |
| 605 |
- sed -i \ |
| 606 |
- -e "/^LANGUAGES =/ s/=.*/= $langs/" \ |
| 607 |
- src/po/Makefile || die |
| 608 |
- fi |
| 609 |
-} |
| 610 |
- |
| 611 |
-src_compile() { |
| 612 |
- tc-export CC CXX AR |
| 613 |
- use static && append-ldflags -static |
| 614 |
- |
| 615 |
- local sqlite=$(usex sqlite 1 0) |
| 616 |
- |
| 617 |
- emake SQLITE=$sqlite all |
| 618 |
- if use gtk ; then |
| 619 |
- emake SQLITE=$sqlite gui |
| 620 |
- fi |
| 621 |
-} |
| 622 |
- |
| 623 |
-src_install() { |
| 624 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install |
| 625 |
- dodoc README docs/* |
| 626 |
- if use gtk ; then |
| 627 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui |
| 628 |
- make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" |
| 629 |
- fi |
| 630 |
-} |
Archives