[gentoo-commits] proj/mysql:master commit in: eclass/

["Jorge Manuel B. S. Vicetto" <jmbsvicetto@gentoo.org>]

commit:     9211a75c51961a0c3d2a906db8d5dc0dd4478b62
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 02:46:33 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 02:46:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9211a75c

More updates to the eclasses. They should now be real close to be complete.
Dropped support for <mysql-5.1.50 on the 3 eclasses and make mysql-v2 eclass die for such ebuilds.
Added storage engine options for mysql-cmake, dropped unused functions and cleaned up most commented code. Need to review some use
minimal blocks yet.
Whitespace.

---
 eclass/mysql-autotools.eclass |  163 +++++--------------------------------
 eclass/mysql-cmake.eclass     |  178 +++++++++--------------------------------
 eclass/mysql-v2.eclass        |   47 ++++-------
 3 files changed, 77 insertions(+), 311 deletions(-)

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index 52bddcc..fb26632 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -89,7 +89,7 @@ mysql-autotools_configure_minimal() {
 		myconf="${myconf} --enable-shared --enable-static"
 	fi
 
-	if mysql_version_is_at_least "4.1" && ! use latin1 ; then
+	if ! use latin1 ; then
 		myconf="${myconf} --with-charset=utf8"
 		myconf="${myconf} --with-collation=utf8_general_ci"
 	else
@@ -123,9 +123,9 @@ mysql-autotools_configure_common() {
 		myconf="${myconf} --with-debug=full"
 	else
 		myconf="${myconf} --without-debug"
-		mysql_version_is_at_least "4.1.3" \
-		&& ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) \
-		&& myconf="${myconf} --without-ndb-debug"
+		if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ); then
+			myconf="${myconf} --without-ndb-debug"
+		fi
 	fi
 
 	if [ -n "${MYSQL_DEFAULT_CHARSET}" -a -n "${MYSQL_DEFAULT_COLLATION}" ]; then
