add fix for icon install (bug #117371)

Package-Manager: portage-2.1.2_rc4-r5

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 2386571b4233ef898681d9fa16b81868d87d4785..7f661ece45937a74c3d47ed9b171569e8484cb06 100644 (file)
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.163 2007/01/03 00:31:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.164 2007/01/04 00:33:13 compnerd Exp $
+
+  04 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  abiword-2.4.5-r1.ebuild, abiword-2.4.6.ebuild:
+  Fix to install icon into correct directory (bug #117371), based on
+  suggestion from Chris Mayo <mayo@clara.co.uk>
 
 *abiword-2.4.6 (03 Jan 2007)
 

diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index 5c24001457738eb0d12db95cb02d0cfae30b9c22..23760b578ad896f7572620ef61fc4510a60cdd6c 100644 (file)
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -30,22 +30,22 @@ EBUILD abiword-2.4.4.ebuild 2421 RMD160 558dc043bfb620e7dd34a8ed02790bea1475458f
 MD5 b082c134fbde1fa64b913a0ac8829497 abiword-2.4.4.ebuild 2421
 RMD160 558dc043bfb620e7dd34a8ed02790bea1475458f abiword-2.4.4.ebuild 2421
 SHA256 13c057f906377938de6c9c308c340c1e6aea61c3130a3c90f0aa120de3ae612f abiword-2.4.4.ebuild 2421
-EBUILD abiword-2.4.5-r1.ebuild 2547 RMD160 72364fd096d045bc9c268754708df8728410cf8c SHA1 bab529595ee081a87bbb5c64cf6a45a9adeac6ae SHA256 a95c903bb10cba3df91f932651edda51aa8da8f13d4e777b8214123e84794208
-MD5 805e40a8c14093fafbee463493007044 abiword-2.4.5-r1.ebuild 2547
-RMD160 72364fd096d045bc9c268754708df8728410cf8c abiword-2.4.5-r1.ebuild 2547
-SHA256 a95c903bb10cba3df91f932651edda51aa8da8f13d4e777b8214123e84794208 abiword-2.4.5-r1.ebuild 2547
+EBUILD abiword-2.4.5-r1.ebuild 2582 RMD160 0218e1e6b426e4991a1caf00db1359d11df4d569 SHA1 66cdada5aaebb16d76b37df7b99d7f85d0ac4222 SHA256 a1240f344ce4a1a6a93549583cf4c60add61177eba49207c0b6caeeb574efc21
+MD5 96ec172ab5eda4fe6665302e759de14a abiword-2.4.5-r1.ebuild 2582
+RMD160 0218e1e6b426e4991a1caf00db1359d11df4d569 abiword-2.4.5-r1.ebuild 2582
+SHA256 a1240f344ce4a1a6a93549583cf4c60add61177eba49207c0b6caeeb574efc21 abiword-2.4.5-r1.ebuild 2582
 EBUILD abiword-2.4.5.ebuild 2334 RMD160 f5dab11edcb1a1530d7a01a0a3fdc925baf83054 SHA1 ebdbae2c99f94b85d0bbbbdf5a347dc50cd1060a SHA256 ec17ea05c4923525524fb098b5308285c1aa7ff2e10ce40d8e9550166bc99e2c
 MD5 47dfaddf977cf303fc70839227879b3a abiword-2.4.5.ebuild 2334
 RMD160 f5dab11edcb1a1530d7a01a0a3fdc925baf83054 abiword-2.4.5.ebuild 2334
 SHA256 ec17ea05c4923525524fb098b5308285c1aa7ff2e10ce40d8e9550166bc99e2c abiword-2.4.5.ebuild 2334
-EBUILD abiword-2.4.6.ebuild 2349 RMD160 e5f05319ef6319cc441a8dff0e9a8ea3cffdf475 SHA1 d88cd2ba8ac77ed94dbf24cb7974ce1edda65ee9 SHA256 062e27a718895ca5c1d92c52ac13bd9b28394e89b0a7585fae99ba554087f75b
-MD5 a7ee312611a0b03457be105e8a4a144d abiword-2.4.6.ebuild 2349
-RMD160 e5f05319ef6319cc441a8dff0e9a8ea3cffdf475 abiword-2.4.6.ebuild 2349
-SHA256 062e27a718895ca5c1d92c52ac13bd9b28394e89b0a7585fae99ba554087f75b abiword-2.4.6.ebuild 2349
-MISC ChangeLog 21877 RMD160 1a68c8508dc1ff8cabbd91c2dc731e66ecd9b91d SHA1 5ca4b92dadc6865863b9827d19e91dafe1df04d7 SHA256 ba5c2b5c45811e846633518a2c8eaa27314c1ff94a4e2cc13c904fac9d701110
-MD5 7d6dc0b860d0bbd2fa989bb8b6929df8 ChangeLog 21877
-RMD160 1a68c8508dc1ff8cabbd91c2dc731e66ecd9b91d ChangeLog 21877
-SHA256 ba5c2b5c45811e846633518a2c8eaa27314c1ff94a4e2cc13c904fac9d701110 ChangeLog 21877
+EBUILD abiword-2.4.6.ebuild 2384 RMD160 2469c937907fec323361302845cde6be8c35ebfb SHA1 c25b2aebbf2765e0f253f480948462dea06d6f54 SHA256 088cf0c915b829877aeaec52f7e92d7f594b6fde1f134217ac55870e0cbdd184
+MD5 10b6ed57897ff5610f040ff4488d1a27 abiword-2.4.6.ebuild 2384
+RMD160 2469c937907fec323361302845cde6be8c35ebfb abiword-2.4.6.ebuild 2384
+SHA256 088cf0c915b829877aeaec52f7e92d7f594b6fde1f134217ac55870e0cbdd184 abiword-2.4.6.ebuild 2384
+MISC ChangeLog 22100 RMD160 ed94144185cbdd844c32d2932761cf30c9ec0e03 SHA1 a2b0b0181378666ecbfd5b9efc011acc493c02c2 SHA256 57f45794e5a3e9fd41181e6a06e3d11b0eafb1360ae42cbd751ec8353d4a374c
+MD5 aee8329819dcef83aa1e0d96074c959a ChangeLog 22100
+RMD160 ed94144185cbdd844c32d2932761cf30c9ec0e03 ChangeLog 22100
+SHA256 57f45794e5a3e9fd41181e6a06e3d11b0eafb1360ae42cbd751ec8353d4a374c ChangeLog 22100
 MISC metadata.xml 165 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 SHA1 7fc9c8a1bf4ba6ea2047d4fa8046e13a2abd6b82 SHA256 9e51028c1f6811ec63067385fb8d6cb393d04b1a1d6688e0bbeb368ef34d57a0
 MD5 3b7f9b4ae874f21ec05137f8038bdd69 metadata.xml 165
 RMD160 46d22302656e49f090e45d3c10f90c4e16f75877 metadata.xml 165

diff --git a/app-office/abiword/abiword-2.4.5-r1.ebuild b/app-office/abiword/abiword-2.4.5-r1.ebuild
index b5eed807633a675bd55e2d2e0215beb587b89206..2008dcb54632d0e1faee918c22a7bb0c34db1050 100644 (file)
--- a/app-office/abiword/abiword-2.4.5-r1.ebuild
+++ b/app-office/abiword/abiword-2.4.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.5-r1.ebuild,v 1.1 2006/12/12 22:27:26 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.5-r1.ebuild,v 1.2 2007/01/04 00:33:13 compnerd Exp $
 
 inherit eutils fdo-mime alternatives
 
@@ -67,7 +67,7 @@ src_compile() {
 src_install() {
        dodir /usr/{bin,lib}
 
-       make DESTDIR="${D}" install || die "Installation failed"
+       make DESTDIR="${D}" icondir="${ROOT}usr/share/pixmaps" install || die "Installation failed"
 
        dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop
 

diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
index 36c177aa58eee57fa3a55c27bffc2b6483aa744a..1fc26570977bfc97f8383c759e29ce299dc8fd46 100644 (file)
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ b/app-office/abiword/abiword-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.1 2007/01/03 00:31:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.2 2007/01/04 00:33:13 compnerd Exp $
 
 inherit alternatives eutils fdo-mime
 
@@ -60,7 +60,7 @@ src_compile() {
 
 src_install() {
        dodir /usr/{bin,lib}
-       make DESTDIR="${D}" install || die "install failed"
+       make DESTDIR="${D}" icondir="${ROOT}usr/share/pixmaps" install || die "install failed"
 
        dosed "s:Exec=abiword:Exec=abiword-2.4:" /usr/share/applications/abiword.desktop