Remove the swat binary if USE=swat since it will be unusable otherwise #138026.

Package-Manager: portage-2.1.2_rc3-r5

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 6b1bd490713c34b0b36ba022df9db8a9f696d392..ac4bd99e25a8a4e61c16d1c2d143f5fa42b0af94 100644 (file)
--- 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.260 2006/12/17 03:26:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.261 2006/12/17 21:35:20 vapier Exp $
+
+  17 Dec 2006; Mike Frysinger <vapier@gentoo.org> samba-3.0.23d.ebuild:
+  Remove the swat binary if USE=swat since it will be unusable otherwise #138026.
 
 *samba-3.0.23d (17 Dec 2006)
 

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index a75d872176cf4d6b5a457d0d83b15b6e5bfea900..3fed3696e61657aa7029f0578b00782f132bc85c 100644 (file)
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -58,14 +58,14 @@ EBUILD samba-3.0.23a.ebuild 8217 RMD160 90c43ca5eac274e1965c7609fec576f9ad8c89bc
 MD5 d46f902b92a4a3d77b7899fd90e888ad samba-3.0.23a.ebuild 8217
 RMD160 90c43ca5eac274e1965c7609fec576f9ad8c89bc samba-3.0.23a.ebuild 8217
 SHA256 11a6692c5619413eee274d57d9d2ffb7a9ad162209fedca87f80db6f4a7ad3e3 samba-3.0.23a.ebuild 8217
-EBUILD samba-3.0.23d.ebuild 8246 RMD160 d2672d1b5afcb4e97490cc793bf12918f1f9b0f8 SHA1 4f339d08e64f9392612568a457a4d6d6b0aefd3a SHA256 597da5ad529bbd74333d190500a89ec65b4934d3ca33a58b54345d81f8f5cbf9
-MD5 1413bb02c5c92c92e3b2fbc705262458 samba-3.0.23d.ebuild 8246
-RMD160 d2672d1b5afcb4e97490cc793bf12918f1f9b0f8 samba-3.0.23d.ebuild 8246
-SHA256 597da5ad529bbd74333d190500a89ec65b4934d3ca33a58b54345d81f8f5cbf9 samba-3.0.23d.ebuild 8246
-MISC ChangeLog 44951 RMD160 02d4575c28d645a13ec555da7dec2eb09176cbb4 SHA1 759c215b9a68e3182ef118a5939ee89f86cb74e9 SHA256 019e69447394f7bd573e05a94847215c52d2a0ac1cefc151f1360bcda9742bc9
-MD5 6796b020d5e758ca0fe3c191719aa4d9 ChangeLog 44951
-RMD160 02d4575c28d645a13ec555da7dec2eb09176cbb4 ChangeLog 44951
-SHA256 019e69447394f7bd573e05a94847215c52d2a0ac1cefc151f1360bcda9742bc9 ChangeLog 44951
+EBUILD samba-3.0.23d.ebuild 8379 RMD160 83c4b7db112d03a45b2dea903c6bd83cd374eb07 SHA1 0a4d9d11c338d5858904a5f0370a3a0ef9b6e488 SHA256 6353b9b93a2ef8b024071ea74bce9c7d99b11f496a2e06396dfc7254906cc8f1
+MD5 be8ccd0f1cc5c7d833d52c69e3a7cb69 samba-3.0.23d.ebuild 8379
+RMD160 83c4b7db112d03a45b2dea903c6bd83cd374eb07 samba-3.0.23d.ebuild 8379
+SHA256 6353b9b93a2ef8b024071ea74bce9c7d99b11f496a2e06396dfc7254906cc8f1 samba-3.0.23d.ebuild 8379
+MISC ChangeLog 45106 RMD160 bf833ee8965710eadf4629e46d129b54600dd3a3 SHA1 e784e6bc160f820d8b904848935acc3a55860991 SHA256 8dab6aeb3b371bdc0b2405bf18cf792c9c2654c0f92faa17943c2ae23bd1b684
+MD5 673fbdea2b408dff7066352d4fd38b39 ChangeLog 45106
+RMD160 bf833ee8965710eadf4629e46d129b54600dd3a3 ChangeLog 45106
+SHA256 8dab6aeb3b371bdc0b2405bf18cf792c9c2654c0f92faa17943c2ae23bd1b684 ChangeLog 45106
 MISC metadata.xml 491 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 SHA1 0e2b7b349b3494ce9c4a96dbedd970ca07e8394c SHA256 f6534dfe5249b4f1482818d56c36126ae4681eb5b7d24dbf985f6be6f2c58493
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 RMD160 a168f5ebf64e25d8c80c1c33220b2695ae8f3645 metadata.xml 491
@@ -103,7 +103,7 @@ SHA256 30f6f8be83fa2e02aabfbed9e619367d82f4e70c67e9baeab97fdd451b8f4d2e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFhLkKK9sYciBdMQMRApNcAJ9FUy3qi5g0qaZLSgprabRi3lo+WgCghs5O
-jX3mtyaL04GHoR2UKOjo274=
-=w6K1
+iD8DBQFFhbgiK9sYciBdMQMRAiQYAJ9ep7c6BFb1d74P7nkW6SXo43NhJQCfaFvI
+c64cU3QizJFI2oiv7s6gXqI=
+=AEqZ
 -----END PGP SIGNATURE-----

