/[gentoo-x86]/eclass/mysql.eclass

Diff of /eclass/mysql.eclass

Parent Directory | Revision Log | View Patch Patch

Revision 1.103		Revision 1.168
1	# Copyright 1999-2007 Gentoo Foundation	1	# Copyright 1999-2012 Gentoo Foundation
2	# Distributed under the terms of the GNU General Public License v2	2	# Distributed under the terms of the GNU General Public License v2
3	# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.103 2009/01/12 23:08:17 maekke Exp $	3	# $Header: /var/cvsroot/gentoo-x86/eclass/Attic/mysql.eclass,v 1.168 2012/01/08 23:33:25 jmbsvicetto Exp $
4		4
5	# Author: Francesco Riosa (Retired) <vivo@gentoo.org>	5	# @ECLASS: mysql.eclass
		6	# @MAINTAINER:
6	# Maintainer: MySQL Team <mysql-bugs@gentoo.org>	7	# MySQL Team <mysql-bugs@gentoo.org>
7	# - Luca Longinotti <chtekk@gentoo.org>	8	# Luca Longinotti <chtekk@gentoo.org>
8	# - Robin H. Johnson <robbat2@gentoo.org>	9	# Robin H. Johnson <robbat2@gentoo.org>
		10	# @AUTHOR:
		11	# Francesco Riosa (Retired) <vivo@gentoo.org>
		12	# @BLURB: This eclass provides most of the functions for mysql ebuilds
		13	# @DESCRIPTION:
		14	# The mysql.eclass provides almost all the code to build the mysql ebuilds
		15	# including the src_unpack, src_prepare, src_configure, src_compile,
		16	# scr_install, pkg_preinst, pkg_postinst, pkg_config and pkg_postrm
		17	# phase hooks.
9		18
10	WANT_AUTOCONF="latest"	19	WANT_AUTOCONF="latest"
11	WANT_AUTOMAKE="latest"	20	WANT_AUTOMAKE="latest"
12		21
13	inherit eutils flag-o-matic gnuconfig autotools mysql_fx	22	inherit eutils flag-o-matic gnuconfig autotools mysql_fx versionator toolchain-funcs
14		23
15	# Shorten the path because the socket path length must be shorter than 107 chars	24	# Shorten the path because the socket path length must be shorter than 107 chars
16	# and we will run a mysql server during test phase	25	# and we will run a mysql server during test phase
17	S="${WORKDIR}/mysql"	26	S="${WORKDIR}/mysql"
18		27
19	[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20070108"	28	[[ "${MY_EXTRAS_VER}" == "latest" ]] && MY_EXTRAS_VER="20090228-0714Z"
20	if [[ "${MY_EXTRAS_VER}" == "live" ]]; then	29	if [[ "${MY_EXTRAS_VER}" == "live" ]]; then
21	EGIT_PROJECT=mysql-extras	30	EGIT_PROJECT=mysql-extras
22	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"	31	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git"
23	inherit git	32	inherit git
24	fi	33	fi
25		34
26	if [[ ${PR#r} -lt 60 ]] ; then	35	case "${EAPI:-0}" in
27	IS_BITKEEPER=0	36	2 \| 3 \| 4)
28	elif [[ ${PR#r} -lt 90 ]] ; then	37	EXPORT_FUNCTIONS pkg_setup \
29	IS_BITKEEPER=60	38	src_unpack src_prepare \
30	else	39	src_configure src_compile \
31	IS_BITKEEPER=90	40	src_install \
		41	pkg_preinst pkg_postinst \
		42	pkg_config pkg_postrm
		43	IUSE_DEFAULT_ON='+'
		44	;;
		45	0 \| 1)
		46	EXPORT_FUNCTIONS pkg_setup \
		47	src_unpack \
		48	src_compile \
		49	src_install \
		50	pkg_preinst pkg_postinst \
		51	pkg_config pkg_postrm
		52	;;
		53	*)
		54	die "Unsupported EAPI: ${EAPI}" ;;
		55	esac
		56
		57
		58	# @ECLASS-VARIABLE: MYSQL_PV_MAJOR
		59	# @DESCRIPTION:
		60	# Upstream MySQL considers the first two parts of the version number to be the
		61	# major version. Upgrades that change major version should always run
		62	# mysql_upgrade.
		63	MYSQL_PV_MAJOR="$(get_version_component_range 1-2 ${PV})"
		64
		65	# Cluster is a special case...
		66	if [[ "${PN}" == "mysql-cluster" ]]; then
		67	case $PV in
		68	6.1\|7.0\|7.1*) MYSQL_PV_MAJOR=5.1 ;;
		69	esac
32	fi	70	fi
33		71
		72
		73	# @ECLASS-VARIABLE: MYSQL_VERSION_ID
		74	# @DESCRIPTION:
34	# MYSQL_VERSION_ID will be:	75	# MYSQL_VERSION_ID will be:
35	# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]	76	# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo revision number, all [0..99]
36	# This is an important part, because many of the choices the MySQL ebuild will do	77	# This is an important part, because many of the choices the MySQL ebuild will do
37	# depend on this variable.	78	# depend on this variable.
38	# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"	79	# In particular, the code below transforms a $PVR like "5.0.18-r3" in "5001803"
…		…
47	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"	88	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
48	done	89	done
49	# strip leading "0" (otherwise it's considered an octal number by BASH)	90	# strip leading "0" (otherwise it's considered an octal number by BASH)
50	MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}	91	MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
51		92
		93	# @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
		94	# @DESCRIPTION:
		95	# Specifiy if community features are available. Possible values are 1 (yes)
		96	# and 0 (no).
		97	# Community features are available in mysql-community
		98	# AND in the re-merged mysql-5.0.82 and newer
		99	if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
		100	MYSQL_COMMUNITY_FEATURES=1
		101	elif [ "${PV#5.0}" != "${PV}" ] && mysql_version_is_at_least "5.0.82"; then
		102	MYSQL_COMMUNITY_FEATURES=1
		103	elif [ "${PV#5.1}" != "${PV}" ] && mysql_version_is_at_least "5.1.28"; then
		104	MYSQL_COMMUNITY_FEATURES=1
		105	elif [ "${PV#5.4}" != "${PV}" ] ; then
		106	MYSQL_COMMUNITY_FEATURES=1
		107	elif [ "${PV#5.5}" != "${PV}" ] ; then
		108	MYSQL_COMMUNITY_FEATURES=1
		109	elif [ "${PV#6}" != "${PV}" ] ; then
		110	MYSQL_COMMUNITY_FEATURES=1
		111	elif [ "${PV#7}" != "${PV}" ] ; then
		112	MYSQL_COMMUNITY_FEATURES=1
		113	else
		114	MYSQL_COMMUNITY_FEATURES=0
		115	fi
		116
		117	# @ECLASS-VARIABLE: XTRADB_VER
		118	# @DESCRIPTION:
		119	# Version of the XTRADB storage engine
		120	XTRADB_VER="${XTRADB_VER}"
		121
		122	# @ECLASS-VARIABLE: PERCONA_VER
		123	# @DESCRIPTION:
		124	# Designation by PERCONA for a MySQL version to apply an XTRADB release
		125	PERCONA_VER="${PERCONA_VER}"
		126
52	# Be warned, *DEPEND are version-dependant	127	# Be warned, *DEPEND are version-dependant
53	# These are used for both runtime and compiletime	128	# These are used for both runtime and compiletime
54	DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )	129	DEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )
55	userland_GNU? ( sys-process/procps )	130	kernel_linux? ( sys-process/procps )
56	>=sys-apps/sed-4	131	>=sys-apps/sed-4
57	>=sys-apps/texinfo-4.7-r1	132	>=sys-apps/texinfo-4.7-r1
58	>=sys-libs/readline-4.1	133	>=sys-libs/readline-4.1
59	>=sys-libs/zlib-1.2.3"	134	>=sys-libs/zlib-1.2.3"
60		135
		136	[[ "${PN}" == "mariadb" ]] \
		137	&& DEPEND="${DEPEND} libevent? ( >=dev-libs/libevent-1.4 )"
		138
