version bump

Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 90 insertions, 5 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index e63cb97dddc9..32a9ca4e0fae 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.91 2015/04/29 14:54:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.92 2015/06/29 09:06:44 aballier Exp $
+
+*ocamlnet-4.0.4 (29 Jun 2015)
+
+  29 Jun 2015; Alexis Ballier <aballier@gentoo.org> +ocamlnet-4.0.4.ebuild:
+  version bump
 
 *ocamlnet-4.0.3 (29 Apr 2015)
 
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 4e8db6cd0f4d..d405f2a590d4 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST ocamlnet-3.7.7.tar.gz 3357674 SHA256 5b8e464a874018c5e48fc1edc752b83e014061f19316b5b14df8422d939e7609 SHA512 b500a92e6c5dc4d96ac26352923d78cb3a8b555deda038c41860aecbd20ee9ccbcfee949014c91f1266c937ae03fadd72c322e3cbe6456d23fd20b871114df6a WHIRLPOOL ceb4a9fc5d43fe89487589ae14c4bdf58d6c3d99d3a9ebc07fa722e894106899a2ae2aca91a47338d8004017fdd0d23632e187d96ec51479b43955daddbbb893
 DIST ocamlnet-4.0.2.tar.gz 4604051 SHA256 586e10b00ab1a60eaa5a10dd9bcf51487c7b657b65f093a2afdf8f24d3389f31 SHA512 d28615fcef5b73d857e9e3f637195dbd787631997c5594a589a5b1192f2cb6e61a3271b4872045dbdee9074ca892731ce66fa5e0d9efcdda6f96319a0c6049a6 WHIRLPOOL f01a2165ebaff143f9cacce28c80721e2f7d11b1577a39bf18ddfa7483d72308d36395c32f12f9cabc3295e1c1eaaa813f4d8f96425cfc4876097656682164b7
 DIST ocamlnet-4.0.3.tar.gz 4334416 SHA256 d3b030715fe2c5f395ff9c08f0a8d3baa8830161300ba29e5aa8fabb92b182c1 SHA512 3d0900bc73325433af59718c0168d7e13f49c3d6d0d330826e9b1fbe8c9b97b5289c3f063e9523e3a25155d8ef54117a1d458509bb0073b05a6442525cd45a86 WHIRLPOOL 7db6ee225a269de5290fd4473b3d61b357a425a2f597e770158e54c9844de5fd2e0c556fb736fd8e0e66606b267251f6c932c79d63e1550f7da36c843767cd11
+DIST ocamlnet-4.0.4.tar.gz 4336176 SHA256 becaa6c2b0c1ae6a3fb05139928442e5d4a685ea5033017060a86d70114e5f72 SHA512 f3bce94d43161e46bf0973bfbe0d9d5d7232136a24a27b987ae371a7aab129720df35bd0d6ef75126d587ee1fde56fe29d05bc44840724adf3be50ac250e7c85 WHIRLPOOL 34985fa9a49a60d6e671645a73533d6284b87205d63956265e631195ab117afdc6b41347e72f92d8cab711aef35db0c78a8989c955507dac66e8174ec6cb0242
 EBUILD ocamlnet-3.7.7.ebuild 1791 SHA256 edfba70df9c96bf7e74555a1fac121ff3ba4d30ea69c19f63fc5e61f98fbaac7 SHA512 df3ec6b64918e475857fba79c5bbb4fa4dc673a35b5544c756cbcd36acc479565b6f1cb707268f764cd082cea72e9da18ecd2dca911d61c8efca4d2dc289ac8f WHIRLPOOL a8f3e5c8f296832d64827184ebebfb685649297d1f78383184419fb01ac6802b2a1eafd738558f7bf7fd3319895b7cde3d4db86461d59d2358ec22438fd92b1e
 EBUILD ocamlnet-4.0.2.ebuild 1807 SHA256 85968dab11b6e9a02960c13c68b6a4b12fa4459d2fbd4720e191fd2155216946 SHA512 6d2f2b1780b62b79b30cb48ca26b9146175306e4f9b7bb3572866eeca07c59420c88d87bf5a343cda01c088e5c8189c6cc608b970de954541b6d4699751a3452 WHIRLPOOL cd9a6b7967a17af2d7db980777a1e433d6c37c708e576ec4b6bad28012f95ba7f3f3a56926430aeb9d47ad35e6061720f10c784a08cc61ff55e74f54f2934a88
 EBUILD ocamlnet-4.0.3.ebuild 1807 SHA256 921fa8bc0b975acc7c9dd611ca41e0746886b43950614e1437872396ea44e473 SHA512 c8d009efdc3e72503666b3dc98518fdfb6781de1b1eaae4af19aa41ef70bf9bc55a70228ab45c8d513ec09e0e4a27dbd3c68744d2cd28e54c9d76b7807c05231 WHIRLPOOL 570e2794ec162e72cb8dbdb684103ffd650fd4f1e5f1b3f4bb8c21936c68f46b86808dc03780b4e5d713da692e820df7ee0152e1ff70500e86b8d3d940f4ec15
