version bump ; cleanup 5.0 ; new USE="max-idx-128"

(Portage version: 2.0.53)

11 files changed, 53 insertions, 639 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 83af94a91db7..28666366f5b5 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,18 @@
 # 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.285 2005/12/30 16:54:46 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.286 2005/12/30 19:52:40 vivo Exp $
+
+*mysql-5.0.18-r30 (30 Dec 2005)
+*mysql-5.0.18 (30 Dec 2005)
+
+  30 Dec 2005; Francesco Riosa <vivo@gentoo.org> -mysql-5.0.15.ebuild,
+  -mysql-5.0.16-r4.ebuild, -mysql-5.0.17-r30.ebuild, +mysql-5.0.18.ebuild,
+  +mysql-5.0.18-r30.ebuild, mysql-5.1.4_alpha-r30.ebuild:
+  - Version bump to 5.0.18
+  - Added a new use flag "max-idx-128" to take advantage of the possibility to
+    use a maximum of 128 indexes per table (default is 64).
+    Valid for both mysql 5.0 and 5.1, but still minimally tested
+  - cleanup of older 5.0 version
 
   30 Dec 2005; Fernando J. Pereda <ferdy@gentoo.org> mysql-4.1.14.ebuild:
   Stable on alpha wrt bug #109301. Credit and lots of thanks to Thomas Cort
diff --git a/dev-db/mysql/files/digest-mysql-5.0.15 b/dev-db/mysql/files/digest-mysql-5.0.15
deleted file mode 100644
index 9d25b38b16cd..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.15
+++ /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-r4 b/dev-db/mysql/files/digest-mysql-5.0.16-r4
deleted file mode 100644
index 0a23c702e105..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.16-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-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.17-r30 b/dev-db/mysql/files/digest-mysql-5.0.17-r30
deleted file mode 100644
index 3500b5b2ad29..000000000000
--- a/dev-db/mysql/files/digest-mysql-5.0.17-r30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c6e93571a944a7e7203e4e831adaaee3 mysql-5.0.17.tar.gz 19119986
-MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18 b/dev-db/mysql/files/digest-mysql-5.0.18
new file mode 100644
index 000000000000..dbc872680f72
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.18
@@ -0,0 +1,2 @@
+MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
+MD5 4f3c297c14745c5a30d7b3dc5a867990 mysql-extras-20051220.tar.bz2 69528
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r30 b/dev-db/mysql/files/digest-mysql-5.0.18-r30
new file mode 100644
index 000000000000..dbc872680f72
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-5.0.18-r30
@@ -0,0 +1,2 @@
+MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
+MD5 4f3c297c14745c5a30d7b3dc5a867990 mysql-extras-20051220.tar.bz2 69528
diff --git a/dev-db/mysql/files/digest-mysql-5.1.4_alpha-r30 b/dev-db/mysql/files/digest-mysql-5.1.4_alpha-r30
index ac8604bc099c..b74e4ab6bfd1 100644
--- a/dev-db/mysql/files/digest-mysql-5.1.4_alpha-r30
+++ b/dev-db/mysql/files/digest-mysql-5.1.4_alpha-r30
@@ -1,2 +1,2 @@
 MD5 e6544e120a8ec006c60c01111e070b9b mysql-5.1.4-alpha.tar.gz 16863249
-MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508
+MD5 4f3c297c14745c5a30d7b3dc5a867990 mysql-extras-20051220.tar.bz2 69528
diff --git a/dev-db/mysql/mysql-5.0.15.ebuild b/dev-db/mysql/mysql-5.0.15.ebuild
deleted file mode 100644
index 43646a2955fe..000000000000
--- a/dev-db/mysql/mysql-5.0.15.ebuild
+++ /dev/null
@@ -1,617 +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.15.ebuild,v 1.6 2005/11/25 17:19:19 anarchy 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 ~arm ~ppc ~s390 ~sparc ~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 --library=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"
-	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 ! 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.15" \
-		&& 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_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"
-		# 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 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.17-r30.ebuild b/dev-db/mysql/mysql-5.0.18-r30.ebuild
index 59643be8241b..9680524e0ad9 100644
--- a/dev-db/mysql/mysql-5.0.17-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.18-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.17-r30.ebuild,v 1.2 2005/12/26 23:10:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r30.ebuild,v 1.1 2005/12/30 19:52:40 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -11,8 +11,8 @@ stripdots() {
 }
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-MYSQL_VERSION_ID=$(stripdots "5.00.17.00")
-NDB_VERSION_ID=50017
+MYSQL_VERSION_ID=$(stripdots "5.00.18.00")
+NDB_VERSION_ID=50018
 #major, minor only in the slot
 SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
 
