gentoo resync : 19.04.2018

17 files changed, 115 insertions, 63 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 0f8e6165d65b..a99ed945dc19 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 a5b60f4d75be..87537972626e 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,5 +1,5 @@
 DIST emacs-26.0.91.tar.xz 43988932 BLAKE2B 05e5b9d51f92f2719ea22806f73b17903f5941c82a2e4e762b7664ed1b05f7324c0b020ded311dc4f22b7668684f59eaf3f3c2495f85977f3510698d7e0edd09 SHA512 4e20743299ed419c8ad7bea00c5389fb7c81f4e631165fe2b19c4bbd7c2b401416073282814f30bb96e5c3961724bfbb565781c50ee481a4f4c762ca6f480fba
-EBUILD emacs-vcs-26.0.91.ebuild 12729 BLAKE2B a4c199947689fa3f0f93c22cf8542ba6faf8dae19f8d087aeeb7149ef531a971f9c9542c45b0e1c89d206bbb42ccf10b1df121e71523536f2db8b040024541ea SHA512 183b51312550aaf65b360929d0736adcc1381e28e3f944de7e68fde0262d5bba597f10fdddd27b1e72db31b7a03cf2b0c2bbdf0e4aee5c65e3ead3554e91e8e6
-EBUILD emacs-vcs-26.1.9999.ebuild 12783 BLAKE2B ddd7dceaeff16528d04f18501950676c224220d870b93467089692772c1df9ea4d9cfaa35d2d3590335b6c4fb05df05a18680d6f6d307de0c01a1d2e9c985404 SHA512 2a6420f9deb01f8251a6ea96124bd83ac3a65c1d8daf7a02706319fb19ccdeea66282c2cd85d4e0ae332c1ab190d4a3885f72d69e01d0785e60dc697d48ffc35
-EBUILD emacs-vcs-27.0.9999.ebuild 12727 BLAKE2B 18d435a62a2baac1d519d8c70dea28d77fafedd0a7b6710ffc16bea6d52d3a3c135276ef13fcbaa26fe6201c7e07294715592334cdd0520ef2e9b9d788c8bfd4 SHA512 beaa58a1ca07fabdf9a1c4240e6b9a122e601b180bd04c9fce2671c1d1cef72dc63a08640ada982c1b7463f60c97f5f9317649b01cea5a34e499c552afef6e84
-MISC metadata.xml 2875 BLAKE2B 0791cae7c67dd1dbd4cceb7da63771252f195dc4c90606e4f7d244ac562f1907325816bd40996edc8becfc1ed55fe9738bfe7e639dbb013a06171de32b8493f2 SHA512 49031fc328278cc6910e5ea566d807c9b5c8cdccd5f3fc9aa60902f566b46c47acf96e6388e2d43aa97ebc7f0a5a98041d936f12dfd06b7816f1720656d4799e
+EBUILD emacs-vcs-26.0.91.ebuild 12719 BLAKE2B e9cb6729ddf5a5dc39e83809c627ec70a423368705751bfb330ac6a275fe97645413cd9bcc0e66c29b89d66225f03101dd40494adb090a2b6b717b4e5388d913 SHA512 9a661682ef16a2faf92cbe90dda4265b2b55d72d1a8c6145f9876bc9ded3a943e7c8d985f3b19c9d8b0c1f4898eba21f6db969656c05354654813db43298f8e6
+EBUILD emacs-vcs-26.1.9999.ebuild 12773 BLAKE2B 2fc2d8356806514b478bd61d51a742e11c1d474370c87c31ee2240a9ed0b7b62f451781a65e0f246ceba9b64723c5ec947ae225e116438e2930a296841f7e6b4 SHA512 d0208781658d7b79b97f57db2fa4c7b24a07c1a3cf53dfa0a76a7a1ff37339cf0bbd879a8e8a133b87d3b6885680bce67bb294d83e95376223f74f57219ed578
+EBUILD emacs-vcs-27.0.9999.ebuild 12717 BLAKE2B 28575bb2bfc91a316bb104bcd39b4537d405fb58555c6e56c07d872af65f9795f66f94942ef1cd323305c52f761f362534ca230c7d18af55a56389b8ac923e3e SHA512 e30eeb7226462a7eaa6f447b18baa552fff74a88cb8e7366ecfdd64fe630f7d510155fb34f0d04651ab6114607e0e160a6e584e8e60f9ac3219e10d102b4dbfb
+MISC metadata.xml 2799 BLAKE2B 0b1f8190aa0a7884ce80e712caafa063e053e5b100bbf56ca97156e1b99cc32bd22caa20297ca0249b50b3991444b05d33c49051eabad56f20e799fd6c5e7d54 SHA512 cc0a8ac18f7366e0384528b963c9f2de4c6faabca3cfdf4abd92456feb70454c95df125ec0648806614ac0daaabf198acad0bd349295bf7b01b159db96fbece4
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 67ab807d938d..157a7ec760b0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.0.91.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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 )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -113,8 +113,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )
 	X? ( x11-base/xorg-proto )"
