old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 14 insertions, 249 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index 7ff74189b923..6bf39bd3fda8 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.179 2014/04/07 16:50:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.180 2014/04/07 16:52:35 ssuominen Exp $
+
+  07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> -files/usbmodules.sh,
+  -files/usbutils.cron, -usbutils-004.ebuild, -usbutils-006-r1.ebuild,
+  -usbutils-006.ebuild:
+  old
 
   07 Apr 2014; Samuli Suominen <ssuominen@gentoo.org> usbutils-007.ebuild:
   Use PYTHON_REQUIRED_USE to abort early if required.
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 8aa3264f47e5..3bf8e983fe7e 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,26 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX usbmodules.sh 989 SHA256 096271d45255f27836274ce92e89456644b6fc68e3a784b9dd251d28a407c630 SHA512 3df1f3b4b61f3413c9cf992987a6744a5bf707101588786f0f92bbef92b5d07a7a90654f21924053f9b0309f326a1327488847127cc844bc665aded4adc3e543 WHIRLPOOL b23c7eb511db7c398c28bbc745fa2a7536e9c2fe1d8f40379b9efb36d168b7fbf12cad771bbe596e39156dd0340075edb482b6a2e5b2d222ed910544f4066d25
 AUX usbutils-006-stdint.patch 701 SHA256 da7ffae1b7169bbf32446cf5e63b0983d2f87bbef2cae0ce1b69acbd5ac3310e SHA512 8854846ec60652490401932a751e1e7ea61f59afa83447dd976ac351f898418777780b5e240c76771580aa8a879dbb63928adc053a3a95649dde5d9fab52798a WHIRLPOOL 73fca2e8de3da1745a78de495f9a1132b0b788c7b15f0ce5ff25f8c66ebd881d18089dcf76734d8c179bb5fcae1c9343db3767cff1d04143e11c374878d2643f
-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-007.tar.xz 418264 SHA256 7593a01724bbc0fd9fe48e62bc721ceb61c76654f1d7b231b3c65f6dfbbaefa4 SHA512 ee5c9ae4b39747139dbf2c0295d0556c2087002a99c1a1c6de9b87714c0ed37c277471794f0c53b15f4f9e4323527eb5d15d7e1197f73e04f2de6978d3d85987 WHIRLPOOL 4374ba416f2bd8678ebfed25e7d5f2fccc5e49abf80716b3b96915601e801ab07686905d5c45e9ae7e7bb40c16084e97a24afc9c35d0ca743e877eea320ab9af
-EBUILD usbutils-004.ebuild 1366 SHA256 7e4726cb68afe1f26ab34072879b58393fb9e95fc58b8588b511e8b25ec55b09 SHA512 8913a3514890950317ab74a04b6cfb5958702deda44465dce51f3e4664d57534c2083b4669e4d79ea60c3e23f3c14794db3ecfaa17863e5e664e7396c0a011ae WHIRLPOOL 41134414d69f13663dbb4d5446006a3944f3916577ec560eb6b4e56273086d953f2031023d8a1b9cc5e6cfc1a71a3adda8f88563a3f58103219ba4fda39bf584
-EBUILD usbutils-006-r1.ebuild 1277 SHA256 cd808825c7c8203c91c2af8a4fd9a4cda9ac2b7994d3bdc16b85cb4186a181d0 SHA512 b0cedc0218bc8bbf5af804cc97b724aa0a5ef7e166b6d4c77310ca3f940b345a63484041ecef004e9e180bffc7f1ba0b023fec26b3bf5f92e7ae1e78b9accb40 WHIRLPOOL 228766982b41b579a9c52b83d05d0d7d8f9c57c1dfa5400aa052b0db00a978e089315d4365e258d2aab88ae6f0a2e4851c0146f0b0c559049e2aa79364c0ecb1
-EBUILD usbutils-006.ebuild 1591 SHA256 056a56557e6c8057053980da81b7293f28f19012653b36c95e6cd620f351aa0c SHA512 94f756deba929d7cf1017dc9f024adeda63103cb70d24b0c9746d4bd5eb57d82674abc6dabfcdce6c69cdfa88435041d0a32da38e9cbdd771b394909613d5dde WHIRLPOOL 8b44043aede06f4e4d3eedf48dc9a267732221d9a485c99c190cb47b018fd2fd33f25140c45932f3694f32f54179a1559bb1158516ce68ecdda3839dd3567139
 EBUILD usbutils-007.ebuild 1354 SHA256 61513aa0853b5301f4a28c8102706a720379fb94187fcb68596bdc2165a48ca6 SHA512 044ee09ae6ce69a92942f64cc3e7e10290a836089a3a3893af593f11625fe2d7aec76668f08bc80e24e513a693d433ca1c3a3e60927ebe66d3c5275f04d7560f WHIRLPOOL 259767855ab8ca9dd75daf1dd3afe1f9dd9da4d41eba14c21abe931af1eb1b7ae0909d8983f7841cbbf45b867fc4515002207bb1dcfacc9d92247dfa6b383fc4
