added sys-apps/pciutils-3.0.2

5 files changed, 137 insertions, 0 deletions

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index b89cce28d..d665fdd04 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,9 +1,14 @@
 AUX conf.d-pciparm 988 RMD160 47d31ca9710c1be47e060e235394784b7831a6e0 SHA1 740ff1012c2fa2211357f707d17875c8d1ca66a5 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887
 AUX init.d-pciparm 1871 RMD160 45f027ad3369e2e60b83ec62fd67188c079b4b70 SHA1 d45ffbd09058a49ac219a9456a70fddbea693928 SHA256 30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5
+AUX pcimodules-pciutils-3.0.0.patch 431 RMD160 13b893c84eb72ba89c35868ff15ff34cc82a182a SHA1 c32a0f439131bc241eb2093ce47d74eceb99bc50 SHA256 4d1d90a43b348f116cf16db5727ea124ae0cb6a925bb1b175d0c61c7a808c3e3
 AUX pcimodules-pciutils-3.1.0.patch 540 RMD160 76ca68a766c30ad3d505dbf8fd080eabcca07166 SHA1 128af5ed8ab4627bb8958462337066dd25c18968 SHA256 3677886e03913ccbe440cd86cdbceb65feb5b45aea96e863116238940af4be8d
 AUX pcimodules.8 3220 RMD160 59ab95c358f30157bd49c84ada19324f534b6d75 SHA1 cc529791cfd868de19a0f9302eeb6de0e90a60aa SHA256 b05b561fb4b54687560e75a63813157f134fc1cb7ca13fab11a5ec05971c05fd
 AUX pcimodules.c 4944 RMD160 4be729671eef485b90ae8b2274dc64d2757a86b9 SHA1 6383f2f482317e5663f41e9a1d80096e0021c710 SHA256 e3af196913e27c23b96c99036bee32f3fc4c90876927713ea5cbff0eb58c25eb
 AUX pciutils-2.2.7-update-pciids-both-forms.patch 843 RMD160 6be4dd832f8274512bfc79b753147ea768d5fbf8 SHA1 d351b16196bc02f85a5523a6f3397218568abb6c SHA256 78c3e5758064464a826ce7df74c6b27065db422434f936022b404d112f5403f2
+AUX pciutils-3.0.0-build.patch 340 RMD160 b734b9bc3148f68e479fe763c182cd294ba16802 SHA1 0464ceb78aa3f80760a94f3ed0b5b4e55786980b SHA256 969f2496e2310342aed5af38d6470714ac1d34a5547a4195ce779c5d5131dc8d
+AUX pciutils-3.0.0-locale-happiness.patch 1199 RMD160 3b1bb4df333de85929748d4290ccb46923f82c81 SHA1 10b018ca036cd48528d48510b78b6d42eb8ac1cd SHA256 5e56f412bd51647cf43fa860d48a7de8d01c8185ac04940f29099194f82fccaa
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
+DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f7 SHA1 4591785f6f70ed44e593933bb34012d83b4c3853 SHA256 ab11bd88c7e20b2bc4801df044086be69b6d728dc88cf6e73db47cdd02c46584
 DIST pciutils-3.1.2.tar.gz 291324 RMD160 05190a2d13c92eb04a88714434e46c202158199b SHA1 a9b75a5afde21eae483bee577d9060646e3eba25 SHA256 7b682329410a39e6d61183e168342e1d125c875a35acd4c746ff1bec2ab6789d
+EBUILD pciutils-3.0.2.ebuild 2258 RMD160 08ca5ba7422d8d0a8d90665ca0d62866deaf3c55 SHA1 ddb47252cd6b42563196d36a20cf4dc7779fbcca SHA256 a28cad685a6a5eb6b93688c4a6c74a13ba332e54d690de16ecea86ac9cb185b9
 EBUILD pciutils-3.1.2.ebuild 2107 RMD160 9c429a8afd2b23b383334fde7f88cbdee475583b SHA1 e6f8d5c1e8f80932f091617549852b3b6e0ba906 SHA256 1b2def5fa262a7072e53f1f96863b609e3f2d1a6bf50309ebd20d56ca641e084
