Version bump for bug #225005, give it ocamlopt optional support, fix bug #174232, and add ~amd64

Package-Manager: portage-2.1.5.4

4 files changed, 135 insertions, 5 deletions

diff --git a/app-text/active-dvi/ChangeLog b/app-text/active-dvi/ChangeLog
index 93cd2f11f166..01bd89aa35ca 100644
--- a/app-text/active-dvi/ChangeLog
+++ b/app-text/active-dvi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2008/06/05 15:42:19 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/active-dvi/ChangeLog,v 1.18 2008/06/07 20:39:53 aballier Exp $
+
+*active-dvi-1.7.3 (07 Jun 2008)
+
+  07 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/active-dvi-1.7.3-asneeded.patch, +active-dvi-1.7.3.ebuild:
+  Version bump for bug #225005, give it ocamlopt optional support, fix bug
+  #174232, and add ~amd64
 
   05 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
   active-dvi-1.6.0-r1.ebuild:
diff --git a/app-text/active-dvi/Manifest b/app-text/active-dvi/Manifest
index fd72a57b7ada..1b7b87196fa2 100644
--- a/app-text/active-dvi/Manifest
+++ b/app-text/active-dvi/Manifest
@@ -2,17 +2,20 @@
 Hash: SHA1
 
 AUX active-dvi-1.6.0-warn-error.patch 9744 RMD160 d69cbf69334494815ad7785b13c3766e311ae6bb SHA1 2f222e772b28c21d0dc508aeab3b9b4d1ca97d66 SHA256 27ae283f6d98644c6c77f16b77f6fa7a83aac11bf46adf451f2341408cfcd404
+AUX active-dvi-1.7.3-asneeded.patch 856 RMD160 08ef973f8b7616ad3d5674c9fbf3fd31959497ef SHA1 ee6bc65d63bef8239b570667d350cc1eb2631e7d SHA256 1a0816e3e3c9005f3799b4a52b4d62288c0cd8b6dcefc3cacd9afce8f8239c5a
 DIST advi-1.4.0.tar.gz 4390953 RMD160 3f9205f12b04b76f6c6403b2037755aa9cd9f848 SHA1 580625328cb555bd97e8be3438d65fb396fc3457 SHA256 c8cf818b50cc6855933b9f5074e1d9e8e8f85ba53d63790c5195341a63a0412a
 DIST advi-1.6.0.tgz 11436152 RMD160 55bc5f2742964f29bc694997c3dd9573f8c71964 SHA1 8c033df906f3e208471506f64ffa0b175c1c5ee8 SHA256 ab77eb986987b4e6750e07e3a90f6bf58bea173eaeb2b1ebb0680d7545553e6b
+DIST advi-1.7.3.tar.gz 5220228 RMD160 722576131ae24850aa8ec7459ba2a0eea9b8e20b SHA1 17b7dfe42cb9ed4b434fb5c31b141854b269de48 SHA256 15cb3b50f6375ce725bce7a28ceb15076147d540cb76255264c76a91ae743a46
 EBUILD active-dvi-1.4.0.ebuild 2440 RMD160 64350e6286c82735b5703feceacb83d4f621789c SHA1 56de8710d212a19a6da143bd3d51d99c3d1f2d77 SHA256 fa88126f3f29a4b1277fc50c4d4acefc52105c8ec5975f6270f76fb4bc8042b3
 EBUILD active-dvi-1.6.0-r1.ebuild 2709 RMD160 126f7900e90a98b346ad5d337fefb7d4cb46d932 SHA1 6c4def4851cb5c60a88d1f0b59b99798f896fb96 SHA256 0d8bd3d0c98b4e1cc7fd2ac68c5ff9bf0497d1933ee5dd1a03cfb0b7783836a6
 EBUILD active-dvi-1.6.0.ebuild 2657 RMD160 842775e980b4d1f3ef1f561588da7d007c6183c4 SHA1 cf3005f326eb3564454422834a55553bcb134d42 SHA256 34705c09dca4cfc7f74caea99194b1fc42844bba369a85a44df179f0fdc9cec2
