version bump + slotted stuff
authorFrancesco Riosa <vivo@gentoo.org>
Wed, 23 Nov 2005 02:09:52 +0000 (02:09 +0000)
committerFrancesco Riosa <vivo@gentoo.org>
Wed, 23 Nov 2005 02:09:52 +0000 (02:09 +0000)
Package-Manager: portage-2.0.53_rc6

19 files changed:
dev-db/mysql/ChangeLog
dev-db/mysql/Manifest
dev-db/mysql/files/digest-mysql-4.0.25-r2
dev-db/mysql/files/digest-mysql-4.0.26
dev-db/mysql/files/digest-mysql-4.0.26-r30 [deleted file]
dev-db/mysql/files/digest-mysql-4.1.14
dev-db/mysql/files/digest-mysql-4.1.15
dev-db/mysql/files/digest-mysql-4.1.15-r30
dev-db/mysql/files/digest-mysql-5.0.13_rc [deleted file]
dev-db/mysql/files/digest-mysql-5.0.15
dev-db/mysql/files/digest-mysql-5.0.15-r30 [deleted file]
dev-db/mysql/files/digest-mysql-5.0.16 [new file with mode: 0644]
dev-db/mysql/files/digest-mysql-5.0.16-r30 [new file with mode: 0644]
dev-db/mysql/files/mysql-slot.rc6
dev-db/mysql/mysql-4.0.26-r30.ebuild [deleted file]
dev-db/mysql/mysql-4.1.15-r30.ebuild
dev-db/mysql/mysql-5.0.13_rc.ebuild [deleted file]
dev-db/mysql/mysql-5.0.16-r30.ebuild [new file with mode: 0644]
dev-db/mysql/mysql-5.0.16.ebuild [moved from dev-db/mysql/mysql-5.0.15-r30.ebuild with 55% similarity]

index 487a155883eef42e1dacb20e83035a92af02fbab..af06abee88fd9c47ee370594a64c8f652ab4ff0c 100644 (file)
@@ -1,6 +1,30 @@
 # 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.263 2005/11/21 13:17:45 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.264 2005/11/23 02:09:51 vivo Exp $
+
+*mysql-5.0.16-r30 (23 Nov 2005)
+*mysql-5.0.16 (23 Nov 2005)
+
+  23 Nov 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6,
+  -mysql-4.0.26-r30.ebuild, mysql-4.1.15-r30.ebuild,
+  -mysql-5.0.13_rc.ebuild, -mysql-5.0.15-r30.ebuild, +mysql-5.0.16.ebuild,
+  +mysql-5.0.16-r30.ebuild:
+  Version bump for the 5.0 series.
+  The ebuild has been rewritten, it's the first step to slot the mysql database
+  server. (diff 5.0.16 and 5.0.16-r30 if you don't belive at it)
+  
+  Also the rc scripts are changed, hopefully bug #109380 is gone (Thanks to
+  Rodrigo Severo for shaping it).
+  
+  It's possible from now start more than one server tweaking the
+  /etc/conf.d/mysql .
+  
+  The future of slotted MySQL is still uncertain but the rc script will be kept.
+  
+  More than uncertain is the slotting of MySQL-4.0 too.
+  
+  reassuming, be careful playing with these ebuilds, never ever "~ARCH" keywords
+  has been so unstable.
 
   21 Nov 2005; Guy Martin <gmsoft@gentoo.org> mysql-4.1.14.ebuild:
   Stable on hppa.
index 3fbf939de6dfb6c8b7e3a288c3c5dbce4a3e66f6..30d38e5aabd2ab7865e4986edf1edc6469d7a1be 100644 (file)
@@ -1,33 +1,31 @@
-MD5 d03173cbe63775e2b629c9cd82be8e7e ChangeLog 48737
-MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 432e8894444e71bc477ef7a68ce5d819 mysql-4.1.14.ebuild 18859
-MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
-MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008
-MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
-MD5 662ccd43b0d8861cd0a7216828cceb76 mysql-5.0.13_rc.ebuild 18768
-MD5 30d53356599a3edfe8eee21930f678d1 mysql-4.1.15.ebuild 18881
-MD5 e76952be1da3d57167807176d7f17760 mysql-4.0.26-r30.ebuild 15570
-MD5 c0bd3a276b8102df31e2130b5a74e224 mysql-4.1.15-r30.ebuild 15747
-MD5 74a34395d76d265b312feab60785ee94 mysql-5.0.15-r30.ebuild 15869
-MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
-MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
-MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
-MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
-MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
-MD5 713dc46b7ffa15edda542a15508ce07c files/digest-mysql-5.0.13_rc 142
+MD5 343d21d403b401a0196720f7cca63dc6 ChangeLog 49658
 MD5 bd6b9a577a5647c86a61e04416d21be1 files/digest-mysql-3.23.58-r1 140
-MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15 139
-MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26-r30 139
-MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15-r30 139
-MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15-r30 139
-MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
-MD5 05b7f9542728418c0f46d9037d32e0c7 files/mysql-slot.rc6 7758
-MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
+MD5 a1ce75bb181f38bde0b8e7ea749d0ff5 files/digest-mysql-4.0.25-r2 139
+MD5 159e00d2b1c7784aa4c7ca4a1182ac17 files/digest-mysql-4.0.26 139
+MD5 9040858b685242247ae7973f7e886ea2 files/digest-mysql-4.1.14 139
+MD5 cffe948509c4dfbd74c8325456af1212 files/digest-mysql-4.1.15 139
+MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r30 139
+MD5 fefe35cd4b1f8d6a19d399276497431f files/digest-mysql-5.0.15 139
+MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16 139
+MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r30 139
 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 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
 MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
+MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
+MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
+MD5 033dfac33983899ef35d291ad9c1a2f7 files/mysql-slot.rc6 8660
 MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
+MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
+MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
+MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
+MD5 432e8894444e71bc477ef7a68ce5d819 mysql-4.1.14.ebuild 18859
+MD5 8f0459b59aef1d70d7ebe22109aa121e mysql-4.1.15-r30.ebuild 21938
+MD5 30d53356599a3edfe8eee21930f678d1 mysql-4.1.15.ebuild 18881
+MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008
+MD5 b9be9054b1943a0ed306bd28a75d6b2f mysql-5.0.16-r30.ebuild 21938
+MD5 02aca753b257c9a9cdaceaf609c99803 mysql-5.0.16.ebuild 21361
index 38f31096918fc7b2dad1fa02c22ec084738abd67..cb17084fcc411e85048f4c4b0111d445491f92a0 100644 (file)
@@ -1,2 +1,2 @@
 MD5 68a47ff8c1f0c24866a792f6b3bb59d6 mysql-4.0.25.tar.gz 11159288
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
index 0165f0321bce2ae74027d0992b97e9ebab104885..8ecbbb37d656d8da790aa45e7c9d42c61ad3c38d 100644 (file)
@@ -1,2 +1,2 @@
 MD5 4e2060a3875470e0d853391e8647a019 mysql-4.0.26.tar.gz 11144366
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.26-r30 b/dev-db/mysql/files/digest-mysql-4.0.26-r30
deleted file mode 100644 (file)
index 0165f03..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4e2060a3875470e0d853391e8647a019 mysql-4.0.26.tar.gz 11144366
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
index 530f960597fefe0fff38d83c94abecf63851553e..6e45780948f7d4e6611b24f4baf10f945061228f 100644 (file)
@@ -1,2 +1,2 @@
 MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
index 6b4725ac1cefa6dbfb2bbc710f53c5d9327eb660..3dcdee5a9c20004be7a753ff2282be99d5260963 100644 (file)
@@ -1,2 +1,2 @@
 MD5 65a0841e592641b8816f9212aaa40176 mysql-4.1.15.tar.gz 17257765
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
index 6b4725ac1cefa6dbfb2bbc710f53c5d9327eb660..ed0a7a3295423ea836c4facfaa7fec1640020379 100644 (file)
@@ -1,2 +1,2 @@
 MD5 65a0841e592641b8816f9212aaa40176 mysql-4.1.15.tar.gz 17257765
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
diff --git a/dev-db/mysql/files/digest-mysql-5.0.13_rc b/dev-db/mysql/files/digest-mysql-5.0.13_rc
deleted file mode 100644 (file)
index 7336d58..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d9500d81b4253142a2a3c68b53942aab mysql-5.0.13-rc.tar.gz 19209618
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
index 9d25b38b16cd68b08e45fee094d000139952267a..1dcfde32898b6229c42e205b8bcb27a733880165 100644 (file)
@@ -1,2 +1,2 @@
 MD5 b19e03de0ec348552b4bfac2e215f335 mysql-5.0.15.tar.gz 18813065
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-5.0.15-r30 b/dev-db/mysql/files/digest-mysql-5.0.15-r30
deleted file mode 100644 (file)
index 9d25b38..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b19e03de0ec348552b4bfac2e215f335 mysql-5.0.15.tar.gz 18813065
-MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-5.0.16 b/dev-db/mysql/files/digest-mysql-5.0.16
new file mode 100644 (file)
index 0000000..0a23c70
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 ecf2ae1d782a8d129af940c15a44f477 mysql-5.0.16.tar.gz 19031670
+MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
diff --git a/dev-db/mysql/files/digest-mysql-5.0.16-r30 b/dev-db/mysql/files/digest-mysql-5.0.16-r30
new file mode 100644 (file)
index 0000000..0a23c70
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 ecf2ae1d782a8d129af940c15a44f477 mysql-5.0.16.tar.gz 19031670
+MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
index 75efdb637d5c7d30d3bd3e049a395cdf1589f4b7..1a9ec12093e6db048ea42f06eee6f4f66fd0e104 100644 (file)
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/mysql-slot.rc6,v 1.2 2005/11/20 13:37:21 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.3 2005/11/23 02:09:52 vivo Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -32,6 +32,7 @@ get_slot_config() {
        # grab the parameters from conf.d/mysql definition
        local tmp_eval="mysql_slot_${srv_slot}${srv_num:+"_"}${srv_num}[@]"
        local conf_d_parameters="${!tmp_eval}"
+       [[ ${conf_d_parameters[*]} == '()' ]] && conf_d_parameters=''
        MY_SUFFIX="-${srv_slot}"
        [[ "${MY_SUFFIX}" == '-0' ]] && MY_SUFFIX=''
        MY_CNF="/etc/mysql${MY_SUFFIX}/my.cnf"
@@ -81,12 +82,17 @@ get_slot_config() {
                                socket="${my_default#socket=}"
                                paramlist="${paramlist}--${my_default%%=*},"
                                ;;
-                       *)
+                       *=*)
                                # list of parameters we already have
                                # prepend "--" because my_print_defaults do it
                                paramlist="${paramlist}--${my_default%%=*},"
                                # little trick from mysqld_safe
                                unmanagedparams="${unmanagedparams} $(echo "--${my_default}" | sed -e 's,\([^=/a-zA-Z0-9_.-]\),\\\1,g')"
+                               ;;
+                       *)
+                               paramlist="${paramlist}--${my_default},"
+                               unmanagedparams="${unmanagedparams} --${my_default}"
+                               ;;
                esac
        done
 
@@ -115,9 +121,15 @@ get_slot_config() {
                                if ! in_list "${my_default%%=*}" "${paramlist}" ; then
                                        socket="${my_default#--socket=}"
                                fi ;;
-                       *)
+                       *=*)
                                # check into the list of parameters we already have
-                               if ! in_list "${my_default%%=*}" "${paramlist}" ; then
+                               if ! in_list "${my_default%%=*}" "${paramlist}"; then
+                                       paramlist="${paramlist}${my_default%%=*},"
+                                       unmanagedparams="${unmanagedparams} $(echo "${my_default}" | sed -e 's,\([^=/a-zA-Z0-9_.-]\),\\\1,g')"
+                               fi
+                               ;;
+                       *)
+                               if ! in_list "${my_default}" "${paramlist}"; then
                                        paramlist="${paramlist}${my_default%%=*},"
                                        unmanagedparams="${unmanagedparams} $(echo "${my_default}" | sed -e 's,\([^=/a-zA-Z0-9_.-]\),\\\1,g')"
                                fi
