bug #166606

Package-Manager: portage-2.1.2-r9

diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index 38be4a31d1431254e58c86572770e5e599ef91f6..b7a6f78c1f757b426e07171d5659f9b19cc50dc2 100644 (file)
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql-init-scripts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.1 2007/01/12 16:54:20 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.2 2007/03/04 15:47:03 vivo Exp $
+
+*mysql-init-scripts-1.2 (04 Mar 2007)
+
+  04 Mar 2007; Francesco Riosa <vivo@gentoo.org> files/mysql.rc6,
+  -mysql-init-scripts-1.1.ebuild, +mysql-init-scripts-1.2.ebuild:
+  workaround for bug #166606
 
   12 Jan 2007; Luca Longinotti <chtekk@gentoo.org> ChangeLog:
   Move from sys-apps/mysql.

diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 8b2edd4cf7913d9fdc9fab2605324c77154c78a7..d7023068a433855345a48fe6a4b9bc053e177ae8 100644 (file)
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -6,10 +6,10 @@ AUX mysql.conf.d 3273 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 SHA1 64e9b
 MD5 092bb6cad90a875da8899e104304c969 files/mysql.conf.d 3273
 RMD160 a2661c832c1091b2d05e599fc58cce6f686c7f31 files/mysql.conf.d 3273
 SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c files/mysql.conf.d 3273
-AUX mysql.rc6 10655 RMD160 37ca10afa120766244ff38beb3437319d6989569 SHA1 7184363e424d5d2f29a14083b55b3d00c8e568ad SHA256 945a6963368d1da9fdb9edf470cd4e177e2513bbbcc2028b944e391b3e6eebad
-MD5 55571d41f7d19a77c3a4c29a7e234463 files/mysql.rc6 10655
-RMD160 37ca10afa120766244ff38beb3437319d6989569 files/mysql.rc6 10655
-SHA256 945a6963368d1da9fdb9edf470cd4e177e2513bbbcc2028b944e391b3e6eebad files/mysql.rc6 10655
+AUX mysql.rc6 10661 RMD160 0a0a1d84febd750a62cf331841b1bb765ccdae87 SHA1 35ceea9fc1e2e58f742d396bdcd1a17c7ad9c4f1 SHA256 039e54883fc42d3b9ddfdfca46bb906420a7d47156f5b1392292f4aa3f712149
+MD5 5a6f929affaf040b95043e1bd8637fbb files/mysql.rc6 10661
+RMD160 0a0a1d84febd750a62cf331841b1bb765ccdae87 files/mysql.rc6 10661
+SHA256 039e54883fc42d3b9ddfdfca46bb906420a7d47156f5b1392292f4aa3f712149 files/mysql.rc6 10661
 AUX mysqlmanager.conf.d 1009 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 SHA1 0d82531df24ba4f0d957176b6fa0076a1cae0356 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7
 MD5 c94178cadec3be56c4e6c7ec9812cfcf files/mysqlmanager.conf.d 1009
 RMD160 b443dc0cd1cb7fb054fe7229a52b8d093e634652 files/mysqlmanager.conf.d 1009
@@ -18,18 +18,18 @@ AUX mysqlmanager.rc6 6632 RMD160 17fd2bdfcad0ca6e32e6ee91e1e0db7ce3263fef SHA1 1
 MD5 9bd0a4e431bda8249ae96273209715e2 files/mysqlmanager.rc6 6632
 RMD160 17fd2bdfcad0ca6e32e6ee91e1e0db7ce3263fef files/mysqlmanager.rc6 6632
 SHA256 0d37cb3199a2752604a105d54340a61b9ee062e6c1d977a863628b694d93e96d files/mysqlmanager.rc6 6632
