gentoo resync : 15.02.2018

16 files changed, 180 insertions, 146 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 47c3574ea6fe..d1089de46bbe 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index bb6604944ff3..4824475af050 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.0.90.tar.xz 43908428 BLAKE2B 20858eb7b06b488451ebdffd7cedf28055f38cb45960c2b74c926204be1225cff297a8ce95a4cf535349fe73b24c9e5347fed3c3decf55492c82daca9fb470c2 SHA512 c263d1d1a12d8b21cc43ddcb46a28ce3a54d0ef09e240518f19bfdabf4c4ceebc3c2d1521aae9808cafdd3e731c93dd22b4f1e7e619e38076aa4ffdbaadea93b
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.90.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-26.0.91.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-26.0.9999-r1.ebuild 12565 BLAKE2B 362a652887f83fbff0de302151434017fc14d5dc7161eaab3c8703b943f29398ebee329e6e4a6332232a18e02f4267d4c6e03fc566f6928529df10b0b1974020 SHA512 c5ecd590ab781be74f358f297bcbf352c8050e3959e1be1553d60749a1a3bd39fb2da97530684f1db5da87fd5406cd746146980cad19bacefebd969b9d43823b
-EBUILD emacs-vcs-27.0.9999.ebuild 12563 BLAKE2B 1e055c47031dbdb4a85eadb6dce9af654ae4db6fa2efe5c8b9d5b997c95a924cd14c311a0259202be313d6bb749591b7b5b961f1060e06bbd810c2d26dd11be3 SHA512 889477a06c2feced7647071592f3a06e871b29a36ece4f006f6c83e71082b931c26cac7294938bee54d88ebf8d817b65a81c6b04ccff9e479c7063cc325df060
+EBUILD emacs-vcs-26.0.90.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-26.0.91.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-26.0.9999-r1.ebuild 12848 BLAKE2B f57b226409467bc5bddc3cb2770d195d5d65ddcd42af948dc67215f7988c666916ac1da5e1ae106888d116d8367e3758c868b9f8a637416926f2e1bddc9a5268 SHA512 7d0a502ec539ca07347dc3ea0fb9784bae85251954ea7470dcd7959f3f9cf4e374fd41b720cd63e4d209e36de0c39d7a0b4efaeea6955d270e3dfaeadefa37c1
+EBUILD emacs-vcs-27.0.9999.ebuild 12846 BLAKE2B 6e2bed8d56874d5feef6fb45f9863758e7948396442b2d20bfb716b84eab70c9339cecca562fb3907f9432da3ff4dd9c9b1ea16a7f90377eebddf016d8c108c2 SHA512 3f15c529e3373db897a345de9544e1c98fa896bfd756c2bc3042090b0d4fd5385cb2b3e0496b60284ac52a6fba96c030f05d3d7718d1edccefcc743b3cdf4b4d
 MISC metadata.xml 2949 BLAKE2B 06aca7f50e1e0a376363438665651ab1647b885f71fc258874a360f3309621283168b2b4f9d57f208c575af1681de899655893f16d691496c20929175b0684bb SHA512 8a349fcb7e9a915ceb37b766f9286ea701aac5aee65fca04357e7e734fd767b2f824525960fa6b860be9e52c2099396f05c2710ecebd020b5d42341849918a98
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.90.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
index 7aa4dd5eab52..b251388e08bc 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.9999-r1.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
index e45d3a68bbe7..ef040e969456 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -49,8 +49,14 @@ RDEPEND="sys-libs/ncurses:0=
 	systemd? ( sys-apps/systemd )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -65,6 +71,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -73,8 +80,9 @@ RDEPEND="sys-libs/ncurses:0=
 		)
 		gtk? (
 			xwidgets? (
-				x11-libs/gtk+:3
 				net-libs/webkit-gtk:4=
+				x11-libs/gtk+:3
+				x11-libs/libXcomposite
 			)
 			!xwidgets? (
 				gtk3? ( x11-libs/gtk+:3 )
@@ -86,10 +94,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -255,8 +273,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 850cbee98442..bf715a63be81 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 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
+EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf
+EBUILD emacs-23.4-r17.ebuild 11553 BLAKE2B 2a547246425ca1bf5936d07a632a67e942b82163b061fd648631c3dd3cfe70c220b78cc0ffa899b28cc96c39070ce53ffa21dd872e440cae06a263fc486d4a84 SHA512 40cdfdb92d30b355e70d95dbba17f0995ac9209ed23c8a91f3b1e254c5312fa773c903487ee3be567855fcafbeb216f719086d65f90afe3b72bbddf417cb5e21
+EBUILD emacs-24.5-r5.ebuild 11382 BLAKE2B b20b12487f724d9bea33bf26fa23f8887695cd0029d8b020ad2b646d5e5f9dfceb783a631e7d6fa5a256131e08ef059b1fb1a61c2da048f740a369b52bb6c958 SHA512 3750356b1edc38009220da7d9327cf4f990ff34b84513185602baa964b9804392bb970f191a7fdc3a5bee49c81dd90b206ec31a7b53574c16e992873b317886e
+EBUILD emacs-25.3-r1.ebuild 11689 BLAKE2B c663335a2f562523e8c101c4654d6acb37a1e36162d9fde3cb7cb0b9950197bf75bc480298f43b15e290aae9cde19162707399c57af8539b676cba9ca11d1262 SHA512 37b1d591b767188f01950e011347737a2480e85e620d6fd08fada9c44a50087ff5bd2a6bbb4f462b80318c378a1e12edff13f1460454066213b27f15ee65c905
 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 19abd28b5a20..8b9d3d2c04e9 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-2018 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -71,7 +71,8 @@ src_configure() {
 
 src_compile() {
 	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	SANDBOX_ON=0 LD_PRELOAD="" emake --jobs=1 \
+	export SANDBOX_ON=0
+	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-r17.ebuild
index 00d4f14a53a5..09fda80f8ed3 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -27,8 +27,11 @@ RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	dbus? ( sys-apps/dbus )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gif? ( media-libs/giflib:0= )
@@ -38,9 +41,8 @@ RDEPEND="sys-libs/ncurses:0=
 		tiff? ( media-libs/tiff:0 )
 		xpm? ( x11-libs/libXpm )
 		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
@@ -52,10 +54,23 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXext
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXext
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -209,9 +224,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake \
-		CC="$(tc-getCC)" \
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	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-r5.ebuild
index 8360af8c48d8..a60d29353474 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -32,8 +32,14 @@ RDEPEND="sys-libs/ncurses:0=
 	ssl? ( net-libs/gnutls:0= )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		media-libs/fontconfig
+		media-libs/freetype
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXinerama
+		x11-libs/libXrandr
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -45,9 +51,8 @@ RDEPEND="sys-libs/ncurses:0=
 		xpm? ( x11-libs/libXpm )
 		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
 		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
 				>=dev-libs/m17n-lib-1.5.1
@@ -62,10 +67,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -210,8 +225,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild
index 286763c2e236..0377eb678615 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -31,8 +31,14 @@ RDEPEND="sys-libs/ncurses:0=
 	ssl? ( net-libs/gnutls:0= )
 	zlib? ( sys-libs/zlib )
 	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
 		x11-misc/xbitmaps
 		gconf? ( >=gnome-base/gconf-2.26.2 )
 		gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -47,6 +53,7 @@ RDEPEND="sys-libs/ncurses:0=
 			media-libs/fontconfig
 			media-libs/freetype
 			x11-libs/libXft
+			x11-libs/libXrender
 			cairo? ( >=x11-libs/cairo-1.12.18 )
 			m17n-lib? (
 				>=dev-libs/libotf-0.9.4
@@ -62,10 +69,20 @@ RDEPEND="sys-libs/ncurses:0=
 				>=x11-libs/motif-2.3:0
 				x11-libs/libXp
 				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
 			)
 			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
 			)
 		)
 	)"
@@ -220,8 +237,8 @@ src_configure() {
 }
 
 src_compile() {
-	# Disable the sandbox. For the unbelievers, see bug #131505
-	SANDBOX_ON=0 LD_PRELOAD="" emake
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake
 }
 
 src_install () {
diff --git a/app-editors/lfhex/Manifest b/app-editors/lfhex/Manifest
deleted file mode 100644
index d0356e00bbd6..000000000000
--- a/app-editors/lfhex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 01-abs-llabs.dpatch 792 BLAKE2B 5fea08953d7c8c368479a303abc1c9b1b2141fd8e77e7eb73bf681dd8ce0a5641523d8f0a3a953c45d3bce6de86de3089be92cb90a0067703c3bc9e8203e4c58 SHA512 cb23e3541b3ff93ceb86d52fdee6028588bd79f0270bd2bae78ba9c8e729bb7d2fd50ab08b83b6546935b67c4076593f8c5457166c81e1e4ee65adc10b034965
-AUX 02-gcc-4.7.dpatch 717 BLAKE2B ce81dd6c77da9bf56c352c1050d42f65ab6539a02c41ff1dd8a724fcd16fa2c4d0961bbc62e9661641b0b30226a657e301fbc2773797166f7f845f086aa1b0bd SHA512 4f934f4a63b1530e672d59ca3ee5a2304b2be5404d2e4ac708d4e51af69b6f4b5ed818005409ce831701fa92db8f634b06a4cc69ea002205f7985931fd06fc53
-DIST lfhex-0.42.tar.gz 868287 BLAKE2B 23c9879025682dd18ec9b2dce41411e77513f5f09a4295be094de5c20df05b06c5b7689587294417676996724c4548daa33a8ce6f0d66d50410bde612cb5780a SHA512 5b0d61f732b4b3a0ff2d73ae3ea551af78047a2edd45916d6ad61fb6d89c18faa4e28ed321e51e034519635c3310ce7b0b67fb809ed67d6c37cb252b78696c88
-EBUILD lfhex-0.42.ebuild 733 BLAKE2B b7838234d7fc5b405231fbe679dc6ae83ff6d0b8ef7166dbc203d295062a90413d925624f053fc7f42962b58a8f44780f91471d251548a41c7ae2e5990120a08 SHA512 ddd5a34b3eeff8fdc703161ea2d7d6824c56e4023bf44033d055d36ac64fefdf965f3116f6e9356e3a27df3f79e808a8e94682801d0b953a7584a6e2f6f4737e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/lfhex/files/01-abs-llabs.dpatch b/app-editors/lfhex/files/01-abs-llabs.dpatch
deleted file mode 100644
index 74ffcbce7299..000000000000
--- a/app-editors/lfhex/files/01-abs-llabs.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-abs-llabs.dpatch by Thiemo Seufer
-##
-## DP: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
-## (#495467)
-
-diff -up lfhex-0.42.orig/src/reader.cpp lfhex-0.42/src/reader.cpp
---- lfhex-0.42.orig/src/reader.cpp	2008-10-08 19:25:57.000000000 +0200
-+++ lfhex-0.42/src/reader.cpp	2008-10-08 19:26:16.000000000 +0200
-@@ -238,7 +238,7 @@ bool Reader::loadPage(off_t pageIdx)
-     // free the page which is the furthest away from the page we are loading
- 
-     // this could be trouble if off_t is unsigned!
--    if( abs(_firstPage - pageIdx) > abs(_lastPage - pageIdx) ) 
-+    if( ::llabs(_firstPage - pageIdx) > ::llabs(_lastPage - pageIdx) ) 
-       while(!freePage(_firstPage++));
-     else
-       while(!freePage(_lastPage--));
-
diff --git a/app-editors/lfhex/files/02-gcc-4.7.dpatch b/app-editors/lfhex/files/02-gcc-4.7.dpatch
deleted file mode 100644
index 0d58072d9574..000000000000
--- a/app-editors/lfhex/files/02-gcc-4.7.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02-gcc-4.7.dpatch by gregor herrmann <gregoa@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add missing include to avoid FTBFS with gcc 4.7
-## DP: Bug-Debian: http://bugs.debian.org/667238
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lfhex-0.42~/src/expr.h lfhex-0.42/src/expr.h
---- lfhex-0.42~/src/expr.h	2008-09-19 02:36:49.000000000 +0200
-+++ lfhex-0.42/src/expr.h	2012-05-07 17:03:22.788794002 +0200
-@@ -19,6 +19,7 @@
-  */
- 
- #include <string>
-+#include <sys/types.h>
- 
- bool expr_eval( const std::string &str, off_t &value );
- 
diff --git a/app-editors/lfhex/lfhex-0.42.ebuild b/app-editors/lfhex/lfhex-0.42.ebuild
deleted file mode 100644
index ba168caf5ddc..000000000000
--- a/app-editors/lfhex/lfhex-0.42.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qt4-r2
-
-DESCRIPTION="A fast hex-editor with support for large files and comparing binary files"
-HOMEPAGE="http://stoopidsimple.com/lfhex"
-SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	# Apply Debian patches to fix compilation errors like gcc-4.7 compat
-	epatch "${FILESDIR}"/*.dpatch
-}
-
-src_configure() {
-	eqmake4
-}
-
-src_install() {
-	dobin lfhex
-	dodoc ../README
-	make_desktop_entry "${PN}" "${PN}"
-}
diff --git a/app-editors/lfhex/metadata.xml b/app-editors/lfhex/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-editors/lfhex/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>