Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/
Date: Sun, 31 May 2020 09:13:48
Message-Id: 1590916419.e461aa752395206e5df0bbb1d11538b0a660a393.polynomial-c@gentoo
1 commit: e461aa752395206e5df0bbb1d11538b0a660a393
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 31 09:13:24 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun May 31 09:13:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e461aa75
7
8 sys-apps/pciutils: Removed old
9
10 Package-Manager: Portage-2.3.100, Repoman-2.3.22
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/pciutils/Manifest | 2 -
14 sys-apps/pciutils/pciutils-3.6.2-r1.ebuild | 120 -----------------------------
15 sys-apps/pciutils/pciutils-3.6.3.ebuild | 120 -----------------------------
16 3 files changed, 242 deletions(-)
17
18 diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
19 index 1df127df67d..568417d5e94 100644
20 --- a/sys-apps/pciutils/Manifest
21 +++ b/sys-apps/pciutils/Manifest
22 @@ -1,5 +1,3 @@
23 DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
24 -DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
25 -DIST pciutils-3.6.3.tar.gz 495316 BLAKE2B 01dab2337dcde5dc436df6892ce7c54c9c875b7c619c8f8675027e82e1073ab9b4c603f61f9b03c27af90fecb60fd35199fdf0b62dc90b5d2d387bfde00408b3 SHA512 deaf265bae9149289c860eb47cf6b85ff300744a1e79bcd232819f56e6dcdddcda4e7d3639869c228a492237985298866eb2633938b00d880545594e3c02df05
26 DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
27 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
28
29 diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
30 deleted file mode 100644
31 index bab8c6b3195..00000000000
32 --- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
33 +++ /dev/null
34 @@ -1,120 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -inherit eapi7-ver multilib toolchain-funcs multilib-minimal flag-o-matic
41 -
42 -DESCRIPTION="Various utilities dealing with the PCI bus"
43 -HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
44 -SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
45 -
46 -LICENSE="GPL-2"
47 -SLOT="0"
48 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
49 -IUSE="dns +kmod static-libs +udev zlib"
50 -
51 -# Have the sub-libs in RDEPEND with [static-libs] since, logically,
52 -# our libpci.a depends on libz.a/etc... at runtime.
53 -LIB_DEPEND="
54 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
55 - udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
56 -"
57 -DEPEND="
58 - kmod? ( sys-apps/kmod )
59 - static-libs? ( ${LIB_DEPEND} )
60 - !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
61 -"
62 -RDEPEND="
63 - ${DEPEND}
64 - sys-apps/hwids
65 -"
66 -DEPEND="
67 - ${DEPEND}
68 - kmod? ( virtual/pkgconfig )
69 -"
70 -
71 -PATCHES=(
72 - "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
73 -)
74 -
75 -MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
76 -
77 -switch_config() {
78 - [[ $# -ne 2 ]] && return 1
79 - local opt=$1 val=$2
80 -
81 - sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
82 - return 0
83 -}
84 -
85 -src_prepare() {
86 - default
87 -
88 - if use static-libs ; then
89 - cp -pPR "${S}" "${S}.static" || die
90 - mv "${S}.static" "${S}/static" || die
91 - fi
92 -
93 - multilib_copy_sources
94 -}
95 -
96 -multilib_src_configure() {
97 - append-lfs-flags #471102
98 -}
99 -
100 -pemake() {
101 - emake \
102 - HOST="${CHOST}" \
103 - CROSS_COMPILE="${CHOST}-" \
104 - CC="$(tc-getCC)" \
105 - AR="$(tc-getAR)" \
106 - PKG_CONFIG="$(tc-getPKG_CONFIG)" \
107 - RANLIB="$(tc-getRANLIB)" \
108 - DNS=$(usex dns) \
109 - IDSDIR='$(SHAREDIR)/misc' \
110 - MANDIR='$(SHAREDIR)/man' \
111 - PREFIX="${EPREFIX}/usr" \
112 - SHARED="yes" \
113 - STRIP="" \
114 - ZLIB=$(usex zlib) \
115 - PCI_COMPRESSED_IDS=0 \
116 - PCI_IDS=pci.ids \
117 - LIBDIR="\${PREFIX}/$(get_libdir)" \
118 - LIBKMOD=$(multilib_native_usex kmod) \
119 - HWDB=$(usex udev) \
120 - "$@"
121 -}
122 -
123 -multilib_src_compile() {
124 - pemake OPT="${CFLAGS}" all
125 - if use static-libs ; then
126 - pemake \
127 - -C "${BUILD_DIR}/static" \
128 - OPT="${CFLAGS}" \
129 - SHARED="no" \
130 - lib/libpci.a
131 - fi
132 -}
133 -
134 -multilib_src_install() {
135 - pemake DESTDIR="${D}" install install-lib
136 - use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
137 -}
138 -
139 -multilib_src_install_all() {
140 - dodoc ChangeLog README TODO
141 -
142 - rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
143 - "${ED}"/usr/share/man/man8/update-pciids.8*
144 -
145 - newinitd "${FILESDIR}"/init.d-pciparm pciparm
146 - newconfd "${FILESDIR}"/conf.d-pciparm pciparm
147 -}
148 -
149 -pkg_postinst() {
150 - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
151 - elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
152 - elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
153 - fi
154 -}
155
156 diff --git a/sys-apps/pciutils/pciutils-3.6.3.ebuild b/sys-apps/pciutils/pciutils-3.6.3.ebuild
157 deleted file mode 100644
158 index cc2e5824111..00000000000
159 --- a/sys-apps/pciutils/pciutils-3.6.3.ebuild
160 +++ /dev/null
161 @@ -1,120 +0,0 @@
162 -# Copyright 1999-2020 Gentoo Authors
163 -# Distributed under the terms of the GNU General Public License v2
164 -
165 -EAPI=7
166 -
167 -inherit multilib toolchain-funcs multilib-minimal flag-o-matic
168 -
169 -DESCRIPTION="Various utilities dealing with the PCI bus"
170 -HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
171 -SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
172 -
173 -LICENSE="GPL-2"
174 -SLOT="0"
175 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
176 -IUSE="dns +kmod static-libs +udev zlib"
177 -
178 -# Have the sub-libs in RDEPEND with [static-libs] since, logically,
179 -# our libpci.a depends on libz.a/etc... at runtime.
180 -LIB_DEPEND="
181 - zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
182 - udev? ( >=virtual/libudev-208[static-libs(-),${MULTILIB_USEDEP}] )
183 -"
184 -DEPEND="
185 - kmod? ( sys-apps/kmod )
186 - static-libs? ( ${LIB_DEPEND} )
187 - !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
188 -"
189 -RDEPEND="
190 - ${DEPEND}
191 - sys-apps/hwids
192 -"
193 -DEPEND="
194 - ${DEPEND}
195 - kmod? ( virtual/pkgconfig )
196 -"
197 -
198 -PATCHES=(
199 - "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
200 -)
201 -
202 -MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
203 -
204 -switch_config() {
205 - [[ $# -ne 2 ]] && return 1
206 - local opt=$1 val=$2
207 -
208 - sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
209 - return 0
210 -}
211 -
212 -src_prepare() {
213 - default
214 -
215 - if use static-libs ; then
216 - cp -pPR "${S}" "${S}.static" || die
217 - mv "${S}.static" "${S}/static" || die
218 - fi
219 -
220 - multilib_copy_sources
221 -}
222 -
223 -multilib_src_configure() {
224 - append-lfs-flags #471102
225 -}
226 -
227 -pemake() {
228 - emake \
229 - HOST="${CHOST}" \
230 - CROSS_COMPILE="${CHOST}-" \
231 - CC="$(tc-getCC)" \
232 - AR="$(tc-getAR)" \
233 - PKG_CONFIG="$(tc-getPKG_CONFIG)" \
234 - RANLIB="$(tc-getRANLIB)" \
235 - DNS=$(usex dns) \
236 - IDSDIR='$(SHAREDIR)/misc' \
237 - MANDIR='$(SHAREDIR)/man' \
238 - PREFIX="${EPREFIX}/usr" \
239 - SHARED="yes" \
240 - STRIP="" \
241 - ZLIB=$(usex zlib) \
242 - PCI_COMPRESSED_IDS=0 \
243 - PCI_IDS=pci.ids \
244 - LIBDIR="\${PREFIX}/$(get_libdir)" \
245 - LIBKMOD=$(multilib_native_usex kmod) \
246 - HWDB=$(usex udev) \
247 - "$@"
248 -}
249 -
250 -multilib_src_compile() {
251 - pemake OPT="${CFLAGS}" all
252 - if use static-libs ; then
253 - pemake \
254 - -C "${BUILD_DIR}/static" \
255 - OPT="${CFLAGS}" \
256 - SHARED="no" \
257 - lib/libpci.a
258 - fi
259 -}
260 -
261 -multilib_src_install() {
262 - pemake DESTDIR="${D}" install install-lib
263 - use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
264 -}
265 -
266 -multilib_src_install_all() {
267 - dodoc ChangeLog README TODO
268 -
269 - rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
270 - "${ED}"/usr/share/man/man8/update-pciids.8*
271 -
272 - newinitd "${FILESDIR}"/init.d-pciparm pciparm
273 - newconfd "${FILESDIR}"/conf.d-pciparm pciparm
274 -}
275 -
276 -pkg_postinst() {
277 - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 3.2.0 ; then
278 - elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
279 - elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
280 - fi
281 -}