remove old

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

5 files changed, 6 insertions, 161 deletions

diff --git a/dev-ml/pgocaml/ChangeLog b/dev-ml/pgocaml/ChangeLog
index efd4bbef2118..15b6f7f8a244 100644
--- a/dev-ml/pgocaml/ChangeLog
+++ b/dev-ml/pgocaml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/pgocaml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pgocaml/ChangeLog,v 1.3 2013/07/22 01:10:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pgocaml/ChangeLog,v 1.4 2013/08/19 13:57:46 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> -pgocaml-1.6.ebuild,
+  -files/pgocaml-1.6-makefile.patch, -files/pgocaml-1.6-parallel-make.patch,
+  -files/pgocaml-1.6-test.patch:
+  remove old
 
 *pgocaml-1.7.1 (22 Jul 2013)
 
diff --git a/dev-ml/pgocaml/files/pgocaml-1.6-makefile.patch b/dev-ml/pgocaml/files/pgocaml-1.6-makefile.patch
deleted file mode 100644
index ba691fb45955..000000000000
--- a/dev-ml/pgocaml/files/pgocaml-1.6-makefile.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix depends for a test file in the Makefile
-
---- a/Makefile	2012-07-04 19:53:31.000000000 +0200
-+++ b/Makefile	2012-09-10 14:24:48.502757692 +0200
-@@ -19,7 +19,7 @@
- include Makefile.config
- 
- ifeq ($(USE_BATTERIES),yes)
--EXTLIB := batteries
-+EXTLIB := camomile,batteries
- else
- EXTLIB := extlib
- endif
-@@ -44,11 +44,15 @@
- 
- GETLIB=-I +$(1) $(shell ocamlfind query $(1) -predicates byte -format "%d/%a")
- 
-+COMMA = ,
-+
- FOR_P4  := \
- 	$(call GETLIB,unix) \
- 	$(call GETLIB,str) \
-+	$(call GETLIB,num.core) \
-+	$(call GETLIB,bigarray) \
- 	$(call GETLIB,pcre) \
--	$(call GETLIB,$(EXTLIB)) \
-+	$(shell ocamlfind query $(subst $(COMMA), ,$(EXTLIB)) -predicates byte -format "%d/%a") \
- 	$(call GETLIB,calendar) \
- 	$(call GETLIB,csv) \
- 	./pgocaml.cma
diff --git a/dev-ml/pgocaml/files/pgocaml-1.6-parallel-make.patch b/dev-ml/pgocaml/files/pgocaml-1.6-parallel-make.patch
deleted file mode 100644
index daa0b167c230..000000000000
--- a/dev-ml/pgocaml/files/pgocaml-1.6-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -102,6 +102,8 @@
- # Rules for core library.
- #
- 
-+pa_pgsql.ml4: $(OBJS)
-+
- pa_pgsql.cmo: pa_pgsql.ml4
- 	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) \
- 	  -pp "camlp4o pa_extend.cmo q_MLast.cmo $(P4_PARAMS) -impl" \
diff --git a/dev-ml/pgocaml/files/pgocaml-1.6-test.patch b/dev-ml/pgocaml/files/pgocaml-1.6-test.patch
deleted file mode 100644
index d33c8dfbfdfa..000000000000
--- a/dev-ml/pgocaml/files/pgocaml-1.6-test.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix the lowlevel test with the batteries USE flag
-
---- a/test_pgocaml_lowlevel.ml	2012-04-10 20:45:04.000000000 +0200
-+++ b/test_pgocaml_lowlevel.ml	2012-09-15 16:45:37.104790274 +0200
-@@ -22,7 +22,11 @@
- 
- open Printf
- 
-+IFDEF USE_BATTERIES THEN
-+module List = BatList
-+ELSE
- open ExtList
-+ENDIF
- 
- let print_row i row =
-   printf "row %d: [%s]\n" i
---- a/Makefile	2012-07-04 19:53:31.000000000 +0200
-+++ b/Makefile	2012-09-15 17:00:58.384820257 +0200
-@@ -84,7 +84,7 @@
- #
- 
- test_pgocaml_lowlevel$(EXECUTABLE_SUFFIX): test_pgocaml_lowlevel.cmo pgocaml.cma
--	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) pgocaml.cma -o $@ $<
-+	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLSYNTAX) $(OCAMLCPACKAGES) $(OCAMLCLIBS) pgocaml.cma -o $@ $<
- 
- test_pgocaml$(EXECUTABLE_SUFFIX): test_pgocaml.cmo pgocaml.cma
- 	ocamlfind ocamlc $(OCAMLCFLAGS) $(OCAMLCPACKAGES) $(OCAMLCLIBS) pgocaml.cma -o $@ $<
diff --git a/dev-ml/pgocaml/pgocaml-1.6.ebuild b/dev-ml/pgocaml/pgocaml-1.6.ebuild
deleted file mode 100644
index 5f502939e081..000000000000
--- a/dev-ml/pgocaml/pgocaml-1.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pgocaml/pgocaml-1.6.ebuild,v 1.2 2012/11/21 11:59:55 aballier Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="PG'OCaml is a set of OCaml bindings for the PostgreSQL database"
-HOMEPAGE="http://pgocaml.forge.ocamlcore.org/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/922/${P}.tgz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc batteries"
-
-DEPEND="dev-ml/calendar
-	!batteries? ( dev-ml/extlib )
-	batteries? ( dev-ml/batteries )
-	dev-ml/csv
-	dev-ml/pcre-ocaml
-	>=dev-lang/ocaml-3.10[ocamlopt]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-test.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-}
-
-src_configure() {
-	echo "DESTDIR := \"${ED}/\"" >> Makefile.config
-	use batteries && echo "USE_BATTERIES := yes" >> Makefile.config
-	emake depend
-}
-
-src_compile() {
-	use doc && emake doc
-	emake
-}
-
-src_test() {
-	local default_pguser="postgres"
-	local default_pghost="localhost"
-	local default_pgport=""
-
-	einfo "The tests need a running PostgreSQL server."
-	einfo "Test requires PGUSER or/and PGPORT or/and PGHOST to be set."
-	einfo "If there are not, defaults are:"
-	einfo "    PGUSER=${default_pguser}"
-	einfo "    PGHOST=${default_pghost}"
-	einfo "    PGPORT=${default_pgport}"
-	einfo "Define them at the command line or in:"
-	einfo "    ${EROOT%/}/etc/pgocaml_test_env"
-
-	local user_defined_pguser=$PGUSER
-	local user_defined_pghost=$PGHOST
-	local user_defined_pgport=$PGPORT
-
-	unset PGUSER
-	unset PGHOST
-	unset PGPORT
-
-	if [[ -f ${EROOT%/}/etc/pgocaml_test_env ]]; then
-		source "${EROOT%/}/etc/pgocaml_test_env"
-	fi
-	[[ -n $PGUSER ]] && export PGUSER
-	[[ -n $PGHOST ]] && export PGHOST
-	[[ -n $PGPORT ]] && export PGPORT
-
-	[[ -n $user_defined_pguser ]] && export PGUSER=$user_defined_pguser
-	[[ -n $user_defined_pghost ]] && export PGHOST=$user_defined_pghost
-	[[ -n $user_defined_pgport ]] && export PGPORT=$user_defined_pgport
-
-	[[ -z $PGUSER ]] && export PGUSER=${default_pguser}
-	[[ -z $PGHOST ]] && export PGHOST=${default_pghost}
-	[[ -z $PGPORT ]] && export PGPORT=${default_pgport}
-
-	einfo "PGUSER set to: ${PGUSER}"
-	einfo "PGHOST set to: ${PGHOST}"
-	einfo "PGPORT set to: ${PGPORT}"
-
-	emake test
-}
-
-src_install() {
-	emake install
-	dodoc BUGS.txt CONTRIBUTORS.txt HOW_IT_WORKS.txt README.txt \
-		CHANGELOG.txt README.profiling
-	use doc && dohtml -r html
-}