This new build implements upstream's requested changes as per bug #44592, as well as resolves #79000, and #76194. Collectively, this now provides a minimal MySQL build (note that the server is still built due to MySQL compile process, just not installed).

Package-Manager: portage-2.0.51.19

7 files changed, 571 insertions, 2 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 256c3777e042..a8bf079d2243 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,16 @@
 # 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.182 2005/03/13 05:47:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.183 2005/03/13 05:54:00 robbat2 Exp $
+
+*mysql-4.0.24-r1 (12 Mar 2005)
+
+  12 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/my.cnf-4.0.24-r1, +files/mysql-4.0.24-manual.texi.patch,
+  +files/mysql-4.0.24-r1.rc6, +mysql-4.0.24-r1.ebuild:
+  This new build implements upstream's requested changes as per bug #44592, as
+  well as resolves #79000, and #76194. Collectively, this now provides a
+  minimal MySQL build (note that the server is still built due to MySQL
+  compile process, just not installed).
 
 *mysql-4.0.24 (12 Mar 2005)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 3ed3ca52489b..6cfc41178aa8 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -7,6 +7,7 @@ MD5 3dfd4b94b05af738e092c6fa296d8354 mysql-4.0.23.ebuild 9059
 MD5 e1033fa49047a578ba121b90fdb2b233 mysql-3.23.52-r1.ebuild 6000
 MD5 e9fc3c775ec6fc9e6d0f871b0b30cbf5 mysql-4.0.23-r2.ebuild 9427
 MD5 b8210bb74ea56b21eeba0077ff472e9b mysql-4.1.8-r1.ebuild 9245
+MD5 a0018d2dfdc35c75029b0c2c34781927 mysql-4.0.24-r1.ebuild 11874
 MD5 8176095e06106185dd2a904061f651bd mysql-3.23.57.ebuild 6688
 MD5 a352c543b55c3b5e4a7a02c5f3ede5d6 mysql-4.0.22.ebuild 8777
 MD5 f23f946b5a74ff097603917b0fd579cb mysql-4.0.22-r2.ebuild 9621
@@ -14,7 +15,7 @@ MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759
 MD5 3e5c2be526e788f57044aafcb7281e10 mysql-4.1.8.ebuild 9106
 MD5 f9b24bd73b0d75705d38ee1e0f5a3072 mysql-4.0.23-r1.ebuild 9180
 MD5 29f350c0ac3c7314a3a5527cdb597c32 mysql-4.0.24.ebuild 9802
-MD5 08255a90670cfe3d8a8aed3624ba5aa3 ChangeLog 28300
+MD5 7f0e928b44d6615aac262f3ac3d03e7b ChangeLog 28771
 MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163
 MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
 MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
@@ -61,13 +62,17 @@ MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 67
 MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
 MD5 dcd899fe185459da4cb9e71c75c3bda3 files/digest-mysql-3.23.57 67
 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67
+MD5 255655c42f50e6011e1e40837d60e625 files/mysql-4.0.24-r1.rc6 1743
 MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465
 MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
+MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603
 MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
 MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66
 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66
 MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66
 MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67
+MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r1 66
 MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813
 MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863
