gentoo resync : 17.02.2021

3 files changed, 15 insertions, 13 deletions

diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
index d61847c71e20..def90aab6a47 100644
--- a/app-text/dblatex/Manifest
+++ b/app-text/dblatex/Manifest
@@ -4,6 +4,7 @@ AUX dblatex-0.3.11-no-inkscape-dependency.patch 753 BLAKE2B 2199d6068d86be9a0a63
 AUX dblatex-0.3.11-path-logging.patch 554 BLAKE2B 7b078b4f0bacaffb3449122b561c264de8c8970fe4cbf5459c5ec651aecd3e3ccb7dcc95bfcc8277686133bc3187a5952edd1bc88dae11c2ddac3aa4060333b4 SHA512 ae08b08a435393bf94039edd8b74457a1d4475d8473fa450b41a993ca4ded08f79566bf2dc78144df977fe1f975e1c60b9d02b2dc4579f8c7d65839946e3de05
 AUX dblatex-0.3.11-setup.patch 1751 BLAKE2B a83e41c4fa68eaee1b6e80404cd5486e64f117ca07314463ca0369cd3bc9d64dbdeb8f5fa2f44bee2704c37dda0e1564c461c7d39b1439aa76800032dd96acad SHA512 f77a82876fe28fdc6f9cc689c8b789fd09e703ca4625207fe81a35b1491bcd46a398eb78781fac60c33ac2efcd3d0957fb3604f8a54cd411b0fd4031016ef5fc
 DIST dblatex-0.3.11py3.tar.bz2 1671505 BLAKE2B 44e89f5f8d81105a3401074ad765479c04a495962c3efb3677cec81bf3b85c67a03585e7da8bdbd103cbea84e38d2bc633bd13704a5835c98d70fed644bfc6ba SHA512 48c1445c702e9c7c3ff83c57bb8a0caf5f4b027669a70887af0a23f75f5f99fb6840c4281b8bad9402910f3850af485d432e3109e5fd93184434cc87eb712695
-EBUILD dblatex-0.3.11-r1.ebuild 1814 BLAKE2B 05bb33b428ce07f633428183336ce173ea4c41977803eb356042a750dc6a6f4cdfa6efb82a7119ec9488f7d8d4b0445ef7731df7231935995a1ca46995ac6971 SHA512 eecf1f580dc811a573f48d2b0c45898eac04ccf2de1429cb1b0fd272e68125c01296c4ea40180f9085851254c3b6b06dec06ce0a40bb10fb3459aa018c3eeab5
-EBUILD dblatex-0.3.11.ebuild 1618 BLAKE2B 427f03056dfe0ac8d2b8f80b046c76b5aa0110f85d49ac07bcca8978df94d122f5996d0d02d485af58bd9b031351ca58e6bb688bd166ee7030005166669967fe SHA512 35471efbc664a9002296d8ed5dd1644c246056ed6a1adc40932da3cce05211b7e9917f357902d5c9420e74d87b6fb3910f3257ef6b6baae6009a58880b826032
+DIST dblatex3-0.3.12.tar.bz2 1693272 BLAKE2B 9310ce5db3b5f92e183f2656c5b1881edaf0208ae4f78f853332c844258fa38d443921fc42c03301773b1451ce272a538c305d765acbdc6eafbdcf25ebf5d2d3 SHA512 5bfa774c8dbe362775f6bbb5e1196e5a2bb1af239778133c12ddc725406ced67f3ff422433a2a1aa02d4431e9be58ba12e918379deb81fcd5b96533d2bdf029a
+EBUILD dblatex-0.3.11-r1.ebuild 1820 BLAKE2B dae0007360430126d2b962f5545eb13978bd691e5b33194abe73816d065a0918af3cce35e3556bc9cb814ec24322442d81077fb65621ac3e799b2972d706517d SHA512 b407637dca76a9954ff5fa0bba939730b36e990ef4211b989fbb11b538039776b62157cd8e55ebbadc8cebddb89fa16bd2cbaf96762bfa6208911a63035a4dec
+EBUILD dblatex-0.3.12.ebuild 1723 BLAKE2B 0dbbaa553ba480e28b9fda4eb07099bfad6042f9a93b1ca97298f1c0980e896e529e108ed31b46a542a782f862528c337aecd41a7df6561f48ad6de953b4bf9d SHA512 8563fe8fe143f297cf976c1dbfea61a2906bbbcba0312159e671333055e645a3efc6d8b2b1d11717f4cae08eadde715341b3e6c8bc4ea994f9a0fafb74e7ded4
 MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 19c45bd966b6..53b5cafc6a3f 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc64 ~sparc x86"
 IUSE="inkscape"
 
 RDEPEND="
diff --git a/app-text/dblatex/dblatex-0.3.11.ebuild b/app-text/dblatex/dblatex-0.3.12.ebuild
index 7edb8877dcf7..ad230da69644 100644
--- a/app-text/dblatex/dblatex-0.3.11.ebuild
+++ b/app-text/dblatex/dblatex-0.3.12.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Transform DocBook using TeX macros"
 HOMEPAGE="http://dblatex.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.tar.bz2"
+SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${PN}3-${PV}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 IUSE="inkscape"
 
 RDEPEND="
@@ -35,20 +35,21 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${P}py3"
+S="${WORKDIR}/${PN}3-${PV}"
 
 PATCHES=(
-	 "${FILESDIR}/${P}-path-logging.patch"
-	 "${FILESDIR}/${P}-setup.patch"
+	 "${FILESDIR}/${PN}-0.3.11-path-logging.patch"
+	 "${FILESDIR}/${PN}-0.3.11-setup.patch"
+	 "${FILESDIR}/${PN}-0.3.11-encode.patch"
 )
 
 python_prepare_all() {
 	# Manual page is precomressed, but we will use our own compression later.
 	gunzip docs/manpage/dblatex.1.gz || die
 	# If we dont have inkscape we need to use an alternative SVG converter
-	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
-	# We need to fix version information in the docs and some metadata
-	grep -l -I -R "0.3.11py3" | xargs -n1 sed -i -e "s/${PV}py3/${PV}/" || die
+	use inkscape || eapply "${FILESDIR}/${PN}-0.3.11-no-inkscape-dependency.patch"
+	# If we use inscape however we want to make dblatex compatible with v1.0
+	use inkscape && eapply "${FILESDIR}/${PN}-0.3.11-inkscape-1.0.patch"
 	distutils-r1_python_prepare_all
 }