diff options
Diffstat (limited to 'dev-db')
| -rw-r--r-- | dev-db/mysql/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-db/mysql/Manifest | 122 | ||||
| -rw-r--r-- | dev-db/mysql/mysql-4.1.12.ebuild | 7 |
3 files changed, 70 insertions, 65 deletions
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog index d5336a341160..58ae8bb17c62 100644 --- a/dev-db/mysql/ChangeLog +++ b/dev-db/mysql/ChangeLog @@ -1,10 +1,14 @@ # 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.200 2005/05/17 20:19:42 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.201 2005/05/18 04:46:22 robbat2 Exp $ 17 May 2005; Markus Rothe <corsair@gentoo.org> mysql-4.1.12.ebuild: Added ~ppc64 to KEYWORDS + 18 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.1.12.ebuild: + we only need to do the unmerge of an old mysql if a local mysql database + exists. + 17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24-r2.ebuild, mysql-4.1.12.ebuild: Cleanup a few minor things. diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 2476919b6aec..72d8224af88d 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,78 +1,78 @@ -MD5 5ec63fffcc48f35cfcce669321e04983 ChangeLog 31668 -MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163 -MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759 -MD5 ca4242e577d3b1b6f69cfa80142c320f mysql-3.23.58.ebuild 6640 MD5 a088b749386760cae4d09caf14f39c84 mysql-4.0.22-r1.ebuild 9269 -MD5 9bb11a2e8c8e579009cb712fd7a8bf66 mysql-4.0.22-r2.ebuild 9602 -MD5 75aca22d48ce2becdbebffb7afcad049 mysql-4.0.22.ebuild 8757 -MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160 -MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407 +MD5 1975292a4eeae0ebd6c3e077d42f22c1 mysql-4.0.24-r2.ebuild 13727 +MD5 ca4242e577d3b1b6f69cfa80142c320f mysql-3.23.58.ebuild 6640 MD5 a4e6b738e389c33c3c9e19b8fb5b8fa3 mysql-4.0.23.ebuild 9040 -MD5 1173ba95403d2a99a6d38d6ae5bde41a mysql-4.0.24-r1.ebuild 11899 -MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816 +MD5 80c210f51c3c19afc810c5fb9fc67c7b mysql-4.0.23-r2.ebuild 9407 MD5 6185a1b16dbe0b6fe32d725e8bee26b6 mysql-4.1.8-r1.ebuild 9225 +MD5 1173ba95403d2a99a6d38d6ae5bde41a mysql-4.0.24-r1.ebuild 11899 +MD5 75aca22d48ce2becdbebffb7afcad049 mysql-4.0.22.ebuild 8757 +MD5 9bb11a2e8c8e579009cb712fd7a8bf66 mysql-4.0.22-r2.ebuild 9602 +MD5 d436e793baae2f71669b96381ce2959b mysql-3.23.58-r1.ebuild 6759 MD5 135c8d82ff80aa2d7d3b1df75719dd00 mysql-4.1.8.ebuild 9087 -MD5 1975292a4eeae0ebd6c3e077d42f22c1 mysql-4.0.24-r2.ebuild 13727 -MD5 57a3c204b83d4466b2944a6199d3042c mysql-4.1.12.ebuild 15535 -MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67 +MD5 be85068e1f8dd9340882814ae10e1763 mysql-4.0.23-r1.ebuild 9160 +MD5 528858502563f62b550e45c8ea3948f2 mysql-4.1.12.ebuild 15567 +MD5 f26f6906248f45f5f0d23248a39c03a4 mysql-4.0.24.ebuild 9816 +MD5 8756cd65136ad04b5b8368583ca0b29a ChangeLog 31828 +MD5 a5dda17df0286cd82cae42d117784903 metadata.xml 163 +MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477 +MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439 +MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217 +MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585 +MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933 +MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58-r1 67 +MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452 +MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368 +MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587 +MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557 +MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394 +MD5 28b79a92729c506943a4f9c6d9abf1fb files/mysql-4.0.24-asm-pic-fixes.patch 2634 MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22 66 -MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66 -MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66 MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23 66 -MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66 -MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67 MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24 66 -MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r1 66 -MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65 -MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8-r1 65 -MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440 -MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 -MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816 -MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 -MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105 -MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368 -MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218 -MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452 -MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557 -MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601 -MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366 +MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12 66 MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047 -MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271 -MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240 -MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477 -MD5 087f3fbbe8e3385f5408d91cb661aace files/mysql-4.0-mysqlhotcopy-security.patch 1394 +MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429 MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452 -MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813 +MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 +MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055 +MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307 +MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562 +MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8 65 MD5 f635289f8422fdf26ba3c3dbdf99c4e2 files/mysql-4.0.14-mysqld-safe-sh.diff 1503 -MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465 +MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654 +MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271 MD5 e501d0f33d9d0be73b37c310099011d2 files/mysql-4.0.14-security-28394.patch 654 -MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187 -MD5 f2905bbcc3f148a2ad689792917bd78d files/mysql-4.0.16-install-db-sh.diff 1429 -MD5 fc80f877fa97f0f3a52ee684ce7f54b2 files/mysql-4.0.16-mysqld-safe-sh.diff 1562 -MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637 -MD5 58c4d09c5c2712254b1881a6fcc7abff files/mysql-4.0.18-gentoo-nptl.diff 587 +MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440 MD5 68cbaa353f522c0a404a4d07693f917d files/mysql-4.0.18-install-db-sh.diff 1473 -MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672 -MD5 d20c23adca5b8731ebfab4d1b5771dab files/mysql-4.0.18-mysqld-safe-sh.diff 1307 -MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863 -MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723 -MD5 e37e03b4ce894ff87fda12ce6f7b31a6 files/mysql-4.0.21-install-db-sh.diff 585 -MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318 -MD5 6d4fc135a2143e95681416795d1948d9 files/mysql-4.0.23-install-db-sh.diff 1055 -MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603 -MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 -MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439 -MD5 3e399acddc48f209b53e260eec64938c files/mysql-4.0.rc6 933 +MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231 +MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366 +MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240 MD5 3d755bbd0b109ec0397b0ce50b4a554d files/mysql-accesstmp.patch 3393 -MD5 6f8de46485ea7dcf886e1747fb117427 files/mysql-gentoo-nptl.diff 654 -MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886 -MD5 7d92ba9c74a73bf3c852a5c078c16d29 files/rebuilder.sh 1557 -MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r2 66 -MD5 ee67067f786849424c4591e278819bbc files/digest-mysql-4.1.12 66 +MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601 +MD5 5701dee85af16e5d7aa821853ec8cda5 files/digest-mysql-4.1.8-r1 65 +MD5 8af497943e1a29aa0a0c6b17af54b116 files/mysql-4.0.21-thrssl.patch 318 +MD5 f599e8b3eb4636bb61721525dc15f5f5 files/mysql-4.0.18-thrssl.patch 723 MD5 c4785801e45235c28d7a4139bfbd73af files/my.cnf-4.1 3667 -MD5 28b79a92729c506943a4f9c6d9abf1fb files/mysql-4.0.24-asm-pic-fixes.patch 2634 +MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557 +MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218 +MD5 a76ec36b83c2f0dbfba65c993f75d135 files/mysql-4.0.18-mysqlbugsecurity.diff 672 +MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905 +MD5 6e0ae36e30287df25336d8bd71c0e764 files/digest-mysql-3.23.58 67 +MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662 MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123 MD5 598859c685b18094178639620cb4ba89 files/mysql-4.1.12-asm-pic-fixes.patch 2655 -MD5 66b1e90f93ae0adc106e7b62a2c4043b files/mysql-4.1.9-thrssl.patch 905 -MD5 a755fb5a3ed724046a4f83fafd819c77 files/mysql-test-myisam-geometry.patch 1217 +MD5 977be6c68f6231cbcf1febd3305ade5d files/mysql-4.0.14-r1-tcpd-vars-fix.diff 465 +MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105 +MD5 c6ff193b0612040bab879d2085b6edea files/mysql-4.0.24-manual.texi.patch 603 +MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816 +MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271 +MD5 9b5ad94f6e99e65bc3373c9dd15dff08 files/mysql-4.0.17-thrssl.patch 637 +MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r1 66 +MD5 04fa914460358170e2865d20b22d2171 files/digest-mysql-4.0.22-r2 66 +MD5 5c65bc30646d669193798324a56b002a files/digest-mysql-4.0.23-r1 66 +MD5 ce711c0d8387720dbb85de1d756daa75 files/digest-mysql-4.0.23-r2 67 +MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r1 66 +MD5 547fab43da8e59a03a5f3e4a500cca45 files/digest-mysql-4.0.24-r2 66 +MD5 152b9a8feef16df47b56c316c5c0601e files/mysql-4.0.13-thrssl.patch 813 +MD5 ad5636b398982a23f6fc58f18a2114fc files/mysql-4.0.18-mysqldmultisecurity.diff 3863 diff --git a/dev-db/mysql/mysql-4.1.12.ebuild b/dev-db/mysql/mysql-4.1.12.ebuild index 89896e34241a..6d56120a4ccb 100644 --- a/dev-db/mysql/mysql-4.1.12.ebuild +++ b/dev-db/mysql/mysql-4.1.12.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.12.ebuild,v 1.4 2005/05/17 20:19:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.12.ebuild,v 1.5 2005/05/18 04:46:22 robbat2 Exp $ inherit eutils gnuconfig flag-o-matic versionator @@ -76,15 +76,16 @@ mysql_get_datadir() { } pkg_setup() { + mysql_get_datadir if ! useq minimal ; then if has_version "<=dev-db/mysql-4.1.4" \ - && ! built_with_use dev-db/mysql minimal ; then + && ! built_with_use dev-db/mysql minimal \ + && [ -d "${DATADIR}/mysql" ]; then mysql_upgrade_error die fi fi mysql_upgrade_warning - mysql_get_datadir } src_unpack() { |