Had a bug in the first edition of the patch, roll out a new revision instead.

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

4 files changed, 32 insertions, 13 deletions

diff --git a/dev-db/mytop/ChangeLog b/dev-db/mytop/ChangeLog
index be7eebeef3da..99c18e0bb9f7 100644
--- a/dev-db/mytop/ChangeLog
+++ b/dev-db/mytop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mytop
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.19 2009/02/13 22:09:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.20 2009/02/15 01:38:59 robbat2 Exp $
+
+*mytop-1.6-r2 (15 Feb 2009)
+
+  15 Feb 2009; Robin H. Johnson <robbat2@gentoo.org>
+  files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch,
+  -mytop-1.6-r1.ebuild, +mytop-1.6-r2.ebuild:
+  Had a bug in the first edition of the patch, roll out a new revision
+  instead.
 
 *mytop-1.6-r1 (13 Feb 2009)
 
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 957b21e3523a..eca7beda4749 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,9 +1,9 @@
 AUX mytop-1.6-global-status.patch 3694 RMD160 ce80216e38fd4f877ca2d3d0ad9505359fbc1f4a SHA1 75994e7a85f1ec617fea7212760019b84ae92aee SHA256 ebdbed74ed25213c2be00b86836ba38a45d84e721b60f3f97302fb3b646d1b06
-AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3056 RMD160 c45bdf0885ce234db90d69e979e0923467899fa6 SHA1 883d05dbb3bd131749ee4fc852b8eaedadc1ddb2 SHA256 31618f03b1eb2d8deaacdc44835bd460faaf4815e654a13e5a82f05e855b80c7
+AUX mytop-1.6-queries-vs-questions-mysql-5.0.76.patch 3365 RMD160 c2da09ca23043bdd9a7e0f618a3e7e19a4e9bfba SHA1 64e98e2ab44d97d78a44512a46877f436b4f8c12 SHA256 9ef308336a3cc51721456822d29fb91734e66f75efd3293038b42f0806820297
 DIST mytop-1.4.tar.gz 18723 RMD160 727f28da3ee440bcec2d950370a16af92e46c105 SHA1 a4629403a3c73287d43d1fb2ed0a3362fccb2e43 SHA256 0ac19a2cd16b4a25d0741c1cee9b056557aea18bb617edd9329a0b78927049dc
 DIST mytop-1.6.tar.gz 19720 RMD160 d2ff40b75c33d09d7cd14602fc78952ca52f8dab SHA1 e1485115ca3a15e79f7811bdc1cfe692aa95833f SHA256 b17c702598b10bb0ce2695f609122637c799eaaaec1afaa73246b048f07be9bd
 EBUILD mytop-1.4.ebuild 770 RMD160 d9d2c96f1c23dce2d2198ed268ffedb273d24425 SHA1 3c4d3334f54d90f97ef2661ed1b98f5eb5c37cab SHA256 1d30811b62f53b6f0233ea05506d12c5b590bdfc4326695a6084e4849c1f724f
-EBUILD mytop-1.6-r1.ebuild 888 RMD160 2e958d08f9f594e7bcf53d2649243e170d0662b9 SHA1 3e56a99186f7d923737d38229a294bf382410a32 SHA256 4b3823a054656d86ce077d12c64283f95f700b29f4f79ec526ed3e8c9a003857
+EBUILD mytop-1.6-r2.ebuild 888 RMD160 d088e2b703f99e815974d126d936272f01fd137f SHA1 292da47ab4800c4bd6f7af2792da1df7ac68a88e SHA256 c765967591f4cc02e8fbf94dd237226db6de6698766dc24d1fcf457b7d3f3af8
 EBUILD mytop-1.6.ebuild 769 RMD160 6b1fcb49c51d4a24a5b74271173f6da41cdf7247 SHA1 c4e5df25461b3feb919edaad60bd8293cdf79ffb SHA256 58cbb9875e1a1a7923583d10d2e62a17f41bf3ee34f60f3b6044d08ce0a86357
