old

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

10 files changed, 16 insertions, 527 deletions

diff --git a/sys-apps/pciutils/ChangeLog b/sys-apps/pciutils/ChangeLog
index 6c7834248980..4478fca0fe8c 100644
--- a/sys-apps/pciutils/ChangeLog
+++ b/sys-apps/pciutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pciutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.207 2012/09/26 10:38:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/ChangeLog,v 1.208 2012/09/26 10:41:25 ssuominen Exp $
+
+  26 Sep 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -files/pciutils-2.2.7-update-pciids-both-forms.patch, -pciutils-3.1.4.ebuild,
+  -files/pciutils-3.1.4-install-lib.patch, -pciutils-3.1.7.ebuild,
+  -pciutils-3.1.7-r1.ebuild, -pciutils-3.1.8.ebuild, -pciutils-3.1.9.ebuild,
+  -pciutils-3.1.9-r2.ebuild:
+  old
 
   26 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> pciutils-3.1.10.ebuild:
   amd64/ppc/ppc64/x86 stable wrt #436186
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 5ab869d1766d..0a924e4d9e40 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -3,35 +3,24 @@ Hash: SHA256
 
 AUX conf.d-pciparm 988 SHA256 ffdec7d6c510a502d212129d31a9b37c3b9c75393a48a8b1ee6010b7d4aa1887 SHA512 7c3513a9112318736907f4a1f3e94910d59752d8f51cf4f9f8ccd33b563250aca17a507e0937507bd9352d12a2b9a47e7419306908990b21a3460e6527dab6a4 WHIRLPOOL b5954d8897687a0c6d267c9f60feadb692ce637bf294f5b2f8b7eca479cf454ac541a4bfe904d43ff59e5a77a808c1cecd63aa1011817ba61152d7a4664c86ad
 AUX init.d-pciparm 1871 SHA256 30a62e5778997954f766cdf289a11ac124502943e8422bc33c49b6aa118df6a5 SHA512 231b7b96a751332a5a2395902e2a8024ae687f1e25b881d07bdcfba08acd1b6b6254e8fa694a7e01d851aa28c4ec6ff3d9c5ac64f8c1a471cc1f8f9a325881bd WHIRLPOOL 1fad1cc4fdb031f7f24d9ec47439b6c6f83f22e85b6081eca283ab8cc501f7af9bbf91f8a0118ca10f45490ffab26c4ff4650f1fc1ab418afaf2cf44a0aa9f00
