gentoo resync : 18.08.2019

9 files changed, 63 insertions, 56 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 93d1cb61f7bd..9d604313700f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index b45551330147..5cb9b33b3470 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,7 +1,8 @@
 AUX pgfsys-luatex.def 13997 BLAKE2B 4d682ac413f03fc2c5f4bb27ffd367af121da27ba14631b1d9a30a3b80181178fa84e07a331efb2b46a0c04749c3f7ac56527b3c65259da7ca2a32a2fde4b294 SHA512 cb946ce0a946048acb03d45452c155a81d82a86cd4673ee70a07ff1e6553aa45be6d56e38cfd51988b095c540e8a3e1ff113958f6eae5255ac9dba8c46b6161d
 DIST pgf-3.1.4-pgfmanual.pdf 10376398 BLAKE2B 4e45a0d69000d1f89a995f3e5e9295b82a79af5cfd5863aba4f1fd9c3b40d05f2f07b6fc2b34a933136448728aea3dfacc4943fd013896cd4cfe52c9dc8aa3c3 SHA512 a2b934d6e9836fce0a731d238b713ebdc3764e8aa76ea4c7fd54c88f59f31fe17f8c306b6a381adc73becb410e0c6350427112e5d46ae762665fc73fcdca54a0
 DIST pgf-3.1.4.tar.gz 2426346 BLAKE2B 44d1c709774586b4de81def3d4e7133d147e9e3c1b69078789c8f62378b97a6fc6cfbd580a5f1d292190282dbec5ca4f080d4567b2e1fa526909f08e07169547 SHA512 472ffca8f465bfb5f98cbe0880887afc5b9043bfc878aa8f64a79970502546cc3e0901010b8662aa582af9bc4a90b622ade828c075396542a1e2ee7af694181c
