gentoo resync : 15.12.2017

5 files changed, 12 insertions, 8 deletions

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index c3e7c9d834e4..796111cd296c 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -8,9 +8,9 @@ DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7
 DIST emacs-25.2-patches-1.tar.xz 2104 BLAKE2B deae1dcaf5c32dcdab365ffab53976158148a125deff2a0373c7da5696c48c36f87f8388fc8f64ab08b3bfcbf694011b58235e972d4bc0e101ca6bbcec779abf SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a
 DIST emacs-25.2.tar.xz 46900336 BLAKE2B 4bcb1dbf1647e1abd1006f586f5e465fa9ced78a87a3bc6edd7de7adb3b4145830b9cd7d889811882603a6f4be74e38626a80ab7d097d3331f42e811f3a93710 SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
-EBUILD emacs-18.59-r11.ebuild 4148 BLAKE2B de5723c0ee9aea333e555cea435a092fc000bacee5e0e0ca4285670b30ea338a9ba0a951ee70564ef10e202024aa302ee37ed3bc1c0e3a99786d8f31cda1da38 SHA512 acabc49069a9783a8afe1bb3ff901fd0406766f5da19e883186095a0fe75978663741128e4311281af5e88c48d5f63d9161b2a6ba8b7b597215d79337c36c19c
-EBUILD emacs-23.4-r16.ebuild 11218 BLAKE2B 2e94b619261f0ac89c4b7bff4e3331f89d5a1a1af57fbf7ab2d444165c2ce8a85b9d9dce92b92aee048c159a569b48804b02564ac1b837f1bcba54f542d21d76 SHA512 744efa2ff0f4fd7be19e1d44426b28e8e8d1f46b60f3ec824a3298df0720681766a4d15a544bcfd3e31ea6a42eea828fa92d64b84c32e8a3f7d821cf2a237cab
-EBUILD emacs-24.5-r4.ebuild 11049 BLAKE2B 219ff8620474dcdfea1ffe7a27e97b4514b3d82975ee2daaa1a98d98723933802865bcccbfa082e54badce4a8fdf751c3f52bdd9fda4f81be20839fa328b7d7a SHA512 1ab721b10efeac79b1f49dedab623fcc5edb27b11c30efe2a070ecf46ef915ffdbb6801e061faa230bd8389158f768f82af2b10c98aabee22834ceb12ed20de8
+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.2-r1.ebuild 11534 BLAKE2B defa0b46ed5ede9eca8a4edb7e3dd06fab21fdd53c854faca88c105c58fa5bf65145ebaef656f59da6ec128d33cf5799adcef33a94421e683f9b8c710a9ab932 SHA512 e29e7e2c3f8987843203799620099f3da70f89d7e44ad606f2b7f4ff7077333c7e783c3b327d735165b6d9e38e8f22a8eb635b8f412c53a7c9946e81467bf2e2
-EBUILD emacs-25.3.ebuild 11456 BLAKE2B 961e16d2c09d2db36d4ddfc92ffaa1c794bca76729a48fd32e0d18b9d5f64364f7a6e1dfa46cb5148cb116c861fc6299e5d092103f5a4cf2e866f34d7a9ffaee SHA512 a7bfbb0891ce8667a21017bfee4a3d9899da0536e996d8c50918cf3c9cb8355002bfbcd2f50e3468e920c3e809bc89849f59ab6427399ea0d554354b0d14294b
+EBUILD emacs-25.3.ebuild 11455 BLAKE2B e4999d4b86c9992223232b8287e17526d16a4ab35d5401477d168e5a51fc2bb0ac26be317e533ce963e4e823fcf72266a11dda73c54a278abdbc767eb080a6b0 SHA512 e907d0edd4595581957e65f57140f344352668c0c4a20e3741f08f937b2b426250f78cca1cbbe88de71388e2343978e86dbc83b85813663b94b0b1be825e558e
 MISC metadata.xml 2759 BLAKE2B 6054420573e7ff20ec4e946e666de88e5e925edf36a2b86ff4f6f1f179c3a4d82e62b5e824b154b8f68d98cefad3831bec4f3a1b4e92c34b2c8ffc76254a3b1f SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index c7a9e9dfa5d9..8b9d3d2c04e9 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -60,11 +60,13 @@ src_configure() {
 		src/s-linux.h || die
 
 	# -O3 and -finline-functions cause segmentation faults at run time.
-	filter-flags -finline-functions
-	replace-flags -O[3-9] -O2
+	# -Wno-implicit will quieten GCC 5; feel free to submit a patch
+	# adding all those missing prototypes.
 	strip-flags
-	# Quieten GCC 5. Feel free to submit a patch adding all those prototypes.
+	filter-flags -finline-functions -fpie
 	append-flags -Wno-implicit
+	append-ldflags $(test-flags -no-pie)	#639562
+	replace-flags -O[3-9] -O2
 }
 
 src_compile() {
diff --git a/app-editors/emacs/emacs-23.4-r16.ebuild b/app-editors/emacs/emacs-23.4-r16.ebuild
index 210f81f16181..230f36053ce5 100644
--- a/app-editors/emacs/emacs-23.4-r16.ebuild
+++ b/app-editors/emacs/emacs-23.4-r16.ebuild
@@ -104,6 +104,7 @@ src_configure() {
 	strip-flags
 	filter-flags -fstrict-aliasing -pie
 	append-flags $(test-flags -fno-strict-aliasing)
+	append-ldflags $(test-flags -no-pie)	#639568
 
 	if use sh; then
 		replace-flags "-O[1-9]" -O0		#262359
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild
index 12bb3ccaf3b7..1dd73ddaf8c0 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild
@@ -97,6 +97,7 @@ src_prepare() {
 src_configure() {
 	strip-flags
 	filter-flags -pie					#526948
+	append-ldflags $(test-flags -no-pie)	#639570
 
 	if use sh; then
 		replace-flags "-O[1-9]" -O0		#262359
diff --git a/app-editors/emacs/emacs-25.3.ebuild b/app-editors/emacs/emacs-25.3.ebuild
index 53ef8c9a4b9f..0cacc0f2275b 100644
--- a/app-editors/emacs/emacs-25.3.ebuild
+++ b/app-editors/emacs/emacs-25.3.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 xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"