diff options
| -rw-r--r-- | app-i18n/canna/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/canna/canna-3.7_p3-r2.ebuild | 25 |
2 files changed, 22 insertions, 10 deletions
diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog index ea208f5db8fe..b93ae7d87f81 100644 --- a/app-i18n/canna/ChangeLog +++ b/app-i18n/canna/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-i18n/canna -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.70 2011/10/05 19:28:09 aballier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.71 2012/05/17 05:30:44 naota Exp $ + + 17 May 2012; Naohiro Aota <naota@gentoo.org> canna-3.7_p3-r2.ebuild: + Add missing dependencies. Respect LDFLAGS. Set VARTEXFONTS=${T}/fonts #223077 05 Oct 2011; Alexis Ballier <aballier@gentoo.org> canna-3.7_p2.ebuild, canna-3.7_p3.ebuild, canna-3.7_p3-r1.ebuild, canna-3.7_p3-r2.ebuild: diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild index 763f54681dcf..01b7c938caee 100644 --- a/app-i18n/canna/canna-3.7_p3-r2.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r2.ebuild,v 1.3 2011/10/05 19:28:09 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r2.ebuild,v 1.4 2012/05/17 05:30:44 naota Exp $ inherit cannadic eutils multilib @@ -19,7 +19,13 @@ IUSE="doc" DEPEND=">=sys-apps/sed-4 x11-misc/gccmakedep x11-misc/imake - doc? ( >=dev-texlive/texlive-langcjk-2010 )" + doc? ( + app-text/ghostscript-gpl + >=dev-texlive/texlive-langcjk-2010 + dev-texlive/texlive-fontsextra + dev-texlive/texlive-genericrecommended + dev-texlive/texlive-latexrecommended + )" RDEPEND="" S="${WORKDIR}/${MY_P}" @@ -53,21 +59,24 @@ src_compile() { #make libCannaDir=../lib/canna canna || die # bug #279706 emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" canna || die + LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die if use doc ; then einfo "Compiling DVI, PS (and PDF) document" cd doc/man/guide/tex xmkmf || die emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" canna.dvi canna.ps || die + LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \ + JLATEXCMD=platex \ + DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \ + canna.dvi canna.ps || die if has_version 'app-text/dvipdfmx' && \ ( has_version 'app-text/acroread' \ || has_version 'app-text/xpdf-japanese' ); then emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \ - LOCAL_LDFLAGS="${LDFLAGS}" JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" \ + LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \ + JLATEXCMD=platex \ + DVI2PSCMD="dvips -f" VARTEXFONTS=${T}/fonts \ canna.pdf || die fi fi |