diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-30 23:59:48 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-30 23:59:48 +0000 |
commit | ee1b8a3331451da52ec0c2f3ee1c54492bfa7f34 (patch) | |
tree | 175bd73fe7e5d01277e80924756ac9571e097d7a | |
parent | Add patch from 1.11.x to fix building against >=glib-2.31 (bug #401539, thank... (diff) | |
download | gentoo-2-ee1b8a3331451da52ec0c2f3ee1c54492bfa7f34.tar.gz gentoo-2-ee1b8a3331451da52ec0c2f3ee1c54492bfa7f34.tar.bz2 gentoo-2-ee1b8a3331451da52ec0c2f3ee1c54492bfa7f34.zip |
If a linguas useflag is not present in acroread, assume it is unset
(Portage version: 2.1.10.44/cvs/Linux x86_64)
-rw-r--r-- | media-fonts/acroread-asianfonts/ChangeLog | 8 | ||||
-rw-r--r-- | media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild | 24 |
2 files changed, 18 insertions, 14 deletions
diff --git a/media-fonts/acroread-asianfonts/ChangeLog b/media-fonts/acroread-asianfonts/ChangeLog index e52bde0a4358..feff56ff8c2c 100644 --- a/media-fonts/acroread-asianfonts/ChangeLog +++ b/media-fonts/acroread-asianfonts/ChangeLog @@ -1,6 +1,10 @@ # 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.27 2009/11/08 01:48:07 matsuu Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/ChangeLog,v 1.28 2012/01/30 23:59:48 dilfridge Exp $ + + 31 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> + acroread-asianfonts-9.1.ebuild: + If a linguas useflag is not present in acroread, assume it is unset 08 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> -acroread-asianfonts-8.1.2.ebuild: diff --git a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild index 8b45a2f77883..946973781bf1 100644 --- a/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild +++ b/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2012 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.4 2009/10/25 11:52:30 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/acroread-asianfonts/acroread-asianfonts-9.1.ebuild,v 1.5 2012/01/30 23:59:48 dilfridge Exp $ -EAPI="2" +EAPI=4 inherit confutils SRC_PREFIX="http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.1/misc/FontPack910_" @@ -24,10 +24,10 @@ IUSE="minimal linguas_ja linguas_ko linguas_zh_CN linguas_zh_TW" RESTRICT="strip mirror" DEPEND="" -RDEPEND="linguas_ja? ( >=app-text/acroread-9.1[-linguas_ja] )" -# linguas_ko? ( >=app-text/acroread-9.1[-linguas_ko] ) -# linguas_zh_CN? ( >=app-text/acroread-9.1[-linguas_zh_CN] ) -# linguas_zh_TW? ( >=app-text/acroread-9.1[-linguas_zh_TW] ) +RDEPEND="linguas_ja? ( >=app-text/acroread-9.1[-linguas_ja(-)] )" +# linguas_ko? ( >=app-text/acroread-9.1[-linguas_ko(-)] ) +# linguas_zh_CN? ( >=app-text/acroread-9.1[-linguas_zh_CN(-)] ) +# linguas_zh_TW? ( >=app-text/acroread-9.1[-linguas_zh_TW(-)] ) S="${WORKDIR}" @@ -47,29 +47,29 @@ src_install() { if use linguas_ja ; then tar xf JPNKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}" tar xf JPNKIT/LANGJPN.TAR --no-same-owner -C "${D}/${INSTALLDIR}" - doins JPNKIT/LICREAD.TXT || die + doins JPNKIT/LICREAD.TXT fi if use linguas_ko ; then tar xf KORKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}" tar xf KORKIT/LANGKOR.TAR --no-same-owner -C "${D}/${INSTALLDIR}" - doins KORKIT/LICREAD.TXT || die + doins KORKIT/LICREAD.TXT fi if use linguas_zh_CN ; then tar xf CHSKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}" tar xf CHSKIT/LANGCHS.TAR --no-same-owner -C "${D}/${INSTALLDIR}" - doins CHSKIT/LICREAD.TXT || die + doins CHSKIT/LICREAD.TXT fi if use linguas_zh_TW ; then tar xf CHTKIT/LANGCOM.TAR --no-same-owner -C "${D}/${INSTALLDIR}" tar xf CHTKIT/LANGCHT.TAR --no-same-owner -C "${D}/${INSTALLDIR}" - doins CHTKIT/LICREAD.TXT || die + doins CHTKIT/LICREAD.TXT fi if use !minimal ; then tar xf xtdfont/XTDFONT.TAR --no-same-owner -C "${D}/${INSTALLDIR}" rm "${D}${RESOURCEDIR}"/Font/{MinionPro*,MyriadPro*} - doins "${D}${INSTALLDIR}"/LICREAD.TXT || die + doins "${D}${INSTALLDIR}"/LICREAD.TXT rm "${D}${INSTALLDIR}"/{INSTALL,LICREAD.TXT} rm -rf "${D}${READERDIR}"/Reader/intellinux fi |