| 1 |
commit: a12abdb4564e5b481ca1df21a3d7eeb7d1aaf453 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 18 15:17:44 2021 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 18 15:17:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a12abdb4 |
| 7 |
|
| 8 |
sys-apps/lshw: properly set VERSION & stop calling git |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/790821 |
| 11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/lshw/Manifest | 2 +- |
| 15 |
sys-apps/lshw/lshw-02.19.2b.ebuild | 10 +++++----- |
| 16 |
sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 8 ++++---- |
| 17 |
3 files changed, 10 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest |
| 20 |
index 37b8ca7c4e8..69e4dc2db55 100644 |
| 21 |
--- a/sys-apps/lshw/Manifest |
| 22 |
+++ b/sys-apps/lshw/Manifest |
| 23 |
@@ -1,2 +1,2 @@ |
| 24 |
+DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 |
| 25 |
DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5 |
| 26 |
-DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 |
| 27 |
|
| 28 |
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild |
| 29 |
index 151be0cdf2d..bb38bfa8e82 100644 |
| 30 |
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild |
| 31 |
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild |
| 32 |
@@ -7,11 +7,11 @@ PLOCALES='fr' |
| 33 |
|
| 34 |
inherit desktop flag-o-matic toolchain-funcs l10n |
| 35 |
|
| 36 |
-MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3) |
| 37 |
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3) |
| 38 |
|
| 39 |
DESCRIPTION="Hardware Lister" |
| 40 |
HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" |
| 41 |
-SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz" |
| 42 |
+SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz" |
| 43 |
|
| 44 |
LICENSE="GPL-2" |
| 45 |
SLOT="0" |
| 46 |
@@ -27,7 +27,7 @@ RDEPEND="sys-apps/hwids |
| 47 |
BDEPEND="gtk? ( virtual/pkgconfig ) |
| 48 |
sqlite? ( virtual/pkgconfig )" |
| 49 |
|
| 50 |
-S="${WORKDIR}/${MY_P}" |
| 51 |
+S="${WORKDIR}/${PN}-${MY_PV}" |
| 52 |
|
| 53 |
DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} ) |
| 54 |
|
| 55 |
@@ -65,12 +65,12 @@ src_compile() { |
| 56 |
|
| 57 |
# Need two sep make statements to avoid parallel build issues. #588174 |
| 58 |
local sqlite=$(usex sqlite 1 0) |
| 59 |
- emake SQLITE=${sqlite} all |
| 60 |
+ emake VERSION=${MY_PV} SQLITE=${sqlite} all |
| 61 |
use gtk && emake SQLITE=${sqlite} gui |
| 62 |
} |
| 63 |
|
| 64 |
src_install() { |
| 65 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 66 |
+ emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 67 |
if use gtk ; then |
| 68 |
newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg |
| 69 |
make_desktop_entry \ |
| 70 |
|
| 71 |
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild |
| 72 |
index bf17c8b0223..09ae682dbd0 100644 |
| 73 |
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild |
| 74 |
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild |
| 75 |
@@ -8,11 +8,11 @@ PLOCALES='fr' |
| 76 |
inherit desktop flag-o-matic toolchain-funcs l10n xdg |
| 77 |
|
| 78 |
MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1" |
| 79 |
-MY_P=${PN}-$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) |
| 80 |
+MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6) |
| 81 |
|
| 82 |
DESCRIPTION="Hardware Lister" |
| 83 |
HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter" |
| 84 |
-SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.tar.gz" |
| 85 |
+SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz" |
| 86 |
|
| 87 |
LICENSE="GPL-2" |
| 88 |
SLOT="0" |
| 89 |
@@ -66,12 +66,12 @@ src_compile() { |
| 90 |
|
| 91 |
# Need two sep make statements to avoid parallel build issues. #588174 |
| 92 |
local sqlite=$(usex sqlite 1 0) |
| 93 |
- emake SQLITE=${sqlite} all |
| 94 |
+ emake VERSION=${MY_PV} SQLITE=${sqlite} all |
| 95 |
use gtk && emake SQLITE=${sqlite} gui |
| 96 |
} |
| 97 |
|
| 98 |
src_install() { |
| 99 |
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 100 |
+ emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') |
| 101 |
if use gtk ; then |
| 102 |
newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg |
| 103 |
make_desktop_entry \ |
Archives