gentoo resync : 03.11.2019

7 files changed, 39 insertions, 59 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 5aa2cc4e22b2..24a7f46a9e3e 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/circuit_macros/Manifest b/dev-tex/circuit_macros/Manifest
index 2346b7ea7262..0ad6c3d6e3ae 100644
--- a/dev-tex/circuit_macros/Manifest
+++ b/dev-tex/circuit_macros/Manifest
@@ -1,8 +1,6 @@
 AUX cm2pdf 1476 BLAKE2B 38fe114ade3d2bcd60b803ec3b0f5f029da70d3bf30c10186a4cf1acdf0e77d97f3e149421313b041084b593fdb830a8435ad602f88e5daf00d5d0ad2ba34f5d SHA512 37db7d2a66bace8666b89169be96b1ecf27f5f6d0f46c16a2f42be75490c4d0b4b89e27631b7e4e8684bbc07176f219ff8cb16987e47d5cb1b0c6cc0973b15f1
-DIST circuit_macros-8.3.2.tar.gz 2047086 BLAKE2B 31dd99b0f25ce09388585466f8735c2b23656aab5b380f405063e58147ecaecc0fb7cfc7dfeecd4ace0852b5175bfca2e7285b3e814f3a2b4e811b74dd587669 SHA512 bfc43496985b9b2a09a5adbf5c2e5dbd09109a75d3d684858746885fd571da17f4d8209bd9a3b084b155d6a36269fea2d9f750a05c262f1c0d07b969b3233204
 DIST circuit_macros-8.4.1.tar.gz 2060119 BLAKE2B 2807ff0166f50f9e9f45750591ef9542cb211cbf657e7386a5c9c189f62f2bc9cae942abe7208240d048313d53c7536c0ee3b65d603c20837bb70b2bf41b30c1 SHA512 af81f20203bc153ded017f56096181cc51fbaeba3063a2a003fcebc4210449fb1f3c044691fad5c6020334e46b9dbbdf9ec07b15af912f94ab669ea02543cbc2
 DIST circuit_macros-8.4.tar.gz 2051691 BLAKE2B abebfaa37b12f53223f76790d1b85b487055ffeac21ca231606c15e06ca0335c79eedc93dc5c0e609394c26574fa50082ab9a60070232a1970098629b1853794 SHA512 70f5d451a69effaad529749940a4b647eaf326808d70b03d209f2a6e5e436f35713e9f11da1179b0651a0eb7ec8f0a6852a3d6618e34e684f6fdc134a4bd0f60
-EBUILD circuit_macros-8.3.2.ebuild 1266 BLAKE2B a50c7b39f0c03046d251fcc164a9a26ddc0e6235219cf8e0587f3ca528e736ae5d4ced991748b9cc3a42e297ecf0f3dc471130228c513ca7f08e187d78a19450 SHA512 5c8b59a396605f53bb04706bea87ff78e7c2e8e64ad6b14929e67e022c0864530f9e9c5315952f2304c64873b1ceb83896a3ae5b03620c480dc62674273a9c81
 EBUILD circuit_macros-8.4.1.ebuild 1266 BLAKE2B c90cf77f5d2eba04ba9c7769ea44357ca349af68d2619a7b1e80a89481c0fa993be1aeb510d289c1f58f230e265fd6f6c10cb6b315c34c1c4a87988a582ae18d SHA512 1e8656220377ec7f6528eb49594c8b95d71eed32897f57f1b9bf4ec1fe6542d99eb71994a5deac51e372e358a729301aa463a14291cd54e393e06a1b1647e0bd
 EBUILD circuit_macros-8.4.ebuild 1266 BLAKE2B c90cf77f5d2eba04ba9c7769ea44357ca349af68d2619a7b1e80a89481c0fa993be1aeb510d289c1f58f230e265fd6f6c10cb6b315c34c1c4a87988a582ae18d SHA512 1e8656220377ec7f6528eb49594c8b95d71eed32897f57f1b9bf4ec1fe6542d99eb71994a5deac51e372e358a729301aa463a14291cd54e393e06a1b1647e0bd
 MISC metadata.xml 857 BLAKE2B 92c3a1b2b676563e88fdf27ee68506471f18f3be8631fe4e034d0f0f36c3ffd22d01ff646e115e2eb654c385a8c9d65e5a48e3458acbf640ea1e9b67412a9d8c SHA512 41169a2fc8a2c674ce744e5ef7d603d43c6d160c207f05b3f1c3ed13787895729cace0b92eea4384985be945e4cae09185bfa17bb5e18f9f9f672e8d60a77dca
