From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DCA7E138262 for ; Sun, 22 May 2016 16:02:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C1F7214215; Sun, 22 May 2016 16:02:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 387B9141F7 for ; Sun, 22 May 2016 16:02:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D83F1340BDE for ; Sun, 22 May 2016 16:02:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7414E968 for ; Sun, 22 May 2016 16:02:18 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1463932934.130a058a6fbd2908ecb9deef8f271abf5ad641fd.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pciutils/, sys-apps/pciutils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pciutils/Manifest sys-apps/pciutils/files/pciutils-3.5.0-expose-pci_init_v30.patch sys-apps/pciutils/pciutils-3.5.0-r1.ebuild X-VCS-Directories: sys-apps/pciutils/files/ sys-apps/pciutils/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 130a058a6fbd2908ecb9deef8f271abf5ad641fd X-VCS-Branch: master Date: Sun, 22 May 2016 16:02:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7cbf7e9a-fd57-45ff-873b-1c526ddd2a4e X-Archives-Hash: f9507f1afdcaff010bb2a6fa371280a1 commit: 130a058a6fbd2908ecb9deef8f271abf5ad641fd Author: Lars Wendler gentoo org> AuthorDate: Sun May 22 16:01:53 2016 +0000 Commit: Lars Wendler gentoo 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 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 -}