7 files changed, 9 insertions, 380 deletions
diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog
index 3a31609c301d..c3db495a0f39 100644
--- a/www-servers/ocsigenserver/ChangeLog
+++ b/www-servers/ocsigenserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/ocsigenserver
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.13 2015/07/16 13:12:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.14 2015/07/16 13:12:42 aballier Exp $
+
+  16 Jul 2015; Alexis Ballier <aballier@gentoo.org> -ocsigenserver-2.5.ebuild,
+  -ocsigenserver-2.5-r1.ebuild:
+  remove old
 
 *ocsigenserver-2.5-r2 (16 Jul 2015)
 
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
index fd1e356539f9..46ed151e542c 100644
--- a/www-servers/ocsigenserver/Manifest
+++ b/www-servers/ocsigenserver/Manifest
@@ -7,15 +7,13 @@ AUX lwt3.patch 3345 SHA256 6e74985ae6247909ee80546c16a810c10231cd3e3b10350e1e32e
 AUX ocsigenserver.confd 491 SHA256 c41f56ac7d4e0b0920d4a561ab855da20e1369c17fa5af49bf37e38e64d1fe04 SHA512 c48a502565eb0dbba52508227cfd45d1aa6cb4db04a7ad16af714eb7d7ddec7699a3bbb5b8c188a34d159c4c98c9961f862abf34cd0576341c4d2069c3b371ec WHIRLPOOL fae02a7ebd2e553c3e04752e119cb914505df178f6e262c1082a565c4ae07c9baced0bf28e829a1ae3ae20b5834d1559a68a5e69d830fd12d6ea656745b0b4f9
 AUX ocsigenserver.initd 1107 SHA256 ca006659d1606753086a522df3ed982f01f963ac6c00f2864cca542bd7772ba1 SHA512 e4fdb1e596b83072b429f141fde08397149022a37f83bdd17bce9ed7947c4cf970f0c7f5eafc642c1d880ee9a28ab9821a375dce4027f77886710a095ee7a2e9 WHIRLPOOL f9c718844ab3659a6036cbd612eac5c0b43e3aba5ad35a256a7271d8c84efd27b80877bd084b6eab871ce3a17ad27b2df7ab07515410148123cd9480614e698c
 DIST ocsigenserver-2.5.tar.gz 1259472 SHA256 d9107e0543a286b2264b0f4255886cdc3670196d5453a689da2985c7e5a7df2b SHA512 8d90ce99bdda2fefdc0d22497badfa885ff310801c6cc205e0360e823964b4b01a1fecef8549121647abfd113bfe45a0b6cb306a326b26657bd95fbafaa59e72 WHIRLPOOL 9feac8009a83520d3f82c3e4162d72cdff7e54b5077af63e1b04d63da0364035480de5a30f04f23c6124e0d4dd4c6c885687d2a24e00b1432b23d572bf90f13e
-EBUILD ocsigenserver-2.5-r1.ebuild 2216 SHA256 156135ab3058660e860257a00394917d1de50eb6e03c470ba2c999e5e540e68a SHA512 aa60661ab913d4ce73a823965a5f9f110079b44831ee5de4293b2ecfbac0b73595d16c7f3ed0a03982f8312703844f6f3018437e8ac3825cf9119faeddea6cbc WHIRLPOOL a5c84a0db8a868485d1488e0814e496629bc01511fed0befd1721321fa3a3148296c2a8abe92b0eee32432235ef06aed25f1561e3c2677cc8b1751bc4f093e1a
 EBUILD ocsigenserver-2.5-r2.ebuild 2216 SHA256 d291013720b899ed6e4cdefbd6a1dc1566b580976a5156c3224dee0c206742fc SHA512 65589292df8626f77a2bcd30729dd5cdbd36236830cb3fe2464cc443cd9a51eab4e1a2cd01c969a2c0db919c4c57241633c884700e14deb671bb14531cd62c9b WHIRLPOOL 1f411ef25a44ace2f214980358f728a9129c7f38cd7b6e492b46b9cb60096377c528bc99643c20875bef86455817f9c4d148748f0139a017e4fcc3c02b54fdbb
-EBUILD ocsigenserver-2.5.ebuild 1997 SHA256 d75460c3ea89e7f2c1abdedef36824e86f7988515f23e558197d48bd8f2f5974 SHA512 95e139d2d0fadbe056a948abff0cd3c1e987774e4b410907749b3b0244a04c3ce04c467b338c6f7423c262b47ce81a8ba39af073a0b75d3ca2d2c428701c595d WHIRLPOOL ee997a912ad6d7810d5ce73d07e1b6f10fd6d07a0f16528845d0b024461f32a08d469afc7a45a683c9d6e2058459239de03f7d9f971dabe7bed2e5583112198d
-MISC ChangeLog 2472 SHA256 2af09db4aad020d613a948b91c845956161d4a26ea5226f0fa15ddf2e1b03315 SHA512 1508abbc98f3563fc693e7928bc608caf6d6d0dffa809d6d2e11934794349f74fdca00d13ff518afe966a090bdccca5eae8d5f7243b79469a9e2a02a4866c2e2 WHIRLPOOL 3537fe0102920a5e6ef23ddb70ccdcffd3022fe2d9742f2b6320ad53a6a13b47340f5241e6a1707fb252dcab0365f29bf6f85703630b17a955abdca174e9474d
+MISC ChangeLog 2597 SHA256 556b121308eca82181ad47eb85315c14fd09132ed5ae8c5c2f63a507df4ce67b SHA512 f949bea17b1730b4fd5142e6b0a7e6260793fb1fb6a9bab0c30ea776fca75bd32069ff5aca595378bc2774cbf168e56b329936f789c00e84dc00232f54c0a49f WHIRLPOOL e3174da4659a104fb41432c2b2bc26137e19fdd51be94cf137bc95a239abd3ea5dcf87e9c6754481809c67167901a63d364b9eea87a27ade72ad7ba856b5d067
 MISC metadata.xml 242 SHA256 8ddcb2df52a0c680260c6121bfa4705e7c4f7355022359730f01272fef1bec2a SHA512 b782c7c3ad06bdab455982f32ae8226e92bcdb434d7a7bd65cc13c1fac1036a4a37a00ba5ca8c4a2b15767b023cdeb68ef6773cbba36f487f6c3664edc0a0a48 WHIRLPOOL 4c09451ce37971639c4b0e10b8faa5b266c83d15a8b74e909f555f2a1d1ed5efcec6e1b2748c732ac70302424209bba51a2abe5c96abe086343f38ce1c04a9f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWnragACgkQvFcC4BYPU0oNAwCeK06uoFQDNlOEoATlVZ8oByoD