diff --git a/dev-tex/circuit_macros/circuit_macros-8.3.2.ebuild b/dev-tex/circuit_macros/circuit_macros-8.3.2.ebuild
deleted file mode 100644
index 710cd1e7d7c7..000000000000
--- a/dev-tex/circuit_macros/circuit_macros-8.3.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit texlive-common
-
-DESCRIPTION="M4 Macros for Electric circuit diagrams in TeX or LaTeX"
-HOMEPAGE="https://ece.uwaterloo.ca/~aplevich/Circuit_macros/"
-SRC_URI="https://ece.uwaterloo.ca/~aplevich/Circuit_macros/Circuit_macros.tar.gz -> circuit_macros-${PV}.tar.gz"
-
-LICENSE="LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples +script"
-
-DEPEND=""
-RDEPEND="|| ( app-text/texlive[graphics] app-text/texlive[pstricks] )
-	media-gfx/dpic
-	sys-devel/m4
-	script? ( app-text/texlive[graphics]
-		dev-texlive/texlive-latexextra )"
-
-S="${WORKDIR}/Circuit_macros${PV}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins *.m4
-	insinto /usr/share/texmf-site/tex/latex/${PN}
-	doins boxdims.sty
-	dodoc README CHANGES Makefile doc/CMman.pdf
-	rm -f doc/CMman.pdf
-	use doc && dodoc -r doc
-	use examples && dodoc -r examples
-	use script && dobin "${FILESDIR}/cm2pdf"
-	docompress -x \
-		/usr/share/doc/${PF}/Makefile \
-		/usr/share/doc/${PF}/doc \
-		/usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	etexmf-update
-	use script && einfo "cm2pdf was installed to automatically create PDFs. Run cm2pdf --help for usage help."
-}
-
-pkg_postrm() {
-	etexmf-update
-}
diff --git a/dev-tex/g-brief/Manifest b/dev-tex/g-brief/Manifest
index 874ea99e296e..389ae5f30e6a 100644
--- a/dev-tex/g-brief/Manifest
+++ b/dev-tex/g-brief/Manifest
@@ -1,3 +1,4 @@
 DIST g-brief-4.0.2.zip 151832 BLAKE2B 3cd785864ff9de88ff74eaf00f36adec6e9b8cb9befb327437dbe06747138738b5850caea5aedfc1eb52d593ca7c2a8644725d77e93910f6eaffc0154b3ad8e3 SHA512 7507de034ab824fe368ab80c44490308b4c9e8a5352d0d434b24190072ab1f49daf4c1153827bbbca2ed2fe0875461187a592032b1a20c008453c4dea677d131
