subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-apps\/lshw\/"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-25 Thread Arthur Zamarin

commit: 5911973ab9adbab7edb128d1f071284cd28f7a67
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May 25 17:31:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May 25 17:31:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5911973a

sys-apps/lshw: Stabilize 02.20.2b-r1 sparc, #932554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index ba2361b46247..51dd7b6cd536 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Sam James

commit: 9415b5ff27acde3c0ea142dbc9be519182f162df
Author: Sam James  gentoo  org>
AuthorDate: Thu May 23 21:57:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 23 21:57:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9415b5ff

sys-apps/lshw: Stabilize 02.20.2b-r1 arm64, #932554

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index febc1f4bbb30..ba2361b46247 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Sam James

commit: 53b63378431a88a6a8b6a52ce5e8e92df2ea45a0
Author: Sam James  gentoo  org>
AuthorDate: Thu May 23 21:55:37 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 23 21:56:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b63378

sys-apps/lshw: Stabilize 02.20.2b-r1 arm, #932554

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index e86700d8629c..febc1f4bbb30 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Arthur Zamarin

commit: f2e6172220f85715595b07d491dbb5ec58b0df99
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 23 15:56:21 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 23 15:56:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e61722

sys-apps/lshw: Stabilize 02.20.2b-r1 ppc64, #932554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index c127bf8bbdf2..e86700d8629c 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Arthur Zamarin

commit: 98ec9f3d48dcc69c006db886e2ee9d6453a8ce56
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 23 15:56:20 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 23 15:56:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98ec9f3d

sys-apps/lshw: Stabilize 02.20.2b-r1 x86, #932554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index eb2d708550c0..c127bf8bbdf2 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Arthur Zamarin

commit: b0401769b39ca633e403ebb83e907e53273556a2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 23 15:56:19 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 23 15:56:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0401769

sys-apps/lshw: Stabilize 02.20.2b-r1 amd64, #932554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index 9d3ac231faee..42442bcbda2b 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-05-23 Thread Arthur Zamarin

commit: 38909fc42bf0c48109c94f07bf13112eafbc139e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 23 15:56:20 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 23 15:56:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38909fc4

sys-apps/lshw: Stabilize 02.20.2b-r1 ppc, #932554

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.20.2b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index 42442bcbda2b..eb2d708550c0 100644
--- a/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-03-29 Thread Ben Kohler

commit: 4e9ece8cbfaaede8fde1ba0923caf48e341af897
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Mar 29 15:37:21 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Mar 29 15:38:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ece8c

sys-apps/lshw: really bump to 02.20.2b

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest  | 2 +-
 sys-apps/lshw/{lshw-02.20.2b.ebuild => lshw-02.20.2b-r1.ebuild} | 8 +++-
 2 files changed, 4 insertions(+), 6 deletions(-)

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.ebuild 
b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
similarity index 91%
rename from sys-apps/lshw/lshw-02.20.2b.ebuild
rename to sys-apps/lshw/lshw-02.20.2b-r1.ebuild
index ad96a414a251..9d3ac231faee 100644
--- a/sys-apps/lshw/lshw-02.20.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.20.2b-r1.ebuild
@@ -7,12 +7,12 @@ 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)
+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://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> 
${P}-${MY_PV}.tar.gz"
+SRC_URI="https://www.ezix.org/software/files/${PN}-${MY_PV}.tar.gz;
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,8 +28,6 @@ RDEPEND="sys-apps/hwdata
 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 )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-02-28 Thread Ben Kohler

commit: 264b78f9b2d52bf04bc782e6d0ed911f7c2b8ccb
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Feb 28 16:24:06 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Feb 28 16:24:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264b78f9

sys-apps/lshw: update Manifest

Compression seems to have changed-- verified that after gunzip, tarball
is bit identical.

Closes: https://bugs.gentoo.org/925598

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 9b64d8aaabb9..ec36a282ac32 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 2482679 BLAKE2B 
00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865
 SHA512 
d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5
+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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-02-28 Thread Ben Kohler

commit: 05b2112277b96e0a24800ce546ce895b55699d07
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Feb 28 15:53:48 2024 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Feb 28 16:07:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05b21122

sys-apps/lshw: add 02.20.2b

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest |  1 +
 sys-apps/lshw/lshw-02.20.2b.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 11f49bc922c2..9b64d8aaabb9 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1 +1,2 @@
 DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2482679 BLAKE2B 
00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865
 SHA512 
d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5
+DIST lshw-02.20.2b-B.02.20.2_.tar.gz 2473654 BLAKE2B 
5f3753902a49a65c2b616d94ba376d2408bf972c11c854699ed69de6a22ef6f9dbaeb2cc13ffd52a4607a8baf6f74cfe00d1206f94c9287bce99aae035b2d2e1
 SHA512 
ec7992aa09dc6e01bd1c7b9c7e0b7d5b041f558759a2ba6cdef574d4d6886e69e5fe5bac023b06574deec2f03bb52e306359faa0e0689ea5e65fd84359efd2b2

diff --git a/sys-apps/lshw/lshw-02.20.2b.ebuild 
b/sys-apps/lshw/lshw-02.20.2b.ebuild
new file mode 100644
index ..ad96a414a251
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.20.2b.ebuild
@@ -0,0 +1,97 @@
+# 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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2024-01-22 Thread Sam James

commit: 35ddb79c65f58a0df3500057f4171dc8b221809a
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 22 08:34:08 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 22 08:35:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ddb79c

sys-apps/lshw: use xdg-utils instead of xdg

This avoids pulling in dev-util/desktop-file-utils, x11-misc/shared-mime-info, 
and
dev-libs/glib with USE=-gtk.

We do the same thing for htop too.

Signed-off-by: Sam James  gentoo.org>

 ...220831.ebuild => lshw-02.19.2b_p20220831-r1.ebuild} | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
