gentoo resync : 11.07.2019

13 files changed, 107 insertions, 12 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 10d5de6dde3d..85ae979592cb 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 528555bd934d..a25fb4bfe127 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,7 +1,7 @@
 DIST emacs-26.2.90.tar.xz 44412120 BLAKE2B 72eab92b3144e3807a612a1a4c87da23181ab9b42b12692401f666eae7fbdb3e832d4f5d9dbc6473df8de9af6046ad94bbb0874a57747b594dbae62435fe5357 SHA512 66e53ae2a6d89505111e7bc9b7a6e6324a9a5577d1ad8905244dbc8619b21ea410b20bd8bab0442ec226f7a0d5f2292e01171189517736e4fa5e0e15eba51074
 DIST emacs-27.0.50_pre20180831.tar.xz 28668124 BLAKE2B fae74d9885889b042142f580e971c73c193306dca26b42dd87ac3d3d765312ce6695511d7d31a047d79803982f6345c4c319a3d83cea1313080170da97482fa2 SHA512 43b32d8943dc897dfc0c1fddb4261a196d3a604add5bcf87a93748125f15db2cac762d3550d6593b80e961ae35d543adc4d5937bac77970c658f93dba26f17e4
-EBUILD emacs-vcs-26.2.90.ebuild 12927 BLAKE2B 1310cb7779ae3a09062986e8b8ddb38969c9cf10728d8b5532e2b37372b124c547451fad4a2cba0917b41dff1b7c238c31465960177851ceacdb936603937b1f SHA512 7353f23891353becb9805bce8acb3590e07ac095ab1d60d712ce650349ee10e29d62557e13aaf17adda59384956dcd79606db2732ea503a702a9ad752f66aa87
-EBUILD emacs-vcs-26.2.9999.ebuild 12927 BLAKE2B 1310cb7779ae3a09062986e8b8ddb38969c9cf10728d8b5532e2b37372b124c547451fad4a2cba0917b41dff1b7c238c31465960177851ceacdb936603937b1f SHA512 7353f23891353becb9805bce8acb3590e07ac095ab1d60d712ce650349ee10e29d62557e13aaf17adda59384956dcd79606db2732ea503a702a9ad752f66aa87
-EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13081 BLAKE2B a8c69eda98474bdd509d72425433207d511a477cb69b5dcc16992ca32392291ee894e093ce35ad7f8ab55de7df801e5e967ec2ea18240ac7454f098d57b4d073 SHA512 53be22e648d2feb1f541af61f0e3cccf6141942e72f805f72b350c329570af3f53f8e1d66db551d99d20e82a051fc90e52c1e6222474f00d38c57b6fd440697a
-EBUILD emacs-vcs-27.0.9999.ebuild 13031 BLAKE2B 6611945e955d43c600ce0a6f7cdd429446674273e3d1ada5923f4835dccc4c438b3b2363c090223895f5c1136e6c8044cc68c4ea00fa48de9350b955ae06b493 SHA512 e2898f70410c640445bc9d3e2535f513a7b2f9a3706edf02de6389b6f05ab65f60d167ce5297089f975a6691c6251d29ba2f2287890e4f5efbe60492c1894ec5
+EBUILD emacs-vcs-26.2.90.ebuild 12934 BLAKE2B d2ac2d402670ca155d84437590b4fab759e8c3250b62dd76c291a1ba629395aa759f18d61bf1f41914c07bcfb9449b0e35c1f8c449aa527df5f2a9f5196300f4 SHA512 d2561c4a74cad55050ed0aa606401ec6f90073ebe5dbc4386bc6325dd177443ae47e24151bae079372bd978802069f8e85c32b98b02518be8f94d01c175760d3
+EBUILD emacs-vcs-26.2.9999.ebuild 12934 BLAKE2B d2ac2d402670ca155d84437590b4fab759e8c3250b62dd76c291a1ba629395aa759f18d61bf1f41914c07bcfb9449b0e35c1f8c449aa527df5f2a9f5196300f4 SHA512 d2561c4a74cad55050ed0aa606401ec6f90073ebe5dbc4386bc6325dd177443ae47e24151bae079372bd978802069f8e85c32b98b02518be8f94d01c175760d3
+EBUILD emacs-vcs-27.0.50_pre20180831.ebuild 13088 BLAKE2B 669f979061d538b36ba3bd058a64224dc65e5a051265662263f30404de358579d4c8fa025cb3611bb91014a2fdae609fa7009604ee99da3d348897a38deabd73 SHA512 d9f41254beceff7fd870ed6b227fa2d8da1c5839631ee685c5ebaf50f849e37375d7df8966d83d81741376dc221cf032251853cdb7312d3981aa2d7588fa9d25
+EBUILD emacs-vcs-27.0.9999.ebuild 13038 BLAKE2B 3bbe81c619e40ef93c769cf7e348f3bf18759225c3412b4249d68f76fb8d2df29d09ca39c2eaad92938be7eeebae6b89952cc8a0f2987ba6acc0bbce18b9e008 SHA512 d3d95e905f8ba0b20b72a8cb2f0377e064c59a2e7e66739df177dfba3c86e31815139e1a32862756098ac7095e970722923ca6eb66984c1d56595e807a849012
 MISC metadata.xml 2897 BLAKE2B 9913cc3b37864559eb273338b02dd202b51820d2614fee5e17f1fe8fa98c691374443d68f29cca5172034c15dfa321390e2624087b3cdb4779364b12711c2a8d SHA512 1764fb9b8da95a3c3469c896808fe4e29b6b0bcb8b9986ccfd4756e451005f2f1f47b0fdcd5243dac7e70aa83f67fef25ac5ebfecf20e5fbd3e5c93851ad7eba
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild
index b117bcb7ba99..728af76b902b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.2.90.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild
index b117bcb7ba99..728af76b902b 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.2.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
index f02acbed5ae3..9c0c25334b7d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.50_pre20180831.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
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 a37170c18181..37177094d50c 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 56380e90fdae..a120b7064592 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -17,5 +17,5 @@ EBUILD emacs-24.5-r5.ebuild 11290 BLAKE2B df7006f96dd7dc6ae829fabf469d72bea84b02
 EBUILD emacs-24.5-r7.ebuild 11364 BLAKE2B f712a1af218f3e495b6c3cfc91850d2a6c31b348635609adde23943c453bb17ad9d34ea571e96fac7bd749704beec72ebeb1ccc2b6aec6b8cab438c780f24313 SHA512 7f8a2c542d85c0125212d13a86dd690cf45c92379f269e5be69772e4d3c0735facc0774ec976190fd7b6f04893220ea3c662d1c7001249c6e9d1b8f26e88eaa4
 EBUILD emacs-25.3-r6.ebuild 11662 BLAKE2B ceef7af0a3b0462e6c57bf27e4138aad675fc7a11d707a6241852cfabd7bfa72dd52654b929b7959f9a6ee39a8bd56d693b046465c97841d9eefd35703333227 SHA512 7a5b76fdb49c0d661cd3b74cb3ff365b8a96391a28ef444a676fec7e4b18eaf804a39afc395f92972ce72cac1cecb0382897ce02adc8d2e7d1f672777b4ac69a
 EBUILD emacs-26.1-r3.ebuild 12308 BLAKE2B dd36d96063583e6190a2a38af7859cb81b769d887b03f25ca39dbcc29c0f42a6fbb6344fd31f598c5f7c95674abb04fa5efd48c163c31c1f324abb7c686de5da SHA512 0a950af2d726d01dbe4803be7f8bcfc06c27c0acd900ad505bdacdd39a9bfead921d6e12f6e8f439816f160a336074eebcb8a3ef14e7b25bca6297ccfe84fc96
