Fixed collision problem.

Package-Manager: portage-2.1.2.2

3 files changed, 25 insertions, 37 deletions

diff --git a/media-fonts/acroread-asianfonts/Manifest b/media-fonts/acroread-asianfonts/Manifest
index 9c38c2d66437..95e362a4a5ee 100644
--- a/media-fonts/acroread-asianfonts/Manifest
+++ b/media-fonts/acroread-asianfonts/Manifest
@@ -1,22 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST FontPack708_chs_i386-linux.tar.gz 14118337 RMD160 b2fb81cf31451a9cb08e6eee930f99be9ebe50ed SHA1 23c331cd2285c056200f7e5c5d6433c678aee098 SHA256 a39342d7c017315eb92b93c289bd9ef9c2601f2fd6033c7968fc34d9a50540c2
 DIST FontPack708_cht_i386-linux.tar.gz 9713040 RMD160 dbdffbf834702c0b95aca5e358fba9abb2fde83c SHA1 79716f59a02c318c81647e601b3f08a356c8c721 SHA256 48f16485c192aa5f77cb2c42869f5484b058b71c4631c6d8f1ad7c8d22ebf40d
 DIST FontPack708_jpn_i386-linux.tar.gz 11268460 RMD160 78d30b947ce6d17e56e19f6126f53fcfa43dd2c0 SHA1 2c92f2463565c87b2aa480b4e69ac5d626e3d57f SHA256 5621ce6c8e129bc530cfcb4de58bd9d618dda28a69830237dfef7acd93023238
 DIST FontPack708_kor_i386-linux.tar.gz 5938528 RMD160 c11cb71f467c3ecd8332ff3a0012989f5cfb2850 SHA1 c41879554e62bc77b0beec9dc2ad6773879c810d SHA256 2057a084d5a89dfe2f01d68a68accd09dac88e89620276dcb95a6f1c8f052e76
-DIST chsfont.tar.gz 13078861 RMD160 0ee131264c4e70cdf109b060ca410043d260e45f SHA1 87a2c3cd8bb029c223b6ea844438a3a65b3352f9 SHA256 9dfdd142440fd18175a24a0f1a771e10e73f4abe10771abe1f613b3c663f4f9f
-DIST chtfont.tar.gz 9441658 RMD160 0f254a71ea7eb5a882daed753876ad6c6215d7c6 SHA1 502bdbfed1e46d65724fc59da07d86b487106110 SHA256 b43df55daae7b424fff34de56902ab437f2a7095339e19f6dfd3328feaa2bfb6
-DIST jpnfont.tar.gz 5332283 RMD160 85da1c1ad84d21856d22911424894c015d40eb8e SHA1 ac2ad153704ca05ea5b8c9a98f921db80848eb75 SHA256 c8cdc7cfe5e88041db94652457ad8cb0cdbf90b4cb3db9815752ea1d3f361b48
-DIST korfont.tar.gz 4977639 RMD160 5aec03a099b4da08bcb3403c7ce1905bf256d178 SHA1 efd24c978cfb303cbd7025ed282037c6ccce51c0 SHA256 3a363e7deafcad4ff0adc7395313e993624280a28fde173434c3737b05d20be4
+DIST chsfont.tar.gz 13504625 RMD160 330db54dc78cfd1e88416095d22bfc9be6bab8c3 SHA1 883f5d0c143adf0bff775ffb3e0254732790a90c SHA256 9e7a45611f6d8b77f8c843738af50334743d1650b259516d1ccde604530c1fa2
+DIST chtfont.tar.gz 9098909 RMD160 84c974270dcffa7d1c83d7fe753bcefa420e51e5 SHA1 653826d6c2ba9606990d7ab0eef4a927fbfeb7d9 SHA256 3d9bcd29f61f2edda8e73198cc098305ef4a1d574048f1d73d3151bb6b4998a9
+DIST jpnfont.tar.gz 10653654 RMD160 7b73e124e8c559d36cb93dc9d85b99e43912a352 SHA1 8377ba6fde70665b8d991fa8571d1ef4b6a5ff78 SHA256 4a4c042161e3d04ca33384661245848f0ea48af8cc0d8ffa6be7457c2b89a5ee
+DIST korfont.tar.gz 5323926 RMD160 bf5608841fdd82e968c04426cd7261918e098010 SHA1 30623b4c6607e773299363b641a49bdabe7025d5 SHA256 986521227d0c1f15fb6b1e5763688d314bd9a014aea23b735d52332d0a971ee3
 EBUILD acroread-asianfonts-7.0.20050728.ebuild 1913 RMD160 dc81588f1e257fa105d72af940a02ca24052fb0e SHA1 b94c4acf85404903891ce33a5c79060373380a93 SHA256 c233979e51f9b13e40be2464b3f183625265d01b04f2ccc92ffbc043a2e23c93
 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 2796 RMD160 b7467e7784534508e4da2d7278d02dcb3cf05a25 SHA1 35f1c5791582616cc2eb21dd1158df8e6da2a532 SHA256 1268fa736cc164b4433d3d3512c50a6626c22bb9c8021ddc9831c08cba88f5e3
