gentoo resync : 03.11.2019

23 files changed, 176 insertions, 572 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 33464a60a489..4318c6a5da23 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest
index 1dea80178a7c..2e10e0a4959e 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,3 +1,5 @@
 DIST bvi-1.4.0.src.tar.gz 139202 BLAKE2B 151d86214aa93bb0a7f383c8de13b8a15fe2cfe7f5892dff52b80e362c049b49082abe846ffaf68ec69201bbffba2fdcc5d00f744756c49ecb26e16ab93bb13d SHA512 119cfc7350f81c324e77243f948cfb91cd9a3122fef307616e4756a99732f69131aed2a26ebe48048698b9c211a0214255f3e6605ad2cbf479a14a4a0f88923c
+DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6
 EBUILD bvi-1.4.0.ebuild 476 BLAKE2B 8828fe7012383599a427032ec9d3fc89457e82cd7d6beaae56a9f2883c960c8c71e1ba6cbe57d4122f1440b2a650193f5bdde6e889358429e1ed90412bbedacc SHA512 642d892af5285215170595beb35aa9957fef14cf67230a8a79e03d1ac0bc92e836b84f7e2a30545f085376346b9571201fa7fec05acd37b8e8e0fea56f75f7db
+EBUILD bvi-1.4.1.ebuild 481 BLAKE2B f00ecc0cdbdb8e3bb9643f779d29076990d43a27c0cda590876e55b089e5eebe381caccf25075d78ed9befc98f63ffc25ec01cf6127d8ea6c3f25275dc8e2401 SHA512 095443eab987a90ec87200704d06a3198823aeb1d7dd0e8a84d03c17cce0617f64ce4f01ca201eb867d77579fe45a25a08d376f62219805bea98c0837e3c0c3e
 MISC metadata.xml 435 BLAKE2B f980e4c6f597a6328b959ab2664cc1de7f5f351d39e06a5383f63fa75933e42a45962184a56b5b3456a0ec9f05d6632b53174fc0bdd00fd92ee9a38eb4ed1a4b SHA512 3feab9fd6833b5503477acf55078027a14976e4a1647463a54901467e9ea40c22f3bb9d41acba1c2b8cfbe8819b2af310d2f19b9f1c0a3eb9a991cf001ea984b
diff --git a/app-editors/bvi/bvi-1.4.1.ebuild b/app-editors/bvi/bvi-1.4.1.ebuild
new file mode 100644
index 000000000000..0606e3e15e1e
--- /dev/null
+++ b/app-editors/bvi/bvi-1.4.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses:0="
+RDEPEND="${DEPEND}"
diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest
index 6eae2aa6d095..e9b648122bf6 100644
--- a/app-editors/gummi/Manifest
+++ b/app-editors/gummi/Manifest
@@ -1,3 +1,5 @@
 DIST gummi-0.6.6.tar.gz 792642 BLAKE2B 4f6096999b06361811a9149fa08eff5d2315f01e55539c5849c4bc86aab5a482ad9a0adfe84de5d093e66a328b294b4d88e1e2e2f0355bab320f0c094581da97 SHA512 3be94927c9aafa4914ed2b6f6f5022dce5bcca315a1f947fafb8a4c8bbc5a2bc57f07f8ceaaacdd0b92a5a30483ea8b00e570faf62479280d2ad874716e4c47d
+DIST gummi-0.7.999.tar.gz 578026 BLAKE2B b3305560d621eab029f0931dfc9978d0883acb886d89d2f9e452a60e465a10736191987523c47fe9f5373d7dd7d112383ebf7eaf030e6f0751197e535e461708 SHA512 1da2171cbb26b8be71c34dd7b1bc025813d35604e465caf67e480c3356a706991e6dcaca3bc99bb862895e4597186850c7d4f203a81a9532a4cd742cd2744dc1
 EBUILD gummi-0.6.6-r2.ebuild 923 BLAKE2B 988d9c593c630344d84cfcf8cc48914c9be667c4207ae8dde87a4eb98e9dd91c11ac26e9fd8d77d7bfa85c23ea73d3cf97e938ee969678d377dcf94ad04e239c SHA512 c46c6559bccfe2c3bb55a75ae32ae57eeafffaeec4cce1242af97bfb2ccd6653b98321fa828e9e5b2726f7ad4c84205a5334e17d9d76c7f32e16f2973ae88da2
+EBUILD gummi-0.7.999.ebuild 943 BLAKE2B 0c5e299fdccbf498337ab8d8498d6f0af2e91ef7a52e3a9988354b61f030b77d22d9eba4e214f8d2d3f6a01437e2c666abb0f851e36ef742927c7e9fc450be55 SHA512 bd3decbb0dd7e430ce5890099cb620472bf39f52a1f3248fcdada2a0c7dcfb19f8ac9bdb0979e6261abcb6345b898866b7177125e88d6f886590d472cb13017c
 MISC metadata.xml 585 BLAKE2B ed01cbc8767c6ca36400a5aeb66a9b041fd2f1ba74bd9952de92470b45bf117de34d94bfec0b6667f8a15a7e88032e36d6f177d6807483bb5d07c4f3cc824c1f SHA512 34f864f2195688b607f59867986304b66e42b167fd8c594b78139ccda1f3819aca73daa8eb69f09214e50730f55065eff97f3ced67dc97f90a2cc9cfd5573c33
