Use doicon/newicon helper functions.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

diff --git a/app-emacs/emacs-common-gentoo/ChangeLog b/app-emacs/emacs-common-gentoo/ChangeLog
index 9a74ca78b870174ce4b606b956da9f283ad3f7bd..f5ba27eace106b703ec266308771b00d83dc7498 100644 (file)
--- a/app-emacs/emacs-common-gentoo/ChangeLog
+++ b/app-emacs/emacs-common-gentoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/emacs-common-gentoo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.109 2014/06/08 11:44:50 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/ChangeLog,v 1.110 2015/01/28 13:06:34 ulm Exp $
+
+  28 Jan 2015; Ulrich Müller <ulm@gentoo.org>
+  emacs-common-gentoo-1.4-r1.ebuild:
+  Use doicon/newicon helper functions.
 
   08 Jun 2014; Ulrich Müller <ulm@gentoo.org> -emacs-common-gentoo-1.4.ebuild:
   Remove old.

diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index e64d2c7a28dcd5241acb80baff1a86f26de99f72..03e798703c53eaaecd3b4233d0dfee5f33a2cdc9 100644 (file)
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -2,20 +2,20 @@
 Hash: SHA256
 
 DIST emacs-common-gentoo-1.4.tar.xz 40848 SHA256 c36081d809c47f4414d623726eeff54d6512eca7f178f864e1f0c71e58a5b78f SHA512 f993ef83bdfe1e622688d93b81f1317663f2918f1dace8785474db759f411c0dc883e9946872e05cc406a1191bf29abe193af5212d652d2e64d5f64576a28cbe WHIRLPOOL 9861d4fadad9a420ebc2ac7f61dec2441ce934903cded6efeeb91600d2ef98fdf1af9f78ebb3518b7810034a2fc8cbb1f7e34ca2467c679083a1de193f181bb5
