diff options
| -rw-r--r-- | dev-db/mysql/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-db/mysql/Manifest | 12 | ||||
| -rw-r--r-- | dev-db/mysql/files/digest-mysql-4.1.16 | 2 | ||||
| -rw-r--r-- | dev-db/mysql/files/digest-mysql-4.1.16-r30 | 2 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.1.16-r30.ebuild | 13 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.1.16.ebuild | 13 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-5.0.17.ebuild | 11 |
7 files changed, 43 insertions, 17 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index c04004c8acd1..f7767d5506b9 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,6 +1,11 @@ # 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.287 2005/12/30 19:59:42 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.288 2005/12/30 20:07:13 vivo Exp $ + + 30 Dec 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.16.ebuild, + mysql-4.1.16-r30.ebuild, mysql-5.0.17.ebuild: + Synced the code of the ebuilds, this should _NOT_ affect the emerge behaviour + on these ones. 30 Dec 2005; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.15.ebuild, -mysql-4.1.15-r2.ebuild: diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index ff54ac69b809..a4bccd5d495e 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,10 +1,10 @@ -MD5 6a08f0fa2a914137fa696ef506c8e820 ChangeLog 56871 +MD5 d0fc7bb206f8af9b8120aaae1eef70e8 ChangeLog 57087 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 4fbd3dfaf869bcd40254f8c83993248f files/digest-mysql-4.1.16 139 -MD5 de7e2ca6c5cededa81194f4d0d440cd5 files/digest-mysql-4.1.16-r30 139 +MD5 9b917ce2955bc91557806257add5e3c9 files/digest-mysql-4.1.16 139 +MD5 9b917ce2955bc91557806257add5e3c9 files/digest-mysql-4.1.16-r30 139 MD5 bbb9e8ef722b301fe22323fbf373c3d1 files/digest-mysql-5.0.17 139 MD5 2217697573a3f8e3c8ad3f9c7a80ff70 files/digest-mysql-5.0.18 139 MD5 2217697573a3f8e3c8ad3f9c7a80ff70 files/digest-mysql-5.0.18-r30 139 @@ -29,9 +29,9 @@ MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219 MD5 04a6e805b1d24c4c0e4b953d663594dc mysql-4.0.25-r2.ebuild 14265 MD5 bc01b998b62fcca567651ca0c99d86af mysql-4.0.26.ebuild 14894 MD5 739b8a544851021d0045944084bec221 mysql-4.1.14.ebuild 18858 -MD5 12f8d071d3dcb3b15ed4331908d152c6 mysql-4.1.16-r30.ebuild 24446 -MD5 671cbb1729fda6ef67eb7c8b81e0df69 mysql-4.1.16.ebuild 24643 -MD5 37d087a2a318ccf1e8bcad15498fbe52 mysql-5.0.17.ebuild 24626 +MD5 3e5cc4edee6197178b11bfb833dbe9e4 mysql-4.1.16-r30.ebuild 24635 +MD5 02a10545f5af030a5a37eff7c3673b25 mysql-4.1.16.ebuild 24832 +MD5 bbd3c8d9f1b9494bf4e99c31de6c444c mysql-5.0.17.ebuild 24815 MD5 0aaa2e69c220875370428d1c26c6fc90 mysql-5.0.18-r30.ebuild 24638 MD5 6ef016a82a855de740f37cf53acb1fa0 mysql-5.0.18.ebuild 24809 MD5 67c6b5ad0d447e65f145c7f675c25913 mysql-5.1.4_alpha-r30.ebuild 24643 diff --git a/dev-db/mysql/files/digest-mysql-4.1.16 b/dev-db/mysql/files/digest-mysql-4.1.16 index bdb5ce1791f6..08a3fde7084a 100644 --- a/dev-db/mysql/files/digest-mysql-4.1.16 +++ b/dev-db/mysql/files/digest-mysql-4.1.16 @@ -1,2 +1,2 @@ MD5 13c5fdd05e28863db3a1261635890b5f mysql-4.1.16.tar.gz 17146702 -MD5 b6d7a647fa0584915ea0b0ed2544c0a0 mysql-extras-20051122.tar.bz2 66350 +MD5 4f3c297c14745c5a30d7b3dc5a867990 mysql-extras-20051220.tar.bz2 69528 diff --git a/dev-db/mysql/files/digest-mysql-4.1.16-r30 b/dev-db/mysql/files/digest-mysql-4.1.16-r30 index 114ed9184213..08a3fde7084a 100644 --- a/dev-db/mysql/files/digest-mysql-4.1.16-r30 +++ b/dev-db/mysql/files/digest-mysql-4.1.16-r30 @@ -1,2 +1,2 @@ MD5 13c5fdd05e28863db3a1261635890b5f mysql-4.1.16.tar.gz 17146702 -MD5 0e8ec66db65a6dd6742e6db1a296bd15 mysql-extras-20051205.tar.bz2 69508 +MD5 4f3c297c14745c5a30d7b3dc5a867990 mysql-extras-20051220.tar.bz2 69528 diff --git a/dev-db/mysql/mysql-4.1.16-r30.ebuild b/dev-db/mysql/mysql-4.1.16-r30.ebuild index c9b9a219bd63..937598e48fc0 100644 --- a/dev-db/mysql/mysql-4.1.16-r30.ebuild +++ b/dev-db/mysql/mysql-4.1.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-4.1.16-r30.ebuild,v 1.2 2005/12/26 23:10:57 vivo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.16-r30.ebuild,v 1.3 2005/12/30 20:07:13 vivo Exp $ # helper function, version (integer) may have section separated by dots # for readbility @@ -26,7 +26,7 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" HOMEPAGE="http://www.mysql.com/" NEWP="${PN}-${PV/_/-}" SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz - mirror://gentoo/mysql-extras-20051205.tar.bz2" + mirror://gentoo/mysql-extras-20051220.tar.bz2" LICENSE="GPL-2" KEYWORDS="-*" @@ -55,6 +55,9 @@ mysql_version_is_at_least() { mysql_version_is_at_least "4.01.03.00" \ && IUSE="${IUSE} cluster utf8 extraengine" +mysql_version_is_at_least "5.00.18.00" \ +&& IUSE="${IUSE} max-idx-128" + mysql_version_is_at_least "5.01.00.00" \ && IUSE="${IUSE} innodb" @@ -438,6 +441,10 @@ src_compile() { myconf="${myconf} --with-partition" fi fi + + mysql_version_is_at_least "5.00.18.00" \ + && useq "max-idx-128" \ + && myconf="${myconf} --with-max-indexes=128" fi #Bug #114895,Bug #110149 @@ -546,7 +553,7 @@ src_install() { done # oops - mysql_check_version_range "5.00.16.00 to 5.00.17.99" \ + mysql_check_version_range "5.00.16.00 to 5.00.18.99" \ && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/" # TODO change at Makefile-am level diff --git a/dev-db/mysql/mysql-4.1.16.ebuild b/dev-db/mysql/mysql-4.1.16.ebuild index b8deaae125bf..c1f0c8d2d508 100644 --- a/dev-db/mysql/mysql-4.1.16.ebuild +++ b/dev-db/mysql/mysql-4.1.16.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.16.ebuild,v 1.3 2005/12/28 21:54:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.16.ebuild,v 1.4 2005/12/30 20:07:13 vivo Exp $ # helper function, version (integer) may have section separated by dots # for readbility @@ -27,7 +27,7 @@ DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" HOMEPAGE="http://www.mysql.com/" NEWP="${PN}-${PV/_/-}" SRC_URI="mirror://mysql/Downloads/MySQL-${PV%.*}/${NEWP}.tar.gz - mirror://gentoo/mysql-extras-20051122.tar.bz2" + mirror://gentoo/mysql-extras-20051220.tar.bz2" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" @@ -56,6 +56,9 @@ mysql_version_is_at_least() { mysql_version_is_at_least "4.01.03.00" \ && IUSE="${IUSE} cluster utf8 extraengine" +mysql_version_is_at_least "5.00.18.00" \ +&& IUSE="${IUSE} max-idx-128" + mysql_version_is_at_least "5.01.00.00" \ && IUSE="${IUSE} innodb" @@ -440,6 +443,10 @@ src_compile() { myconf="${myconf} --with-partition" fi fi + + mysql_version_is_at_least "5.00.18.00" \ + && useq "max-idx-128" \ + && myconf="${myconf} --with-max-indexes=128" fi #Bug #114895,Bug #110149 @@ -548,7 +555,7 @@ src_install() { done # oops - mysql_check_version_range "5.00.16.00 to 5.00.17.99" \ + mysql_check_version_range "5.00.16.00 to 5.00.18.99" \ && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/" # TODO change at Makefile-am level diff --git a/dev-db/mysql/mysql-5.0.17.ebuild b/dev-db/mysql/mysql-5.0.17.ebuild index 4d692487cd26..69686f395359 100644 --- a/dev-db/mysql/mysql-5.0.17.ebuild +++ b/dev-db/mysql/mysql-5.0.17.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.17.ebuild,v 1.3 2005/12/28 21:54:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.17.ebuild,v 1.4 2005/12/30 20:07:13 vivo Exp $ # helper function, version (integer) may have section separated by dots # for readbility @@ -56,6 +56,9 @@ mysql_version_is_at_least() { mysql_version_is_at_least "4.01.03.00" \ && IUSE="${IUSE} cluster utf8 extraengine" +mysql_version_is_at_least "5.00.18.00" \ +&& IUSE="${IUSE} max-idx-128" + mysql_version_is_at_least "5.01.00.00" \ && IUSE="${IUSE} innodb" @@ -440,6 +443,10 @@ src_compile() { myconf="${myconf} --with-partition" fi fi + + mysql_version_is_at_least "5.00.18.00" \ + && useq "max-idx-128" \ + && myconf="${myconf} --with-max-indexes=128" fi #Bug #114895,Bug #110149 @@ -548,7 +555,7 @@ src_install() { done # oops - mysql_check_version_range "5.00.16.00 to 5.00.17.99" \ + mysql_check_version_range "5.00.16.00 to 5.00.18.99" \ && cp "${WORKDIR}/mysql-extras/fill_help_tables.sql-5.0.15" "${D}/usr/share/mysql/" # TODO change at Makefile-am level |