disable werror (fix build with ocaml-4), bug #442828

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

4 files changed, 30 insertions, 13 deletions

diff --git a/app-text/htmlc/ChangeLog b/app-text/htmlc/ChangeLog
index f90996653339..6e3fb60417ca 100644
--- a/app-text/htmlc/ChangeLog
+++ b/app-text/htmlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/htmlc
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/htmlc/ChangeLog,v 1.4 2012/07/24 10:51:37 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmlc/ChangeLog,v 1.5 2013/01/23 00:50:46 aballier Exp $
+
+  23 Jan 2013; Alexis Ballier <aballier@gentoo.org> htmlc-2.21.0.ebuild,
+  +files/htmlc-2.21.0-werror.patch:
+  disable werror (fix build with ocaml-4), bug #442828
 
   24 Jul 2012; Johannes Huber <johu@gentoo.org> htmlc-2.21.0.ebuild:
   Stable for x86, wrt bug #416525
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
index 361301dd4aeb..d2e94c38e977 100644
--- a/app-text/htmlc/Manifest
+++ b/app-text/htmlc/Manifest
@@ -2,18 +2,15 @@
 Hash: SHA256
 
 AUX htmlc-2.21.0-ocaml312.patch 654 SHA256 95fb6b9c2fe079f0306cf53ff4a2ca1466ad4a33b7c5ed99b44328d8dd368a04 SHA512 6be398a33047683cbaf11d30f1abbc9bff49b7bd68abd1eee12cf9170621c647d7a9486443af49e033da91a5b2248dad8c28e7b1202c0396c2739a9a4cb1a257 WHIRLPOOL e41bec453324273a53d40cf54fe2984dac46f3a4cabe1403b7a08169204f998f260d4d4044eeb261691e49e3cbf75f4a97dab36b118f3303883a7df30ec246e4
+AUX htmlc-2.21.0-werror.patch 521 SHA256 1780731be1d891c1bae548babea4ffdcd02c0f1ccea292659aea8f3d45781a5c SHA512 f501a3d6e6ab494772af3d38c190095a8e6d541efa54bb5809a42c07d89395c8c323172849b3aef4afc6b2a58e5fe65e9a93756899d4e4916308621c14f74e58 WHIRLPOOL 395f514e8ea9b2e027c4b476e2093510495c62b7cab877d6aa31301b0fbcf61ce550516d66dce285f89b1aa2c9ac75a0fc17aa33a1ce1db0a800a99220f31755
 DIST htmlc-2.21.0.tgz 118291 SHA256 eb56d8fd4a47df1c7f915b31aff19f74f405e498012c663e64c6704cf5a4cf88 SHA512 9ea42e9574dbfdad6ca4a1dc60d197652edba2afbe9f79d4e9703486339f4b6af07a407499810fa9a194eae3352e278122ff8570503f7afe12ab6253c5135ac7 WHIRLPOOL f3017c504a74f249dba153f90832fd0cd6244307574ffacc2141b107baaad9e2e8abeeff45c3e276cde480910751bf826d729090b6f770fb3ffb4b18fd6c7d73
