gentoo resync : 28.04.2021

3 files changed, 24 insertions, 30 deletions

diff --git a/dev-util/visual-regexp/Manifest b/dev-util/visual-regexp/Manifest
index f12eee4a2c5d..650a2a72a98e 100644
--- a/dev-util/visual-regexp/Manifest
+++ b/dev-util/visual-regexp/Manifest
@@ -9,6 +9,6 @@ AUX visualregexp.desktop 166 BLAKE2B c9b2868b32040b17c134c79986ed05880c12b2d4d90
 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
+EBUILD visual-regexp-3.0-r1.ebuild 890 BLAKE2B 5bbf3a4e93d3f04cb03e08844fe90f54fc3b00f611a124ad5726c6b561f3ded3f7aff6465b38c8dfe143b6d3df152db7b2e31bb265041706cd1c27c8891ca804 SHA512 c0c8ed3e5f50d6df8c74e972dd79c9a065e74f9e525c36736078d83d5e8a4617625763de1697a987976fe8791acd5f8786527411f773f2426c9cdae4e59130a2
+EBUILD visual-regexp-3.1.ebuild 1211 BLAKE2B 5b186db0e5968782dd2eb71a845ef03ca807aa471fd038ab76e41d608356889481723c10b2b30dd7d0c9dba662644a02904b773fb7ba79bb7705dde255c8b3db SHA512 cd59b8cb18463440b953992ae17aedc2da91bc50bf171c3c5f83f35857ee2ced71c074e9941c395386400dab86783c2c642e3a6e323d6eb26f8319a3287375f8
 MISC metadata.xml 395 BLAKE2B 99fff524ddfcceb143a1eb1e6436a9c8f81fa972d80d3ec5609428be2b236355b8f33bad4ac41ed320aaf9fff6c770a63aba8e54db28eb0c9a3871fd7a913876 SHA512 96785ef8ec6aae2f17b9c99f2cd239f6a695bfb349739155fedd585c8787dc8649248ffd7039620fc4c7f8cdcfedc6512e39bba1086231bf3f31fbc127a293e6
diff --git a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
index 6de44bc09c0e..4277831ac548 100644
--- a/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.0-r1.ebuild
@@ -1,33 +1,29 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit desktop
 
 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"
+S="${WORKDIR}"/visual_regexp-${PV}
 
 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
-}
+PATCHES=(
+	"${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
diff --git a/dev-util/visual-regexp/visual-regexp-3.1.ebuild b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
index 3920d2a42ab5..835dd195fbad 100644
--- a/dev-util/visual-regexp/visual-regexp-3.1.ebuild
+++ b/dev-util/visual-regexp/visual-regexp-3.1.ebuild
@@ -1,25 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit desktop edos2unix
 
 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"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=dev-lang/tk-8.5"
 
-S="${WORKDIR}"
+PATCHES=(
+	"${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
+)
 
 src_unpack() {
 	# Manually copy the source file since unpack gets confused by things it can't unpack
@@ -32,14 +37,7 @@ 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
+	default
 }
 
 src_install() {