shared modules fix (bug #140602)

Package-Manager: portage-2.1

3 files changed, 23 insertions, 21 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7a9f662c8eab..8e654cce4368 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # 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.253 2006/07/23 15:46:10 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.254 2006/07/24 12:14:53 satya Exp $
+
+  24 Jul 2006; Christian Andreetta <satya@gentoo.org> samba-3.0.23a.ebuild:
+  shared modules fix (bug #140602)
 
 *samba-3.0.23a (23 Jul 2006)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ae92830c342b..26827ce8cfb3 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -49,14 +49,14 @@ EBUILD samba-3.0.23.ebuild 8725 RMD160 793246b318580bc52e2dd85f9a55777eda61d2e5
 MD5 23b872056433d1c59db6d34b7af91c1f samba-3.0.23.ebuild 8725
 RMD160 793246b318580bc52e2dd85f9a55777eda61d2e5 samba-3.0.23.ebuild 8725
 SHA256 52e8dfb7fca3ada327538e8f5b409ca3af2c9ed571fb5ef4361c7d32e2e30fc0 samba-3.0.23.ebuild 8725
-EBUILD samba-3.0.23a.ebuild 8381 RMD160 b4a6a9634dfdd283d01ae38eec0aefb83b2b4588 SHA1 410429c66ef89e6603f9aea2457965ecacce5abb SHA256 2082406bd38560ff77f8a51467cfbb3f8e70a4101856be6514201a7ff6453116
-MD5 43deaa6e610e48a8cdd0d3e71ecd2856 samba-3.0.23a.ebuild 8381
-RMD160 b4a6a9634dfdd283d01ae38eec0aefb83b2b4588 samba-3.0.23a.ebuild 8381
-SHA256 2082406bd38560ff77f8a51467cfbb3f8e70a4101856be6514201a7ff6453116 samba-3.0.23a.ebuild 8381
-MISC ChangeLog 43885 RMD160 4d70d8f52d2406423c64845f440c8d9bb2d3abdd SHA1 929485ee1711adafa28d6daca22f02928609592d SHA256 1f21a8dd1276addcfbc017a424082bc9d3b9486bbf3ffd97a7b26350a124c173
-MD5 46f7a0d0bd0b65386abceaa8e02d4fa5 ChangeLog 43885
-RMD160 4d70d8f52d2406423c64845f440c8d9bb2d3abdd ChangeLog 43885
-SHA256 1f21a8dd1276addcfbc017a424082bc9d3b9486bbf3ffd97a7b26350a124c173 ChangeLog 43885
+EBUILD samba-3.0.23a.ebuild 8205 RMD160 2fb34be9543e5113e94964f6170e2d4652843789 SHA1 83d7fc7d9e9bf25b37617361230b10aadaac1868 SHA256 787db0fd98db9b8cea7a1fe3f707f579f6d21291089812f001b29662c37114e9
+MD5 ed3ddde3f2417bf83df941804e7927b7 samba-3.0.23a.ebuild 8205
+RMD160 2fb34be9543e5113e94964f6170e2d4652843789 samba-3.0.23a.ebuild 8205
+SHA256 787db0fd98db9b8cea7a1fe3f707f579f6d21291089812f001b29662c37114e9 samba-3.0.23a.ebuild 8205
+MISC ChangeLog 43997 RMD160 95bdd67ca7f2b1c685a37d916ef3ce7967e88f97 SHA1 c4897a329d8f05f20ad69937ed291ef301a7fcf2 SHA256 b5900571f44ca57f6241253d91d62bad3ae5ed51173f3dd3894a9ba80802949c
+MD5 c408a343b7ed7b2576ae4ce2a34d9f1e ChangeLog 43997
+RMD160 95bdd67ca7f2b1c685a37d916ef3ce7967e88f97 ChangeLog 43997
+SHA256 b5900571f44ca57f6241253d91d62bad3ae5ed51173f3dd3894a9ba80802949c ChangeLog 43997
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
diff --git a/net-fs/samba/samba-3.0.23a.ebuild b/net-fs/samba/samba-3.0.23a.ebuild
index fe626b7c0069..bc2e0960a072 100644
--- a/net-fs/samba/samba-3.0.23a.ebuild
+++ b/net-fs/samba/samba-3.0.23a.ebuild
@@ -1,11 +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.23a.ebuild,v 1.1 2006/07/23 15:46:10 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.23a.ebuild,v 1.2 2006/07/24 12:14:53 satya Exp $
 
 inherit eutils versionator
 
 IUSE_LINGUAS="ja pl"
-IUSE="acl async automount cups doc examples kerberos kernel_linux ldap ldapsam
+IUSE="acl async automount cups doc examples kerberos kernel_linux ldap
+	linguas_ja linguas_pl
 	oav pam python quotas readline selinux swat syslog winbind"
 #RESTRICT="test" # tests are enabled with --enable-socket-wrapper
 
@@ -75,19 +76,17 @@ src_compile() {
 
 	local myconf
 	local mylangs
+	local mymod_shared
 
-	mylangs="en"
+	mylangs="--with-manpages-langs=en"
 	use linguas_ja && mylangs="${mylangs},ja"
 	use linguas_pl && mylangs="${mylangs},pl"
-	myconf="${myconf} --with-manpages-langs=${mylangs}"
 
+	use winbind && mymod_shared="--with-shared-modules=idmap_rid"
 	if use ldap; then
-		myconf="${myconf} $(use_with ldap) $(use_with kerberos ads)"
-		myconf="${myconf} $(use_with ldapsam)"
-	else
-		myconf="${myconf} --without-ldapsam $(use_with ldap)"
+		myconf="${myconf} $(use_with kerberos ads)"
+		use winbind && mymod_shared="${mymod_shared},idmap_ad"
 	fi
-	use winbind && myconf="${myconf} $(use_with winbind) --with-shared-modules=idmap_rid,idmap_ad"
 
 	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
 	use hppa && myconf="${myconf} --disable-pie"
@@ -111,13 +110,15 @@ src_compile() {
 		$(use_with automount) \
 		$(use_enable cups) \
 		$(use_with kerberos krb5) \
+		$(use_with ldap) \
 		$(use_with pam) $(use_with pam pam_smbpass) \
 		$(use_with python) \
 		$(use_with quotas) $(use_with quotas sys-quotas) \
 		$(use_with readline) \
 		$(use_with kernel_linux smbmount) \
 		$(use_with syslog) \
-		${myconf} || die
+		$(use_with winbind) \
+		${myconf} ${mylangs} ${mymod_shared} || die
 
 	emake proto || die "SAMBA make proto error"
 	emake everything || die "SAMBA make everything error"
@@ -286,8 +287,6 @@ pkg_postinst() {
 		einfo "swat must be enabled by xinetd:"
 		einfo "    change the /etc/xinetd.d/swat configuration"
 	fi
-	einfo "As of 3.0.20: New USE flags: syslog, automount, async (default: disabled)"
-	einfo "As of 3.0.20b: New USE flags: ldapsam, swat (default: disabled)"
 	einfo "Latest info: README.gentoo in documentation directory"
 }