From 21a306abd1f86278d731c6873f0e76c6122783b9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 5 Nov 2021 21:24:06 +0100 Subject: [PATCH] sys-apps/lshw: Sync with gentoo It's from gentoo commit 38b155fa1bf907617067c98eb4ba3a5d0790eb1a. --- .../portage-stable/sys-apps/lshw/ChangeLog | 99 ---- .../sys-apps/lshw/ChangeLog-2015 | 442 ------------------ .../portage-stable/sys-apps/lshw/Manifest | 15 +- .../lshw/files/lshw-02.15b-build.patch | 116 ----- .../lshw/files/lshw-02.16b-gentoo.patch | 161 ------- .../sys-apps/lshw/files/lshw-02.17b-fat.patch | 10 - .../lshw/files/lshw-02.17b-gentoo.patch | 159 ------- .../lshw/files/lshw-02.17b-musl.patch | 186 -------- .../sys-apps/lshw/lshw-02.16b-r2.ebuild | 70 --- .../sys-apps/lshw/lshw-02.17b-r1.ebuild | 72 --- .../sys-apps/lshw/lshw-02.17b-r2.ebuild | 62 --- .../sys-apps/lshw/lshw-02.17b.ebuild | 70 --- .../lshw/lshw-02.19.2b_p20210121.ebuild | 81 ++++ .../portage-stable/sys-apps/lshw/metadata.xml | 13 +- 14 files changed, 91 insertions(+), 1465 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog-2015 delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.15b-build.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.16b-gentoo.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-fat.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-gentoo.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-musl.patch delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.16b-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog deleted file mode 100644 index 6fc60d1c70..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog +++ /dev/null @@ -1,99 +0,0 @@ -# ChangeLog for sys-apps/lshw -# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 -# (auto-generated from git log) - -*lshw-02.17b-r1 (09 Aug 2015) -*lshw-02.17b (09 Aug 2015) -*lshw-02.16b-r2 (09 Aug 2015) - - 09 Aug 2015; Robin H. Johnson - +files/lshw-02.15b-build.patch, +files/lshw-02.16b-gentoo.patch, - +files/lshw-02.17b-fat.patch, +files/lshw-02.17b-gentoo.patch, - +lshw-02.16b-r2.ebuild, +lshw-02.17b.ebuild, +lshw-02.17b-r1.ebuild, - +metadata.xml: - proj/gentoo: Initial commit - - This commit represents a new era for Gentoo: - Storing the gentoo-x86 tree in Git, as converted from CVS. - - This commit is the start of the NEW history. - Any historical data is intended to be grafted onto this point. - - Creation process: - 1. Take final CVS checkout snapshot - 2. Remove ALL ChangeLog* files - 3. Transform all Manifests to thin - 4. Remove empty Manifests - 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ - 5.1. Do not touch files with -kb/-ko keyword flags. - - Signed-off-by: Robin H. Johnson - X-Thanks: Alec Warner - did the GSoC 2006 migration - tests - X-Thanks: Robin H. Johnson - infra guy, herding this - project - X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo - developer, wrote Git features for the migration - X-Thanks: Brian Harring - wrote much python to improve - cvs2svn - X-Thanks: Rich Freeman - validation scripts - X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 - work in migration - X-Thanks: Michał Górny - scripts, QA, nagging - X-Thanks: All of other Gentoo developers - many ideas and lots of paint on - the bikeshed - - 24 Aug 2015; Justin Lecher metadata.xml: - Use https by default - - Convert all URLs for sites supporting encrypted connections from http to - https - - Signed-off-by: Justin Lecher - - 24 Aug 2015; Mike Gilbert metadata.xml: - Revert DOCTYPE SYSTEM https changes in metadata.xml - - repoman does not yet accept the https version. - This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450. - - Bug: https://bugs.gentoo.org/552720 - - 24 Nov 2015; Mike Frysinger metadata.xml: - standardize various metadata.xml style - - 24 Jan 2016; Michał Górny metadata.xml: - Unify quoting in metadata.xml files for machine processing - - Force unified quoting in all metadata.xml files since lxml does not - preserve original use of single and double quotes. Ensuring unified - quoting before the process allows distinguishing the GLEP 67-related - metadata.xml changes from unrelated quoting changes. - - 24 Jan 2016; Michał Górny metadata.xml: - Replace all herds with appropriate projects (GLEP 67) - - Replace all uses of herd with appropriate project maintainers, or no - maintainers in case of herds requested to be disbanded. - - 24 Jan 2016; Michał Górny metadata.xml: - Set appropriate maintainer types in metadata.xml (GLEP 67) - -*lshw-02.17b-r2 (06 Feb 2016) - - 06 Feb 2016; Anthony G. Basile - +files/lshw-02.17b-musl.patch, +lshw-02.17b-r2.ebuild: - version bump to 02.17b-r2 with upstreamed musl patch - - See: https://github.com/gentoo/gentoo/pull/800 - - 15 May 2016; Mike Frysinger lshw-02.16b-r2.ebuild, - lshw-02.17b.ebuild, lshw-02.17b-r1.ebuild, lshw-02.17b-r2.ebuild: - fix minor syntax error #402313 - - 20 May 2016; Mike Frysinger lshw-02.17b-r2.ebuild: - switch to l10n eclass to handle locales - - 20 May 2016; Mike Frysinger lshw-02.17b-r2.ebuild: - leverage usex to simplify code a bit - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog-2015 b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog-2015 deleted file mode 100644 index 8e240cfb3d..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/ChangeLog-2015 +++ /dev/null @@ -1,442 +0,0 @@ -# ChangeLog for sys-apps/lshw -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.117 2015/07/21 21:31:18 mrueg Exp $ - - 21 Jul 2015; Manuel Rüger -lshw-02.15b.ebuild: - Remove old. - -*lshw-02.17b-r1 (31 May 2014) - - 31 May 2014; Samuli Suominen +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 - +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 lshw-02.16b-r2.ebuild: - Stable for HPPA too. - - 22 Feb 2013; Zac Medico lshw-02.16b-r2.ebuild: - Add ~arm-linux keyword. - - 04 Feb 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for alpha, wrt bug #452684 - - 26 Jan 2013; Markus Meier lshw-02.16b-r2.ebuild: - arm stable, bug #452684 - - 21 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for sparc, wrt bug #452684 - - 21 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for ia64, wrt bug #452684 - - 21 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for ppc, wrt bug #452684 - - 21 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for ppc64, wrt bug #452684 - - 18 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for x86, wrt bug #452684 - - 18 Jan 2013; Agostino Sarubbo lshw-02.16b-r2.ebuild: - Stable for amd64, wrt bug #452684 - -*lshw-02.16b-r2 (02 Dec 2012) - - 02 Dec 2012; Diego E. Pettenò - +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 lshw-02.15b.ebuild, - lshw-02.16b.ebuild, lshw-02.16b-r1.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 21 Apr 2012; Mike Frysinger lshw-02.16b-r1.ebuild: - Restore ~arch keywords #410401. - - 14 Apr 2012; Zac Medico 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ò - +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 +lshw-02.16b.ebuild, - +files/lshw-02.16b-build.patch: - Version bump. - - 11 Nov 2011; Diego E. Pettenò lshw-02.15b.ebuild: - Fix bug #389801, allowing a clean build with [gtk,-sqlite]. - - 08 Oct 2011; Tim Harder - -files/lshw-02.12.01b-build.patch, -lshw-02.14b.ebuild, - -files/lshw-02.14b-gcc45.patch: - Remove old. - - 29 Jul 2011; Zac Medico lshw-02.15b.ebuild: - Add ~x86-linux keyword. - - 26 Jul 2011; Zac Medico lshw-02.15b.ebuild: - Fix for prefix. - - 30 Mar 2011; Christoph Mende lshw-02.14b.ebuild: - Fix gtk+ slot deps - - 25 Mar 2011; Kacper Kowalik lshw-02.15b.ebuild: - ppc64 stable wrt #356927 - - 19 Mar 2011; Raúl Porcel lshw-02.15b.ebuild: - ia64 stable wrt #356927 - - 13 Mar 2011; Pawel Hajdan jr lshw-02.15b.ebuild: - x86 stable wrt bug #356927 - - 12 Mar 2011; Tobias Klausmann lshw-02.15b.ebuild: - Stable on alpha, bug #356927 - - 06 Mar 2011; Michael Weber lshw-02.15b.ebuild: - arm/sparc stable (bug 356927) - - 04 Mar 2011; Brent Baude lshw-02.15b.ebuild: - stable ppc, bug 356927 - - 03 Mar 2011; Samuli Suominen lshw-02.15b.ebuild: - Remove dev-util/pkgconfig from runtime depend. - - 03 Mar 2011; Mike Frysinger lshw-02.15b.ebuild: - Depend on pkgconfig #357015 by André Malo. - - 01 Mar 2011; Markos Chandras lshw-02.15b.ebuild: - Stable on amd64 wrt bug #356927 - - 01 Mar 2011; Tim Harder lshw-02.15b.ebuild: - Add a slot dependency on gtk+:2. - -*lshw-02.15b (28 Oct 2010) - - 28 Oct 2010; Tim Harder +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 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 lshw-02.14b.ebuild: - alpha/ia64/sparc stable wrt #304881 - - 08 Mar 2010; Markus Meier lshw-02.14b.ebuild: - arm stable, bug #304881 - - 26 Feb 2010; Christian Faulhammer lshw-02.14b.ebuild: - stable x86, bug 304881 - - 16 Feb 2010; Steve Dibb lshw-02.14b.ebuild: - amd64 stable, bug 304881 - - 15 Feb 2010; Joseph Jezak lshw-02.14b.ebuild: - Marked ppc/ppc64 stable for bug #304881. - -*lshw-02.14b (07 Jun 2009) - - 07 Jun 2009; Mike Frysinger +lshw-02.14b.ebuild: - Version bump #273052 by Raúl Porcel. - - 14 Oct 2008; Brent Baude lshw-02.13b.ebuild: - stable ppc, bug 241642 - - 14 Oct 2008; Brent Baude lshw-02.13b.ebuild: - stable ppc64, bug 241642 - - 14 Oct 2008; Thomas Anderson lshw-02.13b.ebuild: - stable amd64, bug 241642 - - 13 Oct 2008; Raúl Porcel lshw-02.13b.ebuild: - arm stable wrt #241642 - - 09 Jul 2008; Raúl Porcel lshw-02.13b.ebuild: - alpha/ia64/sparc/x86 stable - -*lshw-02.13b (31 May 2008) - - 31 May 2008; Mike Frysinger - +files/lshw-02.13b-gcc43.patch, +lshw-02.13b.ebuild: - Version bump. - - 22 May 2008; lshw-02.12.01b.ebuild: - - Keyworded ~arm - - 30 Apr 2008; Matti Bickel lshw-02.12.01b.ebuild: - ppc stable (bug #217783) - - 20 Apr 2008; Raúl Porcel lshw-02.12.01b.ebuild: - sparc stable wrt #217783 - - 20 Apr 2008; Mike Frysinger lshw-02.12.01b.ebuild: - Mark amd64 stable #217783 by Kerin Millar. - - 20 Apr 2008; Mike Frysinger - +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 - +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 lshw-02.12.01b.ebuild: - ia64/x86 stable wrt #217783 - - 16 Apr 2008; Tobias Klausmann lshw-02.12.01b.ebuild: - Stable on alpha, bug #217783 - - 16 Apr 2008; Markus Rothe lshw-02.12.01b.ebuild: - Stable on ppc64; bug #217783 - -*lshw-02.12.01b (24 Dec 2007) - - 24 Dec 2007; Mike Frysinger - +files/lshw-02.12.01b-build.patch, +lshw-02.12.01b.ebuild: - Version bump #195824. - - 25 Nov 2007; Brent Baude lshw-02.11.01b.ebuild: - Marked lshw-02.11.01b ppc stable for bug 194114 - - 02 Nov 2007; Steve Dibb lshw-02.11.01b.ebuild: - Drop amd64 stable keyword - - 02 Nov 2007; Steve Dibb lshw-02.11.01b.ebuild: - amd64 stable, bug 194114 - - 01 Nov 2007; Ferris McCormick lshw-02.11.01b.ebuild: - Sparc stable --- Bug #194114 --- I've had it installed for a while. - - 03 Oct 2007; lshw-02.11.01b.ebuild: - keyworded ~ppc64 - - 25 Sep 2007; Raúl Porcel lshw-02.11.01b.ebuild: - alpha/ia64/x86 stable - - 25 Aug 2007; Raúl Porcel lshw-02.11.01b.ebuild: - Back to ~arch, went straight to stable - -*lshw-02.11.01b (25 Aug 2007) - - 25 Aug 2007; Mike Frysinger - +files/lshw-02.11.01b-build.patch, +lshw-02.11.01b.ebuild: - Version bump #188624 by Daniel Pielmeier. - - 14 May 2007; Raúl Porcel lshw-02.10b.ebuild: - alpha stable wrt #166574 - - 22 Apr 2007; Raúl Porcel lshw-02.10b.ebuild: - ia64 stable - - 26 Mar 2007; Raúl Porcel lshw-02.09b.ebuild: - ia64 stable wrt bug 166574 - -*lshw-02.10b (24 Mar 2007) - - 24 Mar 2007; Mike Frysinger +lshw-02.10b.ebuild: - Version bump #170365 by Daniel Webert. - - 18 Feb 2007; nixnut lshw-02.09b.ebuild: - Stable on ppc wrt bug 166574 - - 13 Feb 2007; Gustavo Zacarias lshw-02.09b.ebuild: - Stable on sparc wrt #166574 - - 13 Feb 2007; Raúl Porcel lshw-02.09b.ebuild: - x86 stable wrt bug 166574 - - 13 Feb 2007; Steve Dibb lshw-02.09b.ebuild: - amd64 stable, bug 166574 - - 03 Dec 2006; Tim Yamin lshw-02.08.01b.ebuild: - Stable on IA64; bug #156269. - - 01 Dec 2006; Tobias Scherbaum - lshw-02.08.01b.ebuild: - ppc stable, bug #156269 - - 28 Nov 2006; Christian Faulhammer - lshw-02.08.01b.ebuild: - stable x86, bug #156269 - - 27 Nov 2006; Steve Dibb lshw-02.08.01b.ebuild: - amd64 stable, bug 156269 - - 27 Nov 2006; Gustavo Zacarias lshw-02.08.01b.ebuild: - Stable on sparc wrt #156269 - -*lshw-02.09b (27 Nov 2006) - - 27 Nov 2006; Mike Frysinger - +files/lshw-02.09b-cpuid-PIC.patch, +lshw-02.09b.ebuild: - Version bump #156268 by Daniel Webert. - - 25 Nov 2006; Bryan Østergaard lshw-02.06b.ebuild, - lshw-02.08.01b.ebuild: - Alpha + ~ia64 keywords. - -*lshw-02.08.01b (17 May 2006) - - 17 May 2006; Mike Frysinger - +files/lshw-02.08.01b-build.patch, +lshw-02.08.01b.ebuild: - Version bump #133540 by Daniel Webert. - - 27 Apr 2006; Daniel Gryniewicz lshw-02.06b.ebuild: - Marked stable on amd64 per bug #131184 - - 26 Apr 2006; Gustavo Zacarias lshw-02.06b.ebuild: - Stable on sparc wrt #131184 - - 25 Apr 2006; Tobias Scherbaum lshw-02.06b.ebuild: - ppc stable, bug #131184 - - 25 Apr 2006; Saleem Abdulrasool lshw-02.06b.ebuild: - stable on x86 (bug #131184) - -*lshw-02.07b (25 Apr 2006) - - 25 Apr 2006; Mike Frysinger +lshw-02.07b.ebuild: - Version bump #130973 by Daniel Webert. - - 08 Feb 2006; Aron Griffis lshw-02.05.01b.ebuild: - Mark 02.05.01b stable on alpha - - 25 Nov 2005; Luis Medinas lshw-02.05.01b.ebuild: - Stable on amd64. - - 11 Nov 2005; Michael Hanselmann lshw-02.05.01b.ebuild: - Stable on ppc. - - 08 Nov 2005; Gustavo Zacarias lshw-02.05.01b.ebuild: - Stable on sparc - -*lshw-02.06b (05 Nov 2005) - - 05 Nov 2005; Mike Frysinger - +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 lshw-02.05.01b.ebuild: - Stable on x86; bug #111499 - - 03 Sep 2005; Fernando J. Pereda lshw-02.05.01b.ebuild: - marked ~alpha, wrt bug #104130 - -*lshw-02.05.01b (22 Jul 2005) - - 22 Jul 2005; Mike Frysinger +lshw-02.05.01b.ebuild: - Version bump #99838 by Nunatak. - - 22 May 2005; Tobias Scherbaum lshw-02.03b.ebuild: - Stable on ppc. - - 02 May 2005; Jason Wever lshw-02.03b.ebuild: - Stable on SPARC. - -*lshw-02.04b (28 Apr 2005) - - 28 Apr 2005; Mike Frysinger +lshw-02.04b.ebuild: - Version bump #90727 by Daniel Webert. - -*lshw-02.03b (05 Feb 2005) - - 05 Feb 2005; MATSUU Takuto +lshw-02.03b.ebuild: - Version bumped. - - 03 Feb 2005; -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 +lshw-02.02b.ebuild: - Version bumped. - - 03 Jan 2005; Mike Frysinger - +files/02.00b-cpuid-PIC.patch, lshw-02.00b.ebuild: - Add patch to enable PIC building #61947. - - 21 Dec 2004; Mike Frysinger +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 -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 +lshw-01.08a.ebuild: - Version bumped. - -*lshw-01.07a (13 May 2004) - - 13 May 2004; -lshw-01.00.ebuild, +lshw-01.07a.ebuild: - Version bumped. - - 12 May 2004; Alexander Gabert lshw-01.06a.ebuild: - removed hardened-gcc logic - - 25 Apr 2004; -lshw-01.05a.ebuild, lshw-01.06a.ebuild: - Marked as stable. - -*lshw-01.06a (29 Feb 2004) - - 29 Feb 2004; lshw-01.06a.ebuild: - Version bumped. - -*lshw-01.05a (05 Nov 2003) - - 05 Nov 2003; Martin Holzer lshw-01.05a.ebuild: - Version bumped. - -*lshw-01.04 (04 Oct 2003) - - 04 Oct 2003; MATSUU Takuto lshw-01.04.ebuild: - version bump. - - 21 Sep 2003; 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 lshw-01.03.ebuild: - version bump. - -*lshw-01.02 (06 Aug 2003) - - 06 Aug 2003; Martin Holzer lshw-01.02.ebuild: - Version bumped. closes #25925. - -*lshw-01.00 (15 Apr 2003) - - 15 Apr 2003; Martin Holzer Manifest, lshw-01.00.ebuild: - Adding initial ebuild submitted by Marc Hildebrand - in #19200. diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/Manifest index 9a817cd4eb..b89584ac9b 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/Manifest @@ -1,14 +1 @@ -AUX lshw-02.15b-build.patch 3303 SHA256 3e445965e06e2c658f2bb7e822a2e5dcf082c3965fefd4e1ee285aa781581a01 SHA512 667ec1020c967a134708e3191ff97d2c57a5f93c54df6e5ccc332ce230242bd661269c93fbd63c55b25f6aafc5f14e52b805b0101f4394b0629b9aa70e9ef2dc WHIRLPOOL 4165d6f02760f3d85c7bcd01da9d4828d90f1e305d48fb3e87e5574b3c01db8504d2be1dcb595d86aa034189c1031070149647abe6e0fb84cf636a2c489cdf38 -AUX lshw-02.16b-gentoo.patch 4972 SHA256 101e0bdc47a3deb489317454c66d2f3bfc5cf502f54e426c18a25b8c9fdf4203 SHA512 723a67b91972d3192a422fbead27fc6c3c7020bc0d0afb0d88792659e345f3379be423517f649eda7555d20bc26583ce8298ba101eba63ba6669e7bf213c8aef WHIRLPOOL 1f7c2ce9aa8644554573767048be837a1aa32c194eb702a7c72846bdc56269cef9ccd59196d3ebd39580a8dccd99c3e13fb1053e0a04f1533468ca3999c42e06 -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 -AUX lshw-02.17b-musl.patch 4917 SHA256 b7c81aab812808da83838d0cea643d7c1a296e70084bf4348b4f3319d49538d1 SHA512 d3293e2fd651d2d906f9c71f5d5f9cc09ff3dd0cc0903fdb02c8661d8311ae2af77d918da97a71cc38c8b8f8be6e0241950a24810bbb127edde897393429463a WHIRLPOOL bfb9a21a704d6b577ddd23a7ab1e522e660797d908b8ae2c855132c9b2c4b414f5c2a06e9d61c43efd6793f3150a4b2c4a1c28400103f020cb440d0089b8ea6f -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.16b-r2.ebuild 1575 SHA256 4855e050fc6f302666f1b562c172a2292acf383a55b66ffcb1cf8cca6c369046 SHA512 760322fc1c2067a664515bf932171cdc89bbb24efd0ab3bb0844d9e0234e8ad8e514cc6da656ec236fd96fb206e960caa4a3c1024fd918f3900bbce95cb1c7fa WHIRLPOOL f0d123b00ffa770f9810d86734c84115dcdd376bf1c71f108b8f907f86cfeda6d4531152124cbfa08937e5dccde656c35ad0cf7f892a2fa074e027ba271ae69b -EBUILD lshw-02.17b-r1.ebuild 1625 SHA256 3a18dab4d9e88870767db34bf8f485f9054915d63fec4bb84bd8a1ee4e71b66d SHA512 e9fa21e7c71a7a005224a9f61100a060a882d5f2e8f9a52c330882b697c30f1322bfd1c527bc8fe3e2dc82dc73c64171a7a9a638a5a412615a3fda6e3ab8c8d8 WHIRLPOOL e26fd87346a49192491d85641a0458e8aa19188f013f57c11b8cf0d281276a61f2859b3cfe8fc6a345b9820075bf81187cd54ff494347edeb413bebb991156ad -EBUILD lshw-02.17b-r2.ebuild 1457 SHA256 766bd03006313739df45298a98a1b6b3e42148830ea9bde157ef5a2f3b8a26a2 SHA512 ccb07156cc0c870342b30e4f4c10cddcf01e31f19299e9ad14a43c1dee93baef1968534fff11789493451f5db0ac5417ad345545714cccbf63f559e750940db2 WHIRLPOOL a0a143878e2f65bc1d7cbc871322e6ac3c2efca1ce3e1d42d4c8434d70a09198154a07dcb199e06a0475fa0025bdf1a01053705e8ded222c08fc7872c065dcdf -EBUILD lshw-02.17b.ebuild 1588 SHA256 89eac565f7038a1297078f97cc9be5a3e6ccd6b3bb474fcd27a5d311169cad6d SHA512 715aa03c5d5aa9c725b49739dd57f9b902b09243811a233c6a4b7a2a4dce73a0baba65b211e7215177d396e342057f05c74f6aee9d4925f2c3d9686a38953b6b WHIRLPOOL b105084631e757d9d69f20dfaf68de295ce382183d89cb1584cf2c0e244025b2865906895d4234865ecf1b18eb3671e67407ae54af657c1c77718d3ae0eeef3b -MISC ChangeLog 3814 SHA256 0d1b50caaf76df36646baf5439f54572d6da1e16fd63d42aaf29aa7d91e01cb5 SHA512 c2c3507d1ca0e12cfc07c3a0dffd8865e264fefeed0ba2390e5be9c3df1874a782b546a5540be5fda081228931553c0c4da7bef8fc0cbe31ded9e721651bf6fe WHIRLPOOL 8efbb8e044d7171f32946bba36b8cbe376559ae1f5f748f351a322be268d64e8343152653a35b6989e2885766a05522d3cdfbf2b4ea46b7c47386197e6631a46 -MISC ChangeLog-2015 14670 SHA256 2ef10eddb9a1be131708ee0af8db0abf5d06d3179fe8f9887355a04499050f43 SHA512 5cc4886c2865cb99c5e90d60de96b861cf031fc4a0821c5c75f6b27ee098e980624e5ba78e12224b9ddf5dc54e33ae78939480d00327d0abdc59a994a28d045f WHIRLPOOL b0eab89bee9d39e40a7a8f22f3aa80347a1c9f138c2b3ddcf6fde670d020e9b9c4a65d9115385e0e89435307b0d07e9f14924f0cdcc9fca9b8d4e15d69f354c4 -MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 +DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.15b-build.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.15b-build.patch deleted file mode 100644 index af2b3893ae..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 > $@ diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.16b-gentoo.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.16b-gentoo.patch deleted file mode 100644 index dfd2c89837..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 - --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 - - #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 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-fat.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-fat.patch deleted file mode 100644 index 08654fd5af..0000000000 --- a/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-gentoo.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-gentoo.patch deleted file mode 100644 index 1d3d431ec8..0000000000 --- a/sdk_container/src/third_party/portage-stable/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 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 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-musl.patch b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-musl.patch deleted file mode 100644 index 3fb3cef087..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/files/lshw-02.17b-musl.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- a/src/core/osutils.cc 2016-02-04 23:47:31.071246925 +0000 -+++ b/src/core/osutils.cc 2016-02-04 23:54:17.125253018 +0000 -@@ -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 +0000 -+++ b/src/core/device-tree.cc 2016-02-05 00:38:50.523293133 +0000 -@@ -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 +0000 -+++ b/src/core/pci.cc 2016-02-05 06:02:20.471584381 +0000 -@@ -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 +0000 -+++ b/src/core/network.cc 2016-02-05 02:21:27.940385526 +0000 -@@ -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 +0000 -+++ b/src/core/cpufreq.cc 2016-02-05 02:26:03.283389657 +0000 -@@ -14,6 +14,7 @@ - #include - #include - #include -+#include - #include - #include - #include ---- a/src/core/abi.cc 2016-02-05 06:13:46.072594669 +0000 -+++ b/src/core/abi.cc 2016-02-05 06:14:19.320595168 +0000 -@@ -11,6 +11,7 @@ - #include - #include - #include -+#include - - __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - -@@ -19,7 +20,7 @@ - bool scan_abi(hwNode & system) - { - // are we compiled as 32- or 64-bit process ? -- system.setWidth(sysconf(_SC_LONG_BIT)); -+ system.setWidth(sysconf(LONG_BIT)); - - pushd(PROC_SYS); - diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.16b-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.16b-r2.ebuild deleted file mode 100644 index 47239b8699..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.16b-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r1.ebuild deleted file mode 100644 index 9313b159cf..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r1.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r2.ebuild deleted file mode 100644 index 1318e27930..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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="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 \ - "${FILESDIR}"/${P}-musl.patch - - l10n_find_plocales_changes "src/po" "" ".po" || die - sed -i \ - -e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \ - src/po/Makefile || die -} - -src_compile() { - tc-export CC CXX AR - use static && append-ldflags -static - - emake SQLITE=$(usex sqlite 1 0) all $(usex gtk 'gui' '') -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '') - dodoc README docs/* - if use gtk ; then - make_desktop_entry /usr/sbin/gtk-lshw "Hardware Lister" "/usr/share/lshw/artwork/logo.svg" - fi -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b.ebuild deleted file mode 100644 index 6c37364640..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.17b.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild new file mode 100644 index 0000000000..1d03cec797 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/lshw-02.19.2b_p20210121.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/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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/metadata.xml index 56c1244130..f3841042bf 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/lshw/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/sys-apps/lshw/metadata.xml @@ -1,8 +1,13 @@ - + - - base-system@gentoo.org - Gentoo Base System + + bkohler@gentoo.org + Ben Kohler + + https://ezix.org/src/pkg/lshw/wiki + https://ezix.org/project/newticket?component=lshw + https://www.ezix.org/project/wiki/HardwareLiSter#Changes +