Version bump #314499 by Toffanin.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 130 insertions, 1 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 1c2ea1f822b5..9a34dbbb17d7 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.174 2010/01/30 18:36:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.175 2010/04/10 19:28:55 vapier Exp $
+
+*pciutils-3.1.7 (10 Apr 2010)
+
+  10 Apr 2010; Mike Frysinger <vapier@gentoo.org> +pciutils-3.1.7.ebuild,
+  +files/pciutils-3.1.7-fbsd.patch, +files/pciutils-3.1.7-install-lib.patch:
+  Version bump #314499 by Toffanin.
 
   30 Jan 2010; Raúl Porcel <armin76@gentoo.org> pciutils-3.1.4.ebuild:
   sparc stable wrt #296772
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch b/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
new file mode 100644
index 000000000000..5f424635ab5e
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.7-fbsd.patch
@@ -0,0 +1,11 @@
+--- pciutils-3.1.7/lib/configure
++++ pciutils-3.1.7/lib/configure
+@@ -85,7 +85,7 @@
+ 		esac
+ 		echo >>$c '#define PCI_HAVE_STDINT_H'
+ 		;;
+-	freebsd)
++	freebsd*)
+ 		echo_n " fbsd-device"
+ 		echo >>$c '#define PCI_HAVE_PM_FBSD_DEVICE'
+ 		echo >>$c '#define PCI_PATH_FBSD_DEVICE "/dev/pci"'
diff --git a/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch b/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
new file mode 100644
index 000000000000..ad49aa62b1a9
--- /dev/null
+++ b/sys-apps/pciutils/files/pciutils-3.1.7-install-lib.patch
@@ -0,0 +1,41 @@
+don't have the install and install-lib targets install the same files
+otherwise we can hit parallel install failures
+
+http://bugs.gentoo.org/273489
+
+patch by Kevin Pyle
+
+--- Makefile
++++ Makefile
+@@ -90,6 +90,13 @@
+ 
+ distclean: clean
+ 
++install-pcilib: lib/$(PCILIB)
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
++
++ifeq ($(SHARED),yes)
++install: install-pcilib
++endif
+ install: all
+ # -c is ignored on Linux, but required on FreeBSD
+ 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
+@@ -99,15 +103,12 @@
+ 	$(INSTALL) -c -m 644 lspci.8 setpci.8 update-pciids.8 $(DESTDIR)$(MANDIR)/man8
+ 	$(INSTALL) -c -m 644 pcilib.7 $(DESTDIR)$(MANDIR)/man7
+ ifeq ($(SHARED),yes)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	ln -sf $(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION)
+ endif
+ 
+-install-lib: $(PCIINC_INS) lib/$(PCILIB) lib/$(PCILIBPC)
+-	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(LIBDIR) $(DESTDIR)$(PKGCFDIR)
++install-lib: $(PCIINC_INS) lib/$(PCILIBPC) install-pcilib
++	$(DIRINSTALL) -m 755 $(DESTDIR)$(INCDIR)/pci $(DESTDIR)$(PKGCFDIR)
+ 	$(INSTALL) -c -m 644 $(PCIINC_INS) $(DESTDIR)$(INCDIR)/pci
+-	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL) -c -m 644 lib/$(PCILIBPC) $(DESTDIR)$(PKGCFDIR)
+ ifeq ($(SHARED),yes)
+ 	ln -sf $(LIBNAME).so$(ABI_VERSION) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so
diff --git a/sys-apps/pciutils/pciutils-3.1.7.ebuild b/sys-apps/pciutils/pciutils-3.1.7.ebuild
new file mode 100644
index 000000000000..6ae807351573
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.1.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.7.ebuild,v 1.1 2010/04/10 19:28:55 vapier Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs
+
+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_prepare() {
+	epatch "${FILESDIR}"/${P}-install-lib.patch #273489
+	epatch "${FILESDIR}"/${P}-fbsd.patch #262321
+	epatch "${FILESDIR}"/${PN}-2.2.7-update-pciids-both-forms.patch
+	sed -i -e "/^LIBDIR=/s:/lib:/$(get_libdir):" Makefile
+}
+
+uyesno() { use $1 && echo yes || echo no ; }
+pemake() {
+	emake \
+		HOST="${CHOST}" \
+		CROSS_COMPILE="${CHOST}-" \
+		CC="$(tc-getCC)" \
+		DNS="yes" \
+		IDSDIR="/usr/share/misc" \
+		MANDIR="/usr/share/man" \
+		PREFIX="/usr" \
+		SHARED="yes" \
+		STRIP="" \
+		ZLIB=$(uyesno zlib) \
+		LIBDIR="\${PREFIX}/$(get_libdir)" \
+		"$@"
+}
+
+src_compile() {
+	pemake OPT="${CFLAGS}" all || die
+}
+
+src_install() {
+	pemake DESTDIR="${D}" install install-lib || die
+	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
+}
+
+pkg_postinst() {
+	elog "The 'pcimodules' program has been replaced by 'lspci -k'"
+}