- Restored messed up 4.1.15, thanks to Richard Brown for reporting.\

- added 4.1.15-r1, basically the same ebuild as 5.0.16-r3
(Portage version: 2.0.53_rc6)

8 files changed, 1095 insertions, 492 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index c90df7de17e8..dbdc61284023 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,13 @@
 # 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.270 2005/11/24 18:42:48 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.271 2005/11/24 20:28:11 vivo Exp $
+
+*mysql-4.1.15-r1 (24 Nov 2005)
+
+  24 Nov 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.15.ebuild,
+  +mysql-4.1.15-r1.ebuild, mysql-4.1.15-r30.ebuild, mysql-5.0.16-r30.ebuild:
+  - Restored messed up 4.1.15, thanks to Richard Brown for reporting.
+  - added 4.1.15-r1, basically the same ebuild as 5.0.16-r3
 
   24 Nov 2005; Markus Rothe <corsair@gentoo.org> mysql-4.1.14.ebuild:
   Stable on ppc64
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 4f899494eb92..55e2f27bf7ca 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,20 +1,14 @@
 MD5 e1f0cd0a33bea5efc604c503876f5d90 ChangeLog 51447
-MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
-MD5 cb840696d7d25e0d48c3b121808d680f mysql-4.1.14.ebuild 18859
-MD5 01d3903a874656d7460bb43fd8aef3cd mysql-5.0.16-r3.ebuild 22996
-MD5 b84925753349084e28c584a4c91ce2bd mysql-5.0.16-r30.ebuild 23541
-MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
-MD5 0df392f43cbe9492b8bf44f52e584486 mysql-4.1.15-r30.ebuild 23541
-MD5 878a2643e30451f8c7e7623571d905b5 mysql-4.1.15.ebuild 23409
-MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
-MD5 807edd9638cc95dd917ba07a43b1b9a5 mysql-5.0.15.ebuild 19010
-MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
-MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
-MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r3 139
+MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
+MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15 139
+MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r1 139
+MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r30 139
+MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
+MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r3 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
@@ -23,9 +17,17 @@ 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 356c1b4211a0b3d229bcb09c7c8742a7 files/mysql-4.0.24-r2.rc6 2151
-MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
-MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r30 139
-MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
-MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691
-MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r30 139
 MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
+MD5 2e915001528cb4b44591d907168b6a51 files/mysql-slot.rc6 8691
+MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
+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 cb840696d7d25e0d48c3b121808d680f mysql-4.1.14.ebuild 18859
+MD5 fd0588c3e0885b072e93cb6913b5cb5d mysql-4.1.15-r1.ebuild 22993
+MD5 c9f60968600404293b9a525fe42fda97 mysql-4.1.15-r30.ebuild 23567
+MD5 badca5029ba334c701e0f8683ecf03b1 mysql-4.1.15.ebuild 18879
+MD5 807edd9638cc95dd917ba07a43b1b9a5 mysql-5.0.15.ebuild 19010
+MD5 01d3903a874656d7460bb43fd8aef3cd mysql-5.0.16-r3.ebuild 22996
+MD5 1c7fe8d879b76858f53cd5f273f83917 mysql-5.0.16-r30.ebuild 23567
diff --git a/dev-db/mysql/files/digest-mysql-4.1.15 b/dev-db/mysql/files/digest-mysql-4.1.15
index ed0a7a329542..6b4725ac1cef 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.15
+++ b/dev-db/mysql/files/digest-mysql-4.1.15
@@ -1,2 +1,2 @@
 MD5 65a0841e592641b8816f9212aaa40176 mysql-4.1.15.tar.gz 17257765
-MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.1.15-r1 b/dev-db/mysql/files/digest-mysql-4.1.15-r1
new file mode 100644
index 000000000000..ed0a7a329542
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.15-r1
@@ -0,0 +1,2 @@
+MD5 65a0841e592641b8816f9212aaa40176 mysql-4.1.15.tar.gz 17257765
+MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350
diff --git a/dev-db/mysql/mysql-4.1.15-r1.ebuild b/dev-db/mysql/mysql-4.1.15-r1.ebuild
new file mode 100644
index 000000000000..b02792c8cc1e
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.15-r1.ebuild
@@ -0,0 +1,767 @@
+# 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-r1.ebuild,v 1.1 2005/11/24 20:28:11 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 "4.01.15.00")
+PROTOCOL_VERSION=10
+NDB_VERSION_ID=40115
+#major, minor only in the slot
+SLOT=0
+#NOSLOT 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="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
+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=""
+	#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}"}
+	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
+}
+
+mysql_strip_double_slash() {
+	local path="${1}"
+	local newpath="${path/\/\///}"
+	while [[ ${path} != ${newpath} ]]; do
+		path=${newpath}
+		newpath="${path/\/\///}"
+	done
+	echo "${newpath}"
+}
+
+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
+
+	# Multilib issue with zlib detection
+	sed -i -e "s:zlib_dir/lib:zlib_dir/$(get_libdir):g" \
+		"${S}/config/ac-macros/zlib.m4"
+
+	# 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} `use_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
+
+	#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
+
+	# create globally visible symlinks
+	# TODO : what abaut ndb ?
+	local mylib mylibfullver mylibtmpver maxdots sonamelist
+	pushd "${D}/${MY_LIBDIR}"
+	for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+		mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+		mylibtmpver="${mylibfullver}"
+		maxdots=0
+		while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+			(( ++maxdots ))
+			dosym \
+				$(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
+				$(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
+			mylibtmpver=${mylibtmpver%.*}
+		done
+	done
+	popd
+
+	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
+
+	## TODO : make the check
+	## TODO : what abaut ndb ?
+	#local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
+	#pushd "${ROOT}/${MY_LIBDIR}"
+	#for mylib in libmysqlclient_r libmysqlclient libndbclient; do
+	#	mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
+	#	mylibtmpver="${mylibfullver}"
+	#	maxdots=0
+	#	while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
+	#		(( ++maxdots ))
+	#		prevlink=$(readlink -f "../${mylibtmpver}")
+	#		if [[ -n "${prevlink}" ]] ; then
+	#			if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
+	#			&& [[ "${prevlink##*/}" != "${mylibfullver}" ]]
+	#			then
+	#				# gah this is not totally correct
+	#				einfo "found previous library, please run"
+	#				einfo "revdep-rebuild --soname=${mylibtmpver}"
+	#			fi
+	#			rm -f "../${mylibtmpver}"
+	#		fi
+	#		ln -snf \
+	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
+	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
+	#		mylibtmpver=${mylibtmpver%.*}
+	#	done
+	#done
+	#popd
+
+	# 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
+
+	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"
+}
+
diff --git a/dev-db/mysql/mysql-4.1.15-r30.ebuild b/dev-db/mysql/mysql-4.1.15-r30.ebuild
index a6b4c46d0401..6dec85322981 100644
--- a/dev-db/mysql/mysql-4.1.15-r30.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.4 2005/11/24 14:03:51 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.5 2005/11/24 20:28:11 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -484,7 +484,7 @@ src_install() {
 	# TODO : what abaut ndb ?
 	local mylib mylibfullver mylibtmpver maxdots sonamelist
 	pushd "${D}/${MY_LIBDIR}"
-	for mylib in libmysqlclient_r libmysqlclient; do
+	for mylib in libmysqlclient_r libmysqlclient libndbclient; do
 		mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
 		mylibtmpver="${mylibfullver}"
 		maxdots=0
@@ -621,7 +621,7 @@ pkg_postinst() {
 	## TODO : what abaut ndb ?
 	#local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
 	#pushd "${ROOT}/${MY_LIBDIR}"
-	#for mylib in libmysqlclient_r libmysqlclient; do
+	#for mylib in libmysqlclient_r libmysqlclient libndbclient; do
 	#	mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
 	#	mylibtmpver="${mylibfullver}"
 	#	maxdots=0
diff --git a/dev-db/mysql/mysql-4.1.15.ebuild b/dev-db/mysql/mysql-4.1.15.ebuild
index 408533d0907a..2c03671f8995 100644
--- a/dev-db/mysql/mysql-4.1.15.ebuild
+++ b/dev-db/mysql/mysql-4.1.15.ebuild
@@ -1,23 +1,13 @@
 # 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.ebuild,v 1.9 2005/11/24 14:03:52 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"}"
-}
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15.ebuild,v 1.10 2005/11/24 20:28:11 vivo Exp $
+
+inherit eutils gnuconfig flag-o-matic versionator
 
-# 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
-#major, minor only in the slot
-SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
+SVER=${PV%.*}
+NEWP="${PN}-${PV}"
+#NEWP="${NEWP/_beta/-beta}"
 
-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
@@ -25,18 +15,20 @@ 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"
+SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="-*"
-IUSE="big-tables berkdb debug minimal perl selinux ssl static"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static tcpd"
 RESTRICT="primaryuri"
 
-DEPEND=">=sys-libs/readline-4.1
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
 	bdb? ( sys-apps/ed )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 	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
@@ -45,168 +37,114 @@ 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
+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
+	#   if you need to compile *without it* take a look at
+	#	http://lists.mysql.com/internals/29559
 	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
-}
+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/4.1/en/upgrading-from-4-0.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)"
+	ewarn ""
 
