From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- dev-util/visual-regexp/Manifest | 14 ++++++ .../files/visual-regexp-3.0-help-font-fix.patch | 26 ++++++++++ .../files/visual-regexp-3.0-home-conf-fix.patch | 56 ++++++++++++++++++++++ .../files/visual-regexp-3.0-pattern-load-fix.patch | 31 ++++++++++++ .../files/visual-regexp-3.0-wish-fix.patch | 12 +++++ .../files/visual-regexp-3.1-help-font-fix.patch | 32 +++++++++++++ .../files/visual-regexp-3.1-make-regexp-fix.patch | 12 +++++ .../files/visual-regexp-3.1-wish-fix.patch | 13 +++++ dev-util/visual-regexp/files/visualregexp.desktop | 7 +++ dev-util/visual-regexp/metadata.xml | 12 +++++ dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild | 42 ++++++++++++++++ dev-util/visual-regexp/visual-regexp-3.1.ebuild | 50 +++++++++++++++++++ 12 files changed, 307 insertions(+) create mode 100644 dev-util/visual-regexp/Manifest create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.0-help-font-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.0-pattern-load-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.0-wish-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.1-help-font-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.1-make-regexp-fix.patch create mode 100644 dev-util/visual-regexp/files/visual-regexp-3.1-wish-fix.patch create mode 100644 dev-util/visual-regexp/files/visualregexp.desktop create mode 100644 dev-util/visual-regexp/metadata.xml create mode 100644 dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild create mode 100644 dev-util/visual-regexp/visual-regexp-3.1.ebuild (limited to 'dev-util/visual-regexp') diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest new file mode 100644 index 000000000000..8b68f753d4a8 --- /dev/null +++ b/dev-util/visual-regexp/Manifest @@ -0,0 +1,14 @@ +AUX visual-regexp-3.0-help-font-fix.patch 994 BLAKE2B f4ff38c2b27be32b06f8bab8d96f17dc73ee13868a9bdc8ce7d9dd4b9db75e2e3db6af1e58bed75d72dfc3ca38ad3e26d091d547c251f408cfee4991b0d5fef1 SHA512 806c870cbe76dfb6d5a23a169f5f4e1a79e6d6915ae941c950b9b7f91e30783670276cd247698b176f5a6e21f7eb8147cd1fd71e99e969d720de81d39c36dbd4 +AUX visual-regexp-3.0-home-conf-fix.patch 1792 BLAKE2B 319a636d0d3442a4d71f0dfeade3da082a275f174be1cdf19b386d300c53c6362b2505228d1c062a0113364fb97c4283c3c59330849d37522850b9481421a985 SHA512 be77ca9ef0d484991a665dbc2f59f1030f69edc9be3e0b3f973afcbb19ea424fdf3c9099797391ac6eb6c4943809394f877949240eefd542791ca43815fb3dc6 +AUX visual-regexp-3.0-pattern-load-fix.patch 891 BLAKE2B 01b48a3625ffc37a45db6c5a2729f8f757c256b2317a6eb8d062e19fd31e7273d7115048700783b929a8d79e455b8013c96754a66664499de386a4ea3ac28bd6 SHA512 9b9cc5275852ebcb5a68b8583eee75936d871c8bbd931462e14a56db7e71769d58a9934da17e1eaf806ae9eaf1fdc9836dab113911ac65f9f5a13bcb47ecd6df +AUX visual-regexp-3.0-wish-fix.patch 405 BLAKE2B 7d13312ee03d4552017fc30d37967e8dc327400de2d562d6325d0498dac2e428c75d327d93b53f347b2c92f1c841e3ebae0664f0ad939ad76b9e72843aaa388b SHA512 5e51a9627e86778cca27b37663086c7e80e9d49d1bd53b669b76963e9dcbb42838c7334479efabbd8ca85f980ff4f4cadd2de92e6026586c8bdaa62fd096324c +AUX visual-regexp-3.1-help-font-fix.patch 1264 BLAKE2B 82aea140a83ff96e2e947a10db54af0486be08b37bc68b3ccebd3524d68ca7e7fd757266c7ed3dff2b913004f7d7fe4cef1107f67240af82563fe96ac72ff0cc SHA512 2ec777e5bd3a401f99fa387bb0b015596fcdcf39c11bb214daaf94f56759320d1d36bd9cd36b2cbd634a1c1eccffba1b1d1fb7736981a31528a7752447c74b13 +AUX visual-regexp-3.1-make-regexp-fix.patch 411 BLAKE2B e5bb199f3606bea073ae6cca4673864d3a13587c485d37b3d51ec95dc910d9e811fa7a91e4d39dbb31fb0c426adee0cb97eb7cf9382ff783db21e96d93c795fb SHA512 6d8522788a6ddc4d1cac2a66be4b2c24fbd596927303b58be3e3cabe920e4150a574bb53d588618d096a833b063c197498250abe2d12b8997f278d90747cdf58 +AUX visual-regexp-3.1-wish-fix.patch 383 BLAKE2B 42fc8f5f342e2ca0f566235c013e3ab012a2f306d88be74120f6840e874fb7ed408ca9fe2159a87325ea386c277f2857342cba4ad0805419f0d46631ceb56999 SHA512 eae72720bf064245b4e1076b7a2e4f02dd42e727ca897bb30a6da0a07305e51bd7571b28e6d1e0e251ec9fc5d9724f0a7e2feac306f89c6e7ef2f313f1c6d78d +AUX visualregexp.desktop 166 BLAKE2B c9b2868b32040b17c134c79986ed05880c12b2d4d90157360c1d7b56adf7af8357bad59d6b482947fdfd9e1ac923a656b5583353ca803de5ef21c8b11bf3b107 SHA512 9f80b55123c781749e078c2c6c0117fcc4dbe8e15536e5b4d98683e67de1f5637a3c1e73b109f661765d042f76f71dcd8e633cc9d363de21b5b3ff27db21c1d1 +DIST visual_regexp-3.0.tar.gz 25659 BLAKE2B 3633e0cc908b04fb95320efc65955b40b6f162986de5e0f3a695771950026b516a69bbb9ec8803a4ab757e70d1e9406c38656f51af92edafb955e4956303b5c3 SHA512 3c8b3e44d20f8cdc69fdb501ac82a44f6b755715c9bd6309bbca01193acc72a97595d6012ad889c957adba587c3f8f1f888c0f42993bb81bf3f730adff42c655 +DIST visual_regexp-3.1.tcl 71183 BLAKE2B df6541179cf06c49f6bb40a0bc186ad45aaf535734df6d88d84adcfcb4c3a41a3be842f05e69bb7d378cb04f59cc6f0860f0d4c46dffa7ba91256f3dc14a80ce SHA512 f36729800e0e66ee22339614b47f068eeb440cac501f73898250ddda9865cd5c3cc09bd57a8ea601ef7a3240bddbe524a69b704ae58b8e56decb81b25166818b +DIST visualregexp-icon.png.tar 20480 BLAKE2B 589ea0480f68c442cfecc2638f87a901cc2d75237deefae49616b6626bc1073f14ff9c009c09a28c2e93b2f8c1ae3e4123a05e24aa73f2f6e0bd9fb53bfad15f SHA512 af0a5ec63d2d5fa71842ed85a83541b0f1ee72a4b37941e11f4f212874564b0255a97dfa953ea1684b056a4ab6f86ce47b6df9374628551c9cf8e775f7d12fb2 +EBUILD visual-regexp-3.0-r1.ebuild 935 BLAKE2B cb5066717a3ae6af48b7071e556e8ae1f42a8f7cdc4a8e529ae6ece3dce0db594677be95fc974e142daeab59f81d2fe66c920a3d20bd23a0f06d38bf60c4bbf8 SHA512 19f39420f473fb8a9b049c4fd377abf1ff230c9eeae397d583afb0065851660413ff2c339e9f9b82cd5c62018dc8d9435e0b596f662bc4cbb830071f1de19078 +EBUILD visual-regexp-3.1.ebuild 1237 BLAKE2B 4acfd1028cc591f2ee852a845aa43f0fe3928ff3bfcaee16b552de4794309a59b4360a73f65529b33bc80bf4891ce8c922c260831052d82b5e9d496f1081df35 SHA512 532ecc703222531147989096acbee3523aa39ce79148bb46a0c2ebcf0b5aa7cfe760fe1773dc4b0837f41f7ced5517373bef2b4d43687f92269834cc1c711dea +MISC metadata.xml 365 BLAKE2B ea9b3d852fce83839d993c8118c21d945a2944fbbdd476cea7635b2e7361ba030d33a433fce6c6ce2bc44e0a250d2d0dbc9f6e30d1c1c692252251cfc9181971 SHA512 9556a7d272b95bfde71df2994d8ac26639f3252cd743f9caeeea8b516a70dfd031dacf42dd56df19394c03223001e09bacb094b68256641764d139b3880e9ff1 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 ++" normal "Usage:" bold " [file tail $::argv0] + + " 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 " + } 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/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 ++" normal "Usage:" bold " [file tail $::argv0] + + " 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/visualregexp.desktop b/dev-util/visual-regexp/files/visualregexp.desktop new file mode 100644 index 000000000000..1d66181bc2c1 --- /dev/null +++ b/dev-util/visual-regexp/files/visualregexp.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Exec=visualregexp +Icon=visualregexp-icon +Name=Visual Regexp +Comment=An interactive regular expression editor +Categories=Development; diff --git a/dev-util/visual-regexp/metadata.xml b/dev-util/visual-regexp/metadata.xml new file mode 100644 index 000000000000..61d19ccc4a52 --- /dev/null +++ b/dev-util/visual-regexp/metadata.xml @@ -0,0 +1,12 @@ + + + + + quentin@minster.io + Quentin Minster + + + proxy-maint@gentoo.org + Proxy Maintainers + + 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..6de44bc09c0e --- /dev/null +++ b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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=" + https://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 +} 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..3920d2a42ab5 --- /dev/null +++ b/dev-util/visual-regexp/visual-regexp-3.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +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=" + https://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 ~amd64-linux ~x86-linux" +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" +} -- cgit v1.2.3