61	# Having different flavours at the same time is not a good idea	139	# Having different flavours at the same time is not a good idea
62	for i in "" "-community" ; do	140	for i in "mysql" "mysql-community" "mysql-cluster" "mariadb" ; do
63	[[ "${i}" == ${PN#mysql} ]] \|\|	141	[[ "${i}" == ${PN} ]] \|\|
64	DEPEND="${DEPEND} !dev-db/mysql${i}"	142	DEPEND="${DEPEND} !dev-db/${i}"
65	done	143	done
66		144
		145	# prefix: first need to implement something for #196294
67	RDEPEND="${DEPEND}	146	RDEPEND="${DEPEND}
68	!minimal? ( dev-db/mysql-init-scripts )	147	!minimal? ( !prefix? ( dev-db/mysql-init-scripts ) )
69	selinux? ( sec-policy/selinux-mysql )"	148	selinux? ( sec-policy/selinux-mysql )"
		149
		150	DEPEND="${DEPEND}
		151	virtual/yacc"
		152
		153	if [ "${EAPI:-0}" = "2" ]; then
		154	DEPEND="${DEPEND} static? ( \|\| ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
		155	fi
70		156
71	# compile-time-only	157	# compile-time-only
72	mysql_version_is_at_least "5.1" \	158	mysql_version_is_at_least "5.1" \
73	\|\| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"	159	\|\| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
74		160
75	# compile-time-only	161	# compile-time-only
76	mysql_version_is_at_least "5.1.12" \	162	mysql_version_is_at_least "5.1.12" \
77	&& DEPEND="${DEPEND} innodb? ( >=dev-util/cmake-2.4.3 )"	163	&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
78		164
79	# BitKeeper dependency, compile-time only	165	[[ "${PN}" == "mariadb" ]] \
80	[[ ${IS_BITKEEPER} -eq 90 ]] && DEPEND="${DEPEND} dev-util/bk_client"	166	&& mysql_version_is_at_least "5.2" \
81		167	&& DEPEND="${DEPEND} oqgraph? ( >=dev-libs/boost-1.40.0 )"
		168	#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
		169	# sphinx? ( app-misc/sphinx )"
82		170
83	# dev-perl/DBD-mysql is needed by some scripts installed by MySQL	171	# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
84	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"	172	PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
85		173
		174	# For other stuff to bring us in
		175	PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
		176
86	# Work out the default SERVER_URI correctly	177	# Work out the default SERVER_URI correctly
87	if [ -z "${SERVER_URI}" ]; then	178	if [ -z "${SERVER_URI}" ]; then
		179	[ -z "${MY_PV}" ] && MY_PV="${PV//_/-}"
		180	if [ "${PN}" == "mariadb" ]; then
		181	MARIA_FULL_PV="$(replace_version_separator 3 '-' ${PV})"
		182	MARIA_FULL_P="${PN}-${MARIA_FULL_PV}"
		183	SERVER_URI="
		184	http://ftp.osuosl.org/pub/mariadb/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		185	http://ftp.rediris.es/mirror/MariaDB/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		186	http://maria.llarian.net/download/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		187	http://launchpad.net/maria/${MYSQL_PV_MAJOR}/ongoing/+download/${MARIA_FULL_P}.tar.gz
		188	http://mirrors.fe.up.pt/pub/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		189	http://ftp-stud.hs-esslingen.de/pub/Mirrors/${PN}/${MARIA_FULL_P}/kvm-tarbake-jaunty-x86/${MARIA_FULL_P}.tar.gz
		190	"
88	# The community build is on the mirrors	191	# The community and cluster builds are on the mirrors
		192	elif [[ "${MYSQL_COMMUNITY_FEATURES}" == "1" \|\| ${PN} == "mysql-cluster" ]] ; then
89	if [ "${PN}" == "mysql-community" ]; then	193	if [[ "${PN}" == "mysql-cluster" ]] ; then
90	SERVER_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/mysql-${PV//_/-}.tar.gz"	194	URI_DIR="MySQL-Cluster"
		195	URI_FILE="mysql-cluster-gpl"
		196	else
		197	URI_DIR="MySQL"
		198	URI_FILE="mysql"
		199	fi
		200	URI_A="${URI_FILE}-${MY_PV}.tar.gz"
		201	MIRROR_PV=$(get_version_component_range 1-2 ${PV})
		202	# Recently upstream switched to an archive site, and not on mirrors
		203	SERVER_URI="http://downloads.mysql.com/archives/${URI_FILE}-${MIRROR_PV}/${URI_A}
		204	mirror://mysql/Downloads/${URI_DIR}-${PV%.*}/${URI_A}"
91	# The enterprise source is on the primary site only	205	# The (old) enterprise source is on the primary site only
92	elif [ "${PN}" == "mysql" ]; then	206	elif [ "${PN}" == "mysql" ]; then
93	SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${PV//_/-}.tar.gz"	207	SERVER_URI="ftp://ftp.mysql.com/pub/mysql/src/mysql-${MY_PV}.tar.gz"
94	fi	208	fi
95	fi	209	fi
96		210
97	# Define correct SRC_URIs	211	# Define correct SRC_URIs
98	SRC_URI="${SERVER_URI}"	212	SRC_URI="${SERVER_URI}"
99		213
100	[[ ${MY_EXTRAS_VER} != live ]] && SRC_URI="${SRC_URI}	214	# Gentoo patches to MySQL
		215	[[ ${MY_EXTRAS_VER} != live ]] \
		216	&& SRC_URI="${SRC_URI}
101	mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2	217	mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
102	http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"	218	http://g3nt8.org/patches/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
103	mysql_version_is_at_least "5.1.12" \	219	http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
104	&& [[ -n "${PBXT_VERSION}" ]] \
105	&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz )"
106		220
107	DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."	221	DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
108	HOMEPAGE="http://www.mysql.com/"	222	HOMEPAGE="http://www.mysql.com/"
		223	if [[ "${PN}" == "mariadb" ]]; then
		224	HOMEPAGE="http://askmonty.org/"
		225	DESCRIPTION="MariaDB is a MySQL fork with 3rd-party patches and additional storage engines merged."
		226	fi
		227	if [[ "${PN}" == "mysql-community" ]]; then
		228	DESCRIPTION="${DESCRIPTION} (obsolete, move to dev-db/mysql)"
		229	fi
109	LICENSE="GPL-2"	230	LICENSE="GPL-2"
110	SLOT="0"	231	SLOT="0"
111	IUSE="big-tables debug embedded minimal perl selinux ssl static"	232	IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
112		233
113	mysql_version_is_at_least "4.1" \	234	mysql_version_is_at_least "4.1" \
114	&& IUSE="${IUSE} latin1"	235	&& IUSE="${IUSE} latin1"
115		236
116	mysql_version_is_at_least "4.1.3" \	237	if mysql_version_is_at_least "4.1.3" ; then
117	&& IUSE="${IUSE} cluster extraengine"	238	IUSE="${IUSE} extraengine"
		239	if [[ "${PN}" != "mysql-cluster" ]] ; then
		240	IUSE="${IUSE} cluster"
		241	fi
		242	fi
118		243
119	mysql_version_is_at_least "5.0" \	244	mysql_version_is_at_least "5.0" \
120	\|\| IUSE="${IUSE} raid"	245	\|\| IUSE="${IUSE} raid"
121		246
122	mysql_version_is_at_least "5.0.18" \	247	mysql_version_is_at_least "5.0.18" \
123	&& IUSE="${IUSE} max-idx-128"	248	&& IUSE="${IUSE} max-idx-128"
124		249
125	mysql_version_is_at_least "5.1" \	250	mysql_version_is_at_least "5.1" \
126	&& IUSE="${IUSE} innodb"
127
128	mysql_version_is_at_least "5.1" \
129	\|\| IUSE="${IUSE} berkdb"	251	\|\| IUSE="${IUSE} berkdb"
130		252
		253	[ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
		254	&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
		255
		256	[[ "${PN}" == "mariadb" ]] \
		257	&& IUSE="${IUSE} libevent"
		258
		259	[[ "${PN}" == "mariadb" ]] \
		260	&& mysql_version_is_at_least "5.2" \
		261	&& IUSE="${IUSE} oqgraph"
		262	#SphinxSE is included but is not available in 5.2.4 due to a missing plug.in file
		263	#&& IUSE="${IUSE} oqgraph sphinx"
		264
		265	# MariaDB has integrated PBXT
		266	# PBXT_VERSION means that we have a PBXT patch for this PV
		267	# PBXT was only introduced after 5.1.12
		268	pbxt_patch_available() {
		269	[[ "${PN}" != "mariadb" ]] \
131	mysql_version_is_at_least "5.1.12" \	270	&& mysql_version_is_at_least "5.1.12" \
		271	&& [[ -n "${PBXT_VERSION}" ]]
		272	return $?
		273	}
		274
		275	pbxt_available() {
		276	pbxt_patch_available \|\| [[ "${PN}" == "mariadb" ]]
		277	return $?
		278	}
		279
		280	# Get the percona tarball if XTRADB_VER and PERCONA_VER are both set
		281	# MariaDB has integrated XtraDB
		282	# XTRADB_VERS means that we have a XTRADB patch for this PV
		283	# XTRADB was only introduced after 5.1.26
		284	xtradb_patch_available() {
		285	[[ "${PN}" != "mariadb" ]] \
		286	&& mysql_version_is_at_least "5.1.26" \
		287	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
		288	return $?
		289	}
		290
		291
		292	pbxt_patch_available \
		293	&& PBXT_P="pbxt-${PBXT_VERSION}" \
		294	&& PBXT_SRC_URI="http://www.primebase.org/download/${PBXT_P}.tar.gz mirror://sourceforge/pbxt/${PBXT_P}.tar.gz" \
		295	&& SRC_URI="${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" \
		296
		297	# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plugins
		298	# vs. built outside the dir
		299	pbxt_available \
132	&& IUSE="${IUSE} pbxt"	300	&& IUSE="${IUSE} pbxt" \
		301	&& mysql_version_is_at_least "5.1.40" \
		302	&& PBXT_NEWSTYLE=1
133		303
134	EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_preinst \	304	xtradb_patch_available \
135	pkg_postinst pkg_config pkg_postrm	305	&& XTRADB_P="percona-xtradb-${XTRADB_VER}" \
		306	&& XTRADB_SRC_URI_COMMON="${PERCONA_VER}/source/${XTRADB_P}.tar.gz" \
		307	&& XTRADB_SRC_B1="http://www.percona.com/" \
		308	&& XTRADB_SRC_B2="${XTRADB_SRC_B1}/percona-builds/" \
		309	&& XTRADB_SRC_URI1="${XTRADB_SRC_B2}/Percona-Server/Percona-Server-${XTRADB_SRC_URI_COMMON}" \
		310	&& XTRADB_SRC_URI2="${XTRADB_SRC_B2}/xtradb/${XTRADB_SRC_URI_COMMON}" \
		311	&& XTRADB_SRC_URI3="${XTRADB_SRC_B1}/${PN}/xtradb/${XTRADB_SRC_URI_COMMON}" \
		312	&& SRC_URI="${SRC_URI} xtradb? ( ${XTRADB_SRC_URI1} ${XTRADB_SRC_URI2} ${XTRADB_SRC_URI3} )" \
		313	&& IUSE="${IUSE} xtradb"
136		314
137	#	315	#
138	# HELPER FUNCTIONS:	316	# HELPER FUNCTIONS:
139	#	317	#
140		318
141	bitkeeper_fetch() {	319	# @FUNCTION: mysql_disable_test
142	local reposuf	320	# @DESCRIPTION:
143	if [[ -z "${1}" ]] ; then	321	# Helper function to disable specific tests.
144	local tpv
145	tpv=( ${PV//[-._]/ } )
146	reposuf="mysql-${tpv[0]}.${tpv[1]}"
147	else
148	reposuf="${1}"
149	fi
150	einfo "Using '${reposuf}' repository."
151	local repo_uri="bk://mysql.bkbits.net/${reposuf}"
152	## -- ebk_store_dir: bitkeeper sources store directory
153	local ebk_store_dir="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/bk-src"
154	## -- ebk_fetch_cmd: bitkeeper fetch command
155	# always fetch the latest revision, use -r<revision> if a specified revision is wanted
156	# hint: does not work
157	local ebk_fetch_cmd="sfioball"
158	## -- ebk_update_cmd: bitkeeper update command
159	local ebk_update_cmd="update"
160
161	# addread "/etc/bitkeeper"
162	addwrite "${ebk_store_dir}"
163
164	if [[ ! -d "${ebk_store_dir}" ]] ; then
165	debug-print "${FUNCNAME}: initial checkout, creating bitkeeper directory ..."
166	mkdir -p "${ebk_store_dir}" \|\| die "BK: couldn't mkdir ${ebk_store_dir}"
167	fi
168
169	pushd "${ebk_store_dir}" \|\| die "BK: couldn't chdir to ${ebk_store_dir}"
170
171	local wc_path=${reposuf}
172
173	if [[ ! -d "${wc_path}" ]] ; then
174	local options="-r+"
175
176	# first checkout
177	einfo "bitkeeper checkout start -->"
178	einfo " repository: ${repo_uri}"
179
180	${ebk_fetch_cmd} ${options} "${repo_uri}" "${wc_path}" \
181	\|\| die "BK: couldn't fetch from ${repo_uri}"
182	else
183	if [[ ! -d "${wc_path}/BK" ]] ; then
184	popd
185	die "Looks like ${wc_path} is not a bitkeeper path"
186	fi
187
188	# update working copy
189	einfo "bitkeeper update start -->"
190	einfo " repository: ${repo_uri}"
191
192	${ebk_update_cmd} "${repo_uri}" "${wc_path}" \
193	\|\| die "BK: couldn't update from ${repo_uri} to ${wc_path}"
194	fi
195
196	einfo " working copy: ${wc_path}"
197	cd "${wc_path}"
198	rsync -rlpgo --exclude="BK/" . "${S}" \|\| die "BK: couldn't export to ${S}"
199
200	echo
201	popd
202	}
203
204	mysql_disable_test() {	322	mysql_disable_test() {
		323	local rawtestname testname testsuite reason mysql_disable_file
205	local testname="${1}" ; shift	324	rawtestname="${1}" ; shift
206	local reason="${@}"	325	reason="${@}"
		326	ewarn "test '${rawtestname}' disabled: '${reason}'"
		327
		328	testsuite="${rawtestname/.*}"
		329	testname="${rawtestname/*.}"
207	local mysql_disable_file="${S}/mysql-test/t/disabled.def"	330	mysql_disable_file="${S}/mysql-test/t/disabled.def"
		331	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
208	echo ${testname} : ${reason} >> "${mysql_disable_file}"	332	echo ${testname} : ${reason} >> "${mysql_disable_file}"
209	ewarn "test '${testname}' disabled: '${reason}'"
210	}
211		333
		334	# ${S}/mysql-tests/t/disabled.def
		335	#
		336	# ${S}/mysql-tests/suite/federated/disabled.def
		337	#
		338	# ${S}/mysql-tests/suite/jp/t/disabled.def
		339	# ${S}/mysql-tests/suite/ndb/t/disabled.def
		340	# ${S}/mysql-tests/suite/rpl/t/disabled.def
		341	# ${S}/mysql-tests/suite/parts/t/disabled.def
		342	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
		343	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
		344	# ${S}/mysql-tests/suite/binlog/t/disabled.def
		345	# ${S}/mysql-tests/suite/innodb/t/disabled.def
		346	if [ -n "${testsuite}" ]; then
		347	for mysql_disable_file in \
		348	${S}/mysql-test/suite/${testsuite}/disabled.def \
		349	${S}/mysql-test/suite/${testsuite}/t/disabled.def \
		350	FAILED ; do
		351	[ -f "${mysql_disable_file}" ] && break
		352	done
		353	if [ "${mysql_disabled_file}" != "FAILED" ]; then
		354	echo "${testname} : ${reason}" >> "${mysql_disable_file}"
		355	else
		356	ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
		357	fi
		358	fi
		359	}
		360
		361	# @FUNCTION: mysql_init_vars
		362	# @DESCRIPTION:
212	# void mysql_init_vars()	363	# void mysql_init_vars()
213	#
214	# Initialize global variables	364	# Initialize global variables
215	# 2005-11-19 <vivo@gentoo.org>	365	# 2005-11-19 <vivo@gentoo.org>
216
217	mysql_init_vars() {	366	mysql_init_vars() {
218	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="/usr/share/mysql"}	367	MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"}
219	MY_SYSCONFDIR=${MY_SYSCONFDIR="/etc/mysql"}	368	MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"}
220	MY_LIBDIR=${MY_LIBDIR="/usr/$(get_libdir)/mysql"}	369	MY_LIBDIR=${MY_LIBDIR="${EPREFIX}/usr/$(get_libdir)/mysql"}
221	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="/var/lib/mysql"}	370	MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"}
222	MY_LOGDIR=${MY_LOGDIR="/var/log/mysql"}	371	MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"}
223	MY_INCLUDEDIR=${MY_INCLUDEDIR="/usr/include/mysql"}	372	MY_INCLUDEDIR=${MY_INCLUDEDIR="${EPREFIX}/usr/include/mysql"}
224		373
225	if [[ -z "${MY_DATADIR}" ]] ; then	374	if [[ -z "${MY_DATADIR}" ]] ; then
226	MY_DATADIR=""	375	MY_DATADIR=""
227	if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then	376	if [[ -f ${MY_SYSCONFDIR}/my.cnf ]] ; then
228	MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \	377	MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
229	\| sed -ne '/datadir/s\|^--datadir=\|\|p' \	378	\| sed -ne '/datadir/s\|^--datadir=\|\|p' \
230	\| tail -n1`	379	\| tail -n1`
231	if [[ -z "${MY_DATADIR}" ]] ; then	380	if [[ -z "${MY_DATADIR}" ]] ; then
232	MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \	381	MY_DATADIR=`grep ^datadir ${MY_SYSCONFDIR}/my.cnf \
233	\| sed -e 's/.=\s//' \	382	\| sed -e 's/.=\s//' \
234	\| tail -n1`	383	\| tail -n1`
235	fi	384	fi
236	fi	385	fi
237	if [[ -z "${MY_DATADIR}" ]] ; then	386	if [[ -z "${MY_DATADIR}" ]] ; then
…		…
249	else	398	else
250	PREVIOUS_DATADIR="no"	399	PREVIOUS_DATADIR="no"
251	fi	400	fi
252	export PREVIOUS_DATADIR	401	export PREVIOUS_DATADIR
253	fi	402	fi
		403	else
		404	if [[ ${EBUILD_PHASE} == "config" ]]; then
		405	local new_MY_DATADIR
		406	new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
		407	\| sed -ne '/datadir/s\|^--datadir=\|\|p' \
		408	\| tail -n1`
		409
		410	if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
		411	ewarn "MySQL MY_DATADIR has changed"
		412	ewarn "from ${MY_DATADIR}"
		413	ewarn "to ${new_MY_DATADIR}"
		414	MY_DATADIR="${new_MY_DATADIR}"
		415	fi
254	fi	416	fi
		417	fi
255		418
		419	if [ "${MY_SOURCEDIR:-unset}" == "unset" ]; then
256	MY_SOURCEDIR=${SERVER_URI##*/}	420	MY_SOURCEDIR=${SERVER_URI##*/}
257	MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}	421	MY_SOURCEDIR=${MY_SOURCEDIR%.tar*}
		422	fi
258		423
259	export MY_SHAREDSTATEDIR MY_SYSCONFDIR	424	export MY_SHAREDSTATEDIR MY_SYSCONFDIR
260	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR	425	export MY_LIBDIR MY_LOCALSTATEDIR MY_LOGDIR
261	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR	426	export MY_INCLUDEDIR MY_DATADIR MY_SOURCEDIR
262	}	427	}
…		…
293	myconf="${myconf} $(use_with big-tables)"	458	myconf="${myconf} $(use_with big-tables)"
294	myconf="${myconf} --enable-local-infile"	459	myconf="${myconf} --enable-local-infile"
295	myconf="${myconf} --with-extra-charsets=all"	460	myconf="${myconf} --with-extra-charsets=all"
296	myconf="${myconf} --with-mysqld-user=mysql"	461	myconf="${myconf} --with-mysqld-user=mysql"
297	myconf="${myconf} --with-server"	462	myconf="${myconf} --with-server"
298	myconf="${myconf} --with-unix-socket-path=/var/run/mysqld/mysqld.sock"	463	myconf="${myconf} --with-unix-socket-path=${EPREFIX}/var/run/mysqld/mysqld.sock"
299	myconf="${myconf} --without-libwrap"	464	myconf="${myconf} --without-libwrap"
300		465
301	if use static ; then	466	if use static ; then
302	myconf="${myconf} --with-mysqld-ldflags=-all-static"	467	myconf="${myconf} --with-mysqld-ldflags=-all-static"
303	myconf="${myconf} --with-client-ldflags=-all-static"	468	myconf="${myconf} --with-client-ldflags=-all-static"
…		…
309	if use debug ; then	474	if use debug ; then
310	myconf="${myconf} --with-debug=full"	475	myconf="${myconf} --with-debug=full"
311	else	476	else
312	myconf="${myconf} --without-debug"	477	myconf="${myconf} --without-debug"
313	mysql_version_is_at_least "4.1.3" \	478	mysql_version_is_at_least "4.1.3" \
314	&& use cluster \	479	&& ( use cluster \|\| [[ "${PN}" == "mysql-cluster" ]] ) \
315	&& myconf="${myconf} --without-ndb-debug"	480	&& myconf="${myconf} --without-ndb-debug"
316	fi	481	fi
317		482
318	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then	483	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
319	ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"	484	ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
…		…
338	fi	503	fi
339		504
340	}	505	}
341		506
342	configure_40_41_50() {	507	configure_40_41_50() {
		508	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr"
343	myconf="${myconf} $(use_with perl bench)"	509	myconf="${myconf} $(use_with perl bench)"
344	myconf="${myconf} --enable-assembler"	510	myconf="${myconf} --enable-assembler"
345	myconf="${myconf} --with-extra-tools"	511	myconf="${myconf} --with-extra-tools"
346	myconf="${myconf} --with-innodb"	512	myconf="${myconf} --with-innodb"
347	myconf="${myconf} --without-readline"	513	myconf="${myconf} --without-readline"
		514	myconf="${myconf} $(use_with ssl openssl "${EPREFIX}/usr")"
348	mysql_version_is_at_least "5.0" \|\| myconf="${myconf} $(use_with raid)"	515	mysql_version_is_at_least "5.0" \|\| myconf="${myconf} $(use_with raid)"
349		516
350	# --with-vio is not needed anymore, it's on by default and	517	# --with-vio is not needed anymore, it's on by default and
351	# has been removed from configure	518	# has been removed from configure
		519	# Apply to 4.x and 5.0.[0-3]
352	if use ssl ; then	520	if use ssl ; then
353	mysql_version_is_at_least "5.0.4" \|\| myconf="${myconf} --with-vio"	521	mysql_version_is_at_least "5.0.4" \|\| myconf="${myconf} --with-vio"
354	fi
355
356	if mysql_version_is_at_least "5.1.11" ; then
357	myconf="${myconf} $(use_with ssl)"
358	else
359	myconf="${myconf} $(use_with ssl openssl)"
360	fi	522	fi
361		523
362	if mysql_version_is_at_least "5.0.60" ; then	524	if mysql_version_is_at_least "5.0.60" ; then
363	if use berkdb ; then	525	if use berkdb ; then
364	elog "Berkeley DB support was disabled due to build failures"	526	elog "Berkeley DB support was disabled due to build failures"
…		…
380	myconf="${myconf} --without-berkeley-db"	542	myconf="${myconf} --without-berkeley-db"
381	fi	543	fi
382		544
383	if mysql_version_is_at_least "4.1.3" ; then	545	if mysql_version_is_at_least "4.1.3" ; then
384	myconf="${myconf} --with-geometry"	546	myconf="${myconf} --with-geometry"
		547	if [[ "${PN}" != "mysql-cluster" ]] ; then
385	myconf="${myconf} $(use_with cluster ndbcluster)"	548	myconf="${myconf} $(use_with cluster ndbcluster)"
		549	fi
386	fi	550	fi
387		551
388	if mysql_version_is_at_least "4.1.3" && use extraengine ; then	552	if mysql_version_is_at_least "4.1.3" && use extraengine ; then
389	# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html	553	# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
390	myconf="${myconf} --with-archive-storage-engine"	554	myconf="${myconf} --with-archive-storage-engine"
…		…
403	elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"	567	elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
404	myconf="${myconf} --with-federated-storage-engine"	568	myconf="${myconf} --with-federated-storage-engine"
405	fi	569	fi
406	fi	570	fi
407		571
408	if [ "${PN}" == "mysql-community" ]; then	572	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
409	myconf="${myconf} --enable-community-features"	573	myconf="${myconf} `use_enable community community-features`"
		574	if use community; then
		575	myconf="${myconf} `use_enable profiling`"
		576	else
		577	myconf="${myconf} --disable-profiling"
		578	fi
410	fi	579	fi
411		580
412	mysql_version_is_at_least "5.0.18" \	581	mysql_version_is_at_least "5.0.18" \
413	&& use max-idx-128 \	582	&& use max-idx-128 \
414	&& myconf="${myconf} --with-max-indexes=128"	583	&& myconf="${myconf} --with-max-indexes=128"
…		…
416		585
417	configure_51() {	586	configure_51() {
418	# TODO: !!!! readd --without-readline	587	# TODO: !!!! readd --without-readline
419	# the failure depend upon config/ac-macros/readline.m4 checking into	588	# the failure depend upon config/ac-macros/readline.m4 checking into
420	# readline.h instead of history.h	589	# readline.h instead of history.h
421	myconf="${myconf} $(use_with ssl)"	590	myconf="${myconf} $(use_with ssl ssl "${EPREFIX}"/usr)"
422	myconf="${myconf} --enable-assembler"	591	myconf="${myconf} --enable-assembler"
423	myconf="${myconf} --with-geometry"	592	myconf="${myconf} --with-geometry"
424	myconf="${myconf} --with-readline"	593	myconf="${myconf} --with-readline"
425	myconf="${myconf} --with-row-based-replication"	594	myconf="${myconf} --with-zlib-dir=${EPREFIX}/usr/"
426	myconf="${myconf} --with-zlib=/usr/$(get_libdir)"
427	myconf="${myconf} --without-pstack"	595	myconf="${myconf} --without-pstack"
		596	myconf="${myconf} --with-plugindir=${EPREFIX}/usr/$(get_libdir)/mysql/plugin"
		597
		598	# This is an explict die here, because if we just forcibly disable it, then the
		599	# user's data is not accessible.
		600	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
428	use max-idx-128 && myconf="${myconf} --with-max-indexes=128"	601	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
		602	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
		603	myconf="${myconf} $(use_enable community community-features)"
		604	if use community; then
		605	myconf="${myconf} $(use_enable profiling)"
		606	else
		607	myconf="${myconf} --disable-profiling"
		608	fi
		609	fi
		610
		611	# Scan for all available plugins
		612	local plugins_avail="$(
		613	LANG=C \
		614	find "${S}" \
		615	\( \
		616	-name 'plug.in' \
		617	-o -iname 'configure.in' \
		618	-o -iname 'configure.ac' \
		619	\) \
		620	-print0 \
		621	\| xargs -0 sed -r -n \
		622	-e '/^MYSQL_STORAGE_ENGINE/{
		623	s~MYSQL_STORAGE_ENGINE\([[:space:]]\[?([-_a-z0-9]+)\]?.,~\1 ~g ;
		624	s~^([^ ]+).*~\1~gp;
		625	}' \
		626	\| tr -s '\n' ' '
		627	)"
429		628
430	# 5.1 introduces a new way to manage storage engines (plugins)	629	# 5.1 introduces a new way to manage storage engines (plugins)
431	# like configuration=none	630	# like configuration=none
		631	# This base set are required, and will always be statically built.
432	local plugins="csv,myisam,myisammrg,heap"	632	local plugins_sta="csv myisam myisammrg heap"
		633	local plugins_dyn=""
		634	local plugins_dis="example ibmdb2i"
		635
		636	# These aren't actually required by the base set, but are really useful:
		637	plugins_sta="${plugins_sta} archive blackhole"
		638
		639	# default in 5.5.4
		640	if mysql_version_is_at_least "5.5.4" ; then
		641	plugins_sta="${plugins_sta} partition"
		642	fi
		643	# Now the extras
433	if use extraengine ; then	644	if use extraengine ; then
434	# like configuration=max-no-ndb, archive and example removed in 5.1.11	645	# like configuration=max-no-ndb, archive and example removed in 5.1.11
435	plugins="${plugins},archive,blackhole,example,federated,partition"	646	# not added yet: ibmdb2i
		647	# Not supporting as examples: example,daemon_example,ftexample
		648	plugins_sta="${plugins_sta} partition"
436		649
		650	if [[ "${PN}" != "mariadb" ]] ; then
437	elog "Before using the Federated storage engine, please be sure to read"	651	elog "Before using the Federated storage engine, please be sure to read"
438	elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"	652	elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
		653	plugins_dyn="${plugins_sta} federated"
		654	else
		655	elog "MariaDB includes the FederatedX engine. Be sure to read"
		656	elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
		657	plugins_dyn="${plugins_sta} federatedx"
439	fi	658	fi
440		659	else
441	if use innodb ; then	660	plugins_dis="${plugins_dis} partition federated"
442	plugins="${plugins},innobase"
443	fi	661	fi
		662
		663	# Upstream specifically requests that InnoDB always be built:
		664	# - innobase, innodb_plugin
		665	# Build falcon if available for 6.x series.
		666	for i in innobase falcon ; do
		667	[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
		668	done
		669	for i in innodb_plugin ; do
		670	[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
		671	done
444		672
445	# like configuration=max-no-ndb	673	# like configuration=max-no-ndb
446	if use cluster ; then	674	if ( use cluster \|\| [[ "${PN}" == "mysql-cluster" ]] ) ; then
447	plugins="${plugins},ndbcluster"	675	plugins_sta="${plugins_sta} ndbcluster partition"
		676	plugins_dis="${plugins_dis//partition}"
448	myconf="${myconf} --with-ndb-binlog"	677	myconf="${myconf} --with-ndb-binlog"
		678	else
		679	plugins_dis="${plugins_dis} ndbcluster"
		680	fi
		681
		682	if [[ "${PN}" == "mariadb" ]] ; then
		683	# In MariaDB, InnoDB is packaged in the xtradb directory, so it's not
		684	# caught above.
		685	# This is not optional, without it several upstream testcases fail.
		686	# Also strongly recommended by upstream.
		687	if [[ "${PV}" < "5.2.0" ]] ; then
		688	myconf="${myconf} --with-maria-tmp-tables"
		689	plugins_sta="${plugins_sta} maria"
		690	else
		691	myconf="${myconf} --with-aria-tmp-tables"
		692	plugins_sta="${plugins_sta} aria"
449	fi	693	fi
450		694
		695	[ -e "${S}"/storage/innobase ] \|\| [ -e "${S}"/storage/xtradb ] \|\|
		696	die "The ${P} package doesn't provide innobase nor xtradb"
		697
		698	for i in innobase xtradb ; do
		699	[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
		700	done
		701
		702	myconf="${myconf} $(use_with libevent)"
		703
451	if mysql_version_is_at_least "5.2" ; then	704	if mysql_version_is_at_least "5.2" ; then
452	plugins="${plugins},falcon"	705	#This should include sphinx, but the 5.2.4 archive forgot the plug.in file
		706	#for i in oqgraph sphinx ; do
		707	for i in oqgraph ; do
		708	use ${i} \
		709	&& plugins_dyn="${plugins_dyn} ${i}" \
		710	\|\| plugins_dis="${plugins_dis} ${i}"
		711	done
453	fi	712	fi
		713	fi
454		714
		715	if pbxt_available && [[ "${PBXT_NEWSTYLE}" == "1" ]]; then
		716	use pbxt \
		717	&& plugins_dyn="${plugins_dyn} pbxt" \
		718	\|\| plugins_dis="${plugins_dis} pbxt"
		719	fi
		720
		721	use static && \
		722	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
		723	plugins_dyn=""
		724
		725	einfo "Available plugins: ${plugins_avail}"
		726	einfo "Dynamic plugins: ${plugins_dyn}"
		727	einfo "Static plugins: ${plugins_sta}"
		728	einfo "Disabled plugins: ${plugins_dis}"
		729
		730	# These are the static plugins
455	myconf="${myconf} --with-plugins=${plugins}"	731	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
		732	# And the disabled ones
		733	for i in ${plugins_dis} ; do
		734	myconf="${myconf} --without-plugin-${i}"
		735	done
		736	}
		737
		738	pbxt_src_configure() {
		739	mysql_init_vars
		740
		741	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
		742
		743	einfo "Reconfiguring dir '${PWD}'"
		744	eautoreconf
		745
		746	local myconf=""
		747	myconf="${myconf} --with-mysql=${S} --libdir=${EPREFIX}/usr/$(get_libdir)"
		748	use debug && myconf="${myconf} --with-debug=full"
		749	econf ${myconf} \|\| die "Problem configuring PBXT storage engine"
456	}	750	}
457		751
458	pbxt_src_compile() {	752	pbxt_src_compile() {
459	mysql_init_vars
460		753
461	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null	754	# Be backwards compatible for now
462		755	if [[ $EAPI != 2 ]]; then
463	einfo "Reconfiguring dir '${PWD}'"	756	pbxt_src_configure
464	AT_GNUCONF_UPDATE="yes" eautoreconf	757	fi
465
466	local myconf=""
467	myconf="${myconf} --with-mysql=${S} --libdir=${D}/${MY_LIBDIR}"
468	use debug && myconf="${myconf} --with-debug=full"
469	# TODO: is it safe/needed to use econf here ?
470	./configure ${myconf} \|\| die "Problem configuring PBXT storage engine"
471	# TODO: is it safe/needed to use emake here ?	758	# TODO: is it safe/needed to use emake here ?
472	make \|\| die "Problem making PBXT storage engine (${myconf})"	759	make \|\| die "Problem making PBXT storage engine (${myconf})"
473		760
474	popd	761	popd
475	# TODO: modify test suite for PBXT	762	# TODO: modify test suite for PBXT
476	}	763	}
477		764
478	pbxt_src_install() {	765	pbxt_src_install() {
479	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null	766	pushd "${WORKDIR}/pbxt-${PBXT_VERSION}" &>/dev/null
480	make install \|\| die "Failed to install PBXT"	767	emake install DESTDIR="${D}" \|\| die "Failed to install PBXT"
481	popd	768	popd
482	}	769	}
483		770
484	#	771	#
485	# EBUILD FUNCTIONS	772	# EBUILD FUNCTIONS
486	#	773	#
		774	# @FUNCTION: mysql_pkg_setup
		775	# @DESCRIPTION:
		776	# Perform some basic tests and tasks during pkg_setup phase:
		777	# die if FEATURES="test", USE="-minimal" and not using FEATURES="userpriv"
		778	# check for conflicting use flags
		779	# create new user and group for mysql
		780	# warn about deprecated features
487	mysql_pkg_setup() {	781	mysql_pkg_setup() {
488	if hasq test ${FEATURES} ; then	782	if has test ${FEATURES} ; then
489	if ! use minimal ; then	783	if ! use minimal ; then
490	if [[ $UID -eq 0 ]]; then	784	if [[ $UID -eq 0 ]]; then
491	eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."	785	eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
492	fi	786	fi
493	fi	787	fi
494	fi	788	fi
495		789
		790	# bug 350844
		791	case "${EAPI:-0}" in
		792	0 \| 1)
		793	if use static && !built_with_use sys-libs/ncurses static-libs; then
		794	die "To build MySQL statically you need to enable static-libs for sys-libs/ncurses"
		795	fi
		796	;;
		797	esac
		798
496	# Check for USE flag problems in pkg_setup	799	# Check for USE flag problems in pkg_setup
497	if use static && use ssl ; then	800	if use static && use ssl ; then
498	eerror "MySQL does not support being built statically with SSL support enabled!"
499	die "MySQL does not support being built statically with SSL support enabled!"	801	M="MySQL does not support being built statically with SSL support enabled!"
		802	eerror "${M}"
		803	die "${M}"
		804	fi
		805
		806	if mysql_version_is_at_least "5.1.51" \
		807	&& ! mysql_version_is_at_least "5.2" \
		808	&& use debug ; then
		809	# Also in package.use.mask
		810	die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
500	fi	811	fi
501		812
502	if ! mysql_version_is_at_least "5.0" \	813	if ! mysql_version_is_at_least "5.0" \
503	&& use raid \	814	&& use raid \
504	&& use static ; then	815	&& use static ; then
…		…
506	eerror "with RAID support enabled."	817	eerror "with RAID support enabled."
507	die "USE flags 'raid' and 'static' conflict!"	818	die "USE flags 'raid' and 'static' conflict!"
508	fi	819	fi
509		820
510	if mysql_version_is_at_least "4.1.3" \	821	if mysql_version_is_at_least "4.1.3" \
511	&& ( use cluster \|\| use extraengine ) \	822	&& ( use cluster \|\| use extraengine \|\| use embedded ) \
512	&& use minimal ; then	823	&& use minimal ; then
513	eerror "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"
514	die "USE flags 'cluster' and 'extraengine' conflict with 'minimal' USE flag!"	824	M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
		825	eerror "${M}"
		826	die "${M}"
		827	fi
		828
		829	if mysql_version_is_at_least "5.1" \
		830	&& xtradb_patch_available \
		831	&& use xtradb \
		832	&& use embedded ; then
		833	M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
		834	eerror "${M}"
		835	die "${M}"
		836	fi
		837
		838	# Bug #290570, 284946, 307251
		839	# Upstream changes made us need a fairly new GCC4.
		840	# But only for 5.0.8[3-6]!
		841	if mysql_version_is_at_least "5.0.83" && ! mysql_version_is_at_least 5.0.87 ; then
		842	GCC_VER=$(gcc-version)
		843	case ${CHOST}:${GCC_VER} in
		844	-darwin:4.*) : ;; # bug #310615
		845	:2\|:3\|:4.0\|:4.1\|*:4.2)
		846	eerror "Some releases of MySQL required a very new GCC, and then"
		847	eerror "later release relaxed that requirement again. Either pick a"
		848	eerror "MySQL >=5.0.87, or use a newer GCC."
		849	die "Active GCC too old!" ;;
		850	esac
515	fi	851	fi
516		852
517	# This should come after all of the die statements	853	# This should come after all of the die statements
518	enewgroup mysql 60 \|\| die "problem adding 'mysql' group"	854	enewgroup mysql 60 \|\| die "problem adding 'mysql' group"
519	enewuser mysql 60 -1 /dev/null mysql \|\| die "problem adding 'mysql' user"	855	enewuser mysql 60 -1 /dev/null mysql \|\| die "problem adding 'mysql' user"
520		856
521	mysql_check_version_range "4.0 to 5.0.99.99" \	857	mysql_check_version_range "4.0 to 5.0.99.99" \
522	&& use berkdb \	858	&& use berkdb \
523	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"	859	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
524	}
525		860
		861	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
		862	ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
		863	ewarn "5.1 series should NOT be put into production. In the near"
		864	ewarn "future, it will be disabled from building."
		865	ewarn ""
		866	ewarn "If you need NDB support, you should instead move to the new"
		867	ewarn "mysql-cluster package that represents that upstream NDB"
		868	ewarn "development."
		869	fi
		870	}
		871
		872	# @FUNCTION: mysql_src_unpack
		873	# @DESCRIPTION:
		874	# Unpack the source code and call mysql_src_prepare for EAPI < 2.
526	mysql_src_unpack() {	875	mysql_src_unpack() {
527	# Initialize the proper variables first	876	# Initialize the proper variables first
528	mysql_init_vars	877	mysql_init_vars
529		878
530	unpack ${A}	879	unpack ${A}
531	# Grab the patches	880	# Grab the patches
532	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack	881	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
533	# Bitkeeper checkout support	882
534	if [[ ${IS_BITKEEPER} -eq 90 ]] ; then
535	if mysql_check_version_range "5.1 to 5.1.99" ; then
536	bitkeeper_fetch "mysql-5.1-ndb"
537	elif mysql_check_version_range "5.2 to 5.2.99" ; then
538	bitkeeper_fetch "mysql-5.2-falcon"
539	else
540	bitkeeper_fetch
541	fi
542	cd "${S}"
543	einfo "Running upstream autorun over BK sources ..."
544	BUILD/autorun.sh
545	else
546	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"	883	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
		884
		885	# Be backwards compatible for now
		886	case ${EAPI:-0} in
		887	2) : ;;
		888	0 \| 1) mysql_src_prepare ;;
		889	esac
		890	}
		891
		892	# @FUNCTION: mysql_src_prepare
		893	# @DESCRIPTION:
		894	# Apply patches to the source code and remove unneeded bundled libs.
		895	mysql_src_prepare() {
547	cd "${S}"	896	cd "${S}"
548	fi
549		897
550	# Apply the patches for this MySQL version	898	# Apply the patches for this MySQL version
551	EPATCH_SUFFIX="patch"	899	EPATCH_SUFFIX="patch"
552	mkdir -p "${EPATCH_SOURCE}" \|\| die "Unable to create epatch directory"	900	mkdir -p "${EPATCH_SOURCE}" \|\| die "Unable to create epatch directory"
553	# Clean out old items	901	# Clean out old items
…		…
555	# Now link in right patches	903	# Now link in right patches
556	mysql_mv_patches	904	mysql_mv_patches
557	# And apply	905	# And apply
558	epatch	906	epatch
559		907
560	# Additional checks, remove bundled zlib	908	# last -fPIC fixup, per bug #305873
		909	i="${S}"/storage/innodb_plugin/plug.in
		910	[ -f "${i}" ] && sed -i -e '/CFLAGS/s,-prefer-non-pic,,g' "${i}"
		911
		912	# Additional checks, remove bundled zlib (Cluster needs this, for static
		913	# memory management in zlib, leave available for Cluster)
		914	if [[ "${PN}" != "mysql-cluster" ]] ; then
561	rm -f "${S}/zlib/"*.[ch]	915	rm -f "${S}/zlib/"*.[ch]
562	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"	916	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
		917	fi
563	rm -f "scripts/mysqlbug"	918	rm -f "scripts/mysqlbug"
564		919
565	# Make charsets install in the right place	920	# Make charsets install in the right place
566	find . -name 'Makefile.am' \	921	find . -name 'Makefile.am' \
567	-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;	922	-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
568		923
569	if mysql_version_is_at_least "4.1" ; then	924	if mysql_version_is_at_least "4.1" ; then
570	# Remove what needs to be recreated, so we're sure it's actually done	925	# Remove what needs to be recreated, so we're sure it's actually done
		926	einfo "Cleaning up old buildscript files"
571	find . -name Makefile \	927	find . -name Makefile \
572	-o -name Makefile.in \	928	-o -name Makefile.in \
573	-o -name configure \	929	-o -name configure \
574	-exec rm -f {} \;	930	-exec rm -f {} \;
575	rm -f "ltmain.sh"	931	rm -f "ltmain.sh"
576	rm -f "scripts/mysqlbug"	932	rm -f "scripts/mysqlbug"
577	fi	933	fi
578		934
579	local rebuilddirlist d	935	local rebuilddirlist d
580		936
		937	if xtradb_patch_available && use xtradb ; then
		938	einfo "Adding storage engine: Percona XtraDB (replacing InnoDB)"
		939	pushd "${S}"/storage >/dev/null
		940	i="innobase"
		941	o="${WORKDIR}/storage-${i}.mysql-upstream"
		942	# Have we been here already?
		943	[ -d "${o}" ] && rm -f "${i}"
		944	# Or maybe we haven't
		945	[ -d "${i}" -a ! -d "${o}" ] && mv "${i}" "${o}"
		946	cp -ral "${WORKDIR}/${XTRADB_P}" "${i}"
		947	popd >/dev/null
		948	fi
		949
		950	if pbxt_patch_available && [[ "${PBXT_NEWSTYLE}" == "1" ]] && use pbxt ; then
		951	einfo "Adding storage engine: PBXT"
		952	pushd "${S}"/storage >/dev/null
		953	i='pbxt'
		954	[ -d "${i}" ] && rm -rf "${i}"
		955	cp -ral "${WORKDIR}/${PBXT_P}" "${i}"
		956	popd >/dev/null
		957	fi
		958
581	if mysql_version_is_at_least "5.1.12" ; then	959	if mysql_version_is_at_least "5.1.12" ; then
582	rebuilddirlist="."	960	rebuilddirlist="."
		961	# This does not seem to be needed presently. robbat2 2010/02/23
		962	#einfo "Updating innobase cmake"
583	# TODO: check this with a cmake expert	963	## TODO: check this with a cmake expert
584	use innodb \
585	&& cmake \	964	#cmake \
586	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \	965	# -DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
587	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \	966	# -DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
588	"storage/innobase"	967	# "storage/innobase"
589	else	968	else
590	rebuilddirlist=". innobase"	969	rebuilddirlist=". innobase"
591	fi	970	fi
592		971
593	for d in ${rebuilddirlist} ; do	972	for d in ${rebuilddirlist} ; do
594	einfo "Reconfiguring dir '${d}'"	973	einfo "Reconfiguring dir '${d}'"
595	pushd "${d}" &>/dev/null	974	pushd "${d}" &>/dev/null
596	AT_GNUCONF_UPDATE="yes" eautoreconf	975	eautoreconf
597	popd &>/dev/null	976	popd &>/dev/null
598	done	977	done
599		978
600	if mysql_check_version_range "4.1 to 5.0.99.99" \	979	if mysql_check_version_range "4.1 to 5.0.99.99" \
601	&& use berkdb ; then	980	&& use berkdb ; then
		981	einfo "Fixing up berkdb buildsystem"
602	[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"	982	[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
603	cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \	983	cp -f "${EPREFIX}/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
604	\|\| die "Could not copy libtool.m4 to bdb/dist/"	984	\|\| die "Could not copy libtool.m4 to bdb/dist/"
605	#These files exist only with libtool-2*, and need to be included.	985	#These files exist only with libtool-2*, and need to be included.
606	if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then	986	if [ -f ${EPREFIX}'/usr/share/aclocal/ltsugar.m4' ]; then
607	cat "/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"	987	cat "${EPREFIX}/usr/share/aclocal/ltsugar.m4" >> "bdb/dist/aclocal/libtool.ac"
608	cat "/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"	988	cat "${EPREFIX}/usr/share/aclocal/ltversion.m4" >> "bdb/dist/aclocal/libtool.ac"
609	cat "/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"	989	cat "${EPREFIX}/usr/share/aclocal/lt~obsolete.m4" >> "bdb/dist/aclocal/libtool.ac"
610	cat "/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"	990	cat "${EPREFIX}/usr/share/aclocal/ltoptions.m4" >> "bdb/dist/aclocal/libtool.ac"
611	fi	991	fi
612	pushd "bdb/dist" &>/dev/null	992	pushd "bdb/dist" &>/dev/null
613	sh s_all \	993	sh s_all \
614	\|\| die "Failed bdb reconfigure"	994	\|\| die "Failed bdb reconfigure"
615	popd &>/dev/null	995	popd &>/dev/null
616	fi	996	fi
617	}	997	}
618		998
		999	# @FUNCTION: mysql_src_configure
		1000	# @DESCRIPTION:
		1001	# Configure mysql to build the code for Gentoo respecting the use flags.
619	mysql_src_compile() {	1002	mysql_src_configure() {
620	# Make sure the vars are correctly initialized	1003	# Make sure the vars are correctly initialized
621	mysql_init_vars	1004	mysql_init_vars
622		1005
623	# $myconf is modified by the configure_* functions	1006	# $myconf is modified by the configure_* functions
624	local myconf=""	1007	local myconf=""
…		…
650	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"	1033	CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-rtti"
651	mysql_version_is_at_least "5.0" \	1034	mysql_version_is_at_least "5.0" \
652	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"	1035	&& CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
653	export CXXFLAGS	1036	export CXXFLAGS
654		1037
		1038	# bug #283926, with GCC4.4, this is required to get correct behavior.
		1039	append-flags -fno-strict-aliasing
		1040
		1041	# bug #335185, #335995, with >= GCC4.3.3 on x86 only, omit-frame-pointer
		1042	# causes a mis-compile.
		1043	# Upstream bugs:
		1044	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38562
		1045	# http://bugs.mysql.com/bug.php?id=45205
		1046	use x86 && version_is_at_least "4.3.3" "$(gcc-fullversion)" && \
		1047	append-flags -fno-omit-frame-pointer && \
		1048	filter-flags -fomit-frame-pointer
		1049
655	econf \	1050	econf \
656	--libexecdir="/usr/sbin" \	1051	--libexecdir="${EPREFIX}"/usr/sbin \
657	--sysconfdir="${MY_SYSCONFDIR}" \	1052	--sysconfdir=${MY_SYSCONFDIR} \
658	--localstatedir="${MY_LOCALSTATEDIR}" \	1053	--localstatedir=${MY_LOCALSTATEDIR} \
659	--sharedstatedir="${MY_SHAREDSTATEDIR}" \	1054	--sharedstatedir=${MY_SHAREDSTATEDIR} \
660	--libdir="${MY_LIBDIR}" \	1055	--libdir=${MY_LIBDIR} \
661	--includedir="${MY_INCLUDEDIR}" \	1056	--includedir=${MY_INCLUDEDIR} \
662	--with-low-memory \	1057	--with-low-memory \
663	--with-client-ldflags=-lstdc++ \	1058	--with-client-ldflags=-lstdc++ \
664	--enable-thread-safe-client \	1059	--enable-thread-safe-client \
665	--with-comment="Gentoo Linux ${PF}" \	1060	--with-comment="Gentoo Linux ${PF}" \
666	--without-docs \	1061	--without-docs \
		1062	--with-LIBDIR="$(get_libdir)" \
667	${myconf} \|\| die "econf failed"	1063	${myconf} \|\| die "econf failed"
668		1064
669	# TODO: Move this before autoreconf !!!	1065	# TODO: Move this before autoreconf !!!
670	find . -type f -name Makefile -print0 \	1066	find . -type f -name Makefile -print0 \
671	\| xargs -0 -n100 sed -i \	1067	\| xargs -0 -n100 sed -i \
672	-e 's\|^pkglibdir = $(libdir)/mysql\|pkglibdir = $(libdir)\|;s\|^pkgincludedir = $(includedir)/mysql\|pkgincludedir = $(includedir)\|'	1068	-e 's\|^pkglibdir = $(libdir)/mysql\|pkglibdir = $(libdir)\|;s\|^pkgincludedir = $(includedir)/mysql\|pkgincludedir = $(includedir)\|'
673		1069
		1070	if [[ $EAPI == 2 ]] && [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
		1071	pbxt_patch_available && use pbxt && pbxt_src_configure
		1072	fi
		1073	}
		1074
		1075	# @FUNCTION: mysql_src_compile
		1076	# @DESCRIPTION:
		1077	# Compile the mysql code.
		1078	mysql_src_compile() {
		1079	# Be backwards compatible for now
		1080	case ${EAPI:-0} in
		1081	2) : ;;
		1082	0 \| 1) mysql_src_configure ;;
		1083	esac
		1084
674	emake \|\| die "emake failed"	1085	emake \|\| die "emake failed"
675		1086
676	mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_compile	1087	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
		1088	pbxt_patch_available && use pbxt && pbxt_src_compile
		1089	fi
677	}	1090	}
678		1091
		1092	# @FUNCTION: mysql_src_install
		1093	# @DESCRIPTION:
		1094	# Install mysql.
679	mysql_src_install() {	1095	mysql_src_install() {
680	# Make sure the vars are correctly initialized	1096	# Make sure the vars are correctly initialized
681	mysql_init_vars	1097	mysql_init_vars
682		1098
683	emake install DESTDIR="${D}" benchdir_root="${MY_SHAREDSTATEDIR}" \|\| die "emake install failed"	1099	emake install \
		1100	DESTDIR="${D}" \
		1101	benchdir_root=${MY_SHAREDSTATEDIR} \
		1102	testroot="${MY_SHAREDSTATEDIR}" \
		1103	\|\| die "emake install failed"
684		1104
685	mysql_version_is_at_least "5.1.12" && use pbxt && pbxt_src_install	1105	if [[ "${PBXT_NEWSTYLE}" != "1" ]]; then
686		1106	pbxt_patch_available && use pbxt && pbxt_src_install
687	insinto "${MY_INCLUDEDIR}"	1107	fi
688	doins "${MY_INCLUDEDIR}"/my_{config,dir}.h
689		1108
690	# Convenience links	1109	# Convenience links
		1110	einfo "Making Convenience links for mysqlcheck multi-call binary"
691	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"	1111	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlanalyze"
692	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"	1112	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqlrepair"
693	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"	1113	dosym "/usr/bin/mysqlcheck" "/usr/bin/mysqloptimize"
694		1114
695	# Various junk (my-*.cnf moved elsewhere)	1115	# Various junk (my-*.cnf moved elsewhere)
		1116	einfo "Removing duplicate /usr/share/mysql files"
696	rm -Rf "${D}/usr/share/info"	1117	rm -Rf "${ED}/usr/share/info"
697	for removeme in "mysql-log-rotate" mysql.server* \	1118	for removeme in "mysql-log-rotate" mysql.server* \
698	binary-configure* my-.cnf mi_test_all	1119	binary-configure* my-.cnf mi_test_all
699	do	1120	do
700	rm -f "${D}"/usr/share/mysql/${removeme}	1121	rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
701	done	1122	done
702		1123
703	# Clean up stuff for a minimal build	1124	# Clean up stuff for a minimal build
704	if use minimal ; then	1125	if use minimal ; then
		1126	einfo "Remove all extra content for minimal build"
705	rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}	1127	rm -Rf "${D}${MY_SHAREDSTATEDIR}"/{mysql-test,sql-bench}
706	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}	1128	rm -f "${ED}"/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}
707	rm -f "${D}/usr/sbin/mysqld"	1129	rm -f "${ED}/usr/sbin/mysqld"
708	rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a	1130	rm -f "${D}${MY_LIBDIR}"/lib{heap,merge,nisam,my{sys,strings,sqld,isammrg,isam},vio,dbug}.a
709	fi	1131	fi
710		1132
		1133	# Unless they explicitly specific USE=test, then do not install the
		1134	# testsuite. It DOES have a use to be installed, esp. when you want to do a
		1135	# validation of your database configuration after tuning it.
		1136	if use !test ; then
		1137	rm -rf "${D}"/${MY_SHAREDSTATEDIR}/mysql-test
		1138	fi
		1139
711	# Configuration stuff	1140	# Configuration stuff
712	if mysql_version_is_at_least "4.1" ; then	1141	case ${MYSQL_PV_MAJOR} in
713	mysql_mycnf_version="4.1"
714	else
715	mysql_mycnf_version="4.0"	1142	3*\|4.0) mysql_mycnf_version="4.0" ;;
716	fi	1143	4.[1-9]\|5.0) mysql_mycnf_version="4.1" ;;
		1144	5.[1-9]\|6\|7) mysql_mycnf_version="5.1" ;;
		1145	esac
		1146	einfo "Building default my.cnf (${mysql_mycnf_version})"