-EBUILD emacs-common-gentoo-1.4-r1.ebuild 4582 SHA256 43fb2bf4c42e5a948a759dc39d7e1db8dcef8d311be4c59868aff3a70461ba64 SHA512 92781c7aff8fea847f83452cb351d803ea137f2ead796dfbb0149ca269a23bc5828f273e097fa938f8869f5d51ac5010205e0c1ecd96c12faf297a5515700e91 WHIRLPOOL c23a8ed5fb5566841da8c4c8fe178bdc8f5e4acb9b41ab931783d85442a71ebdf593a540d4195f1886b13f6d50f0e420a6fd81f92313724946bb2ea6bb6690cd
-MISC ChangeLog 17045 SHA256 371da173b7e10a7aa15147988819c4c3a83fa2409aef62a206171c18f50cd123 SHA512 452dbca89004825b9583f2251d807215c61bae01844c3ac6f6317e192154b49631fe45d2b3ace8cb02b799561c4fb09b28c7525406836ce41be155e0c496ca5a WHIRLPOOL 9dac346a04535dd4294b001167ab8a3a80f1379479299223fa5d9273f836db823d64686a1bfaea5ba9b7284f04fdebc2b10ad074e4712899dea3bb297a1759b3
+EBUILD emacs-common-gentoo-1.4-r1.ebuild 4510 SHA256 09937ea87ba9559d9502896904f9490689f11c33c42ce491cad4e8b2f65d0706 SHA512 31f07d00dec75f9a0b956c5f6a951cdfb3240a2018d03ba45b5985af282d9a85bd70d057a314122b4b4146ab0f30e5606aba3717f7edfcef410f7d236c89e5c1 WHIRLPOOL a67ff6c6e0e88fd6f961e0af945be91734eef04dbbc47e9119149a660e80b40c23c0564722c5f997b761a51bf3c6b6f9fde8f24d07083b37db8229c6776c1868
+MISC ChangeLog 17169 SHA256 e9ea67de9c3503fe25380c220923a41ad6d24743c7327850d1f153aaa85d1a7c SHA512 bdee130452ac0b8890586d4993592cc6e449fc625762c919355e4e90fbd4b1659f34525d809277da95c622057d3e666be1e14bcf8634770d27e7ea4c46395246 WHIRLPOOL 3850be97feb659438baad4fa1142418b23f754751d38bb633d4b23eae92b3b92edbe15d28b488e670ea024c883809c35a65b2bb3c865177bdc78414f6a1c8ad2
 MISC metadata.xml 236 SHA256 f0b6df93ac83810a22d1519f0b37ee94996d1512c4fe4407df6fbb27f4da6608 SHA512 beb19666e6ea1a04718133d41e61ee7e7604ae0e614f979c66835f10fcd8b8e908a136a67397b212bcbb3e67d9bda458d561da228998cd9b616cd4a8bff6a989 WHIRLPOOL 099d599d015c0835bf2ed4780df6609ed0bf407c8cef5278f35fab89ccc6b9b2d98d48833aac8ef3243633dc33206eb155851cf570c980e96dc259d1e0416759
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJTlEzyAAoJEJQzkH1pP7W4tEAMAJ4VpEWq6peAxyg4wAsX3aGG
-eROWEG/eiasFGgLA4t4mKMmzk+hjjJgUk2fRz1pl3kas+J6W6NNhJGD4xHqd48t7
-vnPKMd/VkE9kKra5FejwNAYRaj9Cijw03yNN+0p4PqXy39yQuSpmg4e2pKI6TOio
-WBZCxuzHMapMVYWSp33sKtI5qizOuqGa+x2nN4tpTYA6PH9LD0zHSVp4sp8Lom/Q
-hE0a3oEo75z8BwFEtvnMzP6zo8EAGmjDj4wgS4yVTwVjRvxf8iZ29NziIKSvtLqK
-OvnNgkoOIBu6Ceyit+TYuuXQZjrVNt87r1AUfSD0BtOeuaJPi/XVoYiLyn4FfuIy
-8zRkwldycy1lOIqSdIE4QerPDAXZGt9ixBBCpOIFcNY8qiU1ryFGgrLtcz9yVcvF
-/X+15xx2kp5w2vzfOlylNjI9x0MfAlZKH1O1Xblqfg2UrUY6c+g5ma1r3Ad6D8YK
-/rz1Mtdx+iLT292j7QPYVBOxkMDEvyArWbRUX7eXww==
-=KVBZ
+iQGcBAEBCAAGBQJUyOBbAAoJEJQzkH1pP7W4PBoL/219COMu3VE83jPV1fXeQpr4
+s7e9oTqWnWKcyeQoPQs9SmRbiJTR7Igog+wSv03yQCKAEjDKoEaz/rpxm1siJyDb
+E7dtlPA8sK7xzE+p4ze60w3Qdwt13W7GFCac8eFL+TGLJkQvPbF0it7PI+l4KoXp
+vwroeMxPoT0aOgxe6zrkaGY0uxA3EylwKNhDtUUWhyIDKkESYZVnvHi9+Hqnjg06
+Jq6ZbPkc0YVVVTMB3g4OtFEFj6VhJHHYKpvwfGUaYnXiQpvs5Xnfqw/QtvEjspgC
+cFg15pCJ//MpNgrde8K/mLKH/5pWH0GL0CHozprNus7PSTrLUaJzU5bqX4xW6Mpt
+wCs8GZU7TZ9aovQOVoaROlSLydV0Z+/EGp3CP/mr1doMUqo8AyhCvrp2O2cvcOWZ
+Vz5v8bQBvdse6hT+bLEflUNBX47nHp7wE6D14AV5Du5ESrm6ezDHVyMkh0+EOhkn
+3xeaz2TayIyz9znHXWKLQCwyeFi3Hojl+9enBx9Iiw==
+=PYSO
 -----END PGP SIGNATURE-----

diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
index 6c2dc03736c6cc9f4f90bf220e290f47c8ab6a9e..9e2dc5af60dded011c28952bad617bf13ff7652e 100644 (file)
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild,v 1.10 2014/06/08 10:59:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.4-r1.ebuild,v 1.11 2015/01/28 13:06:34 ulm Exp $
 
 EAPI=5
 
@@ -44,17 +44,17 @@ src_install() {
                local i
                domenu emacs.desktop emacsclient.desktop || die
 
-               pushd icons
-               newicon sink.png emacs-sink.png || die
-               newicon emacs_48.png emacs.png || die
-               newicon emacs22_48.png emacs22.png || die
+               pushd icons || die
+               newicon sink.png emacs-sink.png
+               newicon emacs_48.png emacs.png
+               newicon emacs22_48.png emacs22.png
                for i in 16 24 32 48 128; do
-                       insinto /usr/share/icons/hicolor/${i}x${i}/apps
-                       newins emacs_${i}.png emacs.png
-                       [[ ${i} -ne 128 ]] && newins emacs22_${i}.png emacs22.png
+                       newicon -s ${i} emacs_${i}.png emacs.png
                done
-               insinto /usr/share/icons/hicolor/scalable/apps
-               doins emacs.svg
+               for i in 16 24 32 48; do
+                       newicon -s ${i} emacs22_${i}.png emacs22.png
+               done
+               doicon -s scalable emacs.svg
                popd
 
                gnome2_icon_savelist
@@ -132,7 +132,6 @@ pkg_postinst() {
                fdo-mime_desktop_database_update
                gnome2_icon_cache_update
        fi
-
        readme.gentoo_print_elog
 }