@@ -134,7 +134,7 @@ mysql-autotools_configure_common() {
 		ewarn "You MUST file bugs without these variables set."
 		myconf="${myconf} --with-charset=${MYSQL_DEFAULT_CHARSET}"
 		myconf="${myconf} --with-collation=${MYSQL_DEFAULT_COLLATION}"
-	elif mysql_version_is_at_least "4.1" && ! use latin1 ; then
+	elif ! use latin1 ; then
 		myconf="${myconf} --with-charset=utf8"
 		myconf="${myconf} --with-collation=utf8_general_ci"
 	else
@@ -152,88 +152,6 @@ mysql-autotools_configure_common() {
 
 }
 
-# @FUNCTION: mysql-autotools_configure_40_41_50
-# @DESCRIPTION:
-# Helper function to configure 4.0, 4.1 and 5.0 builds
-mysql-autotools_configure_40_41_50() {
-
-	myconf="${myconf} $(use_with perl bench)"
-	myconf="${myconf} --enable-assembler"
-	myconf="${myconf} --with-extra-tools"
-	myconf="${myconf} --with-innodb"
-	myconf="${myconf} --without-readline"
-	myconf="${myconf} $(use_with ssl openssl)"
-	mysql_version_is_at_least "5.0" || myconf="${myconf} $(use_with raid)"
-
-	# --with-vio is not needed anymore, it's on by default and
-	# has been removed from configure
-	#  Apply to 4.x and 5.0.[0-3]
-	if use ssl ; then
-		 mysql_version_is_at_least "5.0.4" || myconf="${myconf} --with-vio"
-	fi
-
-	if mysql_version_is_at_least "5.0.60" ; then
-			if use berkdb ; then
-				elog "Berkeley DB support was disabled due to build failures"
-				elog "on multiple arches, go to a version earlier than 5.0.60"
-				elog "if you want it again. Gentoo bug #224067."
-			fi
-			myconf="${myconf} --without-berkeley-db"
-	elif use berkdb ; then
-		# 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 use alpha || use amd64 || use hppa || use mips || use sparc ; then
-			elog "Berkeley DB support was disabled due to compatibility issues on this arch"
-			myconf="${myconf} --without-berkeley-db"
-		else
-			myconf="${myconf} --with-berkeley-db=./bdb"
-		fi
-	else
-		myconf="${myconf} --without-berkeley-db"
-	fi
-
-	if mysql_version_is_at_least "4.1.3" ; then
-		myconf="${myconf} --with-geometry"
-		if [[ "${PN}" != "mysql-cluster" ]] ; then
-			myconf="${myconf} $(use_with cluster ndbcluster)"
-		fi
-	fi
-
-	if mysql_version_is_at_least "4.1.3" && use 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
-		myconf="${myconf} --with-csv-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/blackhole-storage-engine.html
-		myconf="${myconf} --with-blackhole-storage-engine"
-
-		# http://dev.mysql.com/doc/mysql/en/federated-storage-engine.html
-		# http://dev.mysql.com/doc/mysql/en/federated-description.html
-		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		if mysql_version_is_at_least "5.0.3" ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-			myconf="${myconf} --with-federated-storage-engine"
-		fi
-	fi
-
-	if [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ]; then
-		myconf="${myconf} `use_enable community community-features`"
-		if use community; then
-			myconf="${myconf} `use_enable profiling`"
-		else
-			myconf="${myconf} --disable-profiling"
-		fi
-	fi
-
-	mysql_version_is_at_least "5.0.18" \
-	&& use max-idx-128 \
-	&& myconf="${myconf} --with-max-indexes=128"
-}
-
 # @FUNCTION: mysql-autotools_configure_51
 # @DESCRIPTION:
 # Helper function to configure 5.1 and later builds
@@ -276,7 +194,7 @@ mysql-autotools_configure_51() {
 	| xargs -0 sed -r -n \
 		-e '/^MYSQL_STORAGE_ENGINE/{
 			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp; 
+			s~^([^ ]+).*~\1~gp;
 		}' \
 	| tr -s '\n' ' '
 	)"