similarity index 88%
rename from sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
rename to sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
index c13c4b22e5b7..254bede1f4ad 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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
+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)
@@ -81,3 +81,17 @@ src_install() {
"${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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-11-03 Thread Ben Kohler

commit: 838d886aab356bea7a809e8b27a3875901ad297b
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri Nov  3 12:15:04 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri Nov  3 12:23:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=838d886a

sys-apps/lshw: drop 02.19.2b_p20210121-r4

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest  |  1 -
 sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild | 88 -
 2 files changed, 89 deletions(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 8b08676d77bf..11f49bc922c2 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1 @@
-DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B 
b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351
 SHA512 
699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
 DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2482679 BLAKE2B 
00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865
 SHA512 
d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
deleted file mode 100644
index 1b0a868d5049..
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-   # Some toolchains are defaulting to C++17, which causes
-   # `

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-09-01 Thread Ben Kohler

commit: 791ea6cb7a7ab2eb006a947bb74275e1fceaf98b
Author: George Burgess IV  google  com>
AuthorDate: Wed Aug  9 19:25:38 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Sep  2 00:23:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791ea6cb

sys-apps/lshw: force c++14 in version 02.19.2b_p20210121

Clang has used C++17 as its default standard since clang-16 (released
17-Mar-2023). This version of lshw does not compile cleanly with this
new standard. Keep it on C++14, since newer versions compile without
issue.

Signed-off-by: George Burgess IV  google.com>
Closes: https://github.com/gentoo/gentoo/pull/32235
Signed-off-by: Ben Kohler  gentoo.org>

 ...2.19.2b_p20210121-r3.ebuild => lshw-02.19.2b_p20210121-r4.ebuild} | 5 +
 1 file changed, 5 insertions(+)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
similarity index 90%
rename from sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild
rename to sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
index 527ff09582af..1b0a868d5049 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r3.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r4.ebuild
@@ -65,6 +65,11 @@ src_prepare() {
 src_compile() {
tc-export CC CXX AR PKG_CONFIG
use static && append-ldflags -static
+   # Some toolchains are defaulting to C++17, which causes
+   # `

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: 25649f6de97f2293405c84a879e36b7a2a8b6e27
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:31:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:31:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25649f6d

sys-apps/lshw: Stabilize 02.19.2b_p20220831 amd64, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index 5ac52c796df4..dd90a3bc2678 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: 84820b8af0d80c1345b8cce8aa37cd3ec5b5df68
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:30:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:30:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84820b8a

sys-apps/lshw: Stabilize 02.19.2b_p20220831 arm, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index c46c0dc9..5ac52c796df4 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: c16d7a45c02559cef8e47b04212fe11598bb0f95
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:31:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:31:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c16d7a45

sys-apps/lshw: Stabilize 02.19.2b_p20220831 x86, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index dd90a3bc2678..c13c4b22e5b7 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: 07ae9d89e0518fae818f8570817033e99b9a614c
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:30:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:30:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ae9d89

sys-apps/lshw: Stabilize 02.19.2b_p20220831 arm64, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index 705c193dbc57..c46c0dc9 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: cff4f034721ef3faf9cc98c17d6d467c3341296f
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:26:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:26:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff4f034

sys-apps/lshw: Stabilize 02.19.2b_p20220831 sparc, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index f190fc882373..6af06ab03385 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: acd3112a92780e8e3dce1e434584f1ceb34ef3b1
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:26:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:26:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd3112a

sys-apps/lshw: Stabilize 02.19.2b_p20220831 ppc, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index 6af06ab03385..10748ff41c92 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-05-12 Thread Sam James

commit: 835f464b68a84cb23b51a2635829dbc66696e66e
Author: Sam James  gentoo  org>
AuthorDate: Fri May 12 16:26:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 12 16:26:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835f464b

sys-apps/lshw: Stabilize 02.19.2b_p20220831 ppc64, #906205

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
index 10748ff41c92..705c193dbc57 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2023-03-01 Thread Ben Kohler

commit: 28ff97e2502265ab7bbea954078d7253f51c17b2
Author: Ben Kohler  gentoo  org>
AuthorDate: Wed Mar  1 15:07:29 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Wed Mar  1 15:08:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28ff97e2

sys-apps/lshw: add 02.19.2b_p20220831

Bug: https://bugs.gentoo.org/898546

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest   |  1 +
 sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild | 83 
 2 files changed, 84 insertions(+)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index b89584ac9ba6..8b08676d77bf 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1 +1,2 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B 
b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351
 SHA512 
699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
+DIST lshw-02.19.2b_p20220831-B.02.19.2_p20220831.tar.gz 2482679 BLAKE2B 
00cc7512a020e05577d82b6ab528524f929ef51455502eb8d9abbb3a2f75cac25d837a888ecf1e55a9c4251bb6515aedf4586da0c3f2f6b587ff0413acda3865
 SHA512 
d0ea5706850a07bbc82c627ce25a2774bbda6f565e259136d89774ec5e85770d8c2373ead46f6f7b1586c85aebdf1383b7ae1539b3f2f9d1b33fa777bc5589f5

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
new file mode 100644
index ..f190fc882373
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20220831.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2023 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
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-02-19 Thread Ben Kohler

commit: 8b9c7a9137a271b3fe73d34c08a21fb768bfa297
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Feb 19 13:12:29 2022 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Feb 19 13:14:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9c7a91

sys-apps/lshw: drop old

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-r1.ebuild | 81 
 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 83 -
 2 files changed, 164 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
deleted file mode 100644
index 3f20bc27da1c..
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 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} )
-
-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 gtk-lshw.svg
-   make_desktop_entry \
-   "${EPREFIX}"/usr/sbin/gtk-lshw \
-   "${DESCRIPTION}"
-   fi
-}

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
deleted file mode 100644
index e9c09debf85b..
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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" ||

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-02-06 Thread Ben Kohler

commit: a69cd51a1b046bf146aafc1c667638f40289db94
Author: Ben Kohler  gentoo  org>
AuthorDate: Sun Feb  6 12:58:45 2022 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sun Feb  6 12:58:45 2022 +
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 ..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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-18 Thread Sam James

commit: f6e95c67365af2641e191e2500f60d032a06cad4
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan 18 22:15:38 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan 18 22:16:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e95c67

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 ppc64, #831188

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index 6818ad6ef392..e9c09debf85b 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Arthur Zamarin

commit: c22c0a42d67fdff39b25d54dc41ba7e92c286860
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 15:23:02 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 15:23:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22c0a42

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 arm64, #831188

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index 827a4293cc23..6818ad6ef392 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Jakov Smolić

commit: c0eeae3d3e30c49c80f720bb05431a0ffb6292b2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 14 13:46:23 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 14 13:46:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0eeae3d

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 x86, #831188

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index 5340b23bd609..827a4293cc23 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Jakov Smolić

commit: 8e4266947eae97a9ff86952afaefec2affbb6a61
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 14 13:46:15 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 14 13:46:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e426694

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 amd64, #831188

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index 1ddee861a2f2..5340b23bd609 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Arthur Zamarin

commit: f68880a9e4725cd488ea53e34519f20b67c3e4c5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 13:21:35 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 13:21:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68880a9

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 sparc, #831188

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index e3f4bf9fca99..bb81c6a905a8 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Arthur Zamarin

commit: b8299c18ae6e42ee29a1bf881fb16898f7085c38
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 13:21:36 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 13:21:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8299c18

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 arm, #831188

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index bb81c6a905a8..0193e7a9c6c3 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2022-01-14 Thread Arthur Zamarin

commit: 6961cb22e8d0e917bd13ad95fabbae8978abd541
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 14 13:21:37 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 14 13:21:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6961cb22

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r2 ppc, #831188

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
index 0193e7a9c6c3..1ddee861a2f2 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-12-24 Thread Mike Gilbert

commit: c6cb7ef2cc023ca42b642c97a8a9aae3585ce3b0
Author: Mike Gilbert  gentoo  org>
AuthorDate: Fri Dec 24 21:45:46 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Dec 25 00:02:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6cb7ef2

sys-apps/lshw: drop 02.19.2b_p20210121

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 81 
 1 file changed, 81 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
deleted file mode 100644
index 1d03cec797f2..
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 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/hwids
-   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} )
-
-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/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 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 gtk-lshw.svg
-   make_desktop_entry \
-   "${EPREFIX}"/usr/sbin/gtk-lshw \
-   "${DESCRIPTION}"
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2021-12-13 Thread Ben Kohler

commit: 21a5b70c1df92f2cee5a4d655e1cc01a3c128e97
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Dec 13 15:17:06 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Dec 13 15:17:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a5b70c

sys-apps/lshw: respect LDFLAGS

Closes: https://bugs.gentoo.org/829001
Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 .../lshw/files/lshw-02.19.2b-respect-LDFLAGS.patch | 33 +
 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild| 83 ++
 2 files changed, 116 insertions(+)

diff --git a/sys-apps/lshw/files/lshw-02.19.2b-respect-LDFLAGS.patch 
b/sys-apps/lshw/files/lshw-02.19.2b-respect-LDFLAGS.patch
new file mode 100644
index ..cce97cc611b6
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.19.2b-respect-LDFLAGS.patch
@@ -0,0 +1,33 @@
+diff --git a/src/Makefile b/src/Makefile
+index 7ae8218..5c990b0 100644
+--- a/src/Makefile
 b/src/Makefile
+@@ -30,7 +30,7 @@ endif
+ ifeq ($(ZLIB), 1)
+   CXXFLAGS+= -DZLIB $(shell pkg-config --cflags zlib)
+ endif
+-LDFLAGS+=-L./core/ -g
++LIBS+=-L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+   LDFLAGS+= -Wl,--as-needed
+ endif
+@@ -44,7 +44,6 @@ ifeq ($(ZLIB), 1)
+ endif
+ 
+ export CXXFLAGS
+-export LIBS
+ export LDFLAGS
+ 
+ ifeq ($(ZLIB), 1)
+diff --git a/src/gui/Makefile b/src/gui/Makefile
+index 63c4ff5..7946736 100644
+--- a/src/gui/Makefile
 b/src/gui/Makefile
+@@ -18,7 +18,6 @@ LIBS+=-L../core -llshw -lresolv $(GTKLIBS)
+ ifeq ($(SQLITE), 1)
+   LIBS+= $(shell pkg-config --libs sqlite3)
+ endif
+-LDFLAGS=
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+   LDFLAGS+= -Wl,--as-needed
+ endif

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
new file mode 100644
index ..e3f4bf9fca99
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
@@ -0,0 +1,83 @@
+# 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 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 gtk-lshw.svg
+   make_desktop_entry \
+   "${EPREFIX}"/usr/sbin/gtk-lshw \
+   "${DESCRIPTION}"
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-12-07 Thread Sam James