+#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
diff --git a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
index 43eb7b98a8a6..2db8dd4b76f3 100644
--- a/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-26.1.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="26"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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 )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -113,8 +113,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )
 	X? ( x11-base/xorg-proto )"
+#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
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 1959cdc4a0d9..aabc1c6f8936 100644
--- a/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-27.0.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="27"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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 )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -113,8 +113,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )
 	X? ( x11-base/xorg-proto )"
+#	pax_kernel? ( sys-apps/attr )
 
 if [[ ${PV##*.} = 9999 ]]; then
 	DEPEND="${DEPEND}
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 743832334a75..b252d0165140 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -40,7 +40,6 @@
     of the internal Lisp implementations</flag>
   <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg>
     instead of the internal movemail substitute</flag>
-  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
   <flag name="source">Install C source files and make them available for
     find-function</flag>
   <flag name="threads">Add elisp threading support</flag>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 724f2780f460..7cf0c86012c7 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,9 +9,9 @@ DIST emacs-25.3-patches-1.tar.xz 1252 BLAKE2B 33c3c8e32b85f548201d4988d3aaf94e64
 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
 DIST emacs-26.1-rc1.tar.xz 44010228 BLAKE2B c7d8d19a8488a88f3eea4dbf4c545de75956b6a82735826d15b603568577fde8019d7655e936ab60bc61e397f3db074e26d5a1d58534714fcaef585fa63a7719 SHA512 bf5a9fac61f024406b050037505c14c83db95f24760c2e32aa8f7e53cc8c2781883af0c3ffe820b039a9444a10e7fdcae7635b7e3c383718de22d77e7ceabe83
 EBUILD emacs-18.59-r11.ebuild 4358 BLAKE2B d5db4c011da9c728092eeb75f8708c7ab3729497be75fec58553de3df47a12a54e0845c1a4bc5a07c1080a305d0fdf8033370c0c5692ca3ae7caa617637d8fea SHA512 9637184ba4c9f51da3eef13625b5de4a1af283ada88c2a4f6fe6f03447907ac37e05ae69abbef514bd0024f748f1cc458567f4480e0e23fd4db26905bfa0b4f9
-EBUILD emacs-23.4-r17.ebuild 11406 BLAKE2B 9f57016f663a7f7e979df4e10a9a91bcfad282ad66e9baa8ba9cea7e58991da6e1ca4454f7eaa36925589cab8036404d8e58962cdcb0e2ddf1a3df0bf855d2a8 SHA512 8cc574a110555c3a42c26de664ef24a938e4ce2f956c28ffeae61a0b4606738a15f8cc3e6e53f8c2af3dec6f28d9e79cccd67addb79e3efb06171ede82202f64
-EBUILD emacs-24.5-r5.ebuild 11121 BLAKE2B 08ad42996a160029d5615a703211615f7230adfc46e3331c6a7f3ddbb27396b30f3266b9803fa980b4b4e1a80abb3e5d297de547e5d88be4796bce1390bfde9e SHA512 5c12fbd82c5b319fcc2da602d5b8ebfa68b215e350fff7ba23d33292e280b2603616eccc982751ab736cf1fb9da834ddc21743690af21484c6a85f62e595719d
+EBUILD emacs-23.4-r17.ebuild 11396 BLAKE2B 9214e1552f6f3d5e74b2449b158077a61073b9c0fbc1fe63280d4e1312d34936031d8d81b3266ad0fb826e4178388eb122aebc40406575195ffe07c9d3654b69 SHA512 2fc090ff6fef113b151c1fe601a277f5cde3b21814e825f7092839fa1563206b8487e4c81a724d9d870dcc0869cdef319e0e2d02a8b0172fe2b3fa078b34573f
+EBUILD emacs-24.5-r5.ebuild 11111 BLAKE2B 74098a7a8ce8a0db2d0b39ef6227f8474fcaf793b0e95bde02c8259bd319d0029fa43006096c826f4d81eb558035db487e3d38ddd14a8496f8824e791c4e1b44 SHA512 5659839366f07eaa3b6f39ed54a46201f4e2ffb9bc14e272255c03e5ed6f79aca7723b8733117943e1250344c895fcb28d3a8cb2cddcdf9a5157215b14bc7f0d
 EBUILD emacs-25.3-r1.ebuild 11640 BLAKE2B 16ac50fda38a906936b0abfb294e1f09d929948befbc6087c99f20f5b894b818c625df9fc274ded2d633fd7034fb9cb53a7111fcf38e18f48e43e3ce99a9363e SHA512 ea8f14799e8a87f4f55c8f9d9488e021319d107432d8cb2f8a63c31e9f11f4e44e497d2f42aa5cc0702001d733f94b9811bbca66a7d7af69320ca9b69514a316
-EBUILD emacs-25.3-r4.ebuild 11610 BLAKE2B 8d1d25c3f104bca4f79b4a1ca0ab06e840a9bb02fb8b17e39d926d5ee79993cccfc4b31417b3ebf2f0a61616dcd67a97f5a1fe0aded050bb2dae4bc8f053ca76 SHA512 81386945f5ee88e1c92244c572372a0456e4d8e8a404675c128a6694cd125e03210fe30113fda5c108f6ae66531ab89fbb10b76f3d56cfb988225b6ad9af8b39
-EBUILD emacs-26.1_rc1.ebuild 11971 BLAKE2B d1f0311acecafbf511584c70d469b8f044f13af028623e741180cc858d0cde23cc60bc0ae6e549525ade708e65e66c5a080dca253305ce9a39c9d777cd11c3b0 SHA512 5a52875d4969c1a7524f158d83e8fce8f7b583f4cc8c50355b0cac876a9d07bbeb6b40873ad082e62870b150717f05eedaa32d128e2816b9145529a95d3802e1
+EBUILD emacs-25.3-r4.ebuild 11600 BLAKE2B c157df51b1b06745380dd3ae450002c7f2eb7ce29028b81bf289c03baf746fffa67c5dc3ffebfb00f916096306004828559c49bd0033f9c933f8fffdb823d550 SHA512 ed04e704027816136faf0820c6adb91c8fe247b9911e2a6ba816a8e56a0495c84fd89157a10b47b3322739f3584d506d8a85220533ce87987481132754045b89
+EBUILD emacs-26.1_rc1.ebuild 11961 BLAKE2B e11b2e6958b8586a38a217232e341a817df6cdcb64418462ba3f674f20f145c820bb60170c12b597b3785f4fe914764fcfe87fa94372b9239656626544ccb943 SHA512 34c5da5bd5e82839b7552aba929f8eed35c868a46d968b0e1189f6b3549819b60d012e373d19fa659461ef9a116bc911eceb138376405e31ba0ae314285e4179
 MISC metadata.xml 2817 BLAKE2B 75ddf0acfc4520b1426bfd99146df35b36f40cc4cb0df7bb773361b786da3857744415a1a8a94a060aa99762e88caaceaa89d5f069fbc9662fcfcce10880f6c1 SHA512 64c729882bcab6a7cfe36d0d5ba5228b15d15000383aa87b5528763fb291cfedd1cd896c406b6e3783677bb772f362de4a54e54c6f056b959f6efffb65325c90
diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild
index 103ee7c28a95..90eef32c372f 100644
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -77,8 +77,8 @@ DEPEND="${RDEPEND}
 	alsa? ( virtual/pkgconfig )
 	dbus? ( virtual/pkgconfig )
 	X? ( virtual/pkgconfig )
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild
index 758dd31c0d58..d4567f903d43 100644
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
 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"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -85,8 +85,8 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-25.3-r4.ebuild b/app-editors/emacs/emacs-25.3-r4.ebuild
index 523b017fdb44..bcec3906b31a 100644
--- a/app-editors/emacs/emacs-25.3-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3-r4.ebuild
@@ -13,7 +13,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"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el 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"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -88,8 +88,8 @@ RDEPEND="sys-libs/ncurses:0=
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )"
+	gzip-el? ( app-arch/gzip )"
+#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-26.1_rc1.ebuild b/app-editors/emacs/emacs-26.1_rc1.ebuild
index 2c2c943b1cf4..b0a58245197d 100644
--- a/app-editors/emacs/emacs-26.1_rc1.ebuild
+++ b/app-editors/emacs/emacs-26.1_rc1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.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 ~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 imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib mailutils motif pax_kernel png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos 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 )"
 
 RDEPEND="sys-libs/ncurses:0=
@@ -97,8 +97,8 @@ RDEPEND="sys-libs/ncurses:0=
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	gzip-el? ( app-arch/gzip )
-	pax_kernel? ( sys-apps/attr )
 	X? ( x11-base/xorg-proto )"
+#	pax_kernel? ( sys-apps/attr )
 
 RDEPEND="${RDEPEND}
 	!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 44a7554e5727..8e2fb5667abd 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -1,5 +1,7 @@
 AUX qhexedit2-0.8.4-fixtest.patch 479 BLAKE2B 1359815f0c072a4f8a036b8168796e22f8522c5e311220d6dd76b12df5c138693582f26a9d09ab33ca5e10a1e9d8dd6bb7b668d6bee09785b163dee6048a39af SHA512 6f72dc45c91da43a27bb66f7a81f33f810eef45711e6d84675bf761dda3a296aca7931e955526504c53a173a6ef65ef4712f378f8d4a1fbdd2437829aa2f49e6
 AUX qhexedit2-0.8.4-setup.py.patch 596 BLAKE2B 15a801d87d9f690aa354162cb4966b1b691da95f7d64926f1b2ab66bd7d1db29b208cfab0f0bbe0f8fb272d67328f1a5ffd84ceb9d7af3d457ed6cd2a7d27ec0 SHA512 2cabb09c9c6e819a43d434a813ce9eb9614c72a3687758a35f338067d9e02add657ed1feee614486c9dbcbca823a848aedc69f9ab42aabd9ebe414b645b0d67e
 DIST qhexedit2-0.8.4.tar.gz 340766 BLAKE2B af24031fdd9f8d677f7e8ab8fd69667852dd971db30f5406b9aaaa08bf7f2dc692c87e99c141f355adc82c8226b5b29f53ce07ba63656d866f8688cb2cbc67f2 SHA512 8ed831d75c8ec1897dfd7ef497423908b26b0f56e6577928ed035654e52b437f64edd61cfcc1de6eaf5d1f29f9dc97da84d2edd7f427e3c09c9d75d7bc6504ff
+DIST qhexedit2-0.8.4_p20170719.tar.gz 342037 BLAKE2B 667a7c3e93ed3422f21da53b6811fca53b210cfaf2603cf2a61e377e68f295b5024a9fa73d444c1e50af274bdbc6faa62bc2ab4aad176a8b3a6d7540117c5a30 SHA512 3c412b9bbe4f84f6f445b6ad530fc51dc5422a0a5bb6184edc7df92595aa5215c345e2b16effae8de758b299c5f7f7d44cf54dd65a180941c30790194679baa8
 EBUILD qhexedit2-0.8.4.ebuild 1824 BLAKE2B bf51b60fa58333b2fa727adadd3bb35b0215a77773b51d856dafc1cda3702834e074735dc5a908dadd41134d767e81e8ec6f7fb83cad2de139dd9023df890fb1 SHA512 610257b125661932965e7f6a2a4e6db53bb552382b0f34eca35729da9179d3668629d30e70f07a6c29b6aadcf45c123a28b05c066603079f6669f9ae6e52b5b4
+EBUILD qhexedit2-0.8.4_p20170719.ebuild 1918 BLAKE2B e20d884970da32077ca574299b8efef94ad827290270521933d716e67be5dd90c317740d7870756bd4b56b9c06bf3b344e59304b7d909f3109f67f6f272ec14a SHA512 17f03387ad5f06dd448ce344759c67cbf33267b5f7c6c7637566c17d5b683c0d1f6dffb7de1320e41b7725b5b7f1b3bfa840b402777a6e4f5e76f8bd11621094
 MISC metadata.xml 1114 BLAKE2B c0703321180cf2ecb96008fe1e479d6b1f95dfd104626d5099f96663010c562400b3daf9442db2496359bc1637ef8b93a17954512261dcacd03f00fb08946152 SHA512 76912cf5ba235269d58a8e81c7e8d96bb76ff8274b37d220fbafbdf8bdcb7e6e6a76bdb64f1ba8c22ca7c00a9a45e1c96a7849ebed38bd949f5647fcd3d1f2b5
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
new file mode 100644
index 000000000000..e4e30e3c8f45
--- /dev/null
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4_p20170719.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 qmake-utils
+
+EGIT_COMMIT="5f3ca79dbe8c765b685636a1751d242a6bfabb7d"
+DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings"
+HOMEPAGE="https://github.com/lancos/qhexedit2/"
+SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gui python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.8.4-fixtest.patch"
+	"${FILESDIR}/${PN}-0.8.4-setup.py.patch"
+)
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	python? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+src_prepare() {
+	default
+	sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \
+		-e "\$aINSTALLS += target" src/qhexedit.pro \
+		|| die "src/qhexedit.pro: sed failed"
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	eqmake5 src/qhexedit.pro
+	if use gui; then
+		cd example || die "can't cd example"
+		eqmake5 qhexedit.pro
+	fi
+}
+
+src_compile() {
+	default
+	use python && distutils-r1_src_compile
+	use gui && emake -C example
+}
+
+python_compile() {
+	use python && distutils-r1_python_compile build_ext --library-dirs="${S}"
+}
+
+src_test() {
+	cd test || die "can't cd test"
+	mkdir logs || die "can't create logs dir"
+	eqmake5 chunks.pro
+	emake
+	./chunks || die "test run failed"
+	grep -q "^NOK" logs/Summary.log && die "test failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	doheader src/*.h
+	use python && distutils-r1_src_install
+	use gui && dobin example/qhexedit
+	if use doc; then
+		dodoc -r doc/html
+		dodoc doc/release.txt
+	fi
+}
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index eebf5cee3c0c..6ff86f6deb91 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -4,5 +4,5 @@ DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd
 DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
 EBUILD scite-3.5.5.ebuild 2116 BLAKE2B 6804a7de3d7d491d901a7ed2c0acaded903864579b1045fea2845ff63754f35328ad39e1308e9c4462cbe63d147e3d22844dbef37b0469235a8356e4de722bad SHA512 3cb6bea06bb846d448eb5643037cf961d916fdcca96efce4202fb4eb351741300f170b91c777831129dab523fc1644bf1955b586811cdb3b02dcd4a93a9f98bb
 EBUILD scite-3.6.5-r1.ebuild 2242 BLAKE2B 2203a916c7e4b9eeb2c78dc15aa8bab6ba18021c8796ee5b3eb03f198d04360153622fbf031bfe5bac10ce1e1880cb1bea61d5ebca4b068daf272ece5f19ecee SHA512 1fa0330ecbaef2dd14b39eb5b285a6ce7db9ee227749675e9658d278b3c0cab26920f633525717e129e7a95ea134b8cd95aab839ea180c8099512d408c2c8969
