Use doicon instead insinto + doins to install icon files

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

7 files changed, 39 insertions, 28 deletions

diff --git a/app-mobilephone/gnokii/ChangeLog b/app-mobilephone/gnokii/ChangeLog
index f20224a6491e..52359d43a864 100644
--- a/app-mobilephone/gnokii/ChangeLog
+++ b/app-mobilephone/gnokii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-mobilephone/gnokii
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.113 2011/09/21 07:44:16 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/ChangeLog,v 1.114 2012/09/05 09:20:17 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> gnokii-0.6.27-r2.ebuild,
+  gnokii-0.6.27-r4.ebuild, gnokii-0.6.28.1.ebuild, gnokii-0.6.29.ebuild,
+  gnokii-9999.ebuild:
+  Use doicon instead insinto + doins to install icon files
 
   21 Sep 2011; Michał Górny <mgorny@gentoo.org> gnokii-9999.ebuild:
   Migrate to git-2.
diff --git a/app-mobilephone/gnokii/Manifest b/app-mobilephone/gnokii/Manifest
index 35bb46abd6f4..5a05f80e3539 100644
--- a/app-mobilephone/gnokii/Manifest
+++ b/app-mobilephone/gnokii/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnokii-0.6.27-TP-PI.patch 711 SHA256 7f570eb6877342882f438449a9a8d93f1db7b1e466467c8341df7e28d53f8d79 SHA512 66adcdfc61d913f7b0951217b25e6cc3f8d19a61e08c325978a98316e3d83b911a347a029912ffa90a54279e7bce1ae3aab5a9ddfc602d1771401459674e7f96 WHIRLPOOL 94f8a21cd5223ccdfbe85e1d972c98d620a84d3fed85f1e5fdc52e5ca06e1dd6646cff102c48ef3ba0cdcf17b624768364c4768ab882cbb7deb8352190e42eca
 AUX gnokii-0.6.27-disable-database.patch 1236 SHA256 e4ccb40497b1ae06708a075acd2e63f19ca3c56ff0bfff7bf9df0134262cd715 SHA512 9ac3a022df0c6cb0643c71ee13f136fccab09eab92c31f95c5a598e09830a5c671eeaa20ad55ce4de41eb4fae8c77f09a97677c830fb19eee1e69684dd9c5162 WHIRLPOOL 150e8e8fe9c9903d4e95ce60918e13f3dade767524040b5e8ac3e5810b83bd1655d3682e6b44497deeb469161570cf8ef14b4862afabb84a5aa3c19e9c24ac77
 AUX gnokii-0.6.27-icon.patch 441 SHA256 409fb78596ff3e29a363023099b772c8b2454318df4f7a2532c28e5f995eceba SHA512 82b776f61bcd540dfc957b59406e548113341c8f5dc6be126625dac15e02b4061fa661c71699ba5d9e68ccaeb7a3460bb1d844d66a677e3640a40c12abb57fd2 WHIRLPOOL 489a1181ee56969c32f1b1aa01139e8a2effb276c45b0426a897b8fced4fd200e271f7f61e3622a4fc1d004f0b65cf67f6e0d61884d532dacbd484a8068571d6
@@ -7,10 +10,18 @@ AUX gnokii-9999-translations.patch 361 SHA256 4aa65a26c7ad6cc08b3d34491652830fc3
 DIST gnokii-0.6.27.tar.bz2 1491564 SHA256 69f1d75f755a2918e9577cf28dacea9d6fca9b9d722813341d50d12acb8ee886 SHA512 45ce74f28ed127022f7062c0b57532662859f79bb8fdb52236789de27af86b7ad5684a0c70786bd13e408b393c28296609730a420bb7dae6f2a2cc3bfb783d10 WHIRLPOOL e4d6dbee60609d0ee3ef2c42982584527b12a970f3e67191cd27e233fb66f1dae43486dc803abb50e57c2352dffc1baae2cee1f452263a17a30fa6056d8c44f3
 DIST gnokii-0.6.28.1.tar.bz2 1271287 SHA256 58659ccd8a6d4b38cbfcc820ec4705acea6e5ba63f89c9a5494d03c63e71aced SHA512 f8f2e17bf415db1f832ded159f17443543a3a5df7b3390c5e55f6e83a0b5d66f8323608d245bda04140c6145ccb52ced15cce03339a950bc7f78442fc9250d06 WHIRLPOOL 091d7e0ed566db7d22a53b4f22296b731ef79ed4b408ce2239a20363ae99bcbd52cb802e11163f1fc71fe3974fd8689fa6d21760c83ec8183c8696f9a82ebb95
 DIST gnokii-0.6.29.tar.bz2 1302020 SHA256 d1633e934b6b43c681ea96c5830d44683a85f05e64ea03c3ecf0d5096aee8470 SHA512 0d080b4f06163d00fcae5f27fe3b66886c12cf0356c245a5200552e1f98e4347f15b0101d5e709a3d6f98b3ffc55ede12789bec779cc0c9d566db1e4a050ae32 WHIRLPOOL 8ebb2e2613187bd79de19bcc8841016966b49762579d130a4f4c89e2d126d9068630db8c11d119ba57ad58a4ca3dd9e2ff6ddadbeeacb0a31a1a0a2e958d6910
-EBUILD gnokii-0.6.27-r2.ebuild 2781 SHA256 c68aa81ae1da34876fce5a588a23714e6b1ec4354e32f7cf3ff788798776daba SHA512 b2f39820dafc82684039c321b4b4ea1acfe36c14866f6ac91b492eae186fc1fc2aabe7b51dcc88d04363a508b122fad2ef53adb97ace0901f6a866908c335226 WHIRLPOOL a23a38faa91989cbd9a1adabf8a61ccdea588f61cd2b8410367dae5265c12200c81964be38ae22143d218eea0edf879dbbebfb9bd41fa8e0055aab0df790a82b
-EBUILD gnokii-0.6.27-r4.ebuild 3463 SHA256 46b98c4856baf9b91e3cc4095c135225593d8bbc06da3d92c3590b0c5bc338fe SHA512 e522605298aca56914e637845738e728c476111647cf79035f295b1862194fdc8254a986532dc177ce1be1b576fef4e70d083977e571067896e3c6d0aeb51350 WHIRLPOOL 437e07304b2a54a2f63938294540d57df61b19e422d82602ea26774f0fbf31f91da8ea1f197ba5fc9b2d6419bb9efd967fef7c5ba1aea744479108929337d19b
-EBUILD gnokii-0.6.28.1.ebuild 3544 SHA256 c59f61ac3df78353e160059817b7701bbcf2176c2374919072df5516a731eecd SHA512 cf4842f3e60d968300fddb5db63465f661628fb3f568e37e2d58be85e8ff4c9a01ff6caa1385556e4202e26b9673d7ed345cae07980b9f7ffc7f3c4d33cbc5ac WHIRLPOOL cd0179f57d2159a49fc8b2df29528af22dbed26e622d4bc43412d44c7fdaeabfdfab5fdd80748c6455b7471bdb971b175859efb7eddcf782d1e3a6c50e945293
-EBUILD gnokii-0.6.29.ebuild 3451 SHA256 fb51feccb53eba6b129925b696e9a0d6e2587f0388265d5d2b40cfbb4ec2860d SHA512 54c2a306826b86c9dfccaa5e30b706e833d4545804dbbff8857ad6517eee8ce9a7726f70e89b08f5217986acd207b42cbb1d9de612fc07fea065cdab645adf82 WHIRLPOOL 7d504aca596907d12e58b6f6c3daa3adfa9c8d81c0b4bafce6f61f1b3eafa3478d899f8fb4b2627e87269aa9889ebc4c6f1f2d426c6f53afa5734b5349b6e012
-EBUILD gnokii-9999.ebuild 3346 SHA256 774af7d0e67c6544584656764dd4cee5139f2a30be30291dbcc5779d6dc18400 SHA512 52c61e6972bd7889fcec7e1818aa8e97e4c1ad47a926772e1a1e422b0bd73e3784bc3d2642292c26a3d09fabc9dafb137cd0507a5af5cb15b130ca09502162ba WHIRLPOOL b7ab9d5dcf457b37cfcfbb2556858778bb214e35894c56b4cb774abd8b3e16b1c38e4548c6e8309b175fb346cf42eed8674f01b3f246ad7ab93bff70effdf363
-MISC ChangeLog 20848 SHA256 63fee7ba655ae8d6401d2c297aa457e7a71ed67041a12063f6153ceb92de45e4 SHA512 8ca314353ea7c8e0cb0859c8a507f13867acb56aeab70350e1cc6cfc817cb8c0e0813eb7f3fe5ecac2fc30af3a8a017d9cf3be04bb05be6c735b958d6d6f95b7 WHIRLPOOL a855d2527ea1cd8c915ea925b765ead5775c00812a445a79d7064b48c7667bf93221bc46c00f891a53b91c22e6f94b9840aaea286f4dd87ffd61cf670d91f332
+EBUILD gnokii-0.6.27-r2.ebuild 2749 SHA256 c98865e9583d4973009a43c36a6e52017d1001609c53ba991cf24c61662da5f4 SHA512 3166a402c97d0f40ada2a22b9c34a22ef68750be842fd32c7f068b552d2b7d347f5da1f1ca3e94ebc3eb10fedfafbfe7e603c26e4d3df94b53a71581d2540802 WHIRLPOOL 19309b085b4893d8ec2e639f8ddf702465db2d7ee4e80bdfc2a653d478fd296df222a51e941a1129925a8781fab26dd13ce68962bc8717586679ae311af9e931
+EBUILD gnokii-0.6.27-r4.ebuild 3431 SHA256 0eba112017dd8d0fafab4b9ee22e2966fede103143afb54c0cd1ea42ac91a81a SHA512 071ccf3d73c9923404297a182425ee7292e69d5fd85bba71d1653d42b347bee901016672546c10dbb0cd28e89cd0de41bc9254c2ace327bdc64014b3a23df05b WHIRLPOOL b83521b1d6c905d7a4059c70bb8681c0d0745a87c207d1942a72ea8c25c0ac86a514a6a9593e089e152744aecddfeab4290387adebbfa95b606f288b41a4e3f4
+EBUILD gnokii-0.6.28.1.ebuild 3512 SHA256 6efe060efb67464ef413fa04e5cc79cc7eac00aec9fb71196928b2bbb11c62e5 SHA512 49638469a85c71656204acbf9bac5ff37260c98619bef646d551e0995334a4f22003ceb3263522bce08d301b3b69de33673f318c64675a7574db4328900ae224 WHIRLPOOL 74c9ff87d76de7f9290115cdff4c0f525bff92773ee83878dd2ef099533033801267140f45c3d20c46a2b4417d0bcc6895e1b5c772efb7462a599d357c6b81ed
+EBUILD gnokii-0.6.29.ebuild 3417 SHA256 b040c694baad90ba8f5226703da17956ef29f38f86bb6acab0491decad72a80f SHA512 eb9fb769c60086c9877b651152e5e1c2e4d1ba8fceca16f35700befb03223fd89d9e3eac795f8faf1ec9f4e8e77efc372bb12d6087699a10aafdaea0b983d35a WHIRLPOOL ba497128847047eb22ebf2115f7ec9c237bc028e42eeac210c2d8d14b72610b4c3562a2d78ced20fce248e93d9233b130baea39dbcb3f004b49bb422f3367eb7
+EBUILD gnokii-9999.ebuild 3317 SHA256 33799438fbab6102c73eb5373d72f9d137af2ca777e595278f9c4b1baf58059d SHA512 0a079e0b408df48dc8fc982b8c45979b8572b46e30df88b93efaa13db3fa62974bf0646cefb854b95ea38c9d867c92c644737168fc20173b1bd901206bd5d07b WHIRLPOOL 4a33d227cffd96c33611621911b06a8b2e9016625529719f49db1382cf0c898751f889ce4871c50c74ceadf9acabf000e221053168e17516e0404d531e22747b
+MISC ChangeLog 21073 SHA256 fd5e9fc34901769487a04b0b9c87e1b1380ad39e232ba41405f4c0f6996ceefd SHA512 51700625fe013b852c71a504fe30e8c604d9445373e256066315aa8440d86b4edd01a6e1386f91097a5e5ea100891c595889ca8c568fc1182e45b56cce59b606 WHIRLPOOL b6dbb10749ddbaf51ba52680dbe20b17ead08aea78009c8223b4225199fd175c8070cc63c285ecf0d2c30590d81d8dbd6a5eb53b72b2dfed15cd78a7d840052c
 MISC metadata.xml 663 SHA256 8275ef9e2f500c48cc7c6620246bfafdf15e0bbd62bbe5f7fe286ebf5650a5ca SHA512 cb7da8890e6ae7031e0273627b8e67e7e1e61e20b8f31d73ecfdfc8ddda2bea8f729e4752536219d5d38ab1848f1662fa2dc8c29926028582df06b62c9e85c2a WHIRLPOOL 865875995c85c51db972601633125e47abb3090a64f27788febf670e6fa4b6538cb957b30bc2faad0b8f03b30fd2a0984a08a028f1ba268e65c21669ce9f37b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlBHGVcACgkQgAnW8HDreRZWbgCdE20II8KFWYZ0FfBs43zlH2ma