+EBUILD g-brief-4.0.2-r1.ebuild 1020 BLAKE2B 87d7bc86396684a361600b42522b3e737a9e67480d5658eea3e1fe1702e84446ccc8b028fbf185950f007a814762994290aae423b45fe9063ca9306993a04317 SHA512 9941909aa4dab2e0a80ab682926ce20aae1ba7cfaefb3852f6cbbb1d6d1f2783c499d20b16abb2929255cb186a72211a2a5d05df27f904270e2c2e3b17158cdd
 EBUILD g-brief-4.0.2.ebuild 996 BLAKE2B f37748f7a5a2519d59012f0c7bb661f20a24b59413c05853d2387c3a90723045fdce2916fa969ba553b40d4fe34c36fb0ac39b185d682ff2ff0c6c60dc446325 SHA512 ac80e1cc529ae2813ad82d099511b03a068a1fd5a726933885b867faa6ed02077eb9d869ce7fd0377292a3f58d19e5a1f9870eb2a99a0d78b52be8bcf17f814c
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild b/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..569461d81b35
--- /dev/null
+++ b/dev-tex/g-brief/g-brief-4.0.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package
+
+S="${WORKDIR}"/${PN}
+
+# checksum from official ftp site changes frequently so we mirror it
+DESCRIPTION="LaTeX styles for formless letters in German or English"
+SRC_URI="mirror://gentoo/${P}.zip"
+HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/g-brief/"
+LICENSE="LPPL-1.2"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="dev-texlive/texlive-langgerman"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+TEXMF="/usr/share/texmf-site"
+
+src_compile() {
+	# latex chokes if these file exist, bug #573374
+	rm -f g-brief.drv g-brief.cls g-brief.sty g-brief2.cls g-brief2.sty beispiel.tex beispiel2.tex || die
+	latex-package_src_compile
+	# Now that the source is processed, remove it so that it is not (wrongly)
+	# reprocessed at src_install.
+	rm -f g-brief.dtx || die
+}
diff --git a/dev-tex/xmltex/Manifest b/dev-tex/xmltex/Manifest
index 3831250793b7..a56f89d0f9d8 100644
--- a/dev-tex/xmltex/Manifest
+++ b/dev-tex/xmltex/Manifest
@@ -1,4 +1,4 @@
 AUX format.xmltex.cnf 116 BLAKE2B 2430d263211aabb19f131ade3c471781442ce6ae4ad5b2755735304a6e4edc224e6d7a9db5a09736ce98f77ad4039ca368d91933086296ba5cd5152004fae86a SHA512 9c1580e15fe049dfacc556bb086996375828571bb74f8e5a8f008865d390bbf74f90f32318e107f174e4517dfbae0380344f5c6883ee5d3bdd2115a881ff4a43
 DIST xmltex-1.9.tar.gz 110592 BLAKE2B f58fd239a36f679dee2d0d7a3d25493daa618e5dc6fdab063f9d90a48cd542e91e8c2d6166d901c338c98e00abd3f8a4940c0a47b7463c7d083ef7a1652f2968 SHA512 8f8c3ebb56c602365607a8ef7f245404c2f83863e5efc113a7a7fc23772d95cf2d08e0d3e7696c2c18ee1a99aa1d7dde62f4cfbeb5c84dec81d843aebeb21b30
-EBUILD xmltex-1.9-r2.ebuild 1305 BLAKE2B a6c88276c0cc02fb2037139ef6ddd0910631e922e07eb7fb55dd52e1e827d04410bc63707470b7ba41e3165da3c57d15ce0e2a2d803ff142139842096d30a0b8 SHA512 0915cacd569f3603c96c64ae8ed2f142bf7dd4f1fd08df3332e583e5e9c65b768e51235c148cf3f5b965a61a60cfecbeb1d874cf0729eb0aaf98f8ace1f083d6
+EBUILD xmltex-1.9-r3.ebuild 1256 BLAKE2B 08fab000a0524b2c99586594ee58010ec4b93b0ad76c7b791508df00435fb59ab083def9ac64bc259b7982337981ba1c82933ab17b6f92b9ea3768e10fa2c645 SHA512 98df87988aaaa8d6b1ee24e04dc03efc8ecf9e3219a57aae1ff4a29f8a5f1abd4552676a38d297be48ad3668c045ebf8eda16611a0c27af2615e48b324ab3e8f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/xmltex/xmltex-1.9-r2.ebuild b/dev-tex/xmltex/xmltex-1.9-r3.ebuild
index 7fab6274c53d..48708edb6f40 100644
--- a/dev-tex/xmltex/xmltex-1.9-r2.ebuild
+++ b/dev-tex/xmltex/xmltex-1.9-r3.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit latex-package texlive-common
 
-IUSE=""
-
 DESCRIPTION="A non validating namespace aware XML parser implemented in TeX"
 HOMEPAGE="http://www.dcarlisle.demon.co.uk/xmltex/manual.html"
 # Taken from: ftp://www.ctan.org/tex-archive/macros/xmltex.tar.gz
@@ -22,8 +20,7 @@ TEXMF=/usr/share/texmf-site
 
 DEPEND="virtual/latex-base"
 
-RDEPEND="${DEPEND}
-	!=dev-texlive/texlive-htmlxml-2007*"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	fmt_call="$(has_version '>=app-text/texlive-core-2019' \
@@ -35,7 +32,7 @@ src_compile() {
 
 src_install() {
 	insinto /var/lib/texmf
-	doins -r texmf-var/*
+	doins -r texmf-var
 
 	insinto ${TEXMF}/tex/xmltex/base
 	doins *.{xmt,cfg,xml,tex}
@@ -46,6 +43,6 @@ src_install() {
 	insinto /etc/texmf/fmtutil.d
 	doins "${FILESDIR}/format.${PN}.cnf"
 
-	dohtml *.html
+	dodoc *.html
 	dodoc readme.txt
 }