diff options
author | 2013-02-25 08:17:30 +0000 | |
---|---|---|
committer | 2013-02-25 08:17:30 +0000 | |
commit | ccc88c358d4d7076473dca9262ce7ccba19a7fe1 (patch) | |
tree | c9ac3e4fc322136937f6c693189cefc4e1d53ceb /net-fs/samba | |
parent | old (diff) | |
download | gentoo-2-ccc88c358d4d7076473dca9262ce7ccba19a7fe1.tar.gz gentoo-2-ccc88c358d4d7076473dca9262ce7ccba19a7fe1.tar.bz2 gentoo-2-ccc88c358d4d7076473dca9262ce7ccba19a7fe1.zip |
Fix for prefix and add ~arm-linux and ~x86-linux keywords.
(Portage version: 2.2.0_alpha163_p13/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'net-fs/samba')
-rw-r--r-- | net-fs/samba/ChangeLog | 5 | ||||
-rw-r--r-- | net-fs/samba/samba-3.6.12.ebuild | 36 |
2 files changed, 22 insertions, 19 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index fa91ee9afff7..8736c586da06 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/samba # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.568 2013/02/22 18:40:35 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.569 2013/02/25 08:17:30 zmedico Exp $ + + 25 Feb 2013; Zac Medico <zmedico@gentoo.org> samba-3.6.12.ebuild: + Fix for prefix and add ~arm-linux and ~x86-linux keywords. 22 Feb 2013; Agostino Sarubbo <ago@gentoo.org> samba-3.5.21.ebuild: Stable for arm, wrt bug #454798 diff --git a/net-fs/samba/samba-3.6.12.ebuild b/net-fs/samba/samba-3.6.12.ebuild index 51965cf32dcd..c8337855d374 100644 --- a/net-fs/samba/samba-3.6.12.ebuild +++ b/net-fs/samba/samba-3.6.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild,v 1.4 2013/02/18 23:25:24 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild,v 1.5 2013/02/25 08:17:30 zmedico Exp $ EAPI=4 @@ -14,7 +14,7 @@ HOMEPAGE="http://www.samba.org/" SRC_URI="mirror://samba/stable/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="amd64 ~arm hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes swat syslog winbind" @@ -145,9 +145,9 @@ src_configure() { # anymore => LDAP? # - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default econf ${myconf} \ - --with-piddir=/var/run/samba \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ + --with-piddir="${EPREFIX}"/var/run/samba \ + --sysconfdir="${EPREFIX}"/etc/samba \ + --localstatedir="${EPREFIX}"/var \ $(use_enable debug developer) \ --enable-largefile \ --enable-socket-wrapper \ @@ -161,12 +161,12 @@ src_configure() { --disable-dnssd \ $(use_enable avahi) \ --with-fhs \ - --with-privatedir=/var/lib/samba/private \ - --with-rootsbindir=/var/cache/samba \ - --with-lockdir=/var/cache/samba \ - --with-swatdir=/usr/share/doc/${PF}/swat \ - --with-configdir=/etc/samba \ - --with-logfilebase=/var/log/samba \ + --with-privatedir="${EPREFIX}"/var/lib/samba/private \ + --with-rootsbindir="${EPREFIX}"/var/cache/samba \ + --with-lockdir="${EPREFIX}"/var/cache/samba \ + --with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \ + --with-configdir="${EPREFIX}"/etc/samba \ + --with-logfilebase="${EPREFIX}"/var/log/samba \ --with-pammodulesdir=$(getpam_mod_dir) \ $(use_with dmapi) \ --without-afs \ @@ -174,7 +174,7 @@ src_configure() { --without-vfs-afsacl \ $(use_with ldap) \ $(use_with ads) \ - $(use_with ads krb5 /usr) \ + $(use_with ads krb5 "${EPREFIX}"/usr) \ $(use_with ads dnsupdate) \ --without-automount \ $(use_with pam) \ @@ -188,7 +188,7 @@ src_configure() { $(use_with smbclient libsmbclient) \ $(use_with smbsharemodes libsmbsharemodes) \ $(use_with addns libaddns) \ - $(use_with cluster ctdb /usr) \ + $(use_with cluster ctdb "${EPREFIX}"/usr) \ $(use_with cluster cluster-support) \ $(use_with acl acl-support) \ $(use_with aio aio-support) \ @@ -371,7 +371,7 @@ src_install() { if use swat ; then insinto /etc/xinetd.d newins "${CONFDIR}/swat.xinetd" swat - script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" + script/installswat.sh "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}" fi dodoc ../MAINTAINERS.txt ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS @@ -418,10 +418,10 @@ src_install() { # Remove empty installation directories rmdir --ignore-fail-on-non-empty \ - "${D}/usr/$(get_libdir)/samba" \ - "${D}/usr"/{sbin,bin} \ - "${D}/usr/share"/{man,locale,} \ - "${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ + "${ED}/usr/$(get_libdir)/samba" \ + "${ED}/usr"/{sbin,bin} \ + "${ED}/usr/share"/{man,locale,} \ + "${ED}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \ # || die "tried to remove non-empty dirs, this seems like a bug in the ebuild" } |