-DIST pgf_3.0.1.tds.zip 10423731 BLAKE2B ca1513213f47279f7cb67cd6459e01082c6693c0da97e873205f2ed5dad1d3e83ccd036d6b56c245d334a4c9eff44bb81cd673962def80f075b56e6b7e0b7477 SHA512 0899e0fbd6d196504c5d15176015557d38e027429a84de661a5627fa003bfeffdb3f013df23c298b32c3a5605388160f42621e92d626e3ce88561fe4b4b7bddf
-EBUILD pgf-3.0.1-r1.ebuild 1192 BLAKE2B a9d422f622d0bc9e9cd8758aad39b0c77c8d46cbdee8841af8fef6f33634828106e74f2767fe4c1fb548eb615f8c9c890a390b4a29ea76ab6af548b92be040b1 SHA512 b01bbbc2527d1b5dc330d68e70d843bd4bdbcc74e88e4d56314c0be60c2ece52d52baf13dec22f6aac30737bd12c75513171cc4a1e3de8a93f5b55113b06b50d
-EBUILD pgf-3.1.4.ebuild 1230 BLAKE2B 7b1e0891ac100177a75a71e1985c20a7ef9bfd100649e5acecca06586d1e4fd8d649c1be9c6bed3076cac7bdfdd2826a9fb71b18068fb4ff6acac49716b1b895 SHA512 c6db4fa004aa0b074fc7fe614c05f472a70dbbeecaa3135da171bd16ff8896928df69b46c6b67a676201e0d74c5f862297809ab068c8c530e14c28c7e5b8837d
+DIST pgf-3.1.4b-pgfmanual.pdf 10371181 BLAKE2B c619e56fd184fea8761175efed7130b37b10f719e04e87b40448a0a72641f2b7c6be0270ae0c2386d91caf06d9cd46f8eb3eb9293d8ff46d8f4a8400662cc1d8 SHA512 f18e836774b8ad8d7a2adb1c876e529240907b9a9c695ab6366d4bc321766106ced3085dc0d17394d6c19654a2232e10d782e93152c075f7915ffb2f0e09b680
+DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b4204047b9dcdbeb064db48357055324ffe83bb5bd09dd8931a9c8e8768305a72b82ec77257e20badc543a5ca803b8 SHA512 4ba8d9c70d573ff69128d41b20525badf3a3bd0bbbf76ef3c2f2e54ccc05bc0bf1da1f20102df04f8188fe1733d469965228445e6c4af0611c2aa5737ed72180
+EBUILD pgf-3.1.4.ebuild 1219 BLAKE2B 3b1368900d5d6a6df35bc2d3e1bd71540123cc5276de42b18c532d80ddb77afb330d2fb8a93163a863c3a76eddd028a26c435a7dd0494a1e5a8ae6a13f50d50e SHA512 5ca81d104f6c3c9aa3c34f13e5a69dca6814a98ffaf7e6348b5b5dbc8476994c5dcba8184e4a4dea22ff8a22a175f03b119709d3d54a81fdd9e82499dadf6092
+EBUILD pgf-3.1.4b.ebuild 1230 BLAKE2B 7b1e0891ac100177a75a71e1985c20a7ef9bfd100649e5acecca06586d1e4fd8d649c1be9c6bed3076cac7bdfdd2826a9fb71b18068fb4ff6acac49716b1b895 SHA512 c6db4fa004aa0b074fc7fe614c05f472a70dbbeecaa3135da171bd16ff8896928df69b46c6b67a676201e0d74c5f862297809ab068c8c530e14c28c7e5b8837d
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.0.1-r1.ebuild b/dev-tex/pgf/pgf-3.0.1-r1.ebuild
deleted file mode 100644
index 2749c270c6df..000000000000
--- a/dev-tex/pgf/pgf-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="pgf -- The TeX Portable Graphic Format"
-HOMEPAGE="https://sourceforge.net/projects/pgf"
-SRC_URI="mirror://sourceforge/pgf/${PN}_${PV}.tds.zip"
-
-LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc source"
-
-RDEPEND="dev-texlive/texlive-latexrecommended
-	>=dev-tex/xcolor-2.11"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	# Bug #607642
-	cp "${FILESDIR}/pgfsys-luatex.def" "${WORKDIR}/tex/generic/pgf/systemlayer/" || die
-
-	insinto ${TEXMF}
-	doins -r tex || die
-
-	if use source ; then
-		doins -r source || die
-	fi
-
-	cd "${S}/doc/generic/pgf"
-	dodoc AUTHORS ChangeLog README || die
-	if use doc ; then
-		insinto /usr/share/doc/${PF}/texdoc
-		doins pgfmanual.pdf || die
-		doins -r images macros text-en version-* || die
-		dosym /usr/share/doc/${PF}/texdoc ${TEXMF}/doc/latex/${PN} || die
-		docompress -x /usr/share/doc/${PF}/texdoc/
-	fi
-}
diff --git a/dev-tex/pgf/pgf-3.1.4.ebuild b/dev-tex/pgf/pgf-3.1.4.ebuild
index b34e9dfc0947..a8ea44db8ec0 100644
--- a/dev-tex/pgf/pgf-3.1.4.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 RDEPEND="dev-texlive/texlive-latexrecommended
diff --git a/dev-tex/pgf/pgf-3.1.4b.ebuild b/dev-tex/pgf/pgf-3.1.4b.ebuild
new file mode 100644
index 000000000000..b34e9dfc0947
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.4b.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+DESCRIPTION="The TeX Portable Graphic Format"
+HOMEPAGE="https://github.com/pgf-tikz/pgf"
+SRC_URI=" https://github.com/pgf-tikz/pgf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://github.com/pgf-tikz/pgf/releases/download/${PV}/pgfmanual.pdf -> ${P}-pgfmanual.pdf )"
+
+LICENSE="GPL-2 LPPL-1.3c FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+RDEPEND="dev-texlive/texlive-latexrecommended
+	dev-tex/xcolor"
+
+src_install() {
+	insinto "${TEXMF}"
+	doins -r tex
+
+	if use source ; then
+		doins -r source
+	fi
+
+	cd "${S}/doc/generic/pgf" || die
+	dodoc AUTHORS ChangeLog README
+	if use doc; then
+		insinto /usr/share/doc/${PF}/texdoc
+		# pgfmanual is now split from the main tar archive
+		newdoc "${DISTDIR}/${P}-pgfmanual.pdf" pgfmanual.pdf
+		doins -r images macros text-en version-*
+
+		dosym "/usr/share/doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		docompress -x "/usr/share/doc/${PF}/texdoc/"
+	fi
+}
diff --git a/dev-tex/pythontex/Manifest b/dev-tex/pythontex/Manifest
index 5b021ed90780..bdfbf9acfc96 100644
--- a/dev-tex/pythontex/Manifest
+++ b/dev-tex/pythontex/Manifest
@@ -1,3 +1,3 @@
 DIST pythontex-0.16.tar.gz 1787147 BLAKE2B b7b765fdf681f6a757d5dc14437ae433f8310d18ad9e2efe95a8853eaf9f53e2925d7f9e45e0393eb2720019270187fb400e7a6754f18015c4ce5db8a9280729 SHA512 9a84fd7b7f568308addf9ba01c46fadfaface54b9d484c766831f1048064288fd1ecb5c56774bb0041d8f5705f8d5f8a9cd7258dc33157467eca7b3c70259183
