gentoo resync : 10.02.2020

10 files changed, 95 insertions, 4 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index f3ce8387dfa7..a862c028af7f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/crosstex/Manifest b/dev-tex/crosstex/Manifest
index a1f8111c7f85..087ae2f11a3d 100644
--- a/dev-tex/crosstex/Manifest
+++ b/dev-tex/crosstex/Manifest
@@ -1,3 +1,3 @@
 DIST crosstex-0.6.tar.gz 2366411 BLAKE2B 75ecfbb16b67c9cf7e8bce7e62b4fbc7693b57593196987f066d5ede5c7bdfabeb600d081d9e35eaa0ead830cfa5f97810d971583d951913025cccf42e33e1c9 SHA512 88d42ddbe4b229838c0750bbaf6d099349679a66859e8c28e03888d06bbc4641dd815a37e167700f6494a53e950245af864ea260a7779c3fd50e65cd968de08c
-EBUILD crosstex-0.6-r2.ebuild 899 BLAKE2B 9c2de988b5893880bf1f029b677a0937f79d37c8ccf2d248922222351b5028d8287e78faa27dcdd582cefdfa996f25f8f5dd840b227c80ff7a7746339d97ac24 SHA512 72f437759aea7db0e88f118f8d1e57c6d136788d6fbd131b9650c63a9ef64c578c9f1c190d16ea92b2b2ce7883446cc22ed232b75038a6c8064569b5fc654514
+EBUILD crosstex-0.6-r3.ebuild 932 BLAKE2B ff7be60f2d6297516ba1276876ad2fbde2ae52fc3643eb2b2fa3f6ca45b3adebdab2e09d13e5a3adc99255d7d951dd06b23478ee2de3f4115cbb0cd26d83979a SHA512 4f6d4c6b3cbc601dd4799a80a5caeb9ebb27ed124788e91fe2ae84cd6f95741aaf5e310aeab97febc5635c6b0ff66d02ef645de7ba55929d42c131f6ba5be27d
 MISC metadata.xml 327 BLAKE2B b401e5a95533706ef9ec9d59c7601073de96e18d0faf5fa553472b559345055928dd7978a2f513bc1d92c29bfca7bdcb29c316d09f113b6e0cdc2fe95d6b768c SHA512 8426ec7478b97340f66c69fd58c187f1d3d6ac874703a09bf47620c9f57a015519d1ae4ab424a3ea10718c514feb8ad0e6d91b4516d6cf9f06d8b3278e2bb8e7
