updated metadata to point at mysql-bugs@gentoo.org email

(Portage version: 2.1_pre6-r3)

5 files changed, 25 insertions, 61 deletions

diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index cf83d50b1e40..fecc431d2aba 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,6 +1,9 @@
 # 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.310 2006/03/17 20:18:06 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.311 2006/03/18 11:53:53 vivo Exp $
+
+  18 Mar 2006; Francesco Riosa <vivo@gentoo.org> mysql-5.0.18-r60.ebuild:
+  Cleaned up duplicate code on this one too (forgotten before).
 
   17 Mar 2006; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.18-r30.ebuild,
   mysql-4.1.18-r60.ebuild, -mysql-5.0.18-r30.ebuild, mysql-5.0.19.ebuild,
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 11a10f925865..5811da404c63 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e2b8bf53fb9457b14cdbd2b2c39d161 ChangeLog 64188
-RMD160 7db9775370efdcae6733212b4503a7345d20e942 ChangeLog 64188
-SHA256 12304cb365a3434d4d0097cb8b942aae8fcf9dc76a5b9f5242c899729f021ba7 ChangeLog 64188
+MD5 eaccccfc60136d4ec654c4ff2c928473 ChangeLog 64327
+RMD160 05e9dcda2ca4f3aab49f7773ae0b001b484b1198 ChangeLog 64327
+SHA256 af96923a753c419a04da3d142d3d5e1975a681d7f90e6be5f34a2eeeebf1e076 ChangeLog 64327
 MD5 7a9b202499409304a68680f9d749ec8d files/digest-mysql-3.23.58-r1 512
 RMD160 5d30edca2748f16b2092021823c1377da2007194 files/digest-mysql-3.23.58-r1 512
 SHA256 348bceaedc24580dd89d90afb52164a26487574c59e855e2483468d5f1584eec files/digest-mysql-3.23.58-r1 512
@@ -19,9 +16,9 @@ SHA256 580756dca82c751758e5ecd856b3c8883876a94306304f52eef62a24fd3c45ab files/di
 MD5 8bc5dfb3309efc25fe2f13d1311120e4 files/digest-mysql-4.1.18-r60 506
 RMD160 2c4ee85734bd3aaebed23015c96259611ab10d6f files/digest-mysql-4.1.18-r60 506
 SHA256 82f834ad174ae5f145850aa2b3e29a3fbb2bb0fbdf286b1a823ab9ae8385b705 files/digest-mysql-4.1.18-r60 506
-MD5 7a544a6b81a17eb80fa76295f359eb8d files/digest-mysql-5.0.18-r60 509
-RMD160 a831fb74493358ceb6c31c38b2255f147e2814ed files/digest-mysql-5.0.18-r60 509
-SHA256 8452746c8a037308db01b41828d700bdfe04a82e4fc4c25b5576b9eddac3a419 files/digest-mysql-5.0.18-r60 509
+MD5 2f994c051ed73d3057f6bb7d27fd5eb0 files/digest-mysql-5.0.18-r60 506
+RMD160 85a656fc5db6a9b430deab67bf87f72937084477 files/digest-mysql-5.0.18-r60 506
+SHA256 d407c34eeee235ac8fc541f8b5a8a9686d86337bc34edc5d7c6c0a6e1b83cca4 files/digest-mysql-5.0.18-r60 506
 MD5 32bc3210c24c601b06c897fbbd204d6a files/digest-mysql-5.0.19 506
 RMD160 72e4dc7a0be4bc3e48c2705498ea11e2e2e491e7 files/digest-mysql-5.0.19 506
 SHA256 c5082ff62026d5da2cc68da6bb575d1335cda5fe5003092ba3e4a7f50f48e4c8 files/digest-mysql-5.0.19 506
@@ -73,9 +70,9 @@ SHA256 5b36b46e0a5ec1afbf8ae659ad7f901289421ecf1b100924c5fe4db11bbd1475 files/my
 MD5 0b2151ed331b57b7bc3aa91d2c3d1627 files/mysqlmanager.rc6 6620
 RMD160 572df2aa4c49f10be1f186d0ba27ef5252a5849d files/mysqlmanager.rc6 6620
 SHA256 6d64bd796a55663dd76f8dd863c52ec3bc9cab5f7042d98899d1776d7baabdcc files/mysqlmanager.rc6 6620
-MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
-RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 metadata.xml 158
-SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569 metadata.xml 158
+MD5 e163cd910a34809bff5b80a21dc3274f metadata.xml 301
+RMD160 b27b59c9db975a514591473a1dfc5268da4f79ce metadata.xml 301
+SHA256 8c393f93a85f521d59b04e815540ebdedcbbd3d7f8bd55c9ac27790e04dccf7d metadata.xml 301
 MD5 efbcc5fadb346e5cee88ef75a59a3fb0 mysql-3.23.58-r1.ebuild 7225
 RMD160 3b226f344a89fcf48229d18b2847b41f550b21eb mysql-3.23.58-r1.ebuild 7225
 SHA256 186a76bc92d77a1d9080f940995824051a63e1200ba8221a833ae763dc58b7b7 mysql-3.23.58-r1.ebuild 7225
