Use doicon instead insinto + doins to install icon files

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

6 files changed, 21 insertions, 21 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 534f10f0c289..f72e005cc63f 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.161 2012/09/05 07:12:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.162 2012/09/05 08:48:48 jlec Exp $
+
+  05 Sep 2012; Justin Lecher <jlec@gentoo.org> xemacs-21.4.22-r2.ebuild,
+  xemacs-21.5.29-r2.ebuild, xemacs-21.5.30.ebuild, xemacs-21.5.31.ebuild:
+  Use doicon instead insinto + doins to install icon files
 
   05 Sep 2012; Justin Lecher <jlec@gentoo.org> xemacs-21.4.22-r2.ebuild,
   xemacs-21.5.29-r2.ebuild, xemacs-21.5.30.ebuild, xemacs-21.5.31.ebuild:
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index effa43e24d00..d078c05a289a 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -17,17 +17,17 @@ DIST xemacs-21.4.22.tar.gz 8357931 SHA256 87fb7633106625935105e821eb8fe65e521a3d
 DIST xemacs-21.5.29.tar.gz 15453810 SHA256 071f84a2572eb70d4ae5cfc079f8f4c199371621f1855833a55a9577dffc0186 SHA512 3fb677495fa63d287e8f51f71f8741fd2ebcea2f01e062e2adedfa6f8a1daade8ea867cecf15306d13afa485a74517fd1e7c0a4496edb62403b65521b5ee0ef7 WHIRLPOOL 50dfc39eabb15e4bf10566586868ff65cef542b21af8c2d8a563e447ca417c96a585d83c6bff511695996b6299d5f7db520daf1861ac5caadec58e6b00df2a12
 DIST xemacs-21.5.30.tar.gz 15500732 SHA256 cc9573faea6e8442965b47ab011e647f4e0313c985cf4f9b751c52ce4767cc97 SHA512 d90a4db30477bde2649fae4feee4781fbd67a6a22c2f64216451349b8c8222567057cf6bb15cd4c3c34e5fb034a2b4269c3975a83a8226f08a39a5e18fef8da9 WHIRLPOOL e4da4e1a328aa2ef230acb6c3c7a5f2aebcffe97b8bdcb34431df385494779284c8115569c0aa6212d03f24f88a13e55354d9c8c9399b91ecb50377627d5e4e2
 DIST xemacs-21.5.31.tar.gz 15802193 SHA256 d59f90b7e72621376a23daa484f1929945d0527350a10989fd086bde9d0a997d SHA512 17c385459edffc063d43537dae5b2883d2d7481e7f7596d02c9859ecb9dd4ee48921647b389ed979d65ede2745b647c9b196c9ef0873e6d526d21262f04b7f41 WHIRLPOOL b2a1741af341f260671e1c8479f47c30113b515b240d86b41b6449abde96be896371d3f6b038ab72a96c422f84704de0a41e403a16c9ca2a4861e590e65b1f59