-EBUILD pythontex-0.16.ebuild 1214 BLAKE2B 690c25953ae3aaf3c813fb1415a6e27fe33f82928721c66536b29acac74130534ec0c2c6ec48de79292c7824f68d73cce803891ff20717beb9dede49a9bd992d SHA512 28046fd0dcd3d5a9de49dd63c7e0ed73efc415587467256c093e19a0491656c99f1874d3d14f0d879cd41ec1e377e5c159ccaed85171b3e462ac554790ee7575
+EBUILD pythontex-0.16.ebuild 1198 BLAKE2B 47d0fc4c880df4cd9ff1fde3f27544d446cadca02692696f0a0300b10c6e45579d12046abf0daa36253dc20f0565328ff0526937fdd7058bf4e1c8680a359940 SHA512 84e552c53fb1ce513a8ebbb060a2a19812a4735ac4eb146a173b7abb3dcc847bb4a6f308d1310ff8dbd0941582f6f37f0ac6d193de5faa7b0070f588112ef9d2
 MISC metadata.xml 455 BLAKE2B 29194bce5b2d503fcc93f46304a0473988315bda823c61ca1d63b2e0f41d4266d2197affe33bbcd46a889f5602952765a89b3236cf2cde6f0687519112b11e6c SHA512 8f87ee6e99c9cd263e6e6ec6241a463b2c3c7496a03314998015840a332fcfb3a9ebd7ac2970faa7afabde5ced10d1bdf5c553d2ae91c20bc97a0295c9250a3d
diff --git a/dev-tex/pythontex/pythontex-0.16.ebuild b/dev-tex/pythontex/pythontex-0.16.ebuild
index 91e46e98f50e..60a36dee8a0d 100644
--- a/dev-tex/pythontex/pythontex-0.16.ebuild
+++ b/dev-tex/pythontex/pythontex-0.16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit latex-package python-r1
 
@@ -22,7 +22,7 @@ DEPEND="${PYTHON_DEPS}
 	>=dev-texlive/texlive-latexextra-2016
 	dev-tex/pgf"
 RDEPEND="${DEPEND}
-	highlighting? ( dev-python/pygments[${PYTHON_USEDEP}] )"
+	dev-python/pygments[${PYTHON_USEDEP}]"
 
 TEXMF=/usr/share/texmf-site
 
diff --git a/dev-tex/xcolor/Manifest b/dev-tex/xcolor/Manifest
index 8421e4aeab81..5584fc0240c9 100644
--- a/dev-tex/xcolor/Manifest
+++ b/dev-tex/xcolor/Manifest
@@ -1,3 +1,3 @@
 DIST xcolor212.zip 769972 BLAKE2B 4d8b1dbf123fae07e6ecfdd90150d82b4932e64941598774d8bad4b009db15491d831bdaa03266a925724bac2d22bd28adf7e936f991d4d0d90a14de4ec81722 SHA512 66255b29aa7d2eb11239fa9ce1a12e2b9397028d84b1503fb5bbf06276b597263224eccd064f1e87f7bdb2e96b0ae2d564bb7cb99b92907ccfc2468492a3479e
-EBUILD xcolor-2.12.ebuild 863 BLAKE2B ab751b55b4184f46d469ac76ab50bc8de142b86770eca5f4f06c3ec8f056263ada0d7dfc3d476d91d4c810bdc6364cf6466782eee5f7671489099e4446b905a6 SHA512 52dca55a50799ec384cda8e619659ffcfa5e149fe755a671bed077af470bd41dd6963138c6bca8d72268589ca91e43d10e4387a95cc072297fca332a21aaa4c5
+EBUILD xcolor-2.12-r1.ebuild 1052 BLAKE2B 7e7f43476b4d5eb2cee66197dc35efd2e68ef16f82ade44da8cbf9d4c8dfdd307705e9292b8b7d3ea887d3bdf2acc483970e620fc58693de5671bcc178fc5140 SHA512 a5296fd154cb105932545f4415eafa0e06c499d765ee621a07d6ce8c377a00e262b6c2f338709a2cb8887202e34ff0f7e0c9a510987560cc3c9eef114e59df01
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/xcolor/xcolor-2.12.ebuild b/dev-tex/xcolor/xcolor-2.12-r1.ebuild
index d36d4c1c9aff..c1c0591fdf3e 100644
--- a/dev-tex/xcolor/xcolor-2.12.ebuild
+++ b/dev-tex/xcolor/xcolor-2.12-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit latex-package
 
-DESCRIPTION="xcolor -- easy driver-independent access to colors"
+DESCRIPTION="Easy driver-independent access to colors"
 HOMEPAGE="http://www.ukern.de/tex/xcolor.html"
 SRC_URI="http://www.ukern.de/tex/xcolor/ctan/${P//[.-]/}.zip"
 
@@ -20,17 +20,26 @@ DEPEND="${RDEPEND}
 	doc? (
 		dev-texlive/texlive-pstricks
 		dev-texlive/texlive-latexextra
-	)
-	app-arch/unzip"
+	)"
+
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}"
 
 TEXMF="/usr/share/texmf-site"
 
+src_prepare() {
+	if has_version '>=dev-texlive/texlive-latexrecommended-2019'; then
+		#sty filename has been changed in tl2019
+		sed -i -e s#fvrb-ex#fancyvrb-ex# xcolor.dtx || die
+	fi
+	default
+}
+
 src_install() {
 	export VARTEXFONTS="${T}/fonts"
 
-	latex-package_src_install || die
+	latex-package_src_install
 
 	dodoc README ChangeLog
 }