strip -O[n] with n < 2, rc script for 4.1

(Portage version: 2.0.53)

8 files changed, 43 insertions, 8 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 012d0e94ea9c..0bbeabd8012a 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.277 2005/12/08 17:46:38 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.278 2005/12/09 18:32:30 vivo Exp $
+
+*mysql-5.0.16-r4 (09 Dec 2005)
+*mysql-4.1.15-r2 (09 Dec 2005)
+
+  09 Dec 2005; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.15-r1.ebuild,
+  +mysql-4.1.15-r2.ebuild, mysql-4.1.15-r30.ebuild, -mysql-5.0.16-r3.ebuild,
+  +mysql-5.0.16-r4.ebuild, mysql-5.0.16-r30.ebuild,
+  mysql-5.1.3_alpha-r30.ebuild:
+  Updated rc script also for 4.1.15 .
+  Stripping C*FLAGS -O[n] with n < 2, those flag has been created problems
+  repeatedly (also on my test boxes).
+  The upstream default is "-O3", all testing here is done with "-O2" so it's
+  possible to consider these ones safe.
+  The same change may be backported also to the other ebuilds (stable 4.0 and
+  4.1)
 
   08 Dec 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r1,
   files/mysqlmanager-slot.rc6:
diff --git a/dev-db/mysql/files/digest-mysql-4.1.15-r1 b/dev-db/mysql/files/digest-mysql-4.1.15-r2
index ed0a7a329542..ed0a7a329542 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.15-r1
+++ b/dev-db/mysql/files/digest-mysql-4.1.15-r2
diff --git a/dev-db/mysql/files/digest-mysql-5.0.16-r3 b/dev-db/mysql/files/digest-mysql-5.0.16-r4
index 0a23c702e105..0a23c702e105 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.16-r3
+++ b/dev-db/mysql/files/digest-mysql-5.0.16-r4
diff --git a/dev-db/mysql/mysql-4.1.15-r1.ebuild b/dev-db/mysql/mysql-4.1.15-r2.ebuild
index 931e29e9be8e..0858575d131b 100644
--- a/dev-db/mysql/mysql-4.1.15-r1.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r1.ebuild,v 1.4 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r2.ebuild,v 1.1 2005/12/09 18:32:30 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -238,6 +238,12 @@ src_unpack() {
 	find . -name 'Makefile.am' \
 		-exec sed --in-place -e 's!$(pkgdatadir)!'${MY_SHAREDSTATEDIR}'!g' {} \;
 
+	# Manage mysqlmanager
+	mysql_version_is_at_least "5.00.15.00" \
+	&& sed -i -e "s!@GENTOO_EXT@!${MY_SUFFIX}!g" \
+		-e "s!@GENTOO_SOCK_PATH@!var/run/mysqld!g" \
+		"${S}/server-tools/instance-manager/Makefile.am"
+
 	# remove what need to be recreated, so we are sure it's actually done
 	find . -name Makefile -o -name Makefile.in -o -name configure -exec rm -f {} \;
 	rm ltmain.sh
@@ -427,6 +433,8 @@ src_compile() {
 		fi
 	fi
 
+	#Bug #114895,Bug #110149
+	filter-flags "-O" "-O[s01]"
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
@@ -565,7 +573,9 @@ src_install() {
 	doins scripts/mysqlaccess.conf
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 	insinto "/etc/conf.d"
-	newins "${FILESDIR}/mysql-slot.conf.d" "mysql"
+	newins "${FILESDIR}/mysql-slot.conf.d-r1" "mysql"
+	mysql_version_is_at_least "5.00.11.00" \
+	&& newins "${FILESDIR}/mysqlmanager-slot.conf.d" "mysqlmanager"
 
 	local charset='utf8'
 	! useq utf8 && local charset='latin1'
@@ -577,7 +587,9 @@ src_install() {
 	# minimal builds don't have the server
 	if ! useq minimal; then
 		exeinto /etc/init.d
-		newexe "${FILESDIR}/mysql-slot.rc6" "mysql"
+		newexe "${FILESDIR}/mysql-slot.rc6-r1" "mysql"
+		mysql_version_is_at_least "5.00.11.00" \
+		&& newexe "${FILESDIR}/mysqlmanager-slot.rc6" "mysqlmanager"
 		insinto /etc/logrotate.d
 		# TODO
 		newins "${FILESDIR}/logrotate.mysql" "mysql${MY_SUFFIX}"
diff --git a/dev-db/mysql/mysql-4.1.15-r30.ebuild b/dev-db/mysql/mysql-4.1.15-r30.ebuild
index c7c4eaf341be..796841bca961 100644
--- a/dev-db/mysql/mysql-4.1.15-r30.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.7 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.8 2005/12/09 18:32:30 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -433,6 +433,8 @@ src_compile() {
 		fi
 	fi
 
+	#Bug #114895,Bug #110149
+	filter-flags "-O" "-O[s01]"
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
diff --git a/dev-db/mysql/mysql-5.0.16-r30.ebuild b/dev-db/mysql/mysql-5.0.16-r30.ebuild
index 8c8b16b845ba..238e4aed1273 100644
--- a/dev-db/mysql/mysql-5.0.16-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.7 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r30.ebuild,v 1.8 2005/12/09 18:32:30 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -433,6 +433,8 @@ src_compile() {
 		fi
 	fi
 
+	#Bug #114895,Bug #110149
+	filter-flags "-O" "-O[s01]"
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
diff --git a/dev-db/mysql/mysql-5.0.16-r3.ebuild b/dev-db/mysql/mysql-5.0.16-r4.ebuild
index fad41a8d2111..2a8178d1f4d6 100644
--- a/dev-db/mysql/mysql-5.0.16-r3.ebuild
+++ b/dev-db/mysql/mysql-5.0.16-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r3.ebuild,v 1.5 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.16-r4.ebuild,v 1.1 2005/12/09 18:32:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -432,6 +432,8 @@ src_compile() {
 		fi
 	fi
 
+	#Bug #114895,Bug #110149
+	filter-flags "-O" "-O[s01]"
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
diff --git a/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild b/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild
index f703e54da19f..2e9a5a1e02df 100644
--- a/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild
+++ b/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild,v 1.1 2005/12/08 14:54:31 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.1.3_alpha-r30.ebuild,v 1.2 2005/12/09 18:32:31 vivo Exp $
 
 # helper function, version (integer) may have section separated by dots
 # for readbility
@@ -433,6 +433,8 @@ src_compile() {
 		fi
 	fi
 
+	#Bug #114895,Bug #110149
+	filter-flags "-O" "-O[s01]"
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"