gentoo resync : 30.09.2018

15 files changed, 63 insertions, 33 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f47ed68fe78c..b92953f839bb 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 2d22e241744c..25e81096012b 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -15,9 +15,9 @@ DIST emacs-26.1.tar.xz 44258932 BLAKE2B 5b5ea6a506228507af18417c3f94c2d6ea482c25
 EBUILD emacs-18.59-r12.ebuild 4412 BLAKE2B e560829c6de369456f7a77ddba9a6047addace03406ca36aa7778473d470484e7a675cd5eceabc491b86a5a7140ecaafdb86fab9db5974d0fd817f4b55d48a85 SHA512 11144b4d09773faf8ea2fe054695b5a045778c0cfdf0314c9eb8b0af34526eac1e0ac6f245955361e99807eadea9e8c0d40411907e14e2845ce2b91f0d404245
 EBUILD emacs-23.4-r18.ebuild 11525 BLAKE2B 392ea4005890b48531149ce7a061a6b8154eeddd1abfd35ed98bdb8742cb0aee2c1e57690662d7842704c4402e43bfabccfeeceafc7f8c6e43d2946149c6da92 SHA512 12f3f575c67d5022782fa268bd0fbecc9b032f0b36209014dac73f90a63025d6586c4805c6214f061bbf2d527e1b8b7bf209641490ad8268fc86fdc450f54b8f
 EBUILD emacs-24.5-r5.ebuild 11261 BLAKE2B cee3de84ec6fe6b9a7592d090be1e0902c49d4f460633268e96547ea96f67d8cf590f0584780f057ed8fc0e79502e309bc3ad2105996ae5c7b315a03897cb16b SHA512 b0fba024fd12174d6fa55a87a7b5f3318adb23fff00d18508f3fb7cbbe1f4abb8bc565596b30321554c5619dacb56bc1c2eb13e09b046630852de690e06aa253
-EBUILD emacs-24.5-r7.ebuild 11342 BLAKE2B e8b0d454aa4661e838037ac264e29422267ba914964725c07746e50ed69e8cb03036557ae0d71e6772886ed8bc6e3b0525c82dcd90ae2bd3f517bf11a680e87c SHA512 2f97aafd89d1c54f5f0b0a097ce301579a146bd8baa8ba6b05774cbcd4430ac94f8bd10e4ef7396857ba0c32206060019e996e326e38e44932455cf303bf1d89
+EBUILD emacs-24.5-r7.ebuild 11341 BLAKE2B cbfa201230d78f7b2c727000a7bfcf1663e9ef862c9cf3d2ed2f33f826e7ba11edcd361eac063a2cb0f5133c5408ee88dca00e9276d7742ce29dd6b862f73928 SHA512 47107d55cc04dcce47bf15d2ece2eeabbd0ef68934d52db3257978e0f844f49561b2b972272e1c6ad3d4cc41ffc2cf8282c3d1216fd9a929e796deba179c8bd2
 EBUILD emacs-25.3-r4.ebuild 11753 BLAKE2B ab01076daf8c815a4bd7de83d652c8293219d9e4fb25002897527c0aaa87ac00c11f36a0c8a10e4e474629007950c67792ab3cd8e243cb046791fcba1fea19ff SHA512 dbae997b01fa892ce34dc554d1566e8c2a530c3246805b6028ebaf45cffdfb878e1fd98d827c0f6f3e37be52ae38b2929223161b234a5ed9e2dbfda6d786c191
