gentoo resync : 03.11.2021

4 files changed, 140 insertions, 114 deletions

diff --git a/app-editors/padre/Manifest b/app-editors/padre/Manifest
index a8799192805a..577e28b94fc7 100644
--- a/app-editors/padre/Manifest
+++ b/app-editors/padre/Manifest
@@ -1,4 +1,5 @@
 AUX padre-1.0.0-DBD-Sqlite.patch 1139 BLAKE2B e46deb29f997585e78f2316796ce2aaeb6f04b0b984f76f502e140873cdf872a42e26548dc7a1c2cbdefecad1be705fcae04b9f697e541476088fb9140a94d95 SHA512 a23818ef3bedf24a11e8e1cdf5aca8b0a3eb67123e796c0014116c51c2b2c7c55bbe50f04bc200650e3e4b34c519929478d4ff4b38b120a360d8d23438c36a4d
+AUX padre-1.0.0-utf8.patch 737 BLAKE2B 7653613de2d2ce037c74b8fe82ac39c8ceae38ce3f25f5c530c0ad5d69bb74d88c43f222c6ed8cdda64e7c77562be6a228812d46ff45452e879d51d25bc2980c SHA512 68b9d1672cda447a4841d68c914b2b4cb382d9b274d4645684000b0909a0dcc5ac1914d15924ae338848bb7309a049a33bc1b0fb3c313e92425159855921ceb0
 DIST Padre-1.00.tar.gz 1969274 BLAKE2B 2c0a982b2addaaa8c2cf994c2aeed7985779b3c9663b3022c83a67ebc4a3d0c35fa7f5e6d0f7649cf9e47c51e1a01df42a977e03366f0f2b75c76964b4bf1dde SHA512 8a2630eb54944b85ec77eaf90595fe6bb482b88ae87622b9e54973fbc1cc5f7ccf83d7b2481a9a66886310db9678569d23b18de033f7759db71ac73fd3151856
-EBUILD padre-1.0.0-r1.ebuild 2838 BLAKE2B dde9f8e871085bcf28c22956bacd601714687b5c75f22582c430ac2d3d39bd7592392ac98f470c8cd948b9d2de73271e03a5597a53439a6355c75475cf10d09c SHA512 cdf3323c730a216a1d182aedb1106a1d6539ad65d8b63672c3a8055209a381640569cbd024244512891d2f60da918ac6bad92f63241a6f56c8df7f590ef2088e
+EBUILD padre-1.0.0-r2.ebuild 2977 BLAKE2B ff302b7ec61429b4e69f51608a5b6102a210fdf3b4c884a0fb70a8775577aabbda13f981d9a982e64b75247177578b7d5c0e475eea51aa3e14ba9c5469ea2b5a SHA512 34aadd214a85a296ed628f2910a2e691646ff4d003883126777986ae605e3aeff795b73ed02247b8ec7098bb0f6a1e714e7b8eaa4e6dbfb630d36616c2ee45b1
 MISC metadata.xml 330 BLAKE2B 6ff025e4df1870d19283f8e2098da9ac06ad6ed76d39bed9b7844a1d4db4bb26751533f8b182e1c5ceb1e743bae54f371665e9ad7445031ad3592177b4481328 SHA512 bea09eef46c3ed1a37d249fcd87b35e4c3f8532772605093ab303c2fff8591bbc176ed2d0507a9a5cabd159ed7af6407a37b720b158112d2a4930168af8654f9