-EBUILD xemacs-21.4.22-r2.ebuild 6735 SHA256 a2a8ba1b5db54f859168a87dd9f4afe4185ffc837a17aad0cbafc7dc8421a735 SHA512 bc4ed1c680be03742c7582a3221c776767e8b9e7f14d97cf261534668182349bfcb6035e8472354c90071e853d3b6b6ab42ecdf72d8909de4725ae26aa0cffdb WHIRLPOOL 6f9fb1951f1099116aa0729f1a3ab1c671266e46dd074adff5e32643dbc26f38ec1c63e2a3e8bdc26c89e939a1bb2cb9df68e0bc9741299fa8ebda53a822b166
-EBUILD xemacs-21.5.29-r2.ebuild 6966 SHA256 0f13a87ccafb56d979d1280cac09e8751b899e132ffa2db4b1aa5ed317d08a60 SHA512 6cda1615d8fee2b2c3cc1fcc09403e4ea758f11d2f1b166176904eece827955ebf3a85aff719b7f41039e393907c98b934bd7d09966c268b96952da78938b8ae WHIRLPOOL 36126be7f5ffa11fc1a62b0582eb6be9f3bc81faba92887485618460ea1606643cf78fd65bfe36f4da9710b219b95dc96c49310e6484aae1759040d8cfa80bed
-EBUILD xemacs-21.5.30.ebuild 6791 SHA256 ff3018fb3d7a910cefd2bb40e58712720ac060f24f90197fb8789b9e6404715d SHA512 6fedd0cfe0ec1b0ed81410703eabe1995ba8e6f8347eb01bd86dae7d0449dec9c1e0bc23bfd44c2b62b16e4689c1f04ea271309afb99ccc0b659fc823bcccd62 WHIRLPOOL 75847225479cc4ce542e96cc799eea8808cacc74772e34db94bff76f9bfb23e2c9e6daacdb3a48fb306860aa72ecc3dbce6ff15f88c4853c2229b441db0b128d
-EBUILD xemacs-21.5.31.ebuild 6717 SHA256 d14f3b936286bc941f693c4e87a5ae584bdd5e4da68fb525c79053bf260c4a2d SHA512 ef2ad4e3ed5ddce4759a0694343bf85d05972c7f2a98de99272cde5b0faacffd7d50b08ab096e34d34689f078678be5d15a4fc9c0960104e087623da703273b7 WHIRLPOOL 41cc4a3031b9b403ccc27941140ec55d65f9b3a6f57d4894ace4e404b2b12ee890041ff58675b4d3aada9ce153a306ca66801405aeb6a3a3ad4eebfba613fbf7
-MISC ChangeLog 27576 SHA256 970a7c9daf4461f462c9dd25a2c5c3a1b9ffcb23b42a75ed78fd9d6d078add96 SHA512 c05f56ca6c05d6c37bfa403c45ab1c2965cd85ceeb2ce1a3237fc4e90a055e2c3773516197db6a6137c0cbe06b7174392e8e91289a5232e24f114a6b7d486dab WHIRLPOOL 70092fdec7a448f9c8e4c92a2610b3f34e950357b0ec13d0958115aeae0d839eece07f045df4a38c4b846c14cd03aaf3a4779eaa3308a53bf3911a15fd055a4b
+EBUILD xemacs-21.4.22-r2.ebuild 6708 SHA256 7595f26f39e38d8c39ce80e0a7fcba29749a501565aaacf10b5a41a4ac70cd3a SHA512 80b6fefb6cc9a88fd3d9f5e794669cb4eaf87e10352f1dd3ec8667df42407719371a7029a2e8a950e9465828229dd0e3b6947d734b769a4aa8bab5603fa8faf2 WHIRLPOOL cb837e66dd04b701bfad75bf1dd4b993ee6f23ad58954341922e7b0292598ae9ba9258d8a87bb0587e0a6022bd501c35307b1bd12ba0336e672afe928fcd64ea
+EBUILD xemacs-21.5.29-r2.ebuild 6939 SHA256 09b377a8cfc358b548aac6e4d14871229af2cd506907aa0c845153585471f1d2 SHA512 b001ae0220785d80b885451963175acbaffd467585458d04066454b39ed1cd72028bca20e7c60c5a3029bf228723d6cddcf87adad08a6877881a95d870aa0688 WHIRLPOOL e6b37072823cb29e4eaacfe342709b0ddaa46179a829ef6f09e32b110869364400dc94f969b1a88c18cd8b55ee995e35339b38827aebb6298afcf9328982b4b3
+EBUILD xemacs-21.5.30.ebuild 6764 SHA256 7f25e520dff6458655b09ea89a23ad1735b20fc06118900e327612d4fb36d3f3 SHA512 a4df593bdfc572e651b5ec3b4d28f96f34a907545e6d0b7bd43f00784050cfc2c815923714a003bc34d1ed319700ce19ab6cdcac3871ed8ce24bd8af39d82555 WHIRLPOOL 00f520c23f51f9215aaac28f41456e42562e14d181a9e9f415abd3585da820aa271b0a66fa3142d58fa025302fecdb6a0b2136bfca24ea4eacdffbe72a5f542c
+EBUILD xemacs-21.5.31.ebuild 6691 SHA256 fc6470ed3c33a861129f1f9bc24895ac4a4d02caff4644591628a7c72196fe93 SHA512 8dce7dae36a287b9ee3d24e5b29a7df4af1a617e98b8c965309c8688547e049538f134a6782c4ef61e303f7149e1e6b50a8c07871c9650f88a181a26dfecd97e WHIRLPOOL fe590f50f2440b4c0abf7f8336607dca7ddfe6397b836daed5afef600e32819eb65d16ef2c7bf684cc442e4caa638af169b570704447f06e160639f1b893ccf6
+MISC ChangeLog 27783 SHA256 57f81a95ee2b24a6c9fcc4c10d6347cb7913fea9007d47f5f378a8310d1d8bb7 SHA512 98680cbc2eb3875f3ed4db42557a592aaccdb545d4e5c7d8f19c1c873fcf3a50880d3027832052b7d353f8a85bcbcb652a665456fb516bb76727cbe402057147 WHIRLPOOL e8fa361f08e3a852ba2d4fc215c8b9665484a81d77a79107ad9ef9cea5c1eab511b9cbdb3becd93d8cf6ce40b58fe587a105deb3d30a3213db099ab939bced64
 MISC metadata.xml 711 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58 SHA512 b201e8584db8c7f798137dd79d2136639a0456e6127b28259ac42535664d608ff3d290e30f28ba2d71cf6c971ff5f5048d9b7911bff7907f715acbefb54d8048 WHIRLPOOL 0344fe6a29e42f5088260ccd648c83eda9cc13abbd78fa29db799ed66bed2f385735f7cd54aa5e00cf61f0cc1673892f207a553d9ccab55141c76cec2e179bfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlBG+1IACgkQgAnW8HDreRZqvQCgtEqsBhBWOErPiDR1TgJ8R+wB