-AUX pciutils-2.2.7-update-pciids-both-forms.patch 717 SHA256 003805f721184379960839519751b2a67ec8d020a229f7876cf339bb232fa162 SHA512 6e2cea247c0bd39a0d91ecda795ad922954e5ac307ade0110f3b70b75b3edd7f1606f0ecac61571ea26df8dc263e45ccc7f74bc551812cd069adde2c1e3188c0 WHIRLPOOL 21abad1b1ffd374bd08997ae30899d05e14451689f5dfeeb045a42c4a2fe21e54d5b968836dc7f32687c0ad901276cd3768483ae77e9ddbc98ef04f1ed047051
-AUX pciutils-3.1.4-install-lib.patch 1548 SHA256 ce1f27cf8d76f441e976e2379ac587553a8a790a5ea7d7f451d74d17e041357d SHA512 3a15d2b506462e09812fbd99ac857e416aaec64cf881100012e471aad942ad7c10006c00805a75f9c76b1f26bfc33955328ec5dbafa35985bbae38f9ae795812 WHIRLPOOL e53da7d8c26af4af81afe1ec05fe67c70569633129cd828096d89807636a4a72bba95a77bd4e04a1f8c7f8b0ad870bf38d29c6398cb00493ee56aabe4561cec2
 AUX pciutils-3.1.7-fbsd.patch 289 SHA256 801b01e0698711fc3695e6d8c2f088c88756d912ac561eda3d617fecf5556af4 SHA512 842b80c1c29062b7f71b0e70c1a9e29ee6a8c811c759e01fb4ada8d1e49f18b18bbce41c7340ac839d79bfc16b5d7306401e735ed56e3dd904f8770878e7dd06 WHIRLPOOL 34c1022ecab9b36818409bedeebb8fc626f3eb019b10c8e4b9a148371db75c1e1872e0c8c77d4c4e262528488e4469cc45a005cefc2e837d0b02ea80ec9594c2
 AUX pciutils-3.1.7-install-lib.patch 1507 SHA256 d1c5179274e238c619f751aeb8c3b992f2f4fe884a3d69cbca61acf18667d81c SHA512 9ac2b28d5fa9497a049b01bf4b3e32b22f20be2f15bdd444c90bec06b6408e8032207915c459a0652b668f01a6599d1f6877faf9c1465238fd8434494fd38360 WHIRLPOOL 248c14d41d126f3163173fcaea58e876736573f9e1393186aec83285e8fecbf245f115cd3f69ce5d1ac100df6be6ee6591dae28fa03f5d95afb52fe543aa43ed
 AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340de8781d361cb185035d5928aee82fe SHA512 e20286ae41569236b549d13c703266f920f335609c1ad2e5d67fd1561f9e9c68d4ac1fd530f93a4451ec79a5496ed226b83db0c74935499f44cd47e94eb74f49 WHIRLPOOL 9d5bf04b08a76bb786524e8fdc4de412154340f17dcccf48ebcb7504a6b5feb8a719337489a20dd8d94d77bdeb93e75009f66840a18ec63805d8fe36dc7e1981
 AUX pciutils.cron 42 SHA256 f97b127efda8095683b0a20ca071694f90e18c131743a9d36c8baf633b112836 SHA512 aff8876eda9c66662be97277822a010bd09f6fac2ce3b3e07a6f9ada5ee33c80942181af3214580e957d3af19541636edf6a0a9619c74d30484611fdc579f03a WHIRLPOOL e4bff870e135510e827c2527f5583f25d1d99908d9af401138a3f58208c1c73e10eb84cf1896328323e0676f2dd94dcec25967ca175c02e9a13bddd977fd579c
 DIST pciutils-3.1.10.tar.gz 345149 SHA256 7ca8201f806cbad31cb86bcbb2c2c99853cc05618b360eb58bde31a0f8d1f2a3 SHA512 2227ba3bbd1d5a02986b167010305286a9ad4d2781175291dd95a8f68a06f5508228e519bb34fdf92225cbd1334843d393ff1137bfc992403fd61896607353d5 WHIRLPOOL 7a4390b0da0c1b1df396076e05d7829fc3726199d2482abe61e59fa0e2e75c2de8f6019de57ea55aadf7001674a38d6666444e913e38af7ce76e8b1233645a27
-DIST pciutils-3.1.4.tar.gz 305747 SHA256 676b941ddaf912387092c6925597b14cef4f35f495bdbb229c1e5947151a1b20
-DIST pciutils-3.1.7.tar.gz 320603 SHA256 0f39818eabd793bb48d5b98ca52141d8247306a85876482c0075d0c95aeccea2 SHA512 af4e81ffab76ae258954d9a4f1dd91f63d1d604216383f412a78adc7ceb7f2038d64e9f6250c113fd3cb3d98f1de7bdd05dc81e87d2d98e28265a34e12a23567 WHIRLPOOL a574c993c6102291c86ddccfb72f51546446087ea0f75ffb6e19f5ab62830f0bfba785ecc76b9832682b4dae3544bbe8378e997021fa4f6b48e6434c152052fd
-DIST pciutils-3.1.8.tar.gz 376199 SHA256 15a7de19f23f95eeda2487bedc6b4c11eddea9c30bba35573775b4d46b7a46ca SHA512 ec81bad10d84fc7a906e78323a896d4014c014e7678b190775f56b4c88768a5423af5825e06c90e544b3f693f4a611310c82e6b9b5a44943f2a7b004f4640142 WHIRLPOOL b5b65fdab56c39af64d50cfe0378afb69e80ecb6fc697420297d1757ebc6793712330a0ce2997a807dbdd2d2b642e2010de0f733a7f889d68339fdeb8860c70e
 DIST pciutils-3.1.9.tar.gz 340215 SHA256 8ae7d320c50f02b015f5e2bb17a9f815cf201dae81b6bbd46b8a45552d00a178 SHA512 9e15ae5743bfbdaeb73d02c237d2632ee31f36be3efa5c26688473d2720157ca728384d98a06738eacab0d9a160641a22d53422d0a5d507d9779e0517e18bffb WHIRLPOOL b04f19d82065d166f0fcf47a69682fbeea94ee77f3fc771ede125f7d8c2e51cbf9a2d05ad0682814ee4bc6655567bff52a6e5a9b9ff9a6a5afdf2ee862213244
 EBUILD pciutils-3.1.10.ebuild 2331 SHA256 b136b5baf75650f3c49f74a9d962bddb637f5d6ff3d1f49f820cc5c99eb7e7c4 SHA512 81530c0bc3d5238eae747137570b2226786e2644f12fb905bc5a857271c35219fe421e44976358d6610ef0ddbf2c8c0abd924270027117ade7184a600bc3a3c3 WHIRLPOOL a9a645fdf5e47ef7fa22dee02c4d3ba6eb69b1d4770221f958eca8f6a6765f896b7392b052048f3ff9dbcb426e3c93eacfc420367936d360cb135dbfd18efd10
