Disable cups in samba-3.5 since it depends on old versions that were removed. Upgrade to 3.6 recommended for those that need printing

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

3 files changed, 10 insertions, 24 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 3e5be6ebeac9..02e40b244077 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.585 2013/07/20 17:44:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.586 2013/07/26 07:57:32 patrick Exp $
+
+  26 Jul 2013; Patrick Lauer <patrick@gentoo.org> samba-3.5.21.ebuild:
+  Disable cups in samba-3.5 since it depends on old versions that were removed.
+  Upgrade to 3.6 recommended for those that need printing
 
   20 Jul 2013; Jeroen Roovers <jer@gentoo.org> samba-4.0.6.ebuild,
   samba-4.0.7.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index afcd612cc1f9..052e5021854e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
 AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
@@ -42,18 +39,11 @@ DIST samba-3.6.16.tar.gz 34108738 SHA256 347c0abe608ad907d04e37948d0f82a2d9dd8da
 DIST samba-4.0.6.tar.gz 23949307 SHA256 63e53dc270d13231bed56b816c18793d8425f199b1a5efdaadc080f4d6911de3 SHA512 761fa945fdef1ddc7688e8482324aaec10f68252ff201b11739eac9863e3c4ee0d0207b87c735c529d7a62ae65785d146de7e9cd37fdac2c4463e1692635ee11 WHIRLPOOL c8d8ba019c2823da8e73b78496aa5fcfff4e518d66a2915b7fadc6337e18da8f6d379200b03eea0eebf2d6fdd49ae9828e2e1bc1ae5014206f54f21f39d25d02
 DIST samba-4.0.7.tar.gz 22078244 SHA256 e9ad36ff65a1d6b6a57f272aa08f844139ac2b5b1cb2257f1236aa2a8c864245 SHA512 84573c9fad7ad2f605661158faf70e3e57c6c15e814dd504314355055e73c58bd48bbdf2941203bb8c6dd36fb1635d3ba54a8a4534bf7a104d0c48e1bc063163 WHIRLPOOL f6001faf8cce7920d5b87ea6ed64a6f0d42f03a73162ae8bcf5b5fc6d0141cef3c038a3993e330008cc3dc445a8b4a388e9a62cb8d8f0bf4e4b4639ab0f5e146
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
-EBUILD samba-3.5.21.ebuild 12567 SHA256 4f7389da068ff867ec8c03afbc451e17580df49a13b4db16aea1532e5d77eb57 SHA512 344036c801e850d097d84f3b6badb83fb1777319d6d90caa8be5621e7a15e6011a07c1a30c7f8870bd302b686511940fef1e03179484a4c37b816e0ff6be06f5 WHIRLPOOL 3b099715d1c01cf241f1fcc6110725f3fb50fb9808aa58b02232ae7a545cc01a7c04bf886dbde14c85f6e12919dbf0aa4acb588d37a059d8db5bd1529a95c4e7
+EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.6.12.ebuild 12017 SHA256 b1a4ae0e490e6e3ecbdef24b9a50336e676cb39f6077044ef9e99f745e433147 SHA512 f377aa4ad20d5a05d31a492935251040e2a3c4522fb774fc2918d09d629480551a6eb359d1079fd4ed9eed9339985977d5f792358b0b74d426261e01dd662c6e WHIRLPOOL dd77e2be95a4766cce5dab5f06ae5f4064f0824a26018e191ba881cd2aec6a865762441f8f983114f21d58edcbc5dad8c75fe9409db2e4270a6aab64944b7153
 EBUILD samba-3.6.15.ebuild 12347 SHA256 70ceef21473641490f6a5b2c8ff8c2b0306fd6edf6578f278eab616a95b971f3 SHA512 2e474e0ae66f3b1b5041d839c199a6329640786c4a7b0fd34d76ca4246a25ea77464ab31f497d1c5febba2d9f0d582965f63355062dc37bd125037808fb0f4c4 WHIRLPOOL a39b87d43dc4102de248b3fa6b9c99107b4bf6f3427e978dffee2eab1ae24d42484ff0ed0630acb0089702c600281aa2d4b1d15d6414548878e8b4d67dac6a7a
 EBUILD samba-3.6.16.ebuild 12626 SHA256 256c7381cf163375c3bd326818ea387c94251dcf5a4c9c1316f4c4cd74f90638 SHA512 441bb8f987ebc769f42fb249e217525167ee96d4ffce992b8c19ccfbbfe775737081d1adc1b5f55122d0675731b5a0b7f1550fdb005ff60440b7d323825068ef WHIRLPOOL 19166ec8fa5ba8014245b757c325bbca35bd70f6dbb896816ffe219e8e8ca6a55ba8df49cbc8a3ad598eccc6307bf9de9702c0718127f2708dab42cfa7dc48d7
 EBUILD samba-4.0.6.ebuild 4097 SHA256 43ec31359a7c69ca91d7de591ea792a0b6fba78b83307a0962b065461c6a8ed4 SHA512 6d3d3ed127367a870bf64655eaa775042091ee38acc17d2af611bb1195b54920831c5d36a2551e7cd4fbd441842e96e80a4dd8f59f8a09359f715237d58ec9a8 WHIRLPOOL 516c7c0c86fa7ef40833c9749b535937638dd5c08b94cbed5c27fa5d8dcf5c8a2f8ad295a693b72600798b30d1611e5d6cd69fb5b7b9c24761d6417f55918e12
 EBUILD samba-4.0.7.ebuild 4216 SHA256 b86711044ab90162c1fa97827be696e080f81db31647e569a47e15d31ca2ba43 SHA512 a626231277e62a5454bf6af2dad43cba7a1c90fe83f2c506f26ab6d95a37ae5ce8b450b19b328dfba5f45e4bf745155a0cd31fc4d293854f142fd76bfd2136a8 WHIRLPOOL c7b17ffa79cab9957bb486317ba99819869c634c7864357a525faf80f436723b247c7bfe7630757597a9e977d8c200e0a948c9767dedc2c6d6aadcad7f9c3268
