Fixing krbplugin install, and server examples location, bug #320953 , patch thanks to Honza Macháček <Hloupy.Honza@centrum.cz>

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

3 files changed, 29 insertions, 21 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 0d7e36981437..decc16d3c409 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.418 2010/05/21 17:31:08 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.419 2010/05/24 21:56:45 vostorga Exp $
+
+  24 May 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.3.ebuild:
+  Fixing krbplugin install, and server examples location, bug #320953 ,
+  patch thanks to Honza Macháček <Hloupy.Honza@centrum.cz> 
 
   21 May 2010; Víctor Ostorga <vostorga@gentoo.org> samba-3.5.3.ebuild:
   Fixing build with USE=ads winbind, patch thanks to Rainer Ruecker
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 2cdd0789752d..43e8fa95fdd1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -67,7 +67,7 @@ EBUILD samba-3.4.6.ebuild 10276 RMD160 d93c3ceb9379ea30725e97c31385e407057511c5
 EBUILD samba-3.4.8.ebuild 10279 RMD160 8b074f156261ac02ccea0498128baaa111cb49c5 SHA1 54aa753544d2364222595ff6e2e696fb71a53c55 SHA256 406ac133473a56f6a35987f483dd11e7891d0c41b16ff1e7c479304444d4430d
 EBUILD samba-3.5.0.ebuild 10367 RMD160 3747350a7c8fb15ba076a61335fb9c2232787d8e SHA1 8ad51a352093142f65971f84761b12092205f2e1 SHA256 acf23ab0b379185db2d2577da1bf078687b6bb3047ac497153264c464b99cc99
 EBUILD samba-3.5.2-r1.ebuild 10383 RMD160 e696906d98534964483c9ea731dd0e5377d0440e SHA1 f4f53d3fd39152ca575234c1f61fc88306b54da0 SHA256 e39214300e0fbdb2f8e401772a53b425eba4678c09c5a6f769f67610dbed60e0
-EBUILD samba-3.5.3.ebuild 10971 RMD160 46098d1f9624e1d3d9b5d4acbe54f7a6c0b67e7b SHA1 3e5442d18a790fc63a815c6c0c9713914f7722ca SHA256 a1e9280099c1ca4d4040c07a83c5e0139ac19d23a101e2eae19b8eabe7f11e76
+EBUILD samba-3.5.3.ebuild 11023 RMD160 2ccd1ebd8a0a8849bf0fc32ba8ec2e8c8e347af8 SHA1 ba12cb10b9b524a6dbf2c250653ae7f561edadc9 SHA256 896c1ceac5e4b4cc3cb079f7aa46d475dba05e9b67a081f35b0494b305a59bef
 EBUILD samba-4.0.0_alpha11.ebuild 4156 RMD160 d63bbf124c3fde8d264da490122a0826dda1aa13 SHA1 4bd67529b6094b91349e138614ba36075e5912c5 SHA256 619c7c38aa499083e3ee7ba06f681851b76a4456c1b8e8f3d4f3c998eaccda58
-MISC ChangeLog 69570 RMD160 cedd6e664684ec5fe82c23c86aa3bb4185ba7c45 SHA1 8601b9a9c704a0baa27410da5839b2d604369aa5 SHA256 1524aa4ac8c7778d32b06ec795d14c92f120c4b6239475ecf8ca4918777fc498
+MISC ChangeLog 69778 RMD160 69d8fa135367b2ebad3a8553cd980a608d65ffd8 SHA1 d96f13bbd35f0c5b28d365e30406887e80cb300d SHA256 7720fd6ea71af04de4f5e8170126956d8687bdb10abaecdd38b4145ebf7bdb06
 MISC metadata.xml 1678 RMD160 fc5f6a9674053523edb993fda99f75789e995231 SHA1 7a3f710083ab340eb139281a0d9d94af1aaa4927 SHA256 afeddf0c54227bcdd40ccc67c65b5ee8809cbba447d0500773270d89de7d044e
diff --git a/net-fs/samba/samba-3.5.3.ebuild b/net-fs/samba/samba-3.5.3.ebuild
index 5dcb775e3b4a..ab6d4a960b93 100644
--- a/net-fs/samba/samba-3.5.3.ebuild
+++ b/net-fs/samba/samba-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.3 2010/05/21 17:31:08 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.3.ebuild,v 1.4 2010/05/24 21:56:45 vostorga Exp $
 
 EAPI="2"
 
@@ -285,19 +285,21 @@ src_install() {
 	done
 
 	# install krbplugin
-	if has_version app-crypt/mit-krb5 ; then
-		insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
-		doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-		${KRBPLUGIN}${PLUGINEXT} failed"
-	elif has_version app-crypt/heimdal ; then
-		insinto /usr/$(get_libdir)/plugin/krb5
-		doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
-		${KRBPLUGIN}${PLUGINEXT} failed"
+	if [ -n "${KRBPLUGIN}" ] ; then
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+			${KRBPLUGIN}${PLUGINEXT} failed"
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT} || die "installing
+			${KRBPLUGIN}${PLUGINEXT} failed"
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
+		done
 	fi
-	insinto /usr
-	for prog in ${KRBPLUGIN} ; do
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
 
 	# install server components
 	if use server ; then
@@ -344,7 +346,9 @@ src_install() {
 	fi
 
 	# install the spooler to cups
-	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	if use cups ; then
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
 
 	# install misc files
 	insinto /etc/samba
@@ -362,7 +366,6 @@ src_install() {
 
 	# install examples
 	if use examples ; then
-		einfo "install examples"
 		insinto /usr/share/doc/${PF}/examples
 
 		if use smbclient ; then
@@ -374,9 +377,10 @@ src_install() {
 		fi
 
 		if use server ; then
-			doins -r \
-				auth autofs dce-dfs LDAP logon misc pdb perfcounter \
-				printer-accounting printing scripts tridge validchars VFS
+			cd ../examples
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+			perfcounter printer-accounting printing scripts tridge \
+			validchars VFS
 		fi
 	fi