All changes refer to slotted versions and eclasses for these.

- removed "utf8" controversial use flag, it was simply replacing utf8 in my.cnf
- added "srvdir" use flag, on a system without previous installed MySQL it will
> use datadir="/srv/localhost/mysql/datadir"
- support for NOCHECK in rc scripts to be used during upgrade
- inherit mysql_fx from ebuilds, instead of mysql.eclass to make easyer froze a
> "stable" package moving the mysql.eclass into the ebuild itself.
- updated "logrotate" and "my.cnf" to support slotting
Package-Manager: portage-2.1_pre3-r1

8 files changed, 199 insertions, 16 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 68ea7ab684df..0d9a7e1d4abc 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.293 2006/01/15 14:18:30 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.294 2006/01/24 19:25:57 vivo Exp $
+
+  24 Jan 2006; Francesco Riosa <vivo@gentoo.org> +files/my.cnf-4.1-r1,
+  +files/logrotate-slot.mysql, files/mysql-slot.rc6-r2,
+  mysql-4.1.16-r30.ebuild, mysql-5.0.18-r30.ebuild,
+  mysql-5.1.4_alpha-r30.ebuild:
+  All changes refer to slotted versions and eclasses for these.
+  - removed "utf8" controversial use flag, it was simply replacing utf8 in
+  > my.cnf
+  - added "srvdir" use flag, on a system without previous installed MySQL it
+  > will use datadir="/srv/localhost/mysql/datadir"
+  - support for NOCHECK in rc scripts to be used during upgrade
+  - inherit mysql_fx from ebuilds, instead of mysql.eclass to make easyer
+  > froze a "stable" package moving the mysql.eclass into the ebuild itself.
+  - updated "logrotate" and "my.cnf" to support slotting
 
   15 Jan 2006; Francesco Riosa <vivo@gentoo.org> mysql-4.1.16-r30.ebuild,
   mysql-5.0.18-r30.ebuild, mysql-5.1.4_alpha-r30.ebuild:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 9d162c311870..4417707e9503 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a905c9dd804ce8510e9425dfed432f03 ChangeLog 58939
+MD5 84ebd6a4f165a427c434e430088dde23 ChangeLog 59702
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
@@ -12,11 +12,13 @@ MD5 bbb9e8ef722b301fe22323fbf373c3d1 files/digest-mysql-5.0.17 139
 MD5 2217697573a3f8e3c8ad3f9c7a80ff70 files/digest-mysql-5.0.18 139
 MD5 b780f68ac543a4a0b728d047bae97021 files/digest-mysql-5.0.18-r30 139
 MD5 c97294b384ac1f53d113585d5dd4bf25 files/digest-mysql-5.1.4_alpha-r30 144
+MD5 631d741e2c56442abacaa4c1ca5db499 files/logrotate-slot.mysql 502
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
 MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
 MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
+MD5 0ad942c25eb224912a699844fc15ff75 files/my.cnf-4.1-r1 4243
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
 MD5 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151
@@ -25,7 +27,7 @@ MD5 624541a36c1aae85e3999078d2468215 files/mysql-slot.conf.d-r1 2999
 MD5 7855af91fd7c2253e5da6b6a0e245375 files/mysql-slot.conf.d-r2 3817
 MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691
 MD5 8158f25fbd80fba48f0d01b0889ea0b3 files/mysql-slot.rc6-r1 9016
-MD5 f1ccf59573d77bf58bd654f44af43c0c files/mysql-slot.rc6-r2 7848
+MD5 e498f5d3b097ab0ab2db0e46b2a8e9a0 files/mysql-slot.rc6-r2 7883
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
 MD5 9ff84042930f67b14f418a9dcf78d860 files/mysqlmanager-slot.conf.d 1021
 MD5 69488d8c4aca1adf37e4c24b39305487 files/mysqlmanager-slot.rc6 6614
@@ -34,16 +36,16 @@ MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
 MD5 04a6e805b1d24c4c0e4b953d663594dc mysql-4.0.25-r2.ebuild 14265
 MD5 bc01b998b62fcca567651ca0c99d86af mysql-4.0.26.ebuild 14894
 MD5 739b8a544851021d0045944084bec221 mysql-4.1.14.ebuild 18858
