Gentoo Archives: gentoo-commits

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