Bug #296186: Revbump with fix to use SHOW GLOBAL STATUS for QPS count, like similar patch in mytop. Upstream no longer maintains mtop, you should probably move to mytop instead.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 75 insertions, 3 deletions

diff --git a/dev-db/mtop/ChangeLog b/dev-db/mtop/ChangeLog
index 0383d9aca640..3bcecf6e76f6 100644
--- a/dev-db/mtop/ChangeLog
+++ b/dev-db/mtop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mtop
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/ChangeLog,v 1.9 2007/02/22 01:06:26 peper Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/ChangeLog,v 1.10 2010/01/31 07:51:18 robbat2 Exp $
+
+*mtop-0.6.6-r1 (31 Jan 2010)
+
+  31 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> +mtop-0.6.6-r1.ebuild,
+  +files/mtop-0.6.6-globalstatusfix.patch:
+  Bug #296186: Revbump with fix to use SHOW GLOBAL STATUS for QPS count,
+  like similar patch in mytop. Upstream no longer maintains mtop, you should
+  probably move to mytop instead.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/dev-db/mtop/Manifest b/dev-db/mtop/Manifest
index eeabcf7c5ac4..3b5305111f06 100644
--- a/dev-db/mtop/Manifest
+++ b/dev-db/mtop/Manifest
@@ -1,4 +1,6 @@
+AUX mtop-0.6.6-globalstatusfix.patch 623 RMD160 6c7695fe799fbeeb9e82b6532f5458a0dd501088 SHA1 0fe334f1e7d48a45a0778d242b540d38e6ea270f SHA256 a0c8f0a644b1b6d87c2bd172b03c7bc63a96134f291991b9a953811bb3d27f1f
 DIST mtop-0.6.6.tar.gz 48161 RMD160 0db07a98cfa412de543dfda3404259dbb52be39c SHA1 f22fd1972c64f11c0877fe46f1f03cc39ee79bfd SHA256 2e7fc09511d2d0f130da1f52bf85fcfeea0be2cc3aa3d93b88498605c0281d74
+EBUILD mtop-0.6.6-r1.ebuild 1129 RMD160 ad42cc8500a25776c88acb9bf696d5f632537357 SHA1 968ba3ccbf0585c12cd93e0a5a828c3e3539e45b SHA256 042d4c38f32fc1a746d40220fd8674726b35bc05da2133a70668d989ea85efa7
 EBUILD mtop-0.6.6.ebuild 842 RMD160 e20bead207a196ddea5fcbb1b109cdcfe1b9ac7c SHA1 8f54018a7fd087abf3961d316fc354f80f8555a2 SHA256 de6bc1bc9863c6f211676714a359273ae8f4e88b534c8c1448b61a5131f85609
-MISC ChangeLog 994 RMD160 f9f56e892169bd99a6f17db407cdc3e0dc59b96c SHA1 adb94e0dd25db258135d66f3ecbdb668d831fcc5 SHA256 57ab5e2f7191da72c045b2ca616b29db801984f3d98fbb8a5e1ff3f8c93abfba
+MISC ChangeLog 1331 RMD160 ae7d71fac4eb3e5d16b4d8e3458a540d9fcac524 SHA1 49603a6a85f3b50d636b8426b8ca887f25569966 SHA256 1f13f17b0da7b5765946b7ea346ba58359f681c02e91121ef9d5709816fb6b4b
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
diff --git a/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch b/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch
new file mode 100644
index 000000000000..1d10acc42a99
--- /dev/null
+++ b/dev-db/mtop/files/mtop-0.6.6-globalstatusfix.patch
@@ -0,0 +1,12 @@
+diff -ur mtop-0.6.6/work/mtop-0.6.6/mtop.PL mtop-0.6.6-r1/work/mtop-0.6.6/mtop.PL
+--- mtop-0.6.6/work/mtop-0.6.6/mtop.PL	2004-09-13 00:22:03.000000000 +0200
++++ mtop-0.6.6-r1/work/mtop-0.6.6/mtop.PL	2009-12-08 15:04:56.000000000 +0100
+@@ -568,7 +568,7 @@
+     die "Unable to connect to mysql [", $DBI::errstr, "]\n";
+ 
+ my $st_procs   = $dbh->prepare("show full processlist");
+-my $st_status  = $dbh->prepare("show status");
++my $st_status  = $dbh->prepare("show global status");
+ my $st_kill    = $dbh->prepare("kill ?");
+ my $st_flush   = $dbh->prepare("flush status");
+ my $st_vars    = $dbh->prepare("show variables");
diff --git a/dev-db/mtop/mtop-0.6.6-r1.ebuild b/dev-db/mtop/mtop-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..cab5793e6105
--- /dev/null
+++ b/dev-db/mtop/mtop-0.6.6-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/mtop-0.6.6-r1.ebuild,v 1.1 2010/01/31 07:51:18 robbat2 Exp $
+
+EAPI=2
+inherit perl-app
+
+DESCRIPTION="Mysql top monitors a MySQL server"
+HOMEPAGE="http://mtop.sourceforge.net"
+SRC_URI="mirror://sourceforge/mtop/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND="dev-perl/Curses
+		dev-perl/DBI
+		dev-perl/DBD-mysql
+		virtual/perl-libnet"
+
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}"/mtop-0.6.6-globalstatusfix.patch
+}
+
+src_prepare() {
+	perl-app_src_prep || die "Perl module preparation failed."
+}
+
+src_compile() {
+	perl-app_src_compile || die "Perl module compilation failed."
+}
+
+src_test() {
+	perl-module_src_test || die "Perl module tests failed."
+}
+
+src_install() {
+	perl-module_src_install || die "Perl module installation failed."
+	dodoc ChangeLog COPYING README README.devel
+}
+
+warnmsg() {
+	einfo "Upstream no longer maintains mtop. You should consider dev-db/mytop instead."
+}
+pkg_postinst() {
+	warnmsg
+}
+pkg_preinst() {
+	warnmsg
+}