remove old

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 5 insertions, 139 deletions

diff --git a/www-servers/ocsigen/ChangeLog b/www-servers/ocsigen/ChangeLog
index 6ea5dc215c6a..c5a614e53f25 100644
--- a/www-servers/ocsigen/ChangeLog
+++ b/www-servers/ocsigen/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2009/10/13 06:57:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/ocsigen/ChangeLog,v 1.28 2009/10/16 11:43:25 aballier Exp $
+
+  16 Oct 2009; Alexis Ballier <aballier@gentoo.org> -ocsigen-1.2.0.ebuild,
+  -files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch:
+  remove old
 
 *ocsigen-1.2.1 (13 Oct 2009)
 
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
deleted file mode 100644
index 16535ad1b790..000000000000
--- a/www-servers/ocsigen/files/ocsigen-1.2.0-pcre-ocaml-6.0.0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 8fead0f0381a..000000000000
--- a/www-servers/ocsigen/ocsigen-1.2.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
-}