diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /sys-apps/lshw | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'sys-apps/lshw')
-rw-r--r-- | sys-apps/lshw/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/lshw/files/lshw-02.18b-gentoo.patch | 20 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.18b-r1.ebuild | 4 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.18b.ebuild | 6 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.19.2b.ebuild | 1 | ||||
-rw-r--r-- | sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 5 |
6 files changed, 22 insertions, 24 deletions
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index 4a962f84c521..aab09158ea69 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,11 +1,11 @@ -AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a108fc6f29c6cb62d2a3a64d4de5412be7a460ba217f0ba625aec5cc4efb7ff9c0750cd14073f3b0783a883c1dd1 SHA512 c9492cf301ba06f225d8afab62ab889572f9acede7b63cfc0ae665275b1056981dd85b02d4d49fc6294194a71fc405ded6bf27b3f461e550b0e5a3dc6fb939d7 +AUX lshw-02.18b-gentoo.patch 4709 BLAKE2B 5e07b8bba96f5ddd6717bb765965962a64638d8137ad1008a760b685b8dafc5da1a79862adad35612aa7038de096337e7d8506267328da70f22d916acfadd750 SHA512 42d2b966207173ba78926610100d7567f8e115d20378b02231de962d6949bee5de2cfcec1ac1399478b144ec19cb739e37f314d2c02b9f58c7895f9e099d5988 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 -EBUILD lshw-02.18b-r1.ebuild 1779 BLAKE2B cdcdef6003f3c8daccd8ea442822908813914f2b155887f9f3c2f0a4b843ff3833380e5bb0657b50293af35de36b305cfd741dfdd61b30d38063b98cf705d4d5 SHA512 b5a21f8effa23ab0154249d1e37fc7c966a4b6ac1896943903bfeb66a1105c682a2e9a7fc1e603179cf1ce5ea8955d162276681c8946e3bd3f1c98d7665a926f -EBUILD lshw-02.18b.ebuild 1721 BLAKE2B 51a1020346e3ac0856d1c7dbbe5827c430db0b017b35ae70876e6b8fcfcea7d134f942dc507b8158ad9010242cf9f94c92b8521b981b8d569137cd0fb0eb0273 SHA512 9065cd8709e623d6ee770f2fb499bb433bcf383795e8b280171da3b7a2d9a93e32956aaaeaa347dfbedd81d29c4bd964f8839d7ab98124c86d9fb65e7feb07cd -EBUILD lshw-02.19.2b.ebuild 2143 BLAKE2B a2ffef5fd6e729e670b13a596f6aac6d15e33d8388c02efec0e410f6ffb5fbfff64ac8ae15c97adfea61cee639e9dad29fd7f8bb4a50e5a89502f96ff4ce3c0d SHA512 98d66f43361a8fd5a7e39cb939804392e9f5c763affd448217a18a45b6276588e1f8e11a775fbc9ef1953ffca5f77f1a7ae0b807182341fab42efd0c847958bb -EBUILD lshw-02.19.2b_p20210121.ebuild 2147 BLAKE2B faad40e16dc2e37e0c92805e3f8f6287ee41f30b2f82935fdbf4cacca8b19d44955f12f6c980bb22b7a201e3a47f3a6f137c0880e9590be9812ae528775cf604 SHA512 e6aaa0917953fe2483f474c256b062725801c6e7a7dfb84a1baddb9622ed909aaf079ebb520aa4e621d2dc12a6fc1ade9256ec8b40d0bb88312c37639921d5c3 +EBUILD lshw-02.18b-r1.ebuild 1786 BLAKE2B 827c53ca19545e3435c1d797000d2460b4fb170226958f523467705821bc9086f8fa145bc2090c4660369df2788faf7ed64f4572d39f92dde5ce4e56586bf1b8 SHA512 3bc735eeab8d1ba80326cc2c2fe432ed7a44915d1653f2a8bd8147e5299eeac5de63aa2aa3af210fe8d6d71ca1c066c0928d3b27d54e29b9119618f6289be8b0 +EBUILD lshw-02.18b.ebuild 1728 BLAKE2B eb1cd904c324bd1e3e4256aa882e2895d3c12daf11dc46dfe208f645915c22b04bc04196beb828bbd69edcfd1841b6df0eb6cea7d5414c6e668df0f4bb9f18cb SHA512 44adbbb8b82c816b5a36cff686e251023ba0263e0c64fa596baddd5a096018d4147e128894666738f725c0680adb2843732c89fa92bb7edc318185e5bfb2d4b3 +EBUILD lshw-02.19.2b.ebuild 2134 BLAKE2B d71b2f4cd8a0ae26bfb414bbfec683452edee62aac75a218fed8bb5ae899f00aa7bce577edf2a909b7309b1b5106bd8b5240ed401bd4e05a7cbe771a463d713c SHA512 033b096652d7732fbc256344b1de2fa4e4345a8375f090fd27ec6db1f020ab8f71b0df238ed0174c2d871913a2a2e95cccd897df266744fb17f4e7f3dcafbfd9 +EBUILD lshw-02.19.2b_p20210121.ebuild 2227 BLAKE2B ccf17dd0b2f86b8bfac33423a815cdaf0479cd05a8574b848e6c47226fc1731117c9e7c625a6d4436a10bb7c4d73908f38c353ebff0cf2987a25243a9d095db6 SHA512 4c2f06c4109ba86f7cb435b37f6242c9f80a16e7c889b0aae1d545961fd6fa759ff44463928aaf1d9cbb6af2423124f7fab99a226ad6cccab417d6379ec98ca3 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3 diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch index 0a50e9dc868c..dd42df9b5282 100644 --- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch +++ b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch @@ -1,5 +1,5 @@ ---- lshw-B.02.18/src/Makefile -+++ lshw-B.02.18/src/Makefile +--- a/src/Makefile ++++ b/src/Makefile @@ -21,11 +21,11 @@ CXX?=c++ INCLUDES=-I./core/ @@ -82,8 +82,8 @@ .timestamp: date --utc +%Y%m%d%H%M%S > $@ ---- lshw-B.02.18/src/core/Makefile -+++ lshw-B.02.18/src/core/Makefile +--- a/src/core/Makefile ++++ b/src/core/Makefile @@ -1,10 +1,9 @@ PACKAGENAME?=lshw @@ -97,8 +97,8 @@ LDSTATIC= LIBS= ---- lshw-B.02.18/src/core/pci.cc -+++ lshw-B.02.18/src/core/pci.cc +--- a/src/core/pci.cc ++++ b/src/core/pci.cc @@ -17,7 +17,7 @@ #define PROC_BUS_PCI "/proc/bus/pci" @@ -108,8 +108,8 @@ #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 +--- a/src/core/usb.cc ++++ b/src/core/usb.cc @@ -27,7 +27,7 @@ #define PROCBUSUSBDEVICES "/proc/bus/usb/devices" @@ -119,8 +119,8 @@ #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 +--- a/src/gui/Makefile ++++ b/src/gui/Makefile @@ -1,5 +1,7 @@ PACKAGENAME?=lshw diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild index 5df82efaafaf..f3e16336e3f6 100644 --- a/sys-apps/lshw/lshw-02.18b-r1.ebuild +++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild @@ -5,13 +5,13 @@ EAPI="5" PLOCALES='fr' -inherit flag-o-matic eutils toolchain-funcs l10n +inherit desktop flag-o-matic 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" +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" diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild index 74e8e232c50e..8243b8bc20c7 100644 --- a/sys-apps/lshw/lshw-02.18b.ebuild +++ b/sys-apps/lshw/lshw-02.18b.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="5" PLOCALES='fr' -inherit flag-o-matic eutils toolchain-funcs l10n +inherit desktop flag-o-matic 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" +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" diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild index 471abbf1b243..9ddf5f85eb28 100644 --- a/sys-apps/lshw/lshw-02.19.2b.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b.ebuild @@ -70,7 +70,6 @@ src_compile() { } src_install() { - default emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') if use gtk ; then newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild index 20087b02f948..bf17c8b0223a 100644 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild @@ -5,7 +5,7 @@ EAPI=7 PLOCALES='fr' -inherit desktop flag-o-matic toolchain-funcs l10n +inherit desktop flag-o-matic toolchain-funcs l10n xdg MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1" MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) @@ -16,7 +16,7 @@ SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="gtk sqlite static" REQUIRED_USE="static? ( !gtk !sqlite )" @@ -71,7 +71,6 @@ src_compile() { } src_install() { - default emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') if use gtk ; then newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg |