version bump 4.1 ; updated mysql.eclass

Package-Manager: portage-2.1_pre4-r1

4 files changed, 85 insertions, 7 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 7dac5c3515dd..f9ed8d410a24 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mysql
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.300 2006/02/05 16:59:03 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.301 2006/02/08 16:39:23 vivo Exp $
+
+*mysql-4.1.18-r30 (08 Feb 2006)
+
+  08 Feb 2006; Francesco Riosa <vivo@gentoo.org> +mysql-4.1.18-r30.ebuild:
+  - version bump for MySQL 4.1
+  - mysql eclass has been modified after suggestions from portage team
 
   05 Feb 2006; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6-r3,
   files/mysqlmanager-slot.rc6:
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 98ae9cc5cd3a..31ea8a90a6a4 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 2e0dfed14a963d7f9e4f581040a8de66 ChangeLog 60787
-RMD160 85d00fa8ecd71e2e2c4a64671e7d6620568f1677 ChangeLog 60787
-SHA256 8180ed660c2d0f1a321b6898e06fb482bb24b42ac8bf2067c3bd96a2ef5b7505 ChangeLog 60787
+MD5 a30d614d2ac5b0de35e916b2e0ac981f ChangeLog 60998
+RMD160 ae7d9a213ed5c3262211daee82c2b42ab8f55bda ChangeLog 60998
+SHA256 89e6d0382d0afed943ec1dab8de510916650dd3624b075ac702ca811775de1a5 ChangeLog 60998
 MD5 c6fcd70c34bed04e59808ec71c5bedfb files/digest-mysql-3.23.58-r1 140
 RMD160 eedbaecbaf03a55c5510f74aa508ff9075bf151f files/digest-mysql-3.23.58-r1 140
 SHA256 f08bf2eb63cd3809353ab2fbef2cf50ba57c6d8df0c696631b2577dae741f12e files/digest-mysql-3.23.58-r1 140
@@ -22,6 +22,9 @@ SHA256 929e03145ba51d9845061456c1118d1c014641aded45aae3d586584e51af3441 files/di
 MD5 c1cd09c8d73a466f7361cd1af46c9087 files/digest-mysql-4.1.16-r30 139
 RMD160 c13c85e5f799bf3e44a4d637383c25ee06d39050 files/digest-mysql-4.1.16-r30 139
 SHA256 1a5edc2a55a82815f79565e99189297aad0afcf37af17fdf08cdb2c6450a97a3 files/digest-mysql-4.1.16-r30 139
+MD5 9cc8cf047c6784b87d9ffc2f9bdbeec3 files/digest-mysql-4.1.18-r30 509
+RMD160 f19f66a83eb82c60a5384d58ff0d0da932ad11f5 files/digest-mysql-4.1.18-r30 509
+SHA256 ee801d4d2f1f3d2f86ae1cf267ed32a662bc80488da29c5348e28f1cd4b5abd3 files/digest-mysql-4.1.18-r30 509
 MD5 61fb608f7d62d7c79a6e214ff6080464 files/digest-mysql-5.0.18 509
 RMD160 9c7c0e613946b7d4b994dd754937eaf2ac0eca6c files/digest-mysql-5.0.18 509
 SHA256 5a6cf4a50060b5e13c7bcfe4e9bb7e1596d03eaaf6871c1c33e82bddfbc17ea8 files/digest-mysql-5.0.18 509
@@ -106,6 +109,9 @@ SHA256 4b51ae5e9823a43d16771364ff03e5694506f77964cd6344622b082a99e88450 mysql-4.
 MD5 4a7d5088f14f10f82b4c6d24ee3c6c95 mysql-4.1.16.ebuild 24839
 RMD160 3e0d755713246e4c5d1a56b779eed3e5d6a7a9e0 mysql-4.1.16.ebuild 24839
 SHA256 1f50257c9df61ce11c86cdacf69800aeed3683a604c71d0a5b51a706ad897e77 mysql-4.1.16.ebuild 24839
+MD5 a12bdc2b643a187412f64386f7e4dbcb mysql-4.1.18-r30.ebuild 2028
+RMD160 b3af5391d81744c199df53e0bba48aa734d161f3 mysql-4.1.18-r30.ebuild 2028
+SHA256 5f29b51d657ad7bba490cfba3c898de8e5276af849fcd364a2cc23ced72cee3f mysql-4.1.18-r30.ebuild 2028
 MD5 ca89aea7ff7b48c1bf3bbf982cc6e9d4 mysql-5.0.18-r30.ebuild 2037
 RMD160 08c82e10a33c406590c05ae1caf95e277f513892 mysql-5.0.18-r30.ebuild 2037
 SHA256 3e12bd7432357eddc665c98ca4b3dbde1a19a11b19917926fc1b3a43606fd1a7 mysql-5.0.18-r30.ebuild 2037
@@ -118,7 +124,7 @@ SHA256 3a1e1c8d111f9c74a9b96b85e45f5508537b8726808ddf952d23b5e011476066 mysql-5.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5i8bKolR564NvWYRAoEIAKC73FuyS+/7fsgCl1FmZEjQMBUXmgCfaM3u
-d/i076V31KLyrfBAJGX2gVA=
-=lucK
+iD8DBQFD6h7QKolR564NvWYRAoIeAKCBNz8qmuObi04uPHrlMw+BByWvAACgq+PL
+/KEIo4xnTE5e4kG8RN8CJ8Q=
+=qyXQ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/digest-mysql-4.1.18-r30 b/dev-db/mysql/files/digest-mysql-4.1.18-r30
new file mode 100644
index 000000000000..b6d4d95da5e1
--- /dev/null
+++ b/dev-db/mysql/files/digest-mysql-4.1.18-r30
@@ -0,0 +1,6 @@
+MD5 a2db4edb3e1e3b8e0f8c2242225ea513 mysql-4.1.18.tar.gz 17172994
+RMD160 6a761803092d9e34c15a18bad7e2c1c46f2e2429 mysql-4.1.18.tar.gz 17172994
+SHA256 7744d78131619b73a82adb6f73d6cfc6bad11a6ad2806c0f5130f88fe88ac9dd mysql-4.1.18.tar.gz 17172994
+MD5 d4e55fc358750d878ddb3c9450a95a5c mysql-extras-20060115.tar.bz2 78365
+RMD160 8ea4c995b3b3dbb7fe2f86418f0d327496ace99d mysql-extras-20060115.tar.bz2 78365
+SHA256 6a53bcd68b16de2f1990c2f523b898120f8fc32d28ad589e70452930391a6f09 mysql-extras-20060115.tar.bz2 78365
diff --git a/dev-db/mysql/mysql-4.1.18-r30.ebuild b/dev-db/mysql/mysql-4.1.18-r30.ebuild
new file mode 100644
index 000000000000..2a9aabac2d95
--- /dev/null
+++ b/dev-db/mysql/mysql-4.1.18-r30.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.18-r30.ebuild,v 1.1 2006/02/08 16:39:23 vivo Exp $
+
+# MYSQL_VERSION_ID will be
+# major * 10e6 + minor * 10e4 + micro * 10e2 + gentoo magic number, all [0..99]
+# this is an important piece, becouse from this variable depends many of the
+# choices the ebuild will do.
+# in particular the code below work only with PVR like "5.0.18-r3"
+# the result with the previous PVR is "5001803"
+MYSQL_VERSION_ID=""
+tpv=( ${PV//[-._]/ } ) ; tpv[3]="${PVR:${#PV}}" ; tpv[3]="${tpv[3]##*-r}"
+for vatom in 0 1 2 3; do
+	# pad to lenght 2
+	tpv[${vatom}]="00${tpv[${vatom}]}"
+	MYSQL_VERSION_ID="${MYSQL_VERSION_ID}${tpv[${vatom}]:0-2}"
+done
+# strip leading "0" (otherwise it's considered an octal number from bash)
+MYSQL_VERSION_ID=${MYSQL_VERSION_ID##"0"}
+
+# for future use ...
+NDB_VERSION_ID=$(( ${MYSQL_VERSION_ID} / 100 ))
+
+inherit mysql
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DEPEND="${DEPEND}
+	>=sys-libs/readline-4.1
+	bdb? ( sys-apps/ed )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	userland_GNU? ( sys-process/procps )
+	>=sys-libs/zlib-1.2.3
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-apps/sed-4"
+RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
+# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
+
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		cd mysql-test
+		sed -i -e "s|MYSQL_TCP_PORT=3306|MYSQL_TCP_PORT=3307|" mysql-test-run
+		./mysql-test-run
+		retstatus=$?
+
+		# to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}