-WLAAniEZl/P/qv7Eh1dhmvRhNtdiOdQR
-=koF+
+iEYEAREIAAYFAlWnrcsACgkQvFcC4BYPU0o70ACeN14+zKkfjbAShpR7OPxXdrjn
+H5UAn3t1vC1ncbcjfDMtEOkrPZGkCvy5
+=Q1AO
 -----END PGP SIGNATURE-----
diff --git a/www-servers/ocsigenserver/files/pcre.patch b/www-servers/ocsigenserver/files/pcre.patch
deleted file mode 100644
index 187b2b9c5994..000000000000
--- a/www-servers/ocsigenserver/files/pcre.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix build with ocamlnet built without -compat-pcre.
-
-Index: ocsigenserver-2.2.0/src/extensions/Makefile
-===================================================================
---- ocsigenserver-2.2.0.orig/src/extensions/Makefile
-+++ ocsigenserver-2.2.0/src/extensions/Makefile
-@@ -4,6 +4,7 @@ PACKAGE  := lwt.unix     \
- 	    lwt.ssl      \
- 	    lwt.react    \
-             netstring    \
-+	    netstring-pcre \
- 	    tyxml.parser \
- 
- LIBS     := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}}
-Index: ocsigenserver-2.2.0/configure
-===================================================================
---- ocsigenserver-2.2.0.orig/configure
-+++ ocsigenserver-2.2.0/configure
-@@ -414,6 +414,8 @@ check_library lwt.ssl   "Missing support
- 
- check_library netstring \
-     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
-+check_library netstring-pcre \
-+    "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
- check_library netsys \
-     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html"
- 
-Index: ocsigenserver-2.2.0/Makefile.options
-===================================================================
---- ocsigenserver-2.2.0.orig/Makefile.options
-+++ ocsigenserver-2.2.0/Makefile.options
-@@ -34,6 +34,7 @@ BASE_PACKAGE := lwt
- SERVER_PACKAGE := lwt.ssl           \
- 	          ${LWT_EXTRA_PACKAGE} \
- 	          netstring         \
-+	          netstring-pcre    \
-                   findlib           \
- 	          cryptokit         \
- 		  tyxml             \
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild
deleted file mode 100644
index 324b2800f873..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.2.0.ebuild,v 1.4 2014/09/01 16:43:52 mgorny Exp $
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-SRC_URI="http://ocsigen.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib"
-REQUIRED_USE="|| ( sqlite dbm )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.3.0:=[react,ssl]
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.0.1:=
-		>=dev-ml/tyxml-2.1:=
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dbm? ( || ( dev-ml/camldbm >=dev-lang/ocaml-3.12[gdbm] ) )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/pcre.patch"
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
-
-	dodoc README
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.3.0.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.3.0.ebuild
deleted file mode 100644
index 67a8eb5eeebf..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.3.0.ebuild,v 1.2 2014/09/01 16:43:52 mgorny Exp $
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-SRC_URI="http://ocsigen.org/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib"
-REQUIRED_USE="|| ( sqlite dbm )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.3.0:=[react,ssl]
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.0.1:=
-		>=dev-ml/tyxml-2.1:=
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dbm? ( || ( dev-ml/camldbm >=dev-lang/ocaml-3.12[gdbm] ) )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
-
-	dodoc README
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
deleted file mode 100644
index 807d0981b9d1..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.5-r1.ebuild,v 1.2 2015/07/16 13:10:33 aballier Exp $
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-SRC_URI="https://github.com/ocsigen/ocsigenserver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib"
-REQUIRED_USE="|| ( sqlite dbm )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl]
-		>=dev-ml/react-0.9.3:=
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.2.5:=
-		>=dev-ml/tyxml-3.3:=
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dev-ml/ocaml-ipaddr:=
-		dbm? ( || ( dev-ml/camldbm:= >=dev-lang/ocaml-3.12[gdbm] ) )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/lwt.patch"
-	epatch "${FILESDIR}/lwt2.patch"
-	epatch "${FILESDIR}/lwt3.patch"
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		--with-preempt \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
-
-	dodoc README
-
-	# We create it at runtime
-	rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.5.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.5.ebuild
deleted file mode 100644
index 74bd0ea9ddae..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ocsigenserver-2.5.ebuild,v 1.1 2014/12/01 10:04:01 aballier Exp $
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-SRC_URI="https://github.com/ocsigen/ocsigenserver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib"
-REQUIRED_USE="|| ( sqlite dbm )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.4.2:=[react,ssl]
-		>=dev-ml/react-0.9.3:=
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.2.5:=
-		>=dev-ml/tyxml-3.3:=
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dev-ml/ocaml-ipaddr:=
-		dbm? ( || ( dev-ml/camldbm:= >=dev-lang/ocaml-3.12[gdbm] ) )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die
-
-	dodoc README
-}