Version bump, bug 374231. Add myself as secondary maintainer.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

7 files changed, 38 insertions, 328 deletions

diff --git a/dev-db/maatkit/ChangeLog b/dev-db/maatkit/ChangeLog
index 7a9b80a3bdc1..6e171436fdf2 100644
--- a/dev-db/maatkit/ChangeLog
+++ b/dev-db/maatkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/maatkit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/ChangeLog,v 1.21 2011/05/10 13:22:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/ChangeLog,v 1.22 2011/07/06 16:51:45 idl0r Exp $
+
+*maatkit-7540 (06 Jul 2011)
+
+  06 Jul 2011; Christian Ruppert <idl0r@gentoo.org> -maatkit-5014.ebuild,
+  -maatkit-5240.ebuild, -maatkit-6070.ebuild, -maatkit-7041.ebuild,
+  +maatkit-7540.ebuild, metadata.xml:
+  Version bump, bug 374231. Add myself as secondary maintainer.
 
   10 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> maatkit-7207.ebuild:
   x86 stable wrt bug #363245
diff --git a/dev-db/maatkit/Manifest b/dev-db/maatkit/Manifest
index c8c88da34554..962dd7ae7d7c 100644
--- a/dev-db/maatkit/Manifest
+++ b/dev-db/maatkit/Manifest
@@ -1,22 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST maatkit-5014.tar.gz 822002 RMD160 15666ea848147d00f2ce0b82462aded307b44706 SHA1 a422650b52f03922ce8ffcd4d158a989f3b07a00 SHA256 6cd39c5d8e56e54fa3627aea8cd9be8c49ee00537fe7493bbae1318af5e3ff18
-DIST maatkit-5240.tar.gz 837523 RMD160 a2d8f04da22da9f0be47aacb5a7e15e22cabaeb0 SHA1 b53ba4cc63d0a62eb92735e6fb617289fdc38946 SHA256 2e251dff39f2117ebdbc6acf2ee8eacacf41cbdc411a56ed266e429e26d279aa
-DIST maatkit-6070.tar.gz 892329 RMD160 660795f9c3b0fc9c3007665f2214b7e6e6013c79 SHA1 e29b6d7e83da1902a085af1b5ade9a3d9d45a770 SHA256 51875b604007c0a2516aae8ede1d50b0f528c1a8a4965231eaac6ed4245b0637
-DIST maatkit-7041.tar.gz 1143373 RMD160 9eb34d16dd3c4c5b25435c60fac5d3e3e8952bf7 SHA1 d27e8e625e02f9b55ab0f75c671abdb650455f9b SHA256 1eaa6230feaab851f9a115c9945bfcb55252a07942dcb309240c34d9a73eaf3c
 DIST maatkit-7207.tar.gz 1194909 RMD160 6dae85423c29cbd73fd612afa206d1f0d94f791f SHA1 9bf98ed03444830a1259f840647ea2229bac711e SHA256 f1cdb59d8c06b9f172a49094f02d263f08ae3716d010b88c55ec16e484f9a498
