Merge pull request #226 from marineam/lshw

bump(sys-apps/lshw): sync with upstream
This commit is contained in:
Alex Crawford 2015-06-24 14:28:06 -07:00
commit 2161b618a7
15 changed files with 1240 additions and 0 deletions

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
DESCRIPTION=Hardware Lister
EAPI=3
HOMEPAGE=http://ezix.org/project/wiki/HardwareLiSter
IUSE=gtk sqlite static
KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-linux
LICENSE=GPL-2
RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 )
SLOT=0
SRC_URI=http://ezix.org/software/files/lshw-B.02.15.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=18471e4180ee3ecbad2523b18f743566

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=compile install prepare
DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
DESCRIPTION=Hardware Lister
EAPI=4
HOMEPAGE=http://ezix.org/project/wiki/HardwareLiSter
IUSE=gtk sqlite static
KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
REQUIRED_USE=static? ( !gtk )
SLOT=0
SRC_URI=http://ezix.org/software/files/lshw-B.02.16.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=777aed0daf22ad7b804d33c17f87335d

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=compile install prepare
DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
DESCRIPTION=Hardware Lister
EAPI=4
HOMEPAGE=http://ezix.org/project/wiki/HardwareLiSter
IUSE=gtk sqlite static
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
REQUIRED_USE=static? ( !gtk )
SLOT=0
SRC_URI=http://ezix.org/software/files/lshw-B.02.17.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=5e0f23212c8d2a659759d3b706be50e5

View File

@ -0,0 +1,14 @@
DEFINED_PHASES=compile install prepare
DEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) gtk? ( virtual/pkgconfig ) sqlite? ( virtual/pkgconfig )
DESCRIPTION=Hardware Lister
EAPI=5
HOMEPAGE=http://ezix.org/project/wiki/HardwareLiSter
IUSE=gtk sqlite static
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=gtk? ( x11-libs/gtk+:2 ) sqlite? ( dev-db/sqlite:3 ) sys-apps/hwids
REQUIRED_USE=static? ( !gtk )
SLOT=0
SRC_URI=http://ezix.org/software/files/lshw-B.02.17.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4
_md5_=b138f0325ac3fdcf79251d73a72b2a76

View File