diff --git a/app-editors/gummi/gummi-0.7.999.ebuild b/app-editors/gummi/gummi-0.7.999.ebuild
new file mode 100644
index 000000000000..1b970f9dfd15
--- /dev/null
+++ b/app-editors/gummi/gummi-0.7.999.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Simple LaTeX editor for GTK+ users"
+HOMEPAGE="https://github.com/alexandervdm/gummi"
+SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	app-text/gtkspell:3
+	app-text/poppler[cairo]
+	dev-libs/glib:2
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	x11-libs/pango
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Gummi supports spell-checking through gtkspell. Support for"
+	elog "additional languages can be added by installing myspell-**-"
+	elog "packages for your language of choice."
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest
index d34546437a39..f369276ff2de 100644
--- a/app-editors/kile/Manifest
+++ b/app-editors/kile/Manifest
@@ -1,3 +1,6 @@
+AUX kile-2.9.93-cmake.patch 549 BLAKE2B f93414f3b09b45952a5082e9c9c0cd53b01b7b2ee3b080e6d4ef554cd3cbbf84f60061e1b4f9d1ab060f2e4ea221af3407140f9d897bece353691d9f262033e2 SHA512 be9a14c712c05bc63b1bf31eb959083580913c2ae37f642eab86f47a07f75d63d633fa154cce2ac65866b25da530cf0699e654c7b05ffc4361d35bc389a13faa
 DIST kile-2.9.92_p20190716.tar.xz 6176728 BLAKE2B cc6b5f12c7798c806a1e78b79c32e90a3f713d65429afbddfbf75a3a666cfbea75d32be1c2e7d15ce2e414301473f03168e84428bcec161cfd12ceeba674add3 SHA512 614d6aba168f47af41e6a352e7ad838c187945b857c19654ce40ea80c359e5d88a184f1ab02b404c022b897f8ac6f3a61323c9d1043fbb0412eb3d16690e40bb
+DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504
 EBUILD kile-2.9.92_p20190716.ebuild 1626 BLAKE2B 6d9ef50a335645b8f25bf36b830d73f5be2e1ad08aa951118d41bedbbdd6837f38403cf5e9b6de5de6696b07e97ceb14e64874bf758a6bd3a5bc5e0beec8f6cf SHA512 88808252c0661fa3c85e86afd4bbe6c424b6f74041c967b2849075046a276624a5d74dc5c29f9eea684115601a6c13b6a09541d50cff44ddac5c17a482aa074d
+EBUILD kile-2.9.93.ebuild 1516 BLAKE2B 0bb3dce7250334a7f3e2248361b5253a7656325582bd0aca43a2305063d731d0ae094a48ddf3878d3153de7a956d68ca557c6d3e2a2be0b8e266a87706f9b448 SHA512 7984d6920913b9ee4bb59f7ce40968b7a728d846b762ca5eb24ddeb513ff173f92d05a730a46de2074d527da6f3b8e045ffe34e3f572ee1ed2c6fb0ec0739106
 MISC metadata.xml 476 BLAKE2B a152c0446aad3c66df2574332dc89f6797a16db142daafc82c3845f159b68bfcb922615f5912429d9965141ede27945512e5af1f5811ccbfa761026cc105b4b3 SHA512 82eaa93d944622e571887200fc50166b34ad4098ca2612749e72fff4e80f9f3fa07736cb8cd171fe3258fcd18209f7e60b01c859ad3cf20e4e238eab9dc3e486