-EBUILD maatkit-5014.ebuild 2444 RMD160 79d5ff4df4e869312242e32283fc5104e3c65ea1 SHA1 2928ce8fd932d73eea4c3ff1cd8625e1a79728e3 SHA256 a91ed8259a6f412056de11676b46bbbeb810db9d07fa6770558728f8af40231c
-EBUILD maatkit-5240.ebuild 2477 RMD160 2cff8a85d1edafd17ed2f99736c490b2fded8e0d SHA1 776b5a2ef13bcccc15d0442495457fd151bc8920 SHA256 a34fd642c03f045d1f304fa2a2079ba95593ce7562c4e35b69d42cf9f6f91696
-EBUILD maatkit-6070.ebuild 2480 RMD160 b591b0c959a79e6c75282d16e4b494ca17fd5e8c SHA1 4d21f47f9fcac44d4888b3bfde9c65b9ee353fb5 SHA256 d5b55eb0c1bc6acf5b7da7304a4c05cbc9b5a0288b080956da7b3ea87d6431b7
-EBUILD maatkit-7041.ebuild 2760 RMD160 36ba40875199043dacb735912bed703a43f8c264 SHA1 197d254386fc237abf7ae780d3f02f106464f92b SHA256 c0a8bbc163e2cbe59209dad53291b2114237bdb947485e0f5e039d860a4dafa1
+DIST maatkit-7540.tar.gz 1312812 RMD160 e353e11daca259c6990dfc3af02f12579b8f7064 SHA1 206f50a29ad7bf6a37e24b8e72a12331895b60aa SHA256 618b8ba8f8df1c8ac04d127986a7bb6a834643523000c9c5ea4ee7d95aeef9a8
 EBUILD maatkit-7207.ebuild 2761 RMD160 9a631ff33d7ae9bb479896e84f483f583c7f4949 SHA1 877179614429126abf01f325b098fe03ac89eef4 SHA256 e2375da0d46572500f3ceba2ac9894787fea65e340878483635b341f417a6e28
-MISC ChangeLog 2912 RMD160 e3d9dc91b0a5bae1607896b14ef691243d25c670 SHA1 c56d587f44a45ad7950a31ff0e87bd6e9c5ddc1d SHA256 34974a46a4fc238c66391573c5ad66f863cc7ea3aa208030871d1ee6dab59fb9
-MISC metadata.xml 749 RMD160 f8ade3452970966160d4761c6eeae9a8de1f3b3a SHA1 f33c8cc4c15437ae49166e59fb259e1b7652a3dc SHA256 a0b3078abd49c59e4884e440153c6e989c26c98806256a9ff0ec9f7c2d5e1754
+EBUILD maatkit-7540.ebuild 2790 RMD160 9247d34e340bcddf9ef66f463e6eca98470d01e5 SHA1 0c74cb2720acf1d7502cc7deb1d7722abaa08b51 SHA256 100039778ef83a68032000d45f9cc5b3adb943072ce516601382bd9bc31808b5
+MISC ChangeLog 3181 RMD160 de854eda971dd0f4052417ae5cc51d53bc547199 SHA1 27c01b6dbca276093e788ee173ffb6d9a552f55a SHA256 f692f86ecdb8f1c9c0bf98de092f1703002e784f38565609fc3f0bf035d3336d
+MISC metadata.xml 904 RMD160 6d0c11ecb98c97713086b035b3371a5eb309af9f SHA1 66e4a29fec0afc40d9c7b92ae19b4caf16069f1b SHA256 b13210a7e734222b72b99355591d9d2dae2b8cb2efacdffe5190f99fb15dd1ff
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3JPBoACgkQuUQtlDBCeQIf9QCeLK14eGGhXVgx9HZdoT+JFWNk
-t0kAn0Z0gEJNHg8KT+i7f1AfAPgX64Dh
-=LgY7
+iQEcBAEBCAAGBQJOFJKmAAoJEMOx0zmdw4Z1j4YH/0W5jNb5CYujuHchSJKJpkYZ
+C/kSkvtCzSkvNwufq8qLnuTHgLkIBL6H0sR7dHlcH454zfvHbKlVxHNsYPi4iZ2t
+AqFNRlErVYdIm64YljC2u4AHfKN0/QpWtetujOoyhKTNJJrshzGMV/LtjWn1wsT5
+PxDuLYOASvmBa+9dE7yK4aJMuHrwG4Pyqdws1qR7rNthDN4nuFWIHIaPdHflygH3
+Wvyx58TOf2O/HQI8uEacbkOOaNdNghb7DuzsYU36QLeqPpqVvbrGYVFSbxEqSmJd
+AKC914FMpr5P97Lul9/+mlkgT7zIifDAoNqZRWZ5qvSrLVB1q26l2FekxgUD534=
+=kDoO
 -----END PGP SIGNATURE-----