-EBUILD pciutils-3.1.4.ebuild 1887 SHA256 a26d0fccdad93a143e2acb7396d72f4000a2839c9591c816718cf48ddcc95cb8 SHA512 5684e7a58753efb4f1da918b46d1e8ce0fce1f0858335e182e1385414a5e4aef1bb4c4722525db30fe43670e7987b02e86468188585b12a35c1ea61b594b9056 WHIRLPOOL 973db68136c5d5dd27099bd571859561a4d20f85586fac16b93478780cfeb8e0ae5ccc7b8b0ef8eb2484cc7809d66fd4105fd2ddfcaadefd1a61692288bb6add
-EBUILD pciutils-3.1.7-r1.ebuild 1919 SHA256 30a44a58ba00df1f751bc45e52465f99f6becbdede21f3dcac957b262074b1d2 SHA512 cdd5e9a7f172c4f78fa1384813958fb04a2e614a0343bced667ac285a0591cbfa0538897d7a26becf849370e440aae5b9cfbd19641dd25c57ef849a723d89a23 WHIRLPOOL 761304d550cea9c2f80bbb8d4bed58e759c591fcedab04d68dbcc5a576370083ad48ac93b10f6dc68d8df536cecccdd5aa5fb98c58e6cdd4fd6f7dcf113d7be6
-EBUILD pciutils-3.1.7.ebuild 1902 SHA256 12e662c0cb4db1892c50be7c445ec6f7cfe4caf9b3ac8f1b04735be086e3a86a SHA512 444f144375e45ce94379801b3606edc4839033a0eb74bc2529ebb65be8e6139a17665e745975c0f183cf073a9aa812b1c95c64ea203d3aaf66c618bbfa391a5a WHIRLPOOL 9623719e273c145c58802329ec73ea842f9bd2808b5e483e568ea55a5a85c84dc4783ce660f99a835bbdeee928e2b75a2337c67a32a848a8585eb47d90153e97
-EBUILD pciutils-3.1.8.ebuild 1919 SHA256 b43f5921960891fe0d5175608c595b502c6a47ca5f5767e5bc546d411c52632c SHA512 f9d5d4c382ef049b8d4523a6780cd3192401223213e436ac9f10dfeaae1917e430f1ec8bc5cef48c36773182c39cbc4d34c23164a7e14739fda9e6725bf2c1ad WHIRLPOOL b74979b3a7de56f28644550d37f090edee75b147fa4d02af55d700a422c3d927277f80b436341767ad52df412bb703c6a48e8aa8616d71dcdc9321f75909f4dd
 EBUILD pciutils-3.1.9-r1.ebuild 2014 SHA256 44a139467ac835d9a9265e39c753b8938e9e2e544061c1c00ebdc5ce05fa8066 SHA512 f756291ff3fcc18bae6c5080747a1e99920d6e01e06b45c127bb6b411653d1a80d87d08614580646c47b868be804371affcccbf90ae8aee1f13c28dc44d3a30e WHIRLPOOL b7229540aa415002074d5b701949d4b4ad14ba87236cd12f742a3d6b866d9c7838d11cadcc6ce36d1ff50fcbb51bc0d2e05845ddba4c9e922c3966b6e4efefdc