717	insinto "${MY_SYSCONFDIR}"	1147	insinto "${MY_SYSCONFDIR#${EPREFIX}}"
718	doins scripts/mysqlaccess.conf	1148	doins scripts/mysqlaccess.conf
		1149	mycnf_src="my.cnf-${mysql_mycnf_version}"
719	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \	1150	sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
720	"${FILESDIR}/my.cnf-${mysql_mycnf_version}" \	1151	-e "s!/tmp!${EPREFIX}/tmp!" \
		1152	-e "s!/usr!${EPREFIX}/usr!" \
		1153	-e "s!= /var!= ${EPREFIX}/var!" \
		1154	"${FILESDIR}/${mycnf_src}" \
721	> "${TMPDIR}/my.cnf.ok"	1155	> "${TMPDIR}/my.cnf.ok"
722	if mysql_version_is_at_least "4.1" && use latin1 ; then	1156	use prefix && sed -i -e '/^user[ ]*= mysql$/d' "${TMPDIR}/my.cnf.ok"
723	sed -e "s\|utf8\|latin1\|g" -i "${TMPDIR}/my.cnf.ok"	1157	if use latin1 ; then
		1158	sed -i \
		1159	-e "/character-set/s\|utf8\|latin1\|g" \
		1160	"${TMPDIR}/my.cnf.ok"