@@ -26,7 +26,7 @@ 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-20051205.tar.bz2"
+	mirror://gentoo/mysql-extras-20051220.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="-*"
@@ -55,6 +55,9 @@ mysql_version_is_at_least() {
 mysql_version_is_at_least "4.01.03.00" \
 && IUSE="${IUSE} cluster utf8 extraengine"
 
+mysql_version_is_at_least "5.00.18.00" \
+&& IUSE="${IUSE} max-idx-128"
+
 mysql_version_is_at_least "5.01.00.00" \
 && IUSE="${IUSE} innodb"
 
@@ -438,6 +441,10 @@ src_compile() {
 				myconf="${myconf} --with-partition"
 			fi
 		fi
+
+		mysql_version_is_at_least "5.00.18.00" \
+		&& useq "max-idx-128" \
+		&& myconf="${myconf} --with-max-indexes=128"
 	fi
 
 	#Bug #114895,Bug #110149
@@ -546,7 +553,7 @@ src_install() {
 	done
 
 	# oops
-	mysql_check_version_range "5.00.16.00 to 5.00.17.99" \
+	mysql_check_version_range "5.00.16.00 to 5.00.18.99" \
 	&& cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
 
 	# TODO change at Makefile-am level
diff --git a/dev-db/mysql/mysql-5.0.16-r4.ebuild b/dev-db/mysql/mysql-5.0.18.ebuild
index 24127fe89fd3..df415613105a 100644
--- a/dev-db/mysql/mysql-5.0.16-r4.ebuild
+++ b/dev-db/mysql/mysql-5.0.18.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-r4.ebuild,v 1.3 2005/12/12 10:15:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18.ebuild,v 1.1 2005/12/30 19:52:40 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -11,8 +11,8 @@ stripdots() {
 }
 
 # major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
-MYSQL_VERSION_ID=$(stripdots "5.00.16.00")
-NDB_VERSION_ID=50016
+MYSQL_VERSION_ID=$(stripdots "5.00.18.00")
+NDB_VERSION_ID=50018
 #major, minor only in the slot
 SLOT=0
 #NOSLOT SLOT=$(( ${MYSQL_VERSION_ID} / 10000 ))
@@ -27,7 +27,7 @@ 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"
+	mirror://gentoo/mysql-extras-20051220.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
@@ -56,6 +56,9 @@ mysql_version_is_at_least() {
 mysql_version_is_at_least "4.01.03.00" \
 && IUSE="${IUSE} cluster utf8 extraengine"
 
+mysql_version_is_at_least "5.00.18.00" \
+&& IUSE="${IUSE} max-idx-128"
+
 mysql_version_is_at_least "5.01.00.00" \
 && IUSE="${IUSE} innodb"
 
@@ -440,6 +443,10 @@ src_compile() {
 				myconf="${myconf} --with-partition"
 			fi
 		fi
+
+		mysql_version_is_at_least "5.00.18.00" \
+		&& useq "max-idx-128" \
+		&& myconf="${myconf} --with-max-indexes=128"
 	fi
 
 	#Bug #114895,Bug #110149
@@ -548,7 +555,7 @@ src_install() {
 	done
 
 	# oops
-	mysql_check_version_range "5.00.16.00 to 5.00.16.99" \
+	mysql_check_version_range "5.00.16.00 to 5.00.18.99" \
 	&& cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
 
 	# TODO change at Makefile-am level
@@ -761,7 +768,7 @@ pkg_config() {
 		# 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}" 2>&1 | grep -v "Skipping it."
+		> "${sqltmp}" 2>/dev/null
 
 		if [[ -r "${help_tables}" ]] ; then
 			cat "${help_tables}" >> "${sqltmp}"
diff --git a/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild b/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
index ee7916f597ae..7ffc3448e3ac 100644
--- a/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
+++ b/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild,v 1.2 2005/12/26 23:10:57 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.4_alpha-r30.ebuild,v 1.3 2005/12/30 19:52:40 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -26,7 +26,7 @@ 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-20051205.tar.bz2"
+	mirror://gentoo/mysql-extras-20051220.tar.bz2"
 
 LICENSE="GPL-2"
 KEYWORDS="-*"
@@ -55,6 +55,9 @@ mysql_version_is_at_least() {
 mysql_version_is_at_least "4.01.03.00" \
 && IUSE="${IUSE} cluster utf8 extraengine"
 
+mysql_version_is_at_least "5.00.18.00" \
+&& IUSE="${IUSE} max-idx-128"
+
 mysql_version_is_at_least "5.01.00.00" \
 && IUSE="${IUSE} innodb"
 
@@ -438,6 +441,10 @@ src_compile() {
 				myconf="${myconf} --with-partition"
 			fi
 		fi
+
+		mysql_version_is_at_least "5.00.18.00" \
+		&& useq "max-idx-128" \
+		&& myconf="${myconf} --with-max-indexes=128"
 	fi
 
 	#Bug #114895,Bug #110149
@@ -546,7 +553,7 @@ src_install() {
 	done
 
 	# oops
-	mysql_check_version_range "5.00.16.00 to 5.00.17.99" \
+	mysql_check_version_range "5.00.16.00 to 5.00.18.99" \
 	&& cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/"
 
 	# TODO change at Makefile-am level