diff --git a/app-editors/kile/files/kile-2.9.93-cmake.patch b/app-editors/kile/files/kile-2.9.93-cmake.patch
new file mode 100644
index 000000000000..94e39c463517
--- /dev/null
+++ b/app-editors/kile/files/kile-2.9.93-cmake.patch
@@ -0,0 +1,20 @@
+I know upstream wants to help us but it doesn't work...
+
+--- a/CMakeLists.txt	2019-10-19 14:23:41.000000000 +0200
++++ b/CMakeLists.txt	2019-10-20 15:50:52.606325681 +0200
+@@ -116,15 +116,6 @@
+ 		kile2.0-5_upd.pl
+ 	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update)
+ 
+-install(FILES
+-		AUTHORS
+-		ChangeLog
+-		README
+-		README.cwl
+-		kile-remote-control.txt
+-		README.MacOSX
+-	DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile)
+-
+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
diff --git a/app-editors/kile/kile-2.9.93.ebuild b/app-editors/kile/kile-2.9.93.ebuild
new file mode 100644
index 000000000000..ad69bc67ec67
--- /dev/null
+++ b/app-editors/kile/kile-2.9.93.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"
+inherit kde5
+
+DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks"
+HOMEPAGE="https://kile.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="FDL-1.2 GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pdf +png"
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep okular)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	pdf? ( app-text/poppler[qt5] )
+"
+RDEPEND="${DEPEND}
+	!app-editors/kile:4
+	$(add_kdeapps_dep konsole)
+	$(add_kdeapps_dep okular 'pdf?')
+	virtual/latex-base
+	virtual/tex-base
+	pdf? (
+		>=app-text/texlive-core-2014
+		app-text/ghostscript-gpl
+	)
+	png? (
+		app-text/dvipng
+		virtual/imagemagick-tools[png?]
+	)
+"
+
+DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} )
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 88ca4263ac91..9960b30ddf9e 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,3 @@
-DIST mousepad-0.4.1.tar.bz2 644161 BLAKE2B 656245afb38423cff7eb8a038c8247d9023e10eb85f574f25fd4fad50b0316cbe125630ddff330adb91c49eec9ee3ed67ecd0546b9fecb065c832882b3e42145 SHA512 2ffbb4245a3344437bd41f9f28cc066ae45062f6b6d169aa274e933f033c434f0b10845ccf42ab846dcad25ae7cee36ea6619bfb6889e8cd41c994be87b77be8
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
-EBUILD mousepad-0.4.1.ebuild 997 BLAKE2B b3aa9ff9fd24384dad2219a270187aff5c7e1954acef0bb10cd2a6707092a53b972d1f58bd397f871b28504e7c3e5cb1e73fa554939fa399538ef6e1da53a550 SHA512 be7e8177305687445becc4b2af67612c186f2b4d8d6e0bbbb8b5c58ba2442420da2537cabf64d52f2347cd725a416b763f33576f962866466ecc017f7183948c
 EBUILD mousepad-0.4.2.ebuild 1135 BLAKE2B 94382272da3c4e73d7116598cd8cc5fd0d0fc8d89e8de32b2ee1b36a4535687ca24168ceed13b7c644c8402a5c455d59f161b65391454493892578bec89c1151 SHA512 70011b57e94d29363a7af9971f8896aeefeeb935df6a6e9006fc42a48ee3182a88ca25cc2da9e852ec100150d17f95681f9f8b18e39070f9d0d9a6281d7700e2
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.1.ebuild b/app-editors/mousepad/mousepad-0.4.1.ebuild
deleted file mode 100644
index 28be4153da21..000000000000
--- a/app-editors/mousepad/mousepad-0.4.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gtk3"
-
-RDEPEND=">=dev-libs/glib-2.30:2=
-	dbus? ( >=dev-libs/dbus-glib-0.100:0= )
-	!gtk3? ( >=x11-libs/gtk+-2.24:2=
-		x11-libs/gtksourceview:2.0= )
-	gtk3? ( >=x11-libs/gtk+-3.20:3=
-		x11-libs/gtksourceview:3.0= )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		$(use_enable dbus)
-		$(use_enable gtk3)
-		)
-
-	econf "${myconf[@]}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index 25445427f388..c470380ea020 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -2,6 +2,6 @@ AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07f
 DIST neovim-0.3.8.tar.gz 9233661 BLAKE2B 252a64d2ac5ca1f8e1695d3f0f694ac333d9d9179dc4c428a279534e455de4b8d2c0dc6e638f775bb28a940fc1254bad426f7cee1bffaa2dbf84deefe49d41dc SHA512 431d3df859b430570e3f927328b862945a15b1ac041108599670d32af6cccac9361a143fc6af27847529629a43a5e0a0afd98b1c826d4ee1e7570de3cf14f9c7
 DIST neovim-0.4.2.tar.gz 9552134 BLAKE2B 4004a2e2788344ab96c97f145acc4f75680961ad004fcaa017731557899bbed24c6003b799c1496067a3ca75d8a4c2e63344b9646e8dab0ed00c9fa329d90ab2 SHA512 cc0de18ee7ca5105a0dd9f5f06b4d58335618b22c4dc3d584a024683785ff9d541c7f5131742b8a818ac9acb2218da92f9b8a881d56c4b963237918e589fac22
 EBUILD neovim-0.3.8.ebuild 1921 BLAKE2B 37b80b8a916af164511bcb3f7aac79428045f9e14ecafe2a8c36aae8d72ebc387874017b1a5cb8bc0f663dc20f2b57979eb11f6cd12cc67a6295c9a722d84207 SHA512 f6f55b612bdc1964995d8016f917279e936f76b929291011282a42eb34471a9fefe9b298d950447693984b3ba575cd3fe1ea4fdcc4e8cf5f5c00c028a44ab40d