-EBUILD emacs-25.3-r6.ebuild 11642 BLAKE2B b7ce973860dc3709e6731652ec5b5f82d91ce4fb042b2129123ac641a2b0fb253d61051aaf67a63d4af1d23905a83c5e4f24244ea1fe8c22cc42ae73c9e2ab49 SHA512 8c5ec55d78af9881245b918fd548d335e0499540ee2591eac0c95c8c44577f8ae794b0cc387f0d19931fc38e6a19132c439b62c5d0ca221dd8e4466657fdd289
+EBUILD emacs-25.3-r6.ebuild 11641 BLAKE2B ff98a8e3ed4143d72e9a22eaecd9efd09a889d879b8e644bc4eb571a05e48d5a5d6035c2a00e0a8e169041fba13d5523253ed9f9e4535c14870ff06b78c2fb72 SHA512 b4e0305a0910677938d7c95e0c1a0e50e64b236e0488f2b86d66d7bd8e2ab05ddcd5b2a4e85b795a6b3f0c3c6e3d5087862623c1e623bba163a8ad3e251c7785
 EBUILD emacs-26.1-r1.ebuild 12177 BLAKE2B 8849e102d459b68740e5127372c3ccdd07b64368cf6d364acd27ffcee331347dd2ee48d38204215b839d4682becc0449b104f168a86c1982c0940c1ab4f5389f SHA512 77b4ce147e8e091979d01ee111539111b2854a09caf85f637dddf3d2bac27509224f7437a6ed8f5321566042e1689b3c13d1b1485fdccfba5ef375e82367bdad
-EBUILD emacs-26.1-r3.ebuild 12288 BLAKE2B 018250fd3949cd0651454731283d5dd451e86a5dc8067fab9c1aebb5e89654cf4e8988cfe953ed6c8d88a72fde12b7dbbe8cf082662ec630ed35f91822c7d5d4 SHA512 01ce42d36729559ffc3db8d1a2011716d109f97a18711cdb5faeb2f7a289ed05631d51d15df2de485482940916e936e2a1feb25b199ad75082307d5d166f4454
+EBUILD emacs-26.1-r3.ebuild 12287 BLAKE2B b85a157da9052bca61e2fc49c0f8705e38423f54d38d178725e07a92fa36753b520e99e086bca6e6eb7359b1ded161606046565e22d2bf273feca1a5f5d624ae SHA512 bfbea979b9c51e21373b2734dbd305cce0a80eca7bfc226b6c7495ceb3395894f2d2284545e190ae4ed9f95c305e6b464afb5a544e32db181c05fcd4750e4327
 MISC metadata.xml 2849 BLAKE2B 28cad6b703be952825ae288ee9218209a2f38992bc8381ef60a0f6b36f57971bd133ccff284f0bc20d03a15d89c71950c21a2c32b3f47bd80bb793f5e439e1e0 SHA512 0db4dc9edb2a6f9e917b4648b887ec12f016f77d3332e67bf8962a0ba592908e34108610083e76f4abe7cd2f52a07bb75e8b14089b1ca87c138e711c2d31ff9b
diff --git a/app-editors/emacs/emacs-24.5-r7.ebuild b/app-editors/emacs/emacs-24.5-r7.ebuild
index 84430156d636..8a99b15164a6 100644
--- a/app-editors/emacs/emacs-24.5-r7.ebuild
+++ b/app-editors/emacs/emacs-24.5-r7.ebuild
@@ -12,7 +12,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 ~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 ~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 gtk2 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 )"
 
diff --git a/app-editors/emacs/emacs-25.3-r6.ebuild b/app-editors/emacs/emacs-25.3-r6.ebuild
index bbce550ba360..6ee9ceb9f750 100644
--- a/app-editors/emacs/emacs-25.3-r6.ebuild
+++ b/app-editors/emacs/emacs-25.3-r6.ebuild
@@ -12,7 +12,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 ~m68k ~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 ~m68k ~mips ~ppc ~ppc64 ~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 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 )"
 
