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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A08713835A for ; Tue, 23 Mar 2021 15:22:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D58F5E083E; Tue, 23 Mar 2021 15:22:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2BF3E083E for ; Tue, 23 Mar 2021 15:22:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3908E340AB5 for ; Tue, 23 Mar 2021 15:22:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 584DC4F1 for ; Tue, 23 Mar 2021 15:22:23 +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: <1616512926.0b13961c6b2337e838656fa6d60ea1103f090498.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/lshw/Manifest sys-apps/lshw/lshw-02.19.2b.ebuild sys-apps/lshw/metadata.xml X-VCS-Directories: sys-apps/lshw/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 0b13961c6b2337e838656fa6d60ea1103f090498 X-VCS-Branch: master Date: Tue, 23 Mar 2021 15:22:23 +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: b7712ad2-4746-4a86-95f4-d0fe402ec3c2 X-Archives-Hash: 463885c4a93d9e8ba0997554c1d9e350 commit: 0b13961c6b2337e838656fa6d60ea1103f090498 Author: Ben Kohler gentoo org> AuthorDate: Tue Mar 23 14:55:04 2021 +0000 Commit: Ben Kohler gentoo org> CommitDate: Tue Mar 23 15:22:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b13961c sys-apps/lshw: take package & bump to 02.19b Per floppym from base-system, I am ok to adopt this package Closes: https://bugs.gentoo.org/747901 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Ben Kohler gentoo.org> sys-apps/lshw/Manifest | 1 + sys-apps/lshw/lshw-02.19.2b.ebuild | 81 ++++++++++++++++++++++++++++++++++++++ sys-apps/lshw/metadata.xml | 11 ++++-- 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index e68eaf4c638..68b5ea91df0 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1 +1,2 @@ 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 diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild new file mode 100644 index 00000000000..471abbf1b24 --- /dev/null +++ b/sys-apps/lshw/lshw-02.19.2b.ebuild @@ -0,0 +1,81 @@ +# 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 toolchain-funcs l10n + +MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3) + +DESCRIPTION="Hardware Lister" +HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" +SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gtk sqlite static" + +REQUIRED_USE="static? ( !gtk !sqlite )" + +DEPEND="${RDEPEND}" +RDEPEND="sys-apps/hwids + gtk? ( x11-libs/gtk+:2 ) + sqlite? ( dev-db/sqlite:3 )" +BDEPEND="gtk? ( virtual/pkgconfig ) + sqlite? ( virtual/pkgconfig )" + +S="${WORKDIR}/${MY_P}" + +DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} ) + +src_prepare() { + default + + l10n_find_plocales_changes "src/po" "" ".po" || die + sed -i \ + -e "/^LANGUAGES =/ s/=.*/= $(l10n_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/misc/pci.ids":' \ + src/core/pci.cc || die + sed -i \ + -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/misc/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 SQLITE=${sqlite} all + use gtk && emake SQLITE=${sqlite} gui +} + +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 + make_desktop_entry \ + "${EPREFIX}"/usr/sbin/gtk-lshw \ + "${DESCRIPTION}" + fi +} diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml index 56c12441305..3602ce544cc 100644 --- a/sys-apps/lshw/metadata.xml +++ b/sys-apps/lshw/metadata.xml @@ -1,8 +1,13 @@ - - base-system@gentoo.org - Gentoo Base System + + bkohler@gentoo.org + Ben Kohler + + https://ezix.org/src/pkg/lshw/wiki + https://ezix.org/project/newticket?component=lshw + https://www.ezix.org/project/wiki/HardwareLiSter#Changes +