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

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

commit:     34ddcc6fd1543de69741ea56cbeb77091ee83ce8
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 03:53:52 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 03:53:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=34ddcc6f

More cleanup of the ebuilds and eclasses.

---
 dev-db/mysql/mysql-5.5.10.ebuild |    1 -
 eclass/mysql-autotools.eclass    |    4 +-
 eclass/mysql-cmake.eclass        |   12 ++++---
 eclass/mysql-v2.eclass           |   57 ++++++-------------------------------
 4 files changed, 19 insertions(+), 55 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.10.ebuild b/dev-db/mysql/mysql-5.5.10.ebuild
index fa4774e..309b9f1 100644
--- a/dev-db/mysql/mysql-5.5.10.ebuild
+++ b/dev-db/mysql/mysql-5.5.10.ebuild
@@ -21,7 +21,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~spar
 EPATCH_EXCLUDE=''
 
 DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
-#RDEPEND="!media-sound/amarok[embedded]"
 
 # Please do not add a naive src_unpack to this ebuild
 # If you want to add a single patch, copy the ebuild to an overlay

diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclass
index d668e4d..6d8bf95 100644
--- a/eclass/mysql-autotools.eclass
+++ b/eclass/mysql-autotools.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:

diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass
index 862401f..d2ef3cc 100644
--- a/eclass/mysql-cmake.eclass
+++ b/eclass/mysql-cmake.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
 
 # @ECLASS: mysql.cmake.eclass
 # @MAINTAINER:
@@ -122,7 +122,6 @@ configure_cmake_standard() {
 		-DMYSQL_USER=mysql
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock
 		-DWITHOUT_READLINE=1
-		-DWITH_SSL=system
 		-DWITH_ZLIB=system
 		-DWITHOUT_LIBWRAP=1
 	)
@@ -139,12 +138,15 @@ configure_cmake_standard() {
 		$(cmake-utils_use_with profiling)
 	)
 
+	if use ssl; then
+		mycmakeargs+=( -DWITH_SSL=system )
+	else
+		mycmakeargs+=( -DWITH_SSL=0 )
+	fi
 }
 
 configure_51() {
 
-	myconf="${myconf} $(use_with ssl ssl /usr)"
-
 	# 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"

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 0d8bc91..7de76f5 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
+# $Header: $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -181,34 +181,27 @@ SLOT="0"
 
 case "${BUILD}" in
 	"autotools")
-		IUSE="big-tables debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+		IUSE="big-tables debug embedded minimal +perl selinux ssl static test"
 		;;
 	"cmake")
-		IUSE="debug embedded minimal ${IUSE_DEFAULT_ON}perl selinux ssl static test"
+		IUSE="debug embedded minimal +perl selinux ssl static test"
 		;;
 esac
 
-mysql_version_is_at_least "4.1" \
-&& IUSE="${IUSE} latin1"
+IUSE="${IUSE} latin1"
 
-if mysql_version_is_at_least "4.1.3" ; then
-	IUSE="${IUSE} extraengine"
-	if [[ "${PN}" != "mysql-cluster" ]] ; then
-		IUSE="${IUSE} cluster"
-	fi
+IUSE="${IUSE} extraengine"
+if [[ "${PN}" != "mysql-cluster" ]] ; then
+	IUSE="${IUSE} cluster"
 fi
 
-mysql_version_is_at_least "5.0" \
-|| IUSE="${IUSE} raid"
-
 mysql_version_is_at_least "5.0.18" \
 && IUSE="${IUSE} max-idx-128"
 
-mysql_version_is_at_least "5.1" \
-|| IUSE="${IUSE} berkdb"
+IUSE="${IUSE} berkdb"
 
 [ "${MYSQL_COMMUNITY_FEATURES}" == "1" ] \
-&& IUSE="${IUSE} ${IUSE_DEFAULT_ON}community profiling"
+&& IUSE="${IUSE} +community profiling"
 
 [[ "${PN}" == "mariadb" ]] \
 && IUSE="${IUSE} libevent"
@@ -250,10 +243,6 @@ RDEPEND="${DEPEND}
 "
 
 # compile-time-only
-mysql_version_is_at_least "5.1" \
-|| DEPEND="${DEPEND} berkdb? ( sys-apps/ed )"
-
-# compile-time-only
 mysql_version_is_at_least "5.1.12" \
 && DEPEND="${DEPEND} >=dev-util/cmake-2.4.3"
 
@@ -387,14 +376,6 @@ mysql-v2_pkg_setup() {
 	   die "Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51"
 	fi
 
-	if ! mysql_version_is_at_least "5.0" \
-	&& use raid \
-	&& use static ; then
-		eerror "USE flags 'raid' and 'static' conflict, you cannot build MySQL statically"
-		eerror "with RAID support enabled."
-		die "USE flags 'raid' and 'static' conflict!"
-	fi
-
 	if mysql_version_is_at_least "4.1.3" \
 	&& ( use cluster || use extraengine || use embedded ) \
 	&& use minimal ; then
@@ -412,28 +393,10 @@ mysql-v2_pkg_setup() {
 		die "${M}"
 	fi
 
-	# Bug #290570, 284946, 307251
-	# Upstream changes made us need a fairly new GCC4.
-	# But only for 5.0.8[3-6]!
-	if mysql_version_is_at_least "5.0.83"  && ! mysql_version_is_at_least 5.0.87 ; then
-		GCC_VER=$(gcc-version)
-		case ${GCC_VER} in
-			2*|3*|4.0|4.1|4.2)
-			eerror "Some releases of MySQL required a very new GCC, and then"
-			eerror "later release relaxed that requirement again. Either pick a"
-			eerror "MySQL >=5.0.87, or use a newer GCC."
-			die "Active GCC too old!" ;;
-		esac
-	fi
-
 	# This should come after all of the die statements
 	enewgroup mysql 60 || die "problem adding 'mysql' group"
 	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
 
-	mysql_check_version_range "4.0 to 5.0.99.99" \
-	&& use berkdb \
-	&& elog "Berkeley DB support is deprecated and will be removed in future versions!"
-
 	if [ "${PN}" != "mysql-cluster" ] && use cluster; then
 		ewarn "Upstream has noted that the NDB cluster support in the 5.0 and"
 		ewarn "5.1 series should NOT be put into production. In the near"