Gentoo Archives: gentoo-commits

From: Ben Kohler <bkohler@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/lshw/
Date: Sat, 19 Feb 2022 13:15:10
Message-Id: 1645276457.8b9c7a9137a271b3fe73d34c08a21fb768bfa297.bkohler@gentoo
1 commit: 8b9c7a9137a271b3fe73d34c08a21fb768bfa297
2 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 19 13:12:29 2022 +0000
4 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 19 13:14:17 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9c7a91
7
8 sys-apps/lshw: drop old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
12
13 sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild | 81 ------------------------
14 sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild | 83 -------------------------
15 2 files changed, 164 deletions(-)
16
17 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
18 deleted file mode 100644
19 index 3f20bc27da1c..000000000000
20 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r1.ebuild
21 +++ /dev/null
22 @@ -1,81 +0,0 @@
23 -# Copyright 1999-2021 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=7
27 -
28 -PLOCALES='fr'
29 -
30 -inherit desktop flag-o-matic plocale toolchain-funcs xdg
31 -
32 -MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
33 -MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
34 -
35 -DESCRIPTION="Hardware Lister"
36 -HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
37 -SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
38 -
39 -LICENSE="GPL-2"
40 -SLOT="0"
41 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
42 -IUSE="gtk sqlite static"
43 -
44 -REQUIRED_USE="static? ( !gtk !sqlite )"
45 -
46 -DEPEND="${RDEPEND}"
47 -RDEPEND="sys-apps/hwdata
48 - gtk? ( x11-libs/gtk+:3 )
49 - sqlite? ( dev-db/sqlite:3 )"
50 -BDEPEND="gtk? ( virtual/pkgconfig )
51 - sqlite? ( virtual/pkgconfig )"
52 -
53 -S=${WORKDIR}/${PN}
54 -
55 -DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
56 -
57 -src_prepare() {
58 - default
59 -
60 - plocale_find_changes "src/po" "" ".po" || die
61 - sed -i \
62 - -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
63 - src/po/Makefile || die
64 - sed -i \
65 - -e 's:\<pkg-config\>:${PKG_CONFIG}:' \
66 - -e 's:+\?make -C:${MAKE} -C:' \
67 - -e '/^CXXFLAGS/s:=-g: +=:' \
68 - -e '/^CXXFLAGS/s:-g ::' \
69 - -e '/^LDFLAGS/s: -g::' \
70 - -e '/^all:/s: $(DATAFILES)::' \
71 - -e '/^install:/s: all::' \
72 - src/Makefile src/gui/Makefile || die
73 - sed -i \
74 - -e '/^CXXFLAGS/s:\?=-g: +=:' \
75 - -e '/^LDFLAGS=/d' \
76 - src/core/Makefile || die
77 - sed -i \
78 - -e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
79 - src/core/pci.cc || die
80 - sed -i \
81 - -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
82 - src/core/usb.cc || die
83 -}
84 -
85 -src_compile() {
86 - tc-export CC CXX AR PKG_CONFIG
87 - use static && append-ldflags -static
88 -
89 - # Need two sep make statements to avoid parallel build issues. #588174
90 - local sqlite=$(usex sqlite 1 0)
91 - emake VERSION=${MY_PV} SQLITE=${sqlite} all
92 - use gtk && emake SQLITE=${sqlite} gui
93 -}
94 -
95 -src_install() {
96 - emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
97 - if use gtk ; then
98 - newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
99 - make_desktop_entry \
100 - "${EPREFIX}"/usr/sbin/gtk-lshw \
101 - "${DESCRIPTION}"
102 - fi
103 -}
104
105 diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
106 deleted file mode 100644
107 index e9c09debf85b..000000000000
108 --- a/sys-apps/lshw/lshw-02.19.2b_p20210121-r2.ebuild
109 +++ /dev/null
110 @@ -1,83 +0,0 @@
111 -# Copyright 1999-2022 Gentoo Authors
112 -# Distributed under the terms of the GNU General Public License v2
113 -
114 -EAPI=7
115 -
116 -PLOCALES='fr'
117 -
118 -inherit desktop flag-o-matic plocale toolchain-funcs xdg
119 -
120 -MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
121 -MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
122 -
123 -DESCRIPTION="Hardware Lister"
124 -HOMEPAGE="https://www.ezix.org/project/wiki/HardwareLiSter"
125 -SRC_URI="https://ezix.org/src/pkg/lshw/archive/${MY_COMMIT}.tar.gz -> ${P}-${MY_PV}.tar.gz"
126 -
127 -LICENSE="GPL-2"
128 -SLOT="0"
129 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
130 -IUSE="gtk sqlite static"
131 -
132 -REQUIRED_USE="static? ( !gtk !sqlite )"
133 -
134 -DEPEND="${RDEPEND}"
135 -RDEPEND="sys-apps/hwdata
136 - gtk? ( x11-libs/gtk+:3 )
137 - sqlite? ( dev-db/sqlite:3 )"
138 -BDEPEND="gtk? ( virtual/pkgconfig )
139 - sqlite? ( virtual/pkgconfig )"
140 -
141 -S=${WORKDIR}/${PN}
142 -
143 -DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.txt} )
144 -
145 -PATCHES=( "${FILESDIR}"/lshw-02.19.2b-respect-LDFLAGS.patch )
146 -
147 -src_prepare() {
148 - default
149 -
150 - plocale_find_changes "src/po" "" ".po" || die
151 - sed -i \
152 - -e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
153 - src/po/Makefile || die
154 - sed -i \
155 - -e 's:\<pkg-config\>:${PKG_CONFIG}:' \
156 - -e 's:+\?make -C:${MAKE} -C:' \
157 - -e '/^CXXFLAGS/s:=-g: +=:' \
158 - -e '/^CXXFLAGS/s:-g ::' \
159 - -e '/^LDFLAGS/s: -g::' \
160 - -e '/^all:/s: $(DATAFILES)::' \
161 - -e '/^install:/s: all::' \
162 - src/Makefile src/gui/Makefile || die
163 - sed -i \
164 - -e '/^CXXFLAGS/s:\?=-g: +=:' \
165 - -e '/^LDFLAGS=/d' \
166 - src/core/Makefile || die
167 - sed -i \
168 - -e '/^#define PCIID_PATH/s:DATADIR"\/pci.ids.*:"/usr/share/hwdata/pci.ids":' \
169 - src/core/pci.cc || die
170 - sed -i \
171 - -e '/^#define USBID_PATH/s:DATADIR"\/usb.ids.*:"/usr/share/hwdata/usb.ids":' \
172 - src/core/usb.cc || die
173 -}
174 -
175 -src_compile() {
176 - tc-export CC CXX AR PKG_CONFIG
177 - use static && append-ldflags -static
178 -
179 - # Need two sep make statements to avoid parallel build issues. #588174
180 - local sqlite=$(usex sqlite 1 0)
181 - emake VERSION=${MY_PV} SQLITE=${sqlite} all
182 - use gtk && emake SQLITE=${sqlite} gui
183 -}
184 -
185 -src_install() {
186 - emake VERSION=${MY_PV} DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install $(usex gtk 'install-gui' '')
187 - if use gtk ; then
188 - newicon -s scalable src/gui/artwork/logo.svg gtk-lshw.svg
189 - make_desktop_entry \
190 - "${EPREFIX}"/usr/sbin/gtk-lshw \
191 - "${DESCRIPTION}"
192 - fi
193 -}