old

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

5 files changed, 13 insertions, 168 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 7aa5f55f030a..42e6d81e87f3 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.142 2012/09/24 11:45:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.143 2012/09/24 11:47:22 ssuominen Exp $
+
+  24 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -usbutils-005.ebuild,
+  -usbutils-005-r1.ebuild, -files/usbutils-005-missing-includes.patch:
+  old
 
   24 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> usbutils-006.ebuild,
   +files/usbutils-006-libusbx-1.0.13.patch:
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index b610ba5e59e5..672acd7cc3be 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,26 +2,22 @@
 Hash: SHA256
 
 AUX usbmodules.sh 989 SHA256 096271d45255f27836274ce92e89456644b6fc68e3a784b9dd251d28a407c630 SHA512 3df1f3b4b61f3413c9cf992987a6744a5bf707101588786f0f92bbef92b5d07a7a90654f21924053f9b0309f326a1327488847127cc844bc665aded4adc3e543 WHIRLPOOL b23c7eb511db7c398c28bbc745fa2a7536e9c2fe1d8f40379b9efb36d168b7fbf12cad771bbe596e39156dd0340075edb482b6a2e5b2d222ed910544f4066d25
-AUX usbutils-005-missing-includes.patch 511 SHA256 43f4e07a9d2ce5568f24fadd590756cff15d2c239dc5dbf07d9c17c4a8b1c020 SHA512 960d009b38617ae8ab2156efc219b3dc0df886ad6f412e52a0b516ce37a150389465e0cb2d57d697b1e27944522cd16721ab38f1f0377ba114319f75baa049d0 WHIRLPOOL 7fee0ee8e2c061ca403be7e9630a934b8f9fc6965ba7583d4277870f34efddf2a1cdee541096cf45aaeb243bc454c73b7af7f9f94894c5663ee1384dc925e26a
 AUX usbutils-006-libusbx-1.0.13.patch 493 SHA256 3eb620ad3442de5ab8809cab78a3d749cd3683e41ed0be31062daa4e4f093f83 SHA512 a02e2f139489c22f8040c948d5d9b956b78564f4a2563274552fa3bd84e484a8ef2f51e45a4ebbc3dcd07055c80c170262e4b67793b228058739bc973c958ce9 WHIRLPOOL d695bdb7842c548d9b89bf54158b3d8d63a46cf1d063fe4b04c75f8e793c0aab9853d506de98bb559ddadfed6e28d1ea9e6757b3d091b1511d3475f36092d58f
 AUX usbutils.cron 42 SHA256 4e53150761fc4a00b2a3593edd72e61c8710d619b96f0ae88b3c73360fac15d2 SHA512 d948cfb693ca15c369e4837e2d3ba28f09b83e0e50eb031ad80dd3c88ed18505c203ba90f05c15e7718302774e5251da07983225b9d88902cf057e1f9837c2d3 WHIRLPOOL aa5d61765e6215fb76bc0ea30cb39aecaa5213ff37176116a14feffa98dd0509df0ddd912508ec05decc308e2dd089425b64c71d9e0329c5c10dd283ddf2c630
 DIST usbutils-004.tar.gz 583444 SHA256 0a16de4559d603beafbf893e255aa6cee2fb564a806640e1365dec3438749666 SHA512 982ca156ca52962b6e0f9e91976796c49069f3fbc4162102351ab90694ba2d79ea065d3b30f178929c2bba1869badc43efaf4b49f96e78e7f6f16af42ffe168c WHIRLPOOL 4b1bf9d9d080632bca2834666f0332c5491c91df7b54732581fb30655ef2658efc46e5ad097b3d8bc3a5b531ded4331ac69215772d698978a67ecb06642e6886
 DIST usbutils-006.tar.xz 408420 SHA256 d9b5b5e7e5f797896e42efaa0a1f83089210bfed79312c1f04dd30b4f729ed0e SHA512 bb9129a47c2e2099f535dcdefdcd8ddc3c269d5b0b7982d38ce89ce2fb068efba47843cc5e3ba609c30754880b7730504584d1540908b1069253be1b4fd7f113 WHIRLPOOL 8a903479389f33c8e6104228d58e14763c9394f40e4ddfc86b58f7af10ba19aee60c7f0c9c7ce490144a576c01441d33a1c3d58d939bbda9a61e1e99ce3c1b7e