-MD5 1a23b7f1b0568b6fc95953c09c15d587 acroread-asianfonts-7.0.8.ebuild 2796
-RMD160 b7467e7784534508e4da2d7278d02dcb3cf05a25 acroread-asianfonts-7.0.8.ebuild 2796
-SHA256 1268fa736cc164b4433d3d3512c50a6626c22bb9c8021ddc9831c08cba88f5e3 acroread-asianfonts-7.0.8.ebuild 2796
+EBUILD acroread-asianfonts-7.0.8.ebuild 2740 RMD160 4f8ffe553bcc65288abb137ec435a9d8e7afd5c9 SHA1 ba588ba9bccfb2d121571d09b1bd7411e1227741 SHA256 2222c587d75d635f0453138dde4ad29fc9014615ed69a9c0044258c334a87fa7
+MD5 98f249b776704967d50c263364fc32c9 acroread-asianfonts-7.0.8.ebuild 2740
+RMD160 4f8ffe553bcc65288abb137ec435a9d8e7afd5c9 acroread-asianfonts-7.0.8.ebuild 2740
+SHA256 2222c587d75d635f0453138dde4ad29fc9014615ed69a9c0044258c334a87fa7 acroread-asianfonts-7.0.8.ebuild 2740
 MISC ChangeLog 3066 RMD160 1bd7fa8af3f1faf8069ead848430d2c19a327cf1 SHA1 0f97c8832ae77ddc38831729f5bb021d349af1ed SHA256 20aaee364db59b9f4e6e04e467421e0086660f1f68ea3ed9c2b032543f3ce9b7
 MD5 7e90f59701b9f92f62906e851d90189e ChangeLog 3066
 RMD160 1bd7fa8af3f1faf8069ead848430d2c19a327cf1 ChangeLog 3066
@@ -25,16 +22,9 @@ MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4
 MD5 9088d4a413fe0b465560c753492acf1f metadata.xml 175
 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e metadata.xml 175
 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8 metadata.xml 175
-MD5 b3475cfde6855f198a59117fbfa2d5e4 files/digest-acroread-asianfonts-7.0.20050728 907
-RMD160 247d756c4988f0d1911bb7b0356a42541375c9b1 files/digest-acroread-asianfonts-7.0.20050728 907
-SHA256 d54c479a7f7a80b228891757c31d8bd57a966010af55e4a413b6b51986b311ab files/digest-acroread-asianfonts-7.0.20050728 907
+MD5 870db7b560cc987e238341c9cdf1668b files/digest-acroread-asianfonts-7.0.20050728 910
+RMD160 0ea1e31837a1a1314e4de1ac515b5162ad05a43e files/digest-acroread-asianfonts-7.0.20050728 910
+SHA256 3c461b075569dee55558084f19f9b352cb2ff12a7305bd965fa72a3006b65d42 files/digest-acroread-asianfonts-7.0.20050728 910
 MD5 c5fd9074cbed27c60992d4bb059a29bc files/digest-acroread-asianfonts-7.0.8 1138
 RMD160 4fcae9f373d2d7353379fdf54c8777dca4595058 files/digest-acroread-asianfonts-7.0.8 1138
 SHA256 f0fd87181e26dc50d179be68b79a821ba9b7eef5f27adc91bc79f6784f89ef1b files/digest-acroread-asianfonts-7.0.8 1138
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGmly/ejvha5XGaMRAkasAKC+IetFDsxHwLgTtqySwnbp/mEURACeIhIw
-DcWBW+flepc7rusN6Uhs6M0=
-=tSxQ
------END PGP SIGNATURE-----
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 84232b9729ae..e4f259f97686 100644
--- 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.2 2007/04/09 14:09:03 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-7.0.8.ebuild,v 1.3 2007/04/10 11:07:30 matsuu Exp $
 
 inherit eutils
 
