Version bump, wrt bug #494586, thanks to Quentin Minster <quentin AT minster.io>, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

7 files changed, 119 insertions, 53 deletions

diff --git a/dev-util/visual-regexp/ChangeLog b/dev-util/visual-regexp/ChangeLog
index c418441c51aa..130b670056f8 100644
--- a/dev-util/visual-regexp/ChangeLog
+++ b/dev-util/visual-regexp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/visual-regexp
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/ChangeLog,v 1.14 2013/12/15 18:56:26 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/ChangeLog,v 1.15 2014/02/01 09:44:22 pinkbyte Exp $
+
+*visual-regexp-3.1 (01 Feb 2014)
+
+  01 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> -visual-regexp-3.0.ebuild,
+  +visual-regexp-3.1.ebuild, +files/visual-regexp-3.1-help-font-fix.patch,
+  +files/visual-regexp-3.1-make-regexp-fix.patch,
+  +files/visual-regexp-3.1-wish-fix.patch, -files/wish-fix.diff:
+  Version bump, wrt bug #494586, thanks to Quentin Minster <quentin AT
+  minster.io>, drop old
 
 *visual-regexp-3.0-r1 (15 Dec 2013)
 
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
new file mode 100644
index 000000000000..1dd7e7021b4f
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch
@@ -0,0 +1,32 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-10 01:49:14.987065220 +0100
++++ b/visual_regexp.tcl	2013-11-10 01:49:04.177341077 +0100
+@@ -740,10 +740,13 @@
+ 	frame .help.text;
+ 
+ 	if {$tcl_platform(platform) == "windows"} {
+-		text .help.text.t -borderwidth 2 -relief groove -font {Courier 10} -yscrollcommand [list .help.text.sy set];
++        set hfont {Courier 10}
++        set hbfont {Courier 10 bold}
+ 	} else {
+-		text .help.text.t -borderwidth 2 -relief groove -yscrollcommand [list .help.text.sy set];
++        set hfont {9x15}
++        set hbfont {9x15bold}
+ 	}
++    text .help.text.t -borderwidth 2 -relief groove -font $hfont -yscrollcommand [list .help.text.sy set];
+ 
+ 	scrollbar	.help.text.sy \
+ 		-command			".help.text.t yview" \
+@@ -755,10 +758,10 @@
+ 
+ 	pack .help.text -side top -fill both -expand 1 -padx 20
+ 
+-	.help.text.t tag configure bold -font "[.help.text.t cget -font] bold"
++	.help.text.t tag configure bold -font $hbfont
+ 	.help.text.t insert 1.0 "Version:" bold " $::version
+ 
+-" normal "Usage:" bold " tkregexp <sampleFile>
++" normal "Usage:" bold " [file tail $::argv0] <sampleFile>
+ 
+ " normal "Key bindings:" bold " Alt-q               exit
+               Alt-a               toggle 'all' flag
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
new file mode 100644
index 000000000000..6610b16e76ff
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch
@@ -0,0 +1,12 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-11 12:11:34.256631106 +0100
++++ b/visual_regexp.tcl	2013-11-11 11:50:46.614881803 +0100
+@@ -1437,7 +1439,7 @@
+ 		set output [text	$f.output \
+ 			-wrap						char \
+ 			-undo						1 \
+-			-background				white 
++			-background				white \
+ 			-font						$::font_regexp \
+ 			-selectbackground		lightblue \
+ 			-selectborderwidth	0 \
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
new file mode 100644
index 000000000000..3fae9d095025
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch
@@ -0,0 +1,13 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-10-29 03:42:43.443932232 +0100
++++ b/visual_regexp.tcl	2013-10-29 03:35:35.441951822 +0100
+@@ -1,7 +1,6 @@
+-package require starkit
+-starkit::startup
++#!/usr/bin/wish
+ 
+-set version 3.0
++set version 3.1
+ 
+ ###############################################################################################
+ #
diff --git a/dev-util/visual-regexp/files/wish-fix.diff b/dev-util/visual-regexp/files/wish-fix.diff
deleted file mode 100644
index bfb7478d1fec..000000000000
--- a/dev-util/visual-regexp/files/wish-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur visual_regexp-3.0/visual_regexp.tcl visual_regexp-current/visual_regexp.tcl
---- visual_regexp-3.0/visual_regexp.tcl	2002-09-01 08:24:56.000000000 -0500
-+++ visual_regexp-current/visual_regexp.tcl	2004-03-29 23:20:43.000000000 -0500
-@@ -1,7 +1,7 @@
- #!/bin/sh  
- #-*-tcl-*-  
- # the next line restarts using wish \
--exec wish8.3 "$0" -- ${1+"$@"}
-+exec wish "$0" -- ${1+"$@"}
- 
- 
- set version 3.0
diff --git a/dev-util/visual-regexp/visual-regexp-3.0.ebuild b/dev-util/visual-regexp/visual-regexp-3.0.ebuild
deleted file mode 100644
index 805acddf71fa..000000000000
--- a/dev-util/visual-regexp/visual-regexp-3.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.0.ebuild,v 1.9 2012/09/05 09:45:09 jlec Exp $
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
-HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
-	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/tk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/visual_regexp-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/wish-fix.diff
-}
-
-src_install() {
-	dodoc README
-
-	newbin visual_regexp.tcl visualregexp
-
-	dosym visualregexp /usr/bin/tkregexp
-
-	doicon "${WORKDIR}"/visualregexp-icon.png
-
-	domenu "${FILESDIR}"/visualregexp.desktop
-}
diff --git a/dev-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
new file mode 100644
index 000000000000..b89b3155fce4
--- /dev/null
+++ b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/visual-regexp-3.1.ebuild,v 1.1 2014/02/01 09:44:23 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Type the regexp and visualize it on a sample of your choice"
+HOMEPAGE="http://laurent.riesterer.free.fr/regexp/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/visualregexp-icon.png.tar
+	http://laurent.riesterer.free.fr/regexp/visual_regexp-${PV}.tcl"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/tk-8.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# Manually copy the source file since unpack gets confused by things it can't unpack
+	cp "${DISTDIR}/visual_regexp-${PV}.tcl" "${WORKDIR}/visual_regexp.tcl"
+
+	default
+}
+
+src_prepare() {
+	# File comes with DOS newlines
+	edos2unix visual_regexp.tcl
+
+	epatch \
+		"${FILESDIR}/${P}-wish-fix.patch" \
+		"${FILESDIR}/${P}-help-font-fix.patch" \
+		"${FILESDIR}/${P}-make-regexp-fix.patch" \
+		"${FILESDIR}/${PN}-3.0-home-conf-fix.patch" \
+		"${FILESDIR}/${PN}-3.0-pattern-load-fix.patch"
+
+	epatch_user
+}
+
+src_install() {
+	newbin visual_regexp.tcl visualregexp
+	dosym visualregexp /usr/bin/tkregexp
+	doicon "${WORKDIR}/visualregexp-icon.png"
+	domenu "${FILESDIR}/visualregexp.desktop"
+}