Bug #270161: libusb cleanup. Compiles fine, don't have the hardware to test further.

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

7 files changed, 23 insertions, 17 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index a691fe5a0236..d0f9388843b9 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.119 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.120 2009/11/11 07:50:18 robbat2 Exp $
+
+  11 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> zaptel-1.2.18.ebuild,
+  zaptel-1.2.18-r1.ebuild, zaptel-1.2.24.ebuild, zaptel-1.2.26-r1.ebuild,
+  zaptel-1.2.27-r1.ebuild:
+  Bug #270161: libusb cleanup. Compiles fine, don't have the hardware to
+  test further.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> zaptel-1.2.18.ebuild,
   zaptel-1.2.18-r1.ebuild, zaptel-1.2.24.ebuild, zaptel-1.2.26-r1.ebuild,
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index 94a3d60fc03a..d3bc949ed025 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -22,10 +22,10 @@ DIST zaptel-1.2.18.tar.gz 3076214 RMD160 e051b06311681c281a70c4826705b2ab315377c
 DIST zaptel-1.2.24.tar.gz 3698419 RMD160 dae9da002162ad74d3324f0b0bad409af2585666 SHA1 4a45654ce392a8ba5a5d73a0a01ba8febfcc5c4b SHA256 2c00825461ac3605311f3be646fec0c95715954bbf71aca4eda105fea7895da0
 DIST zaptel-1.2.26.tar.gz 3731266 RMD160 47f584ea4d738b1bc12dc32a6694cd435004c4b5 SHA1 180d2697c773105b2adfe632254116e687447151 SHA256 73481e63596b45587f07aacca6906d298ab36e4b162f1af1af87fb99dcd5dda8
 DIST zaptel-1.2.27.tar.gz 3732992 RMD160 f41ab128a8ecce86a07efc1a697ae7cf1836137e SHA1 02d394a19a998dece198c108ea1b9830b7de0653 SHA256 7bf31ab4b3c4c9e833c9709ceb1d6e82c17fdbc5cbc9933b65ceb7ade4b79f8f
-EBUILD zaptel-1.2.18-r1.ebuild 11211 RMD160 0966507409db5f7cab090737a71d220355ce95c5 SHA1 16de718c73907b4fc3744c5b7db3fbd975f39b18 SHA256 c358bd4cd14442a78ed582238983efb2c949d4ce959582450d7ce3b0f69a0e09
-EBUILD zaptel-1.2.18.ebuild 9397 RMD160 22ebb0a4bd357faa8c6feb7d53f1cf90449a9856 SHA1 4b4b60503edd2f570d51eb9abfac563bb2dfa190 SHA256 4224c0e3ccb4d9269e2942cf4cb1f43b01c73b3b9e65581ba424c68072b3e168
-EBUILD zaptel-1.2.24.ebuild 8946 RMD160 ef1819f34f5601a18aab111d2dd62fc319772231 SHA1 1fbe3b314eafb94ea473428366603c5b50a1391e SHA256 dadab7809e8475afb3890de9689607515bc60580d5e502828e5b0236af4a9fa6
-EBUILD zaptel-1.2.26-r1.ebuild 9042 RMD160 009039e34812b5e3d245da57123afd88f5fbdbfe SHA1 352f42591881f82ce04c2160b195afc72ecc9aba SHA256 aad4cd85851246da3ebbf79a61a54a0e63bbbe665151d71f96fbcd21ba8fcfe8
-EBUILD zaptel-1.2.27-r1.ebuild 9284 RMD160 35b5c1182a08ab71ebda2a979bee4a3a0a4c5cb4 SHA1 61d883945c148ba3a49db4fb1d9b57b2b594451a SHA256 57d13719162d83e2c0319f46aa5414c4eef973f2285be23af9f4a6c36cba6f33
-MISC ChangeLog 23314 RMD160 21b2bf5f5730a7938e924c2e2232606080599c83 SHA1 37d9ce76451e3dadb2f180389841ea82e0ae10d6 SHA256 fcee7c50d2a7fffd868c86b163f42328110ed00edf79069fa2b07805d35648c5
+EBUILD zaptel-1.2.18-r1.ebuild 11214 RMD160 4bcc53b6d490df9e70606e594d9c569ffc647c10 SHA1 c1d28f5b42fcc884c9b3cadc75bd9032ab42ae4e SHA256 39a06e445c7d1f890bcd985a55efbb2bb127549a6ac0b94ef286922ca25c8ee9
+EBUILD zaptel-1.2.18.ebuild 9400 RMD160 570568e5934c852c017150d654aac9f14c8f2be4 SHA1 695f5902d69a3993ced84c2dc6166a891713befe SHA256 806b697b0549f82874597dca9073e7c3aebceae47abab2b9c95e881cfe070cb2
+EBUILD zaptel-1.2.24.ebuild 8949 RMD160 7ab5ad32b2fd04c4e0d66d18ceff65625881af5e SHA1 700dd41e5f772ee3ebc5f8a131c1deb192bab7da SHA256 04eb153cdea2596607885bb08084b2250223878205fdb17cf8fcb72504216e8d
+EBUILD zaptel-1.2.26-r1.ebuild 9045 RMD160 af4fe13da135071ce445710b29ac7d79a043c956 SHA1 f97a15e94f6cb83110bce009f65d2f491f971174 SHA256 13a77cee7a4a8d4b0ccb5fa93b92f46e51b51ef88d5db67a5fb0da6fa3983b56
+EBUILD zaptel-1.2.27-r1.ebuild 9287 RMD160 5a51569a55b7d62ea6c915231e8b01a8a6bc944c SHA1 9430adc5318321e76e4a0ed3c882a156d9e44942 SHA256 149440263c6a00976f3e0b0c57d97d08d3b86fb8f35c5c3d6ced17c985ce99fb
+MISC ChangeLog 23580 RMD160 b0248aa8102c527cfb7d359200a4d092a5358568 SHA1 cbfd7a0c4e4f6c4f372c4d95e3f581041fdc3f00 SHA256 8ed94e616d771be4a7c9d714ab3f65edca26d092377fb81cd0908e317ef42107
 MISC metadata.xml 1480 RMD160 27bd3bee78996d32f3d2f58f48219cd48dbc038b SHA1 d4e6c0d8f8de3cdfc606830cbad9b477e489420a SHA256 90da234d53bce387b5b12b022bdd55edf0e8a2ccb20518c2df46e9cb06e167e6