-EBUILD htmlc-2.21.0.ebuild 1065 SHA256 3939f0dae5f1ddaf0a8fffe7a309bcda468f2f0b0f6f638a72aad9a5f1ac30ff SHA512 0b124ab614346c3c9695f2cb73208b5605d51c3e9f56c258b59b47bbbccdf1e966673f9afbf93052379400259e7d0ce685b874aa2ecb5ca4efb9abc23016e21f WHIRLPOOL ebb17ca48c031f9d2a246121126481171511969f7818afb3298938e0b23999e3997d36900fc97108ad2918e89cbb6923379b148dcf357699703287667f25f77b
-MISC ChangeLog 694 SHA256 fa768d8cedea21fed73402daf001c59d03d3ba057c317038f6625dd7db34a228 SHA512 1625178b9cc3d9439088584ac98c0164e0ed53a3bde9833f147025ce34223c395ac77f8700acd3292e58be4b5d4c0ea5654ba018b3d97eeb3a8e7a887f6562e6 WHIRLPOOL 002e033e7b9ea2eb4d80c50a259f68f63af95ec035c09208240bdf8785a6de1fd2bec179f37a787bc1038706080d7e46129ab15c75c5522eeccb2319fe1c3716
+EBUILD htmlc-2.21.0.ebuild 1109 SHA256 0bd3f004cd6d8a629d8326890005ea3a66cd9f148272b19c50085e68697e5677 SHA512 4aa7c7b97462fefb64b4733fa2916d39d8552f2fea93c16a094f59e2b8f6f4c1e876028269d82530056afd22ff758f89da8deda17ceb2d6c7698abffb5829259 WHIRLPOOL 027662924d70412d2e4047cd01a02370e12680d5c028a2f8d5a5953d9d612cd30172472f683defe26e21c134dd380f97a68fda7543383f42d5f9c0cd05d144bc
+MISC ChangeLog 863 SHA256 a60016f06017c5425a94ecf2607cb56be95b110c87c4b27227ff3bfa92fb0744 SHA512 905d7d6455a5b8fe42d2859de7dfe1b4b06eb70e67ff7cc52b53b440878e5e5892fbaca8c4a1c4b9fd3545f3641a2a40e7dc27986404ba5656035d3405852d68 WHIRLPOOL ff2299ced72bb4635be94e6cd8f4deb7cc738cef323009f9021b31b8423190f18b08316090613d8f6c54fd7496531b8164425cadb6d478d1e9908f45179f4072
 MISC metadata.xml 156 SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee SHA512 e8ee63fd086a54a8c1ff2cb6b8f976c894602e5185c08cb4853487bb266a3c30a122e1e53fa5801574093dbf087135238e1bb465ec491fce1b0d5c29274f2112 WHIRLPOOL 1bf739b8e8d41331e15ceef1b801643cd0ca79e3318e6eef7e927e8df7fa365b7893d2b4ee36db3776ce4a590fbfb1fb71fc2f1f5f66abf5ad3483840c9f4020
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQDn47AAoJEO+t9ga+3I3as3IH/REd0mLIRllRn3XPv2paTwVj
-yL85ik8FE/WFkz9xJHEZ+hbAlErmZWlZraMkwJzuC0CUFabpTrkAw98LKoYMSyib
-/b1knQv3mdqeeDW94D7Su6DrvjD0cr3x4mApnMWv6qzYwgES/JJt0MjBdjUxUPtx
-CR4/91g77qGRmY4Oi/jx89VrxWWYSVLW7Zjrnl2dt/tY1d41Xlsjg++T/sYrO23p
-CxDNVLIH+jxp2gxrqEVpMThf9Nl9plvdNyUSX/09B+Vth9L8wQpRXmrVdOHTgkDT
-HEsLUnBaOx3JeO7Mx1wbmZ4Mo3oTKTMfuEFsP5MFHKWNu+BZ45GiYc97SL0+FM8=
-=XdXm
+iEYEAREIAAYFAlD/M+cACgkQvFcC4BYPU0qd9QCgyhjukw6FDHNu1yvLOil84i/J
+xJ4AmgMd60lmbXy/PYkobwoazdMwQhBo
+=ITzi
 -----END PGP SIGNATURE-----
diff --git a/app-text/htmlc/files/htmlc-2.21.0-werror.patch b/app-text/htmlc/files/htmlc-2.21.0-werror.patch
new file mode 100644
index 000000000000..feb35f54b8df
--- /dev/null
+++ b/app-text/htmlc/files/htmlc-2.21.0-werror.patch
@@ -0,0 +1,15 @@
+Index: htmlc-2.21.0/config/Makefile.in
+===================================================================
+--- htmlc-2.21.0.orig/config/Makefile.in
++++ htmlc-2.21.0/config/Makefile.in
+@@ -35,8 +35,8 @@ MANDIR = \$(PREFIXINSTALLDIR)/man/man\$(
+ 
+ # The Caml compilers (those defaults should be OK)
+ CAMLDEP = ocamldep
+-CAMLBYT = ocamlc -w A -warn-error A -g
+-CAMLBIN = ocamlopt -w A -warn-error A -inline 10000
++CAMLBYT = ocamlc -w A -g
++CAMLBIN = ocamlopt -w A -inline 10000
+ CAMLYAC = ocamlyacc -v
+ CAMLLEX = ocamllex
+ 
diff --git a/app-text/htmlc/htmlc-2.21.0.ebuild b/app-text/htmlc/htmlc-2.21.0.ebuild
index 508c4f11d65b..5e58b1ff251a 100644
--- a/app-text/htmlc/htmlc-2.21.0.ebuild
+++ b/app-text/htmlc/htmlc-2.21.0.ebuild
@@ -1,6 +1,6 @@
-# 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/app-text/htmlc/htmlc-2.21.0.ebuild,v 1.4 2012/07/24 10:51:37 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/htmlc/htmlc-2.21.0.ebuild,v 1.5 2013/01/23 00:50:46 aballier Exp $
 
 EAPI=3
 
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	has_version '>=dev-lang/ocaml-3.12' && epatch "${FILESDIR}/${P}-ocaml312.patch"
+	epatch "${FILESDIR}/${P}-werror.patch"
 }
 
 src_configure() {