fix icon issue wrt #430824, inherit flag-o-matic

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

5 files changed, 45 insertions, 14 deletions

diff --git a/x11-misc/synergy/ChangeLog b/x11-misc/synergy/ChangeLog
index c7846edacb12..9542db27a904 100644
--- a/x11-misc/synergy/ChangeLog
+++ b/x11-misc/synergy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/synergy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.85 2012/08/10 13:49:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/ChangeLog,v 1.86 2012/08/11 17:34:54 hasufell Exp $
+
+  11 Aug 2012; Julian Ospald <hasufell@gentoo.org> synergy-1.4.5-r2.ebuild,
+  synergy-1.4.7.ebuild, synergy-1.4.10.ebuild:
+  fix icon issue wrt #430824, inherit flag-o-matic
 
 *synergy-1.4.10 (10 Aug 2012)
 
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 0bfab5113986..86e8d048270d 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX synergy-1.3.1+gcc-4.3.patch 4463 SHA256 0dfcdedce8de2cf1285a7af30652eba7234d95d769f762774975ea4d0f293375 SHA512 2ad840b1eb57a1073d0b4996bc8c9a126ded00fcc8a53ded1a88026b35077695bf3101fe0fc1aed348ac5a5836c59a1d77282944f4ae4c301527f7a22c7f428c WHIRLPOOL e275a34c8301da2a58dc14eedc3ef8ef91332ebd1e5deaa98908f2ea48f497a337c4c3359c6315bef110d2675acbfa76b4ac104c6397659f2d59e0109a25d44a
 AUX synergy-1.3.1-infinite-timeout-fix.patch 548 SHA256 9038062a1e678ef858f161393332acdde9124beca45cedff9179582f33d20cca SHA512 7966716990ec0b82e90bb59d7ff2eeb5b1ce2bba52a6a667a063cccd4fec9f71a7624d4373231e0084e896defba2dc5d1093b5d29af1b446ec764d798fef366f WHIRLPOOL 98ed28e1ee43ae6a19b3fadbcbf15fc25930c724e15e49507301098e760c3a3b5ad93a97bc66e06bf8a55e7b7a68fd246739bec788dadc35192bc979f5635beb
 AUX synergy-1.3.1-stuttered-delay-fix.patch 2144 SHA256 4ffbbaea726e507e024d550459fb0ab25a9da70cb90245400e86d035bbd9a1b9 SHA512 143f603c13fa97c1688b8645a74d553df71398c36abf57ea340d1a3a9b165f26ab8cd59af5d7751bb05c72a5e67e98eb5bf904b738c9a7a2a905a5b489b14c2a WHIRLPOOL 512d9b8c94593575268bd94f3f6cab3444ca9806d58ee95b9d6eadc20be590873c44b15d958255bdc810dc6f3fada7c12a0bba6c209a578fc6f78e60bbabdcce
@@ -6,8 +9,20 @@ AUX synergy-1.4.5-gtk3-fix.patch 6353 SHA256 795673183f1f8bb10aa8361613798e3e33d
 DIST synergy-1.4.10-Source.tar.gz 3598533 SHA256 06d5a2ceb4cf8808cdab22441897c7b54ec8b4bc8351ac116f9accf54c720fbe SHA512 d8ebff1d53d16f6abb9cc64c7cd2ac5d6923b61ff3773f32d464cb58a0440bdbaa74836662d4c83e541516b4abda97f35855239cd12b6b095535fd38e36f238c WHIRLPOOL 86a8595403b5fb4efe88f4ea2cc528f541ea2cdb195254637ef077971ccc4cea3261d93fa2b8696fd39740a1421530c55099048399dbabe0e183f26da7a3c610
 DIST synergy-1.4.5-Source.tar.gz 3002836 SHA256 69e9ea11bdd05252886fe6a47fc43735bdc8a5af9dc2b843f4c34de1f0515ad1
 DIST synergy-1.4.7-Source.tar.gz 2998229 SHA256 e224d2ab822dc7b6e90a87587ed7d9e32f27d05efebc8430ecf61b3610baea3b
-EBUILD synergy-1.4.10.ebuild 1683 SHA256 c6136aa808b0221503ccac3a16d25769a79ebe80e7c2eda2092c7b4aadd58211 SHA512 444b4364d4cad7179e5a126c1cc55e41ed45d0cf2c253a90b1802e64e2e1124d4399bc183945868f46e36513f393feb53adc170749c11401c0d5d659aca6f15e WHIRLPOOL 0b06f83e1970b3f6216813e33fa8ad327d7dbe668aa2a0a2d480d723c2478b8178f0b534cc10fb7c4b6379604ee74621f63580ff2f7129435a065ff28333b44d
-EBUILD synergy-1.4.5-r2.ebuild 1783 SHA256 bd571a64036a50182535deb4d58df6bdbefdc94a21486e5e5827258aa291f0a7 SHA512 b8e2f7707a97cfced6e3fad9d35943af42fe8bfc19faa1a397f95f4bffc22a0458497faa3e0a2b22847b5698a91ebf6743d77a07e2d1fdd6d43645cee2c7f879 WHIRLPOOL 1cc09904bb697b35458b14daa9feab0e2c0518d7bc14e9a7863840366a173b39f14d1a09b0a31cd7120a34d5e2f4603e17b920610c1ec9c89988dc68cb01ec02
-EBUILD synergy-1.4.7.ebuild 1676 SHA256 0e937c5e0f4016a5d5e1aeea1ba8f6c3f2199ce67be9b2f8d948ddee6ec89901 SHA512 5e745594334110190c5c88fa1e8b526fb61f72a5dc13751792c42d4d1f30d44874e610ca63ff829010612883aef26b399c71c30e4cb6eeb3d3dc5b78d0350e05 WHIRLPOOL f628121c3ad56ec57547432be4351d052cd7847d275c9cac565322690c693e2e228a39b48adbbaf6556451fc1449ec337954b73d5d44d4317c4a3be83bf2805f
-MISC ChangeLog 11680 SHA256 c4395ec175ba61a90f67ed84e086130759472e131ebd954c1d2647829991e31c SHA512 b060f2ede111d8c2363d27f2cf5a207f3d926be5e94d88b7cbf2d18ee925ef25ba6d9f735bcda5900d9fb28572c22b08c948fb985acb57da63588e0bc66511c2 WHIRLPOOL 66f65c21b84aeb21db5cd1e2ec5b0bbb2580046b558c78847badcd92bc007e6e0f62bbbee6ac35b0d575af020c7caa8fcf53566b0a5f8de3c180b56b9ab5fe06
+DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
+EBUILD synergy-1.4.10.ebuild 1839 SHA256 1c481c2453849289a705219e4ba203d5171f0f554cd7fa49c2156a31b00723d9 SHA512 d671d875ab8a0fa501e723de19a3f2fbf24cf8695e7f08fd081876fb47ffa6ee093ed74742ec8164788795a5586f4ac76fed434aa233e64d66aab8e9d53612e7 WHIRLPOOL 6f79ca92f3827e0c6f353b13463d1797762fee445579c4937e9224136952730be210e833672ab65774a40a6bcd0a191fa959ad35c68cfd61691d4cc65b163eb8
+EBUILD synergy-1.4.5-r2.ebuild 1794 SHA256 e3dcef63e02ed6d83dfb2bed0a208add970a3ef885afdadc57f538e231cce05a SHA512 a6f1b021184824bbe673e7cd443b5d81f14925d31ccd4fb206892598bb585514f7b2e730c56e458e108bcd0ad848d420a5e28c2161486751586717d6baa0b68e WHIRLPOOL 1368f445766f20954ac0870682db7e10d891e88495462eacc360afb6e0d723eb52dcd97220fb1ea9e84eb28ef582fd168e902f0b5a5754a8fa53d45a75968d98
+EBUILD synergy-1.4.7.ebuild 1687 SHA256 879e2fd62ce757df41067e5a96d0a739b6d625604c9bffd01da4de52198e9c77 SHA512 833ea4bb3abcf1994dcfce69443ebb57b9b230af4491c6f690274e9e923836951fac7d6c3f86ddc92c05f66e1a575e8c919982f97403cd5cf1d6b6b65a551a3f WHIRLPOOL 3e30f634bff706e1687a4982064659b771c0613bc971c6d97d0c5ed11f254f6fea0a4139d8f1a515041b5491184aceb60a555859ad5c4f771aed4de5b6ab4e2f
+MISC ChangeLog 11855 SHA256 e8b534301ca3d65fcfe0b94740e6620c52733a14efecd965fed55db304e8236c SHA512 d2375581b44b49d6c6e07fd5486615d9112182f0a890b581a1f1a4a4d64f33388d247ae84b463f46a4be06afc870ae4dedcdeb9cad25011e38edd00b97178125 WHIRLPOOL 422d4c6505e41dfea257c14e29488a02dc31eec2b5e3c7b2cb615076abff6d59fd02f5b33fbd452e82db45d5d49a3f2ded881be1abe33b4fb835082fdacd5ba8
 MISC metadata.xml 309 SHA256 dbe19c7fc9f67d80d5ead0d7bbff1bcd6403087c2b8b03052adebf24d80fb2c2 SHA512 4ed9bc97bfe2462d52bba63a760cf614cdab73e6a2e39d5439737f984adf72fb3c24699b60ef8d7eed5a8f7651fed1abf063f3c53dfb5fbf1bda8b9eae6270c8 WHIRLPOOL d1eff3eaa2556371beea7bc0b921235e7602f6d297dd2c8f80505545ea034ac57f210df85dc06398aa2f9f770b8e8c68e78e6a3821ea99a7c0325e1e90300167
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQJpanAAoJEFpvPKfnPDWzisIIAI3MaqTFG+/zbuifn7d/cWZa
+JxkwHd7fbYTZhRg8Tku0V1i8II0snHQmSHZVDBvVhfSgUovnAGxONOd2jXkHWWb0
+L8zglXk+e3LfzqO9grQepR2GC+L2C/OCzaLReYWNfIUr0RZXRWhdhfLX1ZabrNvE
+uYMj5Njiq2DpqSwLNIwf7WsJSN2ogfwNcV9GPy/AhkWQD6xrY9cVlyjb7YJuZtBI
+ogoEKCPltNwl1UQksVSwRJNdBxP8nKewgG6zLSjKZ5gq1TkIuBDFsihBEzbWurmC
+TO86SbhrSJponvQdMRgbzdMUc4y34rkbFQqA0q4W7HshHhaKsJJsGdO94KO6//g=
+=yGtT
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/synergy/synergy-1.4.10.ebuild b/x11-misc/synergy/synergy-1.4.10.ebuild
index 5e17eb95c46a..9ef8c058ac2b 100644
--- a/x11-misc/synergy/synergy-1.4.10.ebuild
+++ b/x11-misc/synergy/synergy-1.4.10.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.10.ebuild,v 1.1 2012/08/10 13:49:23 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.10.ebuild,v 1.2 2012/08/11 17:34:54 hasufell Exp $
 
 EAPI=4
 