-EBUILD neovim-0.4.2.ebuild 1860 BLAKE2B b2ede90a493ac5963f3e4adaf28d27c64c14165ea0e2f0e8140b2204fd111553ad6b8c7729aea594049eec7ff66aebccdabdba61fa34c0f31e575b236f917561 SHA512 544546dc90aa1d010b1ae9f23845b753d91a59c1c4180d6df0ed079b56ad7c0ce60b93d98d20da2b4dd8864be3bab71f17eef8eb9c9723f0f9cbc42f67dad40b
-EBUILD neovim-9999.ebuild 1884 BLAKE2B 35642daa24554b4c3cb439861723381e3176f803abb8ee01982f3cd260a8661a6923c4f96754d3ff1fd4b200c9a505d1c3b18f24a47b57c6bdfa6330d6c7d0a1 SHA512 358fda9fca9b3325b9d0d44ffce8633cd698b1e0530b1c3a4ced44911f939065948ded21418c928f780e4d85c76fc64a22d89035bdbbdfa5c2059fa2681b9ce2
+EBUILD neovim-0.4.2.ebuild 1870 BLAKE2B b9ba9926cdd2dccbc6826f9bb91a11fc5bf97788139f8fa477c1c7c6620a1c0329d102388d142fbcd3ac1719360d70f7931b17f6434d0af63f8735ffdce5157e SHA512 ae453ccf25df891819e299b7b77dc24a7d5a7b2c5feaeb706a65edc49d12189be3afda361c8dcb2b8239b22ecc84fc27fe9dfa91db2813520b21b2057f6b72e7
+EBUILD neovim-9999.ebuild 1894 BLAKE2B 72bf20b3a2d0bf7c4e69f413519ecd3120c86ecf83ba001faeb8e2a82ed87fd01040069e50cea35b52f7d6b253554ef0f10656cd5d59687883c65abff839f950 SHA512 1ba08f8e52181b82e44415d68e2a372e3dbaf2c54f5f05561bef314ed5905f434fcc3028ece08cc9e3be8ef2169e2b0a9424e244e71bf9da7aad81e4462a2c9f
 MISC metadata.xml 862 BLAKE2B e9725c43d1a34d8da4fd779a2a945594914ed51a2fc0b87a9a2a6ddefcc8d38d88c94c426a59df9f94b08045b2f8820ee205e7982a19c15f1872d2a73b35fae6 SHA512 9eb46f7862d26c27f400d22023ac3cc81f5671e8b17d4f52b0743abcfdf53d63366cd16c06ac1e391f02bf35fb9b70e0864eda9457c1f45ff74a06f528d1b8a7
diff --git a/app-editors/neovim/neovim-0.4.2.ebuild b/app-editors/neovim/neovim-0.4.2.ebuild
index 7726bfae3ede..cf111db0b07c 100644
--- a/app-editors/neovim/neovim-0.4.2.ebuild
+++ b/app-editors/neovim/neovim-0.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui"
+IUSE="+luajit +nvimpager +tui"
 
 BDEPEND="
 	dev-util/gperf
@@ -49,10 +49,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	app-eselect/eselect-vi
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 "
 
 CMAKE_BUILD_TYPE=Release
@@ -87,9 +83,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/neovim-python-client
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
 }
diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild
index 794068e522f1..97f2f678904d 100644
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -18,7 +18,7 @@ fi
 
 LICENSE="Apache-2.0 vim"
 SLOT="0"
-IUSE="+clipboard +luajit +nvimpager python remote ruby +tui"
+IUSE="+luajit +nvimpager +tui"
 
 BDEPEND="
 	dev-util/gperf
@@ -50,10 +50,6 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	app-eselect/eselect-vi
-	python? ( dev-python/neovim-python-client )
-	ruby? ( dev-ruby/neovim-ruby-client )
-	remote? ( dev-python/neovim-remote )
-	clipboard? ( || ( x11-misc/xsel x11-misc/xclip ) )
 "
 
 CMAKE_BUILD_TYPE=Release
@@ -88,9 +84,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
+	xdg_pkg_postinst
+	optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard
+	optfeature "Python plugin support" dev-python/neovim-python-client
+	optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client
+	optfeature "remote/nvr support" dev-python/neovim-remote
 }
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index d6dedd4fc1cb..2bf124d1b423 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,12 +1,6 @@
 AUX scite.desktop 138 BLAKE2B f0cc28779504c505e8876fadaffc979939c48088e5cb5c1d0a8b2cd499ecc21806655415ba34b2ca5351a31a588c5818ed21e38c19233055386c0246c5aae4be SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6
 DIST scite-4.1.3.tgz 2546247 BLAKE2B 9c0cd767e6aff861bb706500eebf5fa431d5ce608f37a9b19d2af7d558698eb3073a33fcdd0900abb549aa9ed65981a9f217dc1dae4b21be919c380d20d4ee8f SHA512 875dd44785e9c96a264df9061830c7ab51296061da7765084ec4445d7f529dabecebcfadc5a1d8cab9074ffd588903ca056ed5de0ae974d60a5c57b13d61550d
 DIST scite-4.2.0.tgz 2629884 BLAKE2B f9801146a086faefb38b72d28e00da055191c44254e5a6d34ade06462febd6a2b596aa572dd7e16c7541b0fcc23ff5f97f462b8869440782fd51f71ddd16d4c9 SHA512 d0a46ed2a21057a4fa866ae9305c9893360376d8591a9414eab96f9cb91991a43f3bf824bbb9a00c606555686aafdc0dc4b4bb41bcc94fe5dc90064342914c5a