-MISC ChangeLog 2672 RMD160 038ed419c6c76a5b7737ff49e5643b6dea645e60 SHA1 f15edcc940b05e1074af90e9e089f66f7eea5c4d SHA256 24e74e7c05775e0408598339e33105c465b6c544f381a458536151ad2acec3af
+EBUILD active-dvi-1.7.3.ebuild 2755 RMD160 66e6219070c63b0f12a560694ead6a9ef5e11847 SHA1 9119159cbae5e83ad4b8d649a615c978e9186b01 SHA256 85c8c2177490de6404d32f66a53439584cec087d3ade9640ca086b75fb5e566e
+MISC ChangeLog 2930 RMD160 c4a8174a82dfd48edfd8cf1b85cc87620953c0a0 SHA1 9f6b9eacf1786aa441d1468b1ea7a6b7a0971e39 SHA256 720d8c84f7238bb288e450f886dc21cc3c7523702bd1ce8e8bf5c3ef59d4c8f1
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhICWAACgkQNQqtfCuFnePPdQCfey73UT5HHs3CcmIf3ry9x4O3
-nvQAn20+4XFADDDdS88muIFzHfNTGoJd
-=oErw
+iEYEARECAAYFAkhK8jQACgkQvFcC4BYPU0pbfgCfd0MgWwXjL/49hanJv1mc9ljD
+aRIAoIU1Cv1s/eauED/sggocS0HBUx+S
+=2Mbj
 -----END PGP SIGNATURE-----
diff --git a/app-text/active-dvi/active-dvi-1.7.3.ebuild b/app-text/active-dvi/active-dvi-1.7.3.ebuild
new file mode 100644
index 000000000000..dfcc5850af4c
--- /dev/null
+++ b/app-text/active-dvi/active-dvi-1.7.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2008 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.1 2008/06/07 20:39:53 aballier Exp $
+
+EAPI=1
+
+inherit eutils autotools
+
+MY_PN=${PN/ctive-/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A DVI previewer and a presenter for slides written in LaTeX"
+SRC_URI="http://pauillac.inria.fr/advi/${MY_P}.tar.gz"
+HOMEPAGE="http://pauillac.inria.fr/advi/"
+LICENSE="LGPL-2.1"
+
+IUSE="+ocamlopt tk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-lang/ocaml-3.10.0
+	>=dev-ml/camlimages-2.20-r1
+	virtual/latex-base
+	virtual/ghostscript
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto"
+
+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}"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	AT_M4DIR="." eautoreconf
+}
+
+src_compile() {
+	export ADVI_LOC="/usr/share/texmf/tex/latex/advi"
+	econf $(use_enable ocamlopt native-program)
+	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"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# now install the documentation
+	dodoc ${DOCS}
+	cd "${S}"/doc
+	dohtml *.{jpg,gif,css,html}
+	insinto /usr/share/doc/${PF}
+	doins manual.{dvi,pdf,ps} || die "failed to install documentation"
+	# and the manual page
+	doman advi.1
+	insinto /usr/share/texmf/tex/latex/advi
+	doins splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi || die "failed to install splashes"
+	export STRIP_MASK="*/bin/advi.byt"
+}
+
+pkg_postinst() {
+	einfo "Running texhash to complete installation.."
+	texhash
+}
+
+pkg_postrm() {
+	einfo "Running texhash to complete installation.."
+	texhash
+}
diff --git a/app-text/active-dvi/files/active-dvi-1.7.3-asneeded.patch b/app-text/active-dvi/files/active-dvi-1.7.3-asneeded.patch
new file mode 100644
index 000000000000..09d378485ea4
--- /dev/null
+++ b/app-text/active-dvi/files/active-dvi-1.7.3-asneeded.patch
@@ -0,0 +1,22 @@
+Index: advi-1.7.3/src/Makefile.am
+===================================================================
+--- advi-1.7.3.orig/src/Makefile.am
++++ advi-1.7.3/src/Makefile.am
+@@ -84,13 +84,13 @@ OCAMLLIBS_BYT	= $(CAMLIMAGES_LIBS_BYTE) 
+ 
+ advi$(EXEEXT): $(COBJS) $(OCAMLOPTOBJS)
+ 	$(OCAMLOPT) -o advi$(EXEEXT) \
+-		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) \
+-		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS)
++		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) \
++		$(COBJS) $(OCAMLLIBS_OPT) $(OCAMLOPTOBJS) $(AM_LINKFLAGS)
+ 
+ advi.byt$(EXEEXT): $(COBJS) $(OCAMLBYTOBJS)
+ 	$(OCAMLC) -o advi.byt$(EXEEXT) \
+-		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) $(AM_LINKFLAGS) -custom \
+-		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS)
++		$(OCAMLCFLAGS) $(AM_OCAMLCFLAGS) -custom \
++		$(COBJS) $(OCAMLLIBS_BYT) $(OCAMLBYTOBJS) $(AM_LINKFLAGS)
+ 
+ install_hook: $(INSTALLEXEC) installdata
+ 	- texhash