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

Package-Manager: portage-2.0.53

9 files changed, 51 insertions, 16 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/Manifest b/dev-db/mysql/Manifest
index beaec85d07a4..3a54486ce62d 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,14 +1,14 @@
-MD5 419b279174e7ecfa6190eb05aac6d379 ChangeLog 53782
+MD5 dcb65ead128139a4e47d37ba4c57352c ChangeLog 54434
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
 MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
 MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
 MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15 139
-MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r1 139
+MD5 081bfa8975526ff1098cc4e067cf7545 files/digest-mysql-4.1.15-r2 139
 MD5 0415d0314d8b1a3d5fb8bc5a65660953 files/digest-mysql-4.1.15-r30 139
 MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
-MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r3 139
 MD5 f2f69d4a3f98030fc7248cac3c2d981d files/digest-mysql-5.0.16-r30 139
+MD5 aa38cbef56ecdf34fd61c71bac1120e2 files/digest-mysql-5.0.16-r4 139
 MD5 192d36fe25573b9974310cbd7977bd89 files/digest-mysql-5.1.3_alpha-r30 144
 MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
 MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
@@ -30,10 +30,10 @@ MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
 MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
 MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
 MD5 28d52e441c3b6e76ea85d79615fef054 mysql-4.1.14.ebuild 18857
-MD5 239e7394feb76471a6cffc4a74918e0f mysql-4.1.15-r1.ebuild 23321
-MD5 c1b32f4b1aa85f55000e6a2b97905afb mysql-4.1.15-r30.ebuild 24363
+MD5 244baaa091d5e79e2819ff52894e66d8 mysql-4.1.15-r2.ebuild 23807
+MD5 98e293e213a6b9016a460e20525500b7 mysql-4.1.15-r30.ebuild 24418
 MD5 68d8a9e80d038e354f3fba7c4c9394da mysql-4.1.15.ebuild 18880
 MD5 38667d0ef4311ebb4e9ef25473b4d6af mysql-5.0.15.ebuild 19010
-MD5 97317385e6206c891dbda69bc5171ab4 mysql-5.0.16-r3.ebuild 23712
-MD5 f14ae7b558da0e89190f6612ad769426 mysql-5.0.16-r30.ebuild 24363
-MD5 a96acee9c72617e5f726cc7185ead6a4 mysql-5.1.3_alpha-r30.ebuild 24368
+MD5 ea5cd63c3621830e6d6e31fdc9e234e9 mysql-5.0.16-r30.ebuild 24418
+MD5 ba2efd397d2f513ac0442cf7b41998e4 mysql-5.0.16-r4.ebuild 23767
+MD5 c77aad2f31b60f6d2cad43cf182074f6 mysql-5.1.3_alpha-r30.ebuild 24423
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"