@@ -291,10 +209,6 @@ mysql-autotools_configure_51() {
 	# These aren't actually required by the base set, but are really useful:
 	plugins_sta="${plugins_sta} archive blackhole"
 
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
 	# Now the extras
 	if use extraengine ; then
 		# like configuration=max-no-ndb, archive and example removed in 5.1.11
@@ -464,16 +378,14 @@ mysql-autotools_src_prepare() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
-	if mysql_version_is_at_least "4.1" ; then
-		# Remove what needs to be recreated, so we're sure it's actually done
-		einfo "Cleaning up old buildscript files"
-		find . -name Makefile \
-			-o -name Makefile.in \
-			-o -name configure \
-			-exec rm -f {} \;
-		rm -f "ltmain.sh"
-		rm -f "scripts/mysqlbug"
-	fi
+	# Remove what needs to be recreated, so we're sure it's actually done
+	einfo "Cleaning up old buildscript files"
+	find . -name Makefile \
+		-o -name Makefile.in \
+		-o -name configure \
+		-exec rm -f {} \;
+	rm -f "ltmain.sh"
+	rm -f "scripts/mysqlbug"
 
 	local rebuilddirlist d
 
@@ -499,18 +411,14 @@ mysql-autotools_src_prepare() {
 		popd >/dev/null
 	fi
 
-	if mysql_version_is_at_least "5.1.12" ; then
-		rebuilddirlist="."
-		# This does not seem to be needed presently. robbat2 2010/02/23
-		#einfo "Updating innobase cmake"
-		## TODO: check this with a cmake expert
-		#cmake \
-		#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
-		#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
-		#	"storage/innobase"
-	else
-		rebuilddirlist=". innobase"
-	fi
+	rebuilddirlist="."
+	# This does not seem to be needed presently. robbat2 2010/02/23
+	#einfo "Updating innobase cmake"
+	## TODO: check this with a cmake expert
+	#cmake \
+	#	-DCMAKE_C_COMPILER=$(type -P $(tc-getCC)) \
+	#	-DCMAKE_CXX_COMPILER=$(type -P $(tc-getCXX)) \
+	#	"storage/innobase"
 
 	for d in ${rebuilddirlist} ; do
 		einfo "Reconfiguring dir '${d}'"
@@ -518,25 +426,6 @@ mysql-autotools_src_prepare() {
 		eautoreconf
 		popd &>/dev/null
 	done
-
-	if mysql_check_version_range "4.1 to 5.0.99.99" \
-	&& use berkdb ; then
-		einfo "Fixing up berkdb buildsystem"
-		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
-		cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
-		|| die "Could not copy libtool.m4 to bdb/dist/"
-		#These files exist only with libtool-2*, and need to be included.
-		if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
-			cat "/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
-			cat "/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
-		fi
-		pushd "bdb/dist" &>/dev/null
-		sh s_all \
-		|| die "Failed bdb reconfigure"
-		popd &>/dev/null
-	fi
 }
 
 # @FUNCTION: mysql-autotools_src_configure
@@ -554,11 +443,7 @@ mysql-autotools_src_configure() {
 		mysql-autotools_configure_minimal
 	else
 		mysql-autotools_configure_common
-		if mysql_version_is_at_least "5.1.10" ; then
-			mysql-autotools_configure_51
-		else
-			mysql-autotools_configure_40_41_50
-		fi
+		mysql-autotools_configure_51
 	fi
 
 	# Bug #114895, bug #110149
@@ -679,8 +564,6 @@ mysql-autotools_src_install() {
 
 	# Configuration stuff
 	case ${MYSQL_PV_MAJOR} in
-		3*|4.0) mysql_mycnf_version="4.0" ;;
-		4.[1-9]|5.0) mysql_mycnf_version="4.1" ;;
 		5.[1-9]|6*|7*) mysql_mycnf_version="5.1" ;;
 	esac
 	einfo "Building default my.cnf (${mysql_mycnf_version})"

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 438e44e..7e80ae7 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -37,19 +37,6 @@ mysql-cmake_disable_test() {
 	#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
 	echo ${testname} : ${reason} >> "${mysql_disable_file}"
 
-	# ${S}/mysql-tests/t/disabled.def
-	#
-	# ${S}/mysql-tests/suite/federated/disabled.def
-	#
-	# ${S}/mysql-tests/suite/jp/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl/t/disabled.def
-	# ${S}/mysql-tests/suite/parts/t/disabled.def
-	# ${S}/mysql-tests/suite/rpl_ndb/t/disabled.def
-	# ${S}/mysql-tests/suite/ndb_team/t/disabled.def
-	# ${S}/mysql-tests/suite/binlog/t/disabled.def
-	# ${S}/mysql-tests/suite/innodb/t/disabled.def
-
 	if [ -n "${testsuite}" ]; then
 		for mysql_disable_file in \
 			${S}/mysql-test/suite/${testsuite}/disabled.def  \
@@ -108,9 +95,16 @@ configure_cmake_minimal() {
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
 		-DWITHOUT_READLINE=1
-		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 		-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1
 		-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITHOUT_CSV_STORAGE_ENGINE=1
+		-DWITHOUT_FEDERATED_STORAGE_ENGINE=1
+		-DWITHOUT_HEAP_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITHOUT_MYISAM_STORAGE_ENGINE=1
+		-DWITHOUT_PARTITION_STORAGE_ENGINE=1
+		-DWITHOUT_INNOBASE_STORAGE_ENGINE=1
 	)
 }
 
@@ -146,107 +140,21 @@ configure_cmake_standard() {
 	else
 		mycmakeargs+=( -DWITH_SSL=0 )
 	fi
-}
-
-# @FUNCTION: configure_51
-# @DESCRIPTION:
-# Helper function to configure 5.1 and later builds
-configure_51() {
-
-	# This is an explict die here, because if we just forcibly disable it, then the
-	# user's data is not accessible.
-	use max-idx-128 && die "Bug #336027: upstream has a corruption issue with max-idx-128 presently"
-	#use max-idx-128 && myconf="${myconf} --with-max-indexes=128"
-
-	# Scan for all available plugins
-	local plugins_avail="$(
-	LANG=C \
-	find "${S}" \
-		\( \
-		-name 'plug.in' \
-		-o -iname 'configure.in' \
-		-o -iname 'configure.ac' \
-		\) \
-		-print0 \
-	| xargs -0 sed -r -n \
-		-e '/^MYSQL_STORAGE_ENGINE/{
-			s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ;
-			s~^([^ ]+).*~\1~gp;
-		}' \
-	| tr -s '\n' ' '
-	)"
-
-	# 5.1 introduces a new way to manage storage engines (plugins)
-	# like configuration=none
-	# This base set are required, and will always be statically built.
-	local plugins_sta="csv myisam myisammrg heap"
-	local plugins_dyn=""
-	local plugins_dis="example ibmdb2i"
-
-	# These aren't actually required by the base set, but are really useful:
-	plugins_sta="${plugins_sta} archive blackhole"
-
-	# default in 5.5.4
-	if mysql_version_is_at_least "5.5.4" ; then
-		plugins_sta="${plugins_sta} partition"
-	fi
-	# Now the extras
-	if use extraengine ; then
-		# like configuration=max-no-ndb, archive and example removed in 5.1.11
-		# not added yet: ibmdb2i
-		# Not supporting as examples: example,daemon_example,ftexample
-		plugins_sta="${plugins_sta} partition"
-
-		if [[ "${PN}" != "mariadb" ]] ; then
-			elog "Before using the Federated storage engine, please be sure to read"
-			elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.html"
-			plugins_dyn="${plugins_sta} federatedx"
-		else
-			elog "MariaDB includes the FederatedX engine. Be sure to read"
-			elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_engine"
-			plugins_dyn="${plugins_sta} federated"
-		fi
-	else
-		plugins_dis="${plugins_dis} partition federated"
-	fi
-
-	# Upstream specifically requests that InnoDB always be built:
-	# - innobase, innodb_plugin
-	# Build falcon if available for 6.x series.
-	for i in innobase falcon ; do
-		[ -e "${S}"/storage/${i} ] && plugins_sta="${plugins_sta} ${i}"
-	done
-	for i in innodb_plugin ; do
-		[ -e "${S}"/storage/${i} ] && plugins_dyn="${plugins_dyn} ${i}"
-	done
-
-	# like configuration=max-no-ndb
-	if ( use cluster || [[ "${PN}" == "mysql-cluster" ]] ) ; then
-		plugins_sta="${plugins_sta} ndbcluster partition"
-		plugins_dis="${plugins_dis//partition}"
-		myconf="${myconf} --with-ndb-binlog"
-	else
-		plugins_dis="${plugins_dis} ndbcluster"
-	fi
 