diff --git a/app-editors/padre/files/padre-1.0.0-utf8.patch b/app-editors/padre/files/padre-1.0.0-utf8.patch
new file mode 100644
index 000000000000..946750747553
--- /dev/null
+++ b/app-editors/padre/files/padre-1.0.0-utf8.patch
@@ -0,0 +1,23 @@
+From a3df4d7b8a765f1d0303410cdc686d4bf8adabdc Mon Sep 17 00:00:00 2001
+From: Tim Lapawa <git@lapawa.de>
+Date: Mon, 5 Mar 2018 11:24:36 +0100
+Subject: [PATCH] The tiniest patch you can get to acquire perl 5.26
+ compatibility. It just replaces a malformed UTF8 character.
+
+---
+ lib/Padre/Wx/Main.pm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm
+index f75cc17ea..b9005d40f 100644
+--- a/lib/Padre/Wx/Main.pm
++++ b/lib/Padre/Wx/Main.pm
+@@ -5561,7 +5561,7 @@ sub on_prev_pane {
+ 
+     $main->on_join_lines;
+ 
+-Join current line with next one (à la B<vi> with C<Ctrl+J>). No return value.
++Join current line with next one (a la B<vi> with C<Ctrl+J>). No return value.
+ 
+ =cut
+ 
diff --git a/app-editors/padre/padre-1.0.0-r1.ebuild b/app-editors/padre/padre-1.0.0-r1.ebuild
deleted file mode 100644
index 138b69cffcae..000000000000
--- a/app-editors/padre/padre-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Padre
-DIST_AUTHOR=PLAVEN
-DIST_VERSION=1.00
-inherit perl-module
-
-DESCRIPTION="Perl Application Development and Refactoring Environment"
-HOMEPAGE="http://padre.perlide.org/"
-
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE=""
-
-# Test Deps
-TDEPEND="
-	>=dev-perl/Test-MockObject-1.09
-	>=dev-perl/Test-Script-1.07
-	>=dev-perl/Test-Exception-0.27
-	>=dev-perl/Test-NoWarnings-0.084
-	>=virtual/perl-Test-Simple-0.88
-	>=dev-perl/Test-Warn-0.240.0
-"
-
-RDEPEND="
-	dev-lang/perl[ithreads]
-	>=dev-lang/perl-5.10.1
-	>=dev-perl/Algorithm-Diff-1.190.0
-	>=dev-perl/Capture-Tiny-0.06
-	>=dev-perl/Class-Adapter-1.05
-	>=dev-perl/Class-Inspector-1.22
-	>=dev-perl/Class-XSAccessor-1.130.0
-	>=dev-perl/DBD-SQLite-1.350.0
-	>=dev-perl/DBI-1.58
-	>=dev-perl/Devel-Dumpvar-0.04
-	>=dev-perl/Debug-Client-0.200.0
-	>=dev-perl/Devel-Refactor-0.05
-	>=dev-perl/File-Copy-Recursive-0.37
-	>=dev-perl/File-Find-Rule-0.30
-	>=dev-perl/File-HomeDir-0.91
-	>=virtual/perl-File-Path-2.08
-	>=dev-perl/File-Remove-1.40
-	>=dev-perl/File-ShareDir-1.00
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-File-Temp-0.20
-	>=dev-perl/File-Which-1.08
-	dev-perl/File-pushd
-	virtual/perl-Getopt-Long
-	>=dev-perl/HTML-Parser-3.58
-	>=dev-perl/IO-stringy-2.110
-	virtual/perl-IO
-	>=dev-perl/IO-String-1.08
-	>=dev-perl/IPC-Run-0.83
-	>=dev-perl/JSON-XS-2.2.9
-	>=virtual/perl-Scalar-List-Utils-1.18
-	>=dev-perl/libwww-perl-5.815
-	>=dev-perl/List-MoreUtils-0.22
-	>=dev-perl/Locale-Msgfmt-0.15
-	>=dev-perl/Module-Manifest-0.07
-	>=dev-perl/ORLite-1.960.0
-	>=dev-perl/ORLite-Migrate-1.100.0
-	>=dev-perl/PAR-0.989
-	>=dev-perl/Params-Util-0.33
-	>=dev-perl/Parse-ErrorString-Perl-0.14
-	>=dev-perl/Parse-ExuberantCTags-1.00
-	>=dev-perl/Pod-Abstract-0.16
-	>=dev-perl/Pod-POM-0.17
-	>=virtual/perl-Pod-Simple-3.07
-	>=dev-perl/PPI-1.205
-	>=dev-perl/PPIx-EditorTools-0.130.0
-	>=dev-perl/PPIx-Regexp-0.011
-	dev-perl/Probe-Perl
-	>=dev-perl/Sort-Versions-1.500.0
-	>=virtual/perl-Storable-2.16
-	>=dev-perl/Template-Tiny-0.11
-	>=virtual/perl-Text-Balanced-0.80
-	>=dev-perl/Text-Diff-1.410.0
-	>=dev-perl/Text-FindIndent-0.10
-	>=dev-perl/Text-Patch-1.800.0
-	>=virtual/perl-threads-1.71
-	>=virtual/perl-threads-shared-1.33
-	>=virtual/perl-Time-HiRes-1.97.18
-	>=dev-perl/URI-0
-	>=dev-perl/Wx-0.990.100
-	>=dev-perl/Wx-Perl-ProcessStream-0.28
-	>=dev-perl/Wx-Scintilla-0.340.0
-	>=dev-perl/YAML-Tiny-1.32
-	>=virtual/perl-version-0.79
-"
-DEPEND="${RDEPEND}"
-#	test? (
-#		${TDEPEND}
-#	)
-#"
-
-DIST_TEST=skip
-
-PATCHES=(
-	"${FILESDIR}/${P}-DBD-Sqlite.patch"
-)
-
-src_configure() {
-	unset DISPLAY
-	perl-module_src_configure
-}
-src_prepare() {
-	sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL ||
-		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
-	perl-module_src_prepare
-}
diff --git a/app-editors/padre/padre-1.0.0-r2.ebuild b/app-editors/padre/padre-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..189d740675e4
--- /dev/null
+++ b/app-editors/padre/padre-1.0.0-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_NAME=Padre
+DIST_AUTHOR=PLAVEN
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Perl Application Development and Refactoring Environment"
+HOMEPAGE="http://padre.perlide.org/"
+
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE=""
+
+# Test Deps
+TDEPEND="
+	>=dev-perl/Test-MockObject-1.90.0
+	>=dev-perl/Test-Script-1.70.0
+	>=dev-perl/Test-Exception-0.270.0
+	>=dev-perl/Test-NoWarnings-0.84.0
+	>=virtual/perl-Test-Simple-0.880.0
+	>=dev-perl/Test-Warn-0.240.0
+"
+
+RDEPEND="
+	dev-lang/perl[ithreads]
+	>=dev-lang/perl-5.10.1
+	>=dev-perl/Algorithm-Diff-1.190.0
+	>=dev-perl/Capture-Tiny-0.60.0
+	>=dev-perl/Class-Adapter-1.50.0
+	>=dev-perl/Class-Inspector-1.220.0
+	>=dev-perl/Class-XSAccessor-1.130.0
+	>=dev-perl/DBD-SQLite-1.350.0
+	>=dev-perl/DBI-1.580.0
+	>=dev-perl/Devel-Dumpvar-0.40.0
+	>=dev-perl/Debug-Client-0.200.0
+	>=dev-perl/Devel-Refactor-0.50.0
+	>=dev-perl/File-Copy-Recursive-0.370.0
+	>=dev-perl/File-Find-Rule-0.300.0
+	>=dev-perl/File-HomeDir-0.910.0
+	>=virtual/perl-File-Path-2.80.0
+	>=dev-perl/File-Remove-1.400.0
+	>=dev-perl/File-ShareDir-1.0.0
+	>=virtual/perl-File-Spec-3.27.1
+	>=virtual/perl-File-Temp-0.200.0
+	>=dev-perl/File-Which-1.80.0
+	dev-perl/File-pushd
+	virtual/perl-Getopt-Long
+	>=dev-perl/HTML-Parser-3.580.0
+	>=dev-perl/IO-stringy-2.110.0
+	virtual/perl-IO
+	>=dev-perl/IO-String-1.80.0
+	>=dev-perl/IPC-Run-0.830.0
+	>=dev-perl/JSON-XS-2.2.9
+	>=virtual/perl-Scalar-List-Utils-1.180.0
+	>=dev-perl/libwww-perl-5.815.0
+	>=dev-perl/List-MoreUtils-0.220.0
+	>=dev-perl/Locale-Msgfmt-0.150.0
+	>=dev-perl/Module-Manifest-0.70.0
+	>=dev-perl/ORLite-1.960.0
+	>=dev-perl/ORLite-Migrate-1.100.0
+	>=dev-perl/PAR-0.989.0
+	>=dev-perl/Params-Util-0.330.0
+	>=dev-perl/Parse-ErrorString-Perl-0.140.0
+	>=dev-perl/Parse-ExuberantCTags-1.0.0
+	>=dev-perl/Pod-Abstract-0.160.0
+	>=dev-perl/Pod-POM-0.170.0
+	>=virtual/perl-Pod-Simple-3.70.0
+	>=dev-perl/PPI-1.205.0
+	>=dev-perl/PPIx-EditorTools-0.130.0
+	>=dev-perl/PPIx-Regexp-0.11.0
+	dev-perl/Probe-Perl
+	>=dev-perl/Sort-Versions-1.500.0
+	>=virtual/perl-Storable-2.160.0
+	>=dev-perl/Template-Tiny-0.110.0
+	>=virtual/perl-Text-Balanced-0.800.0
+	>=dev-perl/Text-Diff-1.410.0
+	>=dev-perl/Text-FindIndent-0.100.0
+	>=dev-perl/Text-Patch-1.800.0
+	>=virtual/perl-threads-1.710.0
+	>=virtual/perl-threads-shared-1.330.0
+	>=virtual/perl-Time-HiRes-1.97.18
+	dev-perl/URI
+	>=dev-perl/Wx-0.990.100
+	>=dev-perl/Wx-Perl-ProcessStream-0.280.0
+	>=dev-perl/Wx-Scintilla-0.340.0
+	>=dev-perl/YAML-Tiny-1.320.0
+	>=virtual/perl-version-0.790.0
+"
+BDEPEND="${RDEPEND}
+	test? (
+		${TDEPEND}
+	)
+"
+
+#DIST_TEST=skip
+
+PATCHES=(
+	"${FILESDIR}/${P}-DBD-Sqlite.patch"
+	"${FILESDIR}/${P}-utf8.patch"
+)
+
+src_configure() {
+	unset DISPLAY
+	perl-module_src_configure
+}
+
+src_prepare() {
+	sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL ||
+		die "Can't patch Makefile.PL for 5.26 dot-in-inc"
+	perl-module_src_prepare
+}