724	fi	1161	fi
725	newins "${TMPDIR}/my.cnf.ok" my.cnf	1162	newins "${TMPDIR}/my.cnf.ok" my.cnf
726		1163
727	# Minimal builds don't have the MySQL server	1164	# Minimal builds don't have the MySQL server
728	if ! use minimal ; then	1165	if ! use minimal ; then
		1166	einfo "Creating initial directories"
729	# Empty directories ...	1167	# Empty directories ...
730	diropts "-m0750"	1168	diropts "-m0750"
731	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then	1169	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
732	dodir "${MY_DATADIR}"	1170	dodir "${MY_DATADIR#${EPREFIX}}"
733	keepdir "${MY_DATADIR}"	1171	keepdir "${MY_DATADIR#${EPREFIX}}"
734	chown -R mysql:mysql "${D}/${MY_DATADIR}"	1172	chown -R mysql:mysql "${D}/${MY_DATADIR}"
735	fi	1173	fi
736		1174
737	diropts "-m0755"	1175	diropts "-m0755"
738	for folder in "${MY_LOGDIR}" "/var/run/mysqld" ; do	1176	for folder in "${MY_LOGDIR#${EPREFIX}}" "/var/run/mysqld" ; do
739	dodir "${folder}"	1177	dodir "${folder}"
740	keepdir "${folder}"	1178	keepdir "${folder}"
741	chown -R mysql:mysql "${D}/${folder}"	1179	chown -R mysql:mysql "${ED}/${folder}"
742	done	1180	done
743	fi	1181	fi
744		1182
745	# Docs	1183	# Docs
		1184	einfo "Installing docs"
