support for cups 1.2 libs location (bug #133133), removed msdfs use flag (included by default: bug #127839)

Package-Manager: portage-2.1_rc1-r2

4 files changed, 28 insertions, 25 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index af58c193cb9c..b77a77fd6d9f 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.238 2006/04/28 23:10:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.239 2006/05/15 09:03:12 satya Exp $
+
+  15 May 2006; Christian Andreetta <satya@gentoo.org>
+  samba-3.0.22-r1.ebuild, samba-3.0.22-r2.ebuild:
+  support for cups 1.2 libs location (bug #133133), removed msdfs use flag
+  (included by default: bug #127839)
 
   28 Apr 2006; Jason Wever <weeve@gentoo.org> samba-3.0.22.ebuild:
   Stable on SPARC wrt bug #124632.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 898f801d9a19..7cb89c73a1d7 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -42,22 +42,22 @@ EBUILD samba-3.0.21c-r1.ebuild 8718 RMD160 c64f6e0bc5c8442e6bab0df81f56b95f64248
 MD5 3e03c846184396b342ea840fe7a4b5af samba-3.0.21c-r1.ebuild 8718
 RMD160 c64f6e0bc5c8442e6bab0df81f56b95f6424877b samba-3.0.21c-r1.ebuild 8718
 SHA256 468255300550c0e661b043bf2774e1c14d91d2016af3340fb1180d8c1be7c8e7 samba-3.0.21c-r1.ebuild 8718
-EBUILD samba-3.0.22-r1.ebuild 8766 RMD160 b695ef4d04df051cc31dbf2f21be3ab74ae2989a SHA1 fe2cde206283950574f8bc4796f0ecc5016c1571 SHA256 a40342629e7ff6a07c18992ba997c1fe4d32e161a428aa1218bed53af9684c19 size 8766
-MD5 1c5f835c90c13a8c771fd6de5eef6aed samba-3.0.22-r1.ebuild 8766
-RMD160 b695ef4d04df051cc31dbf2f21be3ab74ae2989a samba-3.0.22-r1.ebuild 8766
-SHA256 a40342629e7ff6a07c18992ba997c1fe4d32e161a428aa1218bed53af9684c19 samba-3.0.22-r1.ebuild 8766
-EBUILD samba-3.0.22-r2.ebuild 8775 RMD160 c71faa36c5f28f96b5f78c3c25cfe23d7155d229 SHA1 f22ce737d160b8f9164ccc85d633f5e734a0fb81 SHA256 9e780245c28a8fef0f5582b39517434b10eb3528145222455af67adeeab386b6 size 8775
-MD5 8623528b15ce9b7435c0880af951d47d samba-3.0.22-r2.ebuild 8775
-RMD160 c71faa36c5f28f96b5f78c3c25cfe23d7155d229 samba-3.0.22-r2.ebuild 8775
-SHA256 9e780245c28a8fef0f5582b39517434b10eb3528145222455af67adeeab386b6 samba-3.0.22-r2.ebuild 8775
+EBUILD samba-3.0.22-r1.ebuild 8752 RMD160 12053b1df7ea18cab46eb05b76410b70a9512a88 SHA1 5e4d02297fcec357e34db421cbc2363e3a7f4c55 SHA256 5a661ac72d9d46085a92faf86a03293d9d1974bbaa72a587504ad731f086c008 size 8752
+MD5 d8986c871b5f231a8582f2708cfde729 samba-3.0.22-r1.ebuild 8752
+RMD160 12053b1df7ea18cab46eb05b76410b70a9512a88 samba-3.0.22-r1.ebuild 8752
+SHA256 5a661ac72d9d46085a92faf86a03293d9d1974bbaa72a587504ad731f086c008 samba-3.0.22-r1.ebuild 8752
+EBUILD samba-3.0.22-r2.ebuild 8761 RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 SHA1 0b2485336ace89a508ae17c28f087ec92ced02bd SHA256 8d256f095ee75369e64932e38fdcd0a4e209e955e8ddd31bd1139a51a92d30c5 size 8761
+MD5 6bc60b39072774c77513eb77bfa59380 samba-3.0.22-r2.ebuild 8761
+RMD160 2a4bc86b3d879bb342f338530c29011f4a33a1f2 samba-3.0.22-r2.ebuild 8761
+SHA256 8d256f095ee75369e64932e38fdcd0a4e209e955e8ddd31bd1139a51a92d30c5 samba-3.0.22-r2.ebuild 8761
 EBUILD samba-3.0.22.ebuild 8724 RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96 SHA1 cc7cd0ee6025857979f76eeda19640b7a3d8c1ae SHA256 99b421e9eace4a7c3fcc80c2f2e32a59569920d8dc7f1fdd8197d0643e2b778f size 8724
 MD5 35d2ea945dc397a1d54c65a7e308a93b samba-3.0.22.ebuild 8724
 RMD160 7776c1bb38ee3447d627aaf286c41ed71f2a2b96 samba-3.0.22.ebuild 8724
 SHA256 99b421e9eace4a7c3fcc80c2f2e32a59569920d8dc7f1fdd8197d0643e2b778f samba-3.0.22.ebuild 8724
-MISC ChangeLog 41441 RMD160 2eef87eb527d1c0be4e13436f7467532510ea44e SHA1 447e1d8aa91248c39e5e1e059a38dcaa13232f1f SHA256 b804873a27ac5e6cee17983139502456056b9a6cc06c0bcb516af16f4ccb2bdb size 41441
-MD5 040f119e28eed74810ed18c21c32e728 ChangeLog 41441
-RMD160 2eef87eb527d1c0be4e13436f7467532510ea44e ChangeLog 41441
-SHA256 b804873a27ac5e6cee17983139502456056b9a6cc06c0bcb516af16f4ccb2bdb ChangeLog 41441
+MISC ChangeLog 41658 RMD160 f5d35a53fd567c8ed55459c55714cfc91f4506dd SHA1 59ceae1a4e09f1778b4b38260b0338ca6ef55d59 SHA256 28d582957d49021b814e148b5d7bda8fa643964f6fc413edbef8b9cd731bf0cb size 41658
+MD5 ea4c2b125f5a2c1d138d6a34aed74ffe ChangeLog 41658
+RMD160 f5d35a53fd567c8ed55459c55714cfc91f4506dd ChangeLog 41658
+SHA256 28d582957d49021b814e148b5d7bda8fa643964f6fc413edbef8b9cd731bf0cb ChangeLog 41658
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493 size 491
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
diff --git a/net-fs/samba/samba-3.0.22-r1.ebuild b/net-fs/samba/samba-3.0.22-r1.ebuild
index b398f373a035..4c41941c674b 100644
--- a/net-fs/samba/samba-3.0.22-r1.ebuild
+++ b/net-fs/samba/samba-3.0.22-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r1.ebuild,v 1.1 2006/04/27 12:36:49 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r1.ebuild,v 1.2 2006/05/15 09:03:12 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav
-	msdfs mysql oav pam postgres python quotas readline selinux swat syslog
+	mysql oav pam postgres python quotas readline selinux swat syslog
 	winbind xml xml2"
 RESTRICT="test"
 
@@ -121,7 +121,6 @@ src_compile() {
 		$(use_with automount) \
 		$(use_enable cups) \
 		$(use_with kerberos krb5) \
-		$(use_with msdfs) \
 		$(use_with pam) $(use_with pam pam_smbpass) \
 		$(use_with python) \
 		$(use_with quotas) $(use_with quotas sys-quotas) \
@@ -196,10 +195,10 @@ src_install() {
 	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
 	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
 
-	# make the smb backend symlink for cups printing support..
+	# make the smb backend symlink for cups printing support (bug #133133)
 	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
+		dodir $(cups-config --serverbin)/backend
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
 	fi
 
 	# VFS plugin modules
diff --git a/net-fs/samba/samba-3.0.22-r2.ebuild b/net-fs/samba/samba-3.0.22-r2.ebuild
index b0e4e405e90d..5be648ff96b1 100644
--- a/net-fs/samba/samba-3.0.22-r2.ebuild
+++ b/net-fs/samba/samba-3.0.22-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r2.ebuild,v 1.1 2006/04/27 17:06:36 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.22-r2.ebuild,v 1.2 2006/05/15 09:03:12 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
 IUSE="acl async automount cups doc examples kerberos ldap ldapsam libclamav
-	msdfs mysql oav pam postgres python quotas readline selinux swat syslog
+	mysql oav pam postgres python quotas readline selinux swat syslog
 	winbind xml xml2"
 RESTRICT="test"
 
@@ -121,7 +121,6 @@ src_compile() {
 		$(use_with automount) \
 		$(use_enable cups) \
 		$(use_with kerberos krb5) \
-		$(use_with msdfs) \
 		$(use_with pam) $(use_with pam pam_smbpass) \
 		$(use_with python) \
 		$(use_with quotas) $(use_with quotas sys-quotas) \
@@ -196,10 +195,10 @@ src_install() {
 	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so.0
 	dosym samba/libsmbclient.so /usr/$(get_libdir)/libsmbclient.so
 
-	# make the smb backend symlink for cups printing support..
+	# make the smb backend symlink for cups printing support (bug #133133)
 	if use cups; then
-		dodir /usr/$(get_libdir)/cups/backend
-		dosym ../../../bin/smbspool /usr/$(get_libdir)/cups/backend/smb
+		dodir $(cups-config --serverbin)/backend
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
 	fi
 
 	# VFS plugin modules