summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-10-09 14:09:16 +0000
committerPeter Volkov <pva@gentoo.org>2009-10-09 14:09:16 +0000
commita56f1115b7fc147a4dc87013d6e0af8c979d3dc7 (patch)
tree56953c16efbff3b18e78479cc8e54c5a253eecf5 /media-fonts/acroread-asianfonts
parentVersion bump. Remove old. Fixes bug #287957. (diff)
downloadhistorical-a56f1115b7fc147a4dc87013d6e0af8c979d3dc7.tar.gz
historical-a56f1115b7fc147a4dc87013d6e0af8c979d3dc7.tar.bz2
historical-a56f1115b7fc147a4dc87013d6e0af8c979d3dc7.zip
Fixed warning reported in bug #283880.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'media-fonts/acroread-asianfonts')
-rw-r--r--media-fonts/acroread-asianfonts/ChangeLog5
-rw-r--r--media-fonts/acroread-asianfonts/Manifest4
-rw-r--r--media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild32
3 files changed, 24 insertions, 17 deletions
diff --git a/media-fonts/acroread-asianfonts/ChangeLog b/media-fonts/acroread-asianfonts/ChangeLog
index 58eca34b4599..775b1d2a5176 100644
--- a/media-fonts/acroread-asianfonts/ChangeLog
+++ b/media-fonts/acroread-asianfonts/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-fonts/acroread-asianfonts
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.24 2009/06/17 23:13:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.25 2009/10/09 14:09:16 pva Exp $
+
+ 09 Oct 2009; Peter Volkov <pva@gentoo.org> acroread-asianfonts-9.1.ebuild:
+ Fixed warning reported in bug #283880.
*acroread-asianfonts-9.1 (17 Jun 2009)
diff --git a/media-fonts/acroread-asianfonts/Manifest b/media-fonts/acroread-asianfonts/Manifest
index 80565b9c6699..3628888e66fc 100644
--- a/media-fonts/acroread-asianfonts/Manifest
+++ b/media-fonts/acroread-asianfonts/Manifest
@@ -9,6 +9,6 @@ DIST FontPack910_jpn_i486-linux.tar.bz2 11006398 RMD160 947c00b5ed391914a14e2de9
DIST FontPack910_kor_i486-linux.tar.bz2 8571757 RMD160 b33291986a78be84b53a1ef4feb33a412fa13162 SHA1 6a0ac9feedb22618bfc5784caeda197fd03aafd5 SHA256 74394114bebfdbf134a74147d68ed9a46af8f08858dd00d50002cf24a9a39077
DIST FontPack910_xtd_i486-linux.tar.bz2 5906030 RMD160 f63255e0512d7a56374d06febe2482e38feed86c SHA1 fd62e425f01a558b4e00d0fcfc22257d62040ff4 SHA256 2180ef033d2d7ae3c758d2bb989c692ce73fb408668a3feeeeed6d05cd363f28
EBUILD acroread-asianfonts-8.1.2.ebuild 3701 RMD160 19e1bba7a20913074d65caae4dc3757f4972b2dc SHA1 6d892ca4f18bf9296d86e8a0406c79ff4d53ceff SHA256 9f14586a73e36aaef0fdad9666fd6a37ecbe033499efc28e3ea6c3cb71dccf05
-EBUILD acroread-asianfonts-9.1.ebuild 3186 RMD160 91d5b9d0d31b1eb9b92556fd234830f97d92de95 SHA1 fa6b9214cb159fbf67f9ee5c72373d1eb41762d5 SHA256 d37f041f2269f4aafbab397038647611c7fe7ce1cb8180608c455a6050044e0d
-MISC ChangeLog 3966 RMD160 867f921998516aa8411116e5734dda59e807387b SHA1 8a0755d958bebfc1594bda00bc8f7d5e5b5ae913 SHA256 46ddb20a6220ce14c42ca42c4df0d70ec62936d318d024fdec09dab04361fc0f
+EBUILD acroread-asianfonts-9.1.ebuild 3323 RMD160 a18599d4df82bbdf580d7891aa8a44e17063e498 SHA1 0dbbcb917ba9560b9fe3fe973f1966d5cb4c9942 SHA256 6cf0363bf326e886ecf4300c4e89d3bae240ee47640ecf2604681e3cf7bf0733
+MISC ChangeLog 4082 RMD160 941a9129af5b33a61f5d8af8e26490986501af98 SHA1 a5a4cd0a88959f0d41c2267102904ca44cf58fb0 SHA256 2269c99e29985e615677eac37c789c4afb7df1bc1162959941570d56fa55a096
MISC metadata.xml 175 RMD160 e22fbca96af27631c4910bc93f69d81280ddd96e SHA1 5f1d4ea1a9ccb9b3dbd74ddaed58f0df64f2ad63 SHA256 0dc53674ee3ca2348bedd390f639dac96f537cce8cd0c550c13917de7b61f2e8
diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
index 01ffb5f40204..dc8ee6b0517d 100644
--- a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
+++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.2 2009/06/23 15:21:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.3 2009/10/09 14:09:16 pva Exp $
EAPI="2"
inherit confutils
@@ -74,21 +74,25 @@ src_install() {
rm -rf "${D}${READERDIR}"/Reader/intellinux
fi
- # bug 152288
- rm "${D}/${CMAPDIR}"/Identity-{V,H}
+ # collision with app-text/acroread, bug #152288
+ if use linguas_ja || use linguas_ko \
+ || use linguas_zh_CN || use linguas_zh_TW; then
- if use !linguas_ja ; then
- rm "${D}/${CMAPDIR}"/{8*,9*,Add*,Adobe-J*,EUC*,Ext*,H,UCS2-9*,UniJ*,UniKS-UTF16*,V}
+ rm "${D}/${CMAPDIR}"/Identity-{V,H}
+
+ if use !linguas_ja ; then
+ rm "${D}/${CMAPDIR}"/{8*,9*,Add*,Adobe-J*,EUC*,Ext*,H,UCS2-9*,UniJ*,UniKS-UTF16*,V}
+ fi
+ #if use !linguas_ko ; then
+ # rm "${D}/${CMAPDIR}"/{Adobe-Korea*,KSC*,UCS2-GBK*,UCS2-KSC*,UniKS*}
+ #fi
+ #if use !linguas_zh_CN ; then
+ # rm "${D}/${CMAPDIR}"/{Adobe-GB*,GB*,UCS2-GB*,UniGB*}
+ #fi
+ #if use !linguas_zh_TW ; then
+ # rm "${D}/${CMAPDIR}"/{Adobe-CNS*,B5*,CNS*,ET*,HK*,UCS2-B5*,UCS-ET*,UniCNS*}
+ #fi
fi
- #if use !linguas_ko ; then
- # rm "${D}/${CMAPDIR}"/{Adobe-Korea*,KSC*,UCS2-GBK*,UCS2-KSC*,UniKS*}
- #fi
- #if use !linguas_zh_CN ; then
- # rm "${D}/${CMAPDIR}"/{Adobe-GB*,GB*,UCS2-GB*,UniGB*}
- #fi
- #if use !linguas_zh_TW ; then
- # rm "${D}/${CMAPDIR}"/{Adobe-CNS*,B5*,CNS*,ET*,HK*,UCS2-B5*,UCS-ET*,UniCNS*}
- #fi
fowners -R -L --dereference 0:0 "${INSTALLDIR}"
}