Add USE=static-libs and drop uncompressed pci.ids hal hack.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 89 insertions, 7 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 9a34dbbb17d7..d7b4ebc51954 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.175 2010/04/10 19:28:55 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.176 2011/03/27 15:41:38 vapier Exp $
+
+*pciutils-3.1.7-r1 (27 Mar 2011)
+
+  27 Mar 2011; Mike Frysinger <vapier@gentoo.org> +pciutils-3.1.7-r1.ebuild:
+  Add USE=static-libs and drop uncompressed pci.ids hal hack.
 
 *pciutils-3.1.7 (10 Apr 2010)
 
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index f040b5739419..b542f725d120 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -11,13 +11,14 @@ AUX pciutils.cron 42 RMD160 ed2388ec7eb6d08d75b4178b3a3d33071d705eee SHA1 1e0385
 DIST pciutils-3.1.4.tar.gz 305747 RMD160 86ed925d1345e8050aa990ce212fff114e569111 SHA1 eafde87ac5bb3f0bcabc98461f22a23f8e7229f2 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20
 DIST pciutils-3.1.7.tar.gz 320603 RMD160 2d81a6a7fdf06889f7d5954dff716bb0516ffd20 SHA1 58336ef8c1bbe870f2cc0ed9481a8cf8a58e039c SHA256 0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2
 EBUILD pciutils-3.1.4.ebuild 1852 RMD160 375f032c885dada98b812e05c6a70dd376776227 SHA1 4e5ef48ad8e43566665c4727411f31d72f3e4eb9 SHA256 5753a5f019ed50b795885580b334c155dd0a659d93aa4fa52460b803b5693284
+EBUILD pciutils-3.1.7-r1.ebuild 1883 RMD160 6cb7d60afdf40115ed1f1c827ad879c5dca5fc86 SHA1 53ec5d2b9155c63de474541fc3929b24415b86db SHA256 c07867031c2737799543b80d07173b04613054b51c398ed3503f0914efe6b97d
 EBUILD pciutils-3.1.7.ebuild 1878 RMD160 70d5337be276711e06199ce911f709cee00d0469 SHA1 0efb06a83499d22554a4c1581d01135a272e798f SHA256 e796110da536aa39359dc4a028e3ad327289517401d2eedc6759c52b345b78e3
-MISC ChangeLog 23121 RMD160 5f16a3da9697e8910151f00175c66044c4f7552c SHA1 c3e27637179f86ab2d22fc61b25dedf22a484d6f SHA256 4af2cb4813f84498302db454f84a69b4a135971f482258ab950b99365188e942
+MISC ChangeLog 23295 RMD160 915d48d88050d37c55271589f5b1efe49c2518ea SHA1 fb0328be7d8bac196d49401eeed4f7816cbb2aba SHA256 5ea22011dad80cf26cf2c590982ef7ca756ea6cc552605afe385a2c2b0e61fda
 MISC metadata.xml 257 RMD160 bda78cd844850cace7d31b3bff6de2d1a7a298d5 SHA1 d754bc91dd7fc7496f5c3aa307879ae74ce3b465 SHA256 665e73270ac904a5c3989d16be4ad8e3d3b492049adebb76621f772d60647a97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAkvCI7kACgkQTwhj9JtAlp7nkAEAivqze0J/behjFHpK7OI+V+dy
-CfUvpq92NXS4cuiqGesBAJxKS+SWEWkpcI10pYmYPqJ4XTZSqi3YSERgMAaqPTtW
-=sQgL
+iF4EAREIAAYFAk2PWpoACgkQaC/OocHi7JYFxwD/ZuGyFnX4HfCe7bq+iiDJ3bTR
+9RnR1rqsrx0jPYBMuVMA/1AScyjl+dLXzZb0XDFTuqeffHuDY0tJtRD6rfh0+wZi
+=Fnl5
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild
new file mode 100644
index 000000000000..e044f2d16803
--- /dev/null
+++ b/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/03/27 15:41:38 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 static-libs zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	!sys-apps/hal"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-install-lib.patch #273489
+	epatch "${FILESDIR}"/${P}-fbsd.patch #262321
+
+	if use static-libs ; then
+		cp -pPR "${S}" "${S}.static" || die
+	fi
+}
+
+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)" \
+		"$@" || die
+}
+
+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 || die
+	use static-libs && { dolib.a "${S}.static/lib/libpci.a" || 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
+
+	newinitd "${FILESDIR}"/init.d-pciparm pciparm
+	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
+}
+
+pkg_postinst() {
+	elog "The 'pcimodules' program has been replaced by 'lspci -k'"
+}