From 63e64b449c1860ebda7258272c548dedae6488c7 Mon Sep 17 00:00:00 2001 From: Francesco Riosa Date: Fri, 21 Oct 2005 08:58:03 +0000 Subject: [PATCH] reverted bugfix Package-Manager: portage-2.0.52-r1 --- dev-db/mysql/ChangeLog | 7 ++++- dev-db/mysql/Manifest | 44 +++++++++++++-------------- dev-db/mysql/mysql-4.0.25-r2.ebuild | 17 +++++------ dev-db/mysql/mysql-4.0.26.ebuild | 17 +++++------ dev-db/mysql/mysql-4.1.14.ebuild | 17 +++++------ dev-db/mysql/mysql-5.0.12_beta.ebuild | 17 +++++------ dev-db/mysql/mysql-5.0.13_rc.ebuild | 17 +++++------ 7 files changed, 63 insertions(+), 73 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 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 mysql-4.1.14.ebuild: Marked ppc diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 24ad7576af0e..771097ad7c58 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,31 +1,31 @@ -MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158 +MD5 93eb56e06059b67713409ca833453b4f mysql-5.0.12_beta.ebuild 18257 +MD5 aaee8e5a4acc3549a448b555a8ca301e mysql-4.1.14.ebuild 18271 +MD5 1fdc869b8c6cc92b4474962f7b9af12a mysql-4.0.26.ebuild 14859 +MD5 6a036bc0b84595dc9c1a14a8bca015fa mysql-5.0.13_rc.ebuild 18413 +MD5 c3f09dc9b5a59873d8ebe67b2096789b mysql-4.1.13-r1.ebuild 17592 MD5 b4e651d8ffcb8b7a92b9bf186081d6e3 mysql-4.0.22.ebuild 8941 MD5 00acf2c6bc09118694e11fafdb7e3970 mysql-4.0.22-r2.ebuild 9814 -MD5 ac74397784bc6979c6cee6319f5be131 mysql-4.0.24.ebuild 9833 -MD5 e81d22b10eba80ebb8212921dcc7d125 mysql-5.0.13_rc.ebuild 18475 -MD5 5695c952b32f08107972be2d0e16ac46 ChangeLog 45362 -MD5 aabdd46ba96f2ac78657eb17c6f08edd mysql-4.0.25-r2.ebuild 13862 -MD5 24fe3293afe5c8a2ff1028b74412a407 mysql-4.1.14.ebuild 18336 MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219 -MD5 cddbdf27a5cbbe3ae521c332c48a8469 mysql-5.0.12_beta.ebuild 18319 -MD5 c3f09dc9b5a59873d8ebe67b2096789b mysql-4.1.13-r1.ebuild 17592 -MD5 30b1d64e5ad083f0f5894c41f14b74e8 mysql-4.0.26.ebuild 14921 -MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123 -MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 -MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 -MD5 1a7299f19831c9bc9930bd76f381da80 files/digest-mysql-4.0.24 139 -MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440 +MD5 ac74397784bc6979c6cee6319f5be131 mysql-4.0.24.ebuild 9833 +MD5 62dc1ede4735f8845489e769c7af37de ChangeLog 45557 +MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158 +MD5 0e2f7e25b805f757847ac60711442bf4 mysql-4.0.25-r2.ebuild 13800 +MD5 5990b9d1cb5ba35bb7c9d56a00d10f58 files/digest-mysql-4.1.13-r1 139 +MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140 -MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139 MD5 0c3c016fee3edff9a0585290e58f1c26 files/digest-mysql-5.0.12_beta 144 -MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 -MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 -MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139 -MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 -MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139 MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22 139 +MD5 1a7299f19831c9bc9930bd76f381da80 files/digest-mysql-4.0.24 139 +MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139 +MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139 +MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 MD5 713dc46b7ffa15edda542a15508ce07c files/digest-mysql-5.0.13_rc 142 -MD5 5990b9d1cb5ba35bb7c9d56a00d10f58 files/digest-mysql-4.1.13-r1 139 +MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440 +MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 +MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068 +MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 +MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816 +MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 +MD5 631ed23db7ff8777599dee1c45edae0f files/digest-mysql-4.0.22-r2 139 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139 -MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068 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" -- 2.26.2