-DIST usbutils_005.orig.tar.gz 234751 SHA256 2a533e58d59aa2358610e40f807428c318984845864f9427ba48d2b34e9d5d17 SHA512 13b809d6428503f147341f51fa3ca0f6419c723c3c87022f7421adae58345ab7367eb7152a368e610b320708c12487a2a9402fd4eaa991f0d953430538f9ab86 WHIRLPOOL 5db751c5828be8f77dbe3f003ff6838bf26c0b6bcb4ae73f53ab8a8dbf382d6838ddeb125c3eaa4b641d7d474b3f2e7fce6837773cdd8509152679e5183fb2c0
 EBUILD usbutils-004.ebuild 1366 SHA256 7e4726cb68afe1f26ab34072879b58393fb9e95fc58b8588b511e8b25ec55b09 SHA512 8913a3514890950317ab74a04b6cfb5958702deda44465dce51f3e4664d57534c2083b4669e4d79ea60c3e23f3c14794db3ecfaa17863e5e664e7396c0a011ae WHIRLPOOL 41134414d69f13663dbb4d5446006a3944f3916577ec560eb6b4e56273086d953f2031023d8a1b9cc5e6cfc1a71a3adda8f88563a3f58103219ba4fda39bf584
-EBUILD usbutils-005-r1.ebuild 1651 SHA256 d1e2b4a345b840c17ce94fb1481bfe42f0be713a3f357dc07df6f301581cc3f6 SHA512 ddfe380c488b487fb27de1e24f62f93090330528cef963bf6155aec080741aa8bf87569b56e7e52fa69976ee5943276a8f5a28d53d4d2c354c996706e12a5542 WHIRLPOOL 0364b260d655e6816e9eb19f5e5b9a2e9107a1a98e0036e4e58bfda76fade274ed6da206e87a2dbf655f0c50f56ce5f43b5b05c88970d1eef4d60e00f43d2f82
-EBUILD usbutils-005.ebuild 1598 SHA256 86a40a5e1731e43e7244d675efd6527389eeaa972016841db3ccbc6dd95abc75 SHA512 7f4f44ae4383b964d4a72823b864781ab82c2d5326b01fcc1bd8b0cdcce20eef459394cd2d6f9e3c47bf2cac652a4b5d21956e6043e9f9b2250c9fb365d47b8c WHIRLPOOL c3eb894624f25073fa89cb41016caab3383c0c2d241b485758e7bf3696e2ef9815b57ab4ad88158743c2892bb92c4ad9ce8ae122b63405a758f784b85242fbf8
 EBUILD usbutils-006.ebuild 1565 SHA256 ee68916a53c6a3f36995530a8844f50f5524df13486fe1ea1c27b297ab4d6da8 SHA512 f288beb6a44c566330cc091d10d216564efd2b2de993c3ab3254e8dd972583fc998ac882bba89df61fcf8d904cd83f2e584395969bcc0ec6e1cf06dc24b57da1 WHIRLPOOL aa269125e17958f37d30b549f12d8be0c36626c0c084277909c292df82f5d62e7543f2a335bfccddeaa3f42b3ecc49c982949831ee045bc7ae94b1af87571a8f
-MISC ChangeLog 18491 SHA256 8266ab3c0360cf5506bf9f814ff746fcc0f7d88c3c000beee73b4a4a41fa9bd3 SHA512 187cb1047016bb1afea9c5ecde7ec7b45d690aab3d1ad421b80902a6ab3807fd0359a9adfb43534b51ee2c2fee85941b66a3056876728b52a1eca108b500b03e WHIRLPOOL 746c1a72543668750b1cceedf62095e4bdacb4c44b223d4b31953ac9a1d978d65337e3c7d97a067290dd6b123810e3aa0efc59f7c43e89bb5ed147f9d5b21186
+MISC ChangeLog 18645 SHA256 e89fcc64bcf0bdb8c130406c6bce1108db0fd5b30ead42c37ab8b58da0492f73 SHA512 a08ee5291e47ded2e389acc7c697d59f2c565c6329c18a6aebce7ba8d0fdbfe3197765aaaf3af19438a2da93b1c925cb03c4c0ef19fdd9b3163f30ef2f41c167 WHIRLPOOL e089edc4a671a512556571ee3a8e490f74f5bb269886e7d67b18561f53598801f0237759cec66f77a7bfda03cd5d3b05d5dab00193eba13100080ff9ff455d12
 MISC metadata.xml 252 SHA256 73bd60d4faf2d4cf923e02b80d531ced8e01c581fc8ae3d7271ae5abd6b14b91 SHA512 934bd5f977a20d4693aa6782d1e1b53987afc88623497f4900c75be477518b0a726d351dd0cc055ce378690e206f8a83ac84701f1aa1dd9d63706b6e7e0fc37c WHIRLPOOL 824fad73f4b8c145705f4b9e899d602cacb1806250b6b233e4490c8d7e5ce18ebab98c61a7a51b86a30b57f6e21a901db52b3d5d02d7e1a3686c4ff82b969d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQYEcsAAoJEEdUh39IaPFNj4cH/R/193+Ya7oJi0FTFI2VWeip
