commit:     55530c398c9017373514da6defb32e68dc67a645
Author:     layman <layman <AT> localhost>
AuthorDate: Sun Mar 13 23:33:14 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=55530c39

sys-apps/pciutils: in tree version 3.3.1 works

 sys-apps/pciutils/Manifest                         |  7 --
 sys-apps/pciutils/files/conf.d-pciparm             | 28 -------
 sys-apps/pciutils/files/init.d-pciparm             | 80 --------------------
 .../pciutils/files/pciutils-3.1.9-static-pc.patch  | 13 ----
 sys-apps/pciutils/files/pciutils-3.2.0-io.patch    | 14 ----
 sys-apps/pciutils/metadata.xml                     | 13 ----
 sys-apps/pciutils/pciutils-3.2.0.ebuild            | 85 ----------------------
 7 files changed, 240 deletions(-)

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
deleted file mode 100644
index b27dce1..0000000
--- a/sys-apps/pciutils/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX conf.d-pciparm 988 SHA256 
ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887 SHA512 
7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4
 WHIRLPOOL 
b5954d8897687a0c6d267c9f60feadb692ce637bf294f5b2f8b7eca479cf454ac541a4bfe904d43ff59e5a77a808c1cecd63aa1011817ba61152d7a4664c86ad
-AUX init.d-pciparm 1871 SHA256 
30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5 SHA512 
231b7b96a751332a5a2395902e2a8024ae687f1e25b881d07bdcfba08acd1b6b6254e8fa694a7e01d851aa28c4ec6ff3d9c5ac64f8c1a471cc1f8f9a325881bd
 WHIRLPOOL 
1fad1cc4fdb031f7f24d9ec47439b6c6f83f22e85b6081eca283ab8cc501f7af9bbf91f8a0118ca10f45490ffab26c4ff4650f1fc1ab418afaf2cf44a0aa9f00
-AUX pciutils-3.1.9-static-pc.patch 373 SHA256 
81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe SHA512 
e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49
 WHIRLPOOL 
9d5bf04b08a76bb786524e8fdc4de412154340f17dcccf48ebcb7504a6b5feb8a719337489a20dd8d94d77bdeb93e75009f66840a18ec63805d8fe36dc7e1981
-AUX pciutils-3.2.0-io.patch 311 SHA256 
aec9f72d5c7eae1e7a7ccc5c433322e2c3ff04237b1049cfe22cd952a3fac548 SHA512 
9acea1ac1f6d87a647c1c69b084726930535ebcb75e79d5fc750dc2862c6cac0a89187febfd215bdc9bd6f75f2a809c02e7967a35eb288167db0a8a780864f99
 WHIRLPOOL 
bcef00c8f4a079ced8e2354bdefee56fe5c33a60cdb0aaa72bd63528e3e792a22ad49fb894a88bdd46639419af89b9228600788a501684295259dcae6c379287
-DIST pciutils-3.2.0.tar.gz 357003 SHA256 
84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 
ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1
 WHIRLPOOL 
fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
-EBUILD pciutils-3.2.0.ebuild 2279 SHA256 
baaee63528064e053068e03eec6210d68d533105fa2e4bd9fbcf5708c3135257 SHA512 
03962535e2124984ecf9b02c50ee1b81f5f42bf0b529ebdcc47081bc441cd9cd01927b39ba7e8de79f12022efe3ee8580761b41199591ec20e616545f88a929f
 WHIRLPOOL 
6e4c81b708b84ce1642079632f06c41bc1a576ec043371d33fb20af4cfe18abbfb6f4c03beb579969664bfd035b3ac0b67730d4f5fb050546528c5a61387dbff
-MISC metadata.xml 524 SHA256 
11eae8d518033f12d6fd34b5624e1271900450dce2755cba0879d3c116155dd0 SHA512 
881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
 WHIRLPOOL 
499344b03bb97ab85fab18cc15c64318c047f58930b0d0bb545a8b29230639dcf8d7e13746e6fbb62d32d7f89e4d03c958a5271b5521977ab29459d7e573efa8

diff --git a/sys-apps/pciutils/files/conf.d-pciparm 
b/sys-apps/pciutils/files/conf.d-pciparm
deleted file mode 100644
index f036b15..0000000
--- a/sys-apps/pciutils/files/conf.d-pciparm
+++ /dev/null
@@ -1,28 +0,0 @@
-# PCI tweaking article:
-# http://www.gentoo.org/doc/en/articles/hardware-stability-p2.xml
-#
-# Apply to all devices:
-# PCIPARM_ALL="...."
-# Cards also can be addressed by vid:pid or by bus:slot.func
-# (see setpci man page relative to -d and -s options)
-# PCIPARM_(BUS|VENDOR)_#="...."
-# Where # is sequentially numbered from zero.
-
-# Examples:
-# "open up" the PCI bus by allowing fairly long bursts
-# for all devices, increasing performance
-# (equivalent to: setpci -v -d *:* latency_timer=b0)
-#PCIPARM_ALL="latency_timer=b0"
-
-# maximize latency timers for network and audio,
-# allowing them to transmit more data per burst,
-# preventing buffer over/under-run conditions
-#PCIPARM_BUS_0="00:04.0 latency_timer=ff"
-#PCIPARM_BUS_1="01:04.0 latency_timer=ff"
-#PCIPARM_VENDOR_0="1057:3410 latency_timer=ff"
-
-# -v : whether to be verbose about changes
-# -D : dry-run, no commit
-# -f : do not warn if the change is already set
-# (see the setpci manpage for more advanced options)
-SETPCI_OPT="-f"

