commit: eaf675c750c6ab524dbb3dd84a34b6cb3989d033 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Oct 31 13:27:59 2021 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Oct 31 13:28:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaf675c7
app-editors/padre: EAPI=8 bump, fix unicode bug Closes: https://bugs.gentoo.org/820476 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> app-editors/padre/files/padre-1.0.0-utf8.patch | 23 +++++ app-editors/padre/padre-1.0.0-r1.ebuild | 113 ------------------------ app-editors/padre/padre-1.0.0-r2.ebuild | 115 +++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 113 deletions(-) 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 00000000000..94675074755 --- /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 <g...@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 138b69cffca..00000000000 --- 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 00000000000..189d740675e --- /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 +}
