diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-17 21:35:20 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-17 21:35:20 +0000 |
| commit | 13afb29e577e8a79b76c4b7b7296e7694ad8a6e7 (patch) | |
| tree | a870590127989bafe4a1b499a70e77ecf1ec5c52 /net-fs | |
| parent | adding nemiver-0.2.0 (diff) | |
| download | gentoo-2-13afb29e577e8a79b76c4b7b7296e7694ad8a6e7.tar.gz gentoo-2-13afb29e577e8a79b76c4b7b7296e7694ad8a6e7.tar.bz2 gentoo-2-13afb29e577e8a79b76c4b7b7296e7694ad8a6e7.zip | |
Remove the swat binary if USE=swat since it will be unusable otherwise #138026.
(Portage version: 2.1.2_rc3-r5)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/samba/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.0.23d.ebuild | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 6b1bd490713c..ac4bd99e25a8 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.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/samba-3.0.23d.ebuild b/net-fs/samba/samba-3.0.23d.ebuild index cfd7404f7bf0..a37847f6e963 100644 --- 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 |