From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C4C11158003 for ; Sun, 6 Feb 2022 12:59:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D01B2BC01A; Sun, 6 Feb 2022 12:59:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 887BF2BC01A for ; Sun, 6 Feb 2022 12:59:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1123342A52 for ; Sun, 6 Feb 2022 12:59:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A9CCE29 for ; Sun, 6 Feb 2022 12:59:03 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1644152325.a69cd51a1b046bf146aafc1c667638f40289db94.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild X-VCS-Directories: sys-apps/lshw/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: a69cd51a1b046bf146aafc1c667638f40289db94 X-VCS-Branch: master Date: Sun, 6 Feb 2022 12:59:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6fb2b145-103e-4065-b44e-2b856d636c79 X-Archives-Hash: 06b43f6420fc1ce061249e91f171a634 commit: a69cd51a1b046bf146aafc1c667638f40289db94 Author: Ben Kohler gentoo org> AuthorDate: Sun Feb 6 12:58:45 2022 +0000 Commit: Ben Kohler gentoo org> CommitDate: Sun Feb 6 12:58:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69cd51a sys-apps/lshw: revbump for desktop file icon fix Closes: https://bugs.gentoo.org/832739 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Ben Kohler gentoo.org> sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild | 83 +++++++++++++++++++++++++ 1 file changed, 83 insertions(+) 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 +}