Depend on hotplug-base instead of hotplug thanks to Heiko Baums <heiko@baums-on-web.de> in bug 142604

Package-Manager: portage-2.1.1_pre4-r3

4 files changed, 22 insertions, 17 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 5fe456034797..8dbc07ef20d9 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.39 2006/07/20 12:28:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.40 2006/08/05 18:22:23 genstef Exp $
+
+  05 Aug 2006; Stefan Schweizer <genstef@gentoo.org> hplip-0.9.7-r3.ebuild,
+  hplip-1.6.6a.ebuild:
+  Depend on hotplug-base instead of hotplug thanks to Heiko Baums
+  <heiko@baums-on-web.de> in bug 142604
 
 *hplip-1.6.6a (20 Jul 2006)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 0df73e54596a..3fabcd84e7f1 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -7,18 +7,18 @@ DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd99
 DIST hplip-0.9.7-2.patch 25718 RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 SHA1 825a134734cee1fc9a06c8de60cfe1825d47fa54 SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c
 DIST hplip-0.9.7.tar.gz 9705231 RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 SHA1 b354a6cf8f5b81f9242c3978c2ab22c752e4f77d SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6
 DIST hplip-1.6.6a.tar.gz 10447071 RMD160 546d4f86c715f760aebff57ba59f08ef4bd20e36 SHA1 899b2c9ac61e2ee5d00432ff1a5142180f73c9a3 SHA256 e87ab9bc4e4a3229dafc154f91d9860a9ae15532118bfad7fb791331340a9d8d
-EBUILD hplip-0.9.7-r3.ebuild 3340 RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 SHA1 83a924ce9c380c81484c05bd0f2416634d4c080e SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810
-MD5 2a697d2ed8239bac96c2ce2cf6627bfc hplip-0.9.7-r3.ebuild 3340
-RMD160 a4572e28563351444d27c2f47cb40278b4e77bd7 hplip-0.9.7-r3.ebuild 3340
-SHA256 604da063ec27ab779d7b5edd67286016a328db5c9c3a2fd7af5f67d1845fd810 hplip-0.9.7-r3.ebuild 3340
-EBUILD hplip-1.6.6a.ebuild 3301 RMD160 8fbc2e04317a249a092f96e0818cd46f1f507acc SHA1 8f98c44a87febf73705ecbf0f0a9a808debf0187 SHA256 00c2bc9af76848658155a412b3dcf377567bd54c57bffbf20ba27da178b4be5f
-MD5 99bb3ce8be6b13617073c9a5e7575604 hplip-1.6.6a.ebuild 3301
-RMD160 8fbc2e04317a249a092f96e0818cd46f1f507acc hplip-1.6.6a.ebuild 3301
-SHA256 00c2bc9af76848658155a412b3dcf377567bd54c57bffbf20ba27da178b4be5f hplip-1.6.6a.ebuild 3301
-MISC ChangeLog 6769 RMD160 84ce8cad4d5fe21b07715f8cd046c0e789e2d805 SHA1 d6859f956ada00b2e050752a58c06c56d95ef7c7 SHA256 4e7aef2b11acda21fb41f89ef45b5430e4879f6a710d7eaecf7c3f9f2579cee9
-MD5 2de620aa8b216f33d35f736ec37acf48 ChangeLog 6769
-RMD160 84ce8cad4d5fe21b07715f8cd046c0e789e2d805 ChangeLog 6769
-SHA256 4e7aef2b11acda21fb41f89ef45b5430e4879f6a710d7eaecf7c3f9f2579cee9 ChangeLog 6769
+EBUILD hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c SHA1 ab473af0d48815e1d42116cd2c0030b6bf43661a SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5
+MD5 fb6b1a96f35c7cbdda733461183b38a3 hplip-0.9.7-r3.ebuild 3346
+RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c hplip-0.9.7-r3.ebuild 3346
+SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5 hplip-0.9.7-r3.ebuild 3346
+EBUILD hplip-1.6.6a.ebuild 3306 RMD160 c4fae13019160a1effa1da2efd2fc95c701cf4e7 SHA1 d3813a2df5e1328514a5c456fcd37d5bbddbd6e8 SHA256 62f100899d0c28282796a067b8a0b70e911f20c2041e60938d40f2f413a62f39
+MD5 803fdb84162bef2d5d61d29048673da0 hplip-1.6.6a.ebuild 3306
+RMD160 c4fae13019160a1effa1da2efd2fc95c701cf4e7 hplip-1.6.6a.ebuild 3306
+SHA256 62f100899d0c28282796a067b8a0b70e911f20c2041e60938d40f2f413a62f39 hplip-1.6.6a.ebuild 3306
+MISC ChangeLog 6975 RMD160 395b5f9b9f59f81e5a37a81d7b3b48dde6b2e81a SHA1 e13968bbdb0eea238349faf2d9653b71274838e5 SHA256 45fb84bb8771341815cdaa4ff4af415743740b958f61dda3f38c924c43f14ac1
+MD5 6f4e2b1b644c9787db7c6b0f568ef22a ChangeLog 6975
+RMD160 395b5f9b9f59f81e5a37a81d7b3b48dde6b2e81a ChangeLog 6975
+SHA256 45fb84bb8771341815cdaa4ff4af415743740b958f61dda3f38c924c43f14ac1 ChangeLog 6975
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/hplip/hplip-0.9.7-r3.ebuild b/net-print/hplip/hplip-0.9.7-r3.ebuild
index 00977d5b6742..6140f921cff1 100644
--- a/net-print/hplip/hplip-0.9.7-r3.ebuild
+++ b/net-print/hplip/hplip-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.10 2006/06/24 04:40:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.11 2006/08/05 18:22:23 genstef Exp $
 
 inherit eutils
 
@@ -32,7 +32,7 @@ RDEPEND="virtual/ghostscript
 		)
 	)
 	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )
+	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug-base )
 	net-print/cups
 	foomaticdb? ( net-print/foomatic-db-engine )
 	>=net-print/foomatic-filters-3.0.2
diff --git a/net-print/hplip/hplip-1.6.6a.ebuild b/net-print/hplip/hplip-1.6.6a.ebuild
index 2326374e2044..dc8166663425 100644
--- a/net-print/hplip/hplip-1.6.6a.ebuild
+++ b/net-print/hplip/hplip-1.6.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6a.ebuild,v 1.1 2006/07/20 12:28:50 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.6a.ebuild,v 1.2 2006/08/05 18:22:23 genstef Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ RDEPEND="virtual/ghostscript
 	)
 	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
 	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug
+	sys-apps/hotplug-base
 	net-print/cups
 	foomaticdb? ( net-print/foomatic-db-engine )
 	>=net-print/foomatic-filters-3.0.2