commit: 6d2e3f0a6af979ee8e88f48094e8989772d1c66b
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 20:28:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 20:28:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2e3f0a

sys-apps/lshw: Stabilize 02.19.2b_p20210121-r1 ALLARCHES, #828474

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
index 494cae1b8fc3..3f20bc27da1c 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 
~amd64-linux ~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-11-28 Thread Mike Gilbert

commit: 9c2a45ae5213c9c0cdef24bd31edfb66357fb4ba
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Nov 25 01:31:35 2021 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Nov 28 19:54:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2a45ae

sys-apps/lshw: migrate to hwdata

Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild | 81 +
 1 file changed, 81 insertions(+)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
new file mode 100644
index ..494cae1b8fc3
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.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 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} )
+
+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 gtk-lshw.svg
+   make_desktop_entry \
+   "${EPREFIX}"/usr/sbin/gtk-lshw \
+   "${DESCRIPTION}"
+   fi
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-08-09 Thread Marek Szuba

commit: 74599c03bb3c4deabe666d753f32adff0aca54b9
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug  9 15:31:06 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug  9 23:56:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74599c03

sys-apps/lshw: keyword 02.19.2b_p20210121 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index a250b59d287..1d03cec797f 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
+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 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-07-13 Thread Ben Kohler

commit: 4411673244f59e9e36c140e31d98936692e6c86a
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Jul 13 13:34:39 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Jul 13 13:34:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44116732

