Transition to eapi 2 use deps

3 files changed, 17 insertions, 47 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/Manifest b/app-text/active-dvi/Manifest
index bfe9485039f2..a75c14ab26b7 100644
--- a/app-text/active-dvi/Manifest
+++ b/app-text/active-dvi/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MISC ChangeLog 4066 RMD160 6c4163504daee45e911bf8d23c509a3af37e1937 SHA1 8556c045c9af3cfe52d4af85658ff61d1561e4ee SHA256 513a080a30c89431bc4ad0f9442abe8eb33e487e3d1d825a91b0ba3f2fab8791
+EBUILD active-dvi-1.7.3.ebuild 1952 RMD160 15bc4d96d95fb555393ba74e85fe3c07f85a844f SHA1 89c6c17c0e32f6a0c495f3ed55befc96f5ea5672 SHA256 ce46558cd49683526ad88618b8a28a671f4d8950c3740441ea9e53187b4b25c1
 AUX active-dvi-1.7.3-asneeded.patch 856 RMD160 08ef973f8b7616ad3d5674c9fbf3fd31959497ef SHA1 ee6bc65d63bef8239b570667d350cc1eb2631e7d SHA256 1a0816e3e3c9005f3799b4a52b4d62288c0cd8b6dcefc3cacd9afce8f8239c5a
-DIST advi-1.7.3.tar.gz 5220228 RMD160 722576131ae24850aa8ec7459ba2a0eea9b8e20b SHA1 17b7dfe42cb9ed4b434fb5c31b141854b269de48 SHA256 15cb3b50f6375ce725bce7a28ceb15076147d540cb76255264c76a91ae743a46
-EBUILD active-dvi-1.7.3.ebuild 2884 RMD160 2fa0d9767954c97807c48331d35eeec7854bfebe SHA1 7355ae68d3f9058b30d54cec79a6345ad41104ac SHA256 fd53496e3efc09bc4127ffb795229bc51a8fa7d73f79284577fbd3c1c206f94f
-MISC ChangeLog 3947 RMD160 79981c5869e6c3b8ca65110a9b32f981d68d3b06 SHA1 9e1baacde5760ecf1ff94ee3abd47a5f6731a919 SHA256 8326c95685657c491618bd29e4add9516d929b7c42fe55065e6cfcdeeeb77b02
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjol/EACgkQvFcC4BYPU0oobQCcDtDroC9YwtMzOr9WAJ37i+SX
-8+AAn3FD4IlB9g3yNsPcfHfpgrALJq+u
-=VF8+
------END PGP SIGNATURE-----
+DIST advi-1.7.3.tar.gz 5220228 RMD160 722576131ae24850aa8ec7459ba2a0eea9b8e20b SHA1 17b7dfe42cb9ed4b434fb5c31b141854b269de48 SHA256 15cb3b50f6375ce725bce7a28ceb15076147d540cb76255264c76a91ae743a46
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"