-EBUILD mysql-init-scripts-1.1.ebuild 803 RMD160 9ab1dc057eec472359750a1a99ef932f76f62d65 SHA1 c9b27f179cfc50339ec294086517404ccf7ae248 SHA256 db3386e84994d633b6fa5c012a438b37736c0f41de0592d7bcb7dde23d21b897
-MD5 9b8b7d1a7e6a51a65968c7dce2ce51e4 mysql-init-scripts-1.1.ebuild 803
-RMD160 9ab1dc057eec472359750a1a99ef932f76f62d65 mysql-init-scripts-1.1.ebuild 803
-SHA256 db3386e84994d633b6fa5c012a438b37736c0f41de0592d7bcb7dde23d21b897 mysql-init-scripts-1.1.ebuild 803
-MISC ChangeLog 314 RMD160 0a4ba1ab015dfa270386738e381fc3051a080a4b SHA1 dcd42b14fdc1628276f87885db633972bf3e3baa SHA256 b32a5612c88a0086be9a15686d40bf75407158c606647a77bfa394e8541e6e0e
-MD5 decefd99806de9b0ed1b36c25d3d91ee ChangeLog 314
-RMD160 0a4ba1ab015dfa270386738e381fc3051a080a4b ChangeLog 314
-SHA256 b32a5612c88a0086be9a15686d40bf75407158c606647a77bfa394e8541e6e0e ChangeLog 314
+EBUILD mysql-init-scripts-1.2.ebuild 801 RMD160 2580e635fa22adc034256440461467ed67578c12 SHA1 b14cdf62897bc62240a8aced9c2ab82d3b4e1144 SHA256 25c64a3754b038dfb3b17e0431a8f7bbb142e21bf2e4e3d939a7a4d1c9e7f3d3
+MD5 7ed62e676e225064aa70b79a7614c6ad mysql-init-scripts-1.2.ebuild 801
+RMD160 2580e635fa22adc034256440461467ed67578c12 mysql-init-scripts-1.2.ebuild 801
+SHA256 25c64a3754b038dfb3b17e0431a8f7bbb142e21bf2e4e3d939a7a4d1c9e7f3d3 mysql-init-scripts-1.2.ebuild 801
+MISC ChangeLog 513 RMD160 b5583ca99284f87be4fd05d5d40e4d3d7808b4c7 SHA1 3ea0d0e7da5dc2501822be4c2d711a34bb8e78f0 SHA256 a0c1228b31139a04669e53c52301d8b78a2ca8245fd96dc786f663d71774f40c
+MD5 3b53107ad1b15ac4971c833450182f47 ChangeLog 513
+RMD160 b5583ca99284f87be4fd05d5d40e4d3d7808b4c7 ChangeLog 513
+SHA256 a0c1228b31139a04669e53c52301d8b78a2ca8245fd96dc786f663d71774f40c ChangeLog 513
 MISC metadata.xml 159 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee SHA1 5eb253a678d6faa0f1c6b3c5720a804ed8923566 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7
 MD5 f1c86d989c7ea2451931e7e2c3530f8c metadata.xml 159
 RMD160 a50a94af7706288c46f81d6c3da9b5f888050eee metadata.xml 159
 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 metadata.xml 159
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-init-scripts-1.1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-init-scripts-1.1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-init-scripts-1.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-mysql-init-scripts-1.2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-mysql-init-scripts-1.2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-mysql-init-scripts-1.2 0

diff --git a/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.1 b/dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.2
similarity index 100%
rename from dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.1
rename to dev-db/mysql-init-scripts/files/digest-mysql-init-scripts-1.2

diff --git a/dev-db/mysql-init-scripts/files/mysql.rc6 b/dev-db/mysql-init-scripts/files/mysql.rc6
index 68ced6e5aeb250ea84e0dcc3d67c118eb77ab1e6..e67c2ca1d13e46c1205859be01dcd2580e5a10c7 100644 (file)
--- a/dev-db/mysql-init-scripts/files/mysql.rc6
+++ b/dev-db/mysql-init-scripts/files/mysql.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql.rc6,v 1.1 2007/01/12 16:54:20 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql.rc6,v 1.2 2007/03/04 15:47:03 vivo Exp $
 
 # external binaries used: which, sed, tac
 
@@ -272,7 +272,7 @@ start() {
                mysqld_thing="${mysqld_thing} ${unmanagedparams}"
                mysqld_thing="${mysqld_thing} --basedir=${basedir}"
                mysqld_thing="${mysqld_thing} --datadir=${datadir}"
-               #see bug #158769  mysqld_thing="${mysqld_thing} --pid-file=${pidfile}"
+               mysqld_thing="${mysqld_thing} --pid-file=${pidfile}"
                mysqld_thing="${mysqld_thing} --socket=${socket}"
 
                wdebug 2 "starting mysqld with: ${mysqld_thing}"
@@ -281,7 +281,8 @@ start() {
                        tmpnice="${NICE:+"--nicelevel "}${NICE}"
                        start-stop-daemon --quiet ${DEBUG/*/"--verbose"} --start \
                        --background ${tmpnice} --pidfile ${pidfile} \
-                       --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing}
+                       --exec ${basedir}/sbin/mysqld${MY_SUFFIX} -- ${mysqld_thing} \
+                       && sleep ${TIMEUNIT}
                        retstatus=$?
                else
                        tmpnice="${NICE:+"nice -n "}${NICE}"

diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild
similarity index 91%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild
index a3f1e769a8b97b6440fc6a5449afca3fa662af93..ff85020336733bc1d163767d92820c70660b8fd2 100644 (file)
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.1.ebuild,v 1.1 2007/01/12 16:54:20 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-1.2.ebuild,v 1.1 2007/03/04 15:47:03 vivo Exp $
 
 DESCRIPTION="Gentoo MySQL init scripts."
 HOMEPAGE="http://www.gentoo.org/"