diff options
| author |   Thomas Anderson <gentoofan23@gentoo.org> | 2009-03-07 14:09:07 +0000 |
|---|---|---|
| committer | Thomas Anderson <gentoofan23@gentoo.org> | 2009-03-07 14:09:07 +0000 |
| commit | b124e3a9921a9be6a861c2af4009f814057a5356 (patch) | |
| tree | 6a00ed1dddaa0a79725dceea78448791d5336fa1 /app-text/active-dvi | |
| parent | Remove obsolete version. (diff) | |
| download | gentoo-2-b124e3a9921a9be6a861c2af4009f814057a5356.tar.gz gentoo-2-b124e3a9921a9be6a861c2af4009f814057a5356.tar.bz2 gentoo-2-b124e3a9921a9be6a861c2af4009f814057a5356.zip | |
Transition to eapi 2 use deps
Diffstat (limited to 'app-text/active-dvi')
| -rw-r--r-- | app-text/active-dvi/ChangeLog | 8 | ||||
| -rw-r--r-- | app-text/active-dvi/active-dvi-1.7.3.ebuild | 40 |
2 files changed, 14 insertions, 34 deletions
diff --git a/app-text/active-dvi/ChangeLog b/app-text/active-dvi/ChangeLog index 66ce88c74564..df0be6035ba3 100644 --- a/app-text/active-dvi/ChangeLog +++ b/app-text/active-dvi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/active-dvi -# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/ChangeLog,v 1.26 2008/10/05 10:33:16 aballier Exp $ +# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/ChangeLog,v 1.27 2009/03/07 14:09:07 gentoofan23 Exp $ + + 07 Mar 2009; Thomas Anderson <gentoofan23@gentoo.org> + active-dvi-1.7.3.ebuild: + Transition to eapi 2 use deps 05 Oct 2008; Alexis Ballier <aballier@gentoo.org> active-dvi-1.7.3.ebuild: Add missing findlib dep, thanks Patrick, bug #239607 diff --git a/app-text/active-dvi/active-dvi-1.7.3.ebuild b/app-text/active-dvi/active-dvi-1.7.3.ebuild index 5d91d1b15acf..d7be8f09d409 100644 --- a/app-text/active-dvi/active-dvi-1.7.3.ebuild +++ b/app-text/active-dvi/active-dvi-1.7.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.7.3.ebuild,v 1.7 2008/10/05 10:33:16 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/active-dvi-1.7.3.ebuild,v 1.8 2009/03/07 14:09:07 gentoofan23 Exp $ -EAPI=1 +EAPI="2" inherit eutils autotools @@ -19,7 +19,7 @@ IUSE="+ocamlopt tk" SLOT="0" KEYWORDS="~amd64 ~ppc x86" -RDEPEND=">=dev-lang/ocaml-3.10.0 +RDEPEND=">=dev-lang/ocaml-3.10.0[ocamlopt?,tk?] >=dev-ml/camlimages-2.20-r2 virtual/latex-base virtual/ghostscript @@ -32,33 +32,6 @@ DEPEND="${RDEPEND} DOCS="README TODO" -pkg_setup() { - # warn those who have USE="tk" but no ocaml tk support - # because we cant force ocaml to be build with tk. - if use tk; then - if [ ! -d /usr/lib/ocaml/labltk ]; then - echo "" - ewarn "You have requested tk support, but it appears" - ewarn "your ocaml wasnt compiled with tk support, " - ewarn "so it can't be included for active-dvi." - echo "" - ewarn "Please stop this build, and emerge ocaml with " - ewarn "USE=\"tk\" ocaml" - ewarn "before emerging active-dvi if you want tk support." - echo "" - # give the user some time to read this, but leave the - # choice up to them - epause 8 - fi - fi - if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then - eerror "In order to build ${PN} with native code support from ocaml" - eerror "You first need to have a native code ocaml compiler." - eerror "You need to install dev-lang/ocaml with ocamlopt useflag on." - die "Please install ocaml with ocamlopt useflag" - fi -} - src_unpack() { unpack ${A} cd "${S}" @@ -66,9 +39,12 @@ src_unpack() { AT_M4DIR="." eautoreconf } -src_compile() { +src_configure() { export ADVI_LOC="/usr/share/texmf/tex/latex/advi" econf $(use_enable ocamlopt native-program) +} + +src_compile() { emake || die "emake failed" cd doc VARTEXFONTS="${T}/fonts" emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi || die "failed to create documentation" |