version bump

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

3 files changed, 84 insertions, 5 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index df7d3ee74104..21b8d4af8bc9 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.42 2010/11/07 16:58:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.43 2010/11/24 15:09:11 aballier Exp $
+
+*ocamlnet-3.1 (24 Nov 2010)
+
+  24 Nov 2010; Alexis Ballier <aballier@gentoo.org> +ocamlnet-3.1.ebuild:
+  version bump
 
   07 Nov 2010; Alexis Ballier <aballier@gentoo.org>
   -ocamlnet-3.0_beta1.ebuild, -ocamlnet-3.0_beta2.ebuild:
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 761cb82e589e..38d6c5a37c7f 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.0.3.tar.gz 2562692 RMD160 66621f4221dd83a1ab1df1ff4332ab2a70ad05b1 SHA1 27820378252e146f7469537a604697ffdc92b02a SHA256 fff5c9fcd4018961f577a85be4df7f6cc25934b619db157588b2447c0b186155
+DIST ocamlnet-3.1.tar.gz 2572525 RMD160 5573ec38f276d75bbec70ba40775c9505ff1d635 SHA1 3bdd27658693f56437cc9222b649d633738f4667 SHA256 c5a58d468c8aedc7854324373911468ba5ef33a75d26a9a0910435054811ac4d
 EBUILD ocamlnet-2.2.9-r1.ebuild 1633 RMD160 3f5062d71a785117681a9ba5766bea0db0095a17 SHA1 ee0ab29b9e61abd35ddcf455a3b0de84992a491b SHA256 3278ac58abcf655aa9ab3ff4c2c8c1aeff58be82867db51af6290bb3a48221e6
 EBUILD ocamlnet-3.0.3.ebuild 1631 RMD160 3024dd5c5c9c8b818dae3f53b2f107fdaea36057 SHA1 6fd9160f01c5d421a012755953bdda5a3661847e SHA256 8c5f49579c304c8b6be0fb4e9557690ef1ba26f70b79f9b29d8e2122f430aa37
-MISC ChangeLog 5550 RMD160 a9c34688effd63d3791687efc2af4aef58dba804 SHA1 d19bb14a0bd694fd0dafe6e1de5ea59cdc9c5c96 SHA256 2ec6eeb1fd49822983cc0028cd2729c2dc9d5366a84e160c6566c945d1506b29
+EBUILD ocamlnet-3.1.ebuild 1629 RMD160 4c63df0f3214d041b4adb68dcbaa99d18b67fc82 SHA1 06132dda65d3660bed9dab5a521581b562089a8f SHA256 295c125f4542d17ab98673c35cccc9db16d413b2b93d9f97df0f59b341d01354
+MISC ChangeLog 5669 RMD160 3527d34f6c3acf8265707109c587e8ba6a89f800 SHA1 a7c58242b2b9a715729c562ee028b8bbba433507 SHA256 8c81d81cf5ea848bd294f9107d7c742c1d4973ad8f0886996cdc5069cccc7830
 MISC metadata.xml 329 RMD160 671595a76989198aaab2de2fefffc3129649c7b2 SHA1 0b57c22cf6c33808b79d6b7d5b1456b8218d9f9c SHA256 299c9229ef86f9e948f0126eb542a18d5ffa76d9876fada7e093257d4f417bdb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzW2rkACgkQvFcC4BYPU0ozAQCfciIEChH+/ApJH4mHlKADctpF
-K6wAnjXM5OyI7ZN1YfBFF0S1VktVz0YA
-=u8JM
+iEYEARECAAYFAkztKp0ACgkQvFcC4BYPU0qi4QCeL1i8RQLatLI4ApWhj067uG1e
+kAwAniL3fiTh2QQcLYOdqcsxz92ARHg8
+=1sx9
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlnet/ocamlnet-3.1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.1.ebuild
new file mode 100644
index 000000000000..b4ebc3597244
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-3.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.1.ebuild,v 1.1 2010/11/24 15:09:11 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 ~ppc ~x86 ~x86-fbsd"
+IUSE="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?]
+		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 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
+}