-EBUILD pciutils-3.1.9-r2.ebuild 2338 SHA256 3dadfd4c36f8aed8f1f5c2a212243e7d191d82522ee0c6f6ad7ed2dcc60e1d5f SHA512 3544b8084fa97bd6fb06ff60cd00946d690a9bb937e9084dd895cae668e020095e50b69762d84b31d70e4d6919e9b18406d2e298fbc64a53578f6212e6353352 WHIRLPOOL e3dd3434bf500a0ca2c34d4be7a07809d745f63501f9a83de523037a91a519401c6a30c448093bf987820e6e2af04981d3a4f47b5df56c8cca44d3461d050a85
-EBUILD pciutils-3.1.9.ebuild 1830 SHA256 49e184ce2fc3ac5c33e2c1c5b53c62302bc0965baeaad4d9ef95297d0c38899b SHA512 05627b97c1cbfffe6e755b5c4ec62b167586d97122e5c9a9f700993e5d301eebe23ae1b0871e7fecd1718a88888f4c6a7880cadb04358883b0a5544053333d94 WHIRLPOOL fc722a12c7f2203dd286534ba72f7846ca182421817f487e47a0bd91582131e7951b938bf4da0f62a7906c5e4563773fb00f6c7be99c1ac93bf7d3db948e7d8d
-MISC ChangeLog 27234 SHA256 043783ca744ade0142124c47b12732337fbc092b2fa214450218fbbc0889407a SHA512 f9a48c1e3bc5e6bce873bdd55dafe9f9c846a282c0a1ca0a7b26f7a1a955c31a3e92877a54d8aa39e1527ced3a4ea8846356933e5984bb789e2381e59977c668 WHIRLPOOL 8e2103cc5b85036d9cfdfb119660c59370341ec23e25f4734b8088f7b321e55b48ca22e505993bfa0e2e283961e08b324745fdb577bc2e8c06ea8b0110b93eee
+MISC ChangeLog 27548 SHA256 b8ed2df776ee708a13e7f81a5c39a742bab53a3dd926944e6950648491a726f5 SHA512 7e5432d97533b81dfbdff7ec35a7a68ddb1d697c16949c584bc964dea1e9cab0b231c63fe4a12051e0422ab21414b3f86673b3ed13a8c76942c5f24e3d030cff WHIRLPOOL 7189dc1a6bac0108629d963a5b37831d545145830df6d82a5ee3a88e691cec1ee3d21831d6fd4ad83aced7915dc7b9e7447b7f537de8520af537a7a0fe02fe5c
 MISC metadata.xml 384 SHA256 6e4cdaeea704436ddddb3669f7766fc8ec9b9c62290145a49859d29c907dead8 SHA512 143b05a7e0c131469b09d37f1fb0ebe0f5519115919ae3572d68aa1f563dcd34af65b2960344528b645eb276fbc6b8fc8a6ae12c94ff53470153e0b35680adf7 WHIRLPOOL bc39799973e5e19cfabcefd4914c4fb9c3ec2168e40780ebf6965a8e09bbbb7612bf578c184ceac75073d45cfccd817ca365fa774f4d2b6c68bdb2040aea3bda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYtppAAoJEEdUh39IaPFN1hoH/2FnOLY9xI9fEuDgIsqwPYZD