-	use static && \
-	plugins_sta="${plugins_sta} ${plugins_dyn}" && \
-	plugins_dyn=""
-
-	einfo "Available plugins: ${plugins_avail}"
-	einfo "Dynamic plugins: ${plugins_dyn}"
-	einfo "Static plugins: ${plugins_sta}"
-	einfo "Disabled plugins: ${plugins_dis}"
-
-	# These are the static plugins
-	myconf="${myconf} --with-plugins=${plugins_sta// /,}"
-	# And the disabled ones
-	for i in ${plugins_dis} ; do
-		myconf="${myconf} --without-plugin-${i}"
-	done
+	# Storage engines
+	mycmakeargs+=(
+		-DWITH_ARCHIVE_STORAGE_ENGINE=1
+		-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+		-DWITH_CSV_STORAGE_ENGINE=1
+		-DWITH_HEAP_STORAGE_ENGINE=1
+		-DWITH_INNOBASE_STORAGE_ENGINE=1
+		-DWITH_MYISAMMRG_STORAGE_ENGINE=1
+		-DWITH_MYISAM_STORAGE_ENGINE=1
+		-DWITH_PARTITION_STORAGE_ENGINE=1
+		$(cmake-utils_use_with extraengine FEDERATED_STORAGE_ENGINE)
+	)
 }
 