diff --git a/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch b/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch
new file mode 100644
index 000000000..b79f22d36
--- /dev/null
+++ b/sys-apps/pciutils/files/pcimodules-pciutils-3.0.0.patch
@@ -0,0 +1,14 @@
+--- pciutils-3.0.0/Makefile
++++ pciutils-3.0.0/Makefile
+@@ -34,9 +34,11 @@
+ lib/config.h lib/config.mk:
+ 	cd lib && ./configure
+ 
++pcimodules: pcimodules.o common.o lib/$(PCILIB)
+ lspci: lspci.o common.o lib/$(PCILIB)
+ setpci: setpci.o common.o lib/$(PCILIB)
+ 
++pcimodules.o: pcimodules.c pciutils.h $(PCIINC)
+ lspci.o: lspci.c pciutils.h $(PCIINC)
+ setpci.o: setpci.c pciutils.h $(PCIINC)
+ common.o: common.c pciutils.h $(PCIINC)
diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-build.patch b/sys-apps/pciutils/files/pciutils-3.0.0-build.patch
new file mode 100644
index 000000000..f1735a0e4
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.0.0-build.patch
@@ -0,0 +1,11 @@
+--- lib/Makefile
++++ lib/Makefile
+@@ -52,7 +52,7 @@
+ else
+ CFLAGS += -fPIC -fvisibility=hidden
+ $(PCILIB): $(addsuffix .o,$(OBJS))
+-	$(CC) -shared $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
++	$(CC) -shared $(LDFLAGS) $(SONAME) -Wl,--version-script=libpci.ver -o $@ $^ $(LIB_LDLIBS)
+ endif
+ 
+ $(PCILIBPC): libpci.pc.in
diff --git a/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch b/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch
new file mode 100644
index 000000000..5a818b4c0
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.0.0-locale-happiness.patch
@@ -0,0 +1,26 @@
+et_EE is a very fun locale. [a-z] does not expand to the full alphabet in that
+crazy place. Force tr to use locale C just to avoid the problem.
+
+diff -Nuar pciutils-3.0.2.orig/lib/configure pciutils-3.0.2/lib/configure
+--- pciutils-3.0.2.orig/lib/configure	2008-09-19 11:04:37.000000000 -0700
++++ pciutils-3.0.2/lib/configure	2008-10-07 02:27:57.043215842 -0700
+@@ -39,7 +39,7 @@
+ 	HOST=${3:-$cpu-$sys}
+ fi
+ # CAVEAT: tr on Solaris is a bit weird and the extra [] is otherwise harmless.
+-host=`echo $HOST | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | tr '[A-Z]' '[a-z]'`
++host=`echo $HOST | sed 's/^\([^-]*\)-\([^-]*\)$/\1--\2/' | LANG=C tr '[A-Z]' '[a-z]'`
+ cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+ sys=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ echo " $host $rel"
+@@ -47,8 +47,8 @@
+ c=config.h
+ m=config.mk
+ echo >$c '#define PCI_CONFIG_H'
+-echo >>$c "#define PCI_ARCH_`echo $cpu | tr '[a-z]' '[A-Z]'`"
+-echo >>$c "#define PCI_OS_`echo $sys | tr '[a-z]' '[A-Z]'`"
++echo >>$c "#define PCI_ARCH_`echo $cpu | LANG=C tr '[a-z]' '[A-Z]'`"
++echo >>$c "#define PCI_OS_`echo $sys | LANG=C tr '[a-z]' '[A-Z]'`"
+ echo >$m 'WITH_LIBS='
+ 
+ echo_n "Looking for access methods..."
diff --git a/sys-apps/pciutils/pciutils-3.0.2.ebuild b/sys-apps/pciutils/pciutils-3.0.2.ebuild
new file mode 100644
index 000000000..7ae1e3bc7
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.0.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.0.2.ebuild,v 1.13 2009/02/07 14:50:20 armin76 Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-native
+
+DESCRIPTION="Various utilities dealing with the PCI bus"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="network-cron zlib"
+
+DEPEND="zlib? ( sys-libs/zlib[lib32?] )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314
+	epatch "${FILESDIR}"/pcimodules-${PN}-3.0.0.patch
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	epatch "${FILESDIR}"/${PN}-3.0.0-locale-happiness.patch
+	cp "${FILESDIR}"/pcimodules.c . || die
+}
+
+multilib-native_src_prepare_internal() {
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+
+	if use lib32 && [[ "${ABI}" == "x86" ]]; then
+		CROSS_COMPILE="x86_64-pc-linux-gnu"
+	else
+		CROSS_COMPILE="${CHOST}"
+	fi
+
+	emake \
+		CROSS_COMPILE="${CROSS_COMPILE}-" \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		"$@"
+}
+
+multilib-native_src_compile_internal() {
+	tc-export AR CC RANLIB
+	pemake OPT="${CFLAGS}" all pcimodules || die "emake failed"
+}
+
+multilib-native_src_install_internal() {
+	pemake DESTDIR="${D}" install install-lib || die
+	dosbin pcimodules || die
+	doman "${FILESDIR}"/pcimodules.8
+	dodoc ChangeLog README TODO
+
+	if use network-cron ; then
+		exeinto /etc/cron.monthly
+		newexe "${FILESDIR}"/pciutils.cron update-pciids \
+			|| die "Failed to install update cronjob"
+	fi
+
+	# Install both forms until HAL has migrated
+	if use zlib ; then
+		local sharedir="${D}/usr/share/misc"
+		elog "Providing a backwards compatibility non-compressed pci.ids"
+		gzip -d <"${sharedir}"/pci.ids.gz >"${sharedir}"/pci.ids
+	fi
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}