diff --git a/net-misc/zaptel/zaptel-1.2.18-r1.ebuild b/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
index 07ea56a7910f..5275969d1132 100644
--- a/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.4 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18-r1.ebuild,v 1.5 2009/11/11 07:50:18 robbat2 Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -32,7 +32,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="dev-libs/libusb
+RDEPEND="=virtual/libusb-0*
 	>=dev-libs/newt-0.50.0
 	astribank? ( dev-lang/perl )
 	ecoslec? ( dev-util/dialog )"
diff --git a/net-misc/zaptel/zaptel-1.2.18.ebuild b/net-misc/zaptel/zaptel-1.2.18.ebuild
index 5a3695c8a108..1b6ccc92a7dd 100644
--- a/net-misc/zaptel/zaptel-1.2.18.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.7 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.18.ebuild,v 1.8 2009/11/11 07:50:18 robbat2 Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -26,7 +26,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 
-RDEPEND="dev-libs/libusb
+RDEPEND="=virtual/libusb-0*
 	>=dev-libs/newt-0.50.0
 	astribank? ( dev-lang/perl )"
 
diff --git a/net-misc/zaptel/zaptel-1.2.24.ebuild b/net-misc/zaptel/zaptel-1.2.24.ebuild
index 2fbf423ba374..c90203c7b6b4 100644
--- a/net-misc/zaptel/zaptel-1.2.24.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.24.ebuild,v 1.3 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.24.ebuild,v 1.4 2009/11/11 07:50:18 robbat2 Exp $
 
 inherit toolchain-funcs eutils linux-mod flag-o-matic
 
@@ -27,7 +27,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc x86"
 
-RDEPEND="dev-libs/libusb
+RDEPEND="=virtual/libusb-0*
 	>=dev-libs/newt-0.50.0
 	astribank? ( dev-lang/perl )"
 
diff --git a/net-misc/zaptel/zaptel-1.2.26-r1.ebuild b/net-misc/zaptel/zaptel-1.2.26-r1.ebuild
index a36458de709e..bfd5678a6679 100644
--- a/net-misc/zaptel/zaptel-1.2.26-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.26-r1.ebuild,v 1.3 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.26-r1.ebuild,v 1.4 2009/11/11 07:50:18 robbat2 Exp $
 
 inherit toolchain-funcs eutils linux-mod flag-o-matic multilib
 
@@ -27,7 +27,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc ~x86"
 
-RDEPEND="dev-libs/libusb
+RDEPEND="=virtual/libusb-0*
 	>=dev-libs/newt-0.50.0
 	astribank? ( dev-lang/perl )"
 
diff --git a/net-misc/zaptel/zaptel-1.2.27-r1.ebuild b/net-misc/zaptel/zaptel-1.2.27-r1.ebuild
index 37d934eab90b..2f228a33f6fd 100644
--- a/net-misc/zaptel/zaptel-1.2.27-r1.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27-r1.ebuild,v 1.4 2009/09/23 19:50:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.27-r1.ebuild,v 1.5 2009/11/11 07:50:18 robbat2 Exp $
 
 inherit toolchain-funcs eutils linux-mod flag-o-matic multilib
 
@@ -27,7 +27,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~ppc x86"
 
-RDEPEND="dev-libs/libusb
+RDEPEND="=virtual/libusb-0*
 	>=dev-libs/newt-0.50.0
 	astribank? ( dev-lang/perl )"