+srMAn0+IjeUNgnZYrpoyxY7LWGLWAVcN
+=0ihl
+-----END PGP SIGNATURE-----
diff --git a/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild b/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
index aa84ebd13ea1..4a816d7485bc 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.16 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r2.ebuild,v 1.17 2012/09/05 09:20:17 jlec Exp $
 
 EAPI="1"
 
@@ -87,8 +87,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then
diff --git a/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild b/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild
index eefd8b5d5117..6336b1e28c37 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild,v 1.6 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.27-r4.ebuild,v 1.7 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -96,8 +96,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then
diff --git a/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild b/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild
index 4586ccb158e3..3c917500aa87 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild,v 1.4 2011/03/27 12:11:23 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.28.1.ebuild,v 1.5 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -100,8 +100,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then
diff --git a/app-mobilephone/gnokii/gnokii-0.6.29.ebuild b/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
index 4e9004e03522..9a4d52fb56ae 100644
--- a/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
+++ b/app-mobilephone/gnokii/gnokii-0.6.29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.29.ebuild,v 1.8 2011/07/22 12:06:53 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-0.6.29.ebuild,v 1.9 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -96,8 +96,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then
diff --git a/app-mobilephone/gnokii/gnokii-9999.ebuild b/app-mobilephone/gnokii/gnokii-9999.ebuild
index c26a24faaa59..d6faab8b207e 100644
--- a/app-mobilephone/gnokii/gnokii-9999.ebuild
+++ b/app-mobilephone/gnokii/gnokii-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.9 2011/09/21 07:44:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/gnokii/gnokii-9999.ebuild,v 1.10 2012/09/05 09:20:17 jlec Exp $
 
 EAPI=2
 
@@ -93,8 +93,7 @@ src_install() {
 	fperms 4755 /usr/sbin/mgnokiidev
 
 	if use X; then
-		insinto /usr/share/pixmaps
-		newins Docs/sample/logo/gnokii.xpm xgnokii.xpm
+		newicon Docs/sample/logo/gnokii.xpm xgnokii.xpm
 	fi
 
 	if use sms; then