remove old

(Portage version: 2.2.0_alpha114/cvs/Linux x86_64)

6 files changed, 7 insertions, 419 deletions

diff --git a/dev-ml/ocamlnet/ChangeLog b/dev-ml/ocamlnet/ChangeLog
index 071cb8e7be7f..7d2650906729 100644
--- a/dev-ml/ocamlnet/ChangeLog
+++ b/dev-ml/ocamlnet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlnet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.60 2012/06/14 17:52:40 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ChangeLog,v 1.61 2012/06/30 18:16:20 aballier Exp $
+
+  30 Jun 2012; Alexis Ballier <aballier@gentoo.org>
+  -files/build_w_camlp5.dpatch, -ocamlnet-2.2.9-r1.ebuild,
+  -files/ocamlnet-2.2.9-glibc28.patch, -ocamlnet-3.2.1.ebuild,
+  -ocamlnet-3.4.1.ebuild:
+  remove old
 
   14 Jun 2012; Michael Weber <xmw@gentoo.org> ocamlnet-3.5.ebuild:
   ppc stable (bug 405959)
diff --git a/dev-ml/ocamlnet/files/build_w_camlp5.dpatch b/dev-ml/ocamlnet/files/build_w_camlp5.dpatch
deleted file mode 100644
index 885933479a73..000000000000
--- a/dev-ml/ocamlnet/files/build_w_camlp5.dpatch
+++ /dev/null
@@ -1,188 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## build_w_camlp5.dpatch by Stefano Zacchiroli <zack@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable building against camlp5 (the "classical" version of camlp4)
-
-@DPATCH@
-diff -urNad trunk~/Makefile.rules trunk/Makefile.rules
---- trunk~/Makefile.rules	2007-07-31 18:20:57.000000000 +0200
-+++ trunk/Makefile.rules	2007-09-08 12:42:33.000000000 +0200
-@@ -13,7 +13,7 @@
- OCAMLFIND = ocamlfind
- OCAMLYACC = ocamlyacc
- OCAMLLEX  = ocamllex
--CAMLP4    = camlp4
-+CAMLP4    = camlp5
- OCAMLMKLIB = ocamlmklib
- OCAMLDOC  = $(OCAMLFIND) ocamldoc
- 
-diff -urNad trunk~/src/equeue-gtk1/Makefile trunk/src/equeue-gtk1/Makefile
---- trunk~/src/equeue-gtk1/Makefile	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk1/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 
- INCLUDES += $(INC_EQUEUE)
- 
--PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
-+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
- 
- include $(TOP_DIR)/Makefile.rules
- 
-diff -urNad trunk~/src/equeue-gtk1/Makefile.pre trunk/src/equeue-gtk1/Makefile.pre
---- trunk~/src/equeue-gtk1/Makefile.pre	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk1/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -6,6 +6,6 @@
- 
- include ./Makefile.gtk
- 
--PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
-+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
- 
- include $(TOP_DIR)/Makefile.rules
-diff -urNad trunk~/src/equeue-gtk2/Makefile.pre trunk/src/equeue-gtk2/Makefile.pre
---- trunk~/src/equeue-gtk2/Makefile.pre	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/equeue-gtk2/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -6,7 +6,7 @@
- 
- include ./Makefile.gtk
- 
--PP_OPTIONS = -syntax camlp4o -package camlp4.macro $(GTK_DEFINES)
-+PP_OPTIONS = -syntax camlp5o -package camlp5.macro $(GTK_DEFINES)
- 
- include $(TOP_DIR)/Makefile.rules
- 
-diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile trunk/src/nethttpd-for-netcgi1/Makefile
---- trunk~/src/nethttpd-for-netcgi1/Makefile	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -8,7 +8,7 @@
- 	  nethttpd_engine.mli nethttpd_services.mli nethttpd_plex.mli
- 
- INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI1) $(INC_NETPLEX)
--PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
- 
- #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
- # do this to enable test coverage calculations
-diff -urNad trunk~/src/nethttpd-for-netcgi1/Makefile.pre trunk/src/nethttpd-for-netcgi1/Makefile.pre
---- trunk~/src/nethttpd-for-netcgi1/Makefile.pre	2007-09-08 12:42:32.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -6,6 +6,6 @@
- 
- INSTALL_EXTRA +=
- 
--PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
- 
- include $(TOP_DIR)/Makefile.rules
-diff -urNad trunk~/src/nethttpd-for-netcgi1/nethttpd_types.mli trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli
---- trunk~/src/nethttpd-for-netcgi1/nethttpd_types.mli	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi1/nethttpd_types.mli	2007-09-08 12:43:01.000000000 +0200
-@@ -117,10 +117,10 @@
-    *)
- 
- class redirected_environment : 
--        ?in_state : Netcgi1_compat.Netcgi_env.input_state ->
--        ?in_header : http_header ->
--        ?properties : (string * string) list ->
--        ?in_channel : Netchannels.in_obj_channel ->
-+        ?in_state: Netcgi1_compat.Netcgi_env.input_state ->
-+        ?in_header: http_header ->
-+        ?properties: (string * string) list ->
-+        ?in_channel: Netchannels.in_obj_channel ->
-         extended_environment ->
-           extended_environment
-   (** This class overlays the input-side containers of an existing environment.
-diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile trunk/src/nethttpd-for-netcgi2/Makefile
---- trunk~/src/nethttpd-for-netcgi2/Makefile	2007-07-31 18:20:59.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi2/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -9,7 +9,7 @@
- 	  nethttpd_intro.txt
- 
- INCLUDES += $(INC_EQUEUE) $(INC_NETSTRING) $(INC_NETCGI2) $(INC_NETPLEX)
--PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
- 
- #PP_OPTIONS_FINDLIB += -ppopt "-DTesting"
- # do this to enable test coverage calculations
-diff -urNad trunk~/src/nethttpd-for-netcgi2/Makefile.pre trunk/src/nethttpd-for-netcgi2/Makefile.pre
---- trunk~/src/nethttpd-for-netcgi2/Makefile.pre	2007-09-08 12:42:32.000000000 +0200
-+++ trunk/src/nethttpd-for-netcgi2/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- INSTALL_EXTRA +=
- 
--PP_OPTIONS = -package "camlp4, camlp4.macro" -syntax "camlp4o"
-+PP_OPTIONS = -package "camlp5, camlp5.macro" -syntax "camlp5o"
- 
- include $(TOP_DIR)/Makefile.rules
- 
-diff -urNad trunk~/src/netplex/Makefile trunk/src/netplex/Makefile
---- trunk~/src/netplex/Makefile	2007-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/Makefile	2007-09-08 12:42:33.000000000 +0200
-@@ -19,7 +19,7 @@
- ALLMT_EXTRA = netplex_mt.cmo
- OPTMT_EXTRA = netplex_mt.cmx
- 
--PP_OPTIONS = -syntax camlp4o -package camlp4
-+PP_OPTIONS = -syntax camlp5o -package camlp5
- 
- OCAMLC_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
- OCAMLOPT_OPTIONS_FOR_netplex_mt.ml = $(THREAD)
-diff -urNad trunk~/src/netplex/Makefile.pre trunk/src/netplex/Makefile.pre
---- trunk~/src/netplex/Makefile.pre	2007-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/Makefile.pre	2007-09-08 12:42:33.000000000 +0200
-@@ -9,7 +9,7 @@
- INSTALL_EXTRA = netplex-packlist netplex_mt.cmo netplex_mt.cmx netplex_mt.o
- INSTOTHER = install-netplex-admin
- 
--PP_OPTIONS = -syntax camlp4o -package camlp4
-+PP_OPTIONS = -syntax camlp5o -package camlp5
- 
- include $(TOP_DIR)/Makefile.rules
- 
-diff -urNad trunk~/src/netplex/netplex_config.ml trunk/src/netplex/netplex_config.ml
---- trunk~/src/netplex/netplex_config.ml	2007-07-31 18:21:00.000000000 +0200
-+++ trunk/src/netplex/netplex_config.ml	2007-09-08 12:42:33.000000000 +0200
-@@ -29,7 +29,7 @@
-   and semi_parse_tree_list =
-     parser
-       | [< 'Kwd ";";
--	   tl = parse_tree_list;
-+	   tl = parse_tree_list
- 	>] -> tl
-       | [< >] -> []
- 	  
-@@ -47,7 +47,7 @@
-   and parse_rhs =
-     parser
-       | [< 'Kwd "=";
--	   v = parse_param_value;
-+	   v = parse_param_value
- 	>] ->
- 	  `Parameter v
-       | [< 'Kwd "{";
-diff -urNad trunk~/src/netstring/Makefile.def trunk/src/netstring/Makefile.def
---- trunk~/src/netstring/Makefile.def	2007-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/Makefile.def	2007-09-08 12:42:33.000000000 +0200
-@@ -46,7 +46,7 @@
- 	netchannels_tut.txt netmime_tut.txt netsendmail_tut.txt \
- 	netulex_tut.txt neturl_tut.txt
- 
--PP_OPTIONS = -package camlp4 -syntax camlp4o
-+PP_OPTIONS = -package camlp5 -syntax camlp5o
- 
- OCAMLC_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
- OCAMLOPT_OPTIONS_FOR_netstring_mt.ml = $(THREAD)
-diff -urNad trunk~/src/netstring/netmime.ml trunk/src/netstring/netmime.ml
---- trunk~/src/netstring/netmime.ml	2007-07-31 18:20:58.000000000 +0200
-+++ trunk/src/netstring/netmime.ml	2007-09-08 12:42:33.000000000 +0200
-@@ -579,7 +579,7 @@
- ;;
- 
- 
--let storage ?ro ?fin : store -> (mime_body * out_obj_channel) = function
-+let storage ?ro ?fin = function
-     `Memory ->
-       let body = new memory_mime_body_int ~ro_first:false ?ro "" in
-       let body_ch = body#open_value_wr() in
diff --git a/dev-ml/ocamlnet/files/ocamlnet-2.2.9-glibc28.patch b/dev-ml/ocamlnet/files/ocamlnet-2.2.9-glibc28.patch
deleted file mode 100644
index 622119e96f42..000000000000
--- a/dev-ml/ocamlnet/files/ocamlnet-2.2.9-glibc28.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: ocamlnet-2.2.9/src/rpc-auth-local/Makefile
-===================================================================
---- ocamlnet-2.2.9.orig/src/rpc-auth-local/Makefile
-+++ ocamlnet-2.2.9/src/rpc-auth-local/Makefile
-@@ -1,5 +1,6 @@
- TOP_DIR=../..
- 
-+CC_OPTIONS += -ccopt -D_GNU_SOURCE
- PKGNAME  = rpc-auth-local
- OBJECTS  = rpc_auth_local.cmo
- COBJECTS = rpclocal.o
diff --git a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
deleted file mode 100644
index 2a12e615270f..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-2.2.9-r1.ebuild,v 1.11 2009/09/28 16:43:22 betelgeuse Exp $
-
-EAPI="2"
-
-inherit eutils findlib
-
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="mirror://sourceforge/ocamlnet/${P}.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="gtk ssl tk httpd +ocamlopt"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-DEPEND=">=dev-ml/findlib-1.0
-		>=dev-ml/pcre-ocaml-5
-		>=dev-ml/camlp5-5.05
-		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
-		gtk? ( >=dev-ml/lablgtk-2 )
-		ssl? ( dev-ml/ocaml-ssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/build_w_camlp5.dpatch"
-	epatch "${FILESDIR}/${P}-glibc28.patch"
-}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-	    -bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable ssl ssl) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all || die "make failed"
-	if use ocamlopt; then
-		emake -j1 opt || die "make failed"
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-3.2.1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.2.1.ebuild
deleted file mode 100644
index e19a6124f52e..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-3.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.2.1.ebuild,v 1.3 2011/05/09 08:42:19 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-IUSE="gtk ssl tk httpd +ocamlopt zip"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-DEPEND=">=dev-ml/findlib-1.0
-		>=dev-ml/pcre-ocaml-5
-		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
-		gtk? ( >=dev-ml/lablgtk-2 )
-		ssl? ( >=dev-ml/ocaml-ssl-0.4 )
-		zip? ( dev-ml/camlzip )
-		"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-	    -bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable ssl ssl) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all || die "make failed"
-	if use ocamlopt; then
-		emake -j1 opt || die "make failed"
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}
diff --git a/dev-ml/ocamlnet/ocamlnet-3.4.1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.4.1.ebuild
deleted file mode 100644
index 6de147922996..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-3.4.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlnet/ocamlnet-3.4.1.ebuild,v 1.1 2011/11/02 15:05:41 aballier Exp $
-
-EAPI="2"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="as-is GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-DEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5 )
-		>=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
-		cryptokit? ( dev-ml/cryptokit )
-		gtk? ( >=dev-ml/lablgtk-2 )
-		ssl? ( >=dev-ml/ocaml-ssl-0.4 )
-		zip? ( dev-ml/camlzip )
-		"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-	    -bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable cryptokit crypto) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable ssl ssl) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all || die "make failed"
-	if use ocamlopt; then
-		emake -j1 opt || die "make failed"
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}