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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 76 insertions, 7 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/Manifest b/dev-tex/bibtex2html/Manifest
index f90d738cacdf..afa0d88b74e5 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX bibtex2html-1.88-destdir.patch 1401 RMD160 38fc945f3b4b53c69d3dea0db48009752a5ebf3a SHA1 eaa6b7e94bffad0f875cd46cf43fafc16d934c27 SHA256 64da838742f8466670ac9cc5eae87001137e8dafe4e6a5bdfe936bde1eab940a
 DIST bibtex2html-1.80.tar.gz 66757 RMD160 cdf980e3f16abfbd984f7c11eb09b35c0354de12 SHA1 8d8c71c067e64718bccd2a1aa55c6efe38e841b1 SHA256 5cdbe6edd798d6739f2f2c8b72422dec24004f175baf6607fcbb794a48136562
 DIST bibtex2html-1.94.tar.gz 84438 RMD160 d289af1fffc7578ac1bce259dca80b6825586eb3 SHA1 710ecf4e20f8dffabb0684222d7de3cf502cb691 SHA256 fc78c6ccb925f9b14177f99ca212c8335ba18949dcad8c61f14a398c934887aa
+DIST bibtex2html-1.95.tar.gz 87934 RMD160 b99db3af1854e092a85e6c419e5b25aefc0b0e2d SHA1 5958a23a917d25946f9f413e9aa7c6a9a56c7289 SHA256 88fd33be1f6e781881725dc82e5928b83097de539bdbc50f054c87bf2a7cf68c
 EBUILD bibtex2html-1.80.ebuild 877 RMD160 9fe7de381e58950844ac34dd253402381bb1bcf0 SHA1 83c7adcc495105536b60089c690134236f3e6b37 SHA256 45c4803f7e96ba46442ab95223e726ed4357192e4d9d31de0c3dcbff1c4240bf
 EBUILD bibtex2html-1.94.ebuild 1381 RMD160 f883e13cc489d18d7d5378ed809a680acabd9d1e SHA1 62b674208ed4fd2552a2664ee53bacdfde8e31f2 SHA256 03a24e9bf620910b5417c3c56e7a7ca4edace6767f1567334faeb790dd0945e3
-MISC ChangeLog 2745 RMD160 f7ae621eb6976e43db29280aed8751bd7698c00d SHA1 ff1e0caf436527857e10cb4a8c864f4bf59606fa SHA256 336669354637f652698600efe2d5cffdfe47a63df3aa4f36de8db863d8f8a22f
+EBUILD bibtex2html-1.95.ebuild 1567 RMD160 e7a88a8c9e7baa0e0a7c8835603745dfd2fd0a10 SHA1 1d33cb9c6645b36c628dd7c92daf21f051b71918 SHA256 49b8f2f1bbf295a56e6b7440645501ba3bdd4633497196f0ae83b16068543ac4
+MISC ChangeLog 2939 RMD160 f730f453b8c20c0b58ab5131f95d73e8af290f18 SHA1 3b1e621aed7369f3ce34214958f19de49cac082a SHA256 4dd2fefb89c143153ef14a1ed12193003d4f913ca447159387fc8fb5a0d0a82f
 MISC metadata.xml 172 RMD160 e2dfe7d8bfa960392476274b92f63c23decef85c SHA1 62dc1f53a2d8f353b2634c5d34a58873e780c408 SHA256 a5d330930445123a650096027217b27ed9a2b94516764f54adaa36a49204b054
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkrUGBcACgkQvFcC4BYPU0rxVQCgmMHR7FSIdwVilCh+vmDwUuh0
-p6YAoLoYU8PJrHFvABcLjI6Quvfx+Rx7
-=B0mU
+iEYEARECAAYFAkxZGQUACgkQvFcC4BYPU0qn0QCfcH2X5xK/gfW+dvYPlcT/5tZe
+i10AniFAdcpRpRJGeGdOv9F+iXN4sKSZ
+=hOAz
 -----END PGP SIGNATURE-----
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
+}