version bump

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

4 files changed, 89 insertions, 6 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 973f90229bbf..16f129dbde4a 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.46 2011/04/14 18:40:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.47 2011/04/14 19:05:09 aballier Exp $
+
+*ocamlnet-3.3.0_beta1 (14 Apr 2011)
+
+  14 Apr 2011; Alexis Ballier <aballier@gentoo.org>
+  +ocamlnet-3.3.0_beta1.ebuild, metadata.xml:
+  version bump
 
   14 Apr 2011; Alexis Ballier <aballier@gentoo.org> -ocamlnet-3.0.3.ebuild,
   -ocamlnet-3.1.ebuild, -ocamlnet-3.2.ebuild:
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index d0b22bbf85d1..958c7edcd1ca 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -5,14 +5,16 @@ AUX build_w_camlp5.dpatch 7584 RMD160 53e5def4617442a232ef146884c25c35067c9ef8 S
 AUX ocamlnet-2.2.9-glibc28.patch 367 RMD160 99d07978b0dddd5f4a7f36d88caf8a0a6364aca2 SHA1 c811c63f9f10126bff21f20ccc4476b43f001e61 SHA256 e266efc15186d88542fbdfe1ddc6500b9bd07c707c3b0b78911e1142d7828762
 DIST ocamlnet-2.2.9.tar.gz 1877257 RMD160 1299e1316e0547171089b0caaa9deb13c4c67c31 SHA1 ca073c60f86fede60d4c479e5589127010482804 SHA256 134530a4357879e095bdbbb5f21f78634a16ef4d787eb151676b7fee7e4c0dc9
 DIST ocamlnet-3.2.1.tar.gz 2732852 RMD160 dba1ac7005a6d0ae03a4dacf37f13eee55f3cfce SHA1 69bb8228ea5f8f7f258991b04196a555afe12e88 SHA256 3d68a178c172e2e68fbe0527b4224a07f5f61722515c7cecb1d77b1a96436ef0
+DIST ocamlnet-3.3.0test1.tar.gz 3029286 RMD160 81458773d7e9ddd2799937c528d8f79e20aae26e SHA1 1f77962633ad6ee4f288cc61abe24d78a68498b7 SHA256 9f19d57f76eb8b18f38b64e4a883dc080f0e8883da131aba36df54e27c73477f
 EBUILD ocamlnet-2.2.9-r1.ebuild 1633 RMD160 3f5062d71a785117681a9ba5766bea0db0095a17 SHA1 ee0ab29b9e61abd35ddcf455a3b0de84992a491b SHA256 3278ac58abcf655aa9ab3ff4c2c8c1aeff58be82867db51af6290bb3a48221e6
 EBUILD ocamlnet-3.2.1.ebuild 1631 RMD160 d9e86d09782a866f23d4c8d84719851b048380d7 SHA1 3b33459aab65c74ea7119753ee9a4f19ecf1e670 SHA256 60520441fe584d8257d9ba80d3a7f644a6833b73f65b34dfa60fdf69128ce5ee
-MISC ChangeLog 6047 RMD160 3623e4a251194030f5235613d8b9fd420ccc16ad SHA1 5d57889496b92f8feea9d3500c46cea0ae1eed50 SHA256 3bb167e2e30ad357d0fac345ae15d7723fab34f288836442ff6971314f29b38a
-MISC metadata.xml 329 RMD160 671595a76989198aaab2de2fefffc3129649c7b2 SHA1 0b57c22cf6c33808b79d6b7d5b1456b8218d9f9c SHA256 299c9229ef86f9e948f0126eb542a18d5ffa76d9876fada7e093257d4f417bdb
+EBUILD ocamlnet-3.3.0_beta1.ebuild 1720 RMD160 26aafda3075bc4a993944492430208f8f527aa22 SHA1 dc8c1565e037c10b14dd6a4fb0de78c492c1c06c SHA256 4b79ef15cd99070704334f54ad4bee2125a77d5353732078ae7dcfeac18c0af8
+MISC ChangeLog 6198 RMD160 8a50f1dcc63279e5a1f0652ae7648a0b6faccccc SHA1 4b04edad6e6febeb054e69263f98f079b8598971 SHA256 150003c6143744ca3eec171c0981459c86fbded3e9c5fd2e5d80f2425cbb06e8
+MISC metadata.xml 419 RMD160 1ccd28e42a80f3946a2b7d36fa5bfe0eb411520c SHA1 58a3938bf84b282b5d6ffccb9c1ee8964d05aed6 SHA256 b8b5005c86a12de781987f6a36917a635b46469a5ef497d6fec80e3d8737e7fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2nP7YACgkQvFcC4BYPU0o1MACfYqdX6RtUM4B6iJs+sgwdWbu9
-T/MAoMTKgUD6wyOmKenLB4sZYhvD7uzG
-=BJMp
+iEYEARECAAYFAk2nRWsACgkQvFcC4BYPU0p19ACbBDsmsq3OCWViZtNMBLZ65Ui2
+4GwAn1B579/jZq5yMdUi1BJ992G3Db5U
+=mwSu
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index a9af6c577fdf..6220a6cd728d 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<herd>ml</herd>
 <use>
+	<flag name='cryptokit'>Enables encryption support via <pkg>dev-ml/cryptokit</pkg></flag>
 	<flag name='httpd'>Enables net-httpd web server component</flag>
 	<flag name='zip'>Enables netzip support to read/write gzip data using object channels</flag>
 </use>
diff --git a/dev-ml/ocamlnet/ocamlnet-3.3.0_beta1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.3.0_beta1.ebuild
new file mode 100644
index 000000000000..465496725a15
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-3.3.0_beta1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.3.0_beta1.ebuild,v 1.1 2011/04/14 19:05:09 aballier Exp $
+
+EAPI="2"
+
+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="as-is GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="cryptokit gtk ssl tk httpd +ocamlopt zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+DEPEND=">=dev-ml/findlib-1.0
+		>=dev-ml/pcre-ocaml-5
+		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
+		cryptokit? ( dev-ml/cryptokit )
+		gtk? ( >=dev-ml/lablgtk-2 )
+		ssl? ( >=dev-ml/ocaml-ssl-0.4 )
+		zip? ( dev-ml/camlzip )
+		"
+RDEPEND="${DEPEND}"
+
+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 cryptokit crypto) \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable ssl ssl) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+}
+
+src_compile() {
+	emake -j1 all || die "make failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "make failed"
+	fi
+}
+
+src_install() {
+	export STRIP_MASK="*/bin/*"
+	findlib_src_install
+}