-EBUILD scite-4.0.2.ebuild 2696 BLAKE2B fb806e58076633f9afd123427367262817bd3ce41d9d3541dbad8cbe250e2bc354112b78335f074a7cd11f5960279743620bd00c8d5e5621566374c85fbd7190 SHA512 e42f8edb2cba0438baba51879f5f376a12d7fce542f2ebaaedd9a8c2623b515f4d28b207d128fc3521315520da80ad887edbb701ab0ccd0cf405a5880dec98c4
+EBUILD scite-4.0.2.ebuild 2695 BLAKE2B 50d1da60a06f994dcd6de01559a8bc6dab58978e2a76981c130d225e8e3e471037700ce9334e99d2cb6bcd4b979a2ce32cfc8344ee46f8ac6502612012cd1763 SHA512 78ba5d76dd55d408b974c283b528ff95ddf957ccc7c1f3a2a1f90df51b7895b4303321a2110646f80994f2dfc42922e8a170999a91237a4a53637c2e4f6a5832
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
index b480aae0dade..f5d3f5c8774c 100644
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ b/app-editors/scite/scite-4.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 
 RDEPEND="dev-libs/glib:=
diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest
index dc6c8a37bddd..39ecd172b994 100644
--- a/app-editors/yudit/Manifest
+++ b/app-editors/yudit/Manifest
@@ -1,5 +1,3 @@
-DIST yudit-2.9.2.tar.gz 2831966 BLAKE2B a7ac8b3b538820e6101b57f8407fd99e9aaa4baf16fd3b09c4d4322b53b85fd631a3b36b6bfac214cc378fb4fd8b9ac30c2cb77959b680064e5ec625998ec6c0 SHA512 39bbd6f1696a97922a5db83b25b52609660ea77c7651cfde1d7189789e7d9a6298f6dd91acf17ab9d1bef1fabbdeb7bb1f9ab95a14198913c84c30154efd9e07
 DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b
