Revision bump, several fixes from bug #492700; proxied commit for Quentin Minster (laomaiweng).

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

7 files changed, 192 insertions, 9 deletions

diff --git a/dev-util/visual-regexp/ChangeLog b/dev-util/visual-regexp/ChangeLog
index 8a124d847b7b..c418441c51aa 100644
--- a/dev-util/visual-regexp/ChangeLog
+++ b/dev-util/visual-regexp/ChangeLog
@@ -1,6 +1,16 @@
 # 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.13 2013/10/23 08:15:15 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visual-regexp/ChangeLog,v 1.14 2013/12/15 18:56:26 tomwij Exp $
+
+*visual-regexp-3.0-r1 (15 Dec 2013)
+
+  15 Dec 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/visual-regexp-3.0-help-font-fix.patch,
+  +files/visual-regexp-3.0-home-conf-fix.patch,
+  +files/visual-regexp-3.0-pattern-load-fix.patch,
+  +files/visual-regexp-3.0-wish-fix.patch, +visual-regexp-3.0-r1.ebuild:
+  Revision bump, several fixes from bug #492700; proxied commit for Quentin
+  Minster (laomaiweng).
 
   23 Oct 2013; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Added Quentin Minster to metadata.xml whom will proxy maintain this package.
diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
index 4d9650e77095..223b516afdc6 100644
--- a/dev-util/visual-regexp/Manifest
+++ b/dev-util/visual-regexp/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX visual-regexp-3.0-help-font-fix.patch 994 SHA256 3b466db66a9b694ae91d8e9be12c627e1541258f801373369c3b8d13d28588f0 SHA512 806c870cbe76dfb6d5a23a169f5f4e1a79e6d6915ae941c950b9b7f91e30783670276cd247698b176f5a6e21f7eb8147cd1fd71e99e969d720de81d39c36dbd4 WHIRLPOOL 05c28db8228cd30ce37e0d99a825e72be593e1df0d82a85e965de236376f57397a9f7fc74024919167a7cc15bc6a377a67ada62e7ebfaf0ba519c68f2a57c3d0
+AUX visual-regexp-3.0-home-conf-fix.patch 1792 SHA256 01ccae8dd5600e70f208a9f93f178eee87ce33dc77c21d46ac9945e3fcf52482 SHA512 be77ca9ef0d484991a665dbc2f59f1030f69edc9be3e0b3f973afcbb19ea424fdf3c9099797391ac6eb6c4943809394f877949240eefd542791ca43815fb3dc6 WHIRLPOOL 5fc496b808d9076492a865aa676f61d65f12500f95389f0f166bd7d8f75be2cd6101a06a87a1146b4b1b2615782ba55eb279c24df6b36c2673c255e0758133f4
+AUX visual-regexp-3.0-pattern-load-fix.patch 891 SHA256 59608fb6da74c1c4ba6f3ec56f22f39dabd6c8e7f0a045e70644c521f7ce31d6 SHA512 9b9cc5275852ebcb5a68b8583eee75936d871c8bbd931462e14a56db7e71769d58a9934da17e1eaf806ae9eaf1fdc9836dab113911ac65f9f5a13bcb47ecd6df WHIRLPOOL f446f2ffb8d55b18785faa543b19ed8acdfddc1fc65a61b0b329b0b336daba5e11bdb155afcfc102f4c74bb7f9e6b0b87c05e27d48240537ee12118b6d519339
+AUX visual-regexp-3.0-wish-fix.patch 405 SHA256 da55282349b3229b82469d415b7e6821a8f1b8c9f9b6a79ecc795c24e347c0ae SHA512 5e51a9627e86778cca27b37663086c7e80e9d49d1bd53b669b76963e9dcbb42838c7334479efabbd8ca85f980ff4f4cadd2de92e6026586c8bdaa62fd096324c WHIRLPOOL 05cf905c082d56f1a4aa8dc6c95b8cf03702612b1e75d8bbf7f576aea918651707640016bc8df9cbf797c0d51942669bd6d7494cd9f41044cf6b738c7d47eaf2
 AUX visualregexp.desktop 166 SHA256 ed4527e88f6b81c568a9866d1a500e1aae63c8984721c46555eb6bf5d957f739 SHA512 9f80b55123c781749e078c2c6c0117fcc4dbe8e15536e5b4d98683e67de1f5637a3c1e73b109f661765d042f76f71dcd8e633cc9d363de21b5b3ff27db21c1d1 WHIRLPOOL 974cc1f6cabb0ae97459d3cb93dabd19e4eac29df078415e85eb82554eca6293fbfbbe423d4a3418f1968c3a53e8e6d73c63001433db7f9086204328c5fdb762
 AUX wish-fix.diff 405 SHA256 da55282349b3229b82469d415b7e6821a8f1b8c9f9b6a79ecc795c24e347c0ae SHA512 5e51a9627e86778cca27b37663086c7e80e9d49d1bd53b669b76963e9dcbb42838c7334479efabbd8ca85f980ff4f4cadd2de92e6026586c8bdaa62fd096324c WHIRLPOOL 05cf905c082d56f1a4aa8dc6c95b8cf03702612b1e75d8bbf7f576aea918651707640016bc8df9cbf797c0d51942669bd6d7494cd9f41044cf6b738c7d47eaf2
 DIST visual_regexp-3.0.tar.gz 25659 SHA256 07a22a498e32476c7ae17b00d131c04a53def4e5f174ffe42ddbc42e44752c0f SHA512 3c8b3e44d20f8cdc69fdb501ac82a44f6b755715c9bd6309bbca01193acc72a97595d6012ad889c957adba587c3f8f1f888c0f42993bb81bf3f730adff42c655 WHIRLPOOL 56be241b1653fbb0b0fa5f4a1b13e755424a2d193b267e68b938ca34dbe636bcf7fdd2bb65611abe9d3e8ebb2080614c1224534424b9a83840f5ade3015a3964
 DIST visualregexp-icon.png.tar 20480 SHA256 8704b626f9318d62fe6bdf7f2b4fb4ef7b72c6b4fe7376e55c486d5dc89fd064 SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2 WHIRLPOOL 7dd0e70e4f419e0f4d9a6ad57260267b674b2f2ebe904ec5ec582a539d3cc619eac968e580318b003babf0b36885298b4a7c8d8ff8c4591d61794f83da807834
+EBUILD visual-regexp-3.0-r1.ebuild 1059 SHA256 aa56e5e08d1896a0fd77181cc3289c3d6997a24a8f2cab5d6573a3043d22c343 SHA512 044716b8ce2226d1ea3b0a32e69766f51820efe3d23933bc27daa6f5cce03aebb4f34cbdecb638423111f09eb90264ab1a182c48dd0d3a537ec88cb9c58fd026 WHIRLPOOL 59319e840a7e91ece5214c847e7907063ce8f35cff23ceafb647ce0c0c1a05dfe8b454652d09d41108ae4f692f057e1c9953bd46085c939272dddb87f68e7353
 EBUILD visual-regexp-3.0.ebuild 915 SHA256 3da05d06c3ad72a93e2d82908e7059db740cee299aa7785460ad7cd1a3130b68 SHA512 65bebdf514f816e64712a08a75e8fc8c60ec54890bfd72d58b2a6bcd945fcb446c399aa332cda4113a48f921160ac745876b709b2422944115dbee9759164b38 WHIRLPOOL 53173226eb72c5b61a02dd46b94b63f4ecea81169660903f2feb9a6ab8d6545560f2b9edfc6cc17ca2b2133e5bef06d55bd7fb649a493ac02270dab2e1f8bac9