746	dodoc README COPYING ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE	1185	for i in README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE ; do
		1186	[[ -f "$i" ]] && dodoc "$i"
		1187	done
747	doinfo "${S}"/Docs/mysql.info	1188	doinfo "${S}"/Docs/mysql.info
748		1189
749	# Minimal builds don't have the MySQL server	1190	# Minimal builds don't have the MySQL server
750	if ! use minimal ; then	1191	if ! use minimal ; then
		1192	einfo "Including support files and sample configurations"
751	docinto "support-files"	1193	docinto "support-files"
752	for script in \	1194	for script in \
753	"${S}"/support-files/my-*.cnf \	1195	"${S}"/support-files/my-*.cnf \
754	"${S}"/support-files/magic \	1196	"${S}"/support-files/magic \
755	"${S}"/support-files/ndb-config-2-node.ini	1197	"${S}"/support-files/ndb-config-2-node.ini
756	do	1198	do
757	dodoc "${script}"	1199	[[ -f "$script" ]] && dodoc "${script}"
758	done	1200	done
759		1201
760	docinto "scripts"	1202	docinto "scripts"
761	for script in "${S}"/scripts/mysql* ; do	1203	for script in "${S}"/scripts/mysql* ; do
762	[[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"	1204	[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
763	done	1205	done
764		1206
765	fi	1207	fi
766		1208
767	mysql_lib_symlinks "${D}"	1209	mysql_lib_symlinks "${ED}"
768	}	1210	}
769		1211
		1212	# @FUNCTION: mysql_pkg_preinst
		1213	# @DESCRIPTION:
		1214	# Create the user and groups for mysql - die if that fails.