diff --git a/dev-db/mysql/files/digest-mysql-4.0.24-r1 b/dev-db/mysql/files/digest-mysql-4.0.24-r1
new file mode 100644
index 000000000000..c6d7e25405e2
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.0.24-r1
@@ -0,0 +1 @@
+MD5 408d3001ed715ddc90009c247e548638 mysql-4.0.24.tar.gz 16885399
diff --git a/dev-db/mysql/files/my.cnf-4.0.24-r1 b/dev-db/mysql/files/my.cnf-4.0.24-r1
new file mode 100644
index 000000000000..7d7161015568
--- /dev/null
+++ b/dev-db/mysql/files/my.cnf-4.0.24-r1
@@ -0,0 +1,114 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0.24-r1,v 1.1 2005/03/13 05:54:00 robbat2 Exp $
+#
+# This file can be simultaneously placed in three places:
+# 1. /etc/mysql/my.cnf to set global options.
+# 2. /var/lib/mysql/my.cnf to set server-specific options.
+# 3. ~/.my.cnf to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run the program with --help to get a list of them.
+#
+# The following values assume you have at least 64M RAM!
+
+[client]
+#password	= my_password
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+[safe_mysqld]
+err-log		= /var/log/mysql/mysql.err
+
+[mysqld]
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+log-error	= /var/log/mysql/mysqld.err
+# If set, mysql logs all queries(general query log). This will be deprecated in
+# 5.0. This logs all queries, even error queries and is slow.
+# log          = /var/log/mysql/mysql.log
+#
+# If you really need logging, use rather binary logging. Especially when doing
+# replication. Read
+# file:/usr/share/doc/mysql-*/manual.html.gz#Replication
+# You can use PURGE MASTER LOGS TO '$hostname-bin.010' to get rid of old logs
+# from $hostname-bin.01 up to $hostname-bin.09 while the slave server is
+# running.
+# Before doing that, check which logfile slave curently uses by running
+# mysql> SHOW SLAVE STATUS
+# To list logfiles on master do:
+# mysql> SHOW MASTER LOGS
+# Then use PURGE for those not needed anymore only! Never remove the files
+# manually!
+#
+# Also consult RESET MASTER and RESET SLAVE commands before doing any changes
+# mysql> RESET MASTER - Deletes all binary logs listed in the index
+#                       file, resetting the binlog index file to be empty.
+# mysql> RESET SLAVE - Makes the slave forget its replication position in
+#                      the master logs.
+# mysql> SET SQL_LOG_BIN=0  - this turns off logging (execute on MASTER only)
+# mysql> SET SQL_LOG_BIN=1  - this turns on logging (execute on MASTER only)
+#
+# log-bin
+# set-variable  = binlog-do-db=non_existant
+# set-variable  = binlog-ignore-db=database_name
+#
+# server-id has to unique for each master or slave in your network,
+# lets use last number from IP address
+# server-id      = 207
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+language	= /usr/share/mysql/english
+skip-locking
+set-variable	= key_buffer=16M
+set-variable	= max_allowed_packet=1M
+set-variable	= thread_stack=128K
+# keep secure by default!
+bind-address    = 127.0.0.1
+port		= 3306
+# this can make it even more secure:
+#skip-networking
+#
+# The following is the InnoDB configuration
+# if you wish to disable innodb instead
+# uncomment just the next line
+#skip-innodb
+#
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes.
+# you might want to bump this up a bit on boxes with more RAM
+set-variable = innodb_buffer_pool_size=32M
+# this is the default, increase if you have lots of tables
+set-variable = innodb_additional_mem_pool_size=1M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+innodb_data_home_dir = /var/lib/mysql/
+innodb_log_arch_dir = /var/lib/mysql/
+innodb_log_group_home_dir = /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+set-variable = innodb_log_file_size=8M
+# this is the default, increase if you have very large transactions.
+set-variable = innodb_log_buffer_size=1M
+# this is the default, and won't hurt you.
+# you shouldn't need to tweak it.
+set-variable = innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit=1
+
+
+[mysqldump]
+quick
+set-variable	= max_allowed_packet=1M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completition
+
+[isamchk]
+set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch b/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch
new file mode 100644
index 000000000000..2789efba0336
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.24-manual.texi.patch
@@ -0,0 +1,20 @@
+--- mysql-4.0.24.bbb/Docs/manual.texi	2005-03-11 22:49:27.000000000 +0100
++++ mysql-4.0.24/Docs/manual.texi	2005-03-11 22:57:56.000000000 +0100
+@@ -91349,7 +91349,7 @@
+ 
+ @c NOTE: To regenerate this list, run the make-errmsg-table.pl script.
+ 
+-@include errmsg-table.texi
++failed to include errmsg-table.texi
+ 
+ Client error information comes from the following files:
+ 
+@@ -91370,7 +91370,7 @@
+ 
+ @c NOTE: To regenerate this list, run the make-cl-errmsg-table.pl script.
+ 
+-@include cl-errmsg-table.texi
++failed to include cl-errmsg-table.texi
+ 
+ 
+ @node Extending MySQL, Problems, Error-handling, Top
diff --git a/dev-db/mysql/files/mysql-4.0.24-r1.rc6 b/dev-db/mysql/files/mysql-4.0.24-r1.rc6
new file mode 100644
index 000000000000..f55c45418b8a
--- /dev/null
+++ b/dev-db/mysql/files/mysql-4.0.24-r1.rc6
@@ -0,0 +1,60 @@
+#!/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-4.0.24-r1.rc6,v 1.1 2005/03/13 05:54:00 robbat2 Exp $
+
+depend() {
+	use dns net
+}
+
+
+getconfig() {
+	MY_NAME="(`basename $1`)"
+	[ -z "${MY_NAME/(mysql)}" ] && MY_NAME=""
+
+	MY_CNF=${MY_CNF=/etc/mysql/my.cnf}
+	if [ ! -f ${MY_CNF} ]; then
+		eerror "No ${MY_CNF} file exists! Using automatic defaults!"
+	fi
+
+	#dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+	#dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	local mysqld_cnf="`my_print_defaults --config-file=${MY_CNF} mysqld`"
+	dir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	pid_file=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1`
+	
+	# push these out to the script
+	export MY_NAME MY_CNF pid_file datadir 
+}
+
+checkconfig() {
+	getconfig
+	if [ -z "$datadir" ]; then
+		eerror "Your mysql doesn't have any datadir setting, default or specific"
+		eerror "Please check your my.cnf : ${MY_CNF}"
+		return 1
+	fi
+
+	if [ ! -d "$datadir/mysql" ]; then
+		eerror "You don't appear to have the mysql database installed yet."
+		eerror "Please run /usr/bin/mysql_install_db to have this done..."
+		return 1
+	fi
+}
+
+start() {
+	getconfig
+	checkconfig || return 1
+	ebegin "Starting mysqld (${MY_NAME})"
+	start-stop-daemon --start --quiet --pidfile=${pid_file}
+		--exec /usr/bin/mysqld_safe \
+		--background --defaults-file=${MY_CNF} -- >/dev/null 2>&1
+	eend $?
+}
+
+stop () {
+	getconfig
+	ebegin "Stopping mysqld (${MY_NAME})"
+	start-stop-daemon --stop --retry 5 --quiet --pidfile=${pid_file}
+	eend $?
+}
diff --git a/dev-db/mysql/mysql-4.0.24-r1.ebuild b/dev-db/mysql/mysql-4.0.24-r1.ebuild
new file mode 100644
index 000000000000..f2832ab28c23
--- /dev/null
+++ b/dev-db/mysql/mysql-4.0.24-r1.ebuild
@@ -0,0 +1,359 @@
+# 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.24-r1.ebuild,v 1.1 2005/03/13 05:54:00 robbat2 Exp $
+
+inherit eutils gnuconfig
+#to accomodate -laadeedah releases
+NEWP=${P}
+
+SVER=${PV%.*}
+#normal releases:
+SDIR=MySQL-${SVER}
+#for a pre-release:
+#SDIR=MySQL-${SVER}-Pre
+
+S=${WORKDIR}/${NEWP}
+
+DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
+HOMEPAGE="http://www.mysql.com/"
+SRC_URI="mirror://mysql/Downloads/${SDIR}/${NEWP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd"
+RESTRICT="nomirror"
+
+DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( dev-lang/perl )
+	>=sys-libs/zlib-1.1.3
+	>=sys-apps/texinfo-4.7-r1
+	sys-process/procps
+	>=sys-apps/sed-4"
+PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+
+mysql_upgrade_warning() {
+	ewarn
+	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 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+	ewarn
+	epause 5
+}
+
+
+mysql_get_datadir() {
+	DATADIR=""
+	if [ -f '/etc/mysql/my.cnf' ] ; then
+		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+		#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 | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	fi
+	if [ -z "${DATADIR}" ]; then
+		DATADIR="/var/lib/mysql/"
+		einfo "Using default DATADIR"
+	fi
+	einfo "MySQL DATADIR is ${DATADIR}"
+	export DATADIR
+}
+
+pkg_setup() {
+	mysql_upgrade_warning
+	mysql_get_datadir
+}
+
+src_unpack() {
+	if use static && use ssl; then
+		local msg="MySQL does not support building statically with SSL support"
+		eerror "${msg}"
+		die "${msg}"
+	fi
+	unpack ${A} || die
+
+	#zap startup script messages
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff || die
+	#zap binary distribution stuff
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff || die
+	#required for qmail-mysql
+	EPATCH_OPTS="-p0 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
+	#for correct hardcoded sysconf directory
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
+	# NPTL support
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff || die
+	# Merged upstream as of 4.0.24
+	# bad tmpfiles in mysqlaccess, see bug 77805
+	#EPATCH_OPTS="-p1 -d ${S}" \
+	#epatch ${FILESDIR}/mysql-accesstmp.patch
+
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.24-manual.texi.patch || 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_OPTS="-p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch || die
+
+	if use tcpd; then
+		EPATCH_OPTS="-p1 -d ${S}" \
+		epatch ${FILESDIR}/${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
+
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
+	sed -i \
+		-e "s/\<set_bit\>/my__set_bit/g" \
+		-e "s/\<clear_bit\>/my__clear_bit/g" \
+	    || die "Failed to fix bitops"
+}
+
+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
+	use readline && myconf="${myconf} --without-readline"
+	use readline || myconf="${myconf} --with-readline"
+
+	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`"
+
+	# 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
+		# 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
+		if use sparc || use alpha || use hppa || use mips
+		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
+
+	# documentation
+	myconf="${myconf} `use_with doc docs`"
+
+	#glibc-2.3.2_pre fix; bug #16496
+	export CFLAGS="${CFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
+	export CXXFLAGS="${CXXFLAGS} -DHAVE_ERRNO_AS_DEFINE=1"
+
+	#bug fix for #15099, should make this api backward compatible
+	export CFLAGS="${CFLAGS} -DUSE_OLD_FUNCTIONS"
+	export CXXFLAGS="${CXXFLAGS} -DUSE_OLD_FUNCTIONS"
+
+	#the compiler flags are as per their "official" spec ;)
+	#CFLAGS="${CFLAGS/-O?/} -O3" \
+	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti" \
+	econf \
+		-C \
+		--libexecdir=/usr/sbin \
+		--sysconfdir=/etc/mysql \
+		--localstatedir=/var/lib/mysql \
+		--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.sock \
+		${myconf} || die "bad ./configure"
+
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	make install DESTDIR=${D} benchdir_root=/usr/share/mysql || die
+
+	#move client libs, install a couple of missing headers
+	mv ${D}/usr/$(get_libdir)/mysql/libmysqlclient*.so* ${D}/usr/$(get_libdir)
+	dosym ../libmysqlclient.so /usr/$(get_libdir)/mysql/libmysqlclient.so
+	dosym ../libmysqlclient_r.so /usr/$(get_libdir)/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 ! use 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.0.24-r1 my.cnf
+	# minimal builds don't have the server
+	if ! useq minimal; then
+		exeinto /etc/init.d
+		newexe ${FILESDIR}/mysql-4.0.24-r1.rc6 mysql
+		insinto /etc/logrotate.d
+		newins ${FILESDIR}/logrotate.mysql mysql
+	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
+
+}
+
+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}"
+		make test || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
+
+pkg_config() {
+	mysql_get_datadir
+	if useq minimal; then
+		die "Minimal builds do NOT include the MySQL server"
+	fi
+	if [ ! -d ${ROOT}/${DATADIR}/mysql ] ; then
+		einfo "Press ENTER to create the mysql database and set proper"
+		einfo "permissions on it, or Control-C to abort now..."
+		read
+		${ROOT}/usr/bin/mysql_install_db #>>/var/log/mysql/mysql.err 2>&1
+		# changing ownership of newly created databases to mysql.mysql
+		chown -R mysql:mysql ${ROOT}/${DATADIR}
+		chmod 0750 ${ROOT}/${DATADIR}
+		ewarn "For security reasons you should set your MySQL root"
+		ewarn "password as soon as possible."
+
+	else
+		einfo "Hmm, it appears as though you already have the mysql"
+		einfo "database in place.  If you are having problems trying"
+		einfo "to start mysqld, perhaps you need to manually run"
+		einfo "/usr/bin/mysql_install_db and/or check your config"
+		einfo "file(s) and/or database(s) and/or logfile(s)."
+	fi
+}
+
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 /bin/false /var/lib/mysql mysql || die "problem adding user mysql"
+}
+
+pkg_postinst() {
+	mysql_get_datadir
+
+	if ! useq minimal; then
+		#empty dirs...
+		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
+		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
+		[ -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 ${ROOT}/${DATADIR}
+
+		#your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+		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."
+}