From 4e9ece8cbfaaede8fde1ba0923caf48e341af897 Mon Sep 17 00:00:00 2001 From: Ben Kohler Date: Fri, 29 Mar 2024 10:37:21 -0500 Subject: sys-apps/lshw: really bump to 02.20.2b Signed-off-by: Ben Kohler --- sys-apps/lshw/Manifest | 2 +- sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 95 ++++++++++++++++++++++++++++++++++ sys-apps/lshw/lshw-02.20.2b.ebuild | 97 ----------------------------------- 3 files changed, 96 insertions(+), 98 deletions(-) create mode 100644 sys-apps/lshw/lshw-02.20.2b-r1.ebuild delete mode 100644 sys-apps/lshw/lshw-02.20.2b.ebuild (limited to 'sys-apps/lshw') diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index ec36a282ac32..a6dbc0a3d840 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,2 +1,2 @@ DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2473654 BLAKE2B 5f3753902a49a65c2b616d94ba376d2408bf972c11c854699ed69de6a22ef6f9dbaeb2cc13ffd52a4607a8baf6f74cfe00d1206f94c9287bce99aae035b2d2e1 SHA512 ec7992aa09dc6e01bd1c7b9c7e0b7d5b041f558759a2ba6cdef574d4d6886e69e5fe5bac023b06574deec2f03bb52e306359faa0e0689ea5e65fd84359efd2b2 -DIST lshw-02.20.2b-B.02.20.2_.tar.gz 2473654 BLAKE2B 5f3753902a49a65c2b616d94ba376d2408bf972c11c854699ed69de6a22ef6f9dbaeb2cc13ffd52a4607a8baf6f74cfe00d1206f94c9287bce99aae035b2d2e1 SHA512 ec7992aa09dc6e01bd1c7b9c7e0b7d5b041f558759a2ba6cdef574d4d6886e69e5fe5bac023b06574deec2f03bb52e306359faa0e0689ea5e65fd84359efd2b2 +DIST lshw-B.02.20.tar.gz 2484139 BLAKE2B 8abdd7cee6c42b8956229a0b62ac9f96359750f26cbfeb2ed74402eae3e7cd818133bf0b747351522c6387974ce2a98cf5ab29379e56c50abc980e497bcc19d7 SHA512 afc5d57f4b7c49d8e1934a3df623657882cc1325268c8c024dc0fa25495edd3ce7fdadb9c83ac6e5d3e723bc08d6175162d4d879ced09f76ad145ff42b38d3f0 diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild new file mode 100644 index 000000000000..9d3ac231faee --- /dev/null +++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PLOCALES="ca es fr" + +inherit desktop flag-o-matic plocale toolchain-funcs xdg-utils + +MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-2) + +DESCRIPTION="Hardware Lister" +HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" +SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +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 )" + +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 +} + +pkg_postinst() { + if use gtk ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_postrm() { + if use gtk ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} diff --git a/sys-apps/lshw/lshw-02.20.2b.ebuild b/sys-apps/lshw/lshw-02.20.2b.ebuild deleted file mode 100644 index ad96a414a251..000000000000 --- a/sys-apps/lshw/lshw-02.20.2b.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PLOCALES="ca es fr" - -inherit desktop flag-o-matic plocale toolchain-funcs xdg-utils - -MY_COMMIT=42fef565731411a784101de614a54bff79d1858e -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 -} - -pkg_postinst() { - if use gtk ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_postrm() { - if use gtk ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} -- cgit v1.2.3-65-gdbad