3 files changed, 118 insertions, 7 deletions
diff --git a/www-servers/ocsigen/ChangeLog b/www-servers/ocsigen/ChangeLog
index 6bd3d9446da3..d4d63ccd0be8 100644
--- a/www-servers/ocsigen/ChangeLog
+++ b/www-servers/ocsigen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/ocsigen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.29 2009/11/25 17:24:47 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.30 2011/01/20 23:55:24 aballier Exp $
+
+*ocsigen-1.3.4 (20 Jan 2011)
+
+  20 Jan 2011; Alexis Ballier <aballier@gentoo.org> +ocsigen-1.3.4.ebuild:
+  version bump
 
 *ocsigen-1.2.2 (25 Nov 2009)
 
diff --git a/www-servers/ocsigen/Manifest b/www-servers/ocsigen/Manifest
index d69fac156687..b994f48181d0 100644
--- a/www-servers/ocsigen/Manifest
+++ b/www-servers/ocsigen/Manifest
@@ -4,13 +4,15 @@ Hash: SHA1
 AUX ocsigen.confd 335 RMD160 7196593f5d8ec7b40488771bdf0f60a904eca476 SHA1 e896da5ae6ef2da8f6a375bddbc2dad4c0c26fa8 SHA256 19be530156391d674a4db516303ff614e897a38e50bbff065ddcbf897d0feb8d
 AUX ocsigen.initd 870 RMD160 c259ad550e2c521c31afe772d6b1bc0c217d8827 SHA1 a294deab42e24e098a96158249ad0cd90d086cd3 SHA256 846ac84dfd83adbaaba67c7d3c59878aea5ebeac96d436521df9a012e46d00c9
 DIST ocsigen-1.2.2.tar.gz 687604 RMD160 23d9a441e25461e016d78b17e25dea64c1cf88a5 SHA1 717f949f07970610ad32a5eb55b49bda9aa35600 SHA256 02d860da65fbe2f020ee6a3946920542fa1873dc47228ecb33945f80c68bd06e
+DIST ocsigen-1.3.4.tar.gz 783270 RMD160 47bc55ee41f66ffa6bd2e5127b735a2ac0ea0893 SHA1 5084b3c596c65a011a56ddbc6026674604d08aac SHA256 89939ef965541824de88a9002ac1924e3067c9e16331cfadfed731f6822c9fa2
 EBUILD ocsigen-1.2.2.ebuild 2601 RMD160 d46fe4f3a7c921e13e8ce554171bf24601530ed4 SHA1 de0e9f7797bee86abaf1b0b2b79399b6efa32e39 SHA256 0b5e586b6e2a7e634cb68b33faa1135f5cc52e8607708c46c88f9baece97f50f
-MISC ChangeLog 3944 RMD160 a00326eb7500689d609604f77a5e9d0e63fca897 SHA1 1ef0a04a6d3b69d07ce7704d84a0e2cb035110e5 SHA256 2e03ede60a6df9c0dc647901be74cc5557af4128cead74953d507c542a06a59a
+EBUILD ocsigen-1.3.4.ebuild 2604 RMD160 24753212c567b7e7201d0e7bc3411c1a907146ca SHA1 da4342e67a9dd352826446dd123d9f838c0cb709 SHA256 743c3ed7ca4aa1be73141dad8952d28b33176217c3126e31c5e1d83ed5e9e1a8
+MISC ChangeLog 4065 RMD160 f062e3da8de6d93ac891866a224a1044879746e9 SHA1 dc02db807360ef67bbfe4c754451327875579855 SHA256 7783be87f492c2b5040e0e5b0a0e695393d3ef04cb0416ffbe9fc848da90b51c
 MISC metadata.xml 954 RMD160 31edbdaf8fcc1fbb7f58b559717def731c5af262 SHA1 535650460fb02456232fec59358b3b9cb8b332d1 SHA256 c1f72e4998ecfe6fde39e1774aeebaa768ffca641bb93ceadf66edc0602838c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAksNaGUACgkQvFcC4BYPU0ob5gCfdzUxqPyWJf0z6XI942zLZa/j
