version bump, add ocamlopt useflag, fix build with ocaml 3.12 (bug #331081)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 69 insertions, 2 deletions

diff --git a/dev-tex/bibtex2html/ChangeLog b/dev-tex/bibtex2html/ChangeLog
index 243ec1860f4a..ec2b95366d7e 100644
--- a/dev-tex/bibtex2html/ChangeLog
+++ b/dev-tex/bibtex2html/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tex/bibtex2html
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/ChangeLog,v 1.19 2009/10/13 06:02:57 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/ChangeLog,v 1.20 2010/08/04 07:38:39 aballier Exp $
+
+*bibtex2html-1.95 (04 Aug 2010)
+
+  04 Aug 2010; Alexis Ballier <aballier@gentoo.org>
+  +bibtex2html-1.95.ebuild:
+  version bump, add ocamlopt useflag, fix build with ocaml 3.12 (bug
+  #331081)
 
   13 Oct 2009; Alexis Ballier <aballier@gentoo.org>
   -bibtex2html-1.91.ebuild, -bibtex2html-1.92.ebuild:
diff --git a/dev-tex/bibtex2html/bibtex2html-1.95.ebuild b/dev-tex/bibtex2html/bibtex2html-1.95.ebuild
new file mode 100644
index 000000000000..dda2afa7b69a
--- /dev/null
+++ b/dev-tex/bibtex2html/bibtex2html-1.95.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.95.ebuild,v 1.1 2010/08/04 07:38:39 aballier Exp $
+
+EAPI=2
+
+inherit eutils
+
+IUSE="doc +ocamlopt"
+
+DESCRIPTION="A bibtex to HTML converter"
+SRC_URI="http://www.lri.fr/~filliatr/ftp/bibtex2html/${P}.tar.gz"
+HOMEPAGE="http://www.lri.fr/~filliatr/bibtex2html/"
+
+SLOT="0"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+RESTRICT="test"
+
+# With use doc we need a latex compiler to generate manual.pdf
+# hevea is used for manual.html
+# manual.tex needs fullpage.sty
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
+	doc? ( virtual/latex-base
+	|| ( dev-texlive/texlive-latexextra app-text/ptex )
+		dev-tex/hevea )"
+# We need tex-base for bibtex but also some bibtex styles, so we use latex-base
+RDEPEND="virtual/latex-base"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.88-destdir.patch"
+	# Avoid pre-stripped files
+	sed -i -e "s/strip/true/" Makefile.in
+	# Fix build with ocaml 3.12, bug #331081
+	has_version '>=dev-lang/ocaml-3.12' && sed -i 's/lstr/lcamlstr/' Makefile.in
+	# For make install
+	use ocamlopt || sed -i 's/= opt /= noopt /' Makefile.in
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	if use ocamlopt ; then
+		emake opt || die
+	else
+		emake byte || die
+	fi
+	if use doc; then
+		emake doc || die "failed to create doc"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "failed to install"
+	dodoc README CHANGES
+	if use doc; then
+		dodoc manual.pdf
+		dohtml manual.html
+	fi
+}