gentoo resync : 11.02.2018

5 files changed, 30 insertions, 18 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a3baec563849..850cbee98442 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -6,8 +6,8 @@ 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-r16.ebuild 11264 BLAKE2B 5d6c8a786435acc3f0311951741b895ed426305444efe9f0c83166576f984c51266e42d8502f03338bdcfeeb9b3c3aa34068485beb6e10a8138eaf1315e734cc SHA512 fdff9e3bf6839e7caf6ecbd841ed6d332173aeb46550a652dea8975fe92d8b3174045170a9b8e8ce898e3853e8620b7c3d90c93ad76d2cd35014b3a0257f2f1a
-EBUILD emacs-24.5-r4.ebuild 11095 BLAKE2B bf769253d5791e01441f4f55fb3a00c0187b22c05ff8c7a8a9fae5a23fe9861fe44b0ffc23d4be6c623ed837451781a70f1e6af326c03858ddc0bffc09534b20 SHA512 ce02df6231626e4edceb9e2e693f2006446b62f09c553d1ed0c028f1cfa255a0d9abec16de717ac4c18f78511f087ebceab2bbcc11c6b452d7d0bcd43c87586a
-EBUILD emacs-25.3.ebuild 11361 BLAKE2B 44eca337c724e3a5de4925d451d225ee01b7bf69c6779997d758210d1974b642e3e6bfe294b093ccce2575be6132d8cdf2c9e99983671f7ca215d6eb5c4e228e SHA512 f8c2b572a91c6a287f7a94468bf568cf91b4d86650e53850b505261b4be40767b01679ae9711ece1642a696ce1228a4b3b3ebb80bf928895c044e3dd8e33ecfb
+EBUILD emacs-18.59-r11.ebuild 4236 BLAKE2B fed7eab492eda2b43052157f1acae73f5bfb5ce7442d31e998d911f2fc816644362291bb792cc69d4892905ce5dad59f1fe7f1f8be49840b788c218ae53ae074 SHA512 dcff2915f687ce61501c26aee208d7930a12792911bd0b9bd12b54a46f1167cbebd71c08e9cd50f37adaa6c77b509a57f9c0f1d7677e587137593c54e30f57e3
+EBUILD emacs-23.4-r16.ebuild 11340 BLAKE2B 828da59bc867f0a1d146ddbb3a0ebff1b6abdb9f7d2d06f207db73f125fcc60e4d214ab92a70a48f88927ede95dcf4e3f9287763af5467f258b30a8dd5c85991 SHA512 f9891249bcda86d06ee0ffe1c5514b92c5019b33bb96089a04b27aa17a55835d127dc96c060247e51d5239886ca92454f0c715cb0fc001911e3b9848f6849eca
+EBUILD emacs-24.5-r4.ebuild 11167 BLAKE2B 634f3a3d27636482c936131de3155c221463d4a5df9bb7333b772ece99e9955d91ce9dc1e3e98bd0b64a404f004f8a3ee45c074f6498a7a3ca856ab035cdb585 SHA512 c5ad345aace7622b00f8e0bbff7ef2138d8bb62d7e1ae05ecb22ca8acc236f19d04bb972f0ffe003bebc12536c15d0466912ed026f8cb02e5b0539c85f2ea2ab
+EBUILD emacs-25.3.ebuild 11433 BLAKE2B 5c50e04e2568305636bb08956ff9c4d29563fcd60ea257aa9591bb3e9c3c696525166b0e718e830b1b973cc9182e690e1ee3a26bf91caf5cc38871cfba29a368 SHA512 4e973ac3c9bda88676a2c5daf5a33cdb617a7e1d937a21f94711d47136213df1ce5d9449f34e65e30ca3adf2ea74e453a443167a469b8a5e17003163f136d36e
 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..19abd28b5a20 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
@@ -71,8 +71,7 @@ src_configure() {
 
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
-	emake --jobs=1 \
+	SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
 }
diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index 230f36053ce5..00d4f14a53a5 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.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
@@ -48,7 +48,11 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? ( x11-libs/gtk+:2 )
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -205,8 +209,9 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake CC="$(tc-getCC)" \
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake \
+		CC="$(tc-getCC)" \
 		AR="$(tc-getAR) cq" \
 		RANLIB="$(tc-getRANLIB)"
 }
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index 1dd73ddaf8c0..8360af8c48d8 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.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
@@ -58,7 +58,11 @@ RDEPEND="sys-libs/ncurses:0=
 			!gtk3? ( x11-libs/gtk+:2 )
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -206,8 +210,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index 6be101976949..286763c2e236 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -58,7 +58,11 @@ RDEPEND="sys-libs/ncurses:0=
 			!gtk3? ( x11-libs/gtk+:2 )
 		)
 		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXp
+				x11-libs/libXpm
+			)
 			!motif? (
 				Xaw3d? ( x11-libs/libXaw3d )
 				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
@@ -216,8 +220,8 @@ src_configure() {
 }
 
 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable the sandbox. For the unbelievers, see bug #131505
+	SANDBOX_ON=0 LD_PRELOAD="" emake
 }
 
 src_install () {