[dev-db/mariadb-5.5] Drop src_prepare - fixes bug 462078.

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

5 files changed, 10 insertions, 23 deletions

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index 876463572781..d3e178c6ef27 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mariadb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.29 2013/06/02 19:48:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/ChangeLog,v 1.30 2013/06/26 19:42:59 jmbsvicetto Exp $
+
+  26 Jun 2013; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  mariadb-5.5.28a.ebuild, mariadb-5.5.29.ebuild, mariadb-5.5.30.ebuild,
+  mariadb-5.5.31.ebuild:
+  [dev-db/mariadb-5.5] Drop src_prepare - fixes bug 462078.
 
 *mariadb-5.5.31 (02 Jun 2013)
 
diff --git a/dev-db/mariadb/mariadb-5.5.28a.ebuild b/dev-db/mariadb/mariadb-5.5.28a.ebuild
index bd208ea29bd2..8d315f57ffd9 100644
--- a/dev-db/mariadb/mariadb-5.5.28a.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.28a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.1 2013/01/20 02:19:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.28a.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}"
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
 
 # Official test instructions:
 # USE='berkdb -cluster embedded extraengine perl ssl community' \
diff --git a/dev-db/mariadb/mariadb-5.5.29.ebuild b/dev-db/mariadb/mariadb-5.5.29.ebuild
index 56e401235110..918ffec23298 100644
--- a/dev-db/mariadb/mariadb-5.5.29.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.1 2013/02/13 00:47:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.29.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}"
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
 
 # Official test instructions:
 # USE='berkdb -cluster embedded extraengine perl ssl community' \
diff --git a/dev-db/mariadb/mariadb-5.5.30.ebuild b/dev-db/mariadb/mariadb-5.5.30.ebuild
index 50b02812a189..1f0ddded8188 100644
--- a/dev-db/mariadb/mariadb-5.5.30.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.30.ebuild,v 1.1 2013/03/14 01:02:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.30.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130120-0100Z"
@@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}"
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
-	sed -i \
-		-e '/^noinst_PROGRAMS/s/basic-t//g' \
-		"${S}"/unittest/mytap/t/Makefile.am
-	mysql-v2_src_prepare
-}
 
 # Official test instructions:
 # USE='berkdb -cluster embedded extraengine perl ssl community' \
diff --git a/dev-db/mariadb/mariadb-5.5.31.ebuild b/dev-db/mariadb/mariadb-5.5.31.ebuild
index febec71cacd9..45e5b8edbb51 100644
--- a/dev-db/mariadb/mariadb-5.5.31.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.31.ebuild,v 1.1 2013/06/02 19:48:51 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mariadb/mariadb-5.5.31.ebuild,v 1.2 2013/06/26 19:42:59 jmbsvicetto Exp $
 
 EAPI="4"
 MY_EXTRAS_VER="20130602-1946Z"