gentoo resync : 03.11.2019

5 files changed, 3 insertions, 204 deletions

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_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_p3200-r1.ebuild b/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild
index d059f42e93d5..0ac62feeeccc 100644
--- a/app-editors/sublime-text/sublime-text-3_p3200-r1.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() {
diff --git a/app-editors/sublime-text/sublime-text-3_p3211.ebuild b/app-editors/sublime-text/sublime-text-3_p3211.ebuild
deleted file mode 100644
index d059f42e93d5..000000000000
--- a/app-editors/sublime-text/sublime-text-3_p3211.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
-}