From b218b0c2a6ec34770eceb9e19c897af2dde279bf Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Sat, 8 Jul 2017 12:49:30 -0700
Subject: [PATCH] app-editors/sublime-text: Make taskbar icons work

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 ....2-r1.ebuild => sublime-text-2.0.2-r2.ebuild} | 16 +++++++++++++---
 ...1.ebuild => sublime-text-3_pre3126-r2.ebuild} | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)
 rename app-editors/sublime-text/{sublime-text-2.0.2-r1.ebuild => sublime-text-2.0.2-r2.ebuild} (78%)
 rename app-editors/sublime-text/{sublime-text-3_pre3126-r1.ebuild => sublime-text-3_pre3126-r2.ebuild} (79%)

diff --git a/app-editors/sublime-text/sublime-text-2.0.2-r1.ebuild b/app-editors/sublime-text/sublime-text-2.0.2-r2.ebuild
similarity index 78%
rename from app-editors/sublime-text/sublime-text-2.0.2-r1.ebuild
rename to app-editors/sublime-text/sublime-text-2.0.2-r2.ebuild
index 856015667d3a..b482c88d899a 100644
--- a/app-editors/sublime-text/sublime-text-2.0.2-r1.ebuild
+++ b/app-editors/sublime-text/sublime-text-2.0.2-r2.ebuild
@@ -43,10 +43,20 @@ src_install() {
 
 	local size
 	for size in 16 32 48 128 256; do
-		newicon -s ${size} Icon/${size}x${size}/sublime_text.png sublime-text.png
+		newicon -s ${size} Icon/${size}x${size}/sublime_text.png subl.png
 	done
 
-	make_desktop_entry "subl" "Sublime Text ${MV}" \
-		/usr/share/icons/hicolor/48x48/apps/sublime-text.png \
+	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_pre3126-r1.ebuild b/app-editors/sublime-text/sublime-text-3_pre3126-r2.ebuild
similarity index 79%
rename from app-editors/sublime-text/sublime-text-3_pre3126-r1.ebuild
rename to app-editors/sublime-text/sublime-text-3_pre3126-r2.ebuild
index dd797888dc41..d81372b98397 100644
--- a/app-editors/sublime-text/sublime-text-3_pre3126-r1.ebuild
+++ b/app-editors/sublime-text/sublime-text-3_pre3126-r2.ebuild
@@ -44,10 +44,20 @@ src_install() {
 
 	local size
 	for size in 32 48 128 256; do
-		newicon -s ${size} Icon/${size}x${size}/sublime-text.png sublime-text.png
+		newicon -s ${size} Icon/${size}x${size}/sublime-text.png subl.png
 	done
 
-	make_desktop_entry "subl" "Sublime Text ${MV}" \
-		/usr/share/icons/hicolor/48x48/apps/sublime-text.png \
+	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
 }
-- 
2.26.2