From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- sys-apps/lshw/Manifest | 3 +- sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild | 81 ------------------------ sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 83 ------------------------- sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild | 83 +++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 166 deletions(-) delete mode 100644 sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild delete mode 100644 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild create mode 100644 sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild (limited to 'sys-apps/lshw') diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index c9be1af1a508..5cf8bfcdd0d1 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,5 +1,4 @@ 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 -EBUILD lshw-02.19.2b_p20210121-r1.ebuild 2267 BLAKE2B b4dee0d296ab18f6ab8eb050d11d911856aaf254c5df4c6ebc3e35fec5af8ed552d6fbca147b586da873320746eb9abbc4f2910240726c6dd69a72e0e5aa7cea SHA512 d6148eaf68bf55043274d39cc77cc6f627c1a160d2bb2689549530d35a4ec0d0f6a2af25428d1152b3d94facabfb5457cc4d206525d536016c1e1e336ae97873 -EBUILD lshw-02.19.2b_p20210121-r2.ebuild 2330 BLAKE2B 6193055d153ed04b0782557967675aba9d08d6cfd9a6ea2f92c0d758949abcd6cdb2becc5a3ef419ea3d95a625d3208fcbd122fffc6323e69baf39c9bf70c467 SHA512 d3e5f44b4ebdd74dbcfe1276c00ad09f4c18fdce2d8fa124b64f5732263ccdbad1fa68af8c1bfd58adb486d29b17b45afd1bf88183fc46bc16b042189d925fdc +EBUILD lshw-02.19.2b_p20210121-r3.ebuild 2326 BLAKE2B 2c2b43f64529d1980dd30dd09df931f9fe48849c998f1a0bba4111fc585040d4ebff6e3a156e3fefc0b648d2484234d5591fd286d44fc3132ab444c916a4eee0 SHA512 2d5c62b80565cbe1b803b628c004b562286d3f84dc1e6de0cb5ba7296da18dfe935009265accfa116dbb2a1b72c8cc2a42d28d0cea907fc5bcdf174d981cf883 MISC metadata.xml 462 BLAKE2B 0eca79307d6db1495a4799c970f6de55239b0b3b3636fb6ab833eccf824ed6569206a33272a2dbbc420d8f3d746ee8db7312fbc56f119f068634043699705e0a SHA512 948063d79d644ddfd3b559a7f113c73fa45a43d9282aad12400444d7e9431db44e0a5ef75fc0d866cfae9e0b67859df2b5996512e9eb296622546cb2bfdea9e7 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild deleted file mode 100644 index 3f20bc27da1c..000000000000 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2021 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} ) - -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}:' \ - -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 gtk-lshw.svg - make_desktop_entry \ - "${EPREFIX}"/usr/sbin/gtk-lshw \ - "${DESCRIPTION}" - fi -} diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild deleted file mode 100644 index e9c09debf85b..000000000000 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.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}:' \ - -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 gtk-lshw.svg - make_desktop_entry \ - "${EPREFIX}"/usr/sbin/gtk-lshw \ - "${DESCRIPTION}" - fi -} diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild new file mode 100644 index 000000000000..527ff09582af --- /dev/null +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild @@ -0,0 +1,83 @@ +# 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}:' \ + -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 +} -- cgit v1.2.3