Remove old.

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

4 files changed, 7 insertions, 93 deletions

diff --git a/dev-ml/ocaml-mysql/ChangeLog b/dev-ml/ocaml-mysql/ChangeLog
index e594d0980415..422f372e7d5e 100644
--- a/dev-ml/ocaml-mysql/ChangeLog
+++ b/dev-ml/ocaml-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/ocaml-mysql
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.15 2014/08/10 20:43:03 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ChangeLog,v 1.16 2015/05/31 00:13:05 mrueg Exp $
+
+  31 May 2015; Manuel Rüger <mrueg@gentoo.org>
+  -files/ocaml-mysql-1.0.3-head.patch, -files/ocaml-mysql-1.0.3-shtool-r1.patch,
+  -ocaml-mysql-1.0.4.ebuild:
+  Remove old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ocaml-mysql-1.0.4.ebuild,
   ocaml-mysql-1.1.1.ebuild:
diff --git a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-head.patch b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-head.patch
deleted file mode 100644
index 8e178ff23c83..000000000000
--- a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-head.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- etc/shtool.orig	2004-02-15 15:58:06.714608714 +0100
-+++ etc/shtool	2004-02-15 15:58:45.627450465 +0100
-@@ -532,13 +532,13 @@
-     if [ ".$opt_e" = .yes -a ".`echo $text | egrep '%d'`" != . ]; then
-         if [ ".$domainname" = . ]; then
-             if [ -f /etc/resolv.conf ]; then
--                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -1 |\
-+                domainname="`egrep '^[ 	]*domain' /etc/resolv.conf | head -n 1 |\
-                              sed -e 's/.*domain//' \
-                                  -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
-                                  -e 's/^\.//' -e 's/^/./' |\
-                              awk '{ printf("%s", $1); }'`"
-                 if [ ".$domainname" = . ]; then
--                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -1 |\
-+                    domainname="`egrep '^[ 	]*search' /etc/resolv.conf | head -n 1 |\
-                                  sed -e 's/.*search//' \
-                                      -e 's/^[ 	]*//' -e 's/^ *//' -e 's/^	*//' \
-                                      -e 's/ .*//' -e 's/	.*//' \
-@@ -2100,7 +2100,7 @@
-         if [ -r "$FILE" ]; then
-             #   grep out current information
-             id=`grep 'Version [0-9]*.[0-9]*[.abps][0-9]* ([0-9]*-[a-zA-Z]*-[0-9]*)' $FILE | \
--                head -1 | \
-+                head -n 1 | \
-                 sed -e 's%.*Version \([0-9]*\)\.\([0-9]*\)\([.abps]\)\([0-9]*\) (\([0-9]*-[a-zA-Z]*-[0-9]*\)).*%\1:\2:\3:\4:\5%'`
-             version=`echo $id | awk -F: '{ print $1 }'`
-             revision=`echo $id | awk -F: '{ print $2 }'`
diff --git a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch b/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch
deleted file mode 100644
index b76fa30f0d08..000000000000
--- a/dev-ml/ocaml-mysql/files/ocaml-mysql-1.0.3-shtool-r1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur a/etc/shtool b/etc/shtool
---- a/etc/shtool	2005-08-17 14:21:24.000000000 +0200
-+++ b/etc/shtool	2005-08-17 14:25:01.000000000 +0200
-@@ -378,8 +378,14 @@
-             tmpdir="$TEMPDIR"
-         fi
-     fi
--    tmpfile="$tmpdir/.shtool.$$"
--    rm -f $tmpfile >/dev/null 2>&1
-+    if mkdir "$tmpdir/.shtool.$$"; then
-+        tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-+    else
-+        echo "$msgprefix:Error: failed to create temporary file" 1>&2
-+        exit 1
-+    fi
-+    tmpfile="$tmpdir/.shtool.$$/shtool.tmp"
-+    rm -fr "$tmpdir/.shtool.$$" >/dev/null 2>&1 || true
-     touch $tmpfile
- fi
- 
diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
deleted file mode 100644
index 3528d9755be3..000000000000
--- a/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-mysql/ocaml-mysql-1.0.4.ebuild,v 1.5 2014/08/10 20:43:03 slyfox Exp $
-
-EAPI="2"
-
-inherit findlib eutils
-
-IUSE="doc +ocamlopt"
-
-DESCRIPTION="A package for ocaml that provides access to mysql databases"
-SRC_URI="http://raevnos.pennmush.org/code/${PN}/${P}.tar.gz"
-HOMEPAGE="http://raevnos.pennmush.org/code/ocaml-mysql/index.html"
-
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
-	>=virtual/mysql-4.0"
-
-RDEPEND="$DEPEND"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64 ppc x86"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.0.3-head.patch"
-	epatch "${FILESDIR}/${PN}-1.0.3-shtool-r1.patch"
-}
-
-src_compile()
-{
-	emake all || die "make failed"
-	if use ocamlopt; then
-		emake opt || die "make opt failed"
-	fi
-}
-
-src_install()
-{
-	findlib_src_preinst
-	emake install || die "make install failed"
-
-	use doc && dohtml -r doc/html/*
-	dodoc CHANGES README VERSION || die
-}