Bug #265488 - Getopt-Long is stricter in the new version than it used to be.

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

4 files changed, 57 insertions, 2 deletions

diff --git a/dev-db/mytop/ChangeLog b/dev-db/mytop/ChangeLog
index 99c18e0bb9f7..ccdaf29c448c 100644
--- a/dev-db/mytop/ChangeLog
+++ b/dev-db/mytop/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2009/02/15 01:38:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.21 2009/04/10 07:54:15 robbat2 Exp $
+
+*mytop-1.6-r3 (10 Apr 2009)
+
+  10 Apr 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mytop-1.6-getopt-long-2.38-fixup.patch, +mytop-1.6-r3.ebuild:
+  Bug #265488 - Getopt-Long is stricter in the new version than it used to
+  be.
 
 *mytop-1.6-r2 (15 Feb 2009)
 
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index eca7beda4749..294b5052bb27 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,9 +1,11 @@
+AUX mytop-1.6-getopt-long-2.38-fixup.patch 578 RMD160 db017273c0a7f3dc9bff82ab615f2372e471ab53 SHA1 a79f73f5211151ec3b145921f01d75c8167ac12f SHA256 62ccc268d4e04d2476c817e591bcac91c849e08459cf964a4a1724cabbe4fc8a
 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 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-r2.ebuild 888 RMD160 d088e2b703f99e815974d126d936272f01fd137f SHA1 292da47ab4800c4bd6f7af2792da1df7ac68a88e SHA256 c765967591f4cc02e8fbf94dd237226db6de6698766dc24d1fcf457b7d3f3af8
+EBUILD mytop-1.6-r3.ebuild 952 RMD160 ac53849c8963f3c835aefed70a75deb5f3c83f9d SHA1 df0e97c4eada0cfde637f8115f9e878493e29857 SHA256 b2fd6ec9350123bfc9c6b2c2d293745d55bbf364ee9b2519bc02fd3d37526c79
 EBUILD mytop-1.6.ebuild 769 RMD160 6b1fcb49c51d4a24a5b74271173f6da41cdf7247 SHA1 c4e5df25461b3feb919edaad60bd8293cdf79ffb SHA256 58cbb9875e1a1a7923583d10d2e62a17f41bf3ee34f60f3b6044d08ce0a86357
-MISC ChangeLog 2703 RMD160 800ab4eeb92752df9391b647791f131a475c8ada SHA1 ff69504b4165958814d96e579c4a613c84e4a953 SHA256 fda5c16185b039dc4a83970c5a155c81469f95faf781a44239d6a8bca782d68e
+MISC ChangeLog 2938 RMD160 61ee7137103952f29dbd778d8b6acf5356a7c3f9 SHA1 027d13e67a8cc31695e0b765142b29a1e899fa51 SHA256 d6e31dfb43fdb2bc31fffa4c1f6d0fdc8d86bf9901856ee731c285c32737e20f
 MISC metadata.xml 158 RMD160 17ad87fdb088c4a22ea1849e25da6efdddf26aa5 SHA1 e5826687b0a91fba71e62888faa74fe37f44045a SHA256 a212959a64142f5508788a3d336b55cdb97645b6e54d8a887e7308c67791d569
diff --git a/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch b/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch
new file mode 100644
index 000000000000..b911f9067baa
--- /dev/null
+++ b/dev-db/mytop/files/mytop-1.6-getopt-long-2.38-fixup.patch
@@ -0,0 +1,14 @@
+Getopt-Long-2.38 is stricter about what it allows.
+
+diff -Nuar mytop-1.6.orig/mytop mytop-1.6/mytop
+--- mytop-1.6.orig/mytop	2009-04-10 00:47:31.007111359 -0700
++++ mytop-1.6/mytop	2009-04-10 00:50:39.875391905 -0700
+@@ -153,7 +153,7 @@
+     "idle|i"              => \$config{idle},
+     "resolve|r"           => \$config{resolve},
+     "prompt!"             => \$config{prompt},
+-    "long|!"              => \$config{long_nums},
++    "long!"               => \$config{long_nums},
+     "mode|m=s"            => \$config{mode},
+     "sort=s"              => \$config{sort},
+ );
diff --git a/dev-db/mytop/mytop-1.6-r3.ebuild b/dev-db/mytop/mytop-1.6-r3.ebuild
new file mode 100644
index 000000000000..46edd2fbb8a9
--- /dev/null
+++ b/dev-db/mytop/mytop-1.6-r3.ebuild
@@ -0,0 +1,32 @@
+# 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-r3.ebuild,v 1.1 2009/04/10 07:54:15 robbat2 Exp $
+
+inherit perl-app
+
+DESCRIPTION="mytop - a top clone for mysql"
+HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
+SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-perl/DBD-mysql
+	virtual/perl-Getopt-Long
+	dev-perl/TermReadKey
+	virtual/perl-Term-ANSIColor
+	virtual/perl-Time-HiRes
+	>=sys-apps/sed-4"
+
+PATCHES="${FILESDIR}/${PN}-1.6-global-status.patch
+		 ${FILESDIR}/${PN}-1.6-queries-vs-questions-mysql-5.0.76.patch
+		 ${FILESDIR}/${PN}-1.6-getopt-long-2.38-fixup.patch"
+
+src_install() {
+	perl-module_src_install
+	sed -i -r\
+		-e "s|socket( +)=> '',|socket\1=> '/var/run/mysqld/mysqld.sock',|g" \
+		"${D}"/usr/bin/mytop
+}