-
 #
 # EBUILD FUNCTIONS
 #
@@ -363,13 +271,6 @@ mysql-cmake_src_install() {
 	# Various junk (my-*.cnf moved elsewhere)
 	einfo "Removing duplicate /usr/share/mysql files"
 
-#	rm -Rf "${D}/usr/share/info"
-#	for removeme in  "mysql-log-rotate" mysql.server* \
-#		binary-configure* my-*.cnf mi_test_all*
-#	do
-#		rm -f "${D}"/${MY_SHAREDSTATEDIR}/${removeme}
-#	done
-
 	# Clean up stuff for a minimal build
 #	if use minimal ; then
 #		einfo "Remove all extra content for minimal build"
@@ -423,29 +324,24 @@ mysql-cmake_src_install() {
 		done
 	fi
 
-	# Docs
-#	einfo "Installing docs"
-#	dodoc README ChangeLog EXCEPTIONS-CLIENT INSTALL-SOURCE
-#	doinfo "${S}"/Docs/mysql.info
-
 	# Minimal builds don't have the MySQL server
-#	if ! use minimal ; then
-#		einfo "Including support files and sample configurations"
-#		docinto "support-files"
-#		for script in \
-#			"${S}"/support-files/my-*.cnf \
-#			"${S}"/support-files/magic \
-#			"${S}"/support-files/ndb-config-2-node.ini
-#		do
-#			[[ -f "$script" ]] && dodoc "${script}"
-#		done
-#
-#		docinto "scripts"
-#		for script in "${S}"/scripts/mysql* ; do
-#			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
-#		done
-#
-#	fi
+	if ! use minimal ; then
+		einfo "Including support files and sample configurations"
+		docinto "support-files"
+		for script in \
+			"${S}"/support-files/my-*.cnf.sh \
+			"${S}"/support-files/magic \
+			"${S}"/support-files/ndb-config-2-node.ini.sh
+		do
+			[[ -f "$script" ]] && dodoc "${script}"
+		done
+
+		docinto "scripts"
+		for script in "${S}"/scripts/mysql* ; do
+			[[ -f "$script" ]] && [[ "${script%.sh}" == "${script}" ]] && dodoc "${script}"
+		done
+
+	fi
 
 	mysql_lib_symlinks "${D}"
 }

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 3d86a0c..8b2bfd5 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -105,6 +105,8 @@ done
 # strip leading "0" (otherwise it's considered an octal number by BASH)
 MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 
+# This eclass should only be used with at least mysql-5.1.50
+mysql_version_is_at_least "5.1.50" || die "This eclass should only be used with >=mysql-5.1.50"
 
 # @ECLASS-VARIABLE: MYSQL_COMMUNITY_FEATURES
 # @DESCRIPTION:
@@ -114,9 +116,7 @@ MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
 # AND in the re-merged mysql-5.0.82 and newer
 if [ "${PN}" == "mysql-community" -o "${PN}" == "mariadb" ]; then
 	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.0" ] && mysql_version_is_at_least "5.0.82"; then
-	MYSQL_COMMUNITY_FEATURES=1
-elif [ "${MYSQL_PV_MAJOR}" == "5.1" ] && mysql_version_is_at_least "5.1.28"; then
+elif [ "${MYSQL_PV_MAJOR}" == "5.1" ]; then
 	MYSQL_COMMUNITY_FEATURES=1
 elif mysql_version_is_at_least "5.4.0"; then
 	MYSQL_COMMUNITY_FEATURES=1
@@ -207,9 +207,7 @@ if [[ ${PN} != "mysql-cluster" ]] ; then
 	IUSE="${IUSE} cluster"
 fi
 
-mysql_version_is_at_least "5.0.18" \
-&& IUSE="${IUSE} max-idx-128"
-
+IUSE="${IUSE} max-idx-128"
 IUSE="${IUSE} berkdb"
 
 [[ ${MYSQL_COMMUNITY_FEATURES} == 1 ]] \
@@ -259,8 +257,7 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND} static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) )"
 
 # compile-time-only
