[gentoo-commits] gentoo-x86 commit in eclass: mysql.eclass

[Robin H. Johnson (robbat2)]

robbat2     10/11/28 21:55:54

  Modified:             mysql.eclass
  Log:
  Bug #344885: Upstream has broken USE=debug for 5.1 series >=5.1.51

Revision  Changes    Path
1.156                eclass/mysql.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mysql.eclass?r1=1.155&r2=1.156

Index: mysql.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v
retrieving revision 1.155
retrieving revision 1.156
diff -p -w -b -B -u -u -r1.155 -r1.156
--- mysql.eclass	2 Nov 2010 20:27:41 -0000	1.155
+++ mysql.eclass	28 Nov 2010 21:55:54 -0000	1.156
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.155 2010/11/02 20:27:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.156 2010/11/28 21:55:54 robbat2 Exp $
 
 # @ECLASS: mysql.eclass
 # @MAINTAINER:
@@ -756,6 +756,13 @@ mysql_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"
+	fi
+
 	if ! mysql_version_is_at_least "5.0" \
 	&& use raid \
 	&& use static ; then