gentoo resync : 13.03.2018

5 files changed, 20 insertions, 12 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9f73e8af2191..974b878e6bd3 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,9 +6,9 @@ DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7
 DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aaf0b83eb6fa841ce4569bc58e2bd12802890c2a8496375280c0ce8fa56515918dfdcbc958f349bc2472104e37ad1fcd1 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5
 DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
-EBUILD emacs-23.4-r17.ebuild 11543 BLAKE2B 7d81a885b1e616e2ad999551f71b2b5a148343b12aae151737b5016ebf3907c14f742e5b5027c69d96ca30973005c9672ab2df4e6a1cb8937c5b3c9306e3d1ee SHA512 f918a9697111a0acf74a3a85ca1ddae9bf31ba67f3813d8ac935323dc8fab919d3780a144bdb81e763205c108ff023d3b05287b8c1558019769678d7572e4cbd
-EBUILD emacs-24.5-r5.ebuild 11262 BLAKE2B 43a9bfd9e8f3d8a9f455de0259be93190046125a07409bc207619a649571a6f3b73f65a0fe47a4924fade80e063b7a71540a27118af28ec434b9d0860c908e9c SHA512 9fbf4f3ba1440a96fe8965fb74ff225ff00286793cdfc47a707a22837068bbb92eafabe51224a805eec557546d45bd09320749b98fb6c087ad6b80c2fa506bb5
+EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B 891a95e5cbbee86dc136ecbdaf5b7c2aeac06b8d2fca5e10095d5052a4ad8d68903ce8360ae98425c457993d51c166d2bc766fc280f00dce859f0396a1851b43 SHA512 701fb20f7051a8e66577b02647bbed62d9ca83343b4dbb87d87337f622ce35ef41d85e8c0f575874b3a4454dc5f0b2ef545acf199564b7cb45020ec5c34540f0
+EBUILD emacs-23.4-r17.ebuild 11606 BLAKE2B 2e97c8718805e43451cf0983f40778a9978dfc5e5b3b052d706e5334cf71f696e19930dd770fd3b9b4e2bf13fbb8b6d44092843e426d3d3727c202aade82c8e2 SHA512 cbae99ac079f2cd6fa2924219cbfc13f66c0b40eb613aad58c276eafd599835199651fa8834d59fab9b7fe459155cd8f915323fbbc91327bea1eaad1fca2a055
+EBUILD emacs-24.5-r5.ebuild 11321 BLAKE2B d85cf7cb787c177a934e6609295d05d4fab1d93f3d14a0fb9fa5d67796825e07f263dc884c92b4a877c91f16d16ad2b319bec49ca9c63e9287400b1d394fa3cb SHA512 53563e09fef028ecef516dd40fbf1f090e270ec3fac57c54c54812cb5b2bd50ce268ce328c15719067f9271728239a3a2ddb002c962f711fa4ef33c53278c11b
 EBUILD emacs-25.3-r1.ebuild 11677 BLAKE2B 49cf26e17c3d336a888f8bcd5eabe2723f4345784c4df836b4f62f056521cfd18e8d78340d892867810bef0ec61de468929f32d70f08d6f91984b2fce3eb294d SHA512 53d0b970fa78a1ae938d46d6e7af0ea28a4b46f66df50927aba7d2bf6b5c895c785fc917a016704a6dad8b481824481c76e99193d5a2ef3a02cd4d2d1011f052
-EBUILD emacs-25.3-r3.ebuild 11743 BLAKE2B 8a668fcc47f8f3f7bf9629fbe8156f7aa52eaba7e912f6f77b2127bee972312074f0d2db8d13db695c2cad996d8aca5a4cae3e6067d179582bdb30b2cf6a6bfa SHA512 ff16e4f8ea26e9d7c2b9e22d632c1a818481ec12b05fe81349e455c76bff02bd71827dcbb3c7c07883ea12bcb788b63ec08332ecff9e2b60713dfee6082917e5
+EBUILD emacs-25.3-r3.ebuild 11741 BLAKE2B 597459f40cc19141488a3353ea83f1b3eb8d6edbcb828879d34a6457e1ec99ea92d8b386a6a7c04cef7e7564216e5486ab836c851bcd651b8da44be7cb8dea99 SHA512 484aaebfa350361360c0d3a2b52bc929fa73803ff27dc2f03fc3dc7a49c9ba5714b370c72d5d7d53bcce09668735b7cc6a8e4a276a6442efe6c901c9a986cd72
 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index 8b9d3d2c04e9..9b260064e0b8 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,6 +28,14 @@ DEPEND="${RDEPEND}
 
 PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"
 
+src_prepare() {
+	default
+
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	sed -i -e 's:\./temacs.*dump:env SANDBOX_ON=0 LD_PRELOAD= &:' \
+		src/ymakefile || die
+}
+
 src_configure() {
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
@@ -70,8 +78,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
+	addpredict /var/lib/emacs/lock
 	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 92884cb78c16..b331aae1a49c 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -223,10 +223,11 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
 	emake CC="$(tc-getCC)" \
 		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)"
+		RANLIB="$(tc-getRANLIB)" \
+		RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index cc5f76a02d49..2668c7388bd9 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -224,8 +224,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild
index b6a41e500685..9b664cf0cd89 100644
--- a/app-editors/emacs/emacs-25.3-r3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"