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

(Portage version: 2.2_rc27/cvs/Linux x86_64)

3 files changed, 54 insertions, 1 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/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
+}