-inherit eutils cmake-utils qt4-r2
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
 HOMEPAGE="http://synergy-foss.org/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}-Source.tar.gz"
+SRC_URI="http://${PN}.googlecode.com/files/${P}-Source.tar.gz
+	http://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -56,8 +57,7 @@ src_install () {
 
 	if use qt4 ; then
 		newbin bin/${PN} qsynergy
-		# FIXME: convert the .ico file to a real png instead
-		newicon src/gui/res/win/QSynergy.ico q${PN}.png
+		newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png
 		make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility;
 	fi
 
@@ -70,3 +70,15 @@ src_install () {
 
 	dodoc README doc/synergy.conf.example* ChangeLog
 }
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/synergy/synergy-1.4.5-r2.ebuild b/x11-misc/synergy/synergy-1.4.5-r2.ebuild
index 0d6d3173ea73..af683cf96686 100644
--- a/x11-misc/synergy/synergy-1.4.5-r2.ebuild
+++ b/x11-misc/synergy/synergy-1.4.5-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.5-r2.ebuild,v 1.6 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.5-r2.ebuild,v 1.7 2012/08/11 17:34:54 hasufell Exp $
 
 EAPI=4
 
-inherit eutils cmake-utils qt4-r2
+inherit eutils flag-o-matic cmake-utils qt4-r2
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
 HOMEPAGE="http://synergy-foss.org/"
diff --git a/x11-misc/synergy/synergy-1.4.7.ebuild b/x11-misc/synergy/synergy-1.4.7.ebuild
index dda064bacbd4..b66d59b99249 100644
--- a/x11-misc/synergy/synergy-1.4.7.ebuild
+++ b/x11-misc/synergy/synergy-1.4.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.7.ebuild,v 1.2 2012/07/19 15:59:54 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/synergy/synergy-1.4.7.ebuild,v 1.3 2012/08/11 17:34:54 hasufell Exp $
 
 EAPI=4
 
-inherit eutils cmake-utils qt4-r2
+inherit eutils flag-o-matic cmake-utils qt4-r2
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers."
 HOMEPAGE="http://synergy-foss.org/"