From ec82846d15c127f36a0f0620e30c9c0fbbdd514c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 2 Sep 2023 04:15:24 +0100
Subject: gentoo auto-resync : 02:09:2023 - 04:15:24
---
sys-apps/lshw/Manifest | 2 +-
sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild | 83 -----------------------
sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild | 88 +++++++++++++++++++++++++
3 files changed, 89 insertions(+), 84 deletions(-)
delete mode 100644 sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild
create mode 100644 sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
(limited to 'sys-apps/lshw')
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index d6414b0c3cdd..72c8630cec1d 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,6 +1,6 @@
AUX lshw-02.19.2b-respect-LDFLAGS.patch 815 BLAKE2B 44cd1820a6ba3c854d04d9affeeaab1780ec1c0eebbea930906519363ef8cd31b831c7f6d7c22f8770d6f97cc6dc90d63f2a140e79c7bd3c93cabef1b9542567 SHA512 e3a98a0c5d5b890f18589295bf0d64db04b1d08b66353ad1a658ef84a4e1abd85f9d3d52e8ec7a54234e3573cb3c89e7ccb953544fe3af0b6a168dabb00d45e5
DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2482679 BLAKE2B 00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865 SHA512 d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5
-EBUILD lshw-02.19.2b_p20210121-r3.ebuild 2326 BLAKE2B 2c2b43f64529d1980dd30dd09df931f9fe48849c998f1a0bba4111fc585040d4ebff6e3a156e3fefc0b648d2484234d5591fd286d44fc3132ab444c916a4eee0 SHA512 2d5c62b80565cbe1b803b628c004b562286d3f84dc1e6de0cb5ba7296da18dfe935009265accfa116dbb2a1b72c8cc2a42d28d0cea907fc5bcdf174d981cf883
+EBUILD lshw-02.19.2b_p20210121-r4.ebuild 2573 BLAKE2B 6fdea34b6745ea900b50d1dd3747e2ba3560f6ce7c121cec821ad59b612ec6c1412686f85ab8b2eab94e256768e0b876fdddb5071eca56ff493076edc895904c SHA512 5ba25f11a2980d8924e0e81d5d07c50733eedcbd9290cb816d1ffef1dcc043ac4b757e380bd1d79a50cdc0cc302fcc78e046ef8c5cb871c9f304fa3fa0c572c5
EBUILD lshw-02.19.2b_p20220831.ebuild 2330 BLAKE2B fa1c176121ea926b5d4493820c7523b42dbf21ddb141c809860691a941386e51197de837a4da513449ca02e1422d5d58f473c30328f459836cb08973f0f1d497 SHA512 b614e48e51fa45a8db4ab964adac542a6e1ff67bc831e2ac5bc671d829de35cd4f20536df41d6d8936a58bdc1c2bf5d4ea5579c1fe3595a91b5aa92285d2498e
MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild
deleted file mode 100644
index 527ff09582af..000000000000
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES='fr'
-
-inherit desktop flag-o-matic plocale toolchain-funcs xdg
-
-MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
-MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
-
-DESCRIPTION="Hardware Lister"
-HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
-SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gtk sqlite static"
-
-REQUIRED_USE="static? ( !gtk !sqlite )"
-
-DEPEND="${RDEPEND}"
-RDEPEND="sys-apps/hwdata
- gtk? ( x11-libs/gtk+:3 )
- sqlite? ( dev-db/sqlite:3 )"
-BDEPEND="gtk? ( virtual/pkgconfig )
- sqlite? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${PN}
-
-DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
-
-PATCHES=( "${FILESDIR}"/lshw-02.19.2b-respect-LDFLAGS.patch )
-
-src_prepare() {
- default
-
- plocale_find_changes "src/po" "" ".po" || die
- sed -i \
- -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
- src/po/Makefile || die
- sed -i \
- -e 's:\<pkg-config\>:${PKG_CONFIG}:' \
- -e 's:+\?make -C:${MAKE} -C:' \
- -e '/^CXXFLAGS/s:=-g: +=:' \
- -e '/^CXXFLAGS/s:-g ::' \
- -e '/^LDFLAGS/s: -g::' \
- -e '/^all:/s: $(DATAFILES)::' \
- -e '/^install:/s: all::' \
- src/Makefile src/gui/Makefile || die
- sed -i \
- -e '/^CXXFLAGS/s:\?=-g: +=:' \
- -e '/^LDFLAGS=/d' \
- src/core/Makefile || die
- sed -i \
- -e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
- src/core/pci.cc || die
- sed -i \
- -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
- src/core/usb.cc || 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 VERSION=${MY_PV} SQLITE=${sqlite} all
- use gtk && emake SQLITE=${sqlite} gui
-}
-
-src_install() {
- emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
- if use gtk ; then
- newicon -s scalable src/gui/artwork/logo.svg lshw.svg
- make_desktop_entry \
- "${EPREFIX}"/usr/sbin/gtk-lshw \
- "${DESCRIPTION}"
- fi
-}
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
new file mode 100644
index 000000000000..1b0a868d5049
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES='fr'
+
+inherit desktop flag-o-matic plocale toolchain-funcs xdg
+
+MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
+
+DESCRIPTION="Hardware Lister"
+HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwdata
+ gtk? ( x11-libs/gtk+:3 )
+ sqlite? ( dev-db/sqlite:3 )"
+BDEPEND="gtk? ( virtual/pkgconfig )
+ sqlite? ( virtual/pkgconfig )"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
+
+PATCHES=( "${FILESDIR}"/lshw-02.19.2b-respect-LDFLAGS.patch )
+
+src_prepare() {
+ default
+
+ plocale_find_changes "src/po" "" ".po" || die
+ sed -i \
+ -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
+ src/po/Makefile || die
+ sed -i \
+ -e 's:\<pkg-config\>:${PKG_CONFIG}:' \
+ -e 's:+\?make -C:${MAKE} -C:' \
+ -e '/^CXXFLAGS/s:=-g: +=:' \
+ -e '/^CXXFLAGS/s:-g ::' \
+ -e '/^LDFLAGS/s: -g::' \
+ -e '/^all:/s: $(DATAFILES)::' \
+ -e '/^install:/s: all::' \
+ src/Makefile src/gui/Makefile || die
+ sed -i \
+ -e '/^CXXFLAGS/s:\?=-g: +=:' \
+ -e '/^LDFLAGS=/d' \
+ src/core/Makefile || die
+ sed -i \
+ -e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
+ src/core/pci.cc || die
+ sed -i \
+ -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
+ src/core/usb.cc || die
+}
+
+src_compile() {
+ tc-export CC CXX AR PKG_CONFIG
+ use static && append-ldflags -static
+ # Some toolchains are defaulting to C++17, which causes
+ # `<sys-apps/lshw-02.19.2b_p20220831` to break due to its use of the
+ # `register` keyword. Just pin it at 14, since future versions don't
+ # have this issue.
+ append-cxxflags '-std=c++14'
+
+ # Need two sep make statements to avoid parallel build issues. #588174
+ local sqlite=$(usex sqlite 1 0)
+ emake VERSION=${MY_PV} SQLITE=${sqlite} all
+ use gtk && emake SQLITE=${sqlite} gui
+}
+
+src_install() {
+ emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
+ if use gtk ; then
+ newicon -s scalable src/gui/artwork/logo.svg lshw.svg
+ make_desktop_entry \
+ "${EPREFIX}"/usr/sbin/gtk-lshw \
+ "${DESCRIPTION}"
+ fi
+}
--
cgit v1.2.3