-MISC ChangeLog 23265 SHA256 5daa88a4630ea3befabfe7bae19080fb4778a971384e5b313bc01d7117ff75fc SHA512 2e5f250d30aa7b34a58e28981347e67843b39c6993a33b561b7a238f9ed12a9dea7550875b9ec9635cc7ac97bc386fb8484b0713c712ee32957f92ebf57a8a69 WHIRLPOOL 4bf19289a920ab9f8ea77cedba7dda162ddf614dec85c894045459cb3c59c40ea419df8c26169e928a65ff3a94e50e8bf376253ea1fbde19785f01d30dfea49a
+MISC ChangeLog 23443 SHA256 6839ee51f1d4c4593cc498e9cca5a59219b56ec503dfb6303b5d1a382fe5c718 SHA512 e1e73046b8d06ab83f5f685c891aae8a41b1f2c4c1857d7ddad48dc9ed6e57cec7895e8b7b118dc26e62fdd15ceee8031a30580dc492950fc33a21366e7e1834 WHIRLPOOL 8dab2770927951a3bd2245233101a7c8687628690d4da9c123da33b3219eabd4bec394053417e8d202f02096ab249d3a0223d85ccf3febb81e6cba551e958e4c
 MISC metadata.xml 252 SHA256 73bd60d4faf2d4cf923e02b80d531ced8e01c581fc8ae3d7271ae5abd6b14b91 SHA512 934bd5f977a20d4693aa6782d1e1b53987afc88623497f4900c75be477518b0a726d351dd0cc055ce378690e206f8a83ac84701f1aa1dd9d63706b6e7e0fc37c WHIRLPOOL 824fad73f4b8c145705f4b9e899d602cacb1806250b6b233e4490c8d7e5ce18ebab98c61a7a51b86a30b57f6e21a901db52b3d5d02d7e1a3686c4ff82b969d6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTQtYOAAoJEEdUh39IaPFNMv0H/jQqaBMB8cBY7DYi9NEMG57K
