Fixed file collisions, bug #152288.

diff --git a/media-fonts/acroread-asianfonts/Manifest b/media-fonts/acroread-asianfonts/Manifest
index d6c514fd8c00ae7ce9d56e3329200f5902317aa6..d2e2d33a435bcda208a2637d2c1b6693a2f8442c 100644 (file)
--- a/media-fonts/acroread-asianfonts/Manifest
+++ b/media-fonts/acroread-asianfonts/Manifest
@@ -10,10 +10,10 @@ EBUILD acroread-asianfonts-7.0.20050728.ebuild 1913 RMD160 dc81588f1e257fa105d72
 MD5 14ee386cfc5c53acea4f3012ff971ecb acroread-asianfonts-7.0.20050728.ebuild 1913
 RMD160 dc81588f1e257fa105d72af940a02ca24052fb0e acroread-asianfonts-7.0.20050728.ebuild 1913
 SHA256 c233979e51f9b13e40be2464b3f183625265d01b04f2ccc92ffbc043a2e23c93 acroread-asianfonts-7.0.20050728.ebuild 1913
-EBUILD acroread-asianfonts-7.0.8.ebuild 2685 RMD160 7a5c5f4015fb5f7dc2918850448ecbadef4c9826 SHA1 83066755515c5c81ede9738a808dfb6dfb247e2e SHA256 830586aee78732f8260c4f27a10a9473526dc295a2d7ce019921a36fee548207
-MD5 29546d6e6dfa2b9d978d6fe8a12324fe acroread-asianfonts-7.0.8.ebuild 2685
-RMD160 7a5c5f4015fb5f7dc2918850448ecbadef4c9826 acroread-asianfonts-7.0.8.ebuild 2685
-SHA256 830586aee78732f8260c4f27a10a9473526dc295a2d7ce019921a36fee548207 acroread-asianfonts-7.0.8.ebuild 2685
+EBUILD acroread-asianfonts-7.0.8.ebuild 2796 RMD160 b0b4106343e4b998d7554ba785e13a3a38c3824c SHA1 2e509b18ac93cc9670ec74c1634ee17d6d60be2a SHA256 e745dd68a0c75ae3c7a5269ee7d91a7ad0fd39dd0408611c7e2f0ef927632dbe
+MD5 e9e2c2834a56a475852d41501717e948 acroread-asianfonts-7.0.8.ebuild 2796
+RMD160 b0b4106343e4b998d7554ba785e13a3a38c3824c acroread-asianfonts-7.0.8.ebuild 2796
+SHA256 e745dd68a0c75ae3c7a5269ee7d91a7ad0fd39dd0408611c7e2f0ef927632dbe acroread-asianfonts-7.0.8.ebuild 2796
 MISC ChangeLog 2953 RMD160 48aac799e318d5f710272203328d7d2b7904997a SHA1 e69d760732387ab69bb8816f148c88f5ad5ac93e SHA256 25f1999f7f07c31dd52c07bfcf58e94811fa8ba74840d1806a582d8feea39595
 MD5 4cb64e22aadd1ba717658e9e419bb6e4 ChangeLog 2953
 RMD160 48aac799e318d5f710272203328d7d2b7904997a ChangeLog 2953

diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild
index e02a584e24950584e9958c3fd91c073b4eb58ab8..84232b9729aefb9a2a841dbaed2564e4ecd404b1 100644 (file)
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.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/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild,v 1.1 2007/04/08 00:40:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild,v 1.2 2007/04/09 14:09:03 matsuu Exp $
 
 inherit eutils
 
@@ -78,8 +78,13 @@ src_install() {
        tar xf ${INST_LANG/* /}KIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
        tar xf ${INST_LANG/* /}KIT/BINCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}"
 
+       # bug 152288
+       if [ -f "${D}/${INSTALLDIR}/CMap/Identity-V" ] ; then
+               rm "${D}/${INSTALLDIR}/CMap/Identity-V"
+       fi
+
        insinto ${INSTALLDIR}
        doins ${INST_LANG/* /}KIT/LICREAD.TXT || die
 
-       chown -R -L --dereference 0:0 "${D}/${INSTALLDIR}"
+       fowners -R -L --dereference 0:0 ${INSTALLDIR}
 }