770	mysql_pkg_preinst() {	1215	mysql_pkg_preinst() {
771	enewgroup mysql 60 \|\| die "problem adding 'mysql' group"	1216	enewgroup mysql 60 \|\| die "problem adding 'mysql' group"
772	enewuser mysql 60 -1 /dev/null mysql \|\| die "problem adding 'mysql' user"	1217	enewuser mysql 60 -1 /dev/null mysql \|\| die "problem adding 'mysql' user"
773	}	1218	}
774		1219
		1220	# @FUNCTION: mysql_pkg_postinst
		1221	# @DESCRIPTION:
		1222	# Run post-installation tasks:
		1223	# create the dir for logfiles if non-existant
		1224	# touch the logfiles and secure them
		1225	# install scripts
		1226	# issue required steps for optional features
		1227	# issue deprecation warnings
775	mysql_pkg_postinst() {	1228	mysql_pkg_postinst() {
776	# Make sure the vars are correctly initialized	1229	# Make sure the vars are correctly initialized
777	mysql_init_vars	1230	mysql_init_vars
778		1231
779	# Check FEATURES="collision-protect" before removing this	1232	# Check FEATURES="collision-protect" before removing this
780	[[ -d "${ROOT}/var/log/mysql" ]] \|\| install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"	1233	[[ -d "${EROOT}/var/log/mysql" ]] \|\| install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
781		1234
782	# Secure the logfiles	1235	# Secure the logfiles
783	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}	1236	touch "${ROOT}${MY_LOGDIR}"/mysql.{log,err}
784	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*	1237	chown mysql:mysql "${ROOT}${MY_LOGDIR}"/mysql*
785	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*	1238	chmod 0660 "${ROOT}${MY_LOGDIR}"/mysql*
…		…
790	for script in \	1243	for script in \
791	support-files/my-*.cnf \	1244	support-files/my-*.cnf \
792	support-files/magic \	1245	support-files/magic \
793	support-files/ndb-config-2-node.ini	1246	support-files/ndb-config-2-node.ini
794	do	1247	do
		1248	[[ -f "${script}" ]] \
795	dodoc "${script}"	1249	&& dodoc "${script}"
796	done	1250	done
797		1251
798	docinto "scripts"	1252	docinto "scripts"
799	for script in scripts/mysql* ; do	1253	for script in scripts/mysql* ; do
		1254	[[ -f "${script}" ]] \
800	[[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"	1255	&& [[ "${script%.sh}" == "${script}" ]] \
		1256	&& dodoc "${script}"
801	done	1257	done
802		1258
803	einfo	1259	einfo
804	elog "You might want to run:"	1260	elog "You might want to run:"
805	elog "\"emerge --config =${CATEGORY}/${PF}\""	1261	elog "\"emerge --config =${CATEGORY}/${PF}\""
806	elog "if this is a new install."	1262	elog "if this is a new install."
807	einfo	1263	einfo
808	fi
809		1264
810	if mysql_version_is_at_least "5.1.12" && use pbxt ; then	1265	einfo
		1266	elog "If you are upgrading major versions, you should run the"
		1267	elog "mysql_upgrade tool."
		1268	einfo
		1269	fi
		1270
		1271	if pbxt_available && use pbxt ; then
811	# TODO: explain it better	1272	# TODO: explain it better
812	elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"	1273	elog " mysql> INSTALL PLUGIN pbxt SONAME 'libpbxt.so';"
813	elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"	1274	elog " mysql> CREATE TABLE t1 (c1 int, c2 text) ENGINE=pbxt;"
814	elog "if, after that, you cannot start the MySQL server,"	1275	elog "if, after that, you cannot start the MySQL server,"
815	elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"	1276	elog "remove the ${MY_DATADIR}/mysql/plugin.* files, then"
…		…
825	mysql_check_version_range "4.0 to 5.0.99.99" \	1286	mysql_check_version_range "4.0 to 5.0.99.99" \
826	&& use berkdb \	1287	&& use berkdb \
827	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"	1288	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
828	}	1289	}
829		1290
		1291	# @FUNCTION: mysql_pkg_config
		1292	# @DESCRIPTION:
		1293	# Configure mysql environment.
830	mysql_pkg_config() {	1294	mysql_pkg_config() {
		1295	local old_MY_DATADIR="${MY_DATADIR}"
		1296
831	# Make sure the vars are correctly initialized	1297	# Make sure the vars are correctly initialized
832	mysql_init_vars	1298	mysql_init_vars
833		1299
834	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"	1300	[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
835		1301
836	if built_with_use ${CATEGORY}/${PN} minimal ; then	1302	if built_with_use ${CATEGORY}/${PN} minimal ; then
837	die "Minimal builds do NOT include the MySQL server"	1303	die "Minimal builds do NOT include the MySQL server"
838	fi	1304	fi
839		1305
		1306	if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
		1307	local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})"
		1308	local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})"
		1309
		1310	if [[ -d "${old_MY_DATADIR_s}" ]]; then
		1311	if [[ -d "${MY_DATADIR_s}" ]]; then
		1312	ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
		1313	ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
		1314	else
		1315	elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
		1316	mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
		1317	\|\| die "Moving MY_DATADIR failed"
		1318	fi
		1319	else
		1320	ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
		1321	if [[ -d "${MY_DATADIR_s}" ]]; then
		1322	ewarn "Attempting to use ${MY_DATADIR_s}"
		1323	else
		1324	eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
		1325	die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
		1326	fi
		1327	fi
		1328	fi
		1329
