No need to depend on net-print/cupsddk anymore now that cups-1.4 is stable.

Package-Manager: portage-2.1.10.3/cvs/Linux i686

4 files changed, 15 insertions, 13 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index d903d390c2fc..5b85da91a224 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.193 2011/07/25 18:17:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.194 2011/08/15 19:09:46 billie Exp $
+
+  15 Aug 2011; Daniel Pielmeier <billie@gentoo.org> hplip-3.11.5.ebuild,
+  hplip-3.11.7.ebuild:
+  No need to depend on net-print/cupsddk anymore now that cups-1.4 is stable.
 
 *hplip-3.11.7 (25 Jul 2011)
 
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 572fa7fa9571..f76043f8a5a6 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -12,14 +12,14 @@ AUX hplip-3.9.12-cupsddk.patch 1265 RMD160 4f4cea73c0cfc6e830b27f4945e123e3cd490
 AUX hplip-3.9.12-systray.patch 795 RMD160 23a37fb76a05aa9f835dfef7ee00cf70366f95dc SHA1 11d85332f0200f14bb4492c1528cebb2af72d6f0 SHA256 a2eee24cefe2f40b81bc735fb528dec932864b083bb0cf1305d5d7a8cc5bd719
 DIST hplip-3.11.5.tar.gz 21227642 RMD160 8a87f201aac95253d0ac1765e21aa094f11389f8 SHA1 e3604752b7a1ab0f492a1b4d470f8fa75e8959e5 SHA256 611f677fc1a0d2d493d44bfe84e5e5aaac4124627e94885f57bc77db9178536c
 DIST hplip-3.11.7.tar.gz 21286283 RMD160 aa95d10384689d563ebc8eef151faa5d5b2a3c7a SHA1 82a41c3089392ab096a5d373ce8610ff50b004b2 SHA256 820d73bad6dbd8df774e1e234eb27cae9a6e797466e2261c75db51ba38e4001d
-EBUILD hplip-3.11.5.ebuild 7575 RMD160 1b17cb60012f0dbbbaac6cb948b603de7ebca866 SHA1 6e21c89bf4a3988a4d231186e651bdf01173aaa3 SHA256 6f8a901ad60cc628713140fd51fc96261ad6192270f7ae7215412237077570d2
-EBUILD hplip-3.11.7.ebuild 7645 RMD160 4dc7178106b44dd6fab657d8edf27247852ddceb SHA1 34120cb7d48f69b58f0a61281502b241fcbe29ac SHA256 664eda71d107de71e22b44f736d64f272952cb7df723e1a31966528694c80aa9
-MISC ChangeLog 33395 RMD160 f3332d19ec81a2a746bb635483dc7f061ec90fcf SHA1 8f1e47095f0395c72eaf2a4f7cb367eab890b85d SHA256 161c3f74e3d8a58af94f522dc5528de4ca77f94496199e23e7d3f0a90b70d5b4
+EBUILD hplip-3.11.5.ebuild 7512 RMD160 4a02626f58c9635bc6186244f06dc354ebf4279f SHA1 8b0788a5e34ac1565485feedfeb0af521ca18de1 SHA256 84d238d27507d080bdeab75ea0e0775e26e3512350446fe7deaa95346a51cc07
+EBUILD hplip-3.11.7.ebuild 7586 RMD160 f00f4dd4f179f2d8c6d422bb122e0e533a21e7f0 SHA1 ea04799bd97c197e846cda853949406094e10c6f SHA256 4c3286d6bcc2994c7a10e54dfc716da3f7b501d20383694493aa6a3bcea2905e
+MISC ChangeLog 33570 RMD160 39ea7ed166c4033a9f8fadc7dd1f015311f77515 SHA1 763dd57cf49c4154f5975101a591467bc8a01d2a SHA256 6fff367812d18654b0f98e6515055b070c0ff883a45a2ae6db04bd2cb3b8dc6a
 MISC metadata.xml 1806 RMD160 e707e0dfafb5138991bd381897b2cfdc101592e6 SHA1 7b62985602d07602626bc27078eec3744935cb29 SHA256 351d1d208236544a9a693902bcbcf16e32640f9e049ea0b2326dc1f1a13ad8bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4ts3AACgkQlcuUeyFa0U36jwCgoVUpaUCeu+D6JtI5MJ1qCVX5
-JaMAoJfV8AsrnK2/80F0f+Q2H0+aIoMu
-=g8gw
+iEYEAREIAAYFAk5JbxQACgkQlcuUeyFa0U32VACgqs6TGIooE0vfEWbqBXVGEao4
+mMUAoNjJBsfdDKDTVvM3TPi4V3/IxS10
+=E3e4
 -----END PGP SIGNATURE-----
diff --git a/net-print/hplip/hplip-3.11.5.ebuild b/net-print/hplip/hplip-3.11.5.ebuild
index 60238b49db71..d643a2ff25f3 100644
--- a/net-print/hplip/hplip-3.11.5.ebuild
+++ b/net-print/hplip/hplip-3.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5.ebuild,v 1.5 2011/07/23 18:35:30 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.5.ebuild,v 1.6 2011/08/15 19:09:46 billie Exp $
 
 EAPI=3
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 		dev-libs/openssl
 	)
 	!minimal? (
-		net-print/cups
+		>=net-print/cups-1.4.0
 		virtual/libusb:0
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		fax? ( sys-apps/dbus )
@@ -42,7 +42,6 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	>=app-text/ghostscript-gpl-8.71-r3
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	!minimal? (
 		dev-python/pygobject
 		kernel_linux? ( >=sys-fs/udev-114 )
diff --git a/net-print/hplip/hplip-3.11.7.ebuild b/net-print/hplip/hplip-3.11.7.ebuild
index ea7bef57c582..e4c51c2bc224 100644
--- a/net-print/hplip/hplip-3.11.7.ebuild
+++ b/net-print/hplip/hplip-3.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.7.ebuild,v 1.1 2011/07/25 18:17:55 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.7.ebuild,v 1.2 2011/08/15 19:09:46 billie Exp $
 
 EAPI=3
 
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 		dev-libs/openssl
 	)
 	!minimal? (
-		net-print/cups
+		>=net-print/cups-1.4.0
 		virtual/libusb:0
 		scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
 		fax? ( sys-apps/dbus )
@@ -42,7 +42,6 @@ DEPEND="${COMMON_DEPEND}
 
 RDEPEND="${COMMON_DEPEND}
 	>=app-text/ghostscript-gpl-8.71-r3
-	!static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
 	!minimal? (
 		dev-python/pygobject
 		kernel_linux? ( >=sys-fs/udev-114 )