-DIST scite355.tgz 2302137 BLAKE2B 5b36c68a5447b7fd0dd2fce51fc09cec0ee4a86be10f4f32fa7bf47354c56424cbead6cdfe819c8014be75e843c867ccaa137c5f7e32c3f9b0dabb6b9a5a9cb3 SHA512 cdd9d3aa621f5d31632cfb9f71524255a4b47b70a654bf4bc8a25a76f8a2dbe098a48e0cd4587ced8ca8455be7e809973e212fcbcde5b62087aa0f9528f7f40d
-DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd77772923ceeb249b3182dc47cb1e1097a4e0942b3a5c7528d0e80fe2314ed9d3d2b7f4e960a0f17ff2 SHA512 193dcb1f8787a7c7d520ce62462e5c95e7b6bcaf79f4ab23f9885474fb0444dbc5a69a0d45eafc592e5fff2a2e746a9aba599799e847e3c74d3436eed26580a9
-DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283
-EBUILD scite-3.5.5.ebuild 2096 BLAKE2B ff9f5cda63b66b685c558e7eca8553633b02ab0c6a8bfd2ad7e9b1dd61a562811e0127a439b4ad9440ecaf130e58c0ff4be791889ce90c739de6517a6bfa49ff SHA512 d0f43c83671fc3f4e7c8776493cd686b1d643c0a9b2e481280664b467eae35cb9546e51a1d998e47b3e9bdb249d184c955baf45190f83fae72d59491287d5f96
-EBUILD scite-3.6.5-r1.ebuild 2222 BLAKE2B 5840af902527a245a59650b0485fc9ad38274ab5ee3c459d4ae5d625596862bfc359b68af35cdcab1720bd4b499d6860f6cc7ea275f7fa925d952fc69d3aaf57 SHA512 97909239de93b72dc6beb44f5a2b387883e1024bb8b0d581124be6e4fcfc56edec745dbf287979f5db85c6217c23b218e1ba420966ddc3d398e94c6d11fb2ca6
-EBUILD scite-4.0.2.ebuild 2675 BLAKE2B 55a3ffa305ae36cf27d77b376167123606e7e55a72b4ceac34957fe51cb3325110abc1e50a5bca9a48371938b2241da7d217a46386d15e64888428ac2494625e SHA512 04f7358b0144dc4caa04d17f6c2cd401a6d5b7e3a3e5e1f55ecf07525e5c5b7548e91d18e2ea4a6b24d80abc88bc09757fd5479d6c4d12d3f9bb9456e3fba22c
 EBUILD scite-4.1.3.ebuild 2976 BLAKE2B d92923eb83d02613e10241f727c8324a51e60df0954ba49e0d33031dde3d7ee0447b6bff96b6fa8a47432d0bcc3ca33dd7062c4081910bc735030a552165a35f SHA512 60bc482c10148a40a9a377925e3d19e4cf3d7e6d32a1fd320dc24c9e46eaa46e3752f65e9393cbd31dc50fd0d84a974a90ddc0d9c0bc0f3bf1c8a2fbd59ccbe1
-EBUILD scite-4.2.0.ebuild 2978 BLAKE2B 1c792af0b81ddbbc4971b86391cbb903f01391bd8c9560d936b613859bce02b8a272b20bcb8ced750cee0456ce463401d96ae09b48f978440254bcda0fec6818 SHA512 8ea00f543446e4b803eb4621104a627f7a91cf10553298d689b6a518b0a20b99ce626e02390991d33729046beb049323f81966713b55b65d31556a6fe1b36400
+EBUILD scite-4.2.0.ebuild 2979 BLAKE2B 9699168e861dc67fe186091890ce2dcc0799407c915c4357d23313557d133bbc02aa2835eaf578b1e277241de15633c9d47c93e550d734a85b1734e8a2c79204 SHA512 8a42fb020c8c1ca8befc3f084eb5fecb783fd7017283c52269a3770984d1173b8ea9500e1bfa6d980a1e22ab3ab2b518df0e32ee838bd01de9ccc69dc9f9b0ef
 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79