-EBUILD yudit-2.9.2.ebuild 774 BLAKE2B 5304e2e5e5f9dcaf5f8847f5709d5457b5d4ba2b15d3b4a555ace0cb9f91edc26e7d2521dc388c8a3f538d01ef92cc7416e8b6f5aa6c59ecbfb29e1e5bfbebf9 SHA512 7964bc24e1309add3b4a1a9368270db946cddab68ca27747f91122124cf9bb64e77e8d9f2ed366e29dee56e9dd174cf97118063585443ffe6e84af4028400744
 EBUILD yudit-2.9.6.ebuild 604 BLAKE2B 1aa89fd7b8a9aec721fa4b8a411b141ddcd4004b3bbc64b79ef558ebc76dae2ed8f3abf448a33f4647878aa820e1c7f49cc72d7cf810aaf43eab7e0e104f109b SHA512 44d0e87fb7aebb5b50b69d21179b83d3ff46b6ccb7f454f30dd7b8834d15699bd49446cdcbc6ee56e2cfd8de5a397d08069bac6c27247fe091a1283af5c32963
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/yudit/yudit-2.9.2.ebuild b/app-editors/yudit/yudit-2.9.2.ebuild
deleted file mode 100644
index 458f549e693c..000000000000
--- a/app-editors/yudit/yudit-2.9.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Free (Y)unicode text editor for all unices"
-HOMEPAGE="http://www.yudit.org/"
-SRC_URI="http://yudit.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.10"
-
-src_prepare() {
-	#Don't strip binaries, let portage do that.
-	sed -i "/^INSTALL_PROGRAM/s: -s::" Makefile.conf.in || die "sed failed"
-}
-
-src_compile() {
-	#FIXME:
-	#-j1 because this app builds a tool called 'mytool' and we need to make
-	#sure that it is built before it needs to be used.
-	emake -j1
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc {BUGS,CHANGELOG,NEWS,TODO,XBUGS}.TXT
-}