diff --git a/app-editors/emacs/emacs-26.1-r3.ebuild b/app-editors/emacs/emacs-26.1-r3.ebuild
index 54dac8fb3a75..91e7d01a5f89 100644
--- a/app-editors/emacs/emacs-26.1-r3.ebuild
+++ b/app-editors/emacs/emacs-26.1-r3.ebuild
@@ -12,7 +12,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 ~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/fe/Manifest b/app-editors/fe/Manifest
index c9a6bf70938d..d5403380d520 100644
--- a/app-editors/fe/Manifest
+++ b/app-editors/fe/Manifest
@@ -1,6 +1,6 @@
-AUX fe-1.8-makefile.patch 495 BLAKE2B 311e9864c5dd2a1e7fdee4e394c85194f3a2526bb137d3c681d95a564be64672aa3cb45138b218f53cb381784882a44f2da671392184b2a7850df3a7730571c6 SHA512 1e88c66f37d5cfc90b8561cc8bb99a460003b79ca312e2a5a7ad5ebb44bbea86deb4aab115c3dbe7775edfb162d7417e4581a9854b1cc7e9efd8a91502c12cab
-DIST fe-1.8.tar.gz 169151 BLAKE2B 82ce56137ac462982e314e20f027f3e325b5810b778efe5503624728b48a4e06f6e60c668e35ca8bb70d2bfd07f4d6083d487ac83f382e760451e26a9721ac4e SHA512 c00f23769193b8b74867da32e7424ecb7f807a0186c8f91cd007f83a543777e1ca70909ee17a54ac8e7da743cd3fcb6b0e8cdd6d2fefbfb6766122ade125893b
+AUX fe-1.8-makefile.patch 370 BLAKE2B f0bfc2c97e30ce35a904394a871b275043ee479392997117f1886cebf57fb1fe9f056fdb0bd94f4130837323fc2c20e94aeb575ad0d0f3a80af7199e2fbd3759 SHA512 09820543f98e166a9692788d0b42f29b6ee60852f0e6197af86b4b8da31c902ff9c8be59e925af21e50241d5ef6e629195190dda6a1d0317e601abb4135e1238
 DIST fe-1.9.tar.gz 178678 BLAKE2B 144d8edf2f6bf38f75b7e5593d0fb9d9e3fc4a7e91d974f49fa5f7974ee1e077dbdee4ee25931b34691032c0d4e676ab6b03e4de646947a4ea133876213285d9 SHA512 38121a21c1539ff8ad4f61b92ddfd0582c100f1bc1c5524faf7a60a162c5f8a0b2d1528da7719e522e9b75a527166223c2636f78c9f516abbb33434a9f6e6251
-EBUILD fe-1.8.ebuild 689 BLAKE2B 0e7bf18ef97dd05512b4b5693287ad754812105417dfa4345417f81093e7a9bcb068518ca58f61a36d5757f4afe7a8c227a4579f652f393ffcefa273af293f65 SHA512 e4272214d6a2876f4eeb46b20ac24a186f2f187fe62705f388bc905ce249013d457e82e168e3fbfd23a9b212aeb2021dc1ffbafb9b5c6467a75ed7ed89079285
+DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7
 EBUILD fe-1.9.ebuild 694 BLAKE2B b97c8855f82cf71d6f84358c07f3a3f4e24023db119fc357a01b36ca604b5634330333dae1d2a047107564f6406395a4e78fbd18a7aba40a23aae64d6649ad3f SHA512 987ee3a593b521916c12c40823840d593766c31bf4bcb47d5f082092d3a95078915d8180b6a482c6afc0c014faf88c79076823153f42a64a5aa6789f24243767
+EBUILD fe-2.0.ebuild 678 BLAKE2B 732a3aa3bfcb15b75b90a847514415743f1f19e1b63073e0a5dc5e739bfa81e86ef19616f8322f6d1146d886679c01b5dbea5040a9cf2f3bcfed446c9a6dfc51 SHA512 306c44b23800f8bcb95821d01bf5a55b8ef54b592db277ce1cff251959a9ca0f9135f963577c8964e0bbc7ed1a656c4b56c8cae76357a6bca3f089819277b905
 MISC metadata.xml 1259 BLAKE2B e393bad45601c7e357aa4c4e5e6ede35cdd6758a1cc251cfc3acca0e8526ffb696c0ca484b312be14d23a05d8996ce7fb3bee37fe7a8c9bc72d5c507c26729df SHA512 6539d808d3cd85bab1985dbfb69ddbd01166a4e6dcf66d0f138d1ff1e52d9b7342ff3b468e031f9372308533296e28eb978b00954624890a897b5f41c222f701
diff --git a/app-editors/fe/fe-1.8.ebuild b/app-editors/fe/fe-2.0.ebuild
index 5567eebdbb07..6120b64d7b06 100644
--- a/app-editors/fe/fe-1.8.ebuild
+++ b/app-editors/fe/fe-2.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A small and easy to use folding editor"
 HOMEPAGE="http://www.moria.de/~michael/fe/"
@@ -11,16 +9,14 @@ SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="sendmail"
 