-96YAn104NnKIS+fTJQ5sI3Jtlmf7eR1i
-=vpD5
+iEYEARECAAYFAk04y3IACgkQvFcC4BYPU0qMRQCaAljryHMLsYyDYkp55lkONJgt
+7eIAnRESEtQ5HTD4WJZQhxjGFURSmHU+
+=BUOA
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigen/ocsigen-1.3.4.ebuild b/www-servers/ocsigen/ocsigen-1.3.4.ebuild
new file mode 100644
index 000000000000..23706b65b353
--- /dev/null
+++ b/www-servers/ocsigen/ocsigen-1.3.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ocsigen-1.3.4.ebuild,v 1.1 2011/01/20 23:55:24 aballier Exp $
+
+EAPI=2
+
+inherit eutils findlib multilib
+
+DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
+HOMEPAGE="http://www.ocsigen.org"
+SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug ocamlduce doc dbm +ocamlopt sqlite zlib"
+RESTRICT="strip installsources"
+
+DEPEND="dev-ml/findlib
+		>=dev-ml/lwt-2.0.0_rc
+		zlib? ( >=dev-ml/camlzip-1.03-r1 )
+		dev-ml/cryptokit
+		dev-ml/obrowser
+		>=dev-ml/pcre-ocaml-6.0.1
+		>=dev-lang/ocaml-3.10.2[ocamlopt?]
+		!sqlite? ( !dbm? ( >=dev-lang/ocaml-3.10.2[gdbm] ) )
+		>=dev-ml/ocamlnet-2.2
+		>=dev-ml/ocaml-ssl-0.4
+		ocamlduce? ( >=dev-ml/ocamlduce-3.10.0 )
+		!dbm? ( dev-ml/ocaml-sqlite3 )
+		sqlite? ( dev-ml/ocaml-sqlite3 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup ocsigen
+	enewuser ocsigen -1 -1 /var/www ocsigen
+
+	use !dbm && use !sqlite \
+		&& ewarn "Neither dbm nor sqlite are in useflags, will enable sqlite as default"
+
+	use sqlite && use dbm \
+		&& ewarn "sqlite and dbm are both in useflags, will use only sqlite"
+}
+
+use_enable_default() {
+	if use $2; then
+		if use $1; then
+			echo "--enable-$2  --enable-$1"
+		else
+			echo "--enable-$2  --disable-$1"
+		fi
+	else
+		echo "--disable-$2  --enable-$1"
+	fi
+}
+
+has_dynlink() {
+	if has_version '>=dev-lang/ocaml-3.11' && use ocamlopt ; then
+		echo "--enable-natdynlink"
+	else
+		echo "--disable-natdynlink"
+	fi
+}
+
+src_configure() {
+	./configure \
+		--prefix /usr \
+		--temproot "${D}" \
+		--bindir /usr/bin \
+		--docdir /usr/share/doc \
+		--mandir /usr/share/man/man1 \
+		--extralibdir /usr/$(get_libdir) \
+		--examplesdir /usr/$(get_libdir) \
+		$(use_enable debug) \
+		$(use_enable ocamlduce) \
+		$(use_enable zlib camlzip) \
+		$(use_enable_default sqlite dbm) \
+		$(use_enable ocamlopt nativecode) \
+		$(has_dynlink) \
+		--ocsigen-group ocsigen \
+		--ocsigen-user ocsigen  \
+		--name ocsigen \
+		|| die "Error : configure failed!"
+}
+
+src_compile() {
+	emake -j1 depend || die "Error : make depend failed!"
+	emake -j1 || die "Error : make failed!"
+}
+
+src_install() {
+	if use doc ; then
+		emake -j1 install || die "Error : make install failed!"
+	else
+		emake -j1 installnodoc || die "Error : make install failed!"
+	fi
+
+	emake -j1 logrotate || die "Error : make logrotate failed!"
+
+	newinitd "${FILESDIR}"/ocsigen.initd ocsigen || die
+	newconfd "${FILESDIR}"/ocsigen.confd ocsigen || die
+
+	dodoc README
+}