Version bump, bug 341539. Fix dependencies.

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

3 files changed, 127 insertions, 9 deletions

diff --git a/dev-db/maatkit/ChangeLog b/dev-db/maatkit/ChangeLog
index 9696249abfa2..896e85943790 100644
--- a/dev-db/maatkit/ChangeLog
+++ b/dev-db/maatkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/maatkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/ChangeLog,v 1.13 2010/11/17 18:03:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/maatkit/ChangeLog,v 1.14 2010/11/17 19:57:34 idl0r Exp $
+
+*maatkit-7041 (17 Nov 2010)
+
+  17 Nov 2010; Christian Ruppert <idl0r@gentoo.org> +maatkit-7041.ebuild:
+  Version bump, bug 341539. Fix dependencies.
 
   17 Nov 2010; Christian Ruppert <idl0r@gentoo.org> maatkit-6070.ebuild:
   Respect LDFLAGS whith use "udf", bug 345809.
diff --git a/dev-db/maatkit/Manifest b/dev-db/maatkit/Manifest
index a35772f7a034..81a6eb1cad5e 100644
--- a/dev-db/maatkit/Manifest
+++ b/dev-db/maatkit/Manifest
@@ -4,19 +4,21 @@ 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
 EBUILD maatkit-5014.ebuild 2452 RMD160 d6dfab2700adb1e091b24513d2be55501f20ee5f SHA1 4e1bff430116293053de0fb0ba35e578b742a548 SHA256 c35ac02e00b107e3a7be2d8d36556f78c3560fe8bfc1ef19ea55cd326bbad5ec
 EBUILD maatkit-5240.ebuild 2485 RMD160 d7b5ee74593ddf23ac903096a266e0ed6d47bd51 SHA1 c28cbe9776c27dbe830b967d9d77b79bcf8ee605 SHA256 689288635d04386f566a20edbdc033937bcda8c8f1a6137c92820a101d865ed2
 EBUILD maatkit-6070.ebuild 2487 RMD160 772aa1bcf62e9381fe6ecbf21b27180c45eb6b27 SHA1 8f0c11b4fb0b373b72791e17f0730082802c4cf8 SHA256 19bb9cb44f17ed6011f0cf3836b31b3bb0b2f5e4e59e2378c41e8dbe3689b826
-MISC ChangeLog 1940 RMD160 e16507cc2a2bdb2b55e306188218636bc7644359 SHA1 eb3c5a3cd5d6a66c0a0da90886d8ba0b3b2f20cd SHA256 768e97f3cd083f160f0d1bc2459c278315b1b3a20239af66ac4595056541ef5a
+EBUILD maatkit-7041.ebuild 2765 RMD160 fb841eb2112d6a67e85b7ae64fcb79d47f5f0140 SHA1 17373fe909a0435ebc08f2ac8f5aa6140516665c SHA256 2ec1b0c369b2752b39539d1d0352eab179463b428dcba7e18073db25a34c6182
+MISC ChangeLog 2090 RMD160 d55d3250db4a60a7a7ffb4c920f44974e802d316 SHA1 56fe46c4d9cb37762c2cbb77128c1cf78e3d2359 SHA256 075e6a938b13fe2d41e11376467675235e4acd98fe6e05a79f9e1dac3add9576
 MISC metadata.xml 749 RMD160 f8ade3452970966160d4761c6eeae9a8de1f3b3a SHA1 f33c8cc4c15437ae49166e59fb259e1b7652a3dc SHA256 a0b3078abd49c59e4884e440153c6e989c26c98806256a9ff0ec9f7c2d5e1754
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBCAAGBQJM5BkKAAoJEMOx0zmdw4Z1mJ0IAK3g+EnMUit9hewnvSFtIh2o
-zUpvqFjKpKV44frzf+obULErVFROp0Ts1an7ci34dpDFaB4WfzhmrT9inZDS8vMr
-O59vNTZ46DKI9on9o3ye9vqr4OTrvr+CNmlZu1Sp0pkq25abkzNDE8N3DWwU22Gr
-GHmhGsbT/ofHhaKgvht9v9iBYTJQIiKLsB+kU/CyyNp3Aq6y4WBIDFpdHqLnKw0c
-fnE9cIKrK6nj0csQA+aXZLDEWzMBhAYhvBpCUJnooWFXtHPqkBE/i/UzWRskun/c
-bFhsawuS/2gX0cdZYS5CzAu++qtoPTSKLXM6k1LjEIvbLw+dUFg1bdfIS+i4QY4=
-=yzR+
+iQEcBAEBCAAGBQJM5DO0AAoJEMOx0zmdw4Z1pVEH/30b+TDZPB2wxDRo7MzlKieq
+SH3D/kNMDamjj0mSpze/s32j5YjHGHGkc28VtL6Wwkh+iRtSUaopJUgv0oJpAlvI
+7i8RY3xkxzKvcYfEDiEzkLXlJZxB3Tbr9Wmd3GThxTqiIs2Ef+d1vVsUA3HOPFfz
+yhx9mCJaSwalsFAiWqv2mgPeC3BJxNA65q55zz0d+oclwkcZKtkYp5S1KAh7JjZC
+JmVpaxYnSuqg4KBCmZm1KzBeFm7mjuihsuU2aQFmccFmrUJdMhnD/36QQRjiAuhY
+hTDjE1/dXucYEyjfnQemFLJT0IvfKvbffIlw//m5EbVz1QLW0UmWJ9YR3wd4d2g=
+=mSvP
 -----END PGP SIGNATURE-----
diff --git a/dev-db/maatkit/maatkit-7041.ebuild b/dev-db/maatkit/maatkit-7041.ebuild
new file mode 100644
index 000000000000..8aac96adf055
--- /dev/null
+++ b/dev-db/maatkit/maatkit-7041.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 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.1 2010/11/17 19:57:34 idl0r Exp $
+
+EAPI=3
+
+inherit perl-app perl-module toolchain-funcs
+
+DESCRIPTION="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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="udf"
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Time-HiRes
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	udf? ( dev-db/mysql )
+	virtual/perl-ExtUtils-MakeMaker"
+
+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 udfext udffile udfoutpath
+	udfname="${1}"
+	udfext=".so"
+	udffile="${udfname}${udfext}"
+	udfoutpath="${udfdir}/${udffile}"
+	insinto /usr/$(get_libdir)/mysql/plugins
+	doins "${udfoutpath}" || die
+}
+
+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
+}