-MISC ChangeLog 2433 RMD160 63621d5bc0157fce3a3c31abf32df56c704bed3e SHA1 2fe97711c4b1b923b2210ee4f9bc641f671e1f26 SHA256 22965722e169619f778ce02873a71e47211201111a5d8b278b923cbc73a4a008
+MISC ChangeLog 2703 RMD160 800ab4eeb92752df9391b647791f131a475c8ada SHA1 ff69504b4165958814d96e579c4a613c84e4a953 SHA256 fda5c16185b039dc4a83970c5a155c81469f95faf781a44239d6a8bca782d68e
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
diff --git a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch b/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch
index 85e33fccd952..f1e139fe7471 100644
--- a/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch
+++ b/dev-db/mytop/files/mytop-1.6-queries-vs-questions-mysql-5.0.76.patch
@@ -10,21 +10,32 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
 MySQL-Bug: 41131
 MySQL-Bug-URL: http://bugs.mysql.com/?id=41131
 
+====
+Revision 2:
+The first revision missed changing the instances of $OLD_STATUS{Questions}.
+
 diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop
---- mytop-1.6.orig/mytop	2009-02-13 13:59:43.882787823 -0800
-+++ mytop-1.6/mytop	2009-02-13 14:03:54.749418810 -0800
-@@ -800,8 +800,8 @@
+--- mytop-1.6.orig/mytop	2009-02-14 17:28:38.696187159 -0800
++++ mytop-1.6/mytop	2009-02-14 17:36:31.192890507 -0800
+@@ -800,8 +800,15 @@
  
          ## Queries per second...
  
 -        my $avg_queries_per_sec  = sprintf("%.2f", $STATUS{Questions} / $STATUS{Uptime});
 -        my $num_queries          = $STATUS{Questions};
-+		my $num_queries = defined($STATUS{Queries}) ? $STATUS{Queries} : $STATUS{Questions};
++        my ($num_queries, $old_num_queries);
++        if(defined($STATUS{Queries})) {
++            $num_queries = $STATUS{Queries};
++            $old_num_queries = $OLD_STATUS{Queries};
++        } else {
++            $num_queries = $STATUS{Questions};
++            $old_num_queries = $OLD_STATUS{Questions};
++        }
 +        my $avg_queries_per_sec  = sprintf("%.2f", $num_queries / $STATUS{Uptime});
  
          my @t = localtime(time);
  
-@@ -820,25 +820,25 @@
+@@ -820,25 +827,25 @@
  
  
          printf " Queries: %-5s  qps: %4.0f Slow: %7s         Se/In/Up/De(%%):    %02.0f/%02.0f/%02.0f/%02.0f \n",
@@ -50,12 +61,12 @@ diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop
          {
 -          my $q_diff = ( $STATUS{Questions} - $OLD_STATUS{Questions} );
 -#          print("q_diff: $STATUS{Questions} - $OLD_STATUS{Questions}  / $t_delta = $q_diff\n");
-+          my $q_diff = ( $num_queries - $OLD_STATUS{Questions} );
-+#          print("q_diff: $num_queries - $OLD_STATUS{Questions}  / $t_delta = $q_diff\n");
++          my $q_diff = ( $num_queries - $old_num_queries );
++#          print("q_diff: $num_queries - $old_num_queries  / $t_delta = $q_diff\n");
  
            printf("             qps now: %4.0f Slow qps: %3.1f  Threads: %4.0f (%4.0f/%4.0f) %02.0f/%02.0f/%02.0f/%02.0f \n",
 -                 ( $STATUS{Questions} - $OLD_STATUS{Questions} ) / $t_delta,
-+                 ( $num_queries - $OLD_STATUS{Questions} ) / $t_delta,
++                 ( $num_queries - $old_num_queries ) / $t_delta,
                   ( # slow now (qps)
                    ($STATUS{Slow_queries} ) ?
                    ( $STATUS{Slow_queries} - $OLD_STATUS{Slow_queries} ) / $t_delta :
diff --git a/dev-db/mytop/mytop-1.6-r1.ebuild b/dev-db/mytop/mytop-1.6-r2.ebuild
index 8ccb7f4a695b..98137f61d663 100644
--- a/dev-db/mytop/mytop-1.6-r1.ebuild
+++ b/dev-db/mytop/mytop-1.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r1.ebuild,v 1.1 2009/02/13 22:09:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.6-r2.ebuild,v 1.1 2009/02/15 01:38:59 robbat2 Exp $
 
 inherit perl-app