diff --git a/sys-apps/pciutils/files/init.d-pciparm 
b/sys-apps/pciutils/files/init.d-pciparm
deleted file mode 100644
index 705b647..0000000
--- a/sys-apps/pciutils/files/init.d-pciparm
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/files/init.d-pciparm,v 
1.3 2008/10/11 02:47:50 robbat2 Exp $
-
-depend() {
-       before bootmisc hdparm
-       after localmount
-}
-
-checkconfig() {
-       if [ ! -f /etc/conf.d/pciparm ]; then
-               ewarn "/etc/conf.d/pciparm does not exist, skipping"
-               return 1
-       fi
-
-       if [ -z "${PCIPARM_ALL}" -a -z "${PCIPARM_BUS_0}" -a  -z 
"${PCIPARM_VENDOR_0}" ]; then
-               ewarn "None of PCIPARM_ALL, PCIPARM_BUS_* or PCIPARM_VENDOR_* 
set in /etc/conf.d/pciparm"
-               return 1
-       fi
-}
-
-do_setpci() {
-       #ewarn "do_setpci: /usr/sbin/setpci $SETPCI_OPT $@"
-       SWITCH=$1
-       SPEC_ID=$2
-       shift 2
-       case "$SWITCH" in
-               -d) DESC=vendor ;;
-               -s) DESC=bus ;;
-               *) eerror "Unknown setpci type: $SWITCH" ; return 1 ;;
-       esac
-
-       if [ -z "$SPEC_ID" ]; then
-               eerror "Missing device specifier!"
-               return 1
-       fi
-       if [ -z "$*" ]; then
-               eerror "Missing configuration to set for ($DESC) $SPEC_ID!"
-               return 1
-       fi
-
-       ebegin "Setting PCI params for ($DESC) $SPEC_ID to $@"
-       /usr/sbin/setpci $SETPCI_OPT $SWITCH $SPEC_ID "$@"
-       rc=$?
-       eend $rc
-       return $rc
-}
-
-do_setpci_array() {
-       name=$1
-       shift
-       i=0
-       while true; do
-               eval opt="\$${name}_$i"
-               # End of loop
-               [ -z "${opt}" ] && break
-               # Pass in all other parameters here, in case we want to use 
multiple
-               # arguments later.
-               do_setpci "$@" $opt #|| return 1
-               i=$(($i+1))
-       done
-}
-
-start() {
-       if get_bootparam "nopciparm" ; then
-               ewarn "Skipping pciparm init as requested in kernel cmdline"
-               return 0
-       fi
-
-       checkconfig || return 1
-       
-       # We do not exit after any errors presently, because it might be a
-       # stability-related fix after a failure.
-       [ -n "$PCIPARM_ALL" ] && \
-               do_setpci -d '*:*' $PCIPARM_ALL #|| return 1
-
-       do_setpci_array PCIPARM_BUS -s #|| return 1
-       do_setpci_array PCIPARM_VENDOR -d #|| return 1
-}

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 9e63b7e..0000000
--- 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/files/pciutils-3.2.0-io.patch 
b/sys-apps/pciutils/files/pciutils-3.2.0-io.patch
deleted file mode 100644
index f8cf13b..0000000
--- a/sys-apps/pciutils/files/pciutils-3.2.0-io.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/pciutils-3.2.0/lib/i386-io-linux.h
-+++ b/pciutils-3.2.0/lib/i386-io-linux.h
-@@ -6,11 +6,7 @@
-  *    Can be freely distributed and used under the terms of the GNU GPL.
-  */
- 
--#ifdef __GLIBC__
- #include <sys/io.h>
--#else
--#include <asm/io.h>
--#endif
- 
- static int
- intel_setup_io(struct pci_access *a UNUSED)

diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
deleted file mode 100644
index 739960f..0000000
--- a/sys-apps/pciutils/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
-       <email>[email protected]</email>
-       <name>Gentoo Base System</name>
-</maintainer>
-<use>
-       <flag name="dns">Enable support for querying the central database of 
PCI IDs using DNS</flag>
-       <flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k 
switch in lspci command</flag>
-       <flag name="zlib">Support compressed pci.ids database</flag>
-</use>
-</pkgmetadata>

diff --git a/sys-apps/pciutils/pciutils-3.2.0.ebuild 
b/sys-apps/pciutils/pciutils-3.2.0.ebuild
deleted file mode 100644
index 8e9ed66..0000000
--- a/sys-apps/pciutils/pciutils-3.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.2.0.ebuild,v 
1.14 2014/01/18 04:55:35 vapier Exp $
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ 
http://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="amd64 arm ~mips ppc x86"
-IUSE="+kmod static-libs 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[static-libs(+)] )"
-DEPEND="kmod? ( sys-apps/kmod )
-       static-libs? ( ${LIB_DEPEND} )
-       !static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-RDEPEND="${DEPEND}
-       sys-apps/hwids"
-DEPEND="${DEPEND}
-       kmod? ( virtual/pkgconfig )"
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-       epatch "${FILESDIR}"/${PN}-3.2.0-io.patch
-
-       if use static-libs ; then
-               cp -pPR "${S}" "${S}.static" || die
-       fi
-}
-
-pemake() {
-       emake \
-               HOST="${CHOST}" \
-               CROSS_COMPILE="${CHOST}-" \
-               CC="$(tc-getCC)" \
-               DNS="yes" \
-               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="$(usex kmod)" \
-               "$@"
-}
-
-src_compile() {
-       pemake OPT="${CFLAGS}" all
-       if use static-libs ; then
-               pemake \
-                       -C "${S}.static" \
-                       OPT="${CFLAGS}" \
-                       SHARED="no" \
-                       lib/libpci.a
-       fi
-}
-
-src_install() {
-       pemake DESTDIR="${D}" install install-lib
-       use static-libs && dolib.a "${S}.static/lib/libpci.a"
-       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
-}

Reply via email to