gentoo resync : 25.08.2020

7 files changed, 78 insertions, 100 deletions

diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index b94b036dcadb..d878cbdaf5f1 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
-AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
+AUX po4a-0.60-man.patch 577 BLAKE2B e2f9263b5c92b798224a1ae9ba9e3358bbf755f0573c34512151e7110517ecd7570b7946291de945f8f6557f6ff4b33c2d4f7900c4937ea284fe11e23f50c8a4 SHA512 5d88645d35234723f3b397953bf1aaaa8160fa591dd86430663f270ad10e4d5cceb7957774ce741bc0a46f37120473cb511eab88e78c0826717a4c5761d1c13a
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
-DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B d648029b8afc30b50ff4b216bc46b37731ff7bb471aeec21ada1244f37f9b431c392e0f32b1bf3f16cc15e7fc79946a23aef976548382b998057812d8366a593 SHA512 1ee6216f7c8f1aa4ba51cd96c6a2fd4b5361d8727fa056a333d96f1413aa76fe19480d5e77602a32b526d99a4b436a103fbe93a58856c2e4021c85c5cc20d53c
-EBUILD po4a-0.57.ebuild 1315 BLAKE2B 4af0025a0c55dfa8931872aace40c26f78ece5cd960450745191cc12a86df4f32cb8f92a86f24b72ccbd1d17a1620f6b8df5ce21107265440ba1b9247850dfe9 SHA512 c03cd5ef922f15cb4ee5e572a37f612822d66a8e20a788a3b9a9b1eecca34f129efca0175f188b0b3bbc9330745e844a604a3766fb64c0f91c0d7ae863f1395d
-EBUILD po4a-0.59.1.ebuild 1365 BLAKE2B 1d2364833b47fd38ad32290cd4942da8bebe13a266dd27dcc21b6265361bea45689a86771c49aab3a4f2478f6a350188f80bbaa9cca9572ca70619405ed52d02 SHA512 291da03d42b6039bcb35505161b8da6d7198b7f995130293d9d2582e26d7c01adaeee344791c84b55693c45ebbfc974743387f604bcbea6efcbfec6acf1536ad
+DIST po4a-0.60.tar.gz 3799018 BLAKE2B cecc260af82318fa4dfeab7ef81a29256f6531d8d97afe379d0e3291197f5b9bd0a4379697f23186de0a70ff3476cedae98bedd19bf7cddf59e9503ffbc90202 SHA512 b1e32169221d6aaf49fa0e6a42e45a858c8608a62470e5d5b769da985e4d03e09a220384400fe36f740447770331f7b8b821f00dc9ce68d3c7b00178c146c6a9
+DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
+EBUILD po4a-0.57.ebuild 1267 BLAKE2B 066c64d168e931c61098c860e15def7a08782555f9adb85dcd700aca61d832305938b3d27ce5e7ad1b0d015cecbe8e83f3c3f09432f3f3ab30913adacda09c43 SHA512 8b636a4e7ebe708d3f248f7f89b2ceabfe8a7b6502704a6b8bfaadf9b159338139666871d9e06cfdf8188e760634c6aa8837cba998aef6df09509e06ee1029ce
+EBUILD po4a-0.60.ebuild 1320 BLAKE2B 749a40a9f392816f384cbd7e76e92553ccfcca9174c8179987059106da6453be2cd2d817c2fca80696dabaa4f04ee871dc7e3d11742db6900155afcb249f5f8f SHA512 a498934bf3d554cf042506ebd4642509ac5042f8258a220715ece60786e85cb202851f2bd7b177d84eb9f518a4ca5b80f68e4e440758ef9b9b2919b94f44d816
+EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
deleted file mode 100644
index 226fa0e9b6e2..000000000000
--- a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Kent Fredric <kentfredric@gmail.com>
-Date: Tue, 13 Jun 2017 21:10:34 +1200
-Subject: [PATCH] Fix broken use of lib '.'
-
-   "'.'" is not "."
-
-Bug: https://bugs.gentoo.org/614122
----
- Build.PL | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Build.PL b/Build.PL
-index 43c6f80..9ee443b 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -1,6 +1,6 @@
- #!/usr/bin/perl
- 
--use lib q('.');
-+use lib q(.);
- use Po4aBuilder;
- 
- my $build = Po4aBuilder->new
--- 
-2.13.1
-
diff --git a/app-text/po4a/files/po4a-0.60-man.patch b/app-text/po4a/files/po4a-0.60-man.patch
new file mode 100644
index 000000000000..40927dbda818
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.60-man.patch
@@ -0,0 +1,18 @@
+--- a/Po4aBuilder.pm
++++ b/Po4aBuilder.pm
+@@ -232,7 +232,6 @@
+         }
+         $parser->parse_from_file ($file, $out);
+ 
+-        system("gzip -9 -f $out") and die;
+         unlink "$file" || die;
+     }
+ 
+@@ -250,7 +249,6 @@
+ 		print "Convert $outdir/$outfile.$section (online docbook.xsl file). ";
+ 		system("xsltproc -o $outdir/$outfile.$section --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $file") and die;
+ 	    }
+-            system ("gzip -9 -f $outdir/$outfile.$section") and die;
+         }
+         unlink "$file" || die;
+     }
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
deleted file mode 100644
index 6322c6a37700..000000000000
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
-PLOCALES_BACKUP="en"
-
-inherit perl-module l10n
-
-DESCRIPTION="Tools for helping translation of documentation"
-HOMEPAGE="https://po4a.org/"
-SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-text/openjade
-	dev-libs/libxslt
-	dev-perl/Locale-gettext
-	dev-perl/SGMLSpm
-	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N
-	sys-devel/gettext"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-perl/Module-Build
-	test? (
-		app-text/docbook-sgml-dtd:4.1
-		virtual/tex-base
-	)"
-
-# Running tests in parallel fails
-DIST_TEST="do"
-
-PATCHES=(
-	# Fix bad escaping of '.' in @INC modification
-	"${FILESDIR}"/${PN}-0.45-614122-no-dot-inc.patch
-	"${FILESDIR}"/${PN}-man.patch
-)
-
-src_prepare() {
-	# Check against locale files in ${S}/pod/bin for mismatches
-	# with languages listed in PLOCALES
-	local locales_path="${S}/po/bin"
-	l10n_find_plocales_changes "${locales_path}" "" ".po"
-
-	# Get rid of disabled locales
-	my_get_disabled_locales() {
-		PERL_RM_FILES=( "${PERL_RM_FILES[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
-	}
-
-	l10n_for_each_disabled_locale_do my_get_disabled_locales
-
-	einfo "Your LINGUAS lists the following languages: ${LINGUAS}"
-
-	perl-module_src_prepare
-}
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index fd37e00722ab..a6016b45c7ed 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.59.1.ebuild b/app-text/po4a/po4a-0.60.ebuild
index 6d9d46d247b7..8807618f22d5 100644
--- a/app-text/po4a/po4a-0.59.1.ebuild
+++ b/app-text/po4a/po4a-0.60.ebuild
@@ -6,11 +6,9 @@ PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_B
 
 inherit l10n perl-module
 
-MY_P="${P/-/-v}"
-
 DESCRIPTION="Tools to ease the translation of documentation"
 HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -36,9 +34,8 @@ DEPEND="${RDEPEND}
 		dev-perl/Test-Pod
 		virtual/latex-base
 	)"
-S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-man.patch )
+PATCHES=( "${FILESDIR}"/${P}-man.patch )
 
 DIST_TEST="do"
 
diff --git a/app-text/po4a/po4a-0.61.ebuild b/app-text/po4a/po4a-0.61.ebuild
new file mode 100644
index 000000000000..f17215b23e4a
--- /dev/null
+++ b/app-text/po4a/po4a-0.61.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sr_Cyrl sv uk vi zh_CN zh_HK"
+
+inherit l10n perl-module
+
+DESCRIPTION="Tools to ease the translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/opensp
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	sys-devel/gettext"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		dev-perl/Test-Pod
+		virtual/latex-base
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.60-man.patch )
+
+DIST_TEST="do"
+
+src_prepare() {
+	l10n_find_plocales_changes "${S}/po/bin" '' '.po'
+
+	rm_locale() {
+		PERL_RM_FILES+=( po/{bin,pod}/${1}.po )
+	}
+	l10n_for_each_disabled_locale_do rm_locale
+
+	perl-module_src_prepare
+}