Version bump, thanks Pierre.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.3 x86_64

3 files changed, 104 insertions, 5 deletions

diff --git a/www-servers/ocsigen/ChangeLog b/www-servers/ocsigen/ChangeLog
index 41b60d89114a..0e5c2640faf5 100644
--- a/www-servers/ocsigen/ChangeLog
+++ b/www-servers/ocsigen/ChangeLog
@@ -1,6 +1,11 @@
 # 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.20 2008/08/22 22:29:40 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.21 2008/09/02 21:37:40 aballier Exp $
+
+*ocsigen-1.1.0 (02 Sep 2008)
+
+  02 Sep 2008; Alexis Ballier <aballier@gentoo.org> +ocsigen-1.1.0.ebuild:
+  Version bump, thanks Pierre.
 
   22 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/www-servers/ocsigen/Manifest b/www-servers/ocsigen/Manifest
index 670cc981aa9b..e3ec3ce63d9b 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 fcf6fb9ee45441c4bf9b6adda4e8af54e62c0f8c SHA1 fa256f1c05a41ed47137c75b998f42613c128f7e SHA256 04e7ae1f912cdf6b83a82161d84a0dc4576c3b87544e5e5c1153e149bb37fca2
 DIST ocsigen-1.0.0.tar.gz 684837 RMD160 aece317a832ff41c404ea81adf2cdb31375fc43e SHA1 4c570c21fa27d4e682185b266a1e4ae05a72b642 SHA256 6cff0c3155e6aea21c58daa78fbb480f8ae5d8f62bf33684922e6f3b1450b9fd
+DIST ocsigen-1.1.0.tar.gz 683710 RMD160 48850062baba8a8ae87a736dc922c6a34695204d SHA1 5d1b9aca14a9844f83643424433163336bb5dbd5 SHA256 9cad514c1162eaee8a48de0acb58c061eca8777fdc0eed0538ebd09f844ebcd2
 EBUILD ocsigen-1.0.0.ebuild 2431 RMD160 ad6308ab9c180fe0b9a4cf92be44ef0cde472ac4 SHA1 e7ed969f298e5fe820361d1e251b69a50bffd7fc SHA256 ed651b1919e29755a15cc154cc3436cfc6c91331aa0829e992cf0416f5c37ab3
-MISC ChangeLog 2782 RMD160 914f1925e39bc823d113b74381ba98db213892f1 SHA1 40962e199508f637fd5e835b08f4b93aafc5ae7c SHA256 cb6d3976e951c4bde8f30d530085a888e31f267b98c2e361fc9452a0964a301a
+EBUILD ocsigen-1.1.0.ebuild 2481 RMD160 b55044cb4ea6e7541970214a0c3929f2784dc7a7 SHA1 2cbb813b216fb55a6d213df1c83bed5bdf0b7f9b SHA256 2c0f2b1838f645a885de114026a7178effa45195731079e3f2c179768ce9e2e8
+MISC ChangeLog 2921 RMD160 d2faba0f215a8532bdeb5718988bf2245466aa51 SHA1 5c39aa760f5ded2370c811ac02a52681bf1fd4f7 SHA256 00bee4e66856393a9252e3808c2bde3af1158a7a2b943dc60ab471caf5884e47
 MISC metadata.xml 954 RMD160 31edbdaf8fcc1fbb7f58b559717def731c5af262 SHA1 535650460fb02456232fec59358b3b9cb8b332d1 SHA256 c1f72e4998ecfe6fde39e1774aeebaa768ffca641bb93ceadf66edc0602838c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkivPdkACgkQoeSe8B0zEfy89ACfdJ/jnx5Y8RtEaZ4o/9e1WBF0
-TUoAnjucop6P1J8NVgzgpVyNulw2OLNI
-=sq46
+iEYEARECAAYFAki9sisACgkQvFcC4BYPU0oAnQCfQj1htpayCR+VjGfLMsNm6jOE
+KpAAoL693mvvrZyEN9VBScOY66UCXVdg
+=c4kx
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigen/ocsigen-1.1.0.ebuild b/www-servers/ocsigen/ocsigen-1.1.0.ebuild
new file mode 100644
index 000000000000..91fcd1d4738b
--- /dev/null
+++ b/www-servers/ocsigen/ocsigen-1.1.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ocsigen-1.1.0.ebuild,v 1.1 2008/09/02 21:37:40 aballier Exp $
+
+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"
+IUSE="debug ocamlduce doc dbm sqlite zlib"
+RESTRICT="strip installsources"
+
+DEPEND="dev-ml/findlib
+		dev-ml/lwt
+		zlib? ( >=dev-ml/camlzip-1.03-r1 )
+		dev-ml/cryptokit
+		>=dev-lang/ocaml-3.08.4
+		>=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"
+
+	if use !sqlite && use dbm && ! built_with_use dev-lang/ocaml gdbm; then
+		eerror "You need to compile dev-lang/ocaml with gdbm support"
+		eerror "in order to use ${PN} with dbm"
+		die "please reinstall dev-lang/ocaml with gdbm support"
+	fi
+}
+
+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
+}
+
+src_compile() {
+	./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) \
+		--ocsigen-group ocsigen \
+		--ocsigen-user ocsigen  \
+		--name ocsigen \
+		|| die "Error : configure failed!"
+	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
+}