reverted bugfix

(Portage version: 2.0.52-r1)

6 files changed, 41 insertions, 51 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 9ade306e4afe..10b307ff1859 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.251 2005/10/20 12:53:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.252 2005/10/21 08:58:03 vivo Exp $
+
+  21 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild,
+  mysql-5.0.13_rc.ebuild:
+  Reverted, fix Bug #109881
 
   20 Oct 2005; Luca Barbato <lu_zero@gentoo.org> mysql-4.1.14.ebuild:
   Marked ppc
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index c1462405c162..919b6b7edc0e 100644
--- a/dev-db/mysql/mysql-4.0.25-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.21 2005/10/20 11:35:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.22 2005/10/21 08:58:03 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -334,16 +334,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		if [ -a "${DATADIR}" ] ; then
-			diropts "-m0755"
-			dodir "/var/log/mysql"
-			touch ${D}/var/log/mysql/mysql.{log,err}
-			chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-			keepdir "/var/log/mysql"
-			chown -R mysql:mysql "${D}/var/log/mysql"
-		fi
-
 		diropts "-m0755"
+		dodir "/var/log/mysql"
+		touch ${D}/var/log/mysql/mysql.{log,err}
+		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
 		dodir "/var/run/mysqld"
 
 		keepdir "/var/run/mysqld"
diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild
index 1db547a4fd00..df138407ada7 100644
--- a/dev-db/mysql/mysql-4.0.26.ebuild
+++ b/dev-db/mysql/mysql-4.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.10 2005/10/20 11:35:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.11 2005/10/21 08:58:03 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -363,16 +363,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		if [ -a "${DATADIR}" ] ; then
-			diropts "-m0755"
-			dodir "/var/log/mysql"
-			touch ${D}/var/log/mysql/mysql.{log,err}
-			chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-			keepdir "/var/log/mysql"
-			chown -R mysql:mysql "${D}/var/log/mysql"
-		fi
-
 		diropts "-m0755"
+		dodir "/var/log/mysql"
+		touch ${D}/var/log/mysql/mysql.{log,err}
+		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
 		dodir "/var/run/mysqld"
 
 		keepdir "/var/run/mysqld"
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index e8327c093924..2acdaa8cc6a9 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.16 2005/10/20 12:53:35 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.17 2005/10/21 08:58:03 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -444,16 +444,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		if [ -a "${DATADIR}" ] ; then
-			diropts "-m0755"
-			dodir "/var/log/mysql"
-			touch ${D}/var/log/mysql/mysql.{log,err}
-			chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-			keepdir "/var/log/mysql"
-			chown -R mysql:mysql "${D}/var/log/mysql"
-		fi
-
 		diropts "-m0755"
+		dodir "/var/log/mysql"
+		touch ${D}/var/log/mysql/mysql.{log,err}
+		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
 		dodir "/var/run/mysqld"
 
 		keepdir "/var/run/mysqld"
diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index b686f08a7d10..6c6580e71e46 100644
--- a/dev-db/mysql/mysql-5.0.12_beta.ebuild
+++ b/dev-db/mysql/mysql-5.0.12_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.14 2005/10/20 11:35:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.12_beta.ebuild,v 1.15 2005/10/21 08:58:03 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -444,16 +444,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		if [ -a "${DATADIR}" ] ; then
-			diropts "-m0755"
-			dodir "/var/log/mysql"
-			touch ${D}/var/log/mysql/mysql.{log,err}
-			chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-			keepdir "/var/log/mysql"
-			chown -R mysql:mysql "${D}/var/log/mysql"
-		fi
-
 		diropts "-m0755"
+		dodir "/var/log/mysql"
+		touch ${D}/var/log/mysql/mysql.{log,err}
+		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
 		dodir "/var/run/mysqld"
 
 		keepdir "/var/run/mysqld"
diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild
index 58ae0342870c..f0358e2fd2a0 100644
--- a/dev-db/mysql/mysql-5.0.13_rc.ebuild
+++ b/dev-db/mysql/mysql-5.0.13_rc.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.4 2005/10/20 11:35:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.5 2005/10/21 08:58:03 vivo Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -448,16 +448,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		if [ -a "${DATADIR}" ] ; then
-			diropts "-m0755"
-			dodir "/var/log/mysql"
-			touch ${D}/var/log/mysql/mysql.{log,err}
-			chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-			keepdir "/var/log/mysql"
-			chown -R mysql:mysql "${D}/var/log/mysql"
-		fi
-
 		diropts "-m0755"
+		dodir "/var/log/mysql"
+		touch ${D}/var/log/mysql/mysql.{log,err}
+		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
 		dodir "/var/run/mysqld"
 
 		keepdir "/var/run/mysqld"