840	local pwd1="a"	1330	local pwd1="a"
841	local pwd2="b"	1331	local pwd2="b"
842	local maxtry=5	1332	local maxtry=15
		1333
		1334	if [ -z "${MYSQL_ROOT_PASSWORD}" -a -f "${EROOT}/root/.my.cnf" ]; then
		1335	MYSQL_ROOT_PASSWORD="$(sed -n -e '/^password=/s,^password=,,gp' "${EROOT}/root/.my.cnf")"
		1336	fi
843		1337
844	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then	1338	if [[ -d "${ROOT}/${MY_DATADIR}/mysql" ]] ; then
845	ewarn "You have already a MySQL database in place."	1339	ewarn "You have already a MySQL database in place."
846	ewarn "(${ROOT}/${MY_DATADIR}/*)"	1340	ewarn "(${ROOT}/${MY_DATADIR}/*)"
847	ewarn "Please rename or delete it if you wish to replace it."	1341	ewarn "Please rename or delete it if you wish to replace it."
…		…
850		1344
851	# Bug #213475 - MySQL _will_ object strenously if your machine is named	1345	# Bug #213475 - MySQL _will_ object strenously if your machine is named
852	# localhost. Also causes weird failures.	1346	# localhost. Also causes weird failures.
853	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"	1347	[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
854		1348
855	einfo "Creating the mysql database and setting proper"	1349	if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
856	einfo "permissions on it ..."
857		1350
858	einfo "Insert a password for the mysql 'root' user"	1351	einfo "Please provide a password for the mysql 'root' user now, in the"
		1352	einfo "MYSQL_ROOT_PASSWORD env var or through the /root/.my.cnf file."