sys-apps/lshw: drop old

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest |  1 -
 sys-apps/lshw/lshw-02.19.2b.ebuild | 80 --
 2 files changed, 81 deletions(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 69e4dc2db55..b89584ac9ba 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1 @@
 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

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
deleted file mode 100644
index 1f5b1927f7a..000
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 plocale toolchain-funcs
-
-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/${PN}-${MY_PV}.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}/${PN}-${MY_PV}"
-
-DOCS=( COPYING README.md 
docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
-
-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/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 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 gtk-lshw.svg
-   make_desktop_entry \
-   "${EPREFIX}"/usr/sbin/gtk-lshw \
-   "${DESCRIPTION}"
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-07-04 Thread Ulrich Müller

commit: de44395a3c39c17f1b1e497a6182ba6ad3d4fb08
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul  3 15:47:18 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul  4 14:02:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de44395a

sys-apps/lshw: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild   | 6 +++---
 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index bb38bfa8e82..1f5b1927f7a 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n
+inherit desktop flag-o-matic plocale toolchain-funcs
 
 MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
 
@@ -34,9 +34,9 @@ DOCS=( COPYING README.md 
docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.tx
 src_prepare() {
default
 
-   l10n_find_plocales_changes "src/po" "" ".po" || die
+   plocale_find_changes "src/po" "" ".po" || die
sed -i \
-   -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+   -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
src/po/Makefile || die
sed -i \
-e 's:\:${PKG_CONFIG}:' \

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 1a41f37f5bd..a250b59d287 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n xdg
+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)
@@ -35,9 +35,9 @@ DOCS=( COPYING README.md 
docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.tx
 src_prepare() {
default
 
-   l10n_find_plocales_changes "src/po" "" ".po" || die
+   plocale_find_changes "src/po" "" ".po" || die
sed -i \
-   -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+   -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
src/po/Makefile || die
sed -i \
-e 's:\:${PKG_CONFIG}:' \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-29 Thread Sam James

commit: 87b272ab77237a0d8aae3a367c3a2ebfc5f98c50
Author: Sam James  gentoo  org>
AuthorDate: Sat May 29 15:33:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 29 15:33:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87b272ab

sys-apps/lshw: Stabilize 02.19.2b_p20210121 arm64, #792504

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 4bedb5893fd..1a41f37f5bd 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-28 Thread Agostino Sarubbo

commit: a8231a77bb81cfc721f4e3721b4a6c58ed0dcda8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 28 12:04:08 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 28 12:04:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8231a77

sys-apps/lshw: ppc64 stable wrt bug #792504

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 657f3b2b0bf..4bedb5893fd 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-28 Thread Agostino Sarubbo

commit: 0a1540a7bb8de2d82b4be6123c1191fee6616222
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 28 12:02:54 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 28 12:02:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1540a7

sys-apps/lshw: ppc stable wrt bug #792504

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 41336d19f61..657f3b2b0bf 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-27 Thread Sam James

commit: cf0328cb6aa6ffa468e235c6f2a3bf16cf35cb8e
Author: Sam James  gentoo  org>
AuthorDate: Thu May 27 19:17:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 27 19:17:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0328cb

sys-apps/lshw: Stabilize 02.19.2b_p20210121 sparc, #792504

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 1c882cb9470..41336d19f61 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-27 Thread Sam James

commit: f4e8780867b6b983b83b510f6211632d4297326a
Author: Sam James  gentoo  org>
AuthorDate: Thu May 27 19:13:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 27 19:13:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e87808

sys-apps/lshw: Stabilize 02.19.2b_p20210121 x86, #792504

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 3dcb3f5bf72..be622e4ce7a 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-18 Thread Ben Kohler

commit: a12abdb4564e5b481ca1df21a3d7eeb7d1aaf453
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue May 18 15:17:44 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue May 18 15:17:56 2021 +
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  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 \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2021-05-18 Thread Ben Kohler

commit: 209fbd0bc15fe7ff4c8eab6e578677db5628571d
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue May 18 14:08:01 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue May 18 14:15:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209fbd0b

sys-apps/lshw: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/Manifest |   1 -
 sys-apps/lshw/files/lshw-02.18b-gentoo.patch   | 161 -
 .../lshw/files/lshw-02.18b-gettext-array.patch |  31 
 sys-apps/lshw/files/lshw-02.18b-sgx.patch  |  32 
 sys-apps/lshw/lshw-02.18b-r1.ebuild|  73 --
 sys-apps/lshw/lshw-02.18b.ebuild   |  72 -
 6 files changed, 370 deletions(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 4ddd546f9aa..37b8ca7c4e8 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,3 +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
 DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B 
b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351
 SHA512 
699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0

diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch 
b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
deleted file mode 100644
index dd42df9b528..000
--- a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
+++ /dev/null
@@ -1,161 +0,0 @@
 a/src/Makefile
-+++ b/src/Makefile
-@@ -21,11 +21,11 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
-   CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-   LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@
- export LIBS
- export LDFLAGS
- 
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
- 
- .cc.o:
-   $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- .PHONY: core
- core:
--  +make -C core all
-+  $(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
-   $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--  +make -C po all
-+  $(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--  +make -C gui all
-+  $(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
-   $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--  $(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@
- manuf.txt:
-   wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
- 
--install: all
-+install:
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--  $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--  make -C po install
-+  $(MAKE) -C po install
- 
- install-gui: gui
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -112,8 +108,8 @@
- 
- clean:
-   rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static 
$(PACKAGENAME)-compressed
--  make -C core clean
--  make -C gui clean
-+  $(MAKE) -C core clean
-+  $(MAKE) -C gui clean
- 
- .timestamp:
-   date --utc +%Y%m%d%H%M%S > $@
 a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
 a/src/core/pci.cc
-+++

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-17 Thread Agostino Sarubbo

commit: ef1f4a6e05da2d4fa213ccbe7a63ceb71b78df8f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 17 08:53:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 17 08:53:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1f4a6e

sys-apps/lshw: sparc stable wrt bug #790497

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 89bdf59f008..151be0cdf2d 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-17 Thread Agostino Sarubbo

commit: fdb679971f14c67315829d6897629cb3a12a3059
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 17 07:48:31 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 17 07:49:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb67997

sys-apps/lshw: x86 stable wrt bug #790497

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 8c984abf434..89bdf59f008 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux 
~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-16 Thread Sam James

commit: c904fae696e340fa46279a7e5ba22eb2810861ab
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 03:19:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 03:19:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c904fae6

sys-apps/lshw: Stabilize 02.19.2b ppc, #790497

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 4588219b389..8c984abf434 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-16 Thread Sam James

commit: c840407db38d1f32b337da989bf7056acb273bf7
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 03:04:51 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 03:04:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c840407d

sys-apps/lshw: Stabilize 02.19.2b ppc64, #790497

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 9bb28ad988f..4588219b389 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-16 Thread Sam James

commit: 143c777911ae56da1e5a9fb3eb890759d379c576
Author: Sam James  gentoo  org>
AuthorDate: Mon May 17 02:36:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 17 02:36:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=143c7779

sys-apps/lshw: Stabilize 02.19.2b amd64, #790497

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 42d8866195f..9bb28ad988f 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-16 Thread Sam James

commit: f8923842b9e94e6f6518899282137c35364ee165
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:41:06 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:41:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8923842

sys-apps/lshw: Stabilize 02.19.2b arm64, #790497

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 61b97248a46..42d8866195f 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-05-16 Thread Sam James

commit: 474e0bb8e9f23ad8bfdc5015bda8126776856c87
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 23:40:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 23:40:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474e0bb8

sys-apps/lshw: Stabilize 02.19.2b arm, #790497

Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 9ddf5f85eb2..61b97248a46 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-04-27 Thread David Seifert

commit: 9c6d21a486107288261d4e8e70cb64773d8b1af3
Author: David Seifert  gentoo  org>
AuthorDate: Tue Apr 27 08:07:24 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Apr 27 08:07:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6d21a4

sys-apps/lshw: [QA] update icon caches

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 6de8314e616..bf17c8b0223 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n
+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)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-04-26 Thread Ben Kohler

commit: 26c9ae57fb532859ab35971e0b25c3ea44649ffd
Author: Ben Kohler  gentoo  org>
AuthorDate: Mon Apr 26 17:47:33 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Mon Apr 26 17:47:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c9ae57

sys-apps/lshw: add keywords on gtk3 snapshot

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 20087b02f94..6de8314e616 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk !sqlite )"
@@ -71,7 +71,6 @@ src_compile() {
 }
 
 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-04-21 Thread Guilherme Amadio

commit: efbc8672702ee23a6d4f7f40da596cbcfe9144f5
Author: Guilherme Amadio  gentoo  org>
AuthorDate: Tue Apr 20 13:34:56 2021 +
Commit: Guilherme Amadio  gentoo  org>
CommitDate: Wed Apr 21 14:12:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efbc8672

sys-apps/lshw: fix installation on prefix

The call to default src_install caused installation to happen twice,
once into /usr, then another time into ${EPREFIX}/usr in the next line.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Guilherme Amadio  gentoo.org>

 sys-apps/lshw/lshw-02.19.2b.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild 
b/sys-apps/lshw/lshw-02.19.2b.ebuild
index 471abbf1b24..9ddf5f85eb2 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -70,7 +70,6 @@ src_compile() {
 }
 
 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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-04-03 Thread Sam James

commit: 6322d283459234e128bea9bfa806d4c641fab51f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  2 09:56:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr  3 15:43:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6322d283

sys-apps/lshw: fix variable references

Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.18b-r1.ebuild | 2 +-
 sys-apps/lshw/lshw-02.18b.ebuild| 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild 
b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index 5df82efaafa..839ea3a65e6 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -11,7 +11,7 @@ MAJ_PV=${PV:0:${#PV}-1}
 MIN_PVE=${PV:0-1}
 MIN_PV=${MIN_PVE/b/B}
 
-MY_P="$PN-$MIN_PV.$MAJ_PV"
+MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter;
 SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 74e8e232c50..642b8f500e2 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ MAJ_PV=${PV:0:${#PV}-1}
 MIN_PVE=${PV:0-1}
 MIN_PV=${MIN_PVE/b/B}
 
-MY_P="$PN-$MIN_PV.$MAJ_PV"
+MY_P="${PN}-${MIN_PV}.${MAJ_PV}"
 DESCRIPTION="Hardware Lister"
 HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter;
 SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-03-23 Thread Ben Kohler

commit: 422df4a3667acef549a1a918b90ba20b8f946620
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Mar 23 15:16:32 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Mar 23 15:22:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422df4a3

sys-apps/lshw: disallow USE="static sqlite"

Closes: https://bugs.gentoo.org/720370
Closes: https://github.com/gentoo/gentoo/pull/19674

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/lshw/lshw-02.18b-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild 
b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index bd4bc8ff6db..5df82efaafa 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -21,7 +21,7 @@ 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 )"
+REQUIRED_USE="static? ( !gtk !sqlite )"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )
sqlite? ( dev-db/sqlite:3 )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-03-23 Thread Ben Kohler

commit: 482e97a4124805acac51bc9953fe417c9eb065c8
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Mar 23 15:15:19 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Mar 23 15:22:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482e97a4

sys-apps/lshw: snapshot for gtk3 support

Thanks to Volkmar W. Pogatzki for this contribution & the last bump as
well

Closes: https://bugs.gentoo.org/773583
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_p20210121.ebuild | 82 
 2 files changed, 83 insertions(+)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 68b5ea91df0..4ddd546f9aa 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1,3 @@
 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
+DIST lshw-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B 
b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351
 SHA512 
699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0

diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild 
b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
new file mode 100644
index 000..20087b02f94
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -0,0 +1,82 @@
+# 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_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
+MY_P=${PN}-$(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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk !sqlite )"
+
+DEPEND="${RDEPEND}"
+RDEPEND="sys-apps/hwids
+   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} )
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2021-03-23 Thread Ben Kohler

commit: 0b13961c6b2337e838656fa6d60ea1103f090498
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Mar 23 14:55:04 2021 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Mar 23 15:22:06 2021 +
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 000..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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
+
+   bkoh...@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
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2020-08-19 Thread Sam James

commit: 6d0c5b0bb9b3d0c574b066fec90471fdfd39099f
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug 19 20:06:41 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 19 20:06:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0c5b0b

sys-apps/lshw: arm64 stable

Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Sam James  gentoo.org>

 sys-apps/lshw/lshw-02.18b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild 
b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index 41b2314f46f..bd4bc8ff6db 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2020-06-06 Thread Mart Raudsepp

commit: 5f4692b2c2d7d724a5985530c69080854256a1e0
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat Jun  6 14:54:58 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jun  6 19:30:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4692b2

sys-apps/lshw: arm64 keyworded (bug #685402)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 sys-apps/lshw/lshw-02.18b-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild 
b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index 0e2cb9c6256..41b2314f46f 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2018-05-21 Thread Mikle Kolyada

commit: b364b02cbb702e6fd958196de8df835a24fdb045
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 21 16:14:49 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 21 16:14:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b364b02c

sys-apps/lshw: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/lshw/Manifest   |   1 -
 sys-apps/lshw/files/lshw-02.16b-gentoo.patch | 161 ---
 sys-apps/lshw/lshw-02.16b-r2.ebuild  |  69 
 3 files changed, 231 deletions(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 964450426c4..e68eaf4c638 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1 @@
-DIST lshw-B.02.16.tar.gz 1845891 BLAKE2B 
57d22af384b9f6f1878439f48ebd31163738744842a7682877126d6f914c1496442d79dc818e774f76ee04c4a284407c5ce53ba72af71571731bb4940f8a2338
 SHA512 
ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 
66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214
 SHA512 
4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47

diff --git a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch 
b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
deleted file mode 100644
index dfd2c898370..000
--- a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
+++ /dev/null
@@ -1,161 +0,0 @@
 lshw-B.02.16.orig/src/core/Makefile
-+++ lshw-B.02.16/src/core/Makefile
-@@ -1,10 +1,9 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
 lshw-B.02.16.orig/src/gui/Makefile
-+++ lshw-B.02.16/src/gui/Makefile
-@@ -1,5 +1,7 @@
- PACKAGENAME?=lshw
- 
-+SQLITE?=0
-+
- CXX?=c++
- CC?=cc
- STRIP?=strip
-@@ -8,13 +10,14 @@ OBJCOPY?=objcopy
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs)
--LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
--LDFLAGS=
--ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--  LDFLAGS+= -Wl,--as-needed
-+LIBS=-L../core -llshw -lresolv $(GTKLIBS)
-+
-+ifeq ($(SQLITE), 1)
-+  CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
-+  LIBS+= $(shell pkg-config --libs sqlite3)
- endif
- 
- OBJS = gtk-lshw.o callbacks.o engine.o print-gui.o stock.o
-@@ -39,8 +42,7 @@ gtk-$(PACKAGENAME): $(OBJS) ../core/libl
-   $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--  $(STRIP) gtk-$(PACKAGENAME)
--  
-+
- clean:
-   rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak 
callbacks.c.bak callbacks.h.bak Makefile.bak
- 
 lshw-B.02.16.orig/src/Makefile
-+++ lshw-B.02.16/src/Makefile
-@@ -21,11 +21,11 @@ export SQLITE
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
-   CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-   LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@ export CXXFLAGS
- export LIBS
- export LDFLAGS
- 
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
- 
- .cc.o:
-   $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- .PHONY: core
- core:
--  +make -C core all
-+  $(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
-   $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--  +make -C po all
-+  $(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--  +make -C gui all
-+  $(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@ static: $(PACKAGENAME)-static
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
-   $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--  $(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@ oui.txt:
- manuf.txt:
-   wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2018-01-03 Thread Mike Frysinger

commit: 1cb1b9ca5d372c83314d9f7b02c80eb7c10cc0bc
Author: Wenkai Du  intel  com>
AuthorDate: Thu Jan  4 07:13:02 2018 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Jan  4 07:13:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb1b9ca

sys-apps/lshw: add upstream fix for crashes w/Intel SGX

 sys-apps/lshw/files/lshw-02.18b-sgx.patch | 32 ++
 sys-apps/lshw/lshw-02.18b-r1.ebuild   | 73 +++
 2 files changed, 105 insertions(+)

diff --git a/sys-apps/lshw/files/lshw-02.18b-sgx.patch 
b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
new file mode 100644
index 000..92bd6c23e2f
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.18b-sgx.patch
@@ -0,0 +1,32 @@
+patch from upstream:
+https://ezix.org/src/pkg/lshw/commit/5e5744732b2dcdf83845919256388b3842033183
+
+From 5e5744732b2dcdf83845919256388b3842033183 Mon Sep 17 00:00:00 2001
+From: Wenkai Du 
+Date: Fri, 22 Dec 2017 09:57:57 -0800
+Subject: [PATCH] lshw: fix segmentation fault when /dev/sgx is present
+
+When Intel SGX is enabled in kernel, /dev/sgx is created and is
+picked up by "/dev/sg*" glob matching.
+
+Signed-off-by: Wenkai Du 
+---
+ src/core/scsi.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/scsi.cc b/src/core/scsi.cc
+index b38dda2cd8a8..75061c0fb195 100644
+--- a/src/core/scsi.cc
 b/src/core/scsi.cc
+@@ -30,7 +30,7 @@
+ 
+ __ID("@(#) $Id$");
+ 
+-#define SG_X "/dev/sg*"
++#define SG_X "/dev/sg[0-9]*"
+ #define SG_MAJOR 21
+ 
+ #ifndef SCSI_IOCTL_GET_PCI
+-- 
+2.15.1
+

diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild 
b/sys-apps/lshw/lshw-02.18b-r1.ebuild
new file mode 100644
index 000..c22eab42757
--- /dev/null
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PLOCALES='fr'
+
+inherit flag-o-matic eutils toolchain-funcs l10n
+
+MAJ_PV=${PV:0:${#PV}-1}
+MIN_PVE=${PV:0-1}
+MIN_PV=${MIN_PVE/b/B}
+
+MY_P="$PN-$MIN_PV.$MAJ_PV"
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+IUSE="gtk sqlite static"
+
+REQUIRED_USE="static? ( !gtk )"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )
+   sqlite? ( dev-db/sqlite:3 )"
+DEPEND="${RDEPEND}
+   gtk? ( virtual/pkgconfig )
+   sqlite? ( virtual/pkgconfig )"
+RDEPEND="${RDEPEND}
+   sys-apps/hwids"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-02.18b-gentoo.patch
+   "${FILESDIR}"/${PN}-02.18b-gettext-array.patch
+   "${FILESDIR}"/${PN}-02.18b-sgx.patch
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+
+   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}:' \
+   src/Makefile src/gui/Makefile || 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() {
+   emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 
'install-gui' '')
+   dodoc README.md docs/*
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-11-06 Thread Sergei Trofimovich

commit: f78d9799c1a33f4831302f9cdfa16bfa107a6600
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov  6 21:16:39 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov  6 21:20:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78d9799

sys-apps/lshw: stable 02.18b for sparc, bug #629514 (thanks to Rolf Eike Beer)

Package-Manager: Portage-2.3.13, Repoman-2.3.4
RepoMan-Options: --include-arches="sparc"

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index ce73d9167e8..e9da0f61c0d 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-30 Thread Thomas Deutschmann

commit: d71139c11c2c116573c80cd9c79b93aae62b236d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep 30 23:43:59 2017 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep 30 23:43:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d71139c1

sys-apps/lshw: x86 stable (bug #629514)

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 2ef429b85fc..ce73d9167e8 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-26 Thread Manuel Rüger

commit: 932122a75478f22b8246f2813067f27a5e0e97d6
Author: Manuel Rüger  gentoo  org>
AuthorDate: Tue Sep 26 22:36:44 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Tue Sep 26 22:36:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=932122a7

sys-apps/lshw: amd64 stable

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 29223c152d1..2ef429b85fc 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-22 Thread Sergei Trofimovich

commit: dab51ee945048f0f4f015fef0078e93ebfa024f8
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 22 11:43:51 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 22 19:40:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab51ee9

sys-apps/lshw: stable 02.18b for hppa, bug #629514

Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 5704483a1c6..29223c152d1 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-09 Thread Sergei Trofimovich

commit: 0ed9c5d90472f3b679210192da83bcb2eedb1358
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  9 18:45:30 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  9 18:45:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ed9c5d9

sys-apps/lshw: stable 02.18b for ppc/ppc64, bug #629514

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 0b1536f11b1..5704483a1c6 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-09 Thread Markus Meier

commit: 5ee81eea18d6bc3b9f3c379d53cf296cadcbe90e
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Sep  9 10:25:05 2017 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Sep  9 10:25:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee81eea

sys-apps/lshw: arm stable, bug #629514

Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 78e5662b1f0..0b1536f11b1 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-04 Thread Tobias Klausmann

commit: f5c817607705db8971e7eca1f7e1987ed534350d
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Sep  4 07:26:00 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Sep  4 07:26:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c81760

sys-apps/lshw-02.18b-r0: alpha stable

Gentoo-Bug: 629514

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index 8dce497156a..78e5662b1f0 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-09-01 Thread Sergei Trofimovich

commit: d9229314c828b136baea6f94ac59f51fa7a2dcd9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep  1 22:36:04 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  1 22:36:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9229314

sys-apps/lshw: stable 02.18b for ia64, bug #629514

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"

 sys-apps/lshw/lshw-02.18b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index a3117180c53..8dce497156a 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz;
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux 
~arm-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-08-31 Thread Tim Harder

commit: 2d6b2a7f696e4b804382a08b626624b08dee8269
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Sep  1 02:18:36 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Sep  1 02:21:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d6b2a7f

sys-apps/lshw: use https for HOMEPAGE and SRC_URI

 sys-apps/lshw/lshw-02.16b-r2.ebuild | 4 ++--
 sys-apps/lshw/lshw-02.18b.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.16b-r2.ebuild 
b/sys-apps/lshw/lshw-02.16b-r2.ebuild
index 934be307c4e..36348d30564 100644
--- a/sys-apps/lshw/lshw-02.16b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.16b-r2.ebuild
@@ -10,8 +10,8 @@ MIN_PV=${MIN_PVE/b/B}
 
 MY_P="$PN-$MIN_PV.$MAJ_PV"
 DESCRIPTION="Hardware Lister"
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter;
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz;
+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"

diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index b29154e51e8..a3117180c53 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -13,8 +13,8 @@ MIN_PV=${MIN_PVE/b/B}
 
 MY_P="$PN-$MIN_PV.$MAJ_PV"
 DESCRIPTION="Hardware Lister"
-HOMEPAGE="http://ezix.org/project/wiki/HardwareLiSter;
-SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz;
+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"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2017-08-31 Thread Tim Harder

commit: c6e928d9d154ce3c86d89e961bf5afcb1200a440
Author: Tim Harder  gentoo  org>
AuthorDate: Fri Sep  1 02:19:32 2017 +
Commit: Tim Harder  gentoo  org>
CommitDate: Fri Sep  1 02:21:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e928d9

sys-apps/lshw: remove old

 sys-apps/lshw/Manifest   |   1 -
 sys-apps/lshw/files/lshw-02.17b-fat.patch|  10 --
 sys-apps/lshw/files/lshw-02.17b-gentoo.patch | 159 ---
 sys-apps/lshw/files/lshw-02.17b-musl.patch   | 186 ---
 sys-apps/lshw/lshw-02.17b-r1.ebuild  |  71 --
 sys-apps/lshw/lshw-02.17b-r2.ebuild  |  67 --
 sys-apps/lshw/lshw-02.17b.ebuild |  69 --
 7 files changed, 563 deletions(-)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 5170bcc0535..675dc5e69f3 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,3 +1,2 @@
 DIST lshw-B.02.16.tar.gz 1845891 SHA256 
809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 
ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
 WHIRLPOOL 
8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d
-DIST lshw-B.02.17.tar.gz 2005737 SHA256 
eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c SHA512 
868899dce98e786a08a2134d6e132c388d71ab0f03fa6e10881e14d7a882c1882b46bbc6bd6ddb021cfab87ad6c9fd369453c3916f0b3353027eb2d470e55d9b
 WHIRLPOOL 
5b18df2732e50f38dd8d9168adb6083e9a637cf9596f692a7e6806cda2ad05c777babdbeab470d948604f45bbbf1282be6d9fc68bf5c70741acf2d884e93e749
 DIST lshw-B.02.18.tar.gz 2322176 SHA256 
ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f SHA512 
4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 WHIRLPOOL 
42a76daa9426dbca1f9acd9afc5e66542ea87e4e6cc53c2a125443d3338765ce55845981d1d50b380201dc10c8f0cae6fd1eb573573eb7262ce87c85d74f3e20

diff --git a/sys-apps/lshw/files/lshw-02.17b-fat.patch 
b/sys-apps/lshw/files/lshw-02.17b-fat.patch
deleted file mode 100644
index 08654fd5af6..000
--- a/sys-apps/lshw/files/lshw-02.17b-fat.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-http://bugs.gentoo.org/485496
-
 src/core/fat.cc
-+++ src/core/fat.cc
-@@ -82,4 +82,5 @@
-   uint8_t pmagic[2];
-   } __attribute__((__packed__)) fat32;
-+  char sector[512];   // to make sure the whole struct is at 
least 512 bytes long 
-   } __attribute__((__packed__)) type;
- } __attribute__((__packed__));

diff --git a/sys-apps/lshw/files/lshw-02.17b-gentoo.patch 
b/sys-apps/lshw/files/lshw-02.17b-gentoo.patch
deleted file mode 100644
index 1d3d431ec80..000
--- a/sys-apps/lshw/files/lshw-02.17b-gentoo.patch
+++ /dev/null
@@ -1,159 +0,0 @@
 lshw-B.02.17.orig/src/Makefile
-+++ lshw-B.02.17/src/Makefile
-@@ -21,11 +21,11 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
-   CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-   LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,27 +39,25 @@
- export LIBS
- export LDFLAGS
- 
--DATAFILES = pci.ids usb.ids oui.txt manuf.txt
--
--all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
-+all: $(PACKAGENAME) $(PACKAGENAME).1
- 
- .cc.o:
-   $(CXX) $(CXXFLAGS) -c $< -o $@
- 
- .PHONY: core
- core:
--  +make -C core all
-+  $(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
-   $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--  +make -C po all
-+  $(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--  +make -C gui all
-+  $(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +68,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
-   $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--  $(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +90,13 @@
- manuf.txt:
-   wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
- 
--install: all
-+install:
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--  $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--  make -C po install
-+  $(MAKE) -C

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-03-15 Thread Mike Frysinger

commit: 5bfe0f94df7802976a948b541b56be5fc68389e3
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 15 05:51:08 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 15 06:01:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfe0f94

sys-apps/lshw: support proper $PKG_CONFIG settings

 sys-apps/lshw/lshw-02.17b-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild 
b/sys-apps/lshw/lshw-02.17b-r2.ebuild
index ffd8414595e..74fc33cfafa 100644
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r2.ebuild
@@ -43,10 +43,13 @@ src_prepare() {
sed -i \
-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
src/po/Makefile || die
+   sed -i \
+   -e 's:\:${PKG_CONFIG}:' \
+   src/Makefile src/gui/Makefile || die
 }
 
 src_compile() {
-   tc-export CC CXX AR
+   tc-export CC CXX AR PKG_CONFIG
use static && append-ldflags -static
 
# Need two sep make statements to avoid parallel build issues. #588174

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2017-03-15 Thread Mike Frysinger

commit: 7b78b84875091a71d06d0917f29b64e896a35a42
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 15 06:00:02 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 15 06:01:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b78b848

sys-apps/lshw: version bump to 02.18b #612430

 sys-apps/lshw/Manifest |   1 +
 sys-apps/lshw/files/lshw-02.18b-gentoo.patch   | 161 +
 .../lshw/files/lshw-02.18b-gettext-array.patch |  31 
 sys-apps/lshw/lshw-02.18b.ebuild   |  72 +
 4 files changed, 265 insertions(+)

diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 84a667f9302..5170bcc0535 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,2 +1,3 @@
 DIST lshw-B.02.16.tar.gz 1845891 SHA256 
809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb SHA512 
ad3bd3d7b6f36f912265f0853f5aa37158c6d420a90a5e84b3e8fcd8a3c6137f7505cb5361e3eceb49954332d2466c686c946dcda8db0da3d51b3c48e343c2ab
 WHIRLPOOL 
8e3200b726432859965be744c6afa437ffb4b57166084432064621773018b6f997a282ddea813916bc7faeced22a1286044b91bd69422b83372f03cf0878ca2d
 DIST lshw-B.02.17.tar.gz 2005737 SHA256 
eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c SHA512 
868899dce98e786a08a2134d6e132c388d71ab0f03fa6e10881e14d7a882c1882b46bbc6bd6ddb021cfab87ad6c9fd369453c3916f0b3353027eb2d470e55d9b
 WHIRLPOOL 
5b18df2732e50f38dd8d9168adb6083e9a637cf9596f692a7e6806cda2ad05c777babdbeab470d948604f45bbbf1282be6d9fc68bf5c70741acf2d884e93e749
+DIST lshw-B.02.18.tar.gz 2322176 SHA256 
ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f SHA512 
4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 WHIRLPOOL 
42a76daa9426dbca1f9acd9afc5e66542ea87e4e6cc53c2a125443d3338765ce55845981d1d50b380201dc10c8f0cae6fd1eb573573eb7262ce87c85d74f3e20

diff --git a/sys-apps/lshw/files/lshw-02.18b-gentoo.patch 
b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
new file mode 100644
index 000..0a50e9dc868
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.18b-gentoo.patch
@@ -0,0 +1,161 @@
+--- lshw-B.02.18/src/Makefile
 lshw-B.02.18/src/Makefile
+@@ -21,11 +21,11 @@
+ CXX?=c++
+ INCLUDES=-I./core/
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+ ifeq ($(SQLITE), 1)
+   CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
+ endif
+-LDFLAGS=-L./core/ -g
++LDFLAGS += -L./core/
+ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
+   LDFLAGS+= -Wl,--as-needed
+ endif
+@@ -39,27 +39,25 @@
+ export LIBS
+ export LDFLAGS
+ 
+-DATAFILES = pci.ids usb.ids oui.txt manuf.txt
+-
+-all: $(PACKAGENAME) $(PACKAGENAME).1 $(DATAFILES)
++all: $(PACKAGENAME) $(PACKAGENAME).1
+ 
+ .cc.o:
+   $(CXX) $(CXXFLAGS) -c $< -o $@
+ 
+ .PHONY: core
+ core:
+-  +make -C core all
++  $(MAKE) -C core all
+ 
+ $(PACKAGENAME): core $(PACKAGENAME).o
+   $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+ 
+ .PHONY: po
+ po:
+-  +make -C po all
++  $(MAKE) -C po all
+ 
+ .PHONY: gui
+ gui: core
+-  +make -C gui all
++  $(MAKE) -C gui all
+ 
+ .PHONY: nologo
+ nologo:
+@@ -70,7 +68,6 @@
+ 
+ $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
+   $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
+-  $(STRIP) $@
+ 
+ .PHONY: compressed
+ compressed: $(PACKAGENAME)-compressed
+@@ -93,14 +90,13 @@
+ manuf.txt:
+   wget -O $@ http://anonsvn.wireshark.org/wireshark/trunk/manuf
+ 
+-install: all
++install:
+   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
+   $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
+   $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
+   $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
+   $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
+-  $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
+-  make -C po install
++  $(MAKE) -C po install
+ 
+ install-gui: gui
+   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
+@@ -112,8 +108,8 @@
+ 
+ clean:
+   rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static 
$(PACKAGENAME)-compressed
+-  make -C core clean
+-  make -C gui clean
++  $(MAKE) -C core clean
++  $(MAKE) -C gui clean
+ 
+ .timestamp:
+   date --utc +%Y%m%d%H%M%S > $@
+--- lshw-B.02.18/src/core/Makefile
 lshw-B.02.18/src/core/Makefile
+@@ -1,10 +1,9 @@
+ PACKAGENAME?=lshw
+ 
+-CXX=c++
++CXX?=c++
+ INCLUDES=
+ DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
+-CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+-LDFLAGS=
++CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2017-03-14 Thread Mike Frysinger

commit: ec9e0d08245981acc017e8944d2672793f6a1b33
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Mar 15 05:40:18 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Mar 15 05:41:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9e0d08

sys-apps/lshw: fix parallel build after usex rework #588174

 sys-apps/lshw/lshw-02.17b-r2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild 
b/sys-apps/lshw/lshw-02.17b-r2.ebuild
index 14d905904a1..ffd8414595e 100644
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r2.ebuild
@@ -49,7 +49,10 @@ src_compile() {
tc-export CC CXX AR
use static && append-ldflags -static
 
-   emake SQLITE=$(usex sqlite 1 0) all $(usex gtk 'gui' '')
+   # 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() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/files/

2017-02-04 Thread David Seifert

commit: 8f10b618a1821b689fe55e97df4c7f7c95f519f6
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb  3 15:10:40 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  4 21:19:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f10b618

sys-apps/lshw: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3791

 sys-apps/lshw/files/lshw-02.15b-build.patch | 116 
 1 file changed, 116 deletions(-)

diff --git a/sys-apps/lshw/files/lshw-02.15b-build.patch 
b/sys-apps/lshw/files/lshw-02.15b-build.patch
deleted file mode 100644
index af2b389..
--- a/sys-apps/lshw/files/lshw-02.15b-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
 lshw-B.02.15.orig/src/core/Makefile
-+++ lshw-B.02.15/src/core/Makefile
-@@ -1,10 +1,10 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
--LDFLAGS=
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- LDSTATIC=
- LIBS=
- 
 lshw-B.02.15.orig/src/gui/Makefile
-+++ lshw-B.02.15/src/gui/Makefile
-@@ -8,11 +8,11 @@
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- GTKINCLUDES=$(shell pkg-config gtk+-2.0 --cflags)
- INCLUDES=-I../core $(GTKINCLUDES)
--CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- CFLAGS=$(CXXFLAGS) $(DEFINES)
- GTKLIBS=$(shell pkg-config gtk+-2.0 --libs)
- LIBS=-L../core -llshw -lresolv -lsqlite3 $(GTKLIBS)
--LDFLAGS=
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-   LDFLAGS+= -Wl,--as-needed
- endif
-@@ -39,7 +39,6 @@
-   $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- install: all
--  $(STRIP) gtk-$(PACKAGENAME)
-   
- clean:
-   rm -f $(OBJS) gtk-$(PACKAGENAME) gtk-lshw.glade.bak gtk-lshw.gladep.bak 
interface.c.bak interface.h.bak callbacks.c.bak callbacks.h.bak Makefile.bak
 lshw-B.02.15.orig/src/Makefile
-+++ lshw-B.02.15/src/Makefile
-@@ -21,11 +21,13 @@
- CXX?=c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" 
-DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
--CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
-+CXXFLAGS ?= -g
-+CXXFLAGS += -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
- ifeq ($(SQLITE), 1)
-   CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDFLAGS ?= -g
-+LDFLAGS += -L./core/
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
-   LDFLAGS+= -Wl,--as-needed
- endif
-@@ -48,18 +50,18 @@
- 
- .PHONY: core
- core:
--  +make -C core all
-+  +$(MAKE) -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
-   $(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
--  +make -C po all
-+  +$(MAKE) -C po all
- 
- .PHONY: gui
- gui: core
--  +make -C gui all
-+  +$(MAKE) -C gui all
- 
- .PHONY: nologo
- nologo:
-@@ -70,7 +72,6 @@
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
-   $(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
--  $(STRIP) $@
- 
- .PHONY: compressed
- compressed: $(PACKAGENAME)-compressed
-@@ -93,14 +94,14 @@
- manuf.txt:
-   wget http://www.ethereal.com/distribution/manuf.txt
- 
--install: all
-+install:
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -m 0755 $(PACKAGENAME) $(DESTDIR)/$(SBINDIR)
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -m 0644 $(PACKAGENAME).1 $(DESTDIR)/$(MANDIR)/man1
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
-   $(INSTALL) -m 0644 $(DATAFILES) $(DESTDIR)/$(DATADIR)/$(PACKAGENAME)
--  make -C po install
-+  $(MAKE) -C po install
- 
- install-gui: gui
-   $(INSTALL) -d -m 0755 $(DESTDIR)/$(SBINDIR)
-@@ -110,8 +111,8 @@
-   
- clean:
-   rm -f $(PACKAGENAME).o $(PACKAGENAME) $(PACKAGENAME)-static 
$(PACKAGENAME)-compressed
--  make -C core clean
--  make -C gui clean
-+  $(MAKE) -C core clean
-+  $(MAKE) -C gui clean
- 
- .timestamp:
-   date --utc +%Y%m%d%H%M%S > $@

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2016-05-20 Thread Mike Frysinger

commit: 7b458ea982b270ec5a50b2923a4ff9c58ab6fbc0
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri May 20 15:38:22 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri May 20 15:40:53 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b458ea9

sys-apps/lshw: switch to l10n eclass to handle locales

 sys-apps/lshw/lshw-02.17b-r2.ebuild | 21 -
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild 
b/sys-apps/lshw/lshw-02.17b-r2.ebuild
index 5d7131c..bf6c999 100644
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r2.ebuild
@@ -3,7 +3,10 @@
 # $Id$
 
 EAPI=5
-inherit flag-o-matic eutils toolchain-funcs
+
+PLOCALES='fr'
+
+inherit flag-o-matic eutils toolchain-funcs l10n
 
 MAJ_PV=${PV:0:${#PV}-1}
 MIN_PVE=${PV:0-1}
@@ -36,19 +39,11 @@ src_prepare() {
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-fat.patch \
"${FILESDIR}"/${P}-musl.patch
-   # correct gettext behavior
-   if [[ -n "${LINGUAS+x}" ]] ; then
-   local langs
 
-   for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do
-   if has ${i} ${LINGUAS} ; then
-   langs+=" ${i}"
-   fi
-   done
-   sed -i \
-   -e "/^LANGUAGES =/ s/=.*/= $langs/" \
-   src/po/Makefile || die
-   fi
+   l10n_find_plocales_changes "src/po" "" ".po" || die
+   sed -i \
+   -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+   src/po/Makefile || die
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/

2016-05-15 Thread Mike Frysinger

commit: 5de21637fba927a3f92d56fa184371ae25db076f
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun May 15 20:39:49 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun May 15 20:40:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de21637

sys-apps/lshw: fix minor syntax error #402313

 sys-apps/lshw/lshw-02.16b-r2.ebuild | 2 +-
 sys-apps/lshw/lshw-02.17b-r1.ebuild | 2 +-
 sys-apps/lshw/lshw-02.17b-r2.ebuild | 2 +-
 sys-apps/lshw/lshw-02.17b.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/lshw/lshw-02.16b-r2.ebuild 
b/sys-apps/lshw/lshw-02.16b-r2.ebuild
index 2d49dc8..47239b8 100644
--- a/sys-apps/lshw/lshw-02.16b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.16b-r2.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
for i in $(cd po ; echo *.po | sed 's/\.po//') ; do
if has ${i} ${LINGUAS} ; then
-   langs += " ${i}"
+   langs+=" ${i}"
fi
done
sed -i \

diff --git a/sys-apps/lshw/lshw-02.17b-r1.ebuild 
b/sys-apps/lshw/lshw-02.17b-r1.ebuild
index c16dc9a..9313b15 100644
--- a/sys-apps/lshw/lshw-02.17b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r1.ebuild
@@ -41,7 +41,7 @@ src_prepare() {
 
for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do
if has ${i} ${LINGUAS} ; then
-   langs += " ${i}"
+   langs+=" ${i}"
fi
done
sed -i \

diff --git a/sys-apps/lshw/lshw-02.17b-r2.ebuild 
b/sys-apps/lshw/lshw-02.17b-r2.ebuild
index fcca24e..5d7131c 100644
--- a/sys-apps/lshw/lshw-02.17b-r2.ebuild
+++ b/sys-apps/lshw/lshw-02.17b-r2.ebuild
@@ -42,7 +42,7 @@ src_prepare() {
 
for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do
if has ${i} ${LINGUAS} ; then
-   langs += " ${i}"
+   langs+=" ${i}"
fi
done
sed -i \

diff --git a/sys-apps/lshw/lshw-02.17b.ebuild b/sys-apps/lshw/lshw-02.17b.ebuild
index a7f7c0b..6c37364 100644
--- a/sys-apps/lshw/lshw-02.17b.ebuild
+++ b/sys-apps/lshw/lshw-02.17b.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
for i in $(cd src/po ; echo *.po | sed 's/\.po//') ; do
if has ${i} ${LINGUAS} ; then
-   langs += " ${i}"
+   langs+=" ${i}"
fi
done
sed -i \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/, sys-apps/lshw/files/

2016-02-06 Thread Anthony G. Basile

commit: db21c283b846584ce1aa5e1bc7677876aec19007
Author: jakeogh  v6y  net>
AuthorDate: Sat Feb  6 02:01:21 2016 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sat Feb  6 13:37:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db21c283

sys-apps/lshw: version bump to 02.17b-r2 with upstreamed musl patch

See: https://github.com/gentoo/gentoo/pull/800

 sys-apps/lshw/files/lshw-02.17b-musl.patch | 186 +
 sys-apps/lshw/lshw-02.17b-r2.ebuild|  73 +++
 2 files changed, 259 insertions(+)

diff --git a/sys-apps/lshw/files/lshw-02.17b-musl.patch 
b/sys-apps/lshw/files/lshw-02.17b-musl.patch
new file mode 100644
index 000..3fb3cef
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.17b-musl.patch
@@ -0,0 +1,186 @@
+--- a/src/core/osutils.cc  2016-02-04 23:47:31.071246925 +
 b/src/core/osutils.cc  2016-02-04 23:54:17.125253018 +
+@@ -9,6 +9,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -496,48 +497,48 @@
+ 
+ unsigned short be_short(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+-  return ((__uint16_t)(p[0]) << 8) +
+-(__uint16_t)p[1];
++  return ((uint16_t)(p[0]) << 8) +
++(uint16_t)p[1];
+ }
+ 
+ 
+ unsigned short le_short(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+-  return ((__uint16_t)(p[1]) << 8) +
+-(__uint16_t)p[0];
++  return ((uint16_t)(p[1]) << 8) +
++(uint16_t)p[0];
+ }
+ 
+ 
+ unsigned long be_long(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+-  return ((__uint32_t)(p[0]) << 24) +
+-((__uint32_t)(p[1]) << 16) +
+-((__uint32_t)(p[2]) << 8) +
+-(__uint32_t)p[3];
++  return ((uint32_t)(p[0]) << 24) +
++((uint32_t)(p[1]) << 16) +
++((uint32_t)(p[2]) << 8) +
++(uint32_t)p[3];
+ }
+ 
+ 
+ unsigned long le_long(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+-  return ((__uint32_t)(p[3]) << 24) +
+-((__uint32_t)(p[2]) << 16) +
+-((__uint32_t)(p[1]) << 8) +
+-(__uint32_t)p[0];
++  return ((uint32_t)(p[3]) << 24) +
++((uint32_t)(p[2]) << 16) +
++((uint32_t)(p[1]) << 8) +
++(uint32_t)p[0];
+ 
+ }
+ 
+ 
+ unsigned long long be_longlong(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+   return ((unsigned long long)(p[0]) << 56) +
+ ((unsigned long long)(p[1]) << 48) +
+@@ -552,7 +553,7 @@
+ 
+ unsigned long long le_longlong(const void * from)
+ {
+-  __uint8_t *p = (__uint8_t*)from;
++  uint8_t *p = (uint8_t*)from;
+ 
+   return ((unsigned long long)(p[7]) << 56) +
+ ((unsigned long long)(p[6]) << 48) +
+--- a/src/core/device-tree.cc  2016-02-05 00:02:15.539260197 +
 b/src/core/device-tree.cc  2016-02-05 00:38:50.523293133 +
+@@ -16,6 +16,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -24,13 +25,13 @@
+ __ID("@(#) $Id: device-tree.cc 2433 2012-01-10 22:01:30Z lyonel $");
+ 
+ #define DIMMINFOSIZE 0x80
+-typedef __uint8_t dimminfo_buf[DIMMINFOSIZE];
++typedef uint8_t dimminfo_buf[DIMMINFOSIZE];
+ 
+ struct dimminfo
+ {
+-  __uint8_t version3;
++  uint8_t version3;
+   char serial[16];
+-  __uint16_t version1, version2;
++  uint16_t version1, version2;
+ };
+ 
+ #define DEVICETREE "/proc/device-tree"
+--- a/src/core/pci.cc  2016-02-05 06:02:38.744584655 +
 b/src/core/pci.cc  2016-02-05 06:02:20.471584381 +
+@@ -7,6 +7,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -1131,9 +1132,9 @@
+   string drivername = readlink(string(devices[i]->d_name)+"/driver");
+   string modulename = 
readlink(string(devices[i]->d_name)+"/driver/module");
+ 
+-  device->setConfig("driver", basename(drivername.c_str()));
++  device->setConfig("driver", basename(const_cast(drivername.c_str(;
+   if(exists(modulename))
+-device->setConfig("module", basename(modulename.c_str()));
++device->setConfig("module", basename(const_cast(modulename.c_str(;
+ 
+   if(exists(string(devices[i]->d_name)+"/rom"))
+   {
+--- a/src/core/network.cc  2016-02-05 02:20:31.174384674 +
 b/src/core/network.cc  2016-02-05 02:21:27.940385526 +
+@@ -31,6 +31,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -49,9 +50,9 @@
+ #define SIOCETHTOOL 0x8946
+ #endif
+ typedef unsigned long long u64;
+-typedef __uint32_t u32;
+-typedef __uint16_t u16;
+-typedef __uint8_t u8;
++typedef uint32_t u32;
++typedef uint16_t u16;
++typedef uint8_t u8;
+ 
+ struct ethtool_cmd
+ {
+--- a/src/core/cpufreq.cc  2016-02-05 02:24:29.199388245 +
 b/src/core/cpufreq.cc  2016-02-05 02:26:03.283389657 +
+@@ -14,6 +14,7 @@
+

79 matches

Mail list logo