slp and ldap code is gone in trunk, but we have bonjour now

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

3 files changed, 27 insertions, 20 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index ec353db33838..c978a8adef28 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.477 2012/05/12 01:47:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.478 2012/05/16 22:50:21 dilfridge Exp $
+
+  16 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-9999.ebuild:
+  slp and ldap code is gone in trunk, but we have bonjour now
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> cups-1.5.2-r21.ebuild:
   keyword ~amd64-fbsd
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 46766bb5dcea..2f9bc1ec18f1 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX cups-1.4.0-backend-https.patch 483 RMD160 b338f67ebf0719b5e12eaa8490affbd7a1bb8c0e SHA1 bfeadba67792203d654a64bdec16f3d2a31aeca6 SHA256 9060a5d848d6655db4629822d01fd772a3fbe1a5107109c50cb0ecb4de7a9526
 AUX cups-1.4.2-str3200.patch 1654 RMD160 cc40d26f7e9dbe5a12d9426535d09de10254da26 SHA1 b330108bcfb8ca3ab5d6dd3b48dc3d2937c7bca1 SHA256 8a64f5c72d64ecd95d330fd90630eb02a67865c07921ecb0c010e84b49b537e0
@@ -30,13 +30,23 @@ EBUILD cups-1.4.8-r1.ebuild 7238 RMD160 bcaea5c73607b67db0ddf167028e478e570bb1d2
 EBUILD cups-1.4.8-r23.ebuild 8848 RMD160 0346363cf60979a04b7e626c396b8f558c47e868 SHA1 85dea1ec0d908183257675ac4748ceec57f7f72b SHA256 767556a6135e68aeaff967599dab0a6716c1d8cd0d1309ac8d8f12eadd118646
 EBUILD cups-1.5.2-r21.ebuild 8818 RMD160 950cbee9276b721a0dd1ea3ece8102effe2b5551 SHA1 d2859cc7077152ffa302f44c2f0b5993c0f847d5 SHA256 7f2b4202bee2e10202ce26954a959c56628ef2f93be3ea6a5f5e4e946acb629a
 EBUILD cups-1.5.2-r4.ebuild 8314 RMD160 ca98a87bce824f4fa1cf347ce53c485f8068f416 SHA1 fdd41190e50c2f1356acf0094813fa092b9af6b9 SHA256 0a5b2af35abc1680d405d2134e74a251748d314ccd8415c71a304193ae73cb50
-EBUILD cups-9999.ebuild 7807 RMD160 ac3e841edeec89193a1703eb8423072a2a9fb90a SHA1 8da56eb0e1d2c7500f75ea4509fc7721033c94f9 SHA256 f320677d3e8b484d6c2e39113e62739ea01302e0bc6dbe49cba82050aef6f3e6
-MISC ChangeLog 72661 RMD160 2032931450313dd1d455a00d7042bd70a2dc8f5b SHA1 6095aff7756cd4a3ddc4ab2e89e6d9dfd0bc194b SHA256 109f97238f45d36efbc4a2e42bf8bc91660e3039b00379e4ab6185b970d2225e
+EBUILD cups-9999.ebuild 7598 RMD160 a8d1d0e357025201cc0e2a4855a90f2a13010ca7 SHA1 7464ad99f5cf3e29ba66ef6b1e12a2f07a29c89a SHA256 ed8d34f4e6d615dc2c4c9a4b1d99194a2fb537b4b16ad54d327a7301be1f0a92
+MISC ChangeLog 72800 RMD160 4362d2640e2398605101a761044c840e0120f641 SHA1 74fead0559f4e7b2f80569c6be9ea952b7b6991f SHA256 e54a46d6899b7cc148681e558fc9490ca0aa723a602f6ce5ca4fe49907349383
 MISC metadata.xml 778 RMD160 39d95458b469079b683adf4f2e79eb0b803ce0b9 SHA1 62b298bb9c5435716ce81550213ccd086ec065aa SHA256 26a8d1221a4334579f98705c38f3e3a882c223df86181dcf7968eac2118188b8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+twSYACgkQvFcC4BYPU0oWLACeItpPfkVIQq20wkjKjyF0xluy