-JFFf87NB9gj6W2lEKThf3HAsIu27NiWdD6gIKkYQj4W7fsPGZHuJSdr9d96r/kRE
-leO2ANf/j7t5q1k+HNNss7PRXL3H+/ZtFAafMKYOQGhCXb8z0w9Ix6cXnXmmgKQG
-SvVQKL0XCLSnL/6WX7f6E3hcUW24dPSF+oXLITDFtBcelr85O/2C6MXPGkW6F5Cn
-Oa+qwjaw4hk+Gm8nNm3XRUnrwqQ7VqK7getwAjx32nKo9sdL1UoKYGvK15MPuWnu
-nzT0vm9+jOx1rv/Sq754bhXucWlDewg1gmMTbjnVKaqAaNsK9tQdUOrM15p9rLE=
-=CFA6
+iQEcBAEBCAAGBQJQYts2AAoJEEdUh39IaPFNSlUH/1NrVHR7jMeas9Y2tIOhCjnk
+r0vVJGbB2/iWxhNk9TtXdLXLCmqd13LTAKOTTlrUtUkkxQF4OYDirpyUHjXB+9zN
+qSVKhFveTr+/FaF5WLmQm9yvhzizXY2ylWMQgm7zRn/c8P3tPfQm2QL6TdDSupDp
+8W8WyTWIMQKr5ZpF5bmt0q7QVaADn8xE+3ra5fgj8CwEiMkiaT+6Op8FuH1Bh1YQ
+UVJOcEYUpHBadPQpheMEzRdTrLyRbHjmVYT2G2kRI7ZiI0hs7jVII13e5j3e2MxP
+AQNClvTiuiURIf3K9Z7jtSh6KbMVes4V+j3ER6/BekP6n+C6+dX5Jg18cq1MHMs=
+=Jzbr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch b/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch
deleted file mode 100644
index 855026be4cd9..000000000000
--- a/sys-apps/pciutils/files/pciutils-2.2.7-update-pciids-both-forms.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pciutils-2.2.7/update-pciids.sh
-+++ pciutils-2.2.7/update-pciids.sh
-@@ -72,4 +72,19 @@
- 	rm -f ${DEST%.gz} ${DEST%.gz}.old
- fi
- 
-+# if the gzip version exists, but we are not using compressed mode, 
-+# erase the gzip version, as it is old and crufty
-+if [ -z "$PCI_COMPRESSED_IDS" ] && [ -f $DEST.gz ]; then
-+	rm -f ${DEST}.gz
-+fi
-+
-+# Lastly, because HAL still reads the plaintext version only and 
-+# has not yet migrated to using a library we leave the plaintext 
-+# version in addition to the gzip version.
-+# They need to migrate because the pci.ids format will be changing.
-+if [ ${DEST%.gz} != ${DEST} ] ; then
-+	gzip -d <${DEST} >${DEST%.gz}
-+fi
-+chmod a+r ${DEST} ${DEST%.gz}
-+
- ${quiet} || echo "Done."
diff --git a/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch b/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch
deleted file mode 100644
index 3358b01b855b..000000000000
--- a/sys-apps/pciutils/files/pciutils-3.1.4-install-lib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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,7 +90,11 @@
- 
- distclean: clean
- 
--install: all
-+install-pcilib: lib/$(PCILIB)
-+	$(DIRINSTALL) -m 755 $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -c -m 644 lib/$(PCILIB) $(DESTDIR)$(LIBDIR)
-+
-+install: all install-pcilib
- # -c is ignored on Linux, but required on FreeBSD
- 	$(DIRINSTALL) -m 755 $(DESTDIR)$(SBINDIR) $(DESTDIR)$(IDSDIR) $(DESTDIR)$(MANDIR)/man8 $(DESTDIR)$(MANDIR)/man7
- 	$(INSTALL) -c -m 755 $(STRIP) lspci setpci $(DESTDIR)$(SBINDIR)
-@@ -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.4.ebuild b/sys-apps/pciutils/pciutils-3.1.4.ebuild
deleted file mode 100644
index 6d829f3cdc03..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.4.ebuild,v 1.13 2012/05/24 00:02:37 ssuominen Exp $
-
-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="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}"/${P}-install-lib.patch #273489
-	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) \
-		"$@"
-}
-
-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'"
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild b/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild
deleted file mode 100644
index 7ece6d3a4a1b..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.7-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 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.2 2012/05/24 00:02:37 ssuominen Exp $
-
-EAPI="2"
-
-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="~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'"
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.7.ebuild b/sys-apps/pciutils/pciutils-3.1.7.ebuild
deleted file mode 100644
index 3a16e62136cc..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 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.9 2012/05/24 00:02:37 ssuominen Exp $
-
-EAPI="2"
-
-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="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
-}
-
-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'"
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.8.ebuild b/sys-apps/pciutils/pciutils-3.1.8.ebuild
deleted file mode 100644
index f41425afe1fc..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.8.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.8.ebuild,v 1.4 2012/05/24 00:02:37 ssuominen Exp $
-
-EAPI="3"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="network-cron static-libs zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	!sys-apps/hal"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
-	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
-
-	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) \
-		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'"
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild b/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
deleted file mode 100644
index 92b82afd21eb..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9-r2.ebuild,v 1.12 2012/09/26 10:38:02 ssuominen Exp $
-
-EAPI="4"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="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="static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
-	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
-	epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.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)" \
-		"$@"
-}
-
-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/bin/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() {
-	elog "The 'pcimodules' program has been replaced by 'lspci -k'"
-	elog ""
-	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)."
-}
diff --git a/sys-apps/pciutils/pciutils-3.1.9.ebuild b/sys-apps/pciutils/pciutils-3.1.9.ebuild
deleted file mode 100644
index 555c7c5c11f9..000000000000
--- a/sys-apps/pciutils/pciutils-3.1.9.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-3.1.9.ebuild,v 1.2 2012/05/24 00:02:37 ssuominen Exp $
-
-EAPI="4"
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="network-cron static-libs zlib"
-
-DEPEND="zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.7-install-lib.patch #273489
-	epatch "${FILESDIR}"/${PN}-3.1.7-fbsd.patch #262321
-
-	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) \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		"$@"
-}
-
-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
-
-	if use network-cron ; then
-		exeinto /etc/cron.monthly
-		newexe "${FILESDIR}"/pciutils.cron update-pciids
-	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'"
-}