remove old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

4 files changed, 5 insertions, 202 deletions

diff --git a/www-servers/ocsigenserver/ChangeLog b/www-servers/ocsigenserver/ChangeLog
index e0660d8ea040..6b410ce144d8 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.11 2015/07/16 13:10:33 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigenserver/ChangeLog,v 1.12 2015/07/16 13:11:23 aballier Exp $
+
+  16 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+  -ocsigenserver-2.2.0.ebuild, -ocsigenserver-2.3.0.ebuild, -files/pcre.patch:
+  remove old
 
   16 Jul 2015; Alexis Ballier <aballier@gentoo.org>
   ocsigenserver-2.5-r1.ebuild, files/ocsigenserver.confd,
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
-}