diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-10-09 14:09:16 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-10-09 14:09:16 +0000 |
| commit | cbe9db131d8c06908d58ebf7e22183bfbf1a9e79 (patch) | |
| tree | 77d943908f2a42ff06104fb87b3793bcd8755c7f | |
| parent | Version bump. Remove old. Fixes bug #287957. (diff) | |
| download | gentoo-2-cbe9db131d8c06908d58ebf7e22183bfbf1a9e79.tar.gz gentoo-2-cbe9db131d8c06908d58ebf7e22183bfbf1a9e79.tar.bz2 gentoo-2-cbe9db131d8c06908d58ebf7e22183bfbf1a9e79.zip | |
Fixed warning reported in bug #283880.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
| -rw-r--r-- | media-fonts/acroread-asianfonts/ChangeLog | 5 | ||||
| -rw-r--r-- | media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild | 32 |
2 files changed, 22 insertions, 15 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/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}" } |