@@ -79,9 +79,7 @@ src_install() {
 	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
+	rm "${D}/${INSTALLDIR}"/CMap/Identity-{V,H}
 
 	insinto ${INSTALLDIR}
 	doins ${INST_LANG/* /}KIT/LICREAD.TXT || die
diff --git a/media-fonts/acroread-asianfonts/files/digest-acroread-asianfonts-7.0.20050728 b/media-fonts/acroread-asianfonts/files/digest-acroread-asianfonts-7.0.20050728
index 8bed01e66f15..bb0f005f0bc5 100644
--- a/media-fonts/acroread-asianfonts/files/digest-acroread-asianfonts-7.0.20050728
+++ b/media-fonts/acroread-asianfonts/files/digest-acroread-asianfonts-7.0.20050728
@@ -1,12 +1,12 @@
-MD5 bf5d6713b2eb16798419c2792cd1bd19 chsfont.tar.gz 13078861
-RMD160 0ee131264c4e70cdf109b060ca410043d260e45f chsfont.tar.gz 13078861
-SHA256 9dfdd142440fd18175a24a0f1a771e10e73f4abe10771abe1f613b3c663f4f9f chsfont.tar.gz 13078861
-MD5 cc15fd94d1ba6fd1e995da984bc342e9 chtfont.tar.gz 9441658
-RMD160 0f254a71ea7eb5a882daed753876ad6c6215d7c6 chtfont.tar.gz 9441658
-SHA256 b43df55daae7b424fff34de56902ab437f2a7095339e19f6dfd3328feaa2bfb6 chtfont.tar.gz 9441658
-MD5 5986656807cb4ef9cf532c10b8e1da3e jpnfont.tar.gz 5332283
-RMD160 85da1c1ad84d21856d22911424894c015d40eb8e jpnfont.tar.gz 5332283
-SHA256 c8cdc7cfe5e88041db94652457ad8cb0cdbf90b4cb3db9815752ea1d3f361b48 jpnfont.tar.gz 5332283
-MD5 f2c4add2a12dd362c914bd811d033492 korfont.tar.gz 4977639
-RMD160 5aec03a099b4da08bcb3403c7ce1905bf256d178 korfont.tar.gz 4977639
-SHA256 3a363e7deafcad4ff0adc7395313e993624280a28fde173434c3737b05d20be4 korfont.tar.gz 4977639
+MD5 a03c3c13b436f3cac9a54224b09fc6ff chsfont.tar.gz 13504625
+RMD160 330db54dc78cfd1e88416095d22bfc9be6bab8c3 chsfont.tar.gz 13504625
+SHA256 9e7a45611f6d8b77f8c843738af50334743d1650b259516d1ccde604530c1fa2 chsfont.tar.gz 13504625
+MD5 4b22f29264847cc5a69886b784a4543c chtfont.tar.gz 9098909
+RMD160 84c974270dcffa7d1c83d7fe753bcefa420e51e5 chtfont.tar.gz 9098909
+SHA256 3d9bcd29f61f2edda8e73198cc098305ef4a1d574048f1d73d3151bb6b4998a9 chtfont.tar.gz 9098909
+MD5 e0cfe558379515a6563995c8935f8903 jpnfont.tar.gz 10653654
+RMD160 7b73e124e8c559d36cb93dc9d85b99e43912a352 jpnfont.tar.gz 10653654
+SHA256 4a4c042161e3d04ca33384661245848f0ea48af8cc0d8ffa6be7457c2b89a5ee jpnfont.tar.gz 10653654
+MD5 3cd6dd6041ea42b67b3d0351a2c74ddd korfont.tar.gz 5323926
+RMD160 bf5608841fdd82e968c04426cd7261918e098010 korfont.tar.gz 5323926
+SHA256 986521227d0c1f15fb6b1e5763688d314bd9a014aea23b735d52332d0a971ee3 korfont.tar.gz 5323926