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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

8 files changed, 132 insertions, 63 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/Manifest b/dev-util/visual-regexp/Manifest
index 223b516afdc6..acbe110701f5 100644
--- a/dev-util/visual-regexp/Manifest
+++ b/dev-util/visual-regexp/Manifest
@@ -5,22 +5,25 @@ AUX visual-regexp-3.0-help-font-fix.patch 994 SHA256 3b466db66a9b694ae91d8e9be12
 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 visual-regexp-3.1-help-font-fix.patch 1264 SHA256 495f597108c66cea2bf9b7c7a556786e46536071e83f56713746dfd678a63533 SHA512 2ec777e5bd3a401f99fa387bb0b015596fcdcf39c11bb214daaf94f56759320d1d36bd9cd36b2cbd634a1c1eccffba1b1d1fb7736981a31528a7752447c74b13 WHIRLPOOL 2b528533d1076766d0b414de557809b92e0d4cb7edf651c6c03cc952ac80ca7aa6a12809d2c2ad0cf5b4d5df2ff8047dd5787215f50f7b97f2c153f7bbac492f
+AUX visual-regexp-3.1-make-regexp-fix.patch 411 SHA256 ca2f41eff5c474d77706f0f81a0161b3dcb06e8498635388351f76fbc82e3ad3 SHA512 6d8522788a6ddc4d1cac2a66be4b2c24fbd596927303b58be3e3cabe920e4150a574bb53d588618d096a833b063c197498250abe2d12b8997f278d90747cdf58 WHIRLPOOL a06265c52d625fcfb3ac5215a0c4d79aafe16a32a6c71b2d4854b33e7a8ed94dbcd0a2ce72058f1b2165772adca6fc84fe4b9bb3e124e6d5ef2904040000354a
+AUX visual-regexp-3.1-wish-fix.patch 383 SHA256 abb99f359b79a58557ca5b3472b6fd1abdfa8891be66593448b4ba90339f7a1c SHA512 eae72720bf064245b4e1076b7a2e4f02dd42e727ca897bb30a6da0a07305e51bd7571b28e6d1e0e251ec9fc5d9724f0a7e2feac306f89c6e7ef2f313f1c6d78d WHIRLPOOL 466435881f4b86d629c13fb076e93bce8c3f53e22c2faeeba0aa4651bff37c10991f5f1d2e314593c19a5039b6f548ef12afc4a9a10f4cb68777ea8b53798119
 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 visual_regexp-3.1.tcl 71183 SHA256 153bccbce71da7b208f95abc7408a126f819e4a0e57ad053866080c82e282752 SHA512 f36729800e0e66ee22339614b47f068eeb440cac501f73898250ddda9865cd5c3cc09bd57a8ea601ef7a3240bddbe524a69b704ae58b8e56decb81b25166818b WHIRLPOOL bdb4f35e8a5fd7267848e43a9eb8ea4d02633ace08bf9336826cecf5c4370857a31d54042f92b4cd79e934c468a07c0ba5f3c4ae8eabf7d98cb5ae8198629bbe
 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 2199 SHA256 56010d2a6c43e5849bd26d613826a0b612069845229a731640d4befe98f04feb SHA512 ca4c22d490bbc948c766b7e3242bef70f03eade06c03ebf9d5f4a1931153a12bf828e8c5f3e6575c5a251f1605d4b74ba09d6e8aef06636579c54525554cdc7c WHIRLPOOL eb9837abd91e721a98acfedc7620e961fed180cfd3a5ba0e57caf8fde93f95a47e9226d82f2685a5ec3d12607608034986380affeebe7a11b7de0d791bab3147
+EBUILD visual-regexp-3.1.ebuild 1336 SHA256 c445dc6641053df379853f35dd24d69673a4fa735645505f28a3fea63622e7a0 SHA512 bbcb96f84501c7201df6b84c3f2b7cbf5852334df30d4a5f2d7c94fe633296aaca56f3c6241f3aadd2b9d8f36901e315870ad76acad83f4116caca63c928d7e7 WHIRLPOOL 13160a80100ed0e859b597f0fae72c962caaf1fff0e7c395bf802b720e681087bdac8ba588ae07e6b8cd47b808950eb100e9e409022c3fea5066667d7cf26b4a
+MISC ChangeLog 2598 SHA256 2fbd92832974e42f853212d7b448574b7a3524b252a0c1e710170ef757fe5e0a SHA512 b3b590a41184354c9a3a2d1741968095138b5406080528ecc2a1c8470b24eed94722a88e5e96c98049ce18485f930b3252bf1f4a5953d06240db830d8e9c77f3 WHIRLPOOL 5d95684fb9bcc99a772fa2c342abb9fdb90645d5559b2529aeb000dd097550ecff119f015ec41c2fd1f447a8314003335d1b38fe491518a470d79867df1354b1
 MISC metadata.xml 267 SHA256 65e9772811f71f1e3d3c197d5f08f83fddfe027aed847eb6054aa24cdf942f2a SHA512 855287cbdd728369a6a569aa1d71e905aff263d125be84094973ccfc872cc8b22c32d4373cf6e10766de462b1c9c7f44881e3913013308e531ee450ea0ae49d8 WHIRLPOOL 4ecdf4bd7ecf78ceef15564eb29a4c488b7487be7d8b490df09bccd21b644884b6f515aef3e5986d6b5db73e8a6e2c286541b3fe39431d91aff14045a52b7844
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-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
+iQEcBAEBCAAGBQJS7MH4AAoJECo/aRed9267VP0H/ipFeq6E/tmRwX8udwUdpvXB
+Xxdg9G0ZnzmRJos5t88cR182qVAhStr1Px4JJrBIyBe+SBNM38RoF0NvsEqZH+nC
+fnmCyazHZgwuqOl3RN/YQ3kf+/UPzEGYh7fUcejQmL2mGkG9eocjcsAKPikKa62A
+nUuBge4kRGu9NIjN9uCuHs9ipNLOS/H/CRcFiJ8pHNz8XaYFolwnP6DbqNNEKMLB
+84c2hKHzvS5iwAg+dLZjUFNQ3DXjiu4sK77HEyr1/C8o587nnPEOWUYMYEpRTsM7
+/kPuU7ShiZdyrdQwt4XzkbajV4SOxOY/bWM/mk2EYh42i1tx5uzirTVUM27VbNs=
+=7+5m
 -----END PGP SIGNATURE-----
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"
+}