-EBUILD emacs-26.2.ebuild 12108 BLAKE2B 250d19c0575b9313e475e2229d93c677318601ece2650bcddbbd58f19a41679a7ed6896fa9c13f221a8f08f95bebe5a463867e24b731b25845d39efad3a4dafb SHA512 116e78a52f4ba2e3a7689f2959f14bc489a263db81cdd10cdd2c865825df0b3b453374315814a55ed4dd21414b1d2c3d1ce18a586372f36bef7c0d4045db1c0a
+EBUILD emacs-26.2.ebuild 12114 BLAKE2B b9eea72721bf68cc1c88715e7558591cc5f65ab5fc206ca0ae98f708e5adde69768d9be6e08c5659fc9219b233d7c88eaebd44ed467744b10cccce61a1650714 SHA512 bb389e465276ae4afd57420d4ee4d1b9f2f41fdaea5a94420aa864678129fde524a0b52c1a47a557654f28343b89f25928854209f7fb1292711d87f32267cfff
 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
diff --git a/app-editors/emacs/emacs-26.2.ebuild b/app-editors/emacs/emacs-26.2.ebuild
index 307d55bad7c7..e9c37efb91ac 100644
--- a/app-editors/emacs/emacs-26.2.ebuild
+++ b/app-editors/emacs/emacs-26.2.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="26"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~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 ~riscv ~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 gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
 REQUIRED_USE="?? ( aqua X )"
 
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 4d4877353b81..a56d38ea413f 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,3 +1,5 @@
 DIST okteta-0.26.1.tar.xz 970532 BLAKE2B c04e0c4a2665f91cde26ee28b95f768f3074a08c8fd30920c75f3ce52fdfa717e3e6cea9acf87c3c5d53c830e5badb51faa2abcebd5b55839ea4ee52874a6d4c SHA512 fa4e841c77ae255e9936b29e30fa0bc1f65594898820652ac8ba78497658ec5ef78cadf8b4d33cab09b2ee8da1d75b84377be28680b2d91c5af2dcdfe5da95e3