diff --git a/app-editors/scite/scite-3.5.5.ebuild b/app-editors/scite/scite-3.5.5.ebuild
deleted file mode 100644
index 1adfbe41a5c9..000000000000
--- a/app-editors/scite/scite-3.5.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	cd "${WORKDIR}/scintilla/gtk"
-	sed -i makefile \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-
-	cd "${WORKDIR}/scite/gtk"
-	sed -i makefile \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching makefile"
-
-	cd "${S}"
-	sed -i makefile \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching makefile"
-}
-
-src_compile() {
-	emake -C ../../scintilla/gtk AR="$(tc-getAR)"
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake prefix="${ED}/usr" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	# replace .desktop file with our own working version
-	rm -f "${ED}/usr/share/applications/SciTE.desktop" || die
-	domenu "${FILESDIR}/scite.desktop"
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-3.6.5-r1.ebuild b/app-editors/scite/scite-3.6.5-r1.ebuild
deleted file mode 100644
index 5662b8b541e9..000000000000
--- a/app-editors/scite/scite-3.6.5-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs eutils flag-o-matic
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful editor for programmers"
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching /scintilla/gtk/makefile"
-
-	sed -i "${WORKDIR}/scite/gtk/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		|| die "error patching /scite/gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${WORKDIR}/scite/gtk/SciTE.desktop" \
-		-e "s/^Encoding/#Encoding/" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching /scite/gtk/SciTe.desktop"
-
-	sed -i "${S}/makefile" \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching gtk/makefile"
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
-			-C "${WORKDIR}/scintilla/gtk"
-
-	if use lua; then
-		emake
-	else
-		emake NO_LUA=1
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/{pixmaps,applications}
-
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild
deleted file mode 100644
index 4ab3e1e3acfe..000000000000
--- a/app-editors/scite/scite-4.0.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic gnome2-utils xdg-utils
-
-MY_PV=${PV//./}
-DESCRIPTION="A very powerful, highly configurable, small editor with syntax
-coloring."
-HOMEPAGE="https://www.scintilla.org/SciTE.html"
-SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
-
-LICENSE="HPND lua? ( MIT )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="lua"
-
-RDEPEND="dev-libs/glib:=
-	x11-libs/cairo
-	x11-libs/gtk+:3=
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	lua? ( >=dev-lang/lua-5:= )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/gtk"
-
-src_prepare() {
-	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e "s#-Os##" \
-		|| die "error patching scintilla/gtk/makefile"
-
-	sed -i "${S}/makefile" \
-		-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
-		-e 's#usr/local#usr#g' \
-		-e 's#/gnome/apps/Applications#/applications#' \
-		-e "s#^CXXFLAGS=#CXXFLAGS=${CXXFLAGS} #" \
-		-e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
-		-e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
-		-e "s#^CCOMP =\(.*\)#CCOMP = $(tc-getCC)#" \
-		-e 's#${D}##' \
-		-e 's#-g root#-g 0#' \
-		-e "s#-Os##" \
-		|| die "error patching scite/gtk/makefile"
-
-	# repair and enhance the .desktop file
-	sed -i "${S}/SciTE.desktop" \
-		-e "s#text/plain#text/\*;application/xhtml+xml#" \
-		-e "s#^Categories=\(.*\)#Categories=Development;#" \
-		|| die "error patching scite/gtk/SciTe.desktop"
-
-	#  add the ebuild suffix as shell type for working with ebuilds
-	sed -i "${WORKDIR}/scite/src/perl.properties" \
-		-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-		|| die "error patching scite/src/perl.properties"
-
-	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
-	# Bug #576162
-
-	cd "${WORKDIR}"
-	eapply_user
-}
-
-src_compile() {
-	# prepare make options
-	local emake_pars="GTK3=1"
-	if ! use lua; then
-		emake_pars+=" NO_LUA=1"
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" \
-			LDFLAGS="$(raw-ldflags)" AR="$(tc-getAR)" \
-			-C "${WORKDIR}/scintilla/gtk" $emake_pars
-	emake $emake_pars
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	# we have to keep this because otherwise it'll break upgrading
-	mv "${ED}/usr/bin/SciTE" "${ED}/usr/bin/scite" || die
-	dosym scite /usr/bin/SciTE
-
-	doman ../doc/scite.1
-	dodoc ../README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-editors/scite/scite-4.2.0.ebuild b/app-editors/scite/scite-4.2.0.ebuild
index 0b8f9197c347..fecd4f286206 100644
--- a/app-editors/scite/scite-4.2.0.ebuild
+++ b/app-editors/scite/scite-4.2.0.ebuild
@@ -7,7 +7,7 @@ inherit gnome2-utils toolchain-funcs xdg-utils
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring"
-HOMEPAGE="http://www.scintilla.org/SciTE.html"
+HOMEPAGE="https://www.scintilla.org/SciTE.html"
 SRC_URI="https://www.scintilla.org/${PN}${MY_PV}.tgz -> ${P}.tgz"
 
 LICENSE="HPND lua? ( MIT )"
diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest
index 400c3beeaa91..f4db17930083 100644
--- a/app-editors/sublime-text/Manifest
+++ b/app-editors/sublime-text/Manifest
@@ -1,13 +1,4 @@
-DIST sublime_text_3_build_3176_x32.tar.bz2 10352060 BLAKE2B 97d6e7bcc838ecac53ffa68cc3d355b01d06ea1903fd92b9894f27cf402d0506728be69f27d91dccbcba1bab876f94fd619bcf4877a9d935fb5517e91d2be4ac SHA512 640920a92995aac4af711cb4eb58d142d1afe2cbcbc485a111bc407ce464e81b984cd2110074072cc3805ed8656a4a60acce6f1a014f8a3f27f1b340222b0071
-DIST sublime_text_3_build_3176_x64.tar.bz2 10314226 BLAKE2B 98b0cda71b8a859614a1a6510afa073ca1aae6b9ac5d4b6db259723e8aa057a8b2bf22a0d26f0b6ccce31f39e047293ed84c4a63b8739a6d08c05af5791967bd SHA512 c37bd0d6d7fbbe2757f4244ae2803086d5fe1e25b32a1dd2de4241dc55f66f7c4588f3f9d56059c9d0ef7fe2ae69e76005f16dad60060f38fe10b92fd8eda969
-DIST sublime_text_3_build_3200_x32.tar.bz2 13798686 BLAKE2B bed2ec4cfaccaba6a0443207aa794e01ce2fe2d0e8ca43b6d966fb2745ce0b1a7978f3bed7a0a347d1945b7556acf71143e94a5a93c11cc3101ff816d45e2d9f SHA512 ffcd96f0b612356d0fb15d7b19fb6164c28311de88ae5df7845d5c223ea714c398f37ecdc98747d2491d762dea642a7698303d7033e40ecd1a511e97ced478e0
-DIST sublime_text_3_build_3200_x64.tar.bz2 13657959 BLAKE2B 88d38014977ce92503583e626a59a57ccf0f5ff243cbc1487478d65ab065fccbe28af65f91db7e63a46a90614c1f5161ce24558c6c2ea4d0c6f7cfffd8bd153e SHA512 9a8c739fe0899286f8026bdebcd69ee80ac8a9194cec4695efffda8340438537a03e203f944c94e35478fb2cda3a28971067eabd7152a3247122937e094361d2
-DIST sublime_text_3_build_3207_x32.tar.bz2 13801015 BLAKE2B 5d2c76b4f0894ad2c171cf7e3726e3684057fb4f7c6fa5bd35b9bc9d0e32781884340cb5c2d2bae15128b41b888337d88a7d917e1841b939607507da9c888d93 SHA512 28859fedb76c6074cbf7724ba5822bce8e1e89393bf3f61c4b277847a8568bb3e92345628754deb73e96c10fe748b0c43000d6e15e59422b20904e042a3d1e61
-DIST sublime_text_3_build_3207_x64.tar.bz2 13672413 BLAKE2B e9e98fe0d6d8f059ec9af2593414cf6c35bce3b70193999922f6ea8fccad5348af549a374f57a2410ed10fd74bf58d6bf895da667af67c454d8ad678b52e52a0 SHA512 48510da4714bddfc129d89d68b277c2a3e9badfd0bd276c746e0dc0e5f14efb091dc7c2b3a1228095ebf70be8f73f4a5004f6f8903fb18d7bcc70366150e6251
 DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803
 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1
-EBUILD sublime-text-3_p3176.ebuild 1655 BLAKE2B 9c224d920d1e2928c70c46b6709c579b7e17df4b8f50b06355f4336b730f8341a5a64bcfa31b9be3db94c436aaf6d9f4765241f8f7087774fe970cf3577c812a SHA512 d536fa15fcbad6e804c339f9ab13896020ae92579069fd4e1dddf4337777760fc0b8874f098b73091a5867a3c74ceb5da295df1f893d4b2bf3b0b1ee99269193
-EBUILD sublime-text-3_p3200-r1.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
-EBUILD sublime-text-3_p3207.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
-EBUILD sublime-text-3_p3211.ebuild 1644 BLAKE2B 4c84f453d075c34acfe7df6537ca262c549bfb2fc83a62c29f4ac4c4d9993afd116be1e585bb08c9c9b2942a533dd64f74bb50d2e9fc6312596fdbe57fac61a1 SHA512 5b0404e0141182b70e180caf4264e9df3e743e7759276620d0151cf7ee5b519ff25e3be8f3b24f3021fcabf809f1d2069f0852cf8dab2e813495e83b212c7b2c
+EBUILD sublime-text-3_p3211-r1.ebuild 1648 BLAKE2B 7ef13efe77fa0a21de63f96ce10d0f02d1143f8e1951753fbb1cb93e027824289e4435c69b149d4547138f6eaedb59f45c59f21a6f0d77b908358b13697eb928 SHA512 e8c0fa8667253cc73bdb9f4870eb7ec5780dc88c97b26cd54307366b7a4750d5c24e56a93dd56db36ee5e0b62d738e9634886126f9a512ececfc044399dda32c
 MISC metadata.xml 215 BLAKE2B e5b704d936932650ad333b6ee575d0f6fb54f7b01e62f59912a5d88c8a76bfff888e9de639a9a4d6ec5882a3e9a57874eb89935bb3d1a3c3a79a4b1f58b944fb SHA512 d803656f1527d3fc8a2b3474c0ff52d86170950b70057a65ab412ce1adc926545393fe1cfb71731d573f057de2145edd90d642c644ef26222a2b413cd8922d47
diff --git a/app-editors/sublime-text/sublime-text-3_p3176.ebuild b/app-editors/sublime-text/sublime-text-3_p3176.ebuild
deleted file mode 100644
index 89e271833a01..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3176.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils
-
-# get the major version from PV
-MV=${PV:0:1}
-MY_PV=${PV#*_p}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
-	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-QA_PREBUILT="*"
-S="${WORKDIR}/sublime_text_${MV}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${PN}${MV}
-	doins -r Packages Icon
-	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
-
-	exeinto /opt/${PN}${MV}
-	doexe crash_reporter plugin_host sublime_text
-	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
-
-	local size
-	for size in 32 48 128 256; do
-		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
-	done
-
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
-		"TextEditor;IDE;Development" "StartupNotify=true"
-
-	# needed to get WM_CLASS lookup right
-	mv "${ED%/}"/usr/share/applications/subl{-sublime-text,}.desktop || die
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
diff --git a/app-editors/sublime-text/sublime-text-3_p3200-r1.ebuild b/app-editors/sublime-text/sublime-text-3_p3200-r1.ebuild
deleted file mode 100644
index d059f42e93d5..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3200-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-# get the major version from PV
-MV=${PV:0:1}
-MY_PV=${PV#*_p}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
-	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-QA_PREBUILT="*"
-S="${WORKDIR}/sublime_text_${MV}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${PN}${MV}
-	doins -r Packages Icon
-	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
-
-	exeinto /opt/${PN}${MV}
-	doexe crash_reporter plugin_host sublime_text
-	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
-
-	local size
-	for size in 16 32 48 128 256; do
-		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
-	done
-
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
-		"TextEditor;IDE;Development" "StartupNotify=true"
-
-	# needed to get WM_CLASS lookup right
-	mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
diff --git a/app-editors/sublime-text/sublime-text-3_p3207.ebuild b/app-editors/sublime-text/sublime-text-3_p3207.ebuild
deleted file mode 100644
index d059f42e93d5..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3207.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg-utils
-
-# get the major version from PV
-MV=${PV:0:1}
-MY_PV=${PV#*_p}
-
-DESCRIPTION="Sophisticated text editor for code, markup and prose"
-HOMEPAGE="https://www.sublimetext.com"
-SRC_URI="
-	amd64? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x64.tar.bz2 )
-	x86? ( https://download.sublimetext.com/sublime_text_${MV}_build_${MY_PV}_x32.tar.bz2 )"
-
-LICENSE="Sublime"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	dbus? ( sys-apps/dbus )"
-
-QA_PREBUILT="*"
-S="${WORKDIR}/sublime_text_${MV}"
-
-# Sublime bundles the kitchen sink, which includes python and other assorted
-# modules. Do not try to unbundle these because you are guaranteed to fail.
-
-src_install() {
-	insinto /opt/${PN}${MV}
-	doins -r Packages Icon
-	doins changelog.txt sublime_plugin.py sublime.py python3.3.zip
-
-	exeinto /opt/${PN}${MV}
-	doexe crash_reporter plugin_host sublime_text
-	dosym ../../opt/${PN}${MV}/sublime_text /usr/bin/subl
-
-	local size
-	for size in 16 32 48 128 256; do
-		dosym ../../../../../../opt/${PN}${MV}/Icon/${size}x${size}/sublime-text.png \
-			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
-	done
-
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
-		"TextEditor;IDE;Development" "StartupNotify=true"
-
-	# needed to get WM_CLASS lookup right
-	mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
diff --git a/app-editors/sublime-text/sublime-text-3_p3211.ebuild b/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
index d059f42e93d5..0ac62feeeccc 100644
--- a/app-editors/sublime-text/sublime-text-3_p3211.ebuild
+++ b/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
@@ -48,11 +48,11 @@ src_install() {
 			/usr/share/icons/hicolor/${size}x${size}/apps/subl.png
 	done
 
-	make_desktop_entry "subl" "Sublime Text ${MV}" "subl" \
+	make_desktop_entry "subl %F" "Sublime Text ${MV}" subl \
 		"TextEditor;IDE;Development" "StartupNotify=true"
 
 	# needed to get WM_CLASS lookup right
-	mv "${ED}"/usr/share/applications/subl{-sublime-text,}.desktop || die
+	mv "${ED}"/usr/share/applications/subl{_%F-sublime-text,}.desktop || die
 }
 
 pkg_postrm() {