diff options
| -rw-r--r-- | app-i18n/canna/ChangeLog | 7 | ||||
| -rw-r--r-- | app-i18n/canna/canna-3.7_p2.ebuild | 48 | ||||
| -rw-r--r-- | app-i18n/canna/canna-3.7_p3-r1.ebuild | 46 |
3 files changed, 53 insertions, 48 deletions
diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog index eef5595f0b23..7eb9095cc449 100644 --- a/app-i18n/canna/ChangeLog +++ b/app-i18n/canna/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-i18n/canna # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.67 2010/01/31 15:39:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.68 2010/07/04 19:09:00 ssuominen Exp $ + + 04 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> canna-3.7_p2.ebuild, + canna-3.7_p3-r1.ebuild: + Remove USE="doc" to fix deptree for stable because of bugs 319509 and + 323559. 31 Jan 2010; Raúl Porcel <armin76@gentoo.org> canna-3.7_p3-r1.ebuild: sparc stable wrt #297441 diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild index dac50972b27e..bfa9d4e4cf98 100644 --- a/app-i18n/canna/canna-3.7_p2.ebuild +++ b/app-i18n/canna/canna-3.7_p2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.20 2009/12/31 21:39:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.21 2010/07/04 19:09:00 ssuominen Exp $ inherit cannadic eutils multilib @@ -13,12 +13,12 @@ SRC_URI="mirror://sourceforge.jp/canna/9558/${MY_P/_/}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" +IUSE="" DEPEND=">=sys-apps/sed-4 x11-misc/gccmakedep - x11-misc/imake - doc? ( app-text/ptex )" + x11-misc/imake" +# doc? ( app-text/ptex )" RDEPEND="" S="${WORKDIR}/${MY_P/_/}" @@ -47,21 +47,21 @@ src_compile() { #make libCannaDir=../lib/canna canna || die make canna || die - if use doc ; then - einfo "Compiling DVI, PS (and PDF) document" - cd doc/man/guide/tex - xmkmf || die - make JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" \ - canna.dvi canna.ps || die - if has_version 'app-text/dvipdfmx' && \ - ( has_version 'app-text/acroread' \ - || has_version 'app-text/xpdf-japanese' ); then - make JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" \ - canna.pdf || die - fi - fi + #if use doc ; then + # einfo "Compiling DVI, PS (and PDF) document" + # cd doc/man/guide/tex + # xmkmf || die + # make JLATEXCMD=platex \ + # DVI2PSCMD="dvips -f" \ + # canna.dvi canna.ps || die + # if has_version 'app-text/dvipdfmx' && \ + # ( has_version 'app-text/acroread' \ + # || has_version 'app-text/xpdf-japanese' ); then + # make JLATEXCMD=platex \ + # DVI2PSCMD="dvips -f" \ + # canna.pdf || die + # fi + #fi } src_install() { @@ -84,10 +84,10 @@ src_install() { dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS* - if use doc ; then - insinto /usr/share/doc/${PF} - doins doc/man/guide/tex/canna.{dvi,ps,pdf} - fi + #if use doc ; then + # insinto /usr/share/doc/${PF} + # doins doc/man/guide/tex/canna.{dvi,ps,pdf} + #fi newinitd "${FILESDIR}"/canna.initd canna || die newconfd "${FILESDIR}"/canna.confd canna || die diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild index e22e4188afd4..81dc1736997d 100644 --- a/app-i18n/canna/canna-3.7_p3-r1.ebuild +++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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-r1.ebuild,v 1.8 2010/01/31 15:39:36 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r1.ebuild,v 1.9 2010/07/04 19:09:00 ssuominen Exp $ inherit cannadic eutils multilib @@ -14,12 +14,12 @@ SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2" LICENSE="MIT" SLOT="0" KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" -IUSE="doc" +IUSE="" DEPEND=">=sys-apps/sed-4 x11-misc/gccmakedep - x11-misc/imake - doc? ( app-text/ptex )" + x11-misc/imake" +# doc? ( app-text/ptex ) RDEPEND="" S="${WORKDIR}/${MY_P}" @@ -54,21 +54,21 @@ src_compile() { # bug #279706 emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die - if use doc ; then - einfo "Compiling DVI, PS (and PDF) document" - cd doc/man/guide/tex - xmkmf || die - emake -j1 JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" \ - 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 JLATEXCMD=platex \ - DVI2PSCMD="dvips -f" \ - canna.pdf || die - fi - fi + #if use doc ; then + # einfo "Compiling DVI, PS (and PDF) document" + # cd doc/man/guide/tex + # xmkmf || die + # emake -j1 JLATEXCMD=platex \ + # DVI2PSCMD="dvips -f" \ + # 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 JLATEXCMD=platex \ + # DVI2PSCMD="dvips -f" \ + # canna.pdf || die + # fi + #fi } src_install() { @@ -91,10 +91,10 @@ src_install() { dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS* - if use doc ; then - insinto /usr/share/doc/${PF} - doins doc/man/guide/tex/canna.{dvi,ps,pdf} - fi + #if use doc ; then + # insinto /usr/share/doc/${PF} + # doins doc/man/guide/tex/canna.{dvi,ps,pdf} + #fi newinitd "${FILESDIR}"/${P}.initd canna || die newconfd "${FILESDIR}"/${P}.confd canna || die |