@@ -258,6 +270,7 @@ start() {
 stop () {
        MYSQL_GLOB_PID_FILE=${MYSQL_GLOB_PID_FILE:-"/var/run/svc-started-mysqld"}
        local runwhat pidfile shutdown_elem
+       local PID cnt
        local retstatus=0
        local shutdown_list="$(tac "${MYSQL_GLOB_PID_FILE}")"
        # shutdown in reverse order
@@ -265,7 +278,32 @@ stop () {
                runwhat=${shutdown_elem%%=*}
                pidfile=${shutdown_elem#*=}
                ebegin "Stopping mysqld (${runwhat})"
-               start-stop-daemon --stop --retry 5 --quiet --pidfile="${pidfile}"
+               # following code grabbed from the squid rc script
+               PID=$(cat /var/run/squid.pid 2>/dev/null)
+               start-stop-daemon --stop --quiet --pidfile="${pidfile}"
+        sleep 2
+               if test -n "$PID" && kill -0 $PID 2>/dev/null
+               then
+                       einfon "Waiting ."
+                       cnt=0
+                       while kill -0 $PID 2>/dev/null
+                       do
+                               cnt=`expr $cnt + 1`
+                               if [ $cnt -gt 60 ]
+                               then
+                                       # Waited 120 seconds now. Fail.
+                                       eend 1 "Failed."
+                                       break
+                               fi
+                               sleep 2
+                               echo -n "."
+                       done
+                       echo -n "done."
+                               eend 0
+               else
+                       eend 0
+               fi
+               # end stolen code
                retstatus=$(( $retstatus + $? ))
        done
        [[ "$retstatus" -eq 0 ]] && rm -f "$MYSQL_GLOB_PID_FILE"
diff --git a/dev-db/mysql/mysql-4.0.26-r30.ebuild b/dev-db/mysql/mysql-4.0.26-r30.ebuild
deleted file mode 100644 (file)
index 71e67ca..0000000
+++ /dev/null
@@ -1,516 +0,0 @@
-# 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-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
-
-MYSQL_VERSION_ID=40026
-PROTOCOL_VERSION=8
-NDB_VERSION_ID=0
-SLOT="${MYSQL_VERSION_ID}"
-
-inherit eutils gnuconfig flag-o-matic versionator
-
-SVER=${PV%.*}
-PLV=""
-NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}"
-
-# shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/${PN}"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-       mirror://gentoo/mysql-extras-20050920.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="-*"
-IUSE="berkdb debug minimal perl selinux ssl static tcpd big-tables"
-RESTRICT="primaryuri"
-
-DEPEND=">=sys-libs/readline-4.1
-               bdb? ( sys-apps/ed )
-               tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-               ssl? ( >=dev-libs/openssl-0.9.6d )
-               userland_GNU? ( sys-process/procps )
-               >=sys-libs/zlib-1.2.3
-               >=sys-apps/texinfo-4.7-r1
-               >=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-               selinux? ( sec-policy/selinux-mysql )"
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( dev-perl/DBD-mysql )"
-
-mysql_version_is_at_least() {
-
-       local want_s="$1" have_s="${2:-${MYSQL_VERSION_ID}}"
-       [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value"
-
-       [[ ${want_s} -le ${have_s} ]] \
-       && return 0 \
-       || return 1
-}
-
-mysql_upgrade_warning() {
-       : # TODO
-}
-
-mysql_init_vars() {
-
-       MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
-       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"}
-       MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"}
-       MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"}
-       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"}
-       MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"}
-       MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"}
-
-       # source configure.in for this one
-       AVAILABLE_LANGUAGES="\
-czech danish dutch english estonian french german greek hungarian \
-italian japanese korean norwegian norwegian-ny polish portuguese \
-romanian russian slovak spanish swedish ukrainian"
-
-       if [ -z "${DATADIR}" ]; then
-               DATADIR=""
-               if [ -f "${SYSCONFDIR}/my.cnf" ] ; then
-                       DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-                       if [ -z "${DATADIR}" ]; then
-                               DATADIR=`grep ^datadir "${SYSCONFDIR}/my.cnf" | sed -e 's/.*=\s*//'`
-                       fi
-               fi
-               if [ -z "${DATADIR}" ]; then
-                       DATADIR="${MY_LOCALSTATEDIR}"
-                       einfo "Using default DATADIR"
-               fi
-               einfo "MySQL DATADIR is ${DATADIR}"
-
-               if [ -z "${PREVIOUS_DATADIR}" ] ; then
-                       if [ -a "${DATADIR}" ] ; then
-                               ewarn "Previous datadir found, it's YOUR job to change"
-                               ewarn "ownership and have care of it"
-                               PREVIOUS_DATADIR="yes"
-                               export PREVIOUS_DATADIR
-                       else
-                               PREVIOUS_DATADIR="no"
-                               export PREVIOUS_DATADIR
-                       fi
-               fi
-       fi
-
-       export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
-       export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-       export MY_INCLUDEDIR
-       export DATADIR AVAILABLE_LANGUAGES
-}
-
-pkg_setup() {
-
-       enewgroup mysql 60 || die "problem adding group mysql"
-       enewuser mysql 60 -1 /dev/null mysql \
-       || die "problem adding user mysql"
-}
-
-src_unpack() {
-       if useq static && useq ssl; then
-               local msg="MySQL does not support building statically with SSL support"
-               eerror "${msg}"
-               die "${msg}"
-       fi
-
-       unpack ${A} || die
-
-       mv "${WORKDIR}/${NEWP}" "${S}"
-       cd "${S}"
-
-       # TODO ensure we are using system libraries
-
-       local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
-
-       #zap startup script messages
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0.23-install-db-sh.diff" || die
-       #zap binary distribution stuff
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-mysqld-safe-sh.diff" || die
-       # isam index lenght
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0-nisam.h.diff" || die
-       # hardcoded sysconf directory, managed by slotting code
-       #epatch "${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff" || die
-       # NPTL support
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff" || die
-
-       # attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-       # i would really prefer to fix this at the Makefile.am level, but can't
-       # get the software to autoreconf as distributed - too many missing files
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0.21-thrssl.patch" || die
-
-       # PIC fixes
-       # bug #42968
-       epatch "${MY_PATCH_SOURCE}/${PN}-4.0.25-r2-asm-pic-fixes.patch" || die
-
-       if useq tcpd; then
-               epatch "${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff" || die
-       fi
-
-       for d in ${S} ${S}/innobase; do
-               cd ${d}
-               # WARNING, plain autoconf breaks it!
-               #autoconf
-               # must use this instead
-               WANT_AUTOCONF=2.59 autoreconf --force
-               # Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!"
-               libtoolize --copy --force
-               # Saving this for a rainy day, in case we need it again
-               #WANT_AUTOMAKE=1.7 automake
-               gnuconfig_update
-       done
-}
-
-src_compile() {
-       mysql_init_vars
-       local myconf
-
-       use static \
-               && myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-               || myconf="${myconf} --enable-shared --enable-static"
-
-       myconf="${myconf} `use_with tcpd libwrap`"
-
-       use ssl \
-               && myconf="${myconf} --with-vio --with-openssl" \
-               || myconf="${myconf} --without-openssl"
-
-       myconf="${myconf} `use_with debug` `use_with big-tables`"
-
-       # benchmarking stuff needs perl
-       # and shouldn't be bothered with on minimal builds
-       if useq perl && ! useq minimal; then
-               myconf="${myconf} --with-bench"
-       else
-               myconf="${myconf} --without-bench"
-       fi
-
-       # these are things we exclude from a minimal build
-       # note that the server actually does get built and installed
-       # but we then delete it before packaging.
-       local minimal_exclude_list="server embedded-server extra-tools innodb"
-       if ! useq minimal; then
-               for i in ${minimal_exclude_list}; do
-                       myconf="${myconf} --with-${i}"
-               done
-
-               if useq static ; then
-                       myconf="${myconf} --without-raid"
-                       ewarn "disabling raid support, has problem with static"
-               else
-                       myconf="${myconf} --with-raid"
-               fi
-
-               # lots of chars
-               myconf="${myconf} --with-extra-charsets=all"
-
-               #The following fix is due to a bug with bdb on sparc's. See:
-               #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-               # it boils down to non-64 bit safety.
-               if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
-               then
-                       myconf="${myconf} --without-berkeley-db"
-               else
-                       use berkdb \
-                               && myconf="${myconf} --with-berkeley-db=./bdb" \
-                               || myconf="${myconf} --without-berkeley-db"
-               fi
-
-       else
-               for i in ${minimal_exclude_list}; do
-                       myconf="${myconf} --without-${i}"
-               done
-               myconf="${myconf} --without-berkeley-db"
-               myconf="${myconf} --with-extra-charsets=none"
-       fi
-
-       # glibc-2.3.2_pre fix; bug #16496
-       append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-       #bug fix for #15099, should make this api backward compatible
-       append-flags "-DUSE_OLD_FUNCTIONS"
-
-       #the compiler flags are as per their "official" spec ;)
-       #CFLAGS="${CFLAGS/-O?/} -O3" \
-       export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
-
-       econf \
-               -C \
-               --program-suffix="${MY_SUFFIX}" \
-               --libexecdir="/usr/sbin" \
-               --sysconfdir="${MY_SYSCONFDIR}" \
-               --localstatedir="${MY_LOCALSTATEDIR}" \
-               --sharedstatedir="${MY_SHAREDSTATEDIR}" \
-               --libdir="${MY_LIBDIR}" \
-               --includedir="${MY_INCLUDEDIR}" \
-               --with-low-memory \
-               --enable-assembler \
-               --with-charset=latin1 \
-               --enable-local-infile \
-               --with-mysqld-user=mysql \
-               --with-client-ldflags=-lstdc++ \
-               --enable-thread-safe-client \
-               --with-comment="Gentoo Linux ${PF}" \
-               --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
-               --without-readline \
-               --without-docs \
-               ${myconf} || die "bad ./configure"
-
-       # TODO Move this before autoreconf !!!
-       find . -name 'Makefile' \
-       -exec sed --in-place \
-       -e 's|^pkglibdir\s*=\s*$(libdir)/mysql|pkglibdir = $(libdir)|' \
-       -e 's|^pkgincludedir\s*=\s*$(includedir)/mysql|pkgincludedir = $(includedir)|' \
-       {} \;
-
-       emake || die "compile problem"
-}
-
-src_test() {
-       cd ${S}
-       einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-       make check || die "make check failed"
-       if ! useq minimal; then
-               local retstatus
-               einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-               addpredict /this-dir-does-not-exist/t9.MYI
-               make test
-               retstatus=$?
-
-               # to be sure ;)
-               pkill -9 -f ${S}/ndb/ 2>/dev/null
-               pkill -9 -f ${S}/sql/ 2>/dev/null
-               [[ $retstatus == 0 ]] || die "make test failed"
-
-       else
-               einfo "Skipping server tests due to minimal build."
-       fi
-}
-
-src_install() {
-
-       mysql_init_vars
-       make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
-
-       # TODO : is this a work for eselect ?
-       # move client libs, install a couple of missing headers
-       dosym \
-               "${MY_LIBDIR}/libmysqlclient.so" \
-               "${MY_LIBDIR}/../libmysqlclient.so"
-       dosym \
-               "${MY_LIBDIR}/libmysqlclient_r.so" \
-               "${MY_LIBDIR}/../libmysqlclient_r.so"
-
-       insinto "${MY_INCLUDEDIR}"
-       doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
-
-       # convenience links
-       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}"
-       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}"
-       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}"
-
-       rm -rf "${D}/usr/share/info"
-
-       # various junk
-       rm -f "${D}/usr/share/mysql"/mysql-log-rotate
-       rm -f "${D}/usr/share/mysql"/mysql.server*
-       rm -f "${D}/usr/share/mysql"/binary-configure*
-       rm -f "${D}/usr/share/mysql"/my-*.cnf # Put them elsewhere
-       rm -f "${D}/usr/share/mysql"/mi_test_all*
-
-       # mmh buggy install code || buggy ebuild (always true)?
-       # this should be in ${MY_SHAREDSTATEDIR}
-       for moveme in charsets $AVAILABLE_LANGUAGES     ; do
-               mv "${D}/usr/share/mysql/${moveme}" "${D}${MY_SHAREDSTATEDIR}/"
-       done
-
-       local notcatched=$(ls "${D}/usr/share/mysql"/*)
-       if [[ -n "${notcatched}" ]] ; then
-               ewarn "QA notice"
-               ewarn "${notcatched} files in /usr/share/mysql"
-               ewarn "bug mysql-herd to manage them"
-       fi
-       rm -rf "${D}/usr/share/mysql"
-
-       # clean up stuff for a minimal build
-       # this is anything server-specific
-       if useq minimal; then
-               rm -rf ${D}${MY_SHAREDSTATEDIR}/{mysql-test,sql-bench}
-               rm -f ${D}/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
-               rm -f "${D}/usr/sbin/mysqld${MY_SUFFIX}"
-               rm -f ${D}${MY_LIBDIR}/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
-       fi
-
-       # TODO
-       # config stuff
-       insinto "${MY_SYSCONFDIR}"
-       doins scripts/mysqlaccess.conf
-       newins "${FILESDIR}/my.cnf-4.0.24-r1" my.cnf
-
-       # minimal builds don't have the server
-       if ! useq minimal; then
-               exeinto /etc/init.d
-               # TODO
-               newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" "mysql"
-               insinto /etc/logrotate.d
-               # TODO
-               newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
-
-               #empty dirs...
-               diropts "-m0750"
-               if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-                       dodir "${DATADIR}"
-                       keepdir "${DATADIR}"
-                       chown -R mysql:mysql "${D}/${DATADIR}"
-               fi
-
-               diropts "-m0755"
-               for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
-                       dodir "${folder}"
-                       keepdir "${folder}"
-                       chown -R mysql:mysql "${folder}"
-               done
-       fi
-
-       # docs
-       dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
-       # minimal builds don't have the server
-       if ! useq minimal; then
-               docinto conf-samples
-               dodoc support-files/my-*.cnf
-       fi
-}
-
-pkg_preinst() {
-
-       enewgroup mysql 60 || die "problem adding group mysql"
-       enewuser mysql 60 -1 /dev/null mysql \
-       || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-
-       mysql_init_vars
-       # mind at FEATURES=collision-protect before to remove this
-       [ -d "${ROOT}/var/log/mysql" ] \
-               || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
-
-       #secure the logfiles... does this bother anybody?
-       touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
-       chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
-       chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
-
-       if ! useq minimal; then
-               # your friendly public service announcement...
-               einfo
-               einfo "You might want to run:"
-               einfo "\"emerge --config =${PF}\""
-               einfo "if this is a new install."
-               einfo
-       fi
-
-       mysql_upgrade_warning
-       einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
-
-pkg_config() {
-
-       # need empty datadir
-       echo "1) chroot the server";
-
-       # need empty datadir
-       echo "2) install system tables";
-
-       # need system tables + prev. db running
-       echo "3) copy previous database";
-
-       # create a bunch of symlinks, bin, sbin, man, share, etc
-       echo "4) make default install (client binaries and library)"
-
-       # need external tools
-       echo "5) rebuild dependancies"
-
-       # TODO chroot
-       # /chroot/mysql${MY_SUFFIX}
-       # etc/mysql
-       # tmp
-       # /var/tmp/../log/../run/
-
-       # cp /usr/local/libexec/mysqld /chroot/mysql/usr/local/libexec/
-       # cp -Rv /usr/local/share/mysql /chroot/mysql/usr/local/share/
-       # cp /etc/hosts /chroot/mysql/etc/
-       # cp /etc/resolv.conf /chroot/mysql/etc/
-       # cp /etc/group /chroot/mysql/etc/
-       # cp /etc/master.passwd /chroot/mysql/etc/passwords
-       # cp /etc/my.cnf /chroot/mysql/etc/
-
-       # /chroot/mysql/etc/passwords and /chroot/mysql/etc/group
-       # Remove every entry except for the sys and mysql group
-       # root and mysql.  Then change the root shell to /sbin/nologin
-
-       # mknod /chroot/mysql/dev/null c 2 2
-       # chown root:sys /chroot/mysql/dev/null
-       # chmod 666 /chroot/mysql/dev/null
-       # mknod null c 2 2
-       # mknod random c 2 3
-       # mknod urandom c 2 4
-       # mknod zero c 2 12
-
-       # /chroot/mysql/var/lib/mysql-cluster/config.ini
-
-       # install -C /usr/bin/cat /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/date /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/hostname /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/ls /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/rm /chroot/mysql-40026/usr/bin
-       # install -C /bin/bash /chroot/mysql-40026/usr/bin
-       # install -C /bin/sh /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/nohup /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/sed /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/tee /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/touch /chroot/mysql-40026/usr/bin
-       # install -C /usr/bin/chown /chroot/mysql/usr/sbin/
-       # install /usr/bin/true /chroot/mysql-40026/usr/bin
-       # install /usr/bin/expr /chroot/mysql-40026/usr/bin
-       # install /bin/kill /chroot/mysql-40026/usr/bin
-       # install /usr/bin/sed /chroot/mysql-40026/usr/bin
-       # install /bin/ps /chroot/mysql-40026/usr/bin
-       # install /bin/grep /chroot/mysql-40026/usr/bin
-       # install /usr/bin/tee /chroot/mysql-40026/usr/bin
-       # install /usr/bin/touch /chroot/mysql-40026/usr/bin
-       # install /bin/bash /chroot/mysql-40026/usr/bin
-       # install /bin/sh /chroot/mysql-40026/usr/bin
-       # install /usr/bin/echo /chroot/mysql-40026/usr/bin
-
-       # cp /usr/local/bin/my* /chroot/mysql/usr/local/bin/
-       # cp /usr/local/bin/safe_mysqld /chroot/mysql/usr/local/bin/
-
-       # chown -R root:sys /chroot/mysql
-       # chmod -R 755 /chroot/mysql
-       # chmod 1777 /chroot/mysql/tmp
-       # chown -R mysql:mysql /chroot/mysql/var/db/mysql
-
-#cp ld-*.so*
-#find . -type f -exec ldd {} 2>/dev/null \; \
-#|grep '=> /' \
-#|awk '{ print $3}' \
-#|sort \
-#|uniq
-
-#|awk -F"=>" {'print $2'}| awk -F" " {'print $1'} | grep -v '^(')
-
-
-#for i in $pippo ; do dirname $i >> etc/ld.so.conf.tmp ; done
-#sort etc/ld.so.conf.tmp | uniq > etc/ld.so.conf && rm etc/ld.so.conf.tmp
-#for i in $(cat etc/ld.so.conf) ; do mkdir -p ".${i}" ; done
-#for i in $pippo ; do cp $i /chroot/mysql-40026/$i ; done
-
-# env -i ldconfig -r /chroot/mysql-40026/
-#check:        ldconfig -p -r /chroot/mysql-40026/
-#/etc/ld.so.conf
-
-
-}
index b0398245a7fecc484dde946735613ded2bd29fd7..a10707be004adf5f3fb53f6fd583878b962811f7 100644 (file)
@@ -1,18 +1,23 @@
 # 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.15-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.2 2005/11/23 02:09:51 vivo Exp $
+
+# helper function, version (integer) may have section separated by dots
+# for readbility
+stripdots() {
+       local dotver=${1:-"0"}
+       while [[ "${dotver/./}" != "${dotver}" ]] ; do dotver="${dotver/./}" ; done
+       echo "${dotver:-"0"}"
+}
 
-MYSQL_VERSION_ID=40115
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+MYSQL_VERSION_ID=$(stripdots "4.01.26.30")
 PROTOCOL_VERSION=10
 NDB_VERSION_ID=40115
-SLOT="${MYSQL_VERSION_ID}"
-
-inherit eutils gnuconfig flag-o-matic versionator
-
-SVER=${PV%.*}
-NEWP="${PN}-${PV}"
-#NEWP="${NEWP/_beta/-beta}"
+#major, minor only in the slot
+SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
 
+inherit eutils flag-o-matic gnuconfig
 
 # shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -20,17 +25,17 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-       mirror://gentoo/mysql-extras-20050920.tar.bz2"
+NEWP="${PN}-${PV/_/-}"
+SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
+       mirror://gentoo/mysql-extras-20051122.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="-*"
-IUSE="big-tables berkdb debug minimal perl selinux ssl static tcpd"
+IUSE="big-tables berkdb debug minimal perl selinux ssl static"
 RESTRICT="primaryuri"
 
 DEPEND=">=sys-libs/readline-4.1
        bdb? ( sys-apps/ed )
-       tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
        ssl? ( >=dev-libs/openssl-0.9.6d )
        userland_GNU? ( sys-process/procps )
        >=sys-libs/zlib-1.2.3
@@ -40,29 +45,97 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
+# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
+# (nice) idea from versionator.eclass
 mysql_version_is_at_least() {
-
-       local want_s="$1" have_s="${2:-${MYSQL_VERSION_ID}}"
+       local want_s=$(stripdots "$1") have_s=$( stripdots "${2:-${MYSQL_VERSION_ID}}")
        [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value"
-
-       [[ ${want_s} -le ${have_s} ]] \
-       && return 0 \
-       || return 1
+       [[ ${want_s} -le ${have_s} ]] && return 0 || return 1
 }
 
-if mysql_version_is_at_least 40103 ; then
-       # 2005-09-29
-       #   geometry has been removed due to repeated compile problems _without_ it.
-       #   From now on it will be *always* enabled
-       #   if you need to compile *without it* take a look at
-       #       http://lists.mysql.com/internals/29559
+if mysql_version_is_at_least "4.01.03.00" ; then
        IUSE="${IUSE} cluster utf8 extraengine"
 fi
 
-mysql_upgrade_error() {
-       : # TODO
+# bool mysql_check_version_range(char * range, int ver=MYSQL_VERSION_ID, int die_on_err=MYSQL_DIE_ON_RANGE_ERROR)
+#
+# Check if a version number fall inside a range.
+# the range include the extremes and must be specified as
+# "low_version to hi_version" i.e. "4.00.00.00 to 5.01.99.99"
+# Return true if inside the range
+# 2005-11-19 <vivo at gentoo.org>
+mysql_check_version_range() {
+       local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
+       local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       [[ $lbound -le $my_ver && $my_ver -le $rbound ]] && return 0
+       return 1
+}
+
+# private bool _mysql_test_patch_easy( int flags, char * pname )
+#
+# true if found at least one appliable range
+# 2005-11-19 <vivo at gentoo.org>
+_mysql_test_patch_easy() {
+       local filesdir="${WORKDIR}/mysql-extras"
+       [[ -d "${filesdir}" ]] || die 'sourcedir must be a directory'
+       local flags=$1 pname=$2
+       if [[ $(( $flags & 5 )) -eq 5 ]] ; then
+               einfo "using \"${pname}\""
+               mv "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "cannot move ${pname}"
+               return 0
+       fi
+       return 1
 }
 
+# void mysql_mv_patches(char * index_file, char * filesdir, int my_ver)
+#
+# parse a "index_file" looking for patches to apply to current
+# version.
+# If the patch apply then print it's description
+# 2005-11-19 <vivo at gentoo.org>
+mysql_mv_patches() {
+       local index_file="${1:-"${WORKDIR}/mysql-extras/index.txt"}"
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       local my_test_fx=${3:-"_mysql_test_patch_easy"}
+       local dsc=(), ndsc=0 i
+
+       # values for flags are (2^x):
+       #  1 - one patch found
+       #  2 - at  least one version range is wrong
+       #  4 - at  least one version range is _good_
+       local flags=0 pname='' comments=''
+       while read row; do
+               case "${row}" in
+                       @patch\ *)
+                               ${my_test_fx} $flags "${pname}" \
+                               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+                               flags=1 ; ndsc=0 ; dsc=()
+                               pname=${row#"@patch "}
+                               ;;
+                       @ver\ *)
+                               if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
+                                       flags=$(( $flags | 4 ))
+                               else
+                                       flags=$(( $flags | 2 ))
+                               fi
+                               ;;
+                       # @use\ *) ;;
+                       @@\ *)
+                               dsc[$ndsc]="${row#"@@ "}"
+                               (( ++ndsc ))
+                               ;;
+               esac
+       done < "${index_file}"
+       ${my_test_fx} $flags "${pname}" \
+               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+}
+
+
+# void mysql_init_vars()
+#
+# initialize global variables
+# 2005-11-19 <vivo at gentoo.org>
 mysql_init_vars() {
 
        MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
@@ -73,12 +146,6 @@ mysql_init_vars() {
        MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"}
        MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"}
 
-       # source configure.in for this one
-       AVAILABLE_LANGUAGES="\
-czech danish dutch english estonian french german greek hungarian \
-italian japanese japanese-sjis korean norwegian norwegian-ny polish portuguese \
-romanian russian serbian slovak spanish swedish ukrainian"
-
        if [ -z "${DATADIR}" ]; then
                DATADIR=""
                if [ -f "${SYSCONFDIR}/my.cnf" ] ; then
@@ -109,7 +176,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
        export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
        export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
        export MY_INCLUDEDIR
-       export DATADIR AVAILABLE_LANGUAGES
+       export DATADIR
 }
 
 pkg_setup() {
@@ -121,13 +188,15 @@ pkg_setup() {
 
 src_unpack() {
 
+       mysql_init_vars
+
        if useq static && useq ssl; then
                local msg="MySQL does not support building statically with SSL support"
                eerror "${msg}"
                die "${msg}"
        fi
 
-       if mysql_version_is_at_least 40103 \
+       if mysql_version_is_at_least "4.01.03.00" \
        && useq cluster \
        || useq extraengine \
        && useq minimal ; then
@@ -138,31 +207,54 @@ src_unpack() {
 
        mv "${WORKDIR}/${NEWP}" "${S}"
        cd "${S}"
-       rm -rf "${S}/zlib/"*.[ch]
+
+       EPATCH_SUFFIX="patch"
+       mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory"
+       mysql_mv_patches
+       epatch || die "failed to apply all patches"
+
+       # additional check, remove bundled zlib
+       rm -f "${S}/zlib/"*.[ch]
        sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+       rm -f scripts/mysqlbug
+
+       # Make charsets install in the right place
+       find . -name 'Makefile.am' \
+               -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+       # remove what need to be recreated, so we are sure it's actually done
+       find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+       rm ltmain.sh
+
+       local rebuilddirlist dl buildstep
 
-       local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
-
-       # TODO ensure we are using system libraries
-
-       epatch ${MY_PATCH_SOURCE}/010_all_my-print-defaults-r0.patch || die
-       epatch ${MY_PATCH_SOURCE}/030_all_thrssl-r1.patch || die
-       epatch ${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch || die
-       epatch ${MY_PATCH_SOURCE}/040_all_tcpd-vars-fix.patch || die
-
-       for d in ${S} ${S}/innobase; do
-               cd ${d}
-               # WARNING, plain autoconf breaks it!
-               #autoconf
-               # must use this instead
-               WANT_AUTOCONF="2.59" autoreconf --force
-               # Fix the evil "libtool.m4 and ltmain.sh have a version mismatch!"
-               libtoolize --copy --force
-               # Saving this for a rainy day, in case we need it again
-               #WANT_AUTOMAKE=1.7 automake
-               gnuconfig_update
+       if mysql_version_is_at_least "5.01.00.00" ; then
+               rebuilddirlist=( '.' 'storage/innobase' )
+       else
+               rebuilddirlist=( '.' 'innobase' )
+       fi
+
+       for dl in ${!rebuilddirlist[@]}; do
+               einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
+               pushd "${rebuilddirlist[${dl}]}"
+               for buildstep in \
+                       'libtoolize --copy --force' \
+                       'aclocal --force' \
+                       'autoheader --force -Wnone' \
+                       'autoconf --force -Wnone' \
+                       'automake --force --force-missing -Wnone' \
+                       'gnuconfig_update'
+               do
+                       einfo "performing ${buildstep}"
+                       ${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+               done
+               popd
        done
 
+       [[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
+       pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
+       popd
+
        # Temporary workaround for bug in test suite, a correct solution
        # should work inside the include files to enable/disable the tests
        # for the current configuration
@@ -176,7 +268,6 @@ src_unpack() {
                done
        fi
 
-
        if ! useq berkdb ; then
                einfo "disabling unneded berkdb tests"
                local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
@@ -200,13 +291,14 @@ src_compile() {
                myconf="${myconf} --enable-shared --enable-static"
        fi
 
-       myconf="${myconf} `use_with tcpd libwrap`"
+       #myconf="${myconf} `use_with tcpd libwrap`"
+       myconf="${myconf} --without-libwrap"
 
        if useq ssl ; then
                # --with-vio is not needed anymore, it's on by default and
                # has been removed from configure
-               mysql_version_is_at_least 50004 || myconf="${myconf} --with-vio"
-               if mysql_version_is_at_least 50006 ; then
+               mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio"
+               if mysql_version_is_at_least "5.00.06.00" ; then
                        # yassl-0.96 is young break with gcc-4.0 || amd64
                        #myconf="${myconf} --with-yassl"
                        myconf="${myconf} --with-openssl"
@@ -221,7 +313,7 @@ src_compile() {
                myconf="${myconf} --with-debug=full"
        else
                myconf="${myconf} --without-debug"
-               mysql_version_is_at_least 40103 && useq cluster && myconf="${myconf} --without-ndb-debug"
+               mysql_version_is_at_least "4.01.03.00" && useq cluster && myconf="${myconf} --without-ndb-debug"
        fi
 
        # benchmarking stuff needs perl
@@ -248,8 +340,8 @@ src_compile() {
                        myconf="${myconf} --with-raid"
                fi
 
-               if ! mysql_version_is_at_least 50000 ; then
-                       if mysql_version_is_at_least 40100 && useq utf8; then
+               if ! mysql_version_is_at_least "5.00.00.00" ; then
+                       if mysql_version_is_at_least "4.01.00.00" && useq utf8; then
                                myconf="${myconf} --with-charset=utf8"
                                myconf="${myconf} --with-collation=utf8_general_ci"
                        else
@@ -273,13 +365,13 @@ src_compile() {
                                || myconf="${myconf} --without-berkeley-db"
                fi
 
-               if mysql_version_is_at_least 40103 ; then
-                       myconf="${myconf} --with-geometry"
+               if mysql_version_is_at_least "4.01.03.00" ; then
                        #myconf="${myconf} $(use_with geometry)"
+                       myconf="${myconf} --with-geometry"
                        myconf="${myconf} $(use_with cluster ndbcluster)"
                fi
 
-               mysql_version_is_at_least 40111 &&  myconf="${myconf} --with-big-tables"
+               mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} --with-big-tables"
        else
                for i in ${minimal_exclude_list}; do
                        myconf="${myconf} --without-${i}"
@@ -288,20 +380,20 @@ src_compile() {
                myconf="${myconf} --with-extra-charsets=none"
        fi
 
-       if mysql_version_is_at_least 40103 && useq extraengine; then
+       if mysql_version_is_at_least "4.01.03.00" && useq extraengine; then
                # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
                myconf="${myconf} --with-archive-storage-engine"
                # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-               mysql_version_is_at_least 40104 \
+               mysql_version_is_at_least "4.01.04.00" \
                && myconf="${myconf} --with-csv-storage-engine"
                # http://dev.mysql.com/doc/mysql/en/federated-description.html
                # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-               if mysql_version_is_at_least 50003 ; then
+               if mysql_version_is_at_least "5.00.03.00" ; then
                        einfo "before to use federated engine be sure to read"
                        einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
                        myconf="${myconf} --with-federated-storage-engine"
                fi
-               mysql_version_is_at_least 40111 \
+               mysql_version_is_at_least "4.01.11.00" \
                &&  myconf="${myconf} --with-blackhole-storage-engine"
        fi
 
@@ -313,8 +405,9 @@ src_compile() {
        #the compiler flags are as per their "official" spec ;)
        #CFLAGS="${CFLAGS/-O?/} -O3" \
        export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
-       mysql_version_is_at_least 50000 \
+       mysql_version_is_at_least "5.00.00.00" \
        && export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+
        econf \
                --program-suffix="${MY_SUFFIX}" \
                --libexecdir="/usr/sbin" \
@@ -333,7 +426,6 @@ src_compile() {
                --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
                --with-zlib-dir=/usr \
                --with-lib-ccflags="-fPIC" \
-               --program-suffix="${MY_SUFFIX}" \
                --without-readline \
                --without-docs \
                ${myconf} || die "bad ./configure"
@@ -357,7 +449,7 @@ src_test() {
                local retstatus
                addpredict /this-dir-does-not-exist/t9.MYI
 
-               mysql_version_is_at_least 50013 \
+               mysql_version_is_at_least "5.00.15.00" \
                && make test-force-pl \
                || make test-pl
                retstatus=$?
@@ -393,31 +485,34 @@ src_install() {
        dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}"
        dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}"
 
+       # various junk (my-*.cnf moved elsewhere)
        rm -rf "${D}/usr/share/info"
+       for removeme in  "mysql-log-rotate" mysql.server* \
+               binary-configure* my-*.cnf mi_test_all*
+       do
+               rm -f "${D}/usr/share/mysql/${removeme}"
+       done
+
+       # oops
+       mysql_check_version_range "5.00.16.00 to 5.00.16.99" \
+       && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
 
-       # various junk
-       rm -f "${D}/usr/share/mysql"/mysql-log-rotate
-       rm -f "${D}/usr/share/mysql"/mysql.server*
-       rm -f "${D}/usr/share/mysql"/binary-configure*
-       rm -f "${D}/usr/share/mysql"/my-*.cnf # Put them elsewhere
-       rm -f "${D}/usr/share/mysql"/mi_test_all*
-       rm -f "${D}/usr/share/mysql"/mysql_fix_privilege_tables.sql
-       rm -f "${D}/usr/share/mysql"/fill_help_tables.sql
-       rm -f "${D}/usr/share/mysql"/ndb-config-2-node.ini
-
-       # mmh buggy install code || buggy ebuild (always true)?
-       # this should be in ${MY_SHAREDSTATEDIR}
-       for moveme in charsets $AVAILABLE_LANGUAGES     ; do
-               mv "${D}/usr/share/mysql/${moveme}" "${D}${MY_SHAREDSTATEDIR}/"
+       # TODO change at Makefile-am level
+       for moveme in "mysql_fix_privilege_tables.sql" \
+               "fill_help_tables.sql" "ndb-config-2-node.ini"
+       do
+               mv "${D}/usr/share/mysql/${moveme}"/ "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
        done
 
-       local notcatched=$(ls "${D}/usr/share/mysql"/*)
-       if [[ -n "${notcatched}" ]] ; then
-               ewarn "QA notice"
-               ewarn "${notcatched} files in /usr/share/mysql"
-               ewarn "bug mysql-herd to manage them"
+       if [[ -n "${MY_SUFFIX}" ]] ; then
+               local notcatched=$(ls "${D}/usr/share/mysql"/*)
+               if [[ -n "${notcatched}" ]] ; then
+                       ewarn "QA notice"
+                       ewarn "${notcatched} files in /usr/share/mysql"
+                       ewarn "bug mysql-herd to manage them"
+               fi
+               rm -rf "${D}/usr/share/mysql"
        fi
-       rm -rf "${D}/usr/share/mysql"
 
        # clean up stuff for a minimal build
        # this is anything server-specific
@@ -428,22 +523,24 @@ src_install() {
                rm -f ${D}${MY_LIBDIR}/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
        fi
 
-       # TODO
        # config stuff
        insinto "${MY_SYSCONFDIR}"
        doins scripts/mysqlaccess.conf
        newins "${FILESDIR}/my.cnf-4.1" my.cnf
+       insinto "/etc/conf.d"
+       newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
 
-       if mysql_version_is_at_least 40103 && ! useq utf8; then
-               sed --in-place -e "s/utf8/latin1/" \
-                       "${D}/etc/mysql${MY_SUFFIX}/my.cnf"
-       fi
+       local charset='utf8'
+       ! useq utf8 && local charset='latin1'
+       sed --in-place \
+               -e "s/@MY_SUFFIX@/${MY_SUFFIX}/" \
+               -e "s/@CHARSET@/${charset}/" \
+               "${D}/etc/mysql${MY_SUFFIX}/my.cnf"
 
        # minimal builds don't have the server
        if ! useq minimal; then
                exeinto /etc/init.d
-               # TODO
-               newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" "mysql"
+               newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
                insinto /etc/logrotate.d
                # TODO
                newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
@@ -451,6 +548,7 @@ src_install() {
                #empty dirs...
                diropts "-m0750"
                if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+                       addwrite "${DATADIR}"
                        dodir "${DATADIR}"
                        keepdir "${DATADIR}"
                        chown -R mysql:mysql "${D}/${DATADIR}"
@@ -458,6 +556,7 @@ src_install() {
 
                diropts "-m0755"
                for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+                       addwrite "${folder}"
                        dodir "${folder}"
                        keepdir "${folder}"
                        chown -R mysql:mysql "${folder}"
@@ -479,8 +578,7 @@ src_install() {
 
                docinto "scripts"
                for script in \
-                       $(ls scripts/mysql* | grep -v '.sh$') \
-                       scripts/*.sql
+                       $(ls scripts/mysql* | grep -v '.sh$')
                do
                        dodoc "${script}"
                done
@@ -497,6 +595,7 @@ pkg_preinst() {
 pkg_postinst() {
 
        mysql_init_vars
+
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
                || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
@@ -510,16 +609,132 @@ pkg_postinst() {
                # your friendly public service announcement...
                einfo
                einfo "You might want to run:"
-               einfo "\"emerge --config =${PF}\""
+               einfo "\"emerge --config =${CATEGORY}/${PF}\""
                einfo "if this is a new install."
                einfo
        fi
 
-       mysql_upgrade_warning
        einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
-       : # TODO
-}
+       mysql_init_vars
+       [[ -z "${DATADIR}" ]] && die "sorry, unable to find DATADIR"
+
+       if built_with_use dev-db/mysql minimal; then
+               die "Minimal builds do NOT include the MySQL server"
+       fi
+
+       local menusel
+
+       cat <<-EOF
+        ========
+       ||
+       || 1) Create system database
+       || 2) [TODO] Copy needed file to chroot
+       || 3) [TODO] Make the default server (symlink)
+
+       EOF
+
+       read menusel
+       echo
+       [[ -z "${menusel}" ]] || [[ "${menusel}" == 0 ]] && return 0
+       if [[ "${menusel}" == '1' ]]
+       then
+               local pwd1="a"
+               local pwd2="b"
+               local maxtry=5
+
+               if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
+                       ewarn "You have already a MySQL database in place."
+                       ewarn "(${ROOT}/${DATADIR}/*)"
+                       ewarn "Please rename or delete it if you wish to replace it."
+                       die "MySQL database already exists!"
+               fi
+
+               einfo "Creating the mysql database and setting proper"
+               einfo "permissions on it..."
+
+               einfo "Insert a password for the mysql 'root' user"
+               ewarn "Avoid [\"'\\_%] characters in the password"
+
+               read -rsp "    >" pwd1 ; echo
+               einfo "Check the password"
+               read -rsp "    >" pwd2 ; echo
 
+               if [[ "x$pwd1" != "x$pwd2" ]] ; then
+                       die "Passwords are not the same"
+               fi
+
+               chown -R mysql:mysql ${ROOT}/${DATADIR}
+               chmod 0750 ${ROOT}/${DATADIR}
+
+               local options=""
+               local sqltmp="$(emktemp)"
+
+               local help_tables="${ROOT}/usr/share/doc/mysql-${PVR}/scripts/fill_help_tables.sql.gz"
+               [[ -r "${help_tables}" ]] \
+               && zcat "${help_tables}" > "${TMPDIR}/fill_help_tables.sql" \
+               || touch "${TMPDIR}/fill_help_tables.sql"
+               help_tables="${TMPDIR}/fill_help_tables.sql"
+
+               pushd "${TMPDIR}"
+               ${ROOT}/usr/bin/mysql_install_db${MY_SUFFIX} || die "MySQL databases not installed"
+               popd
+
+               if mysql_version_is_at_least "4.01.03.00" ; then
+                       options="--skip-ndbcluster"
+
+                       # Filling timezones, see
+                       # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+                       ${ROOT}/usr/bin/mysql_tzinfo_to_sql${MY_SUFFIX} ${ROOT}/usr/share/zoneinfo \
+                       > "${sqltmp}"
+
+                       if [[ -r "${help_tables}" ]] ; then
+                               cat "${help_tables}" >> "${sqltmp}"
+                       fi
+               fi
+
+               local socket=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+               local pidfile=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+               local mysqld="${ROOT}/usr/sbin/mysqld${MY_SUFFIX} \
+                       ${options} \
+                       --skip-grant-tables \
+                       --basedir=${ROOT}/usr \
+                       --datadir=${ROOT}/${DATADIR} \
+                       --skip-innodb \
+                       --skip-bdb \
+                       --max_allowed_packet=8M \
+                       --net_buffer_length=16K \
+                       --socket=${socket} \
+                       --pid-file=${pidfile}"
+
+               $mysqld &
+               while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+               do
+                       maxtry=$(($maxtry-1))
+                       echo -n "."
+                       sleep 1
+               done
+
+               # do this from memory we don't want clear text password in temp files
+               local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+               ${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+                       --socket=${socket} \
+                       -hlocalhost \
+                       -e "${sql}"
+
+               einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+               ${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+                       --socket=${socket} \
+                       -hlocalhost \
+                       -uroot \
+                       -p"${pwd1}" \
+                       mysql < "${sqltmp}"
+
+               kill $(< "${pidfile}" )
+               rm  "${sqltmp}"
+               einfo "done"
+       fi # menusel
+}
diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild
deleted file mode 100644 (file)
index 3c47ab6..0000000
+++ /dev/null
@@ -1,610 +0,0 @@
-# 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.9 2005/10/27 22:17:31 vivo Exp $
-
-inherit eutils flag-o-matic versionator
-
-SVER=${PV%.*}
-NEWP="${PN}-${PV}"
-NEWP="${NEWP/_beta/-beta}"
-NEWP="${NEWP/_rc/-rc}"
-
-
-# shorten the path because the socket path length must be shorter than 107 chars
-# and we will run a mysql server during test phase
-S="${WORKDIR}/${PN}"
-
-DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
-HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-       mirror://gentoo/mysql-extras-20050920.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
-RESTRICT="primaryuri"
-
-DEPEND="readline? ( >=sys-libs/readline-4.1 )
-       bdb? ( sys-apps/ed )
-       ssl? ( >=dev-libs/openssl-0.9.6d )
-       perl? ( dev-lang/perl )
-       userland_GNU? ( sys-process/procps )
-       >=sys-libs/zlib-1.2.3
-       >=sys-apps/texinfo-4.7-r1
-       >=sys-apps/sed-4"
-RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
-# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
-
-if version_is_at_least "4.1.3" ; then
-       # 2005-09-29
-       #   geometry has been removed due to repeated compile problems _without_ it.
-       #   From now on it will be always enabled
-       IUSE="${IUSE} cluster utf8 extraengine"
-fi
-
-mysql_upgrade_error() {
-       ewarn "Sorry, plain up/downgrade between different version of MySQL is (still)"
-       ewarn "un-supported."
-       ewarn "Some gentoo documentation on how to do it:"
-       ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
-       ewarn "Also on the MySQL website:"
-       ewarn "http://dev.mysql.com/doc/refman/5.0/en/upgrading-from-4-1.html"
-       ewarn ""
-       ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
-       ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
-       ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)"
-}
-
-mysql_upgrade_warning() {
-       ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
-       ewarn "must recompile the other packages on your system that link with"
-       ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-       ewarn "of packages for your system, you may use:"
-       ewarn "revdep-rebuild --soname=libmysqlclient.so.14"
-       ewarn "from app-portage/gentoolkit."
-       ewarn ""
-       ewarn "the value of \"innodb_log_file_size\" into /etc/mysql/my.cnf file "
-       ewarn "has changed size from \"8M\" to \"5M\"."
-       ewarn "To start mysql either revert the value back to \"8M\" or backup and"
-       ewarn "remove the old ib_logfile* from the datadir"
-}
-
-mysql_get_datadir() {
-       DATADIR=""
-       if [ -f '/etc/mysql/my.cnf' ] ; then
-               #DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
-               #DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
-               DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-               if [ -z "${DATADIR}" ]; then
-                       DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
-                       einfo "Using default DATADIR"
-               fi
-       fi
-       if [ -z "${DATADIR}" ]; then
-               DATADIR="/var/lib/mysql/"
-               einfo "Using default DATADIR"
-       fi
-       einfo "MySQL DATADIR is ${DATADIR}"
-
-       if [ -z "${PREVIOUS_DATADIR}" ] ; then
-               if [ -a "${DATADIR}" ] ; then
-                       ewarn "Previous datadir found, it's YOUR job to change"
-                       ewarn "ownership and have care of it"
-                       PREVIOUS_DATADIR="yes"
-                       export PREVIOUS_DATADIR
-               else
-                       PREVIOUS_DATADIR="no"
-                       export PREVIOUS_DATADIR
-               fi
-       fi
-
-       export DATADIR
-}
-
-pkg_setup() {
-
-       if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
-               mysql_get_datadir
-               local curversion="dev-db/${PN}-${PV%.*}"
-               local oldversion="$(best_version dev-db/mysql)"
-               oldversion=${oldversion%.*}
-
-               # permit upgrade from old version if it's safe
-               useq minimal && oldversion=""
-               built_with_use dev-db/mysql minimal && oldversion=""
-               [[ -d "${DATADIR}/mysql" ]] || oldversion=""
-
-               if [[ -n "${oldversion}" ]] && [[ "${oldversion}" != "${curversion}" ]]
-               then
-                       mysql_upgrade_error
-                       eerror "MySQL-${oldversion} found, up/downgrade to \"${curversion}\" is unsupported"
-                       eerror "export MYSQL_STRAIGHT_UPGRADE=1 to force"
-                       die
-               fi
-       fi
-
-       mysql_upgrade_warning
-
-       enewgroup mysql 60 || die "problem adding group mysql"
-       enewuser mysql 60 -1 /dev/null mysql \
-       || die "problem adding user mysql"
-
-}
-
-src_unpack() {
-       if useq static && useq ssl; then
-               local msg="MySQL does not support building statically with SSL support"
-               eerror "${msg}"
-               die "${msg}"
-       fi
-
-       if version_is_at_least "4.1.3" \
-       && useq cluster \
-       || useq extraengine \
-       && useq minimal ; then
-               die "USEs cluster, extraengine conflicts with \"minimal\""
-       fi
-
-       unpack ${A} || die
-
-       mv "${WORKDIR}/${NEWP}" "${S}"
-       cd "${S}"
-       rm -rf "${S}/zlib/"*.[ch]
-       sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
-
-       local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
-
-       epatch "${MY_PATCH_SOURCE}/010_all_my-print-defaults-r2.patch" || die
-       epatch "${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch" || die
-       epatch "${MY_PATCH_SOURCE}/703_all_test-rpl_rotate_logs.patch" || die
-       #epatch "${MY_PATCH_SOURCE}/705_all_view_geometry.patch" || die
-
-       find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
-       aclocal && autoheader \
-               || die "failed reconfigure step 01"
-       libtoolize --automake --force \
-               || die "failed reconfigure step 02"
-       automake --force --add-missing && autoconf \
-               || die "failed reconfigure step 03"
-
-       if version_is_at_least "5.1_alpha" ; then
-               pushd storage/innobase || die "failed chdir"
-       else
-               pushd innobase || die "failed chroot"
-       fi
-       aclocal && autoheader && autoconf && automake
-       popd
-
-       pushd bdb/dist && sh s_all \
-               || die "failed bdb reconfigure"
-       popd
-
-       # Temporary workaround for bug in test suite, a correct solution
-       # should work inside the include files to enable/disable the tests
-       # for the current configuration
-
-       if ! useq extraengine ; then
-               einfo "disabling unneded extraengine tests"
-               local disable_test="archive bdb blackhole federated view csv"
-               for i in $disable_test ; do
-                       mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
-                       &> /dev/null
-               done
-       fi
-
-
-       if ! useq berkdb ; then
-               einfo "disabling unneded berkdb tests"
-               local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
-               for i in $disable_test ; do
-                       mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
-                       &> /dev/null
-               done
-       fi
-
-}
-
-src_compile() {
-       local myconf
-
-       # readline pair reads backwards on purpose, DONT change it around, Ok?
-       # this is because it refers to the building of a bundled readline
-       # versus the system copy
-       useq readline && myconf="${myconf} --without-readline"
-       useq readline || myconf="${myconf} --with-readline"
-
-       if useq static ; then
-               myconf="${myconf} --with-mysqld-ldflags=-all-static"
-               myconf="${myconf} --with-client-ldflags=-all-static"
-               myconf="${myconf} --disable-shared"
-       else
-               myconf="${myconf} --enable-shared --enable-static"
-       fi
-
-       #myconf="${myconf} `use_with tcpd libwrap`"
-       myconf="${myconf} --without-libwrap"
-
-       if useq ssl ; then
-               # --with-vio is not needed anymore, it's on by default and
-               # has been removed from configure
-               version_is_at_least "5.0.4_beta" || myconf="${myconf} --with-vio"
-               if version_is_at_least "5.0.6_beta" ; then
-                       # yassl-0.96 is young break with gcc-4.0 || amd64
-                       #myconf="${myconf} --with-yassl"
-                       myconf="${myconf} --with-openssl"
-               else
-                       myconf="${myconf} --with-openssl"
-               fi
-       else
-               myconf="${myconf} --without-openssl"
-       fi
-
-       if useq debug; then
-               myconf="${myconf} --with-debug=full"
-       else
-               myconf="${myconf} --without-debug"
-               version_is_at_least "4.1.3" && useq cluster && myconf="${myconf} --without-ndb-debug"
-       fi
-
-       # benchmarking stuff needs perl
-       # and shouldn't be bothered with on minimal builds
-       if useq perl && ! useq minimal; then
-               myconf="${myconf} --with-bench"
-       else
-               myconf="${myconf} --without-bench"
-       fi
-
-       # these are things we exclude from a minimal build
-       # note that the server actually does get built and installed
-       # but we then delete it before packaging.
-       local minimal_exclude_list="server embedded-server extra-tools innodb raid"
-       if ! useq minimal; then
-               for i in ${minimal_exclude_list}; do
-                       myconf="${myconf} --with-${i}"
-               done
-
-               if ! version_is_at_least "5.0_alpha" ; then
-                       if version_is_at_least "4.1_alpha" && useq utf8; then
-                               myconf="${myconf} --with-charset=utf8"
-                               myconf="${myconf} --with-collation=utf8_general_ci"
-                       else
-                               myconf="${myconf} --with-charset=latin1"
-                               myconf="${myconf} --with-collation=latin1_swedish_ci"
-                       fi
-               fi
-
-               # lots of chars
-               myconf="${myconf} --with-extra-charsets=all"
-
-               #The following fix is due to a bug with bdb on sparc's. See:
-               #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
-               # it comes down to non-64-bit safety problems
-               if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
-               then
-                       myconf="${myconf} --without-berkeley-db"
-               else
-                       useq berkdb \
-                               && myconf="${myconf} --with-berkeley-db=./bdb" \
-                               || myconf="${myconf} --without-berkeley-db"
-               fi
-
-               if version_is_at_least "4.1.3" ; then
-                       #myconf="${myconf} $(use_with geometry)"
-                       myconf="${myconf} --with-geometry"
-                       myconf="${myconf} $(use_with cluster ndbcluster)"
-               fi
-
-               version_is_at_least "4.1.11_alpha20050403" &&  myconf="${myconf} --with-big-tables"
-       else
-               for i in ${minimal_exclude_list}; do
-                       myconf="${myconf} --without-${i}"
-               done
-               myconf="${myconf} --without-berkeley-db"
-               myconf="${myconf} --with-extra-charsets=none"
-       fi
-
-       # documentation
-       myconf="${myconf} `use_with doc docs`"
-
-       if version_is_at_least "4.1.3" && useq extraengine; then
-               # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
-               myconf="${myconf} --with-archive-storage-engine"
-               # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-               version_is_at_least "4.1.4" \
-               && myconf="${myconf} --with-csv-storage-engine"
-               # http://dev.mysql.com/doc/mysql/en/federated-description.html
-               # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-               if version_is_at_least "5.0.3" ; then
-                       einfo "before to use federated engine be sure to read"
-                       einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-                       myconf="${myconf} --with-federated-storage-engine"
-               fi
-               version_is_at_least "4.1.11_alpha20050403" \
-               &&  myconf="${myconf} --with-blackhole-storage-engine"
-       fi
-
-       myconf="${myconf} `use_with big-tables`"
-
-       #glibc-2.3.2_pre fix; bug #16496
-       append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
-
-       #the compiler flags are as per their "official" spec ;)
-       #CFLAGS="${CFLAGS/-O?/} -O3" \
-       export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
-       version_is_at_least "5.0_alpha" \
-       && export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
-
-       econf \
-               --libexecdir=/usr/sbin \
-               --sysconfdir=/etc/mysql \
-               --localstatedir=/var/lib/mysql \
-               --with-low-memory \
-               --enable-assembler \
-               --enable-local-infile \
-               --with-mysqld-user=mysql \
-               --with-client-ldflags=-lstdc++ \
-               --enable-thread-safe-client \
-               --with-comment="Gentoo Linux ${PF}" \
-               --with-unix-socket-path=/var/run/mysqld/mysqld.sock \
-               --with-zlib-dir=/usr \
-               --with-lib-ccflags="-fPIC" \
-               ${myconf} || die "bad ./configure"
-
-       emake || die "compile problem"
-}
-
-src_test() {
-       cd ${S}
-       einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-       make check || die "make check failed"
-       if ! useq minimal; then
-               einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-               local retstatus
-               addpredict /this-dir-does-not-exist/t9.MYI
-
-               version_is_at_least "5.0.6_beta" \
-               && make test-force \
-               || make test
-               retstatus=$?
-
-               # to be sure ;)
-               pkill -9 -f "${S}/ndb" 2>/dev/null
-               pkill -9 -f "${S}/sql" 2>/dev/null
-               [[ $retstatus -eq 0 ]] || die "make test failed"
-       else
-               einfo "Skipping server tests due to minimal build."
-       fi
-}
-
-src_install() {
-       mysql_get_datadir
-       make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
-
-       # move client libs, install a couple of missing headers
-       local lib=$(get_libdir)
-       mv ${D}/usr/${lib}/mysql/libmysqlclient*.so* ${D}/usr/${lib}
-       dosym ../libmysqlclient.so /usr/${lib}/mysql/libmysqlclient.so
-       dosym ../libmysqlclient_r.so /usr/${lib}/mysql/libmysqlclient_r.so
-       insinto /usr/include/mysql ; doins include/{my_config.h,my_dir.h}
-
-       # convenience links
-       dosym /usr/bin/mysqlcheck /usr/bin/mysqlanalyze
-       dosym /usr/bin/mysqlcheck /usr/bin/mysqlrepair
-       dosym /usr/bin/mysqlcheck /usr/bin/mysqloptimize
-
-       # various junk
-       rm -f ${D}/usr/bin/make*distribution
-       rm -f ${D}/usr/share/mysql/make_*_distribution
-       rm -f ${D}/usr/share/mysql/mysql.server
-       rm -f ${D}/usr/share/mysql/binary-configure
-       rm -f ${D}/usr/share/mysql/mysql-log-rotate
-       rm -f ${D}/usr/share/mysql/{post,pre}install
-       rm -f ${D}/usr/share/mysql/mi_test*
-       rm -f ${D}/usr/share/mysql/*.spec # Redhat gunk
-       rm -f ${D}/usr/share/mysql/*.plist # Apple gunk
-       rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
-
-       # All of these (ab)use Perl.
-       if ! useq perl; then
-               rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
-               rm -f ${D}/usr/bin/mysqlhotcopy
-               rm -rf ${D}/usr/share/mysql/sql-bench
-       fi
-
-       # clean up stuff for a minimal build
-       # this is anything server-specific
-       if useq minimal; then
-               rm -rf ${D}/usr/share/mysql/{mysql-test,sql-bench}
-               rm -f ${D}/usr/bin/{mysql_install_db,mysqlmanager*,mysql_secure_installation,mysql_fix_privilege_tables,mysqlhotcopy,mysql_convert_table_format,mysqld_multi,mysql_fix_extensions,mysql_zap,mysql_explain_log,mysql_tableinfo,mysqld_safe,myisam*,isam*,mysql_install,mysql_waitpid,mysqlbinlog,mysqltest,pack_isam}
-               rm -f ${D}/usr/sbin/mysqld
-               rm -f ${D}/usr/lib/mysql/lib{heap,merge,nisam,mysys,mystrings,mysqld,myisammrg,vio,dbug,myisam}.a
-       fi
-
-       # config stuff
-       insinto /etc/mysql
-       doins scripts/mysqlaccess.conf
-
-       newins "${FILESDIR}/my.cnf-4.1" my.cnf
-
-       if version_is_at_least "4.1.3" && ! useq utf8; then
-               sed --in-place -e "s/utf8/latin1/" \
-                       ${D}/etc/mysql/my.cnf
-       fi
-
-       # minimal builds don't have the server
-       if ! useq minimal; then
-               exeinto /etc/init.d
-               newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
-               insinto /etc/logrotate.d
-               newins "${FILESDIR}/logrotate.mysql" mysql
-
-               #empty dirs...
-               diropts "-m0750"
-               if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-               dodir "${DATADIR}"
-               keepdir "${DATADIR}"
-               chown -R mysql:mysql "${D}/${DATADIR}"
-               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"
-
-               diropts "-m0755"
-               dodir "/var/run/mysqld"
-
-               keepdir "/var/run/mysqld"
-               chown -R mysql:mysql \
-               "${D}/var/run/mysqld"
-       fi
-
-       # docs
-       dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
-       # minimal builds don't have the server
-       if useq doc && ! useq minimal; then
-               dohtml Docs/*.html
-               dodoc Docs/manual.{txt,ps}
-               docinto conf-samples
-               dodoc support-files/my-*.cnf
-       fi
-}
-
-pkg_preinst() {
-       enewgroup mysql 60 || die "problem adding group mysql"
-       enewuser mysql 60 -1 /dev/null mysql \
-       || die "problem adding user mysql"
-}
-
-pkg_postinst() {
-       mysql_get_datadir
-
-       # mind at FEATURES=collision-protect before to remove this
-       #empty dirs...
-       [ -d "${ROOT}/var/log/mysql" ] \
-               || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-       #secure the logfiles... does this bother anybody?
-       touch ${ROOT}/var/log/mysql/mysql.{log,err}
-       chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-       chmod 0660 ${ROOT}/var/log/mysql/mysql*
-       # secure some directories
-       chmod 0750 ${ROOT}/var/log/mysql
-
-       if ! useq minimal; then
-               # your friendly public service announcement...
-               einfo
-               einfo "You might want to run:"
-               einfo "\"emerge --config =${PF}\""
-               einfo "if this is a new install."
-               einfo
-       fi
-
-       mysql_upgrade_warning
-       einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
-
-pkg_config() {
-       mysql_get_datadir
-
-       if built_with_use dev-db/mysql minimal; then
-               die "Minimal builds do NOT include the MySQL server"
-       fi
-
-       if [[ "$(pgrep mysqld)" != "" ]] ; then
-               die "Oops you already have a mysql daemon running!"
-       fi
-
-       local pwd1="a"
-       local pwd2="b"
-       local maxtry=5
-
-       if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
-               ewarn "You have already a MySQL database in place."
-               ewarn "Please rename it or delete it if you wish to replace it."
-               die "MySQL database already exists!"
-       fi
-
-       einfo "Creating the mysql database and setting proper"
-       einfo "permissions on it..."
-
-       einfo "Insert a password for the mysql 'root' user"
-       ewarn "Avoid [\"'\\_%] characters in the password"
-
-       read -rsp "    >" pwd1 ; echo
-       einfo "Check the password"
-       read -rsp "    >" pwd2 ; echo
-
-       if [[ "x$pwd1" != "x$pwd2" ]] ; then
-               die "Passwords are not the same"
-       fi
-
-       ${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
-
-       # MySQL 5.0 don't need this
-       chown -R mysql:mysql ${ROOT}/${DATADIR}
-       chmod 0750 ${ROOT}/${DATADIR}
-
-       local options=""
-       local sqltmp="$(emktemp)"
-       local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
-
-       if version_is_at_least "4.1.3" ; then
-               options="--skip-ndbcluster"
-
-               # Filling timezones, see
-               # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-               ${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo \
-               > "${sqltmp}"
-
-               if [[ -r "${help_tables}" ]] ; then
-                       cat "${help_tables}" >> "${sqltmp}"
-               fi
-       fi
-
-       local socket=${ROOT}/var/run/mysqld/mysqld.sock
-       local mysqld="${ROOT}/usr/sbin/mysqld \
-               ${options} \
-               --skip-grant-tables \
-               --basedir=${ROOT}/usr \
-               --datadir=${ROOT}/${DATADIR} \
-               --skip-innodb \
-               --skip-bdb \
-               --max_allowed_packet=8M \
-               --net_buffer_length=16K \
-               --socket=${socket} \
-               --pid-file=${ROOT}/var/run/mysqld/mysqld.pid"
-
-       $mysqld &
-       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
-       do
-               maxtry=$(($maxtry-1))
-               echo -n "."
-               sleep 1
-       done
-
-       # do this from memory we don't want clear text password in temp files
-       local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
-       ${ROOT}/usr/bin/mysql \
-               --socket=${ROOT}/var/run/mysqld/mysqld.sock \
-               -hlocalhost \
-               -e "${sql}"
-
-       einfo "Loading \"zoneinfo\" this step may require few seconds"
-
-       ${ROOT}/usr/bin/mysql \
-               --socket=${socket} \
-               -hlocalhost \
-               -uroot \
-               -p"${pwd1}" \
-               mysql < "${sqltmp}"
-
-       kill $( cat ${ROOT}/var/run/mysqld/mysqld.pid )
-       rm  "${sqltmp}"
-       einfo "done"
-}
diff --git a/dev-db/mysql/mysql-5.0.16-r30.ebuild b/dev-db/mysql/mysql-5.0.16-r30.ebuild
new file mode 100644 (file)
index 0000000..b8d2a86
--- /dev/null
@@ -0,0 +1,740 @@
+# 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.16-r30.ebuild,v 1.1 2005/11/23 02:09:51 vivo Exp $
+
+# helper function, version (integer) may have section separated by dots
+# for readbility
+stripdots() {
+       local dotver=${1:-"0"}
+       while [[ "${dotver/./}" != "${dotver}" ]] ; do dotver="${dotver/./}" ; done
+       echo "${dotver:-"0"}"
+}
+
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+MYSQL_VERSION_ID=$(stripdots "5.00.16.00")
+PROTOCOL_VERSION=10
+NDB_VERSION_ID=50016
+#major, minor only in the slot
+SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
+
+inherit eutils flag-o-matic gnuconfig
+
+# shorten the path because the socket path length must be shorter than 107 chars
+# and we will run a mysql server during test phase
+S="${WORKDIR}/${PN}"
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="http://www.mysql.com/"
+NEWP="${PN}-${PV/_/-}"
+SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
+       mirror://gentoo/mysql-extras-20051122.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="-*"
+IUSE="big-tables berkdb debug minimal perl selinux ssl static"
+RESTRICT="primaryuri"
+
+DEPEND=">=sys-libs/readline-4.1
+       bdb? ( sys-apps/ed )
+       ssl? ( >=dev-libs/openssl-0.9.6d )
+       userland_GNU? ( sys-process/procps )
+       >=sys-libs/zlib-1.2.3
+       >=sys-apps/texinfo-4.7-r1
+       >=sys-apps/sed-4"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
+# (nice) idea from versionator.eclass
+mysql_version_is_at_least() {
+       local want_s=$(stripdots "$1") have_s=$( stripdots "${2:-${MYSQL_VERSION_ID}}")
+       [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value"
+       [[ ${want_s} -le ${have_s} ]] && return 0 || return 1
+}
+
+if mysql_version_is_at_least "4.01.03.00" ; then
+       IUSE="${IUSE} cluster utf8 extraengine"
+fi
+
+# bool mysql_check_version_range(char * range, int ver=MYSQL_VERSION_ID, int die_on_err=MYSQL_DIE_ON_RANGE_ERROR)
+#
+# Check if a version number fall inside a range.
+# the range include the extremes and must be specified as
+# "low_version to hi_version" i.e. "4.00.00.00 to 5.01.99.99"
+# Return true if inside the range
+# 2005-11-19 <vivo at gentoo.org>
+mysql_check_version_range() {
+       local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
+       local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       [[ $lbound -le $my_ver && $my_ver -le $rbound ]] && return 0
+       return 1
+}
+
+# private bool _mysql_test_patch_easy( int flags, char * pname )
+#
+# true if found at least one appliable range
+# 2005-11-19 <vivo at gentoo.org>
+_mysql_test_patch_easy() {
+       local filesdir="${WORKDIR}/mysql-extras"
+       [[ -d "${filesdir}" ]] || die 'sourcedir must be a directory'
+       local flags=$1 pname=$2
+       if [[ $(( $flags & 5 )) -eq 5 ]] ; then
+               einfo "using \"${pname}\""
+               mv "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "cannot move ${pname}"
+               return 0
+       fi
+       return 1
+}
+
+# void mysql_mv_patches(char * index_file, char * filesdir, int my_ver)
+#
+# parse a "index_file" looking for patches to apply to current
+# version.
+# If the patch apply then print it's description
+# 2005-11-19 <vivo at gentoo.org>
+mysql_mv_patches() {
+       local index_file="${1:-"${WORKDIR}/mysql-extras/index.txt"}"
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       local my_test_fx=${3:-"_mysql_test_patch_easy"}
+       local dsc=(), ndsc=0 i
+
+       # values for flags are (2^x):
+       #  1 - one patch found
+       #  2 - at  least one version range is wrong
+       #  4 - at  least one version range is _good_
+       local flags=0 pname='' comments=''
+       while read row; do
+               case "${row}" in
+                       @patch\ *)
+                               ${my_test_fx} $flags "${pname}" \
+                               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+                               flags=1 ; ndsc=0 ; dsc=()
+                               pname=${row#"@patch "}
+                               ;;
+                       @ver\ *)
+                               if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
+                                       flags=$(( $flags | 4 ))
+                               else
+                                       flags=$(( $flags | 2 ))
+                               fi
+                               ;;
+                       # @use\ *) ;;
+                       @@\ *)
+                               dsc[$ndsc]="${row#"@@ "}"
+                               (( ++ndsc ))
+                               ;;
+               esac
+       done < "${index_file}"
+       ${my_test_fx} $flags "${pname}" \
+               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+}
+
+
+# void mysql_init_vars()
+#
+# initialize global variables
+# 2005-11-19 <vivo at gentoo.org>
+mysql_init_vars() {
+
+       MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
+       MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"}
+       MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"}
+       MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"}
+       MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql${MY_SUFFIX}"}
+       MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"}
+       MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"}
+
+       if [ -z "${DATADIR}" ]; then
+               DATADIR=""
+               if [ -f "${SYSCONFDIR}/my.cnf" ] ; then
+                       DATADIR=`"my_print_defaults${MY_SUFFIX}" mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+                       if [ -z "${DATADIR}" ]; then
+                               DATADIR=`grep ^datadir "${SYSCONFDIR}/my.cnf" | sed -e 's/.*=\s*//'`
+                       fi
+               fi
+               if [ -z "${DATADIR}" ]; then
+                       DATADIR="${MY_LOCALSTATEDIR}"
+                       einfo "Using default DATADIR"
+               fi
+               einfo "MySQL DATADIR is ${DATADIR}"
+
+               if [ -z "${PREVIOUS_DATADIR}" ] ; then
+                       if [ -a "${DATADIR}" ] ; then
+                               ewarn "Previous datadir found, it's YOUR job to change"
+                               ewarn "ownership and have care of it"
+                               PREVIOUS_DATADIR="yes"
+                               export PREVIOUS_DATADIR
+                       else
+                               PREVIOUS_DATADIR="no"
+                               export PREVIOUS_DATADIR
+                       fi
+               fi
+       fi
+
+       export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
+       export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
+       export MY_INCLUDEDIR
+       export DATADIR
+}
+
+pkg_setup() {
+
+       enewgroup mysql 60 || die "problem adding group mysql"
+       enewuser mysql 60 -1 /dev/null mysql \
+       || die "problem adding user mysql"
+}
+
+src_unpack() {
+
+       mysql_init_vars
+
+       if useq static && useq ssl; then
+               local msg="MySQL does not support building statically with SSL support"
+               eerror "${msg}"
+               die "${msg}"
+       fi
+
+       if mysql_version_is_at_least "4.01.03.00" \
+       && useq cluster \
+       || useq extraengine \
+       && useq minimal ; then
+               die "USEs cluster, extraengine conflicts with \"minimal\""
+       fi
+
+       unpack ${A} || die
+
+       mv "${WORKDIR}/${NEWP}" "${S}"
+       cd "${S}"
+
+       EPATCH_SUFFIX="patch"
+       mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory"
+       mysql_mv_patches
+       epatch || die "failed to apply all patches"
+
+       # additional check, remove bundled zlib
+       rm -f "${S}/zlib/"*.[ch]
+       sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+       rm -f scripts/mysqlbug
+
+       # Make charsets install in the right place
+       find . -name 'Makefile.am' \
+               -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
+
+       # remove what need to be recreated, so we are sure it's actually done
+       find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
+       rm ltmain.sh
+
+       local rebuilddirlist dl buildstep
+
+       if mysql_version_is_at_least "5.01.00.00" ; then
+               rebuilddirlist=( '.' 'storage/innobase' )
+       else
+               rebuilddirlist=( '.' 'innobase' )
+       fi
+
+       for dl in ${!rebuilddirlist[@]}; do
+               einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
+               pushd "${rebuilddirlist[${dl}]}"
+               for buildstep in \
+                       'libtoolize --copy --force' \
+                       'aclocal --force' \
+                       'autoheader --force -Wnone' \
+                       'autoconf --force -Wnone' \
+                       'automake --force --force-missing -Wnone' \
+                       'gnuconfig_update'
+               do
+                       einfo "performing ${buildstep}"
+                       ${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+               done
+               popd
+       done
+
+       [[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
+       pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
+       popd
+
+       # Temporary workaround for bug in test suite, a correct solution
+       # should work inside the include files to enable/disable the tests
+       # for the current configuration
+
+       if ! useq extraengine ; then
+               einfo "disabling unneded extraengine tests"
+               local disable_test="archive bdb blackhole federated view csv"
+               for i in $disable_test ; do
+                       mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+                       &> /dev/null
+               done
+       fi
+
+       if ! useq berkdb ; then
+               einfo "disabling unneded berkdb tests"
+               local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
+               for i in $disable_test ; do
+                       mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+                       &> /dev/null
+               done
+       fi
+}
+
+src_compile() {
+
+       mysql_init_vars
+       local myconf
+
+       if useq static ; then
+               myconf="${myconf} --with-mysqld-ldflags=-all-static"
+               myconf="${myconf} --with-client-ldflags=-all-static"
+               myconf="${myconf} --disable-shared"
+       else
+               myconf="${myconf} --enable-shared --enable-static"
+       fi
+
+       #myconf="${myconf} `use_with tcpd libwrap`"
+       myconf="${myconf} --without-libwrap"
+
+       if useq ssl ; then
+               # --with-vio is not needed anymore, it's on by default and
+               # has been removed from configure
+               mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio"
+               if mysql_version_is_at_least "5.00.06.00" ; then
+                       # yassl-0.96 is young break with gcc-4.0 || amd64
+                       #myconf="${myconf} --with-yassl"
+                       myconf="${myconf} --with-openssl"
+               else
+                       myconf="${myconf} --with-openssl"
+               fi
+       else
+               myconf="${myconf} --without-openssl"
+       fi
+
+       if useq debug; then
+               myconf="${myconf} --with-debug=full"
+       else
+               myconf="${myconf} --without-debug"
+               mysql_version_is_at_least "4.01.03.00" && useq cluster && myconf="${myconf} --without-ndb-debug"
+       fi
+
+       # benchmarking stuff needs perl
+       # and shouldn't be bothered with on minimal builds
+       if useq perl && ! useq minimal; then
+               myconf="${myconf} --with-bench"
+       else
+               myconf="${myconf} --without-bench"
+       fi
+
+       # these are things we exclude from a minimal build
+       # note that the server actually does get built and installed
+       # but we then delete it before packaging.
+       local minimal_exclude_list="server embedded-server extra-tools innodb"
+       if ! useq minimal; then
+               for i in ${minimal_exclude_list}; do
+                       myconf="${myconf} --with-${i}"
+               done
+
+               if useq static ; then
+                       myconf="${myconf} --without-raid"
+                       ewarn "disabling raid support, has problem with static"
+               else
+                       myconf="${myconf} --with-raid"
+               fi
+
+               if ! mysql_version_is_at_least "5.00.00.00" ; then
+                       if mysql_version_is_at_least "4.01.00.00" && useq utf8; then
+                               myconf="${myconf} --with-charset=utf8"
+                               myconf="${myconf} --with-collation=utf8_general_ci"
+                       else
+                               myconf="${myconf} --with-charset=latin1"
+                               myconf="${myconf} --with-collation=latin1_swedish_ci"
+                       fi
+               fi
+
+               # lots of chars
+               myconf="${myconf} --with-extra-charsets=all"
+
+               #The following fix is due to a bug with bdb on sparc's. See:
+               #http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
+               # it comes down to non-64-bit safety problems
+               if useq sparc || useq alpha || useq hppa || useq mips || useq amd64
+               then
+                       myconf="${myconf} --without-berkeley-db"
+               else
+                       useq berkdb \
+                               && myconf="${myconf} --with-berkeley-db=./bdb" \
+                               || myconf="${myconf} --without-berkeley-db"
+               fi
+
+               if mysql_version_is_at_least "4.01.03.00" ; then
+                       #myconf="${myconf} $(use_with geometry)"
+                       myconf="${myconf} --with-geometry"
+                       myconf="${myconf} $(use_with cluster ndbcluster)"
+               fi
+
+               mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} --with-big-tables"
+       else
+               for i in ${minimal_exclude_list}; do
+                       myconf="${myconf} --without-${i}"
+               done
+               myconf="${myconf} --without-berkeley-db"
+               myconf="${myconf} --with-extra-charsets=none"
+       fi
+
+       if mysql_version_is_at_least "4.01.03.00" && useq extraengine; then
+               # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
+               myconf="${myconf} --with-archive-storage-engine"
+               # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
+               mysql_version_is_at_least "4.01.04.00" \
+               && myconf="${myconf} --with-csv-storage-engine"
+               # http://dev.mysql.com/doc/mysql/en/federated-description.html
+               # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
+               if mysql_version_is_at_least "5.00.03.00" ; then
+                       einfo "before to use federated engine be sure to read"
+                       einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+                       myconf="${myconf} --with-federated-storage-engine"
+               fi
+               mysql_version_is_at_least "4.01.11.00" \
+               &&  myconf="${myconf} --with-blackhole-storage-engine"
+       fi
+
+       myconf="${myconf} `use_with big-tables`"
+
+       #glibc-2.3.2_pre fix; bug #16496
+       append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
+
+       #the compiler flags are as per their "official" spec ;)
+       #CFLAGS="${CFLAGS/-O?/} -O3" \
+       export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+       mysql_version_is_at_least "5.00.00.00" \
+       && export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
+
+       econf \
+               --program-suffix="${MY_SUFFIX}" \
+               --libexecdir="/usr/sbin" \
+               --sysconfdir="${MY_SYSCONFDIR}" \
+               --localstatedir="${MY_LOCALSTATEDIR}" \
+               --sharedstatedir="${MY_SHAREDSTATEDIR}" \
+               --libdir="${MY_LIBDIR}" \
+               --includedir="${MY_INCLUDEDIR}" \
+               --with-low-memory \
+               --enable-assembler \
+               --enable-local-infile \
+               --with-mysqld-user=mysql \
+               --with-client-ldflags=-lstdc++ \
+               --enable-thread-safe-client \
+               --with-comment="Gentoo Linux ${PF}" \
+               --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
+               --with-zlib-dir=/usr \
+               --with-lib-ccflags="-fPIC" \
+               --without-readline \
+               --without-docs \
+               ${myconf} || die "bad ./configure"
+
+       # TODO Move this before autoreconf !!!
+       find . -name 'Makefile' \
+       -exec sed --in-place \
+       -e 's|^pkglibdir\s*=\s*$(libdir)/mysql|pkglibdir = $(libdir)|' \
+       -e 's|^pkgincludedir\s*=\s*$(includedir)/mysql|pkgincludedir = $(includedir)|' \
+       {} \;
+
+       emake || die "compile problem"
+}
+
+src_test() {
+       cd ${S}
+       einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+       make check || die "make check failed"
+       if ! useq minimal; then
+               einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+               local retstatus
+               addpredict /this-dir-does-not-exist/t9.MYI
+
+               mysql_version_is_at_least "5.00.15.00" \
+               && make test-force-pl \
+               || make test-pl
+               retstatus=$?
+
+               # to be sure ;)
+               pkill -9 -f "${S}/ndb" 2>/dev/null
+               pkill -9 -f "${S}/sql" 2>/dev/null
+               [[ $retstatus -eq 0 ]] || die "make test failed"
+       else
+               einfo "Skipping server tests due to minimal build."
+       fi
+}
+
+src_install() {
+
+       mysql_init_vars
+       make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
+
+       # TODO : is this a work for eselect ?
+       # move client libs, install a couple of missing headers
+       dosym \
+               "${MY_LIBDIR}/libmysqlclient.so" \
+               "${MY_LIBDIR}/../libmysqlclient.so"
+       dosym \
+               "${MY_LIBDIR}/libmysqlclient_r.so" \
+               "${MY_LIBDIR}/../libmysqlclient_r.so"
+
+       insinto "${MY_INCLUDEDIR}"
+       doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
+
+       # convenience links
+       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlanalyze${MY_SUFFIX}"
+       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}"
+       dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}"
+
+       # various junk (my-*.cnf moved elsewhere)
+       rm -rf "${D}/usr/share/info"
+       for removeme in  "mysql-log-rotate" mysql.server* \
+               binary-configure* my-*.cnf mi_test_all*
+       do
+               rm -f "${D}/usr/share/mysql/${removeme}"
+       done
+
+       # oops
+       mysql_check_version_range "5.00.16.00 to 5.00.16.99" \
+       && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
+
+       # TODO change at Makefile-am level
+       for moveme in "mysql_fix_privilege_tables.sql" \
+               "fill_help_tables.sql" "ndb-config-2-node.ini"
+       do
+               mv "${D}/usr/share/mysql/${moveme}"/ "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
+       done
+
+       if [[ -n "${MY_SUFFIX}" ]] ; then
+               local notcatched=$(ls "${D}/usr/share/mysql"/*)
+               if [[ -n "${notcatched}" ]] ; then
+                       ewarn "QA notice"
+                       ewarn "${notcatched} files in /usr/share/mysql"
+                       ewarn "bug mysql-herd to manage them"
+               fi
+               rm -rf "${D}/usr/share/mysql"
+       fi
+
+       # clean up stuff for a minimal build
+       # this is anything server-specific
+       if useq minimal; then
+               rm -rf ${D}${MY_SHAREDSTATEDIR}/{mysql-test,sql-bench}
+               rm -f ${D}/usr/bin/{mysql{_install_db,manager*,_secure_installation,_fix_privilege_tables,hotcopy,_convert_table_format,d_multi,_fix_extensions,_zap,_explain_log,_tableinfo,d_safe,_install,_waitpid,binlog,test},myisam*,isam*,pack_isam}
+               rm -f "${D}/usr/sbin/mysqld${MY_SUFFIX}"
+               rm -f ${D}${MY_LIBDIR}/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
+       fi
+
+       # config stuff
+       insinto "${MY_SYSCONFDIR}"
+       doins scripts/mysqlaccess.conf
+       newins "${FILESDIR}/my.cnf-4.1" my.cnf
+       insinto "/etc/conf.d"
+       newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
+
+       local charset='utf8'
+       ! useq utf8 && local charset='latin1'
+       sed --in-place \
+               -e "s/@MY_SUFFIX@/${MY_SUFFIX}/" \
+               -e "s/@CHARSET@/${charset}/" \
+               "${D}/etc/mysql${MY_SUFFIX}/my.cnf"
+
+       # minimal builds don't have the server
+       if ! useq minimal; then
+               exeinto /etc/init.d
+               newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
+               insinto /etc/logrotate.d
+               # TODO
+               newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
+
+               #empty dirs...
+               diropts "-m0750"
+               if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+                       addwrite "${DATADIR}"
+                       dodir "${DATADIR}"
+                       keepdir "${DATADIR}"
+                       chown -R mysql:mysql "${D}/${DATADIR}"
+               fi
+
+               diropts "-m0755"
+               for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+                       addwrite "${folder}"
+                       dodir "${folder}"
+                       keepdir "${folder}"
+                       chown -R mysql:mysql "${folder}"
+               done
+       fi
+
+       # docs
+       dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
+       # minimal builds don't have the server
+       if ! useq minimal; then
+               docinto "support-files"
+               for script in \
+                       support-files/my-*.cnf \
+                       support-files/magic \
+                       support-files/ndb-config-2-node.ini
+               do
+                       dodoc "${script}"
+               done
+
+               docinto "scripts"
+               for script in \
+                       $(ls scripts/mysql* | grep -v '.sh$')
+               do
+                       dodoc "${script}"
+               done
+       fi
+}
+
+pkg_preinst() {
+
+       enewgroup mysql 60 || die "problem adding group mysql"
+       enewuser mysql 60 -1 /dev/null mysql \
+       || die "problem adding user mysql"
+}
+
+pkg_postinst() {
+
+       mysql_init_vars
+
+       # mind at FEATURES=collision-protect before to remove this
+       [ -d "${ROOT}/var/log/mysql" ] \
+               || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+
+       #secure the logfiles... does this bother anybody?
+       touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
+       chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
+       chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
+
+       if ! useq minimal; then
+               # your friendly public service announcement...
+               einfo
+               einfo "You might want to run:"
+               einfo "\"emerge --config =${CATEGORY}/${PF}\""
+               einfo "if this is a new install."
+               einfo
+       fi
+
+       einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
+}
+
+pkg_config() {
+       mysql_init_vars
+       [[ -z "${DATADIR}" ]] && die "sorry, unable to find DATADIR"
+
+       if built_with_use dev-db/mysql minimal; then
+               die "Minimal builds do NOT include the MySQL server"
+       fi
+
+       local menusel
+
+       cat <<-EOF
+        ========
+       ||
+       || 1) Create system database
+       || 2) [TODO] Copy needed file to chroot
+       || 3) [TODO] Make the default server (symlink)
+
+       EOF
+
+       read menusel
+       echo
+       [[ -z "${menusel}" ]] || [[ "${menusel}" == 0 ]] && return 0
+       if [[ "${menusel}" == '1' ]]
+       then
+               local pwd1="a"
+               local pwd2="b"
+               local maxtry=5
+
+               if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
+                       ewarn "You have already a MySQL database in place."
+                       ewarn "(${ROOT}/${DATADIR}/*)"
+                       ewarn "Please rename or delete it if you wish to replace it."
+                       die "MySQL database already exists!"
+               fi
+
+               einfo "Creating the mysql database and setting proper"
+               einfo "permissions on it..."
+
+               einfo "Insert a password for the mysql 'root' user"
+               ewarn "Avoid [\"'\\_%] characters in the password"
+
+               read -rsp "    >" pwd1 ; echo
+               einfo "Check the password"
+               read -rsp "    >" pwd2 ; echo
+
+               if [[ "x$pwd1" != "x$pwd2" ]] ; then
+                       die "Passwords are not the same"
+               fi
+
+               chown -R mysql:mysql ${ROOT}/${DATADIR}
+               chmod 0750 ${ROOT}/${DATADIR}
+
+               local options=""
+               local sqltmp="$(emktemp)"
+
+               local help_tables="${ROOT}/usr/share/doc/mysql-${PVR}/scripts/fill_help_tables.sql.gz"
+               [[ -r "${help_tables}" ]] \
+               && zcat "${help_tables}" > "${TMPDIR}/fill_help_tables.sql" \
+               || touch "${TMPDIR}/fill_help_tables.sql"
+               help_tables="${TMPDIR}/fill_help_tables.sql"
+
+               pushd "${TMPDIR}"
+               ${ROOT}/usr/bin/mysql_install_db${MY_SUFFIX} || die "MySQL databases not installed"
+               popd
+
+               if mysql_version_is_at_least "4.01.03.00" ; then
+                       options="--skip-ndbcluster"
+
+                       # Filling timezones, see
+                       # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+                       ${ROOT}/usr/bin/mysql_tzinfo_to_sql${MY_SUFFIX} ${ROOT}/usr/share/zoneinfo \
+                       > "${sqltmp}"
+
+                       if [[ -r "${help_tables}" ]] ; then
+                               cat "${help_tables}" >> "${sqltmp}"
+                       fi
+               fi
+
+               local socket=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+               local pidfile=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}${RANDOM}.sock
+               local mysqld="${ROOT}/usr/sbin/mysqld${MY_SUFFIX} \
+                       ${options} \
+                       --skip-grant-tables \
+                       --basedir=${ROOT}/usr \
+                       --datadir=${ROOT}/${DATADIR} \
+                       --skip-innodb \
+                       --skip-bdb \
+                       --max_allowed_packet=8M \
+                       --net_buffer_length=16K \
+                       --socket=${socket} \
+                       --pid-file=${pidfile}"
+
+               $mysqld &
+               while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+               do
+                       maxtry=$(($maxtry-1))
+                       echo -n "."
+                       sleep 1
+               done
+
+               # do this from memory we don't want clear text password in temp files
+               local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+               ${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+                       --socket=${socket} \
+                       -hlocalhost \
+                       -e "${sql}"
+
+               einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+               ${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+                       --socket=${socket} \
+                       -hlocalhost \
+                       -uroot \
+                       -p"${pwd1}" \
+                       mysql < "${sqltmp}"
+
+               kill $(< "${pidfile}" )
+               rm  "${sqltmp}"
+               einfo "done"
+       fi # menusel
+}
similarity index 55%
rename from dev-db/mysql/mysql-5.0.15-r30.ebuild
rename to dev-db/mysql/mysql-5.0.16.ebuild
index fd06dcab5892ad909e48646f2029edbefb254e2c..b169468d6bc151b36c34c43edc94fea4ac3ab87e 100644 (file)
@@ -1,18 +1,24 @@
 # 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.15-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16.ebuild,v 1.1 2005/11/23 02:09:51 vivo Exp $
+
+# helper function, version (integer) may have section separated by dots
+# for readbility
+stripdots() {
+       local dotver=${1:-"0"}
+       while [[ "${dotver/./}" != "${dotver}" ]] ; do dotver="${dotver/./}" ; done
+       echo "${dotver:-"0"}"
+}
 
-MYSQL_VERSION_ID=50015
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+MYSQL_VERSION_ID=$(stripdots "5.00.16.00")
 PROTOCOL_VERSION=10
-NDB_VERSION_ID=50015
-SLOT="${MYSQL_VERSION_ID}"
-
-inherit eutils flag-o-matic versionator
+NDB_VERSION_ID=50016
+#major, minor only in the slot
+SLOT=0
+#NOSLOT SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
 
-SVER=${PV%.*}
-NEWP="${PN}-${PV}"
-NEWP="${NEWP/_beta/-beta}"
-NEWP="${NEWP/_rc/-rc}"
+inherit eutils flag-o-matic gnuconfig
 
 # shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -20,11 +26,12 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-       mirror://gentoo/mysql-extras-20050920.tar.bz2"
+NEWP="${PN}-${PV/_/-}"
+SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz
+       mirror://gentoo/mysql-extras-20051122.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
 IUSE="big-tables berkdb debug minimal perl selinux ssl static"
 RESTRICT="primaryuri"
 
@@ -39,30 +46,101 @@ RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
+# Is $2 (defaults to $MYSQL_VERSION_ID) at least version $1?
+# (nice) idea from versionator.eclass
 mysql_version_is_at_least() {
-
-       local want_s="$1" have_s="${2:-${MYSQL_VERSION_ID}}"
+       local want_s=$(stripdots "$1") have_s=$( stripdots "${2:-${MYSQL_VERSION_ID}}")
        [[ -z "${want_s}" ]] && die "mysql_version_is_at_least missing value"
-
-       [[ ${want_s} -le ${have_s} ]] \
-       && return 0 \
-       || return 1
+       [[ ${want_s} -le ${have_s} ]] && return 0 || return 1
 }
 
-if mysql_version_is_at_least 40103 ; then
-       # 2005-09-29
-       #   geometry has been removed due to repeated compile problems _without_ it.
-       #   From now on it will be always enabled
+if mysql_version_is_at_least "4.01.03.00" ; then
        IUSE="${IUSE} cluster utf8 extraengine"
 fi
 
-mysql_upgrade_error() {
-       : # TODO
+# bool mysql_check_version_range(char * range, int ver=MYSQL_VERSION_ID, int die_on_err=MYSQL_DIE_ON_RANGE_ERROR)
+#
+# Check if a version number fall inside a range.
+# the range include the extremes and must be specified as
+# "low_version to hi_version" i.e. "4.00.00.00 to 5.01.99.99"
+# Return true if inside the range
+# 2005-11-19 <vivo at gentoo.org>
+mysql_check_version_range() {
+       local lbound="${1%% to *}" ; lbound=$(stripdots "${lbound}")
+       local rbound="${1#* to }"  ; rbound=$(stripdots "${rbound}")
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       [[ $lbound -le $my_ver && $my_ver -le $rbound ]] && return 0
+       return 1
+}
+
+# private bool _mysql_test_patch_easy( int flags, char * pname )
+#
+# true if found at least one appliable range
+# 2005-11-19 <vivo at gentoo.org>
+_mysql_test_patch_easy() {
+       local filesdir="${WORKDIR}/mysql-extras"
+       [[ -d "${filesdir}" ]] || die 'sourcedir must be a directory'
+       local flags=$1 pname=$2
+       if [[ $(( $flags & 5 )) -eq 5 ]] ; then
+               einfo "using \"${pname}\""
+               mv "${filesdir}/${pname}" "${EPATCH_SOURCE}" || die "cannot move ${pname}"
+               return 0
+       fi
+       return 1
+}
+
+# void mysql_mv_patches(char * index_file, char * filesdir, int my_ver)
+#
+# parse a "index_file" looking for patches to apply to current
+# version.
+# If the patch apply then print it's description
+# 2005-11-19 <vivo at gentoo.org>
+mysql_mv_patches() {
+       local index_file="${1:-"${WORKDIR}/mysql-extras/index.txt"}"
+       local my_ver="${2:-"${MYSQL_VERSION_ID}"}"
+       local my_test_fx=${3:-"_mysql_test_patch_easy"}
+       local dsc=(), ndsc=0 i
+
+       # values for flags are (2^x):
+       #  1 - one patch found
+       #  2 - at  least one version range is wrong
+       #  4 - at  least one version range is _good_
+       local flags=0 pname='' comments=''
+       while read row; do
+               case "${row}" in
+                       @patch\ *)
+                               ${my_test_fx} $flags "${pname}" \
+                               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
+                               flags=1 ; ndsc=0 ; dsc=()
+                               pname=${row#"@patch "}
+                               ;;
+                       @ver\ *)
+                               if mysql_check_version_range "${row#"@ver "}" "${my_ver}" ; then
+                                       flags=$(( $flags | 4 ))
+                               else
+                                       flags=$(( $flags | 2 ))
+                               fi
+                               ;;
+                       # @use\ *) ;;
+                       @@\ *)
+                               dsc[$ndsc]="${row#"@@ "}"
+                               (( ++ndsc ))
+                               ;;
+               esac
+       done < "${index_file}"
+       ${my_test_fx} $flags "${pname}" \
+               && for (( i=0 ; $i < $ndsc ; i++ )) ; do einfo ">    ${dsc[$i]}" ; done
 }
 
+
+# void mysql_init_vars()
+#
+# initialize global variables
+# 2005-11-19 <vivo at gentoo.org>
 mysql_init_vars() {
 
-       MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
+       MY_SUFFIX=""
+       #NOSLOT MY_SUFFIX=${MY_SUFFIX:-"-${SLOT}"}
        MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR:-"/usr/share/mysql${MY_SUFFIX}"}
        MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql${MY_SUFFIX}"}
        MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql${MY_SUFFIX}"}
@@ -70,12 +148,6 @@ mysql_init_vars() {
        MY_LOGDIR=${MY_LOGDIR="/var/log/mysql${MY_SUFFIX}"}
        MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql${MY_SUFFIX}"}
 
-       # source configure.in for this one
-       AVAILABLE_LANGUAGES="\
-czech danish dutch english estonian french german greek hungarian \
-italian japanese japanese-sjis korean norwegian norwegian-ny polish portuguese \
-romanian russian serbian slovak spanish swedish ukrainian"
-
        if [ -z "${DATADIR}" ]; then
                DATADIR=""
                if [ -f "${SYSCONFDIR}/my.cnf" ] ; then
@@ -106,7 +178,7 @@ romanian russian serbian slovak spanish swedish ukrainian"
        export MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
        export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
        export MY_INCLUDEDIR
-       export DATADIR AVAILABLE_LANGUAGES
+       export DATADIR
 }
 
 pkg_setup() {
@@ -118,13 +190,15 @@ pkg_setup() {
 
 src_unpack() {
 
+       mysql_init_vars
+
        if useq static && useq ssl; then
                local msg="MySQL does not support building statically with SSL support"
                eerror "${msg}"
                die "${msg}"
        fi
 
-       if mysql_version_is_at_least 40103 \
+       if mysql_version_is_at_least "4.01.03.00" \
        && useq cluster \
        || useq extraengine \
        && useq minimal ; then
@@ -135,36 +209,52 @@ src_unpack() {
 
        mv "${WORKDIR}/${NEWP}" "${S}"
        cd "${S}"
-       rm -rf "${S}/zlib/"*.[ch]
-       sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 
-       local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+       EPATCH_SUFFIX="patch"
+       mkdir -p "${EPATCH_SOURCE}" || die "unable to create epatch directory"
+       mysql_mv_patches
+       epatch || die "failed to apply all patches"
 
-       # TODO ensure we are using system libraries
+       # additional check, remove bundled zlib
+       rm -f "${S}/zlib/"*.[ch]
+       sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
+       rm -f scripts/mysqlbug
 
-       epatch "${MY_PATCH_SOURCE}/010_all_my-print-defaults-r2.patch" || die
-       epatch "${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch" || die
-       epatch "${MY_PATCH_SOURCE}/703_all_test-rpl_rotate_logs.patch" || die
-       #epatch "${MY_PATCH_SOURCE}/705_all_view_geometry.patch" || die
+       # Make charsets install in the right place
+       find . -name 'Makefile.am' \
+               -exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
+       # remove what need to be recreated, so we are sure it's actually done
        find . -name Makefile -o -name Makefile.in -o -name configure -exec rm {} \;
-       aclocal && autoheader \
-               || die "failed reconfigure step 01"
-       libtoolize --automake --force \
-               || die "failed reconfigure step 02"
-       automake --force --add-missing && autoconf \
-               || die "failed reconfigure step 03"
-
-       if mysql_version_is_at_least 50100 ; then
-               pushd storage/innobase || die "failed chdir"
+       rm ltmain.sh
+
+       local rebuilddirlist dl buildstep
+
+       if mysql_version_is_at_least "5.01.00.00" ; then
+               rebuilddirlist=( '.' 'storage/innobase' )
        else
-               pushd innobase || die "failed chroot"
+               rebuilddirlist=( '.' 'innobase' )
        fi
-       aclocal && autoheader && autoconf && automake
-       popd
 
-       pushd bdb/dist && sh s_all \
-               || die "failed bdb reconfigure"
+       for dl in ${!rebuilddirlist[@]}; do
+               einfo "reconfiguring phase $(( ${dl} + 1 )) of ${#rebuilddirlist[@]}"
+               pushd "${rebuilddirlist[${dl}]}"
+               for buildstep in \
+                       'libtoolize --copy --force' \
+                       'aclocal --force' \
+                       'autoheader --force -Wnone' \
+                       'autoconf --force -Wnone' \
+                       'automake --force --force-missing -Wnone' \
+                       'gnuconfig_update'
+               do
+                       einfo "performing ${buildstep}"
+                       ${buildstep} || die "failed ${buildstep/ */} ${rebuilddirlist[${dl}]}"
+               done
+               popd
+       done
+
+       [[ -w bdb/dist/ltmain.sh ]] && cp ltmain.sh bdb/dist/ltmain.sh
+       pushd bdb/dist && sh s_all || die "failed bdb reconfigure"
        popd
 
        # Temporary workaround for bug in test suite, a correct solution
@@ -180,7 +270,6 @@ src_unpack() {
                done
        fi
 
-
        if ! useq berkdb ; then
                einfo "disabling unneded berkdb tests"
                local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
@@ -210,8 +299,8 @@ src_compile() {
        if useq ssl ; then
                # --with-vio is not needed anymore, it's on by default and
                # has been removed from configure
-               mysql_version_is_at_least 50004 || myconf="${myconf} --with-vio"
-               if mysql_version_is_at_least 50006 ; then
+               mysql_version_is_at_least "5.00.04.00" || myconf="${myconf} --with-vio"
+               if mysql_version_is_at_least "5.00.06.00" ; then
                        # yassl-0.96 is young break with gcc-4.0 || amd64
                        #myconf="${myconf} --with-yassl"
                        myconf="${myconf} --with-openssl"
@@ -226,7 +315,7 @@ src_compile() {
                myconf="${myconf} --with-debug=full"
        else
                myconf="${myconf} --without-debug"
-               mysql_version_is_at_least 40103 && useq cluster && myconf="${myconf} --without-ndb-debug"
+               mysql_version_is_at_least "4.01.03.00" && useq cluster && myconf="${myconf} --without-ndb-debug"
        fi
 
        # benchmarking stuff needs perl
@@ -245,6 +334,7 @@ src_compile() {
                for i in ${minimal_exclude_list}; do
                        myconf="${myconf} --with-${i}"
                done
+
                if useq static ; then
                        myconf="${myconf} --without-raid"
                        ewarn "disabling raid support, has problem with static"
@@ -252,8 +342,8 @@ src_compile() {
                        myconf="${myconf} --with-raid"
                fi
 
-               if ! mysql_version_is_at_least 50000 ; then
-                       if mysql_version_is_at_least 40100 && useq utf8; then
+               if ! mysql_version_is_at_least "5.00.00.00" ; then
+                       if mysql_version_is_at_least "4.01.00.00" && useq utf8; then
                                myconf="${myconf} --with-charset=utf8"
                                myconf="${myconf} --with-collation=utf8_general_ci"
                        else
@@ -277,13 +367,13 @@ src_compile() {
                                || myconf="${myconf} --without-berkeley-db"
                fi
 
-               if mysql_version_is_at_least 40103 ; then
+               if mysql_version_is_at_least "4.01.03.00" ; then
                        #myconf="${myconf} $(use_with geometry)"
                        myconf="${myconf} --with-geometry"
                        myconf="${myconf} $(use_with cluster ndbcluster)"
                fi
 
-               mysql_version_is_at_least 40111 &&  myconf="${myconf} --with-big-tables"
+               mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} --with-big-tables"
        else
                for i in ${minimal_exclude_list}; do
                        myconf="${myconf} --without-${i}"
@@ -292,20 +382,20 @@ src_compile() {
                myconf="${myconf} --with-extra-charsets=none"
        fi
 
-       if mysql_version_is_at_least 40103 && useq extraengine; then
+       if mysql_version_is_at_least "4.01.03.00" && useq extraengine; then
                # http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
                myconf="${myconf} --with-archive-storage-engine"
                # http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-               mysql_version_is_at_least 40104 \
+               mysql_version_is_at_least "4.01.04.00" \
                && myconf="${myconf} --with-csv-storage-engine"
                # http://dev.mysql.com/doc/mysql/en/federated-description.html
                # http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-               if mysql_version_is_at_least 50003 ; then
+               if mysql_version_is_at_least "5.00.03.00" ; then
                        einfo "before to use federated engine be sure to read"
                        einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
                        myconf="${myconf} --with-federated-storage-engine"
                fi
-               mysql_version_is_at_least 40111 \
+               mysql_version_is_at_least "4.01.11.00" \
                &&  myconf="${myconf} --with-blackhole-storage-engine"
        fi
 
@@ -317,7 +407,7 @@ src_compile() {
        #the compiler flags are as per their "official" spec ;)
        #CFLAGS="${CFLAGS/-O?/} -O3" \
        export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
-       mysql_version_is_at_least 50000 \
+       mysql_version_is_at_least "5.00.00.00" \
        && export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 
        econf \
@@ -338,7 +428,6 @@ src_compile() {
                --with-unix-socket-path="/var/run/mysqld/mysqld${MY_SUFFIX}.sock" \
                --with-zlib-dir=/usr \
                --with-lib-ccflags="-fPIC" \
-               --program-suffix="${MY_SUFFIX}" \
                --without-readline \
                --without-docs \
                ${myconf} || die "bad ./configure"
@@ -362,7 +451,7 @@ src_test() {
                local retstatus
                addpredict /this-dir-does-not-exist/t9.MYI
 
-               mysql_version_is_at_least 50015 \
+               mysql_version_is_at_least "5.00.15.00" \
                && make test-force-pl \
                || make test-pl
                retstatus=$?
@@ -398,31 +487,34 @@ src_install() {
        dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqlrepair${MY_SUFFIX}"
        dosym "/usr/bin/mysqlcheck${MY_SUFFIX}" "/usr/bin/mysqloptimize${MY_SUFFIX}"
 
+       # various junk (my-*.cnf moved elsewhere)
        rm -rf "${D}/usr/share/info"
+       for removeme in  "mysql-log-rotate" mysql.server* \
+               binary-configure* my-*.cnf mi_test_all*
+       do
+               rm -f "${D}/usr/share/mysql/${removeme}"
+       done
+
+       # oops
+       mysql_check_version_range "5.00.16.00 to 5.00.16.99" \
+       && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
 
-       # various junk
-       rm -f "${D}/usr/share/mysql"/mysql-log-rotate
-       rm -f "${D}/usr/share/mysql"/mysql.server*
-       rm -f "${D}/usr/share/mysql"/binary-configure*
-       rm -f "${D}/usr/share/mysql"/my-*.cnf # Put them elsewhere
-       rm -f "${D}/usr/share/mysql"/mi_test_all*
-       rm -f "${D}/usr/share/mysql"/mysql_fix_privilege_tables.sql
-       rm -f "${D}/usr/share/mysql"/fill_help_tables.sql
-       rm -f "${D}/usr/share/mysql"/ndb-config-2-node.ini
-
-       # mmh buggy install code || buggy ebuild (always true)?
-       # this should be in ${MY_SHAREDSTATEDIR}
-       for moveme in charsets $AVAILABLE_LANGUAGES     errmsg.txt ; do
-               mv "${D}/usr/share/mysql/${moveme}" "${D}${MY_SHAREDSTATEDIR}/"
+       # TODO change at Makefile-am level
+       for moveme in "mysql_fix_privilege_tables.sql" \
+               "fill_help_tables.sql" "ndb-config-2-node.ini"
+       do
+               mv "${D}/usr/share/mysql/${moveme}"/ "${D}/usr/share/mysql${MY_SUFFIX}/" 2>/dev/null
        done
 
-       local notcatched=$(ls "${D}/usr/share/mysql"/*)
-       if [[ -n "${notcatched}" ]] ; then
-               ewarn "QA notice"
-               ewarn "${notcatched} files in /usr/share/mysql"
-               ewarn "bug mysql-herd to manage them"
+       if [[ -n "${MY_SUFFIX}" ]] ; then
+               local notcatched=$(ls "${D}/usr/share/mysql"/*)
+               if [[ -n "${notcatched}" ]] ; then
+                       ewarn "QA notice"
+                       ewarn "${notcatched} files in /usr/share/mysql"
+                       ewarn "bug mysql-herd to manage them"
+               fi
+               rm -rf "${D}/usr/share/mysql"
        fi
-       rm -rf "${D}/usr/share/mysql"
 
        # clean up stuff for a minimal build
        # this is anything server-specific
@@ -433,22 +525,24 @@ src_install() {
                rm -f ${D}${MY_LIBDIR}/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
        fi
 
-       # TODO
        # config stuff
        insinto "${MY_SYSCONFDIR}"
        doins scripts/mysqlaccess.conf
        newins "${FILESDIR}/my.cnf-4.1" my.cnf
+       insinto "/etc/conf.d"
+       newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
 
-       if mysql_version_is_at_least 40103 && ! useq utf8; then
-               sed --in-place -e "s/utf8/latin1/" \
-                       "${D}/etc/mysql${MY_SUFFIX}/my.cnf"
-       fi
+       local charset='utf8'
+       ! useq utf8 && local charset='latin1'
+       sed --in-place \
+               -e "s/@MY_SUFFIX@/${MY_SUFFIX}/" \
+               -e "s/@CHARSET@/${charset}/" \
+               "${D}/etc/mysql${MY_SUFFIX}/my.cnf"
 
        # minimal builds don't have the server
        if ! useq minimal; then
                exeinto /etc/init.d
-               # TODO
-               newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" "mysql"
+               newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
                insinto /etc/logrotate.d
                # TODO
                newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
@@ -456,6 +550,7 @@ src_install() {
                #empty dirs...
                diropts "-m0750"
                if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+                       addwrite "${DATADIR}"
                        dodir "${DATADIR}"
                        keepdir "${DATADIR}"
                        chown -R mysql:mysql "${D}/${DATADIR}"
@@ -463,6 +558,7 @@ src_install() {
 
                diropts "-m0755"
                for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do
+                       addwrite "${folder}"
                        dodir "${folder}"
                        keepdir "${folder}"
                        chown -R mysql:mysql "${folder}"
@@ -484,8 +580,7 @@ src_install() {
 
                docinto "scripts"
                for script in \
-                       $(ls scripts/mysql* | grep -v '.sh$') \
-                       scripts/*.sql
+                       $(ls scripts/mysql* | grep -v '.sh$')
                do
                        dodoc "${script}"
                done
@@ -502,6 +597,7 @@ pkg_preinst() {
 pkg_postinst() {
 
        mysql_init_vars
+
        # mind at FEATURES=collision-protect before to remove this
        [ -d "${ROOT}/var/log/mysql" ] \
                || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
@@ -515,15 +611,106 @@ pkg_postinst() {
                # your friendly public service announcement...
                einfo
                einfo "You might want to run:"
-               einfo "\"emerge --config =${PF}\""
+               einfo "\"emerge --config =${CATEGORY}/${PF}\""
                einfo "if this is a new install."
                einfo
        fi
 
-       mysql_upgrade_warning
        einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
-       : # TODO
+       mysql_init_vars
+       [[ -z "${DATADIR}" ]] && die "sorry, unable to find DATADIR"
+
+       if built_with_use dev-db/mysql minimal; then
+               die "Minimal builds do NOT include the MySQL server"
+       fi
+
+       if [[ "$(pgrep mysqld)" != "" ]] ; then
+               die "Oops you already have a mysql daemon running!"
+       fi
+
+       local pwd1="a"
+       local pwd2="b"
+       local maxtry=5
+
+       if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
+               ewarn "You have already a MySQL database in place."
+               ewarn "Please rename it or delete it if you wish to replace it."
+               die "MySQL database already exists!"
+       fi
+
+       einfo "Creating the mysql database and setting proper"
+       einfo "permissions on it..."
+
+       einfo "Insert a password for the mysql 'root' user"
+       ewarn "Avoid [\"'\\_%] characters in the password"
+
+       read -rsp "    >" pwd1 ; echo
+       einfo "Check the password"
+       read -rsp "    >" pwd2 ; echo
+
+       if [[ "x$pwd1" != "x$pwd2" ]] ; then
+               die "Passwords are not the same"
+       fi
+
+       ${ROOT}/usr/bin/mysql_install_db${MY_SUFFIX} || die "MySQL databases not installed"
+
+       # MySQL 5.0 don't need this
+       chown -R mysql:mysql ${ROOT}/${DATADIR}
+       chmod 0750 ${ROOT}/${DATADIR}
+
+       local options=""
+       local sqltmp="$(emktemp)"
+
+       if mysql_version_is_at_least "4.01.03.00"; then
+               options="--skip-ndbcluster"
+
+               # Filling timezones, see
+               # http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+               ${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share${MY_SUFFIX}/zoneinfo \
+               > "${sqltmp}"
+       fi
+
+       local socket=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}.sock
+       local mysqld="${ROOT}/usr/sbin/mysqld${MY_SUFFIX} \
+               ${options} \
+               --skip-grant-tables \
+               --basedir=${ROOT}/usr \
+               --datadir=${ROOT}/${DATADIR} \
+               --skip-innodb \
+               --skip-bdb \
+               --max_allowed_packet=8M \
+               --net_buffer_length=16K \
+               --socket=${socket} \
+               --pid-file=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}.pid"
+
+       $mysqld &
+       while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]]
+       do
+               maxtry=$(($maxtry-1))
+               echo -n "."
+               sleep 1
+       done
+
+       # do this from memory we don't want clear text password in temp files
+       local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"
+       ${ROOT}/usr/bin/mysql \
+               --socket=${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}.sock \
+               -hlocalhost \
+               -e "${sql}"
+
+       einfo "Loading \"zoneinfo\" this step may require few seconds"
+
+       ${ROOT}/usr/bin/mysql${MY_SUFFIX} \
+               --socket=${socket} \
+               -hlocalhost \
+               -uroot \
+               -p"${pwd1}" \
+               mysql < "${sqltmp}"
+
+       kill $( cat ${ROOT}/var/run/mysqld/mysqld${MY_SUFFIX}.pid )
+       rm  "${sqltmp}"
+       einfo "done"
 }