@@ -91,19 +88,12 @@ SHA256 a88ae368bee8a109a2affe84b1c952b51d53f5ca9457937cf5f39b05ffd05aad mysql-4.
 MD5 6ac703a86faeb15584decd25538222f8 mysql-4.1.18-r60.ebuild 892
 RMD160 9282cee2f6e99746577f7d98132bc340a87cacd7 mysql-4.1.18-r60.ebuild 892
 SHA256 195d4e43b85329b7d3b0fbafdbe437777987b0ac260fa3ac510afdd2bc582804 mysql-4.1.18-r60.ebuild 892
-MD5 fcacdb77a568e41ee9387604b2fe91f9 mysql-5.0.18-r60.ebuild 2072
-RMD160 d0c3282ea4c8d310cb68020e6ecf79b4a9135546 mysql-5.0.18-r60.ebuild 2072
-SHA256 71881207007193709f935da54a67a4c27fed00836d49e1780113cd258807629b mysql-5.0.18-r60.ebuild 2072
+MD5 ba0643eb52460e7becc3c1f1eb367e4c mysql-5.0.18-r60.ebuild 892
+RMD160 ef5cb3f90bc7548a45d335c4ecc9d1c81110b465 mysql-5.0.18-r60.ebuild 892
+SHA256 e10e5f06c1fd8f7dc8ac5574770116e8fdc270703350b7afa37243ec870586df mysql-5.0.18-r60.ebuild 892
 MD5 8239e1cb0ec39c78d55084ad28246b68 mysql-5.0.19.ebuild 888
 RMD160 b894fc0ba1f35c488ce90d5317a1452eb22bffd5 mysql-5.0.19.ebuild 888
 SHA256 e4188005b00c8a7678fa48833f6729be1c87009dcdedb8fdfdb4630b62f932f0 mysql-5.0.19.ebuild 888
 MD5 87b9427d9c167a63030973e78ff9976b mysql-5.1.7_beta.ebuild 892
 RMD160 da03dacffef83eedcf5dbcf6902b1c2aa83f10d1 mysql-5.1.7_beta.ebuild 892
 SHA256 e6d9df9b00790ccfc4fb96f2fdac67682d5b8931e6ba9921f8b8010ca62cd6a7 mysql-5.1.7_beta.ebuild 892
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEGxqkKolR564NvWYRAtOEAJ0cE6DTioHwdLasRdONjpDfYaMfLgCfaBCg
-5iZaZLHUHQi1r9hsrJw9X1Y=
-=gKRY
------END PGP SIGNATURE-----
diff --git a/dev-db/mysql/files/digest-mysql-5.0.18-r60 b/dev-db/mysql/files/digest-mysql-5.0.18-r60
index 1cdfff79d680..fc29d583ebd8 100644
--- a/dev-db/mysql/files/digest-mysql-5.0.18-r60
+++ b/dev-db/mysql/files/digest-mysql-5.0.18-r60
@@ -1,6 +1,6 @@
 MD5 f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz 19169082
 RMD160 1987df6d9446637c8e353f61e269e9a57d995803 mysql-5.0.18.tar.gz 19169082
 SHA256 bd3d4b56de636eb14330be20e58f6fc58b015ff9d43926661e2e688ca7b6188a mysql-5.0.18.tar.gz 19169082
-MD5 e47aad78a132dcde074b763c19cb2ac8 mysql-extras-20060304.tar.bz2 78284
-RMD160 1c709ec33758587fb9c6a261dde1d58e1ef5ebc0 mysql-extras-20060304.tar.bz2 78284
-SHA256 92f47ed28745b129b122836546ebda65ae87abcf5b1ca7628f44bcca1ed6af74 mysql-extras-20060304.tar.bz2 78284
+MD5 a986948fcbb3dd9cd5dd8a79289f90ac mysql-extras-20060316.tar.bz2 4719
+RMD160 e4434ee53990bf9622e4a8bdedba63ecad35524e mysql-extras-20060316.tar.bz2 4719
+SHA256 9c5552d40f6ca77ad47f74dd55306ab4d318f24b3f69f2910595b5d480d661d3 mysql-extras-20060316.tar.bz2 4719
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 716e7d4301bd..d8e916e55284 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>mysql</herd>
+<maintainer>
+	<email>mysql_bugs@gentoo.org</email>
+	<description>MySQL herd will not have a mysql@gentoo.org email</description>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql/mysql-5.0.18-r60.ebuild b/dev-db/mysql/mysql-5.0.18-r60.ebuild
index 49dcded76fcc..4d2d37327209 100644
--- a/dev-db/mysql/mysql-5.0.18-r60.ebuild
+++ b/dev-db/mysql/mysql-5.0.18-r60.ebuild
@@ -1,42 +1,9 @@
 # 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-5.0.18-r60.ebuild,v 1.1 2006/03/09 14:00:20 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.18-r60.ebuild,v 1.2 2006/03/18 11:53:53 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 ))
-MY_EXTRAS_VER="20060304"
-
-inherit mysql_fx mysql
+inherit mysql
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-SLOT=0
-
-DEPEND="${DEPEND}
-	>=sys-libs/readline-4.1
-	berkdb? ( 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}