-mysql_version_is_at_least "5.1.12" \
-&& DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
+DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 
 # compile-time-only
 mysql_version_is_at_least "5.5.8" \
@@ -290,7 +287,6 @@ PDEPEND="${PDEPEND} =virtual/mysql-${MYSQL_PV_MAJOR}"
 # PBXT was only introduced after 5.1.12
 pbxt_patch_available() {
 	[[ ${PN} != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.12" \
 	&& [[ -n "${PBXT_VERSION}" ]]
 	return $?
 }
@@ -306,7 +302,6 @@ pbxt_available() {
 # XTRADB was only introduced after 5.1.26
 xtradb_patch_available() {
 	[[ ${PN} != "mariadb" ]] \
-	&& mysql_version_is_at_least "5.1.26" \
 	&& [[ -n "${XTRADB_VER}" && -n "${PERCONA_VER}" ]]
 	return $?
 }
@@ -323,10 +318,7 @@ if pbxt_patch_available; then
 	if pbxt_available; then
 
 		IUSE="${IUSE} pbxt"
-		if mysql_version_is_at_least "5.1.40"; then
-
-			PBXT_NEWSTYLE=1
-		fi
+		PBXT_NEWSTYLE=1
 	fi
 fi
 
@@ -395,23 +387,20 @@ mysql-v2_pkg_setup() {
 		die "${M}"
 	fi
 
-	if mysql_version_is_at_least "5.1.51" \
-	   && ! mysql_version_is_at_least "5.2" \
-	   && use debug ; then
-	   # Also in package.use.mask
-	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
+	if ! mysql_version_is_at_least "5.2" \
+		&& use debug ; then
+		# Also in package.use.mask
+		die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
 	fi
 
-	if mysql_version_is_at_least "4.1.3" \
-	&& ( use cluster || use extraengine || use embedded ) \
+	if ( use cluster || use extraengine || use embedded ) \
 	&& use minimal ; then
 		M="USE flags 'cluster', 'extraengine', 'embedded' conflict with 'minimal' USE flag!"
 		eerror "${M}"
 		die "${M}"
 	fi
 
-	if mysql_version_is_at_least "5.1" \
-	&& xtradb_patch_available \
+	if xtradb_patch_available \
 	&& use xtradb \
 	&& use embedded ; then
 		M="USE flags 'xtradb' and 'embedded' conflict and cause build failures"
@@ -668,14 +657,12 @@ mysql-v2_pkg_config() {
 	egrep -sq external-locking "${helpfile}" && \
 	options="${options/skip-locking/skip-external-locking}"
 
-	if mysql_version_is_at_least "4.1.3" ; then
-		# 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}" 2>/dev/null
+	# 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}" 2>/dev/null
 
-		if [[ -r "${help_tables}" ]] ; then
-			cat "${help_tables}" >> "${sqltmp}"
-		fi
+	if [[ -r "${help_tables}" ]] ; then
+		cat "${help_tables}" >> "${sqltmp}"
 	fi
 
 	einfo "Creating the mysql database and setting proper"