* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/, sys-apps/pciutils/files/
@ 2016-05-22 16:02 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-05-22 16:02 UTC (permalink / raw
To: gentoo-commits
commit: 130a058a6fbd2908ecb9deef8f271abf5ad641fd
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 16:01:53 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun May 22 16:02:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130a058a
sys-apps/pciutils: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/pciutils/Manifest | 1 -
.../files/pciutils-3.5.0-expose-pci_init_v30.patch | 21 ----
sys-apps/pciutils/pciutils-3.5.0-r1.ebuild | 113 ---------------------
3 files changed, 135 deletions(-)
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index b1cf9a7..298bab8 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,4 +1,3 @@
DIST pciutils-3.3.1.tar.gz 393912 SHA256 02beeb14503707c5a3293fe084c18e12e6937c0d4dd1e29e6bcb6b12f124df46 SHA512 4f8b0e62cfd0ffad1674be13c95f5581bc0037ed9843f9866b13eea6fa2703bb39bb878e96df805972f4e9bac36fc67a0a313c463f0764218211f1276cef36b2 WHIRLPOOL 315f1f4f5b98e6e90e3a6af9a8a03acf9732eb5b6de02ced53b32bdaca67360153ee4db1551729e3534d25c81ce2308d89c0715e0554552d029cbb3f18786ff6
DIST pciutils-3.4.1.tar.gz 404166 SHA256 0196624282c33a9bcd4bd097d4100271c82af47797ecd7488ef2711fa5f043b2 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49 WHIRLPOOL 4391c84695dc1f0844129ff5d6056ac1332d855824e1b96ec105073b97d453db21e82d2a071f1bf7d977e26cf51421183b5a37d5a962bccbed9c2667c813cc4c
-DIST pciutils-3.5.0.tar.gz 412990 SHA256 a550931bca47996a7c62449e4daf77c9ac1df12afb3fdd8a77383cab2e8ad580 SHA512 d841da9bf7d7d67d60257c7d42d7ff5e38bc232098b185657a171561b42d08abd4c0a22fbed19e857db08a39ac9fc929dd35e1187e6da02cc8a45a0481051288 WHIRLPOOL 33c47f4175b18544323bc03833357230abcdbf2fa18e66fdd67efbb81b86b482aa4fa04908ca255c26056be8812b4bd804a9dfb0c65725d6bb8bea9ed7811c02
DIST pciutils-3.5.1.tar.gz 413052 SHA256 9e642d842d69e2780f7c11f405099c9f6748a3917a4210d5f0c18eb9b58822a6 SHA512 a324e96556db23011cf86a3ef082851a608c1ef6dd3841cd3231c2e9ef20085cadc22fc6517fc86595610a6d45fc9a05663ebd4d8702e6fbb9def91d2f5e5985 WHIRLPOOL 73e7c5efeabb95d705a19f20b8bc051c3edba8049fc6cd150876e1ee293aa7c8bdb72b4769a98aa9705d1b921fb42dabb052429e4e5912be5d595a14282781f5
diff --git a/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch b/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
deleted file mode 100644
index d5e9a5e..0000000
--- a/sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/init.c 2016-05-20 11:53:00.065874342 -0400
-+++ b/lib/init.c 2016-05-20 11:53:16.725850370 -0400
-@@ -214,6 +214,8 @@
- }
-
- STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a));
-+DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35);
-+SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0);
- SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5);
-
- void
---- a/lib/internal.h 2016-05-14 05:58:01.000000000 -0400
-+++ b/lib/internal.h 2016-05-20 12:04:02.144993094 -0400
-@@ -61,6 +61,7 @@
- void pci_mfree(void *);
- char *pci_strdup(struct pci_access *a, const char *s);
-
-+void pci_init_v30(struct pci_access *a) VERSIONED_ABI;
- void pci_init_v35(struct pci_access *a) VERSIONED_ABI;
-
- /* access.c */
diff --git a/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
deleted file mode 100644
index 334ecdb..0000000
--- a/sys-apps/pciutils/pciutils-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r14
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${DEPEND}
- kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch \
- "${FILESDIR}"/${PN}-3.5.0-expose-pci_init_v30.patch
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- append-lfs-flags #471102
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/misc' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}/static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
- "${ED}"/usr/share/man/man8/update-pciids.8*
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
- elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
- elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
- fi
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/, sys-apps/pciutils/files/
@ 2022-06-21 9:41 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2022-06-21 9:41 UTC (permalink / raw
To: gentoo-commits
commit: 5d34758ac0987fdaa7130983e8021f443162fe23
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 09:40:43 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 09:40:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d34758a
sys-apps/pciutils: drop 3.7.0-r2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/pciutils/Manifest | 1 -
.../pciutils/files/pciutils-3.1.9-static-pc.patch | 13 ---
sys-apps/pciutils/pciutils-3.7.0-r2.ebuild | 112 ---------------------
3 files changed, 126 deletions(-)
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index d50cebb4e33e..79bcc5d9677d 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,2 +1 @@
-DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
diff --git a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch b/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
deleted file mode 100644
index 9e63b7ecd661..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.1.9-static-pc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-make sure all lib entries get into libs.private in the .pc file
-
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -61,7 +61,7 @@ $(PCILIBPC): libpci.pc.in
- -e 's,@LIBDIR@,$(LIBDIR),' \
- -e 's,@IDSDIR@,$(IDSDIR),' \
- -e 's,@VERSION@,$(VERSION),' \
-- -e 's,@LDLIBS@,$(LDLIBS),'
-+ -e 's,@LDLIBS@,$(LDLIBS) $(LIB_LDLIBS),'
-
- init.o: init.c $(INCL)
- access.o: access.c $(INCL)
diff --git a/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild b/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
deleted file mode 100644
index e456279c71ec..000000000000
--- a/sys-apps/pciutils/pciutils-3.7.0-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="
- zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )
-"
-DEPEND="
- kmod? ( sys-apps/kmod )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )
-"
-RDEPEND="
- ${DEPEND}
- sys-apps/hwdata
-"
-BDEPEND="sys-apps/which
- kmod? ( virtual/pkgconfig )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-src_prepare() {
- default
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- append-lfs-flags #471102
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/hwdata' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}/static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
- rm -r "${ED}"/usr/share/hwdata || die
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/, sys-apps/pciutils/files/
@ 2023-12-28 4:23 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-12-28 4:23 UTC (permalink / raw
To: gentoo-commits
commit: 15eb777aaa7f3d2c9d0b99f371f757e372b75ea9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 04:17:59 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 04:17:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15eb777a
sys-apps/pciutils: drop 3.8.0-r1, 3.9.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/pciutils/Manifest | 2 -
.../pciutils/files/pciutils-3.8.0-no-which.patch | 34 ----
.../pciutils/files/pciutils-3.8.0-pkg-config.patch | 19 ---
sys-apps/pciutils/pciutils-3.8.0-r1.ebuild | 171 ---------------------
sys-apps/pciutils/pciutils-3.9.0.ebuild | 166 --------------------
5 files changed, 392 deletions(-)
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index c0806c45dfaf..bde6a201ae41 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,3 +1 @@
DIST pciutils-3.10.0.tar.gz 931711 BLAKE2B 2e1255eb5508c9d1339f5bc772c2592a03cae4d8d097e8939748c9bb5d5d949be53d705d1b7d903f7ea88b2abeea91e39de16e39d2f46f0a1f62f8a9e32c6faa SHA512 3da1af4af8b0fa3cf4d3f06095524e25dc292182beec10aa2c16c5c6ba751fe469d0e7f54e43413b6f3f5bcdbd1fba3c66df1d8e39d2e1962ae36a2d9c06238e
-DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
-DIST pciutils-3.9.0.tar.gz 908219 BLAKE2B 59d2a151b114691980b8f0a0bfdf8e48b9e1a0a9976df6dbc94962c251d8bfc61e7bd3b0f3c47a4295f52b5df67ad0e44ed6f2e6a87728e213e4ef0b8a55c028 SHA512 e17225c2adcc21c9ff4253998aec5805ae5e031888fa01841a1ff680796f7515f9dd6e5c2e0588edba854f66f1268ba8e28ae1a2f794574e715fec8a8c8def4f
diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch b/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch
deleted file mode 100644
index 3024d73555d3..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.8.0-no-which.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/pciutils/pciutils/pull/105
-
-From 91bf24dd3c91f826377548b7e164b49cfed56f9a Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 19 Jun 2022 23:52:22 +0100
-Subject: [PATCH 1/2] lib/configure: drop usage of which
-
-'which' is not required by POSIX and is an external command which may not be
-available, and 'command -v' does the job just fine.
-
-Debian and Gentoo at least are both making efforts to drop which from
-their base system package list.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/configure
-+++ b/lib/configure
-@@ -238,7 +238,7 @@ if [ "$sys" = linux ] ; then
- PKG_CONFIG=pkg-config
- fi
- if [ "$LIBKMOD" != no ] ; then
-- if ! which $PKG_CONFIG >/dev/null ; then
-+ if ! command -v $PKG_CONFIG >/dev/null ; then
- echo_n "($PKG_CONFIG not found) "
- elif $PKG_CONFIG libkmod ; then
- LIBKMOD_DETECTED=1
-@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then
- if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
- echo "$HWDB (set manually)"
- else
-- if `which pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
-+ if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
- HWDB=yes
- else
- HWDB=no
diff --git a/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch b/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch
deleted file mode 100644
index 4630609bad24..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.8.0-pkg-config.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/pciutils/pciutils/pull/105
-
-From a74832198ab36683a867c79b3d6ef2cac9baad55 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 19 Jun 2022 23:53:42 +0100
-Subject: [PATCH 2/2] lib/configure: respect $PKG_CONFIG completely
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/lib/configure
-+++ b/lib/configure
-@@ -268,7 +268,7 @@ if [ "$sys" = linux ] ; then
- if [ "$HWDB" = yes -o "$HWDB" = no ] ; then
- echo "$HWDB (set manually)"
- else
-- if `command -v pkg-config >/dev/null && pkg-config --atleast-version=196 libudev` ; then
-+ if `command -v $PKG_CONFIG >/dev/null && $PKG_CONFIG --atleast-version=196 libudev` ; then
- HWDB=yes
- else
- HWDB=no
diff --git a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild b/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
deleted file mode 100644
index f12dcda2ba1f..000000000000
--- a/sys-apps/pciutils/pciutils-3.8.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
-RDEPEND="${DEPEND}
- sys-apps/hwdata"
-# See bug #847133 re binutils check
-BDEPEND="|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
- kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.8.0-no-which.patch
- "${FILESDIR}"/${PN}-3.8.0-pkg-config.patch
-)
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-check_binutils_version() {
- if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
- # Okay, hopefully it's Binutils' bfd.
- # bug #847133
-
- # Convert this:
- # ```
- # GNU ld (Gentoo 2.38 p4) 2.38
- # Copyright (C) 2022 Free Software Foundation, Inc.
- # This program is free software; you may redistribute it under the terms of
- # the GNU General Public License version 3 or (at your option) a later version.
- # This program has absolutely no warranty.
- # ```
- #
- # into...
- # ```
- # 2.38
- # ```
- local ver=$($(tc-getLD) --version 2>&1 | head -1 | rev | cut -d' ' -f1 | rev)
-
- if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
- # Skip if unrecognised format so we don't pass something
- # odd into ver_cut.
- return
- fi
-
- ver_major=$(ver_cut 1 "${ver}")
- ver_minor=$(ver_cut 2 "${ver}")
-
- # We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
- # because we've had other miscompiles with older Binutils (not just build failures!)
- # and we don't want people running any unsupported versions of Binutils. An example
- # of this is where glibc is completely broken with old binutils: bug #802036. It's
- # just not sustainable to support.
- if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
- eerror "Old version of binutils activated! ${P} cannot be built with an old version."
- eerror "Please follow these steps:"
- eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
- eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
- eerror "2. Run: . /etc/profile"
- eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
- eerror "4. Complete your world upgrade if you were performing one."
- eerror "5. Perform a depclean (emerge -acv)"
- eerror "\tYou MUST depclean after every world upgrade in future!"
- die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
- fi
- fi
-}
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-src_prepare() {
- default
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # bug #640836, bug #852929
- filter-lto
-
- # bug #471102
- append-lfs-flags
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/hwdata' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
-
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}"/static \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
-
- use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
- rm -r "${ED}"/usr/share/hwdata || die
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
diff --git a/sys-apps/pciutils/pciutils-3.9.0.ebuild b/sys-apps/pciutils/pciutils-3.9.0.ebuild
deleted file mode 100644
index 3c3f56eeee65..000000000000
--- a/sys-apps/pciutils/pciutils-3.9.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
-RDEPEND="${DEPEND}
- sys-apps/hwdata"
-# See bug #847133 re binutils check
-BDEPEND="|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
- kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-check_binutils_version() {
- if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
- # Okay, hopefully it's Binutils' bfd.
- # bug #847133
-
- # Convert this:
- # ```
- # GNU ld (Gentoo 2.38 p4) 2.38
- # Copyright (C) 2022 Free Software Foundation, Inc.
- # This program is free software; you may redistribute it under the terms of
- # the GNU General Public License version 3 or (at your option) a later version.
- # This program has absolutely no warranty.
- # ```
- #
- # into...
- # ```
- # 2.38
- # ```
- local ver=$($(tc-getLD) --version 2>&1 | head -n 1 | rev | cut -d' ' -f1 | rev)
-
- if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
- # Skip if unrecognised format so we don't pass something
- # odd into ver_cut.
- return
- fi
-
- ver_major=$(ver_cut 1 "${ver}")
- ver_minor=$(ver_cut 2 "${ver}")
-
- # We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
- # because we've had other miscompiles with older Binutils (not just build failures!)
- # and we don't want people running any unsupported versions of Binutils. An example
- # of this is where glibc is completely broken with old binutils: bug #802036. It's
- # just not sustainable to support.
- if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
- eerror "Old version of binutils activated! ${P} cannot be built with an old version."
- eerror "Please follow these steps:"
- eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
- eerror " (If no such version is installed, run emerge -v1 sys-devel/binutils)"
- eerror "2. Run: . /etc/profile"
- eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
- eerror "4. Complete your world upgrade if you were performing one."
- eerror "5. Perform a depclean (emerge -acv)"
- eerror "\tYou MUST depclean after every world upgrade in future!"
- die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
- fi
- fi
-}
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-src_prepare() {
- default
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # bug #640836, bug #852929
- filter-lto
-
- # bug #471102
- append-lfs-flags
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/hwdata' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
-
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}"/static \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
-
- use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
- rm -r "${ED}"/usr/share/hwdata || die
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-28 4:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28 4:23 [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/, sys-apps/pciutils/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-06-21 9:41 David Seifert
2016-05-22 16:02 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox