Bug #240292, version bump.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

4 files changed, 101 insertions, 2 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 52af91a403b2..0b70a7e43465 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.144 2008/08/25 13:10:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.145 2008/10/07 10:13:18 robbat2 Exp $
+
+*pciutils-3.0.2 (07 Oct 2008)
+
+  07 Oct 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/pciutils-3.0.0-locale-happiness.patch, +pciutils-3.0.2.ebuild:
+  Bug #240292, version bump.
 
   25 Aug 2008; Raúl Porcel <armin76@gentoo.org> pciutils-3.0.0.ebuild:
   ia64 stable wrt #235028
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index b22a410337ff..1ba319b3a4e5 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,11 +3,14 @@ AUX pcimodules-pciutils-3.0.0.patch 9041 RMD160 ab4a9d7cc3df5f3492a72d1ce5401389
 AUX pciutils-2.2.7-build.patch 716 RMD160 f142d0fbfaed97d4b75d479ac295757befd9935a SHA1 33f5b05c97dd0e74a6cd08ebf8495c55fb4eca81 SHA256 43c963ac3af01878a4a2303a657a3fbecc0c9a1cc545cc724ba2edaa3a14bf45
 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-3.0.0-resolv.patch 1163 RMD160 5cfe106380413349a514db75dda37d3163404d7b SHA1 c51a69794c252ea63083a40363dbb38e84fcfbaa SHA256 1756e747cfe0801e4189e69f516115fba207564d5ff7bc0e697fac1a0aa7b242
 AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385c0477dffe5ac5c2a4bcd2a3e248dd8a166 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836
 DIST pciutils-2.2.10.tar.gz 234869 RMD160 80f536bec73cd39cfdba8b00921c20fb5dca652f SHA1 1b4f355e0b12e9564d87c5fcdfcaaf87c14a473c SHA256 4ef3474cd8f296f788f576a1c46b9a1f408faf6d95f82f0acece366b5f62d514
 DIST pciutils-3.0.0.tar.gz 244756 RMD160 e0ac0d4f4da0732a159520d8ca4fdea547d97230 SHA1 75436a6b88604bdd288492c4076d39edd2321b92 SHA256 df1a63315bbea8f81591fdeaed2005606eb9f675ab1f9839bea5fba02855a773
+DIST pciutils-3.0.2.tar.gz 270474 RMD160 bab0a8261267dd7be50c29984c1d813174c4a0f7 SHA1 4591785f6f70ed44e593933bb34012d83b4c3853 SHA256 ab11bd88c7e20b2bc4801df044086be69b6d728dc88cf6e73db47cdd02c46584
 EBUILD pciutils-2.2.10.ebuild 1489 RMD160 e526319da981149203c7de5f11fddb743a08a33b SHA1 703e8af045ea0b1b00e83b33bf284a4f465e70f5 SHA256 7571bcaa536bf6b68905f1b8c8259ab6279dfeb4ce181ecb2ee88db28dac5b38
 EBUILD pciutils-3.0.0.ebuild 1808 RMD160 fde67a9da9a2b664e3a789100d3d0af0e6f23d64 SHA1 bc9d0b1d73a8ed78c0acff8869ef4662db31d8bd SHA256 88be7fc27de6b5aeb4af9b6fdf1a3b7fa93c78e5bde9d2a1d0be72c3db240221
-MISC ChangeLog 18851 RMD160 22c2bfc5f9d35bb308082900f6cb5c4aa613e77c SHA1 c15218264a18fcf4c270dbbfb5beefd15d81389f SHA256 0080d546af2113d58f6e068415974d5c266fe46706849050f0fadef893dcff7f
+EBUILD pciutils-3.0.2.ebuild 1881 RMD160 3e3a83d4bc5c833509874901535eadef54f77d5b SHA1 aaa72d1e701c3af08a1e8028f99706ce5d301cef SHA256 359b670c1e872ec2896a9abf67e16ad9462832d7ba4f8d00775d9f0f5983cf81
+MISC ChangeLog 19037 RMD160 b1296847d4ace2a00b4ead27644ddae43f930037 SHA1 05ec53076413990b561a1f25edd6aaafe7fbbec1 SHA256 d5858a60c9c082ac9b4fe281829fec39b6d0bb87fe19510ce75455de05252490
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
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 000000000000..5a818b4c089f
--- /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 000000000000..b5f93751581d
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.0.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2008 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.1 2008/10/07 10:13:18 robbat2 Exp $
+
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+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 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0.0-build.patch #233314
+	#epatch "${FILESDIR}"/${PN}-3.0.0-resolv.patch #218555 #Merged
+	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
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+	emake \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		"$@"
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	pemake OPT="${CFLAGS}" all pcimodules || die "emake failed"
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib || die
+	dosbin pcimodules || die
+	newman pcimodules.man pcimodules.8
+
+	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
+}