-QBNFNEafaDYwv7oMHWZyt91c/leWIcXrDVBxBxuZ0l5IewPiWiTcogvMzYN976Xp
-LCh/+y9bdJr0TrWWbbbfZaCJknnsJJzlGPEYbamUfnJyh7N34nQo7m6ERC9yH1bI
-Sj7vjsyN2QwAX7CoBiYlk5ZXBeLSUePSVLqVBkNCiSORUpjUzcnKA0TZ7n9GuZNr
-FII3DFPdamgUXwMO48st68+MSLa0amt1goueGicLmU/IVOIhEQXmu+XfHz3KCptK
-tQlgJDlo1g+e2LeAKhJQKJ7VDyGsPIMmKGvK3Fy6a7YUDOluh/+zOK5p6hDgiy8=
-=eZPD
+iQEcBAEBCAAGBQJTQtZxAAoJEEdUh39IaPFN0XcIAJhNXEJyqXKg3i/wdryIBslT
+/gSsCtGb/fL7UsX5gFOkSd1ihH2slAp8IGAZLzGhbnPt9xuxIYrKd3vSS1ep0HSk
+4ygRmoM/eMzD4iXFBa5d+VVa+xCPejUX1gxJq9AWbiewKsUDaIiOCbn3b3Lk7Rtz
+clAA1Sxhe2AqF0nApnBbJZ12T1omy2MERRNEYMVWglCh4gYkPXYgItAxYBlyT0CV
+HQScjH/ySnnq+uhKouqu9PFhFlKcA4gm3ZgYoR1LVEwMsi56BU6F4aE2nOrK7cTG
+EEbQC1ho3MeOcEXhwtIyadhgRQUBdckaYYgnuVCG1EGUaHrHf89GN0ClRpbg3zw=
+=mCPS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/files/usbmodules.sh b/sys-apps/usbutils/files/usbmodules.sh
deleted file mode 100755
index dfd89b7f307b..000000000000
--- a/sys-apps/usbutils/files/usbmodules.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-usage() {
-	cat <<-EOF
-	List relevant kernel modules for USB devices currently plugged in.  The
-	module list is taken from the modules installed in /lib/modules/<ver>/.
-
-	Usage: usbmodules [options] [kernel version]
-
-	Options:
-	  -m, --map <map>   Specify usbmap (default: /lib/modules/<ver>/modules.usbmap)
-	  -h, --help        This help screen
-	EOF
-	if [ -n "$*" ] ; then
-		echo
-		echo "Error: $*" 1>&2
-		exit 1
-	else
-		exit 0
-	fi
-}
-
-map=""
-
-while [ -n "$1" ] ; do
-	case $1 in
-		-m|--map)  map=$2; shift;;
-		-h|--help) usage;;
-		--)        break;;
-		-*)        usage "unknown option '$1'";;
-		*)         break;;
-	esac
-	shift
-done
-
-ver=${1:-$(uname -r)}
-map=${map:-/lib/modules/${ver}/modules.usbmap}
-
-for dev in $(lsusb | awk '{print $6}') ; do
-	[ "${dev}" = "0000:0000" ] && continue
-
-	IFS=:
-	set -- ${dev}
-	vendor=$1
-	product=$2
-	unset IFS
-
-	awk \
-		-v vendor="0x${vendor}" \
-		-v product="0x${product}" \
-		'vendor == $3 && product == $4 {print $1}' \
-		${map}
-done
-
-exit 0
diff --git a/sys-apps/usbutils/files/usbutils.cron b/sys-apps/usbutils/files/usbutils.cron
deleted file mode 100755
index 1018546d18fe..000000000000
--- a/sys-apps/usbutils/files/usbutils.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/update-usbids -q
diff --git a/sys-apps/usbutils/usbutils-004.ebuild b/sys-apps/usbutils/usbutils-004.ebuild
deleted file mode 100644
index e4b0b83ed396..000000000000
--- a/sys-apps/usbutils/usbutils-004.ebuild
+++ /dev/null
@@ -1,56 +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-004.ebuild,v 1.8 2012/05/04 09:17:26 jdhore Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit python
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/utils/usb/usbutils/${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() {
-	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() {
-	emake DESTDIR="${D}" install || die
-	use python || rm -f "${D}"/usr/bin/lsusb.py
-	mv "${D}"/usr/sbin/update-usbids{.sh,} || die
-	newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
-	dodoc AUTHORS ChangeLog NEWS README
-
-	use network-cron || return 0
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/usbutils.cron update-usbids || die
-}
diff --git a/sys-apps/usbutils/usbutils-006-r1.ebuild b/sys-apps/usbutils/usbutils-006-r1.ebuild
deleted file mode 100644
index e24a60ca2a40..000000000000
--- a/sys-apps/usbutils/usbutils-006-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006-r1.ebuild,v 1.14 2013/09/05 09:55:09 vapier Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="python zlib"
-
-RDEPEND="virtual/libusb:1=
-	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	sys-apps/hwids
-	python? ( ${PYTHON_DEPS} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdint.patch
-
-	sed -i -e '/^usbids/s:/usr/share:/usr/share/misc:' lsusb.py || die
-
-	use python && python_fix_shebang lsusb.py
-}
-
-src_configure() {
-	econf \
-		--datarootdir="${EPREFIX}/usr/share" \
-		--datadir="${EPREFIX}/usr/share/misc" \
-		--disable-usbids \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-}
diff --git a/sys-apps/usbutils/usbutils-006.ebuild b/sys-apps/usbutils/usbutils-006.ebuild
deleted file mode 100644
index 14dbcfc5d96e..000000000000
--- a/sys-apps/usbutils/usbutils-006.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-006.ebuild,v 1.12 2013/04/19 06:03:22 ssuominen Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit eutils python
-
-DESCRIPTION="USB enumeration utilities"
-HOMEPAGE="http://linux-usb.sourceforge.net/"
-SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="python zlib"
-
-RDEPEND="virtual/libusb:1
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	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}-stdint.patch
-
-	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" \
-		--disable-usbids \
-		$(use_enable zlib)
-}
-
-src_install() {
-	default
-	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
-
-	use python || rm -f "${ED}"/usr/bin/lsusb.py
-
-	newbin "${FILESDIR}"/usbmodules.sh usbmodules
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 006 ]]; then
-		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)."
-	fi
-}