-MISC ChangeLog 1794 SHA256 67dffffd4c67bac604bf5dc15b87041a4ce494b76945199f1b15d3537a15d05f SHA512 8b11f843fd2f8c1afc51e5657c7e06abdbe86b6ee078899fdfcd9b13c71f4232a099ca6517713582863014990d9e09a17463bf6d5a3e8b8d7b0098311f0c2e34 WHIRLPOOL 7783785a948f72b3649c7ca5e5e4a829e58ea580677135e0010f1d4f010f03f0c3f2fd7091996050e3d3f5e77741f58856776050171bbf77edcb584a6b08a5f0
+MISC ChangeLog 2199 SHA256 56010d2a6c43e5849bd26d613826a0b612069845229a731640d4befe98f04feb SHA512 ca4c22d490bbc948c766b7e3242bef70f03eade06c03ebf9d5f4a1931153a12bf828e8c5f3e6575c5a251f1605d4b74ba09d6e8aef06636579c54525554cdc7c WHIRLPOOL eb9837abd91e721a98acfedc7620e961fed180cfd3a5ba0e57caf8fde93f95a47e9226d82f2685a5ec3d12607608034986380affeebe7a11b7de0d791bab3147
 MISC metadata.xml 267 SHA256 65e9772811f71f1e3d3c197d5f08f83fddfe027aed847eb6054aa24cdf942f2a SHA512 855287cbdd728369a6a569aa1d71e905aff263d125be84094973ccfc872cc8b22c32d4373cf6e10766de462b1c9c7f44881e3913013308e531ee450ea0ae49d8 WHIRLPOOL 4ecdf4bd7ecf78ceef15564eb29a4c488b7487be7d8b490df09bccd21b644884b6f515aef3e5986d6b5db73e8a6e2c286541b3fe39431d91aff14045a52b7844
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSZ4WJAAoJEJWyH81tNOV9HecH/im4rVXj3YQh2FMpz2vsq8CL
-LedjXeDxKsibKU00VzhGViXPKdm3p2xCPPBlJtcPDwXAU/rPPV6/FrvT0w3MDKiW
-vG0pJnid7BnuHLh1ZBySoLBtYR6MRe8lprm15KAmrcJXbtyUbif1oj0gJLcHh1N5
-PTrCadI+CkOd9zlF8uGgtVzkEMWGYxE2yfs4sUKR5jnXAc1gruJmw1u2+3o+NpJu
-3VwL6lZnJmbdnejqoJBgZQMsdnH+cyPlKRdoaPBbDR+++4okNYSWZeog76ZdtEuE
-OVjQ1rsGYbAsGkzyVCxXot3X3/vsyhLeBTrKuPCl3BqLgij487TVH/9ZfF9bWy4=
-=Zgru
+iQEcBAEBCAAGBQJSrfr9AAoJEJWyH81tNOV9TpQH/2gW4XUEvvfO9yvRQK/wR+jA
+jK//S49V1gez7rVPe7CMSHt0uipE8XfuzZ+bsfwErNT08J2jh/Yz1dqSrSIMBRAZ
+sxd7yg7+WlraBcApCnA24Fij5ORULCHCQ/RPl8nDLhCGqUqjviH/P5/qwMT/yKBF
+659744sUI+AlVt0+LezMlL3JKCcJtY/0wGVA9nRruXprdMOHb/bTp8SBt/7Kism3
+707PtPFUAuBFjS/TjXzymG2GUnV2l71xJALNum28lltbRWbJV/UQx/2vFBtp2axL
+Zs3KBNt2gcLIxlxll64PDNYvfpipEkFyOoFRmdmC4p8nsrFckf8u+xDQZKhWst0=
+=QKSI
 -----END PGP SIGNATURE-----
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
new file mode 100644
index 000000000000..ec3763cc9dd1
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch
@@ -0,0 +1,26 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-10 01:35:49.959609478 +0100
++++ b/visual_regexp.tcl	2013-11-10 01:34:10.491151352 +0100
+@@ -494,15 +494,18 @@
+ 	pack .help.l -side top -padx 10 -pady 10
+ 	# help text
+ 	if {$tcl_platform(platform) == "windows"} {
+-		text .help.t -bd 2 -relief groove -font {Courier 10}
++        set hfont {Courier 10}
++        set hbfont {Courier 10 bold}
+ 	} else {
+-		text .help.t -bd 2 -relief groove
++        set hfont {9x15}
++        set hbfont {9x15bold}
+ 	}
++    text .help.t -bd 2 -relief groove -font $hfont
+ 	pack .help.t -side top -padx 20
+-	.help.t tag configure bold -font "[.help.t cget -font] bold"
++	.help.t tag configure bold -font $hbfont
+ 	.help.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.0-home-conf-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
new file mode 100644
index 000000000000..c86202ae05fb
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
@@ -0,0 +1,56 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
++++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
+@@ -1062,27 +1060,38 @@
+ #==============================================================================================
+ 
+ # try to get customization from 'visual_regexp.ini'
+-puts "[file exists visual_regexp.ini]"
+-set filename [file dirname [info nameofexecutable]]/visual_regexp.ini
+-if {[file exists $filename]} {
+-	source $filename
+-} elseif {[file exists visual_regexp.ini]} {
+-	source visual_regexp.ini
++set localfilename visual_regexp.ini
++set homefilename ""
++if {[info exists ::env(HOME)]} {
++	set homefilename [file join $::env(HOME) .visual_regexp visual_regexp.ini]
+ }
+-
+-# try to auto user patterns
+-set filename [file dirname [info nameofexecutable]]/regexp.txt
+-if {[file exists $filename]} {
+-	regexp::pattern:load $filename
+-} elseif {[file exists regexp.txt]} {
+-	regexp::pattern:load regexp.txt
++set binfilename [file join [file dirname [info nameofexecutable]] visual_regexp.ini]
++foreach filename [list $localfilename $homefilename $binfilename] {
++	if {[file exists $filename]} {
++		source $filename
++		break
++	}
+ }
+ 
+-# buld the GUI
++# build the GUI
+ regexp::history:init
+ regexp::gui
+ regexp::go
+ 
++# try to auto user patterns
++set localfilename regexp.txt
++set homefilename ""
++if {[info exists ::env(HOME)]} {
++	set homefilename [file join $::env(HOME) .visual_regexp regexp.txt]
++}
++set binfilename [file join [file dirname [info nameofexecutable]] regexp.txt]
++foreach filename [list $localfilename $homefilename $binfilename] {
++	if {[file exists $filename]} {
++		regexp::pattern:load $filename
++		break
++	}
++}
++
+ if {$argc > 1} {
+ 	puts "Usage: $argv0 <sampleFile>"
+ } elseif {$argc == 1} {
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
new file mode 100644
index 000000000000..18dbf509f45a
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch
@@ -0,0 +1,31 @@
+diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
+--- a/visual_regexp.tcl	2013-11-12 23:23:59.730171882 +0100
++++ b/visual_regexp.tcl	2013-11-12 23:24:42.134085257 +0100
+@@ -380,19 +380,17 @@
+ 	}
+ 	# do it
+ 	set in [open $file "r"]
+-	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
+-	while {![eof $in]} {
+-		set name [gets $in]
+-		while {$name == ""} {
+-			set name [gets $in]
+-		}
+-		set pattern [gets $in]
+-		while {$pattern == ""} {
+-			set pattern [gets $in]
++	set contents {}
++	foreach line [split [read $in] \n] {
++		if {$line != ""} {
++			lappend contents $line
+ 		}
+-		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
+ 	}
+ 	close $in
++	$data(w:menu) delete [expr 4+[llength $::regexp_db]/2] end
++	foreach {name pattern} $contents {
++		$data(w:menu) add command -label $name -command "regexp::regexp:insert [list $pattern]"
++	}
+ }
+ 
+ 
diff --git a/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch b/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
new file mode 100644
index 000000000000..bfb7478d1fec
--- /dev/null
+++ b/dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch
@@ -0,0 +1,12 @@
+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-r1.ebuild b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
new file mode 100644
index 000000000000..572080404a63
--- /dev/null
+++ b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/12/15 18:56:26 tomwij 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}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/tk-8.3"
+
+S=${WORKDIR}/visual_regexp-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-wish-fix.patch \
+		"${FILESDIR}"/${P}-help-font-fix.patch \
+		"${FILESDIR}"/${P}-home-conf-fix.patch \
+		"${FILESDIR}"/${P}-pattern-load-fix.patch
+}
+
+src_install() {
+	dodoc README
+
+	newbin visual_regexp.tcl visualregexp
+
+	dosym visualregexp /usr/bin/tkregexp
+
+	doicon "${WORKDIR}"/visualregexp-icon.png
+
+	domenu "${FILESDIR}"/visualregexp.desktop
+}