859	ewarn "Avoid [\"'\\_%] characters in the password"	1353	ewarn "Avoid [\"'\\_%] characters in the password"
860	read -rsp " >" pwd1 ; echo	1354	read -rsp " >" pwd1 ; echo
861		1355
862	einfo "Retype the password"	1356	einfo "Retype the password"
863	read -rsp " >" pwd2 ; echo	1357	read -rsp " >" pwd2 ; echo
864		1358
865	if [[ "x$pwd1" != "x$pwd2" ]] ; then	1359	if [[ "x$pwd1" != "x$pwd2" ]] ; then
866	die "Passwords are not the same"	1360	die "Passwords are not the same"
		1361	fi
		1362	MYSQL_ROOT_PASSWORD="${pwd1}"
		1363	unset pwd1 pwd2
867	fi	1364	fi
868		1365
869	local options=""	1366	local options=""
870	local sqltmp="$(emktemp)"	1367	local sqltmp="$(emktemp)"
871		1368
…		…
874	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \	1371	&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
875	\|\| touch "${TMPDIR}/fill_help_tables.sql"	1372	\|\| touch "${TMPDIR}/fill_help_tables.sql"
876	help_tables="${TMPDIR}/fill_help_tables.sql"	1373	help_tables="${TMPDIR}/fill_help_tables.sql"
877		1374
878	pushd "${TMPDIR}" &>/dev/null	1375	pushd "${TMPDIR}" &>/dev/null
879	"${ROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1	1376	"${EROOT}/usr/bin/mysql_install_db" >"${TMPDIR}"/mysql_install_db.log 2>&1
880	if [ $? -ne 0 ]; then	1377	if [ $? -ne 0 ]; then
881	grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2	1378	grep -B5 -A999 -i "ERROR" "${TMPDIR}"/mysql_install_db.log 1>&2
882	die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"	1379	die "Failed to run mysql_install_db. Please review /var/log/mysql/mysqld.err AND ${TMPDIR}/mysql_install_db.log"
883	fi	1380	fi
884	popd &>/dev/null	1381	popd &>/dev/null
885	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \	1382	[[ -f "${ROOT}/${MY_DATADIR}/mysql/user.frm" ]] \
886	\|\| die "MySQL databases not installed"	1383	\|\| die "MySQL databases not installed"
887	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null	1384	chown -R mysql:mysql "${ROOT}/${MY_DATADIR}" 2>/dev/null
888	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null	1385	chmod 0750 "${ROOT}/${MY_DATADIR}" 2>/dev/null
889		1386
		1387	# Figure out which options we need to disable to do the setup
		1388	helpfile="${TMPDIR}/mysqld-help"
		1389	${EROOT}/usr/sbin/mysqld --verbose --help >"${helpfile}" 2>/dev/null
		1390	for opt in grant-tables host-cache name-resolve networking slave-start bdb \
		1391	federated innodb ssl log-bin relay-log slow-query-log external-locking \
		1392	ndbcluster \
		1393	; do
		1394	optexp="--(skip-)?${opt}" optfull="--skip-${opt}"
		1395	egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
		1396	done
		1397	# But some options changed names
		1398	egrep -sq external-locking "${helpfile}" && \
		1399	options="${options/skip-locking/skip-external-locking}"
		1400
890	if mysql_version_is_at_least "4.1.3" ; then	1401	if mysql_version_is_at_least "4.1.3" ; then
891	options="--skip-ndbcluster"
892
893	# Filling timezones, see	1402	# Filling timezones, see
894	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html	1403	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
895	"${ROOT}/usr/bin/mysql_tzinfo_to_sql" "${ROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null	1404	"${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" > "${sqltmp}" 2>/dev/null
896		1405
897	if [[ -r "${help_tables}" ]] ; then	1406	if [[ -r "${help_tables}" ]] ; then
898	cat "${help_tables}" >> "${sqltmp}"	1407	cat "${help_tables}" >> "${sqltmp}"
899	fi	1408	fi
900	fi	1409	fi
901		1410
		1411	einfo "Creating the mysql database and setting proper"
		1412	einfo "permissions on it ..."
		1413
		1414	use prefix \|\| options="${options} --user=mysql"
		1415
902	local socket="${ROOT}/var/run/mysqld/mysqld${RANDOM}.sock"	1416	local socket="${EROOT}/var/run/mysqld/mysqld${RANDOM}.sock"
903	local pidfile="${ROOT}/var/run/mysqld/mysqld${RANDOM}.pid"	1417	local pidfile="${EROOT}/var/run/mysqld/mysqld${RANDOM}.pid"
904	local mysqld="${ROOT}/usr/sbin/mysqld \	1418	local mysqld="${EROOT}/usr/sbin/mysqld \
905	${options} \	1419	${options} \
906	--user=mysql \	1420	--user=mysql \
907	--skip-grant-tables \
908	--basedir=${ROOT}/usr \	1421	--basedir=${EROOT}/usr \
909	--datadir=${ROOT}/${MY_DATADIR} \	1422	--datadir=${ROOT}/${MY_DATADIR} \
910	--skip-innodb \
911	--skip-bdb \
912	--skip-networking \
913	--max_allowed_packet=8M \	1423	--max_allowed_packet=8M \
914	--net_buffer_length=16K \	1424	--net_buffer_length=16K \
		1425	--default-storage-engine=MyISAM \
915	--socket=${socket} \	1426	--socket=${socket} \
916	--pid-file=${pidfile}"	1427	--pid-file=${pidfile}"
		1428	#einfo "About to start mysqld: ${mysqld}"
		1429	ebegin "Starting mysqld"
917	${mysqld} &	1430	${mysqld} &
		1431	rc=$?
918	while ! [[ -S "${socket}" \|\| "${maxtry}" -lt 1 ]] ; do	1432	while ! [[ -S "${socket}" \|\| "${maxtry}" -lt 1 ]] ; do
919	maxtry=$((${maxtry}-1))	1433	maxtry=$((${maxtry}-1))
920	echo -n "."	1434	echo -n "."
921	sleep 1	1435	sleep 1
922	done	1436	done
		1437	eend $rc
923		1438
		1439	if ! [[ -S "${socket}" ]]; then
		1440	die "Completely failed to start up mysqld with: ${mysqld}"
		1441	fi
		1442
		1443	ebegin "Setting root password"
924	# Do this from memory, as we don't want clear text passwords in temp files	1444	# Do this from memory, as we don't want clear text passwords in temp files
925	local sql="UPDATE mysql.user SET Password = PASSWORD('${pwd1}') WHERE USER='root'"	1445	local sql="UPDATE mysql.user SET Password = PASSWORD('${MYSQL_ROOT_PASSWORD}') WHERE USER='root'"
926	"${ROOT}/usr/bin/mysql" \	1446	"${EROOT}/usr/bin/mysql" \
927	--socket=${socket} \	1447	--socket=${socket} \
928	-hlocalhost \	1448	-hlocalhost \
929	-e "${sql}"	1449	-e "${sql}"
		1450	eend $?
930		1451
931	einfo "Loading \"zoneinfo\", this step may require a few seconds ..."	1452	ebegin "Loading \"zoneinfo\", this step may require a few seconds ..."
932
933	"${ROOT}/usr/bin/mysql" \	1453	"${EROOT}/usr/bin/mysql" \
934	--socket=${socket} \	1454	--socket=${socket} \
935	-hlocalhost \	1455	-hlocalhost \
936	-uroot \	1456	-uroot \
937	-p"${pwd1}" \	1457	-p"${MYSQL_ROOT_PASSWORD}" \
938	mysql < "${sqltmp}"	1458	mysql < "${sqltmp}"
		1459	rc=$?
		1460	eend $?
		1461	[ $rc -ne 0 ] && ewarn "Failed to load zoneinfo!"
939		1462
940	# Stop the server and cleanup	1463	# Stop the server and cleanup
		1464	einfo "Stopping the server ..."
941	kill $(< "${pidfile}" )	1465	kill $(< "${pidfile}" )
942	rm -f "${sqltmp}"	1466	rm -f "${sqltmp}"
943	einfo "Stopping the server ..."
944	wait %1	1467	wait %1
945	einfo "Done"	1468	einfo "Done"
946	}	1469	}
947		1470
		1471	# @FUNCTION: mysql_pkg_postrm
		1472	# @DESCRIPTION:
		1473	# Remove mysql symlinks.
948	mysql_pkg_postrm() {	1474	mysql_pkg_postrm() {
949	: # mysql_lib_symlinks "${D}"	1475	: # mysql_lib_symlinks "${ED}"
950	}	1476	}

 Legend:



Removed from v.1.103
 


changed lines


 
Added in v.1.168
 Legend:



Removed from v.1.103
 


changed lines


 
Added in v.1.168
-Removed from v.1.103
+Added in v.1.168

	ViewVC Help
Powered by ViewVC 1.1.20