+DIST okteta-0.26.2.tar.xz 976264 BLAKE2B 6bd0708ecab61097130ad3b96d44c4a58a7711f6d9ecc9c70d3db792728489f395e691b0157f0cf8ffc0e07b1796ce6fde9f689108c3236412ad37c4e87a210a SHA512 9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246
 EBUILD okteta-0.26.1.ebuild 1601 BLAKE2B 75d2341a98628e49ea93fd39293cf5312e12238ccba7797d0c371241254223213aadc6b337729878fdbd9ab947404fc709ac982f90704fbcfe8d3d2e5e8e8689 SHA512 0d915e3941296f574faeb3c2b119b05bc841e933fee0b0ca79216d53fef738b5849b990c9d65e432656a529b172fac73f056bf38a155a0d0cc8280d8bd49779e
+EBUILD okteta-0.26.2.ebuild 1599 BLAKE2B e9b4a9eadb8365244ab0c08e50ecd88ffc506860bf33cbd945263e76e186afb02da5250f4b2b6f35d70a7d26c0d02097d0b0261dd922753dfa4b3ad9af3e2b3c SHA512 84eecf0795402bc4a3278ab044ddaf22679d544ac19c910a6a7b7ddacad947ccb179d27d57b2580f02e3975781b5b2c13e006e0a9611d68600fd5596256c5269
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.26.2.ebuild b/app-editors/okteta/okteta-0.26.2.ebuild
new file mode 100644
index 000000000000..614b30f95d11
--- /dev/null
+++ b/app-editors/okteta/okteta-0.26.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta/"
+IUSE="crypt designer"
+
+DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtscript 'scripttools')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DOMIT_EXAMPLES=ON
+		$(cmake-utils_use_find_package crypt Qca-qt5)
+		-DBUILD_DESIGNERPLUGIN=$(usex designer)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 62b446bffb5d..f0af4a7c8f10 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -3,6 +3,7 @@ AUX xemacs-21.4.19-db.patch 3157 BLAKE2B f5615179665395f36df25eedd51c1f351aaefa8
 AUX xemacs-21.4.24-gcc5.patch 1132 BLAKE2B 2a494b756f94112ba91a9d918fa540a645dfb7cabf05b5957cafb95c890e9fd4e106c20de97edac0ea7959053eb5cd20a26698713670b3957b097e101e818207 SHA512 1b3e56804594b82209ddb6318c2bff13b8e63f189d98e5ff313022eb66267eb45683841599dadd8a4d97e5e221dd85195121246fba5c91eade905e1d7b593749
 AUX xemacs-21.4.24-glibc-macro.patch 1081 BLAKE2B 2b2aa4898e9a02402418a71abe4138f085e9177c90ee87ede767c682ec185f59cfa308284622d88c432b3e4eae9e20a05df075f7e48f73ac27e53d9f15a8d5ec SHA512 6802260f60cd8ad14f9f7f4dc156e1914cbefd7efae38837426f54f141bec6241c210c28120badfdf46d0cd2866014cf31b05ee228c407cdb0f387ea5cf56e3b
 AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae985568cd1b25e2d46a2149e5d712338cf8d3f69b825410d448a2dd81fe4069e3f320a3dac13a9046651d526d4b9272772b4 SHA512 61af7d1090f160802a6a5ff2ba28ff2d9d2a39ac615c692748a76f60c4f93b6d09a66fbf797467257efe1a269aa90033f5384423521b1e403defb6cbd8709bb3
+AUX xemacs-21.5.34-as-needed.patch 921 BLAKE2B 18b67b2330cda62bb08fccdba8f71d0213f463aeb7e360b8b7f8cd791718cf89f44999858dea9b51a4c1f94b47b6774addd5a1ab9c36d65036f3890925847bb1 SHA512 3b55683346e6a0cac0b0b21ce21f3bc0ca4d2734307a20ce556cdea084e821d9c9be3c69db329ec1546bc249bfa5cae136e393e858bd53105db9152627514285
 AUX xemacs-21.5.34-gcc5.patch 1194 BLAKE2B 1b042f7a7034fa7066279e91d96e6f1c2f962273b4aa26ca3a6bfb5cf737572d97c1d7f11dc87a15e44a2516e9112cb8f4ba8d916feb856bab15beeecce6cbe9 SHA512 276f3e10334c3809f625e69ea0d56585fd429e9aced65331bd1ca0ced467bcf526cee43925b4c4dc381723883348877782e1c234db00e60c3d74a78021a2330b
 AUX xemacs-21.5.34-glibc-macro.patch 1369 BLAKE2B cd03d4c6d3629ab186c60a869cd99483dec1192dddecb91466e72c83b3f2969a0f02ae34953da3511edc80bd17ed880168b98f661fab1a0642d4e2944cc0411c SHA512 6397267d99649f62a20a0a1f2bc380360ed7689691adde515421286b3bcad55dbb0cea246427e03f904fd829624060ad7ae66a67c63f16f3b3c1f88803022176
 AUX xemacs-21.5.34-ncurses-tinfo.patch 699 BLAKE2B 0978b118040b1399bb042efbdfa54968a701b37a5b2f505f4dd1af9971b38c0a52cbe8fb9272ecc19c030bfa79fe28d56df358484116eadf3db9396b7ce09d17 SHA512 814b01388e7eb5963307dd5cd136725dd6d0d206b1a4e8ffc2ca8dabdd0070a58122fb4faa943efead1fe70f6309819177870630e05e5c02b51dc5e2aa0bd765