-masAoLdfNDWVLfiZBVJJsm5koWQQ8Pxz
-=9Ga7
+iEYEAREIAAYFAlBHEfUACgkQgAnW8HDreRahswCgmJOzdKx5QiLKVB3zV8s6WhUG
+sTkAoMNpVH9wthlaE6T6RAftqP0pLV96
+=Lz6v
 -----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/xemacs-21.4.22-r2.ebuild b/app-editors/xemacs/xemacs-21.4.22-r2.ebuild
index 1372dca42bcd..afcb60b3de3c 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.14 2012/09/05 07:12:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r2.ebuild,v 1.15 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -229,8 +229,7 @@ src_install() {
 	dodoc BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README*
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
 	domenu "${FILESDIR}"/${PN}.desktop
 }
diff --git a/app-editors/xemacs/xemacs-21.5.29-r2.ebuild b/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
index 0cf35dcdeec9..7c4b80f823f5 100644
--- a/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.29-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.11 2012/09/05 07:12:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.29-r2.ebuild,v 1.12 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -224,8 +224,7 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
 	domenu "${FILESDIR}"/${PN}.desktop
 }
diff --git a/app-editors/xemacs/xemacs-21.5.30.ebuild b/app-editors/xemacs/xemacs-21.5.30.ebuild
index 4142a5922583..40b4bbd7b510 100644
--- a/app-editors/xemacs/xemacs-21.5.30.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.30.ebuild,v 1.4 2012/09/05 07:12:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.30.ebuild,v 1.5 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -216,8 +216,7 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
 	domenu "${FILESDIR}"/${PN}.desktop
 }
diff --git a/app-editors/xemacs/xemacs-21.5.31.ebuild b/app-editors/xemacs/xemacs-21.5.31.ebuild
index 4de3f3d3c76d..ccb1574c9fee 100644
--- a/app-editors/xemacs/xemacs-21.5.31.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.9 2012/09/05 07:12:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.31.ebuild,v 1.10 2012/09/05 08:48:48 jlec Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -213,8 +213,7 @@ src_install() {
 	cd "${S}"
 	dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README*
 
-	insinto /usr/share/pixmaps
-	newins "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
+	newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm
 
 	domenu "${FILESDIR}"/${PN}.desktop
 }