-wLl2NN3a9HaDq1GJppTc1UsQNrcgk2AB9hLi4Syd7gcRbiMhfLlvr9QNyiSwzoCr
-684IXvAuX1L21pcet3f4qg140fqTF4xxfRiDj3GwFNmGsXOedLjivFYSJ1YvEp6l
-pp9EzM6FxjnS2kclQKRyAuJcBi63W0MQXX0F7mPsgZPC6hhkc+HvrBG//bzh48hM
-fxnTeKfC3yMpjoj9fCjOn7XrKR1ZcOQyOhwMncnZ1xKixHPFv6WJOh4RJqpxrIhr
-0WGMicWzxyczMHL8A1on6OkBdNXpMofod4Z3fWNMSLGJD92GUXFMpmcxx5t89ow=
-=PhBQ
+iQEcBAEBCAAGBQJQYEezAAoJEEdUh39IaPFNg3EH/153rDL9coprJZcs3QLU30FH
+rXMYw9L3KNIyyrFEA8Pe3h1HP3tokFEzdFst0+SqdhsdfUFSfExMGorXXLS6RJj3
+RqfCBo/lQ5xUBuiqVbHnkjrYsTnpCRy/l3XV345Eqw8vqW7TXm+ieCMirKqRf51H
+ta8QqBsZC0TgZgk9oBAWrY3SI3F8Gz1bzNLHUYG3z3Fl4XOtUV8eH7fp1joAeFKS
+FOlA59KeUSufjDnXBvxqtnnOPVaBUD1cUkXRGVEmjvCQEglH7w0mLbREarby1aJ9
+ib4zRkETpULkFbEckY5Mo1+6Hk30Eur3VIoc0N4C8gMLJBcirvWb4FeAiwyu/jY=
+=cBCg
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/files/usbutils-005-missing-includes.patch b/sys-apps/usbutils/files/usbutils-005-missing-includes.patch
deleted file mode 100644
index 5d6d762d17b0..000000000000
--- a/sys-apps/usbutils/files/usbutils-005-missing-includes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This is 04-missing-includes.diff from Debian to resolve http://bugs.gentoo.org/394633
-
---- usbhid-dump/include/uhd/dev_list.h
-+++ usbhid-dump/include/uhd/dev_list.h
-@@ -27,6 +27,7 @@
- #ifndef __UHD_DEV_LIST_H__
- #define __UHD_DEV_LIST_H__
- 
-+#include <stddef.h>
- #include "uhd/dev.h"
- 
- #ifdef __cplusplus
---- usbhid-dump/src/usbhid-dump.c
-+++ usbhid-dump/src/usbhid-dump.c
-@@ -39,6 +39,7 @@
- #include <getopt.h>
- #include <stdio.h>
- #include <libusb-1.0/libusb.h>
-+#include <limits.h>
- 
- #include "config.h"
- 
diff --git a/sys-apps/usbutils/usbutils-005-r1.ebuild b/sys-apps/usbutils/usbutils-005-r1.ebuild
deleted file mode 100644
index dd0842a0695c..000000000000
--- a/sys-apps/usbutils/usbutils-005-r1.ebuild
+++ /dev/null
@@ -1,67 +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/usbutils/usbutils-005-r1.ebuild,v 1.5 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://debian/pool/main/u/${PN}/${PN}_${PV}.orig.tar.gz"
-#SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="python zlib"
-
-RDEPEND="virtual/libusb:1
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	sys-apps/hwids"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing-includes.patch
-
-	eautoreconf
-
-	if use python; then
-		python_convert_shebangs 2 lsusb.py
-		sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--datadir="${EPREFIX}/usr/share/misc" \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	rm "${ED}"/usr/share/misc/usb.ids* "${ED}"/usr/sbin/update-usbids.sh || die
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-
-	newbin "${FILESDIR}"/usbmodules.sh usbmodules
-}
-
-pkg_postinst() {
-	elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
-	elog "usb.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
-}
diff --git a/sys-apps/usbutils/usbutils-005.ebuild b/sys-apps/usbutils/usbutils-005.ebuild
deleted file mode 100644
index d59722c65bba..000000000000
--- a/sys-apps/usbutils/usbutils-005.ebuild
+++ /dev/null
@@ -1,66 +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/usbutils/usbutils-005.ebuild,v 1.5 2012/08/25 22:35:26 vapier Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit autotools eutils python
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://debian/pool/main/u/${PN}/${PN}_${PV}.orig.tar.gz"
-#SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${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 python zlib"
-
-RDEPEND="virtual/libusb:1
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	if use python; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing-includes.patch
-
-	eautoreconf
-
-	if use python; then
-		python_convert_shebangs 2 lsusb.py
-		sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--datarootdir=/usr/share \
-		--datadir=/usr/share/misc \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	# the package (currently) lacks plumbing to use the gzipped file
-	rm -f "${ED}"/usr/share/misc/usb.ids.gz
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-
-	mv "${ED}"/usr/sbin/update-usbids{.sh,} || die
-	newbin "${FILESDIR}"/usbmodules.sh usbmodules
-
-	use network-cron || return 0
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/${PN}.cron update-usbids
-}