Fix for prefix and add ~arm-linux and ~x86-linux keywords.

Package-Manager: portage-2.2.0_alpha163_p13/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

3 files changed, 28 insertions, 35 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/Manifest b/net-fs/samba/Manifest
index de9d4e3df07b..62297073f9cd 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
@@ -36,26 +36,16 @@ DIST samba-4.0.3.tar.gz 22051995 SHA256 ab5d3618632f8869c838c0b2994b3f169da68248
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.15.ebuild 12458 SHA256 2837e33a487578958d53e1bb39762a7426d3b698392da6e63534502f6e9ec74f SHA512 24f10e3ad829d198ffaa7d00deb9692240688fe787827c1bea243e002ebc92f28b23d8c967d4701154dd19ca00d2bd5d5f7c8613bf667209395a29195ef44ce7 WHIRLPOOL 6638a9ad91fdd88152a3d3826d6efb1f1e4e486c472bc46a79a46c994a80e05ec4535915155b8314eb79d617aa0bfa82f49b7a73d5d5a5eee6a8d8753b81864b
 EBUILD samba-3.5.21.ebuild 12452 SHA256 98dbdc11504235a1e4d6af34ea02f22046fdb76a998577ed536317a7f531486b SHA512 d6e763c1f1262a73d8508c778ee788f69e77a85bc5207b0b0c43cb691800721ccef4b929da4f49794220f9ce7e45cf5f0323a0834918b2b49c22f9fa27bb853a WHIRLPOOL eccccfe4936974f3df86bf9a4e50e6c696b8ab5cd82580a68fb2aaf3d4ee502f4fd35696eac501a2b0894a4a8eeb1c21a94b00fdf2321c7d001f2907a7af1fef
-EBUILD samba-3.6.12.ebuild 11853 SHA256 ebad2bf87439221b4991707460b1440d075da5e0fe6a69f6dfb8851de5d2bc5b SHA512 1c9193e6d30054521be30e03d767254d9cd2c6ad58f2c01eac39b432b65eb9a837b08b69fd1ed3417abc7c40a416dd3082bd5298a53c1a234f6ffdcb6517b3b7 WHIRLPOOL b4314338f618e2a48277abcba7398aeec00293d81e47d4fc1afcb26e506ebccdf1f18061990b5e24374926ef0dc35cfe28f8f9e7980cb32958a76f0eb0e5d067
+EBUILD samba-3.6.12.ebuild 12017 SHA256 b1a4ae0e490e6e3ecbdef24b9a50336e676cb39f6077044ef9e99f745e433147 SHA512 f377aa4ad20d5a05d31a492935251040e2a3c4522fb774fc2918d09d629480551a6eb359d1079fd4ed9eed9339985977d5f792358b0b74d426261e01dd662c6e WHIRLPOOL dd77e2be95a4766cce5dab5f06ae5f4064f0824a26018e191ba881cd2aec6a865762441f8f983114f21d58edcbc5dad8c75fe9409db2e4270a6aab64944b7153
 EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
 EBUILD samba-4.0.2.ebuild 4091 SHA256 1e98fe4280d0883d74fbbcad0a408e341f0b4841d9c8492b9eb03370f7c98461 SHA512 1645c73b0786baec9bf9892397f5ad8f281da2f91b5c9e628094bfbb4292000afe36db728175b0aabcc43e15eee4fc9658c762df97e8c09fb4923ae3fabd5034 WHIRLPOOL 412795b1d190d48b9e459165b5f2b5ee9d375d46c6d550fad9627d5a5d47b66d73f94de0490280a6208ee0f1612d1cde79a5f89c6a953f177c6852053097ec2c
 EBUILD samba-4.0.3.ebuild 4091 SHA256 3cec4ee01956da07971fe00e1f775c026646ed4552942b404b016f0a28506edb SHA512 6937780e7213912dc205b17acdd08ceb05245b434dedce711ff5d2e22ee8ca402a8a2f78abe16139de6a5e7a19bc9dd414ee12fbd05c821449e633785cf82113 WHIRLPOOL 9791ddd2a865a4afd3cf02a67eef67cb129762e8ff94be0c2d7bcb30017c598ba4a540cb124e792e7dd8973f16d42b6515f60c79a1bd59d721a09b223d366974
-MISC ChangeLog 94010 SHA256 aa6431c907b75dc882d2fd20feed388d815046c4e9cca0c1d13b5c9ea9a14135 SHA512 bca877fab0f8baa510e5ac8b84f530264bf5afe7a381a26028d6353f7bf8cbf3e46f56bcc1b5a06ae65c1b7363496c500a38455dfbe2779751230408bf58405f WHIRLPOOL d5ca69537a3a3f4f2c7b1163b21d5358ec595499754da55affe25d3726ec5288bd1c1fe307faffaf40b544605ec2b82d76023063a98daa0ee926d5254cad61f3
+MISC ChangeLog 94144 SHA256 cba224d197e5ec53bc2322dd7e02f836a90404d5280d6409dfe9b3f0b426a835 SHA512 8401d0cf1592d1bc70f5aeafc1fffd638d6a5b2f89275019bc8f524e90b11b0e843f63244adf26a22508ccab47a9c75e39ce08258cb3937e2bb6623924279572 WHIRLPOOL b44b1ab7992f3c0f2c1d47a6fe129908303f054e8d82b5617631960ad458b85b69cc73c856156f93bde29fe1c152a3f4b6c91bea490535708e3529914ed8e59a
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRJ7sfAAoJELp701BxlEWf7VsQAL7uEFTNkIJE3Zn+YZUj5Rpj
-+Hv9w/HOp3nWmiZZIIRL+8M0zeN1QkoB+G+1uT4j+sEuEgD1lALiD//JjpDV3HU0
-9OXap9AwS7csBM28/SD2oiqqdhmgOM2TtzT6fBmtS8O9icf70UG7HV37WkQy3Sqo
-dlIOdNYEwVvgX8Pizh+A8pRgvhP94XRqKOZLeUuh99gyNzYB1+d8BXLgaWOsM5aH
-v9kAgEpB9BOckqmadzGq3Qh6q/lyX3m1UdvQJe9zMdRIJLC6MdLpPjv+sN+aCr2q
-saBuyJbZq0tapcwVBAkoFgIadkNUdxvH0drUZoAjs5bWwbbB7ycgToQWoqKZS1vs
-Q5+VfQdUqISogHDm5Qd7yc6GIlwp6/UKd6i/JtzREVk9+PUYL4iALBufufVbv5ZY
-pVPgCjE+E615LMhbo/M19QBfDKtxgzXDTwSKV6DQYjNaCwV01IoVgjqYtTlGyaQ7
-vOO75Fw6No4SiQ4dQe4KHX62YqEEPdqVjRh6Zdd9MU2X+S6RTEzIQKYhy+OrQYTI
-FxO6A0sibHPUI2zIX+D/idgKDCvQYsnkaq2e8IAoZg7IvBs4Ce9aTK073SOVYK1i
-GxA4KExUSW2VpQk/jQUDXfmqybpDENW76ZOGK+bAi/f32KCMajWqYacItJq8CU+u
-u0weluZmXRRdl8Qg9csl
-=U3qE
+iEYEAREIAAYFAlErHhwACgkQ/ejvha5XGaN3UACg6MFLmSus3cbCMiBU0jRNlBmM
+uEsAnR6ysu5zYvc2zL52Hgou0o+NdKDN
+=nNwQ
 -----END PGP SIGNATURE-----
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"
 }