-# 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
+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 --library=libmysqlclient.so.12"
+	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"
 }
 
-
-# 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
+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="${MY_LOCALSTATEDIR}"
+			DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
 			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
+	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 MY_SUFFIX MY_SHAREDSTATEDIR MY_SYSCONFDIR
-	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
-	export MY_INCLUDEDIR
 	export DATADIR
 }
 
-mysql_strip_double_slash() {
-	local path="${1}"
-	local newpath="${path/\/\///}"
-	while [[ ${path} != ${newpath} ]]; do
-		path=${newpath}
-		newpath="${path/\/\///}"
-	done
-	echo "${newpath}"
-}
-
 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() {
-
-	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" \
+	if version_is_at_least "4.1.3" \
 	&& useq cluster \
 	|| useq extraengine \
 	&& useq minimal ; then
@@ -217,54 +155,29 @@ src_unpack() {
 
 	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]
+	rm -rf "${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
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
+	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
 	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
@@ -278,6 +191,7 @@ 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"
@@ -289,10 +203,14 @@ src_unpack() {
 }
 
 src_compile() {
-
-	mysql_init_vars
 	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"
@@ -301,14 +219,13 @@ src_compile() {
 		myconf="${myconf} --enable-shared --enable-static"
 	fi
 
-	#myconf="${myconf} `use_with tcpd libwrap`"
-	myconf="${myconf} --without-libwrap"
+	myconf="${myconf} `use_with tcpd 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
+		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"
@@ -323,7 +240,7 @@ src_compile() {
 		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"
+		version_is_at_least "4.1.3" && useq cluster && myconf="${myconf} --without-ndb-debug"
 	fi
 
 	# benchmarking stuff needs perl
@@ -350,8 +267,8 @@ src_compile() {
 			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
+		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
@@ -375,13 +292,13 @@ src_compile() {
 				|| myconf="${myconf} --without-berkeley-db"
 		fi
 
-		if mysql_version_is_at_least "4.01.03.00" ; then
-			#myconf="${myconf} $(use_with geometry)"
+		if version_is_at_least "4.1.3" ; then
 			myconf="${myconf} --with-geometry"
+			#myconf="${myconf} $(use_with geometry)"
 			myconf="${myconf} $(use_with cluster ndbcluster)"
 		fi
 
-		mysql_version_is_at_least "4.01.11.00" &&  myconf="${myconf} `use_with big-tables`"
+		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}"
@@ -390,40 +307,40 @@ src_compile() {
 		myconf="${myconf} --with-extra-charsets=none"
 	fi
 
-	if mysql_version_is_at_least "4.01.03.00" && useq extraengine; then
+	# 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
-		mysql_version_is_at_least "4.01.04.00" \
+		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 mysql_version_is_at_least "5.00.03.00" ; then
+		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
-		mysql_version_is_at_least "4.01.11.00" \
+		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"
-	mysql_version_is_at_least "5.00.00.00" \
+	version_is_at_least "5.0_alpha" \
 	&& 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}" \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--localstatedir=/var/lib/mysql \
 		--with-low-memory \
 		--enable-assembler \
 		--enable-local-infile \
@@ -431,20 +348,11 @@ src_compile() {
 		--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-unix-socket-path=/var/run/mysqld/mysqld.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"
 }
 
@@ -457,7 +365,7 @@ src_test() {
 		local retstatus
 		addpredict /this-dir-does-not-exist/t9.MYI
 
-		mysql_version_is_at_least "5.00.15.00" \
+		version_is_at_least "5.0.13_rc" \
 		&& make test-force-pl \
 		|| make test-pl
 		retstatus=$?
@@ -472,316 +380,233 @@ src_test() {
 }
 
 src_install() {
+	mysql_get_datadir
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
-	mysql_init_vars
-	make install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" || die
-
-	# create globally visible symlinks
-	# TODO : what abaut ndb ?
-	local mylib mylibfullver mylibtmpver maxdots sonamelist
-	pushd "${D}/${MY_LIBDIR}"
-	for mylib in libmysqlclient_r libmysqlclient; do
-		mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-		mylibtmpver="${mylibfullver}"
-		maxdots=0
-		while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-			(( ++maxdots ))
-			dosym \
-				$(mysql_strip_double_slash "${MY_LIBDIR}/${mylibfullver}") \
-				$(mysql_strip_double_slash "${MY_LIBDIR}/../${mylibtmpver}")
-			mylibtmpver=${mylibtmpver%.*}
-		done
-	done
-	popd
-
-	insinto "${MY_INCLUDEDIR}"
-	doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
+	# 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${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"
+	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}${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
+		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 "${MY_SYSCONFDIR}"
+	insinto /etc/mysql
 	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"
+	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-slot.rc6" "mysql"
+		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
 		insinto /etc/logrotate.d
-		# TODO
-		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
+		newins "${FILESDIR}/logrotate.mysql" mysql
 
 		#empty dirs...
 		diropts "-m0750"
 		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-			addwrite "${DATADIR}"
-			dodir "${DATADIR}"
-			keepdir "${DATADIR}"
-			chown -R mysql:mysql "${D}/${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
+		dodir "/var/log/mysql"
+		# the following files fails with FEATURES="collision-protect"
+		#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 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
+	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_init_vars
-
-	## TODO : make the check
-	## TODO : what abaut ndb ?
-	#local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
-	#pushd "${ROOT}/${MY_LIBDIR}"
-	#for mylib in libmysqlclient_r libmysqlclient; do
-	#	mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
-	#	mylibtmpver="${mylibfullver}"
-	#	maxdots=0
-	#	while [[ ${mylibtmpver} != ${mylib} ]] && [[ ${maxdots} -lt 6 ]]; do
-	#		(( ++maxdots ))
-	#		prevlink=$(readlink -f "../${mylibtmpver}")
-	#		if [[ -n "${prevlink}" ]] ; then
-	#			if [[ "${mylibtmpver}" != "${mylibfullver}" ]] \
-	#			&& [[ "${prevlink##*/}" != "${mylibfullver}" ]]
-	#			then
-	#				# gah this is not totally correct
-	#				einfo "found previous library, please run"
-	#				einfo "revdep-rebuild --soname=${mylibtmpver}"
-	#			fi
-	#			rm -f "../${mylibtmpver}"
-	#		fi
-	#		ln -snf \
-	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/${mylibfullver}") \
-	#			$(mysql_strip_double_slash "${ROOT}/${MY_LIBDIR}/../${mylibtmpver}")
-	#		mylibtmpver=${mylibtmpver%.*}
-	#	done
-	#done
-	#popd
+	mysql_get_datadir
 
 	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
 	[ -d "${ROOT}/var/log/mysql" ] \
-		|| install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
 
 	#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*
+	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 =${CATEGORY}/${PF}\""
+		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_init_vars
-	[[ -z "${DATADIR}" ]] && die "sorry, unable to find DATADIR"
+	mysql_get_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
+	if [[ "$(pgrep mysqld)" != "" ]] ; then
+		die "Oops you already have a mysql daemon running!"
+	fi
 
-		einfo "Creating the mysql database and setting proper"
-		einfo "permissions on it..."
+	local pwd1="a"
+	local pwd2="b"
+	local maxtry=5
 
-		einfo "Insert a password for the mysql 'root' user"
-		ewarn "Avoid [\"'\\_%] characters in the password"
+	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
 
-		read -rsp "    >" pwd1 ; echo
-		einfo "Check the password"
-		read -rsp "    >" pwd2 ; echo
+	einfo "Creating the mysql database and setting proper"
+	einfo "permissions on it..."
 
-		if [[ "x$pwd1" != "x$pwd2" ]] ; then
-			die "Passwords are not the same"
-		fi
+	einfo "Insert a password for the mysql 'root' user"
+	ewarn "Avoid [\"'\\_%] characters in the password"
 
-		chown -R mysql:mysql ${ROOT}/${DATADIR}
-		chmod 0750 ${ROOT}/${DATADIR}
+	read -rsp "    >" pwd1 ; echo
+	einfo "Check the password"
+	read -rsp "    >" pwd2 ; echo
 
-		local options=""
-		local sqltmp="$(emktemp)"
+	if [[ "x$pwd1" != "x$pwd2" ]] ; then
+		die "Passwords are not the same"
+	fi
 
-		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"
+	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
-		pushd "${TMPDIR}"
-		${ROOT}/usr/bin/mysql_install_db${MY_SUFFIX} || die "MySQL databases not installed"
-		popd
+	# MySQL 5.0 don't need this
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
+	chmod 0750 ${ROOT}/${DATADIR}
 
-		if mysql_version_is_at_least "4.01.03.00" ; then
-			options="--skip-ndbcluster"
+	local options=""
+	local sqltmp="$(emktemp)"
+	local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
 
-			# 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 version_is_at_least "4.1.3" ; then
+		options="--skip-ndbcluster"
 
-			if [[ -r "${help_tables}" ]] ; then
-				cat "${help_tables}" >> "${sqltmp}"
-			fi
+		# 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${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
+	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${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
+	# 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
index e8a433627af4..cf3ddbcecd18 100644
--- a/dev-db/mysql/mysql-5.0.16-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.4 2005/11/24 14:03:52 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.5 2005/11/24 20:28:11 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -484,7 +484,7 @@ src_install() {
 	# TODO : what abaut ndb ?
 	local mylib mylibfullver mylibtmpver maxdots sonamelist
 	pushd "${D}/${MY_LIBDIR}"
-	for mylib in libmysqlclient_r libmysqlclient; do
+	for mylib in libmysqlclient_r libmysqlclient libndbclient; do
 		mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
 		mylibtmpver="${mylibfullver}"
 		maxdots=0
@@ -621,7 +621,7 @@ pkg_postinst() {
 	## TODO : what abaut ndb ?
 	#local mylib mylibfullver mylibtmpver maxdots sonamelist prevlink
 	#pushd "${ROOT}/${MY_LIBDIR}"
-	#for mylib in libmysqlclient_r libmysqlclient; do
+	#for mylib in libmysqlclient_r libmysqlclient libndbclient; do
 	#	mylibfullver="$(ls "${mylib}.so"* | sort | tail -n 1)"
 	#	mylibtmpver="${mylibfullver}"
 	#	maxdots=0