diff --git a/dev-db/maatkit/maatkit-5014.ebuild b/dev-db/maatkit/maatkit-5014.ebuild
deleted file mode 100644
index 54e4db3f4938..000000000000
--- a/dev-db/maatkit/maatkit-5014.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/maatkit-5014.ebuild,v 1.2 2011/04/25 14:58:42 armin76 Exp $
-
-EAPI=2
-inherit perl-app toolchain-funcs
-
-DESCRIPTION="maatkit: essential command-line utilities for MySQL"
-HOMEPAGE="http://www.maatkit.org/"
-SRC_URI="http://maatkit.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="udf"
-
-DEPEND="dev-perl/DBD-mysql
-		dev-perl/TermReadKey
-		udf? ( dev-db/mysql[-minimal] )"
-RDEPEND="${DEPEND}"
-
-mysql-udf_src_compile() {
-	local udfdir="${T}/udf/"
-	mkdir -p "${udfdir}"
-
-	local udfname udffile udfext udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	shift
-	CXX="$(tc-getCXX)"
-	local src="$@"
-	if [ -z "$@" ]; then
-		src="${udfname}.cc"
-	fi
-	for f in ${src} ; do
-		[ -f "${f}" ] || \
-			die "UDF ${udfname}: Cannot find source file ${f} to compile"
-	done
-	einfo "UDF ${udfname}: compiling from ${src}"
-	${CXX} \
-		${CXXFLAGS} -fPIC \
-		-I/usr/include/mysql \
-		-shared -o "${udfoutpath}" \
-		$src \
-		|| die "UDF ${udfname}: Failed to compile"
-}
-
-mysql-udf_src_install() {
-	local udfdir="${T}/udf/"
-	local udfname udffile udfext udffile udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	insinto /usr/$(get_libdir)/mysql/plugins
-	doins "${udfoutpath}"
-}
-
-udf_done_intro=0
-mysql-udf_pkg_postinst() {
-	local udfname udffile udfext udffunc udfreturn
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udffunc="${2}"
-	udfreturn="${3}"
-	if [ ${udf_done_intro} -eq 0 ]; then
-		elog "To use the UDFs that were built:"
-		elog "Update your configuration to include 'plugin_dir=/usr/$(get_libdir)/mysql/plugins'"
-		elog "Issue the following commands as a user with FUNCTION privileges:"
-		udf_done_intro=1
-	fi
-	elog "CREATE FUNCTION ${udffunc} RETURNS ${udfreturn} SONAME '${udffile}'"
-}
-
-src_compile() {
-	perl-app_src_compile
-	if use udf; then
-		cd "${S}"/udf
-		mysql-udf_src_compile murmur_udf
-		mysql-udf_src_compile fnv_udf
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use udf; then
-		mysql-udf_src_install murmur_udf
-		mysql-udf_src_install fnv_udf
-	fi
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	if use udf; then
-		mysql-udf_pkg_postinst murmur_udf murmur_hash INTEGER
-		mysql-udf_pkg_postinst fnv_udf fnv_64 INTEGER
-	fi
-}
diff --git a/dev-db/maatkit/maatkit-5240.ebuild b/dev-db/maatkit/maatkit-5240.ebuild
deleted file mode 100644
index 4bc00ee42bb8..000000000000
--- a/dev-db/maatkit/maatkit-5240.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/maatkit-5240.ebuild,v 1.5 2011/04/25 14:58:42 armin76 Exp $
-
-EAPI=2
-inherit perl-app toolchain-funcs
-
-DESCRIPTION="maatkit: essential command-line utilities for MySQL"
-HOMEPAGE="http://www.maatkit.org/"
-SRC_URI="http://maatkit.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="udf"
-
-DEPEND="dev-perl/DBD-mysql
-		dev-perl/TermReadKey
-		udf? ( dev-db/mysql[-minimal] )"
-RDEPEND="${DEPEND}"
-
-mysql-udf_src_compile() {
-	local udfdir="${T}/udf/"
-	mkdir -p "${udfdir}"
-
-	local udfname udffile udfext udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	shift
-	CXX="$(tc-getCXX)"
-	local src="$@"
-	if [ -z "$@" ]; then
-		src="${udfname}.cc"
-	fi
-	for f in ${src} ; do
-		[ -f "${f}" ] || \
-			die "UDF ${udfname}: Cannot find source file ${f} to compile"
-	done
-	einfo "UDF ${udfname}: compiling from ${src}"
-	${CXX} \
-		${CXXFLAGS} -fPIC \
-		-I/usr/include/mysql \
-		-shared -o "${udfoutpath}" \
-		$src \
-		|| die "UDF ${udfname}: Failed to compile"
-}
-
-mysql-udf_src_install() {
-	local udfdir="${T}/udf/"
-	local udfname udffile udfext udffile udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	insinto /usr/$(get_libdir)/mysql/plugins
-	doins "${udfoutpath}"
-}
-
-udf_done_intro=0
-mysql-udf_pkg_postinst() {
-	local udfname udffile udfext udffunc udfreturn
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udffunc="${2}"
-	udfreturn="${3}"
-	if [ ${udf_done_intro} -eq 0 ]; then
-		elog "To use the UDFs that were built:"
-		elog "Update your configuration to include 'plugin_dir=/usr/$(get_libdir)/mysql/plugins'"
-		elog "Issue the following commands as a user with FUNCTION privileges:"
-		udf_done_intro=1
-	fi
-	elog "CREATE FUNCTION ${udffunc} RETURNS ${udfreturn} SONAME '${udffile}'"
-}
-
-src_compile() {
-	perl-app_src_compile
-	if use udf; then
-		cd "${S}"/udf
-		mysql-udf_src_compile murmur_udf
-		mysql-udf_src_compile fnv_udf
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use udf; then
-		mysql-udf_src_install murmur_udf
-		mysql-udf_src_install fnv_udf
-	fi
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	if use udf; then
-		mysql-udf_pkg_postinst murmur_udf murmur_hash INTEGER
-		mysql-udf_pkg_postinst fnv_udf fnv_64 INTEGER
-	fi
-}
diff --git a/dev-db/maatkit/maatkit-6070.ebuild b/dev-db/maatkit/maatkit-6070.ebuild
deleted file mode 100644
index 8bac2c775fb8..000000000000
--- a/dev-db/maatkit/maatkit-6070.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/maatkit-6070.ebuild,v 1.6 2011/04/25 14:58:42 armin76 Exp $
-
-EAPI=2
-inherit perl-app toolchain-funcs
-
-DESCRIPTION="maatkit: essential command-line utilities for MySQL"
-HOMEPAGE="http://www.maatkit.org/"
-SRC_URI="http://maatkit.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="udf"
-
-DEPEND="dev-perl/DBD-mysql
-		dev-perl/TermReadKey
-		udf? ( dev-db/mysql[-minimal] )"
-RDEPEND="${DEPEND}"
-
-mysql-udf_src_compile() {
-	local udfdir="${T}/udf/"
-	mkdir -p "${udfdir}"
-
-	local udfname udffile udfext udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	shift
-	CXX="$(tc-getCXX)"
-	local src="$@"
-	if [ -z "$@" ]; then
-		src="${udfname}.cc"
-	fi
-	for f in ${src} ; do
-		[ -f "${f}" ] || \
-			die "UDF ${udfname}: Cannot find source file ${f} to compile"
-	done
-	einfo "UDF ${udfname}: compiling from ${src}"
-	${CXX} \
-		${CXXFLAGS} -I/usr/include/mysql \
-		${LDFLAGS} -fPIC -shared -o "${udfoutpath}" $src \
-		|| die "UDF ${udfname}: Failed to compile"
-}
-
-mysql-udf_src_install() {
-	local udfdir="${T}/udf/"
-	local udfname udffile udfext udffile udfoutpath
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udfoutpath="${udfdir}/${udffile}"
-	insinto /usr/$(get_libdir)/mysql/plugins
-	doins "${udfoutpath}"
-}
-
-udf_done_intro=0
-mysql-udf_pkg_postinst() {
-	local udfname udffile udfext udffunc udfreturn
-	udfname="${1}"
-	udfext=".so"
-	udffile="${udfname}${udfext}"
-	udffunc="${2}"
-	udfreturn="${3}"
-	if [ ${udf_done_intro} -eq 0 ]; then
-		elog "To use the UDFs that were built:"
-		elog "Update your configuration to include 'plugin_dir=/usr/$(get_libdir)/mysql/plugins'"
-		elog "Issue the following commands as a user with FUNCTION privileges:"
-		udf_done_intro=1
-	fi
-	elog "CREATE FUNCTION ${udffunc} RETURNS ${udfreturn} SONAME '${udffile}'"
-}
-
-src_compile() {
-	perl-app_src_compile
-	if use udf; then
-		cd "${S}"/udf
-		mysql-udf_src_compile murmur_udf
-		mysql-udf_src_compile fnv_udf
-	fi
-}
-
-src_install() {
-	perl-module_src_install
-	if use udf; then
-		mysql-udf_src_install murmur_udf
-		mysql-udf_src_install fnv_udf
-	fi
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	if use udf; then
-		mysql-udf_pkg_postinst murmur_udf murmur_hash INTEGER
-		mysql-udf_pkg_postinst fnv_udf fnv_64 INTEGER
-	fi
-}
diff --git a/dev-db/maatkit/maatkit-7041.ebuild b/dev-db/maatkit/maatkit-7540.ebuild
index eeaca4ea4f77..6953a9ecc5a3 100644
--- a/dev-db/maatkit/maatkit-7041.ebuild
+++ b/dev-db/maatkit/maatkit-7540.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/maatkit-7041.ebuild,v 1.2 2011/04/25 14:58:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/maatkit-7540.ebuild,v 1.1 2011/07/06 16:51:45 idl0r Exp $
 
 EAPI=3
 
