fix Bug #109881 collision-protect stops MySQL upgrade to 4.1.14

(Portage version: 2.0.53_rc5)

6 files changed, 61 insertions, 36 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 851b707984f3..f7a2a1c81481 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.249 2005/10/20 08:17:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.250 2005/10/20 11:35:57 vivo Exp $
+
+  20 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:
+  fix Bug #109881 collision-protect stops MySQL upgrade to 4.1.14
 
   20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
   mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild:
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index 04d4472d1172..c1462405c162 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.20 2005/10/17 13:49:25 vivo Exp $
+# $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 $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -334,17 +334,21 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		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/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild
index fd4183fd8d68..1db547a4fd00 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.9 2005/10/17 13:49:25 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.10 2005/10/20 11:35:57 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -363,17 +363,21 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		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/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index d796cd13df76..ff117f38c340 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.14 2005/10/20 08:17:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.15 2005/10/20 11:35:57 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -444,17 +444,21 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		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/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
diff --git a/dev-db/mysql/mysql-5.0.12_beta.ebuild b/dev-db/mysql/mysql-5.0.12_beta.ebuild
index 31be79a8ec5e..b686f08a7d10 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.13 2005/10/20 08:17:44 vivo Exp $
+# $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 $
 
 inherit eutils flag-o-matic versionator
 
@@ -444,17 +444,21 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		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/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild
index 3e6050679d53..58ae0342870c 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.3 2005/10/20 08:17:44 vivo Exp $
+# $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 $
 
 inherit eutils flag-o-matic versionator
 
@@ -448,17 +448,21 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		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/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs