gentoo resync : 31.05.2021

5 files changed, 20 insertions, 8 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 4ffc121f8142..534ec0d2cbf9 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/dvi2gr/Manifest b/dev-tex/dvi2gr/Manifest
index 07443f081c99..37a54eec0ff3 100644
--- a/dev-tex/dvi2gr/Manifest
+++ b/dev-tex/dvi2gr/Manifest
@@ -1,3 +1,3 @@
 DIST dvi2gr-0.4.tar.gz 10240 BLAKE2B 2caeae03e7d0219542cdc939e6419f84ddcde7050509ec073dfb8010b3f957129f09ca5a25fcda3e058bbfaa1fca772927e036cdfe67cf95fea090b53579bcfe SHA512 d0b69eac3ffb9e6975195fae0a8a16c58c547eb6ffa8954799cfacf88ea1fdfe943cdbd6665694d8c346e5dda88b8df3b031a620323158081cbac45a7e44be19
-EBUILD dvi2gr-0.4-r1.ebuild 914 BLAKE2B e798883add8544842173f224dc069e268c397670049eb8c3a59f72d0c8c2660e5c932c73307292d7c6c4744f5e707a859a8599f079ffd3a6b168d7cd62cc5af4 SHA512 b17e30793f35e6392496812e8881b21bd124a7b6c83009e959d4339e9e224cfaa1d60284f5e3a2bf9dbdb2feb7ba2d4655e3d29f6e01bcd9090562345d8c3ccf
+EBUILD dvi2gr-0.4-r1.ebuild 1094 BLAKE2B 0c1a6847a3f1a3d66b4e382b0817ab63228d7c2963a11cc8938584cfe0c7c9f61ec0fc381b94b767e97a4fcc8971e9d95fc388be5c36682d324178f474468d52 SHA512 580ce997d0fc2b09614146337d36efd6475dc3de2d8e09f00484bcd25ef68e19f20b35e84e4a29c280b3bb82168ba895c143196b7b5e9e5c10249e08c078927c
 MISC metadata.xml 415 BLAKE2B 3deb0cf15844afb12fc48abcef56a46d52f1d611e65463fed37f116d802dd6d22852299f1c830f97809afe289732edef0a99e27adc1a217317dd4e70552c7281 SHA512 d4a50911514e2caa79ec7fd6c7393b99c83a7e1f4704137ea1c62633f324b21e7ceabb097430aba6b6b60ed587ce9019e3c5db7b6544e8aed6293938b2376b0a
diff --git a/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild b/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
index c22237d8ef22..2cdba6f09ec5 100644
--- a/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
+++ b/dev-tex/dvi2gr/dvi2gr-0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit toolchain-funcs virtualx
 
 DESCRIPTION="DVI to Grace translator"
 HOMEPAGE="https://plasma-gate.weizmann.ac.il/Grace/"
@@ -12,10 +12,17 @@ SRC_URI="ftp://plasma-gate.weizmann.ac.il/pub/grace/src/devel/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="examples"
+
+IUSE="examples test"
+#RESTRICT="!test? ( test )"
+# Still missing some fontpackage, but which?
+RESTRICT="test"
 
 DEPEND="media-libs/t1lib"
 RDEPEND="${DEPEND}"
+BDEPEND="test? (
+	sci-visualization/grace
+)"
 
 src_prepare() {
 	tc-export CC
@@ -30,14 +37,18 @@ src_prepare() {
 src_install() {
 	dobin ${PN}
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins *.ti runtest.sh
+		docinto /usr/share/doc/${PF}/examples
+		dodoc *.ti runtest.sh
 	fi
 
 	insinto /usr/share/${PN}
 	doins -r fonts
 }
 
+src_test() {
+	virtx default
+}
+
 pkg_postinst() {
 	einfo "Don't forget install the TeX-Fonts in Grace"
 	einfo "  /usr/share/${PN}/fonts/FontDataBase"
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 58cc0333c0f2..a506799e092a 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -3,6 +3,6 @@ DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11
 DIST tex4ht-texlive-2020-06-24.tar.xz 880952 BLAKE2B d021efca48571711d06d7ed6ecefce068339a49fa83efeaa476329d892a77f73b27273a711dad2cb7ce212ece87ef8a776a10127cec5dc2e0096ce36adbc42a4 SHA512 b6109d27fd38eb0f2f9aab8b96adee2e69081c7317de3c9f527e47053d1520b93c0499e23fdc66f38f04c50633f72930e4fdf5d07612894427ae31dcbc1f66d4
 DIST tex4ht-texlive-20210428.doc.tar.xz 136156 BLAKE2B cde1e0326eb4d38261f7aae132cd5cbb2a72e05f54b708257e0ad3bb5da3fb82ad60d686c61ecd3854d3cc70df75dcbf90499892937c0adfcc6503fb2088d695 SHA512 1f674179ba4e6ab355bf478778c7a1498e4dfb61da0cf7cf9f4a663396ad9c6bac592f5cb1b32d972288fbc201541927a5e5edde18caf73a298b0b8a618a25c5
 DIST tex4ht-texlive-20210428.tar.xz 906228 BLAKE2B a011425a9e1ddb88610805e4af5b65c42dddcc88ec0ca7b2e02ca9a8276423c4a96adfe86980d21b1f2a568bdf95c3ca43b4e814d98e8b5d53319906af13edaf SHA512 89a13dc4fccbc893a113d2cc43d9cd70b20b65b5f4f642bcf9d14994b61667aabbdcdbb9a91ef05631e02e88fcf10b0e1de3739c741f5975770e4b93166766ba
-EBUILD tex4ht-20090611_p1038-r11.ebuild 3738 BLAKE2B 3bd1ba528bd37b5b5bd8af9fc01501a6245e2b312d8cf5e7c0efb85c7a1726ddfcea491d432b4f13b9209d20e8ddcfba6538ce2166010c21b6d57c5e2cfe1239 SHA512 e009aff4e836f362731ef726ece6da5d4bfdad214d829358a0df4b9dbb32502dfd76c976b16af383c9aa05de5782b27d82c21aead0233ae7bb9d68998268d7b0
+EBUILD tex4ht-20090611_p1038-r11.ebuild 3773 BLAKE2B 746fc0ec18a31d9fa9c687bd2e3a481defcbbdca5119a09673772da9118db4aed22dfefdc9e02e7105bd4205d5410fdd7933d7d1d6cf27979ade7070d14a1799 SHA512 ab7caac635e1a2e7451c8d4e0aa320f115b12f4271e5dca0b8cd4731d7b9f03bbc6dfca3f87d011bc23ca32234bb05becd1d4f7b1d7f2dafbbc36e37676c593f
 EBUILD tex4ht-20090611_p1038_p20210428.ebuild 3973 BLAKE2B 6a200e1b48e9fcd7bad319f25dd94ee22abfe6b30ba13264c2416080bbab19d5914ed826ff909b12ea203efef2b2e317aa8c5dbcda58d0492376cbd1c115b5d9 SHA512 250e5e31a52fff2ec15125ac7b0b1c0291dee144d03f3cc3d25ba4c366afa6502b2f8c4e92f1207045349c8b019b42b52e59afd488737a5140e9f266fb5a28b2
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
index 6511637d4ca3..7e3751dc6f48 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r11.ebuild
@@ -22,7 +22,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="java"
 
-RDEPEND="app-text/ghostscript-gpl
+RDEPEND="!>=dev-texlive/texlive-latex-2021
+	app-text/ghostscript-gpl
 	media-gfx/imagemagick
 	dev-libs/kpathsea
 	java? ( >=virtual/jre-1.8:* )"