-MISC ChangeLog 96810 SHA256 0f74dcee5c34c107dc0de9426a82bb09ec93d38e80e32f9c523079d9de42d01c SHA512 eaccc24611b8f7b9f146275f5f9bbfb01c640d4f99ae236fb872daee41439f920753b798d9755e55f94f1380f9ba665957e9caf5c5f3af9e4498cae5c718a0c4 WHIRLPOOL 220c2c9a9f53cf1c81fae02affcd835649ae92ad4a193a2c098e76fdb1e7ffad9003b89aa07b27fe751bbafe88ea14f222b4bc3eb6139683ad123f7acbb739e6
+MISC ChangeLog 97024 SHA256 404f0a0478e3f2542c60aca388112df0f386fe623836880c26e3cc4274dcdb76 SHA512 cf5f43fccd514911645f108158fe21c8dc857bfdde82e3d50a77fe898cc8af9f0ae08b3d1fcbf01dca06305dad128480c0fb8c1f8eaba0a2e04a681406b2d197 WHIRLPOOL d82c0d0939ee208d6751836e54eb3cddbef89a8315035b0de42f8ff91ac6358e337954703a748e329b5d1de301fb7b4cf136bdf09abd99017a829e617e2ae047
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iEYEAREIAAYFAlHqzHUACgkQVWmRsqeSphMGJQCfQPZqrrzbsCi0JfBsqkWZ+wnA
-voEAn34LYPH68Sde4jgFQRxl5Y/qt1xV
-=OA5B
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.5.21.ebuild b/net-fs/samba/samba-3.5.21.ebuild
index 245cc4b21031..5aef07b80cde 100644
--- a/net-fs/samba/samba-3.5.21.ebuild
+++ b/net-fs/samba/samba-3.5.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.21.ebuild,v 1.14 2013/03/05 09:14:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.21.ebuild,v 1.15 2013/07/26 07:57:32 patrick Exp $
 
 EAPI=4
 
@@ -16,11 +16,10 @@ SRC_URI="mirror://samba/stable/${P}.tar.gz
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
+IUSE="acl addns ads +aio avahi caps +client cluster debug doc examples fam
 	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
 	swat syslog winbind"
 
-# upstream doesn't support cups 1.6 for samba 3.5
 DEPEND="dev-libs/popt
 	!net-fs/samba-client
 	!net-fs/samba-libs
@@ -36,7 +35,6 @@ DEPEND="dev-libs/popt
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( <net-print/cups-1.6 )
 	fam? ( virtual/fam )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam
@@ -91,7 +89,6 @@ pkg_setup() {
 		use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
 	fi
 
-	use cups && BINPROGS="${BINPROGS} bin/smbspool"
 	use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
 
 	if use winbind ; then
@@ -170,7 +167,7 @@ src_configure() {
 		--enable-socket-wrapper \
 		--enable-nss-wrapper \
 		$(use_enable swat) \
-		$(use_enable cups) \
+		--disable-cups \
 		--disable-iprint \
 		$(use_enable fam) \
 		--enable-shared-libs \
@@ -397,11 +394,6 @@ src_install() {
 		doman ../docs/manpages/{u,}mount.cifs.8
 	fi
 
-	# install the spooler to cups
-	if use cups ; then
-		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-	fi
-
 	# install misc files
 	insinto /etc/samba
 	doins ../examples/smb.conf.default