diff --git a/net-fs/samba/samba-3.0.23d.ebuild b/net-fs/samba/samba-3.0.23d.ebuild
index cfd7404f7bf05fd04f73efce10fa0e74a85c8a93..a37847f6e963305f980e76f5bee68af632e51c9f 100644 (file)
--- a/net-fs/samba/samba-3.0.23d.ebuild
+++ b/net-fs/samba/samba-3.0.23d.ebuild
@@ -1,6 +1,6 @@
 # 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.23d.ebuild,v 1.1 2006/12/17 03:26:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.23d.ebuild,v 1.2 2006/12/17 21:35:20 vapier Exp $
 
 WANT_AUTOCONF="latest"
 inherit eutils autotools versionator
@@ -210,8 +210,13 @@ src_install() {
 
        newpamd ${CONFDIR}/samba.pam samba
        use winbind && doins ${CONFDIR}/system-auth-winbind
-       insinto /etc/xinetd.d
-       newins ${CONFDIR}/swat.xinetd swat
+       if use swat ; then
+               insinto /etc/xinetd.d
+               newins ${CONFDIR}/swat.xinetd swat
+       else
+               rm -f "${D}"/usr/sbin/swat
+               rm -f "${D}"/usr/share/man/man8/swat.8
+       fi
        newinitd ${CONFDIR}/samba-init samba
        newconfd ${CONFDIR}/samba-conf samba
        if use ldap ; then
@@ -244,17 +249,17 @@ src_install() {
 
        if use examples ; then
                docinto examples
-               cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
-               chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
-               chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
+               cp -pPR ${S2}/examples/* "${D}"/usr/share/doc/${PF}/examples
+               find "${D}"/usr/share/doc/${PF} -type d -print0 | xargs -0 chmod 755
+               find "${D}"/usr/share/doc/${PF}/examples ! -type d -print0 | xargs -0 chmod 644
        fi
 
        if ! use doc ; then
                if ! use swat ; then
-                       rm -rf ${D}/usr/share/doc/${PF}/swat
+                       rm -rf "${D}"/usr/share/doc/${PF}/swat
                else
-                       rm -rf ${D}/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
-                       rm -rf ${D}/usr/share/doc/${PF}/swat/using_samba
+                       rm -rf "${D}"/usr/share/doc/${PF}/swat/help/{guide,howto,devel}
+                       rm -rf "${D}"/usr/share/doc/${PF}/swat/using_samba
                fi
        fi