@ -0,0 +1,439 @@
# ChangeLog for sys-apps/lshw
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.116 2014/05/31 14:45:01 ssuominen Exp $
*lshw-02.17b-r1 (31 May 2014)
31 May 2014; Samuli Suominen <ssuominen@gentoo.org> +lshw-02.17b-r1.ebuild,
+files/lshw-02.17b-fat.patch:
Fix segmentation fault with `lshw --short` while accessing a block device with
corrupt partition wrt #485496. Thanks to Ben Kohler and Juergen Rose.
*lshw-02.17b (08 Aug 2013)
08 Aug 2013; Michael Sterrett <mr_bones_@gentoo.org>
+files/lshw-02.17b-gentoo.patch, +lshw-02.17b.ebuild,
files/lshw-02.15b-build.patch, files/lshw-02.16b-gentoo.patch,
lshw-02.16b-r2.ebuild:
version bump; also fixes bug #402313
26 Jun 2013; Jeroen Roovers <jer@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for HPPA too.
22 Feb 2013; Zac Medico <zmedico@gentoo.org> lshw-02.16b-r2.ebuild:
Add ~arm-linux keyword.
04 Feb 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for alpha, wrt bug #452684
26 Jan 2013; Markus Meier <maekke@gentoo.org> lshw-02.16b-r2.ebuild:
arm stable, bug #452684
21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for sparc, wrt bug #452684
21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for ia64, wrt bug #452684
21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for ppc, wrt bug #452684
21 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for ppc64, wrt bug #452684
18 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for x86, wrt bug #452684
18 Jan 2013; Agostino Sarubbo <ago@gentoo.org> lshw-02.16b-r2.ebuild:
Stable for amd64, wrt bug #452684
*lshw-02.16b-r2 (02 Dec 2012)
02 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+files/lshw-02.16b-gentoo.patch, +lshw-02.16b-r2.ebuild,
-files/lshw-02.16b-build-v2.patch, -files/lshw-02.16b-build.patch,
-lshw-02.16b-r1.ebuild, -lshw-02.16b.ebuild:
Remove old, stop installing oui.txt/manuf.txt (unused), don't use a full
search path for pci and usb ids which are always at the same path for Gentoo.
04 May 2012; Jeff Horelick <jdhore@gentoo.org> lshw-02.15b.ebuild,
lshw-02.16b.ebuild, lshw-02.16b-r1.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
21 Apr 2012; Mike Frysinger <vapier@gentoo.org> lshw-02.16b-r1.ebuild:
Restore ~arch keywords #410401.
14 Apr 2012; Zac Medico <zmedico@gentoo.org> lshw-02.16b-r1.ebuild:
Add ~amd64-linux and ~x86-linux keywords.
*lshw-02.16b-r1 (08 Apr 2012)
08 Apr 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+files/lshw-02.16b-build-v2.patch, +lshw-02.16b-r1.ebuild:
Update patch so that USE=gtk won't fail if sqlite3 is not present. Make the
ebuild depend on hwids and not install its own ids files.
*lshw-02.16b (11 Jan 2012)
11 Jan 2012; Tim Harder <radhermit@gentoo.org> +lshw-02.16b.ebuild,
+files/lshw-02.16b-build.patch:
Version bump.
11 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> lshw-02.15b.ebuild:
Fix bug #389801, allowing a clean build with [gtk,-sqlite].
08 Oct 2011; Tim Harder <radhermit@gentoo.org>
-files/lshw-02.12.01b-build.patch, -lshw-02.14b.ebuild,
-files/lshw-02.14b-gcc45.patch:
Remove old.
29 Jul 2011; Zac Medico <zmedico@gentoo.org> lshw-02.15b.ebuild:
Add ~x86-linux keyword.
26 Jul 2011; Zac Medico <zmedico@gentoo.org> lshw-02.15b.ebuild:
Fix for prefix.
30 Mar 2011; Christoph Mende <angelos@gentoo.org> lshw-02.14b.ebuild:
Fix gtk+ slot deps
25 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> lshw-02.15b.ebuild:
ppc64 stable wrt #356927
19 Mar 2011; Raúl Porcel <armin76@gentoo.org> lshw-02.15b.ebuild:
ia64 stable wrt #356927
13 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> lshw-02.15b.ebuild:
x86 stable wrt bug #356927
12 Mar 2011; Tobias Klausmann <klausman@gentoo.org> lshw-02.15b.ebuild:
Stable on alpha, bug #356927
06 Mar 2011; Michael Weber <xmw@gentoo.org> lshw-02.15b.ebuild:
arm/sparc stable (bug 356927)
04 Mar 2011; Brent Baude <ranger@gentoo.org> lshw-02.15b.ebuild:
stable ppc, bug 356927
03 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> lshw-02.15b.ebuild:
Remove dev-util/pkgconfig from runtime depend.
03 Mar 2011; Mike Frysinger <vapier@gentoo.org> lshw-02.15b.ebuild:
Depend on pkgconfig #357015 by André Malo.
01 Mar 2011; Markos Chandras <hwoarang@gentoo.org> lshw-02.15b.ebuild:
Stable on amd64 wrt bug #356927
01 Mar 2011; Tim Harder <radhermit@gentoo.org> lshw-02.15b.ebuild:
Add a slot dependency on gtk+:2.
*lshw-02.15b (28 Oct 2010)
28 Oct 2010; Tim Harder <radhermit@gentoo.org> +lshw-02.15b.ebuild,
+files/lshw-02.15b-build.patch:
Version bump. Update to EAPI=3, add sqlite USE flag and dependency, use
src_prepare instead of src_unpack, and update build patch.
11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> lshw-02.14b.ebuild,
+files/lshw-02.14b-gcc45.patch:
Fix build w/ GCC 4.5. (bug #314201 by Bernd Buschinski)
04 Apr 2010; Raúl Porcel <armin76@gentoo.org> lshw-02.14b.ebuild:
alpha/ia64/sparc stable wrt #304881
08 Mar 2010; Markus Meier <maekke@gentoo.org> lshw-02.14b.ebuild:
arm stable, bug #304881
26 Feb 2010; Christian Faulhammer <fauli@gentoo.org> lshw-02.14b.ebuild:
stable x86, bug 304881
16 Feb 2010; Steve Dibb <beandog@gentoo.org> lshw-02.14b.ebuild:
amd64 stable, bug 304881
15 Feb 2010; Joseph Jezak <josejx@gentoo.org> lshw-02.14b.ebuild:
Marked ppc/ppc64 stable for bug #304881.
*lshw-02.14b (07 Jun 2009)
07 Jun 2009; Mike Frysinger <vapier@gentoo.org> +lshw-02.14b.ebuild:
Version bump #273052 by Raúl Porcel.
14 Oct 2008; Brent Baude <ranger@gentoo.org> lshw-02.13b.ebuild:
stable ppc, bug 241642
14 Oct 2008; Brent Baude <ranger@gentoo.org> lshw-02.13b.ebuild:
stable ppc64, bug 241642
14 Oct 2008; Thomas Anderson <gentoofan23@gentoo.org> lshw-02.13b.ebuild:
stable amd64, bug 241642
13 Oct 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.13b.ebuild:
arm stable wrt #241642
09 Jul 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.13b.ebuild:
alpha/ia64/sparc/x86 stable
*lshw-02.13b (31 May 2008)
31 May 2008; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.13b-gcc43.patch, +lshw-02.13b.ebuild:
Version bump.
22 May 2008; <solar@gentoo.org> lshw-02.12.01b.ebuild:
- Keyworded ~arm
30 Apr 2008; Matti Bickel <mabi@gentoo.org> lshw-02.12.01b.ebuild:
ppc stable (bug #217783)
20 Apr 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.12.01b.ebuild:
sparc stable wrt #217783
20 Apr 2008; Mike Frysinger <vapier@gentoo.org> lshw-02.12.01b.ebuild:
Mark amd64 stable #217783 by Kerin Millar.
20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.12.01b-alignment.patch, lshw-02.12.01b.ebuild:
Fix from upstream for alignment troubles on sparc #217783 by Friedrich Oslage.
20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.12.01b-gcc43.patch, lshw-02.12.01b.ebuild:
Add fix from upstream for building with gcc-4.3 #213912 by Sergey Dryabzhinsky.
17 Apr 2008; Raúl Porcel <armin76@gentoo.org> lshw-02.12.01b.ebuild:
ia64/x86 stable wrt #217783
16 Apr 2008; Tobias Klausmann <klausman@gentoo.org> lshw-02.12.01b.ebuild:
Stable on alpha, bug #217783
16 Apr 2008; Markus Rothe <corsair@gentoo.org> lshw-02.12.01b.ebuild:
Stable on ppc64; bug #217783
*lshw-02.12.01b (24 Dec 2007)
24 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.12.01b-build.patch, +lshw-02.12.01b.ebuild:
Version bump #195824.
25 Nov 2007; Brent Baude <ranger@gentoo.org> lshw-02.11.01b.ebuild:
Marked lshw-02.11.01b ppc stable for bug 194114
02 Nov 2007; Steve Dibb <beandog@gentoo.org> lshw-02.11.01b.ebuild:
Drop amd64 stable keyword
02 Nov 2007; Steve Dibb <beandog@gentoo.org> lshw-02.11.01b.ebuild:
amd64 stable, bug 194114
01 Nov 2007; Ferris McCormick <fmccor@gentoo.org> lshw-02.11.01b.ebuild:
Sparc stable --- Bug #194114 --- I've had it installed for a while.
03 Oct 2007; <solar@gentoo.org> lshw-02.11.01b.ebuild:
keyworded ~ppc64
25 Sep 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.11.01b.ebuild:
alpha/ia64/x86 stable
25 Aug 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.11.01b.ebuild:
Back to ~arch, went straight to stable
*lshw-02.11.01b (25 Aug 2007)
25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.11.01b-build.patch, +lshw-02.11.01b.ebuild:
Version bump #188624 by Daniel Pielmeier.
14 May 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.10b.ebuild:
alpha stable wrt #166574
22 Apr 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.10b.ebuild:
ia64 stable
26 Mar 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.09b.ebuild:
ia64 stable wrt bug 166574
*lshw-02.10b (24 Mar 2007)
24 Mar 2007; Mike Frysinger <vapier@gentoo.org> +lshw-02.10b.ebuild:
Version bump #170365 by Daniel Webert.
18 Feb 2007; nixnut <nixnut@gentoo.org> lshw-02.09b.ebuild:
Stable on ppc wrt bug 166574
13 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.09b.ebuild:
Stable on sparc wrt #166574
13 Feb 2007; Raúl Porcel <armin76@gentoo.org> lshw-02.09b.ebuild:
x86 stable wrt bug 166574
13 Feb 2007; Steve Dibb <beandog@gentoo.org> lshw-02.09b.ebuild:
amd64 stable, bug 166574
03 Dec 2006; Tim Yamin <plasmaroo@gentoo.org> lshw-02.08.01b.ebuild:
Stable on IA64; bug #156269.
01 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
lshw-02.08.01b.ebuild:
ppc stable, bug #156269
28 Nov 2006; Christian Faulhammer <opfer@gentoo.org>
lshw-02.08.01b.ebuild:
stable x86, bug #156269
27 Nov 2006; Steve Dibb <beandog@gentoo.org> lshw-02.08.01b.ebuild:
amd64 stable, bug 156269
27 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.08.01b.ebuild:
Stable on sparc wrt #156269
*lshw-02.09b (27 Nov 2006)
27 Nov 2006; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.09b-cpuid-PIC.patch, +lshw-02.09b.ebuild:
Version bump #156268 by Daniel Webert.
25 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> lshw-02.06b.ebuild,
lshw-02.08.01b.ebuild:
Alpha + ~ia64 keywords.
*lshw-02.08.01b (17 May 2006)
17 May 2006; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.08.01b-build.patch, +lshw-02.08.01b.ebuild:
Version bump #133540 by Daniel Webert.
27 Apr 2006; Daniel Gryniewicz <dang@gentoo.org> lshw-02.06b.ebuild:
Marked stable on amd64 per bug #131184
26 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.06b.ebuild:
Stable on sparc wrt #131184
25 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> lshw-02.06b.ebuild:
ppc stable, bug #131184
25 Apr 2006; Saleem Abdulrasool <compnerd@gentoo.org> lshw-02.06b.ebuild:
stable on x86 (bug #131184)
*lshw-02.07b (25 Apr 2006)
25 Apr 2006; Mike Frysinger <vapier@gentoo.org> +lshw-02.07b.ebuild:
Version bump #130973 by Daniel Webert.
08 Feb 2006; Aron Griffis <agriffis@gentoo.org> lshw-02.05.01b.ebuild:
Mark 02.05.01b stable on alpha
25 Nov 2005; Luis Medinas <metalgod@gentoo.org> lshw-02.05.01b.ebuild:
Stable on amd64.
11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> lshw-02.05.01b.ebuild:
Stable on ppc.
08 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> lshw-02.05.01b.ebuild:
Stable on sparc
*lshw-02.06b (05 Nov 2005)
05 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+files/lshw-02.06b-build.patch, +files/lshw-02.06b-cpuid-PIC.patch,
+lshw-02.06b.ebuild:
Version bump #111500 by Daniel Webert.
05 Nov 2005; Mark Loeser <halcy0n@gentoo.org> lshw-02.05.01b.ebuild:
Stable on x86; bug #111499
03 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> lshw-02.05.01b.ebuild:
marked ~alpha, wrt bug #104130
*lshw-02.05.01b (22 Jul 2005)
22 Jul 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.05.01b.ebuild:
Version bump #99838 by Nunatak.
22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> lshw-02.03b.ebuild:
Stable on ppc.
02 May 2005; Jason Wever <weeve@gentoo.org> lshw-02.03b.ebuild:
Stable on SPARC.
*lshw-02.04b (28 Apr 2005)
28 Apr 2005; Mike Frysinger <vapier@gentoo.org> +lshw-02.04b.ebuild:
Version bump #90727 by Daniel Webert.
*lshw-02.03b (05 Feb 2005)
05 Feb 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.03b.ebuild:
Version bumped.
03 Feb 2005; <solar@gentoo.org> -lshw-01.08a.ebuild, lshw-02.00b.ebuild,
lshw-02.02b.ebuild:
- removing filter-flags -fPIC from ebuild now that the cpuid patch exists.
Removing broken lshw-01.08a
*lshw-02.02b (22 Jan 2005)
22 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +lshw-02.02b.ebuild:
Version bumped.
03 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+files/02.00b-cpuid-PIC.patch, lshw-02.00b.ebuild:
Add patch to enable PIC building #61947.
21 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/02.00b-dev.patch,
lshw-02.00b.ebuild:
Clean up ebuild and add patch to fix includes #75168 by lukenshiro@ngi.it.
*lshw-02.00b (21 Dec 2004)
21 Dec 2004; MATSUU Takuto <matsuu@gentoo.org> -lshw-01.06a.ebuild,
-lshw-01.07a.ebuild, lshw-01.08a.ebuild, +lshw-02.00b.ebuild:
Version bumped.
Removed old versions.
*lshw-01.08a (06 Sep 2004)
06 Sep 2004; MATSUU Takuto <matsuu@gentoo.org> +lshw-01.08a.ebuild:
Version bumped.
*lshw-01.07a (13 May 2004)
13 May 2004; <matsuu@gentoo.org> -lshw-01.00.ebuild, +lshw-01.07a.ebuild:
Version bumped.
12 May 2004; Alexander Gabert <pappy@gentoo.org> lshw-01.06a.ebuild:
removed hardened-gcc logic
25 Apr 2004; <matsuu@gentoo.org> -lshw-01.05a.ebuild, lshw-01.06a.ebuild:
Marked as stable.
*lshw-01.06a (29 Feb 2004)
29 Feb 2004; <matsuu@gentoo.org> lshw-01.06a.ebuild:
Version bumped.
*lshw-01.05a (05 Nov 2003)
05 Nov 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.05a.ebuild:
Version bumped.
*lshw-01.04 (04 Oct 2003)
04 Oct 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.04.ebuild:
version bump.
21 Sep 2003; <solar@gentoo.org> lshw-01.03.ebuild:
cpuid.cc uses inline asm and can not be linked when position independent code
is desired.
*lshw-01.03 (20 Aug 2003)
20 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> lshw-01.03.ebuild:
version bump.
*lshw-01.02 (06 Aug 2003)
06 Aug 2003; Martin Holzer <mholzer@gentoo.org> lshw-01.02.ebuild:
Version bumped. closes #25925.
*lshw-01.00 (15 Apr 2003)
15 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest, lshw-01.00.ebuild:
Adding initial ebuild submitted by Marc Hildebrand
<marc.hildebrand@t-online.de> in #19200.

View File

@ -0,0 +1,27 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX lshw-02.15b-build.patch 3303 SHA256 3e445965e06e2c658f2bb7e822a2e5dcf082c3965fefd4e1ee285aa781581a01 SHA512 667ec1020c967a134708e3191ff97d2c57a5f93c54df6e5ccc332ce230242bd661269c93fbd63c55b25f6aafc5f14e52b805b0101f4394b0629b9aa70e9ef2dc WHIRLPOOL 4165d6f02760f3d85c7bcd01da9d4828d90f1e305d48fb3e87e5574b3c01db8504d2be1dcb595d86aa034189c1031070149647abe6e0fb84cf636a2c489cdf38
AUX lshw-02.16b-gentoo.patch 4998 SHA256 4ea3260b90d6295f89218ed2a0ba3fb2370f1cb19bb2ba38a7d7623905c3237c SHA512 f79579998aae5fe4aae06bba2cbf18e0f6bcc5cd7ac4c4b85a468ccacbee69f9b011184d34a812a82d2e9a3fbb328cc300708feeb4101c8c975a6601c7155f35 WHIRLPOOL b430992dac235cadb20719815acd598f909fd456945c45983bbf8349e1672beb15a2a702266897faba34225275d45462e8fc2735210372fe7ecb69a559b51d6d
AUX lshw-02.17b-fat.patch 310 SHA256 ba8f5cd5a9872bb377558448864962045e8742bb06cc093463cc63a7ad374e81 SHA512 e42421b3b46880ca946eaa9b9b5f33436c829b28fbb660e4190b2a381fd855611dc061bbcd183074cde93f28bb9c6c7dce336e2de8be925a57da9ada256019f6 WHIRLPOOL 50e777800dee4a46301c0a0c352ed3254f78b24dd702703bf2aa6460a3d018efb1d93065d4c11cb604400a54c9abf05d31e0f357e11fdf941d01216ab7771169
AUX lshw-02.17b-gentoo.patch 4826 SHA256 0596eee063c0449a168a344ef6ec4914581a40444e947c7cd922e7a4e50efce1 SHA512 01deba11db4ad0fbb07f14e75f521adf901b81dc3b2e51febaf51a82bbc0214558250a762bca92d9fd154d634ae1213a4c647c747732b3f00577dddb41deb191 WHIRLPOOL 6ef39e2bb9b2f731ca1df7e96b4c1402aba25efbb9a223ce997f10dd7702e68e9f46785e436bdeb51fc690c052564e9a33259eef8441659e1f0bacc97eb50a5c
DIST lshw-B.02.15.tar.gz 1384466 SHA256 fb01cec64bc9067cce61cd64f8ad81f2f0082985fad5b627cf4bd71ba43735a6 SHA512 e0e2e6f4644416f4b15fe36cbc4d2954ee658f79c3f594f1a0bd467109593f2f746e9d70dbf16e968f699dba0249dc9d43459c5a986df8de1c5de47481411296 WHIRLPOOL 0d43e44cf6c9b304367315b42ba98bb0792fea3e0bca202ae0fc7b9c23f852d9d61053fc08533a6d5ef2f9ab37ef3e8b1027f72324647ad565ea7e14642864a9
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
EBUILD lshw-02.15b.ebuild 1409 SHA256 5e84ead5a119b2cbcd67fbc8e42eed648fa2be0d21a812785b26c5a2b35f70b7 SHA512 f824f207cb103040a3ac8ac02bc8dd2ca0b3b6ce18514d7f324aceeb237464048fae35a92fed82cfc76ebc501fe9312667cb6a3a8bf6293d263dfd8ae30fcab8 WHIRLPOOL d419116adc4ee5f08f24ec0f38aa3e79661f7ccd34561c491f9263a852f73ca10529b71bf042b7adda5ca10fa6d9fb081a0601b463c3ebc36f94d823b608bfbd
EBUILD lshw-02.16b-r2.ebuild 1684 SHA256 3b362d6e2ddb1246dd06c8199871623cba95ea660c8e89ca6fa6771a94369dc7 SHA512 827ccad43be848381d2fbb77d8a2b7dda05d48d0bb5f47dc61096a518745ab022cf0b004612196a53225460cb007017f403e898f1792f5ea6cecd65aa3a2b05f WHIRLPOOL 1ab8180f2ed1f8457390dde76ec918f9998a65a8abd1c7e9b484222295ad4c8c199b7d15611a1420ffc58aec436a6592e7fede6584885643f991d2724ad4d7ef
EBUILD lshw-02.17b-r1.ebuild 1733 SHA256 67d59f6f23581442e3490c27d6d07bc7af8b25a298e16709196594fa443ede5e SHA512 cd04d3d489e31379d0ec680ef7fc04242357bc0a8815e00527282107e8e91814340ddb605a43a0d5035b44569aa0098be72d7a0ea701baca525e5874f08656d3 WHIRLPOOL 8fcba957d11a30294673689d4bdcdef453d308bb57c3ff02b975000341b2b4458695ddae32402af8d3b2b23b6d68bd839877b599e0734b336681066d0b12d7d4
EBUILD lshw-02.17b.ebuild 1693 SHA256 b7de8fd8afdea6429bfdc5c23e9d9b5053c5e801ea15ace50540d75da18d94fb SHA512 88757c436294518286d3597983400945764e8b9564e71f99722caa8bafc896a2a68c15f46bc54deff8c12f53f8fcb1306aa7606d09d1278e6077fa0d24bdc3ea WHIRLPOOL dc0778ac67a408b31cafe7fd50dfdfb02e82092b72e89aee31ce1b15724b9129c9776200a9d49e1963782d394bb481dc2f9d4b7c08c1a454423baf8cf659cd4e
MISC ChangeLog 14590 SHA256 ad49b41a36e5b3f5cdb330f1b73167dee72077827e69fd38d5b3dee7814b38e6 SHA512 c5053776bf810bec7a4f1e441ef6887666adaa69f5dc59b2a329daa1383a98c98491ab5b5d26027abbcd98f129d5f5b1b4313d45d0efd654ce40f094c4f12d49 WHIRLPOOL d14921c4dd47b0cbfc0252ff47667aea1d75303520228c4d714ba587fd2f27235f9367da208c8761aec6260619153135908c997b4a5722d0ebbe76f706762e69
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQEcBAEBCAAGBQJTiepzAAoJEEdUh39IaPFNOcsIAIOghaI7UxLOovj+R9C8YQwa
u5T+lEksoIyJryANjEc6OKz3zYAH0SlHMZteIuDjBTU9uSCYgrnWwM887/+twP7O
giadc1bjQTUXVczy8tx6X8JO2A4DfKpNBXZT5isNUYYq6RVu5Fqn5hfuqWDqpMea
1DizyufCNqsi3RIkmgNTBw9agENNP6VT0hAOKB3EvwxJqXi6Rzv0w7DTOdK+AskG
5xjKJgHf6At+S5vEnQkiZxNScRy+/EWdDytd7xJtZXBoRFeOfD/WYD4rqC2a3g4z
qch+T77vnpxCaqz5ZJUIzKWCz+N/g62g74DjmBFHqz5rPh8yjwK3VbYB4yT69LE=
=9Q9j
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,116 @@
--- 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 > $@

View File

@ -0,0 +1,161 @@
--- 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
-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 @@ install-gui: gui
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.16.orig/src/core/pci.cc
+++ lshw-B.02.16/src/core/pci.cc
@@ -17,7 +17,7 @@ __ID("@(#) $Id: pci.cc 2433 2012-01-10 2
#define PROC_BUS_PCI "/proc/bus/pci"
#define SYS_BUS_PCI "/sys/bus/pci"
-#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
+#define PCIID_PATH "/usr/share/misc/pci.ids"
#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
#define PCI_VENDOR_ID 0x00 /* 16 bits */
--- lshw-B.02.16.orig/src/core/usb.cc
+++ lshw-B.02.16/src/core/usb.cc
@@ -27,7 +27,7 @@
#define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
#define SYSBUSUSBDEVICES "/sys/bus/usb/devices"
-#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
+#define USBID_PATH "/usr/share/misc/usb.ids"
#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
#define USB_CLASS_AUDIO 1

View File

@ -0,0 +1,10 @@
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__));

View File

@ -0,0 +1,159 @@
--- 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 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.17.orig/src/core/Makefile
+++ lshw-B.02.17/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.17.orig/src/core/pci.cc
+++ lshw-B.02.17/src/core/pci.cc
@@ -17,7 +17,7 @@
#define PROC_BUS_PCI "/proc/bus/pci"
#define SYS_BUS_PCI "/sys/bus/pci"
-#define PCIID_PATH DATADIR"/pci.ids:/usr/share/lshw/pci.ids:/usr/local/share/pci.ids:/usr/share/pci.ids:/etc/pci.ids:/usr/share/hwdata/pci.ids:/usr/share/misc/pci.ids"
+#define PCIID_PATH "/usr/share/misc/pci.ids"
#define PCI_CLASS_REVISION 0x08 /* High 24 bits are class, low 8 revision */
#define PCI_VENDOR_ID 0x00 /* 16 bits */
--- lshw-B.02.17.orig/src/core/usb.cc
+++ lshw-B.02.17/src/core/usb.cc
@@ -27,7 +27,7 @@
#define PROCBUSUSBDEVICES "/proc/bus/usb/devices"
#define SYSKERNELDEBUGUSBDEVICES "/sys/kernel/debug/usb/devices"
-#define USBID_PATH DATADIR"/usb.ids:/usr/share/lshw/usb.ids:/usr/local/share/usb.ids:/usr/share/usb.ids:/etc/usb.ids:/usr/share/hwdata/usb.ids:/usr/share/misc/usb.ids"
+#define USBID_PATH "/usr/share/misc/usb.ids"
#define USB_CLASS_PER_INTERFACE 0 /* for DeviceClass */
#define USB_CLASS_AUDIO 1
--- lshw-B.02.17.orig/src/gui/Makefile
+++ lshw-B.02.17/src/gui/Makefile
@@ -1,5 +1,7 @@
PACKAGENAME?=lshw
+SQLITE?=0
+
CXX?=c++
CC?=cc
STRIP?=strip
@@ -8,13 +10,14 @@
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,7 +42,6 @@
$(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

View File

@ -0,0 +1,56 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.15b.ebuild,v 1.15 2012/05/04 09:17:30 jdhore Exp $
EAPI=3
inherit flag-o-matic eutils toolchain-funcs
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="http://ezix.org/project/wiki/HardwareLiSter"
SRC_URI="http://ezix.org/software/files/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-linux"
IUSE="gtk sqlite static"
RDEPEND="gtk? ( x11-libs/gtk+:2 )
sqlite? ( dev-db/sqlite:3 )"
DEPEND="${RDEPEND}
gtk? ( virtual/pkgconfig )
sqlite? ( virtual/pkgconfig )"
S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
}
src_compile() {
tc-export CC CXX AR
use static && append-ldflags -static
local sqlite=0
use sqlite && sqlite=1
emake SQLITE=$sqlite || die "emake failed"
if use gtk ; then
emake SQLITE=$sqlite gui || die "emake gui failed"
fi
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || \
die "install failed"
dodoc README docs/*
if use gtk ; then
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui || \
die "install gui failed"
make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
fi
}

View File

@ -0,0 +1,70 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.16b-r2.ebuild,v 1.12 2013/08/08 19:42:32 mr_bones_ Exp $
EAPI=4
inherit flag-o-matic eutils toolchain-funcs
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="http://ezix.org/project/wiki/HardwareLiSter"
SRC_URI="http://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}
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
# correct gettext behavior
if [[ -n "${LINGUAS+x}" ]] ; then
local langs
for i in $(cd 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
}
src_compile() {
tc-export CC CXX AR
use static && append-ldflags -static
local sqlite=$(usex sqlite 1 0)
emake SQLITE=$sqlite all
if use gtk ; then
emake SQLITE=$sqlite gui
fi
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
dodoc README docs/*
if use gtk ; then
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
fi
}

View File

@ -0,0 +1,72 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.17b-r1.ebuild,v 1.1 2014/05/31 14:45:01 ssuominen Exp $
EAPI=5
inherit flag-o-matic eutils toolchain-funcs
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="http://ezix.org/project/wiki/HardwareLiSter"
SRC_URI="http://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}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-gentoo.patch \
"${FILESDIR}"/${P}-fat.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
}
src_compile() {
tc-export CC CXX AR
use static && append-ldflags -static
local sqlite=$(usex sqlite 1 0)
emake SQLITE=$sqlite all
if use gtk ; then
emake SQLITE=$sqlite gui
fi
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
dodoc README docs/*
if use gtk ; then
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
fi
}

View File

@ -0,0 +1,70 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.17b.ebuild,v 1.1 2013/08/08 19:42:32 mr_bones_ Exp $
EAPI=4
inherit flag-o-matic eutils toolchain-funcs
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="http://ezix.org/project/wiki/HardwareLiSter"
SRC_URI="http://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}
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.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
}
src_compile() {
tc-export CC CXX AR
use static && append-ldflags -static
local sqlite=$(usex sqlite 1 0)
emake SQLITE=$sqlite all
if use gtk ; then
emake SQLITE=$sqlite gui
fi
}
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
dodoc README docs/*
if use gtk ; then
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install-gui
make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg"
fi
}

View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
</pkgmetadata>