@@ -26,6 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/perl-File-Temp
 	virtual/perl-File-Spec
 	virtual/perl-Time-HiRes
+	virtual/perl-Scalar-List-Utils
 	dev-perl/TermReadKey"
 DEPEND="${COMMON_DEPEND}
 	udf? ( dev-db/mysql )
diff --git a/dev-db/maatkit/metadata.xml b/dev-db/maatkit/metadata.xml
index 65d37298016b..274d3e58184b 100644
--- a/dev-db/maatkit/metadata.xml
+++ b/dev-db/maatkit/metadata.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>wschlich@gentoo.org</email>
-	<name>Wolfram Schlich</name>
-	<description>Primary maintainer</description>
-</maintainer>
-<longdescription>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>wschlich@gentoo.org</email>
+		<name>Wolfram Schlich</name>
+		<description>Primary maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>idl0r@gentoo.org</email>
+		<name>Christian Ruppert</name>
+		<description>Secondary maintainer</description>
+	</maintainer>
+	<longdescription>
 maatkit, formerly MySQL Toolkit, is a collection of command-line utilities that
 provide missing functionality for MySQL. Some of the tools implement lacking
 server functionality, such as online consistency checks for master/slave
 replication; others are client-side utilities such as a query profiler.
-</longdescription>
-<use>
-  <flag name='udf'>Build the MySQL UDFs shipped with maatkit, requires non-minimal MySQL</flag>
- </use>
+	</longdescription>
+	<use>
+		<flag name="udf">Build the MySQL UDFs shipped with maatkit, requires non-minimal MySQL</flag>
+	</use>
 </pkgmetadata>