-MISC ChangeLog 11479 SHA256 f7ad395bd45f151ebe611fcdbacc37c7819668ecb7f3666c1ad8c2303bb719b1 SHA512 2efc6d787926179708bee818e839331c2214945452380112244a1ddd0978f5c085d2cc9ca20d2a5ba4bc19e0c893d5e7228d7069c3b3e93937c14e3d80fdf2e7 WHIRLPOOL ad7f47fb0f0820562adc75e3e95d3730add2ea8953afd249fd095ffa16f11c4b38d3228364dcc749aadfc7372070bc8855d88651d7c88324331fddd6f2a1c285
+EBUILD ocamlnet-4.0.4.ebuild 1807 SHA256 983999f55f9e46a756da330947b272020265dedf0897b60b065b11544e019465 SHA512 507b32249cce88e274f53c3101275cc94a29f2bac407b1c97fd55d0705abc6d6ee048a81564a2d25b0e296e98e03c94cbfc5d12a1ce6d60546c2f8701499f29e WHIRLPOOL 384ac45f257f743042f5c5bc5e4139b1b4839ae999bf0673a14e61698b4f396a67d1888de4a483496e0fc1e7024673f1e288a073cd74024b90be28ac15d57c61
+MISC ChangeLog 11602 SHA256 ad19ddb70d18bf8e1e8729014e4871529f0a62a3acd53e263f99701c2b92b676 SHA512 0e4e31b90238c3cf3263636ea6170a299cff214768e8a8e7b36c8c9a56d32ec9fa6da30d08d189df2e05d1e2244954fdb8f660196245510967f2783420b8346d WHIRLPOOL 6f5692eddc354d2f392444bd76a5c2ecc61da28346872af840c0c71086db9efad493ec29797d4807e88757870551c5d673d11610df664d79a42ee5b1a5339188
 MISC metadata.xml 419 SHA256 b8b5005c86a12de781987f6a36917a635b46469a5ef497d6fec80e3d8737e7fb SHA512 2b97106f579b12cfe3378530f9e409f436fb60dba4175ca8ca59e4fef48c25d8a8574876b34efbf08f822d7c394ecbdf17510f3864924d14e1151d0ef0ce5400 WHIRLPOOL 59856d3d135f4b61e511a1321b8178c8a82bb2b1989f00e751d61662d09cf4551a271eeafcf1f8a041f64bdd397db8526338ec9b859287d16070e97c170b51c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVA8KoACgkQvFcC4BYPU0rOlACeMNqLEc8QyvqJAd1+NKQQgDZb
-A5YAn2Ag9wXyIwcdFKdKF+LQyoQFUPsn
-=d8J2
+iEYEAREIAAYFAlWRCqUACgkQvFcC4BYPU0rXgQCfX37KezJfMANLNAG1p5pnY5/r
+kNcAn0Z9DKus/OR3QdjF8xHhNOy9eHPs
+=x5vH
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
new file mode 100644
index 000000000000..07ea1110463f
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-4.0.4.ebuild,v 1.1 2015/06/29 09:06:44 aballier Exp $
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+		pcre? ( >=dev-ml/pcre-ocaml-5:= )
+		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+		tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
+		ssl? ( net-libs/gnutls:= )
+		gtk? ( >=dev-ml/lablgtk-2:= )
+		kerberos? ( virtual/krb5 )
+		zip? ( dev-ml/camlzip:= )
+		"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	export STRIP_MASK="*/bin/*"
+	findlib_src_install
+}