[gentoo-commits] gentoo-x86 commit in net-fs/samba: samba-3.6.12.ebuild ChangeLog

[Zac Medico (zmedico)]

zmedico     13/02/25 08:17:30

  Modified:             samba-3.6.12.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.5                  net-fs/samba/samba-3.6.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild?r1=1.4&r2=1.5

Index: samba-3.6.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.12.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- samba-3.6.12.ebuild	18 Feb 2013 23:25:24 -0000	1.4
+++ samba-3.6.12.ebuild	25 Feb 2013 08:17:30 -0000	1.5
@@ -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 @@
 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 @@
 	# 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 @@
 		--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 @@
 		--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 @@
 		$(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 @@
 		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 @@
 
 	# 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"
 }
 



1.569                net-fs/samba/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.569&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.569&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.568&r2=1.569

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v
retrieving revision 1.568
retrieving revision 1.569
diff -u -r1.568 -r1.569
--- ChangeLog	22 Feb 2013 18:40:35 -0000	1.568
+++ ChangeLog	25 Feb 2013 08:17:30 -0000	1.569
@@ -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@g.o> samba-3.6.12.ebuild:
+  Fix for prefix and add ~arm-linux and ~x86-linux keywords.
 
   22 Feb 2013; Agostino Sarubbo <ago@g.o> samba-3.5.21.ebuild:
   Stable for arm, wrt bug #454798