-OOMAoMH2c3QW7yf/T3RAZNNVFMa0oCkk
-=cWWr
+iQIcBAEBCgAGBQJPtC9VAAoJENwGBM22xffeT+0P/3jNfHP/Qr2jY1jOr3V656DH
+GFvwL0YVax40QXWof0ld/9MqHGQgka1/uVIjFQafQngJoYU86aTq6wfWd3ALW2i2
+QCz0EQnYfyoRcCRpwhW2O1azUkMrL513cSuFHW9gTknogou+KNqi6nTcVgIcLvf1
+EZmKF3XQtmQUe220Hxlj4Gc3gBCQCGmwwOJqKD6BRcdXgIrFhUPOGTYwnP3AtVX8
+rcylADBpl6YQa6Y/GnWD/ZLf35al/yzbuEed6kldC7HBEUvEZd+mVikinQzSqcXz
+HjoFnc217OcpsgdqYOVOWOJ0z+1bXMNnrs4en6SXv3HhFz2snocLbK5AEceZTuZr
+EqALTJiwvgCBq4FwGSGWFKIoLxjq9/5zJ0qESxh55+zU1QBZIE5vWZrjLt4TVM7T
+mqiuVF9DpiZCGVYE0C2yKpzQjFSDNgULjtUJBXXmM9a7Yyi/eMDV5J4qTtDUtPdf
+LgEUMwNtk/VRRl+JOw2YpN2I9MOvNneY53cbzaIClZlSL31TyjAp5I16A2g9NpCo
+ydxp+j4Dn+5sGLL+Y6YS/R9zsopnrR+ypzj1vus7tLTiJOnN3Mc/1G8aDMyM+O8a
+RBNc87/PFCMQB0UEO6cKyfp8r2/vMFjV7+O0aXKhaKksAkasKY5z2DYg5MeC0gGn
+RieAXeiCT8ibho98+1mc
+=TGRK
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 7639bd9cb25f..135de51d410f 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.2 2012/05/08 23:00:40 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.3 2012/05/16 22:50:21 dilfridge Exp $
 
 EAPI=4
 
@@ -11,10 +11,7 @@ MY_PV=${PV/_}
 
 if [[ "${PV}" != "9999" ]]; then
 	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd
-	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
-		http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
-		http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
-	"
+	SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
 else
 	inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd subversion
@@ -27,8 +24,8 @@ HOMEPAGE="http://www.cups.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="acl avahi dbus debug +filters gnutls java kerberos ldap pam
-	python slp +ssl static-libs systemd +threads usb X xinetd"
+IUSE="acl avahi dbus debug +filters gnutls java kerberos pam
+	python +ssl static-libs systemd +threads usb X xinetd zeroconf"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -47,9 +44,7 @@ RDEPEND="
 	dbus? ( sys-apps/dbus )
 	java? ( >=virtual/jre-1.6 )
 	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap[ssl?,gnutls?] )
 	pam? ( virtual/pam )
-	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
 		gnutls? (
 			dev-libs/libgcrypt
@@ -61,6 +56,7 @@ RDEPEND="
 	usb? ( virtual/libusb:0 )
 	X? ( x11-misc/xdg-utils )
 	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( net-misc/mDNSResponder )
 "
 
 DEPEND="${RDEPEND}
@@ -179,19 +175,17 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
 		$(use_enable kerberos gssapi) \
-		$(use_enable ldap) \
 		$(use_enable pam) \
-		$(use_enable slp) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
 		$(use_enable usb libusb) \
+		$(use_enable zeroconf dnssd) \
 		$(use_with java) \
 		--without-perl \
 		--without-php \
 		$(use_with python) \
 		$(use_with xinetd xinetd /etc/xinetd.d) \
 		--enable-libpaper \
-		--disable-dnssd \
 		$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \
 		${myconf}