diff --git a/dev-tex/crosstex/crosstex-0.6-r2.ebuild b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
index 9e986f7cd802..ab2375f5c2c6 100644
--- a/dev-tex/crosstex/crosstex-0.6-r2.ebuild
+++ b/dev-tex/crosstex/crosstex-0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,9 @@ IUSE="examples"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/ply[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/ply[${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${RDEPEND}"
 
 src_install() {
diff --git a/dev-tex/pdfannotextractor/Manifest b/dev-tex/pdfannotextractor/Manifest
index b3332d170954..6655eb1d4f36 100644
--- a/dev-tex/pdfannotextractor/Manifest
+++ b/dev-tex/pdfannotextractor/Manifest
@@ -1,3 +1,6 @@
+AUX PDFAnnotExtractor.java.patch 1043 BLAKE2B 7630ce97561e6c92ebb834539cfc93b2247b49249195e738c952b99671ee33331ac2fc2a655af5bfb2469b9015e78cbd1084d9b20097b5cbbf20cf980f81a009 SHA512 d5b727d1fce4e23a7e4054a6bb1644165dfac207f20371cee0e7935f0d750c33e65a650b590fb97a6c7216137df05f7a0cf4cc4a37428535efea82866379a078
+AUX StringVisitor.java.patch 449 BLAKE2B a294525c1ae93bd5349f7321827e294460c41aed37b81ef436fd2d73388e0c2d54e84da998bf1134f205c026252bf2d7a9beba93a5467ede8fe03595e5100023 SHA512 50982eae2e9479f359daae5ae711207a425fe16af1b9e2a9eea321bde791404fc4a2036e98966c628c8a5c561093fba92e1420709949642a69895669097002e5
+AUX javajars.patch 403 BLAKE2B 1895fcc6398bdbdcff5d6828da11a4d9b2baa5b52eae01a2c3297f265432102fa61283031fc71630ab70b7be9c33a88093bde01bd1c154aadd870cf880fe61cb SHA512 c140c8d6c306c04e092a491a09dfe67cee3afd824790c022ed49198b5ce004481c28addd985427cafbebc350ab8a1c03a5bccfd655bb60631ba3c3e63247a600
 DIST pdfannotextractor-0.1l.zip 48496 BLAKE2B f6c5be87c1b083f8a7b6e894e8ffd0f28b910c67661a9a773164c18ca27acafa22252a78e57d8c521abee2a57f3ce55f55067c7a7b54d51760ed0188571d64df SHA512 043a12545889cbdf9309024bcb381a70eef6ac1c1a3214d678b606c97102dde6cfd473fbd8057f9ed7badebd0fc85db0ce0e05f361a71f8b8c3f71e523f8beba
-EBUILD pdfannotextractor-0.1l-r1.ebuild 1011 BLAKE2B 5dc9be4ab07dca32e9cfaea1f1fa07ca346f392c06e6fd16fecb5aed14e8c608d410507b6d743863e33a88c8dd4cb8764c8b8588033dba6ed9260c08ab8f527e SHA512 c3bd3f48aa2ae4421c52c63281ff887035e69d4e39e2ac4a3252d2b14bbe4dfcaeaf4207800280a5ee4bab0e626dce5ef8ebc7c050f706c47f5557d676895a5e
+EBUILD pdfannotextractor-0.1l-r1.ebuild 1173 BLAKE2B 3b9f45d9643e74b0893823a656171423215ae08c9945c0c456a9d37a27275d2ef5341b90efa5d4af17ebd41ca7f1d5d448545552b17f038b14082085fd8d057b SHA512 793b645c2415516c304afe94d0c45b57be592a86d01bd675557da71a4ff44eef681a1e0d76a696f300a5638d3be8572de674023200ef4432f219b1458516b8ad
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
new file mode 100644
index 000000000000..88c8d372e089
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/PDFAnnotExtractor.java.patch
@@ -0,0 +1,25 @@
+--- PDFAnnotExtractor.java.org	2015-11-26 16:20:12.614852847 +0800
++++ work/source/latex/pax/src/PDFAnnotExtractor.java	2015-11-26 16:21:42.592303074 +0800
+@@ -24,14 +24,14 @@
+ import java.text.*;
+ import java.util.*;
+ 
+-import org.pdfbox.cos.*;
+-import org.pdfbox.pdfparser.*;
+-import org.pdfbox.pdmodel.*;
+-import org.pdfbox.pdmodel.common.*;
+-import org.pdfbox.pdmodel.interactive.action.*;
+-import org.pdfbox.pdmodel.interactive.action.type.*;
+-import org.pdfbox.pdmodel.interactive.annotation.*;
+-import org.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.pdfparser.*;
++import org.apache.pdfbox.pdmodel.*;
++import org.apache.pdfbox.pdmodel.common.*;
++import org.apache.pdfbox.pdmodel.interactive.action.*;
++import org.apache.pdfbox.pdmodel.interactive.action.type.*;
++import org.apache.pdfbox.pdmodel.interactive.annotation.*;
++import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.*;
+ 
+ public class PDFAnnotExtractor implements Constants {
+ 
diff --git a/dev-tex/pdfannotextractor/files/StringVisitor.java.patch b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
new file mode 100644
index 000000000000..1b6a9d1d9161
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/StringVisitor.java.patch
@@ -0,0 +1,14 @@
+Index: work/source/latex/pax/src/StringVisitor.java
+--- StringVisitor.java.org	2015-11-26 16:20:35.434967156 +0800
++++ work/source/latex/pax/src/StringVisitor.java	2015-11-26 16:20:56.504072659 +0800
+@@ -22,8 +22,8 @@
+ 
+ import java.io.*;
+ import java.util.*;
+-import org.pdfbox.cos.*;
+-import org.pdfbox.exceptions.*;
++import org.apache.pdfbox.cos.*;
++import org.apache.pdfbox.exceptions.*;
+ 
+ public class StringVisitor implements ICOSVisitor {
+ 
diff --git a/dev-tex/pdfannotextractor/files/javajars.patch b/dev-tex/pdfannotextractor/files/javajars.patch
new file mode 100644
index 000000000000..bc52050e7b06
--- /dev/null
+++ b/dev-tex/pdfannotextractor/files/javajars.patch
@@ -0,0 +1,13 @@
+Index: work/scripts/pax/pdfannotextractor.pl
+===================================================================
+--- work.orig/scripts/pax/pdfannotextractor.pl
++++ work/scripts/pax/pdfannotextractor.pl
+@@ -84,6 +84,8 @@ my @jar_pdfbox = qw[
+     PDFBox-0.7.2.jar
+ ];
+ my @dir_jar = qw[
++    /usr/share/pdfannotextractor/lib
++    /usr/share/pdfbox/lib
+     /usr/share/java
+     /usr/local/share/java
+ ];
diff --git a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
index 1b6371bf6dbe..5ae9bb84c9eb 100644
--- a/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
+++ b/dev-tex/pdfannotextractor/pdfannotextractor-0.1l-r1.ebuild
@@ -36,6 +36,12 @@ EANT_GENTOO_CLASSPATH="
 	pdfbox-1.8
 	fontbox-1.7
 "
+src_prepare() {
+	eapply "${FILESDIR}"/javajars.patch
+	eapply "${FILESDIR}"/StringVisitor.java.patch
+	eapply "${FILESDIR}"/PDFAnnotExtractor.java.patch
+	default
+}
 
 src_compile() {
 	cd "${S}/source/latex/pax" || die
diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 6ad5cb1df153..04e84c4b432f 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,3 +1,5 @@
 DIST rubber-1.4.tar.gz 109357 BLAKE2B e624674fdadae52890d5599450b741db39c3ddf2ca382a2e87941a87db346cfa33e96e2fb468f052d3f94b7b2086628e675971203a9a4181385c059196fc3df0 SHA512 8b4a9f689702505e19543e5295375c14ae93fb9d6b89d1234fda093d4161551bd58c2485b53678f141d52a140002df08856cfa059f6287721402b74b0ef666f7
+DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c53d9923ce10efc0aaf8a62a962cb2f1c27a0e7a19a9be96710edba923d93589d816aa22305eec33fd08aa08c SHA512 ba22eeddc24b4f9abf0bf087604a4261add648877ec558b766555de09538cd20c21c8cfd9731c1421540bb2479501dd6ed066346d250c6bc981529e31efacc40
 EBUILD rubber-1.4.ebuild 592 BLAKE2B a9a9de9ce465280cedb04efc859ce865c9bf106181a39a4ebcf48d23495eabf313f4bb75e167727da7378ac12086df091e51fca2a57c203f639a1a04ee9e663d SHA512 41a41cb3f4e1286b6659a1c3182d20230097d633c3ce1ea07487a3e2f5b3d678a83024c01dd57ec97d49128198a103c3f893304962575219a07dd9ea72522e6b
+EBUILD rubber-1.5.1.ebuild 653 BLAKE2B 048ca0d9f4b30118f4712e19beeb3ee4c7b70883e14d1daab880a719f793b08c9993e420fd39c14de9c62f4bf39967689de74c4b30bb48b6bf47bfacc10bd300 SHA512 5c5b9a293df49d8d121172bd73b19d5b9cd7ab113873cbff1c29fc420c788479956fa6c67abc56a873e3d71c5fce9366cb36b35842fc4890659766ccc0950115
 MISC metadata.xml 323 BLAKE2B 46540c17674230be613731fbca57ec01370930462c33976af5d00763468eaa70705959ab5d45312430cab731d33ca04f6d8f74788a94c5de7a7bdd9a977f860b SHA512 038fa245ced154fbe7876039c19b87f414d06db21c9b9114274c2ced4221217ffa52e4cafdde1283c00155a3d4249cd7cddbfbdf24122aa67c1ca0f330f9d517
diff --git a/dev-tex/rubber/rubber-1.5.1.ebuild b/dev-tex/rubber/rubber-1.5.1.ebuild
new file mode 100644
index 000000000000..dd7a18c0aa7b
--- /dev/null
+++ b/dev-tex/rubber/rubber-1.5.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A LaTeX wrapper for automatically building documents"
+HOMEPAGE="https://launchpad.net/rubber/"
+SRC_URI="https://launchpad.net/rubber/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/latex-base"
+BDEPEND="${RDEPEND}
+	virtual/texi2dvi"
+
+python_install() {
+	distutils-r1_python_install \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--infodir="${EPREFIX}"/usr/share/info \
+		--mandir="${EPREFIX}"/usr/share/man
+}