-MD5 b993c502a73a76f9868a82f851cdb70d mysql-4.1.16-r30.ebuild 1966
+MD5 4e0cc80f911d3fa35b10a62d3e7b1794 mysql-4.1.16-r30.ebuild 1975
 MD5 fabd73e14eabebac968e6a5ded7569e1 mysql-4.1.16.ebuild 24836
 MD5 d9df2dc4d1233c6bc8f4628c1624b275 mysql-5.0.17.ebuild 24839
-MD5 b2e22c700cf74068e4fcdbc50507f4f5 mysql-5.0.18-r30.ebuild 1966
+MD5 970b4e45e1595d0edbe37c1a8ed68cf3 mysql-5.0.18-r30.ebuild 1975
 MD5 d2ecaaa530a5a25ff3dc4ad4974f8a61 mysql-5.0.18.ebuild 24839
-MD5 239954c043f690385d633ca9e5eb4172 mysql-5.1.4_alpha-r30.ebuild 1971
+MD5 51a06a62df32804d95eb0865d5117f07 mysql-5.1.4_alpha-r30.ebuild 1980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDyopNKolR564NvWYRAl2+AJ9A+WTjrAryk7xFQ6URiXtUbFgslACeO9Eh
-TyLphzwMwuRW6yfktTjjvnQ=
-=sLYA
+iD8DBQFD1n9fKolR564NvWYRAvJLAKCL29ZHRrEqLQecCU3RcNoFMaVcrACfXK8a
+KLovDnpK/aHzmeh43IFJmFE=
+=u3z+
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/logrotate-slot.mysql b/dev-db/mysql/files/logrotate-slot.mysql
new file mode 100644
index 000000000000..3db75a257f14
--- /dev/null
+++ b/dev-db/mysql/files/logrotate-slot.mysql
@@ -0,0 +1,14 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate-slot.mysql,v 1.1 2006/01/24 19:25:57 vivo Exp $
+/var/log/mysql___MY_SUFFIX___/mysql.err /var/log/mysql___MY_SUFFIX___/mysql.log /var/log/mysql___MY_SUFFIX___/mysqld.err {
+monthly
+create 660 mysql mysql
+notifempty
+size 5M
+sharedscripts
+missingok
+postrotate
+/bin/kill -HUP `cat /var/run/mysqld___MY_SUFFIX___/mysqld.pid`
+endscript
+}
diff --git a/dev-db/mysql/files/my.cnf-4.1-r1 b/dev-db/mysql/files/my.cnf-4.1-r1
new file mode 100644
index 000000000000..4b3d4692c0a4
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-4.1-r1
@@ -0,0 +1,152 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1-r1,v 1.1 2006/01/24 19:25:57 vivo Exp $
+
+# The following options will be passed to all MySQL clients
+[client]
+#password					= your_password
+port						= 3306
+socket						= /var/run/mysqld/mysqld@MY_SUFFIX@.sock
+
+[mysql]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=utf8
+
+[myisampack]
+character-sets-dir=utf8
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log						= /var/log/mysql@MY_SUFFIX@/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations.
+[mysqld]
+character-set-server		= utf8
+default-character-set		= utf8
+user 						= mysql
+port 						= 3306
+socket 						= /var/run/mysqld/mysqld@MY_SUFFIX@.sock
+pid-file 					= /var/run/mysqld/mysqld@MY_SUFFIX@.pid
+log-error 					= /var/log/mysql@MY_SUFFIX@/mysqld.err
+basedir 					= /usr
+datadir 					= @DATADIR@
+skip-locking
+#skip-innodb
+key_buffer 					= 16M
+max_allowed_packet 			= 1M
+table_cache 				= 64
+sort_buffer_size 			= 512K
+net_buffer_length 			= 8K
+read_buffer_size 			= 256K
+read_rnd_buffer_size 		= 512K
+myisam_sort_buffer_size 	= 8M
+language 					= /usr/share/mysql@MY_SUFFIX@/english
+
+#security:
+#using "localhost" in connects use sockets by default
+#skip-networking
+bind-address				= 127.0.0.1
+
+log-bin
+server-id 					= 1
+
+# Point the following paths to different dedicated disks
+tmpdir 						= /tmp/
+#log-update 				= /path-to-dedicated-directory/hostname
+
+# you need debug use flag enabled to use this ones.
+# if needed uncomment them, start the server and issue 
+# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# this will show you *exactly* what's appening in your server ;)
+
+#log						= /tmp/mysqld.sql
+#gdb
+#debug						= d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# Uncomment the following if you are using BDB tables
+#bdb_cache_size				= 4M
+#bdb_max_lock				= 10000
+
+# The following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes.
+# you might want to bump this up a bit on boxes with more RAM
+#GENTOO#innodb_buffer_pool_size		= 16M
+# this is the default, increase if you have lots of tables
+#GENTOO#innodb_additional_mem_pool_size	= 2M
+#
+# i'd like to use /var/lib/mysql@MY_SUFFIX@/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql@MY_SUFFIX@/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir		= /var/lib/mysql@MY_SUFFIX@/
+#innodb_log_arch_dir		= /var/lib/mysql@MY_SUFFIX@/
+#innodb_log_group_home_dir	= /var/lib/mysql@MY_SUFFIX@/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+#GENTOO#innodb_data_file_path		= ibdata1:10M:autoextend
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+#GENTOO#innodb_log_file_size		= 5M
+# this is the default, increase if you have very large transactions.
+#GENTOO#innodb_log_buffer_size		= 8M
+# this is the default, and won't hurt you.
+# you shouldn't need to tweak it.
+set-variable				= innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+#GENTOO#innodb_flush_log_at_trx_commit	= 1
+#GENTOO#innodb_lock_wait_timeout	= 50
+
+
+[mysqldump]
+quick
+max_allowed_packet 			= 16M
+
+[mysql]
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[myisamchk]
+key_buffer 					= 20M
+sort_buffer_size 			= 20M
+read_buffer 				= 2M
+write_buffer 				= 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+#vim: set tabstop=4 :
+#vim: set shiftwidth=4 :
+
diff --git a/dev-db/mysql/files/mysql-slot.rc6-r2 b/dev-db/mysql/files/mysql-slot.rc6-r2
index db9a2b54c2a4..c54d0906e9a0 100755
--- a/dev-db/mysql/files/mysql-slot.rc6-r2
+++ b/dev-db/mysql/files/mysql-slot.rc6-r2
@@ -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/files/mysql-slot.rc6-r2,v 1.3 2006/01/11 12:21:52 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6-r2,v 1.4 2006/01/24 19:25:57 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -170,6 +170,7 @@ get_slot_config() {
 }
 
 checkconfig() {
+	[[ -n "${NOCHECK}" ]] && return 0
 	wdebug 4 ">>> checkconfig(\"${1}\")"
 	local datadir="$1"
 	if [ ! -d "${datadir}" ]; then
diff --git a/dev-db/mysql/mysql-4.1.16-r30.ebuild b/dev-db/mysql/mysql-4.1.16-r30.ebuild
index bc25a149a43a..b41d99d8e105 100644
--- a/dev-db/mysql/mysql-4.1.16-r30.ebuild
+++ b/dev-db/mysql/mysql-4.1.16-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.16-r30.ebuild,v 1.6 2006/01/15 14:18:30 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.16-r30.ebuild,v 1.7 2006/01/24 19:25:57 vivo Exp $
 
 # MYSQL_VERSION_ID will be
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
@@ -21,7 +21,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # for future use ...
 NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
 
-inherit mysql
+inherit mysql_fx mysql
 KEYWORDS="-*"
 
 DEPEND="${DEPEND}
diff --git a/dev-db/mysql/mysql-5.0.18-r30.ebuild b/dev-db/mysql/mysql-5.0.18-r30.ebuild
index 0e051d6a0e04..55aa5d2f2cec 100644
--- a/dev-db/mysql/mysql-5.0.18-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.18-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r30.ebuild,v 1.4 2006/01/15 14:18:30 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r30.ebuild,v 1.5 2006/01/24 19:25:57 vivo Exp $
 
 # MYSQL_VERSION_ID will be
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
@@ -21,7 +21,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # for future use ...
 NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
 
-inherit mysql
+inherit mysql_fx mysql
 KEYWORDS="-*"
 
 DEPEND="${DEPEND}
diff --git a/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild b/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
index 6ceb106afd15..8a6357222d8d 100644
--- a/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
+++ b/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild,v 1.6 2006/01/15 14:18:30 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild,v 1.7 2006/01/24 19:25:57 vivo Exp $
 
 # MYSQL_VERSION_ID will be
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
@@ -21,7 +21,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # for future use ...
 NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
 
-inherit mysql
+inherit mysql_fx mysql
 KEYWORDS="-*"
 
 DEPEND="${DEPEND}