-DEPEND="sys-libs/ncurses
+RDEPEND="sys-libs/ncurses:0=
 	sendmail? ( virtual/mta )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=("${FILESDIR}"/${PN}-1.8-makefile.patch)
 
 src_configure() {
 	econf $(use_enable sendmail)
@@ -34,5 +30,6 @@ src_install() {
 		install
 
 	dodoc NEWS README
-	dohtml fe.html
+	docinto html
+	dodoc fe.html
 }
diff --git a/app-editors/fe/files/fe-1.8-makefile.patch b/app-editors/fe/files/fe-1.8-makefile.patch
index 73f7e09020da..572a5c924510 100644
--- a/app-editors/fe/files/fe-1.8-makefile.patch
+++ b/app-editors/fe/files/fe-1.8-makefile.patch
@@ -1,6 +1,5 @@
-diff -Nur fe-1.8-orig/Makefile.in fe-1.8/Makefile.in
---- fe-1.8-orig/Makefile.in	2007-08-31 20:47:09.000000000 +0200
-+++ fe-1.8/Makefile.in	2011-08-27 21:07:43.000000000 +0200
+--- fe-1.8-orig/Makefile.in
++++ fe-1.8/Makefile.in
 @@ -40,10 +40,10 @@
  
  install:	all
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 9b0b6f70affa..6eae2aa6d095 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,3 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
-EBUILD gummi-0.6.6-r1.ebuild 923 BLAKE2B 5192de8451af829ae3a9a2b673c17bb84263304d0ed1dc0a4249843c58ea0fd743d09f3dcdfe627dd22fa21ae4e42d444f63e25994c815178e6dd9c54def2668 SHA512 e65c0d73e2e9f4210048e50dda8247f1bebef281a5528edae821e45b407545933091c9446a7dc47d4c140f169d283281c643eece5bfab8c87f13bf24667f9a8c
+EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.6.6-r1.ebuild b/app-editors/gummi/gummi-0.6.6-r2.ebuild
index e1b1546fc67e..f67449975dee 100644
--- a/app-editors/gummi/gummi-0.6.6-r1.ebuild
+++ b/app-editors/gummi/gummi-0.6.6-r2.ebuild
@@ -15,17 +15,17 @@ KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="
+	app-text/gtkspell:2
+	app-text/poppler[cairo]
 	dev-libs/glib:2
 	dev-texlive/texlive-latex
 	dev-texlive/texlive-latexextra
-	x11-libs/gtk+:2"
-
-DEPEND="${RDEPEND}
-	app-text/gtkspell:2
-	app-text/poppler[cairo]
+	x11-libs/gtk+:2
 	x11-libs/gtksourceview:2.0
 	x11-libs/pango"
 
+DEPEND="${RDEPEND}"
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 68ba6c6e3d6e..d00fb0ff1819 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,5 +1,6 @@
 AUX nano-2.8.7-minimal_compile_fix.patch 1206 BLAKE2B 72265b226a23282baf1d16fe62637a3a6123342da9ddf9fa205d7eaafea710aa62fcafad1188cc1c08bd537be3ddb98403afbfd035fdac5712d6bf24bf2fa40e SHA512 1ebf43ca322c0cd49b7a3ffaad33057d4ac899c7a930569df124e54f713b28ece7e01aa625db91ece0126a07228256d188154bce464bd4c1a97945d686d9f0f3
 AUX nano-3.0-misbinding.patch 1517 BLAKE2B 2feac73d587beaed77649b7d6c92e3eabd411203e38f8b55ae874dcedcd4813ee6abc6b4e54fb33236c380e263257ac7e58b1c027446a4bc6caf5ab067a50c47 SHA512 0ba212b5b076ddb81f8ca723cc9c8656cf00375a913afe35036c84b3a3de23b773d11661d92d389275b26cb090a20445825fd91648579fb8a340b6992930f6bc
+AUX nano-3.1-enable_tiny_build_fix.patch 828 BLAKE2B 70899179a7f4d27202b7f70886f8ef73719e37d44c0b538432986bbb888a2d03620d7e4822550b1f5648f6733cbfbc6585c0c86ad02208cd38f7fe3b543c4e99 SHA512 b3ac68f0d64fcf4b92d59768342debefe24d8e4cabee9a649a94339ff4b0d0d014cd9f4c3a3dc32ff3e84850dbd1f71c5525d3c422cb964f380d6504b1985eec
 DIST nano-2.8.7.tar.gz 2822417 BLAKE2B 2559497b9aee4d4c3cfc86e8af6a54bc0af58588c7bd1142a0e97c6ce50aed66c3852745b83a457263659e97592f0775dcc94c44d818e20440b6524202bfe49a SHA512 511b57f8fe82872827829bca91f7a8666a6ee75924cf2c853332ddd0467abf281c6d3cbaa5dd208c579cbace5bef23d36bd7b62be116aa2175262ed1d15aaf79
 DIST nano-2.9.8.tar.gz 2905951 BLAKE2B 95b78c43a052be68956f5b9493c418c23a9db40b56f709b17217bce257333b69e78e8f8bec191b21df8aa408ce2d3c7d68bc82cf2f785df9b31929f4f41b4325 SHA512 dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
 DIST nano-3.0.tar.xz 1508248 BLAKE2B 1af09a02b9a7c2aac5ce48e9df12d682d1b213885330e5e936c674602249ca6227fb190611a03d9253c93749e892c1ef5e9569c72bb7df749b6b0888da90fdcd SHA512 120b606d65672a905e9ef9f3b55381cc62b7929abeaf409ea4af6be9f51b3d038e6e68f082755cbb7e198f0fb5203e0f4796c6c96ebd054d9a2241b313fcdda1
@@ -7,6 +8,6 @@ DIST nano-3.1.tar.gz 2923258 BLAKE2B d8e8e0da8ed669940a2c5604d476a147cb61f96db03
 EBUILD nano-2.8.7.ebuild 2296 BLAKE2B 0136026fb72a5b1978057e7f9ae7348bd3fd32f47c64316a5b65eb8c74689f8effc4011ef6c1e058cb22f05df001a80e9c7607cd616d8f731ab9f052239389da SHA512 bef42b685a5afb428083378cb084b9c8a0ce679ce4aedf59056eefa4976543babeab6b411f3c002d878fbc50c78fba1e91ef24cd20ae9cb62efd40b36a770305
 EBUILD nano-2.9.8.ebuild 2280 BLAKE2B b644ee6fab01ff53146e0fab085d5547ed4f11743e41a0f856f2ed552bec3f2dbe7a32439e816fac5f96234f1aa9d600761b9687e864854d29978f503168fa77 SHA512 8042d5e3fe58e71af3d928e4ed385665c65d21598f45fd58c1830ded958879cb8642fd98894f147b5b87cfc8a47a24386502084d740fccec5569acd532294220
 EBUILD nano-3.0-r1.ebuild 2329 BLAKE2B ba5b2dcd3e38887a4a1e21789fc2955bfdd9f5328a65edc159d728b97b93612bb4addb9b239cd7175a1a51346f77018597fed1e67bc4a55751570a2320c1079a SHA512 439aef7945a4dbb37a9132a922179440d011d7b172318cd875f065db8a20f92ed58c6c4c507d28dfd5df5eedad02bbbb199b3982378c6ee0fde8db216c5e990d
-EBUILD nano-3.1.ebuild 2279 BLAKE2B 7593cfafb9f968b27a417bc7ae06ca04204922d01760dcc535542a17c534f32bf86b72b85c45a345f4fb1980a5806ecef784f1a0feee34359c5adf60ba38b2c9 SHA512 c85d9ac732fc1136271c162875028ec486120eb9733dd300b677b7657581db9bc32725aeb5c3447cf775e2f6422409788a82e24a48a35685cad40356f712d9a4
+EBUILD nano-3.1.ebuild 2337 BLAKE2B 13b03e1a7d6c511f07205e717ba46db0a812ea33b83fea240f19260558e789d0d6aac75dec56373290673c008166c6caa4de5f574ec3fa3319ab8e3e8b97d52e SHA512 488cf08e5b026af85c5ef01a0160b5e6c6973c14df1162e0bc66dd1a7732a06ce35599a8b733fa4056e76db4906796b7e6c6fa6c1f84b5dd83bd217756c905c0
 EBUILD nano-9999.ebuild 2279 BLAKE2B 6a4a167d78038e7c982383f87a94d8ced33eab3beb9a7765ec4de6832ffcc21a8105e5f8d2799e9df25545de224cc687365110db0f80cc6ef1578bd0b52e80ca SHA512 b9e7bbb9924ce98ed642ec963dfa0a585fd8bdda095fe19029df3b61c98d769e88760afb535e2f5fd728d1e9df39bd9c29524c90b1b3779b6e5d374917652955
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch
new file mode 100644
index 000000000000..58fe1982be9c
--- /dev/null
+++ b/app-editors/nano/files/nano-3.1-enable_tiny_build_fix.patch
@@ -0,0 +1,29 @@
+From 368ec04870a366b19f1c5801a6868786547968b0 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Wed, 19 Sep 2018 20:36:39 +0200
+Subject: build: fix compilation again when configured with --enable-tiny
+
+Reported-by: Jordi Mallach <jordi@mallach.net>
+---
+ src/nano.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/nano.c b/src/nano.c
+index ebb1f11..01f92a1 100644
+--- a/src/nano.c
++++ b/src/nano.c
+@@ -1756,7 +1756,10 @@ int do_input(bool allow_funcs)
+ 	if (shortcut == NULL)
+ 		pletion_line = NULL;
+ 	else {
+-		if (ISSET(VIEW_MODE) && shortcut->func != do_toggle_void &&
++		if (ISSET(VIEW_MODE) &&
++#ifndef NANO_TINY
++								shortcut->func != do_toggle_void &&
++#endif
+ 								!okay_for_view(shortcut)) {
+ 			print_view_warning();
+ 			return ERR;
+-- 
+cgit v1.0-41-gc330
+
diff --git a/app-editors/nano/nano-3.1.ebuild b/app-editors/nano/nano-3.1.ebuild
index 7f0d1d7bfbdc..a9712a1c464c 100644
--- a/app-editors/nano/nano-3.1.ebuild
+++ b/app-editors/nano/nano-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-enable_tiny_build_fix.patch"
+)
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 73e26526b610..db08166c3cb8 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,5 +1,5 @@
 DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
 DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
 EBUILD okteta-0.25.1.ebuild 1603 BLAKE2B 0c64e8a1b0aa5e485fd86cf5a4f9b341b57e81f052f432373a3c3b3b32bba5c135d49c0e27b1de5a5fb2a120cb9d5bc1f283a12a398312aea0d96717fab31d5f SHA512 0b247aed642351f80e4b718c28e6ca7d231399a03fed884905014a7e001d1fc7213c5fc3b04233382cbdad6c1878796198ffaaad9b70975a198bb94bb58cf169
-EBUILD okteta-0.25.3.ebuild 1605 BLAKE2B 7c5a9e81733f75e9cd2ef29ce31a6c17cec9d8c49d90beeecb6407f73843b3a1a0009306dfd4e2e7d0d7620ccc1adbcbf6a1748a9e53b5858a7983c9c4617736 SHA512 82c9fc2dba9978f4671ab98d3b981377b94f5bb71c30050ff2a40e66852eda4f9fb2498289cbb402b0d2ad2d372c3d23d030c632a29cde25ae577588478782c7
+EBUILD okteta-0.25.3.ebuild 1604 BLAKE2B 3d4abb5f75e3de73c51944bfce29b22cd9d79d7cac87335201de43b8fd2a6b5b979be2f74d2e55d92d15564d4783b08db35d75ea820d5be04b3bc194ee21cab3 SHA512 44939a34bdd951feaf06a0d553cb99a1ed3499d816c1308c803ec4a20d1652cc24163a63db49da81305392681ab91ef9d3638fc9e5505a0c53ebeb2e2bdf09b1
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/app-editors/okteta/okteta-0.25.3.ebuild b/app-editors/okteta/okteta-0.25.3.ebuild
index 89727e9e83b1..b0e29bfec2df 100644
--- a/app-editors/okteta/okteta-0.25.3.ebuild
+++ b/app-editors/okteta/okteta-0.25.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Hex editor by KDE"