commit: a12abdb4564e5b481ca1df21a3d7eeb7d1aaf453 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue May 18 15:17:44 2021 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue May 18 15:17:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12abdb4
sys-apps/lshw: properly set VERSION & stop calling git Closes: https://bugs.gentoo.org/790821 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> sys-apps/lshw/Manifest | 2 +- sys-apps/lshw/lshw-02.19.2b.ebuild | 10 +++++----- sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest index 37b8ca7c4e8..69e4dc2db55 100644 --- a/sys-apps/lshw/Manifest +++ b/sys-apps/lshw/Manifest @@ -1,2 +1,2 @@ +DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 -DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild index 151be0cdf2d..bb38bfa8e82 100644 --- a/sys-apps/lshw/lshw-02.19.2b.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b.ebuild @@ -7,11 +7,11 @@ PLOCALES='fr' inherit desktop flag-o-matic toolchain-funcs l10n -MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3) +MY_PV=$(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"; +SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz"; LICENSE="GPL-2" SLOT="0" @@ -27,7 +27,7 @@ RDEPEND="sys-apps/hwids BDEPEND="gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN}-${MY_PV}" DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} ) @@ -65,12 +65,12 @@ src_compile() { # Need two sep make statements to avoid parallel build issues. #588174 local sqlite=$(usex sqlite 1 0) - emake SQLITE=${sqlite} all + emake VERSION=${MY_PV} SQLITE=${sqlite} all use gtk && emake SQLITE=${sqlite} gui } src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') + 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 \ diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild index bf17c8b0223..09ae682dbd0 100644 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild +++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild @@ -8,11 +8,11 @@ PLOCALES='fr' inherit desktop flag-o-matic toolchain-funcs l10n xdg MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1" -MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) +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 -> ${MY_P}.tar.gz" +SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -66,12 +66,12 @@ src_compile() { # Need two sep make statements to avoid parallel build issues. #588174 local sqlite=$(usex sqlite 1 0) - emake SQLITE=${sqlite} all + emake VERSION=${MY_PV} SQLITE=${sqlite} all use gtk && emake SQLITE=${sqlite} gui } src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') + 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 \
