eapi5 and add := dep on ocaml

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 28 insertions, 15 deletions

diff --git a/dev-tex/bibtex2html/ChangeLog b/dev-tex/bibtex2html/ChangeLog
index f1b3b3834770..99c42a336d36 100644
--- a/dev-tex/bibtex2html/ChangeLog
+++ b/dev-tex/bibtex2html/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tex/bibtex2html
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/ChangeLog,v 1.30 2012/06/12 12:46:57 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/ChangeLog,v 1.31 2013/08/19 14:02:21 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> bibtex2html-1.97.ebuild:
+  eapi5 and add := dep on ocaml
 
   12 Jun 2012; Alexis Ballier <aballier@gentoo.org> -bibtex2html-1.96.ebuild:
   remove old
diff --git a/dev-tex/bibtex2html/Manifest b/dev-tex/bibtex2html/Manifest
index 97c9e466ed4c..4c607f17e07b 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bibtex2html-1.88-destdir.patch 1401 SHA256 64da838742f8466670ac9cc5eae87001137e8dafe4e6a5bdfe936bde1eab940a SHA512 34a3f53f08a133f16987cdee2a87a13d767b9b83228996999fc5ee6726a7c99602a3865c6dfbd03ede014dfcada9cc4882e802eff7939083e7c110f1cf0e07e9 WHIRLPOOL f433cacb1ceca0e559776dba2c2ba827e44ef1154b51bb244c3b7bfa77d13b9d288c2d71301f93043f6d3dc622283a7f83e1d5991d27aa86a6c2036d6903caaf
 DIST bibtex2html-1.97.tar.gz 94887 SHA256 99b5b66a729fd2928ee4d9d7d8397e36b684def4be9ee2746233006501c8e314 SHA512 001611bd763e4d91a926bc230341983b7feb1dd59687e1d64896607be54b206878ba4e163750b2d3f88e2e16cdac53a0e2ea70cc6e7ccf57262e368a7b067208 WHIRLPOOL d4531578214f4f21b44572750bdb7a69fa456303ee0876576b09f91504163b7aa3a72f30d6074a684634348d74a1dde7cc8fbcec31019be44b75835a0251b715
-EBUILD bibtex2html-1.97.ebuild 1442 SHA256 c8bcb0895c360fb019030493f1e6800a8d8d8f85cd5b3d9fe6b0f2f9ffd19ddf SHA512 067cace7607e0243db133b794f5c4d0cdb2bb55df95e48e4a613939a81699a3915dedc632da10370e5a5ad3a181ae3ac725e8fba8dcfc5e8b4773e8493df15fb WHIRLPOOL 13c83e221b864cb6880eba05dd6febd591ca81317de63c19e429145ace543327b391297078e6f20cb431144cbd0cdd5b8cc677ca77ae4d16b088ad558942d40f
-MISC ChangeLog 4045 SHA256 fda6ffcd9437d3b66a52598e0c25e87d5fecda70173005c80022f200e4f2c485 SHA512 2ea54ea57e73043544e353cc09422ff60420684f4f10a9176d235b422bb16320b26a7764f571277cbe73331c9b0ab51d933b3a2c74c57ce318454decbb021d5a WHIRLPOOL b6f8b8a9139566050e49f114585808569e721301323c3f01537f54e55f32333268a565b3d7b9504aea2a323e537457ffb67dbf39b601e308943e1af44420bdeb
+EBUILD bibtex2html-1.97.ebuild 1356 SHA256 eac532d59895db9400eb40d6ab74b5c478257d5ef02a599f16d72a63d7b8ecee SHA512 b362820ba67240f8d1193a3522d6a1b68c2b3ca813dbadf2a342ba8177ebfb38e009396821863d836ae47e6dfad83d1f4c71f079f5a7c46a85258f02099ca742 WHIRLPOOL ec3b9cbd0def5d05265e3763cfbb2cdab0a88b74f6bd3bd40534599ad4f93a7fad94c1dddbb5ebc6b22ca0c071d867f56e04ec5781f16df365cb02ace25fd3cd
+MISC ChangeLog 4155 SHA256 a6cda54003aae120b4f7b1061f532ed21ddd82b07269ede0301027888177ec3e SHA512 0b2be1fbd4beb1361df7db2857a2ef9f3049ae1007fe5b20a8a4fbe484710a278d6597ed1097da5e3124d7c1b9aca38ee8431dc7bae2d9d8ddf0720a620a7256 WHIRLPOOL 62c1624f0e5f2adae9fa429df28c0e95e9dd6e66517bbd5484b973198ab884f9ea6534390f8b624ddfc71ea39d8d42fe34ae1af5d438969171477103dc1affd7
 MISC metadata.xml 172 SHA256 a5d330930445123a650096027217b27ed9a2b94516764f54adaa36a49204b054 SHA512 14ddd9a070f2f1975f6ee421076ed6e6ce1f7a4ecd7abd55cd5d9a6ae359a38d75db0f97e02af6e60297c040beb8cbaed3c85390228881bef42c6004cd4238d6 WHIRLPOOL 76784f40a8e0e7d2a914480778d497f08992fae006aea5844557b71f1a07da3632424077ac5d372774152f01a791d33ef3aab8b92029f834e7508e340a1e975a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlISJW8ACgkQvFcC4BYPU0pK6QCfV41wRdJwZfy9hObr2+L9DpOy
+tV0AoMdgdQOKC4PRJQx/H3nrOpuAAiL+
+=4k53
+-----END PGP SIGNATURE-----
diff --git a/dev-tex/bibtex2html/bibtex2html-1.97.ebuild b/dev-tex/bibtex2html/bibtex2html-1.97.ebuild
index e15b83e89b86..52cb944b73c3 100644
--- a/dev-tex/bibtex2html/bibtex2html-1.97.ebuild
+++ b/dev-tex/bibtex2html/bibtex2html-1.97.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.97.ebuild,v 1.3 2012/05/21 21:09:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/bibtex2html/bibtex2html-1.97.ebuild,v 1.4 2013/08/19 14:02:21 aballier Exp $
 
-EAPI=2
+EAPI=5
 
 inherit eutils
 
@@ -21,7 +21,7 @@ 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?]
+DEPEND=">=dev-lang/ocaml-3.10:=[ocamlopt?]
 	doc? ( virtual/latex-base
 		dev-texlive/texlive-latexextra
 		dev-tex/hevea )"
@@ -39,20 +39,20 @@ src_prepare() {
 src_compile() {
 	export VARTEXFONTS="${T}/fonts"
 	if use ocamlopt ; then
-		emake opt || die
+		emake opt
 	else
-		emake byte || die
+		emake byte
 	fi
 	if use doc; then
-		emake doc || die "failed to create doc"
+		emake doc
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "failed to install"
-	dodoc README CHANGES || die
+	emake DESTDIR="${D}" install
+	dodoc README CHANGES
 	if use doc; then
-		dodoc manual.pdf || die
-		dohtml manual.html || die
+		dodoc manual.pdf
+		dohtml manual.html
 	fi
 }