@@ -12,5 +13,5 @@ DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e54
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
 EBUILD xemacs-21.4.24-r1.ebuild 6734 BLAKE2B eb95f30b81f5d1305ab90089fe4feccce6b1b541949195d44c44e55b9631cc780768ecffc89b6228c540cd132e8ed2495dbe852aa264cf1080753e82553cde51 SHA512 e1bc6158ba44b478434b92a9470944a176161f57229a3fac99e15b91aa88ce1f0473eecc0cc6eb5f222ea75cde962157b9d23b4b64489ee95c1b8404eea0d052
 EBUILD xemacs-21.4.24.ebuild 6782 BLAKE2B e7a1fa73200db2829c9573d406b810b316a706cc9a9a70503ccb774a8278846348d8927e7d0005422bd79ba50ded393b72390f29b8b42987f8673cbc82ee64a4 SHA512 198a075e31cef8c28c359b56588414e0d19c317b1640e3c215aa7483f5c2782f82b6318327dc23448831a98c6a3a713242fb52d7977857db0a2ccc36b401e3a4
-EBUILD xemacs-21.5.34-r4.ebuild 7227 BLAKE2B c9e14730c039248883a8147e1deaa07d1a2937069823d1493072955bf362c4849c583b0d4b0a5d3914feb8f86ee34371b934ba5305396e12b193aad7c27df840 SHA512 89428a0b8e3ea66ef0e8418cf5fffa9ccbab351bfac48abc9c6ce479b7c88bd42dd90c1a1728a10d6dc42d7afcbbbb01bef95882e4251d56bcdce15ca1de1f62
+EBUILD xemacs-21.5.34-r4.ebuild 7267 BLAKE2B 125e827c81687086442d4da66740a194c308a3d02b713ba29e0834e2fb8580726e49b17cc48c417eb3dd97bd2a473cfcc762a453ff63497463e3625a749b258c SHA512 3e59773f446d1fdebdd49894225040bd89ce3b8027259293494312fd0e5de9ed02367f56cbf6d73afe112c2959b72619de496ff89fe0d1b66c0cbbe718ab4cd2
 MISC metadata.xml 682 BLAKE2B e6b1655f31d4e58fb4c0d35f8b410af6a17d590fac336c4e17091619629d948d9a9aeba4e579ed4a793c79506afdc9aa77f43db8ece9e5e04dc98fc90291e27d SHA512 51c021269b2f5f9483ff5a743ba5c7a20d60f5e59fd063bee7355468d69528da0d77c1e3b25f320be024beaf4d94130afa16b5a8f151043895371a16cae3fcf7
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
new file mode 100644
index 000000000000..542ce14c36af
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch
@@ -0,0 +1,25 @@
+diff -r 30910ee1cf8c configure
+--- a/configure	Tue Jun 18 10:37:46 2019 +0100
++++ b/configure	Mon Jul 08 20:38:49 2019 +0200
+@@ -16668,7 +16668,7 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-l$athena_variant  $LIBS"
++LIBS="-l$athena_variant $libs_x $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+diff -r 30910ee1cf8c configure.ac
+--- a/configure.ac	Tue Jun 18 10:37:46 2019 +0100
++++ b/configure.ac	Mon Jul 08 20:38:49 2019 +0200
+@@ -4068,7 +4068,8 @@
+           athena_lib=Xaw;
+           AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]);
+         ],
+-        [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]))
++        [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]),
++        $libs_x)
+   fi
+ 
+   dnl Now we locate the Athena headers that we need.
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
index 9747f72b358e..28f843bc94a4 100644
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -66,6 +66,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
 	epatch "${FILESDIR}/${P}-gcc5.patch"
 	epatch "${FILESDIR}/${P}-glibc-macro.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 
 	# Some binaries and man pages are installed under suffixed names
 	# to avoid collions with their GNU Emacs counterparts (see below).