version bump

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 115 insertions, 5 deletions

diff --git a/www-servers/ocsigen/ChangeLog b/www-servers/ocsigen/ChangeLog
index f30dd7a2eb62..6ea5dc215c6a 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.26 2009/09/28 18:59:53 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.27 2009/10/13 06:57:44 aballier Exp $
+
+*ocsigen-1.2.1 (13 Oct 2009)
+
+  13 Oct 2009; Alexis Ballier <aballier@gentoo.org> +ocsigen-1.2.1.ebuild:
+  version bump
 
   28 Sep 2009; Alexis Ballier <aballier@gentoo.org> -ocsigen-1.1.0.ebuild:
   remove old
diff --git a/www-servers/ocsigen/Manifest b/www-servers/ocsigen/Manifest
index 6a9fc7f79ca4..b60e0f9a1f3b 100644
--- a/www-servers/ocsigen/Manifest
+++ b/www-servers/ocsigen/Manifest
@@ -5,13 +5,15 @@ AUX ocsigen-1.2.0-pcre-ocaml-6.0.0.patch 1174 RMD160 fe77b70a2bc6338a5196b518e4c
 AUX ocsigen.confd 335 RMD160 7196593f5d8ec7b40488771bdf0f60a904eca476 SHA1 e896da5ae6ef2da8f6a375bddbc2dad4c0c26fa8 SHA256 19be530156391d674a4db516303ff614e897a38e50bbff065ddcbf897d0feb8d
 AUX ocsigen.initd 870 RMD160 c259ad550e2c521c31afe772d6b1bc0c217d8827 SHA1 a294deab42e24e098a96158249ad0cd90d086cd3 SHA256 846ac84dfd83adbaaba67c7d3c59878aea5ebeac96d436521df9a012e46d00c9
 DIST ocsigen-1.2.0.tar.gz 685291 RMD160 bddabaf108e428359b55c0b7a7c76fe1bb19e4fa SHA1 6f16c238253a6bb81ef30748dbc6b165b3acedb8 SHA256 79ce4b00a0c8639321dcd354419689db84bb343f2f0848b3885fa865d7c125c3
+DIST ocsigen-1.2.1.tar.gz 670777 RMD160 1eea3ef5973249edcfefbac1f923907fd936c761 SHA1 c0256df3170ef2cf3c8feee4402d5e340aa872ea SHA256 43189a83f0f68f6e8009f389ed1b94fbc04184b07637783e337c47dfb3312904
 EBUILD ocsigen-1.2.0.ebuild 2659 RMD160 75e6a0cfca0141895a9f7633bfbdd19339103faa SHA1 f0067b3f942abd994dee9bbbea3cdec86ea929f6 SHA256 f2101297d96b11d1dd41857e16b4cf3e3aa79c6ac994f94c659501f5bcc88324
-MISC ChangeLog 3541 RMD160 8712ec4355c1282824237e2121dbd6498d8ec083 SHA1 d991943f648b3cbfa1bf70fbfa5b3d1b65fac704 SHA256 5c4a0251825b0ced0867cbf92a23fe65d6caf1e3bb5188680f5b34b57f091da4
+EBUILD ocsigen-1.2.1.ebuild 2601 RMD160 f5742d221670d99dfc06240575b1c23577254476 SHA1 741b9ed1bf395596d74e400fed879d2ad5efb123 SHA256 e7e8d3b7bc22e533e44ec4d17269b91dc8e3b05d5ca6b5afb6d1c3ca3fec7652
+MISC ChangeLog 3662 RMD160 7274dd9ffb624c369c0c91c5e1bf02d4d3adea12 SHA1 9e0a164b9382685a8ab85240f37f317a64f52732 SHA256 e178590da4c1e81474e111414e4fbcc4f5b65dee51b0fa43aff0343bcc99a80c
 MISC metadata.xml 954 RMD160 31edbdaf8fcc1fbb7f58b559717def731c5af262 SHA1 535650460fb02456232fec59358b3b9cb8b332d1 SHA256 c1f72e4998ecfe6fde39e1774aeebaa768ffca641bb93ceadf66edc0602838c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrBB68ACgkQvFcC4BYPU0rVEQCdHcV5aJzi7HeWsyLHEuk9J3Dc
-WuwAnRAoKk4/+5YpkMIN5sIahKi7dK/t
-=CPbc
+iEYEARECAAYFAkrUJO0ACgkQvFcC4BYPU0oWPwCglohtK7N2nyhwV/axmLGAkmNM
+afsAoMCB11oa04VKv81yLYMQ2609oidv
+=ylhy
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigen/ocsigen-1.2.1.ebuild b/www-servers/ocsigen/ocsigen-1.2.1.ebuild
new file mode 100644
index 000000000000..8d0d6dce9873
--- /dev/null
+++ b/www-servers/ocsigen/ocsigen-1.2.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ocsigen-1.2.1.ebuild,v 1.1 2009/10/13 06:57:44 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 ~x86 ~x86-fbsd"
+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/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
+}