Backport fixes from 4.1.15, fix Bug 110442

Package-Manager: portage-2.0.52-r1

3 files changed, 35 insertions, 25 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 06227060b18e..228dae494a3b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # 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.255 2005/10/24 17:00:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.256 2005/10/25 17:50:45 vivo Exp $
+
+  25 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild:
+  Backport fixes from 4.1.15, fix Bug 110442
 
 *mysql-5.0.15 (24 Oct 2005)
 
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 11208ccb8eca..c5567f5b6c7b 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,10 +1,10 @@
-MD5 ca4439086bc967f265e38f7d46d8632a mysql-4.1.14.ebuild 18782
+MD5 06d4538a7761f8a0caf247b2545df8a8 mysql-4.1.14.ebuild 18998
 MD5 d419eb0723fa69b4e938806f4aaf705f mysql-4.0.26.ebuild 14895
 MD5 af5393351bb355e6ca2e187afcc3fd34 mysql-5.0.15.ebuild 19150
 MD5 c727796d2a8548e62c735d262a0b8ee7 mysql-5.0.13_rc.ebuild 18929
 MD5 d4af8acfa6042b6149b81e3646637e27 mysql-4.1.15.ebuild 19022
 MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
-MD5 76d4cf1c79d7d844649d58b2d28fd4d2 ChangeLog 47025
+MD5 c3e6e9efb45da0909cc8a2f27bf0ac88 ChangeLog 47141
 MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 2318a7432107d2b7842f9e2fe87d8571 mysql-4.0.25-r2.ebuild 14266
 MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index aea2ae2396ad..662e4b932c7a 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.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.14.ebuild,v 1.20 2005/10/24 17:00:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.21 2005/10/25 17:50:45 vivo Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -106,7 +106,7 @@ pkg_setup() {
 
 	if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
 		mysql_get_datadir
-		local local curversion="dev-db/${PN}-${PV%.*}"
+		local curversion="dev-db/${PN}-${PV%.*}"
 		local oldversion="$(best_version dev-db/mysql)"
 		oldversion=${oldversion%.*}
 
@@ -158,6 +158,7 @@ src_unpack() {
 
 	epatch ${MY_PATCH_SOURCE}/010_all_my-print-defaults-r0.patch || die
 	epatch ${MY_PATCH_SOURCE}/030_all_thrssl-r1.patch || die
+	epatch ${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch || die
 	epatch ${MY_PATCH_SOURCE}/040_all_tcpd-vars-fix.patch || die
 
 	for d in ${S} ${S}/innobase; do
@@ -249,12 +250,19 @@ src_compile() {
 	# these are things we exclude from a minimal build
 	# note that the server actually does get built and installed
 	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
+	local minimal_exclude_list="server embedded-server extra-tools innodb"
 	if ! useq minimal; then
 		for i in ${minimal_exclude_list}; do
 			myconf="${myconf} --with-${i}"
 		done
 
+		if useq static ; then
+			myconf="${myconf} --without-raid"
+			ewarn "disabling raid support, has problem with static"
+		else
+			myconf="${myconf} --with-raid"
+		fi
+
 		if ! version_is_at_least "5.0_alpha" ; then
 			if version_is_at_least "4.1_alpha" && useq utf8; then
 				myconf="${myconf} --with-charset=utf8"
@@ -445,12 +453,12 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		#diropts "-m0755"
-		#dodir "/var/log/mysql"
+		diropts "-m0755"
+		dodir "/var/log/mysql"
 		#touch ${D}/var/log/mysql/mysql.{log,err}
 		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-		#keepdir "/var/log/mysql"
-		#chown -R mysql:mysql "${D}/var/log/mysql"
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
 
 		diropts "-m0755"
 		dodir "/var/run/mysqld"
@@ -497,6 +505,20 @@ pkg_postinst() {
 	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
+pkg_postinst() {
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+}
+
 pkg_config() {
 	mysql_get_datadir
 
@@ -596,18 +618,3 @@ pkg_config() {
 	rm  "${sqltmp}"
 	einfo "done"
 }
-
-pkg_postinst() {
-	# mind at FEATURES=collision-protect before to remove this
-	#empty dirs...
-	[ -d "${ROOT}/var/log/mysql" ] \
-		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-	chmod 0660 ${ROOT}/var/log/mysql/mysql*
-	# secure some directories
-	chmod 0750 ${ROOT}/var/log/mysql
-}
-