Version bump with a patch grabbed from debian to build against latest pcre-ocaml

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

4 files changed, 155 insertions, 7 deletions

diff --git a/www-servers/ocsigen/ChangeLog b/www-servers/ocsigen/ChangeLog
index b3ac0b1f31b4..eb957b2953b5 100644
--- a/www-servers/ocsigen/ChangeLog
+++ b/www-servers/ocsigen/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/ocsigen
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.24 2008/09/25 13:24:50 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.25 2009/09/19 11:59:41 aballier Exp $
+
+*ocsigen-1.2.0 (19 Sep 2009)
+
+  19 Sep 2009; Alexis Ballier <aballier@gentoo.org> +ocsigen-1.2.0.ebuild,
+  +files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch:
+  Version bump with a patch grabbed from debian to build against latest
+  pcre-ocaml
 
   25 Sep 2008; Alexis Ballier <aballier@gentoo.org> ocsigen-1.1.0.ebuild:
   keyword ~x86-fbsd
diff --git a/www-servers/ocsigen/Manifest b/www-servers/ocsigen/Manifest
index dcb180f6f16b..7492b800404d 100644
--- a/www-servers/ocsigen/Manifest
+++ b/www-servers/ocsigen/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX ocsigen-1.2.0-pcre-ocaml-6.0.0.patch 1174 RMD160 fe77b70a2bc6338a5196b518e4cf9f5de0c5ca8a SHA1 de1db6a90ff544a66c3f107597620bbeb7a075f4 SHA256 93c8b2d0adb1aac3b30c03e29bc200e69a629ce20ba146237a275700efe02ed0
 AUX ocsigen.confd 335 RMD160 7196593f5d8ec7b40488771bdf0f60a904eca476 SHA1 e896da5ae6ef2da8f6a375bddbc2dad4c0c26fa8 SHA256 19be530156391d674a4db516303ff614e897a38e50bbff065ddcbf897d0feb8d
 AUX ocsigen.initd 870 RMD160 c259ad550e2c521c31afe772d6b1bc0c217d8827 SHA1 a294deab42e24e098a96158249ad0cd90d086cd3 SHA256 846ac84dfd83adbaaba67c7d3c59878aea5ebeac96d436521df9a012e46d00c9
 DIST ocsigen-1.1.0.tar.gz 683710 RMD160 48850062baba8a8ae87a736dc922c6a34695204d SHA1 5d1b9aca14a9844f83643424433163336bb5dbd5 SHA256 9cad514c1162eaee8a48de0acb58c061eca8777fdc0eed0538ebd09f844ebcd2
+DIST ocsigen-1.2.0.tar.gz 685291 RMD160 bddabaf108e428359b55c0b7a7c76fe1bb19e4fa SHA1 6f16c238253a6bb81ef30748dbc6b165b3acedb8 SHA256 79ce4b00a0c8639321dcd354419689db84bb343f2f0848b3885fa865d7c125c3
 EBUILD ocsigen-1.1.0.ebuild 2491 RMD160 8314c0ca4acf3ad9fbbebc2f1320406ebdd46431 SHA1 78b756e04d317bb3df584077cfa6061354f0250c SHA256 612fb9fe03a2d829fe067965f3a588ba2849f53b34f28123f124103efc801420
-MISC ChangeLog 3214 RMD160 06e434839305d208cfa744821cf9f42ee15758f0 SHA1 58c5e16dbe473311c16e8c7e0b47564bf2b96f05 SHA256 b33df28990449008c665d9dea5599140a6f094a84f36e5077ac25b91f39f0941
+EBUILD ocsigen-1.2.0.ebuild 2659 RMD160 75e6a0cfca0141895a9f7633bfbdd19339103faa SHA1 f0067b3f942abd994dee9bbbea3cdec86ea929f6 SHA256 f2101297d96b11d1dd41857e16b4cf3e3aa79c6ac994f94c659501f5bcc88324
+MISC ChangeLog 3452 RMD160 7e4fd46fdb468313c4b7530c6a5662d690f41edf SHA1 06b194db3e23eeef32cd67c5c30ae57a0f2d8295 SHA256 8ed2a55e269a523001bc65cd0dcf6e72929be42dae66fbf3c4f1be0acd92db15
 MISC metadata.xml 954 RMD160 31edbdaf8fcc1fbb7f58b559717def731c5af262 SHA1 535650460fb02456232fec59358b3b9cb8b332d1 SHA256 c1f72e4998ecfe6fde39e1774aeebaa768ffca641bb93ceadf66edc0602838c7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjbkScACgkQvFcC4BYPU0oPlACfZs3uIuh9EPxSAL53OlHm66f1
-c8EAoIhHCDdXtSCSS38iUCEhWH+xocpV
-=i4/E
+iEYEARECAAYFAkq0x7MACgkQvFcC4BYPU0pwiACeNg9TB7kdCrcLIvi04NpjyBt0
+QC0An3FLaARV6Pw1jSXYxEBBssNyoKqK
+=gfcR
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigen/files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch b/www-servers/ocsigen/files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch
new file mode 100644
index 000000000000..16535ad1b790
--- /dev/null
+++ b/www-servers/ocsigen/files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch
@@ -0,0 +1,31 @@
+From: Stephane Glondu <steph@glondu.net>
+Date: Sat, 13 Jun 2009 02:21:56 +0200
+Subject: [PATCH] Fix for pcre-ocaml 6.0.0
+
+Upstream notified.
+---
+ extensions/staticmod.ml |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/staticmod.ml b/extensions/staticmod.ml
+index d2250ae..aac17d5 100644
+--- a/extensions/staticmod.ml
++++ b/extensions/staticmod.ml
+@@ -188,14 +188,14 @@ let parse_config userconf : parse_config_aux = fun _ _ _ ->
+ 
+       | ("regexp", s)::l when opt.opt_regexp = None ->
+           let s = try Netstring_pcre.regexp ("^"^s^"$")
+-           with Pcre.BadPattern _ ->
++           with Pcre.Error (Pcre.BadPattern _) ->
+              bad_config ("Bad regexp \""^s^"\" in <static regexp=\"...\" />")
+           in
+           parse_attrs l { opt with opt_regexp = Some s }
+ 
+       | ("code", c)::l when opt.opt_code = None ->
+           let c = try Netstring_pcre.regexp ("^"^c^"$")
+-           with Pcre.BadPattern _ ->
++           with Pcre.Error (Pcre.BadPattern _) ->
+              bad_config ("Bad regexp \""^c^"\" in <static code=\"...\" />")
+           in
+           parse_attrs l { opt with opt_code = Some c }
+-- 
diff --git a/www-servers/ocsigen/ocsigen-1.2.0.ebuild b/www-servers/ocsigen/ocsigen-1.2.0.ebuild
new file mode 100644
index 000000000000..8fead0f0381a
--- /dev/null
+++ b/www-servers/ocsigen/ocsigen-1.2.0.ebuild
@@ -0,0 +1,107 @@
+# 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.0.ebuild,v 1.1 2009/09/19 11:59:41 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
+		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"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-pcre-ocaml-6.0.0.patch"
+}
+
+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
+}