gentoo resync : 18.11.2019

5 files changed, 3 insertions, 78 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index f5a7ee55c501..8300bea2ddcd 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/metapost/Manifest b/dev-tex/metapost/Manifest
index 102641a774d3..df811e2c50ac 100644
--- a/dev-tex/metapost/Manifest
+++ b/dev-tex/metapost/Manifest
@@ -1,7 +1,5 @@
-DIST metapost-1.780-src.tar.bz2 7723409 BLAKE2B 851738637f4ec9cc0e9f8d416094f3904fb563be05e461d4f16b1a268675b0789047bb8d54f8fe6551e66b32b5c3e58e35bdf2ec64ef8486cb0c4e9476ec6c71 SHA512 3002da0706fcd33a2d183f42b770b7c2d72759a8ba0e49ae24e4a5cee5dd9cd0842e7e8d854e22962beaff4dfd1b943a63f41ee07a7743bb7d50a0cdfb4dd4ff
 DIST metapost-1.803-src.tar.bz2 8140579 BLAKE2B 9232a875da449b8caa667623e725317336d737e16c2d0b2647e9579fad067ea3eae85eb74ae9a05bfb079e7b18edcb18ee7a7c26bbee343b8ecbd6f5ed84ce90 SHA512 7f59e93f73c9f9c6fe547028dd22527c948ea171c235758e1acf9477c85d2fb2cc145b3bd707646a4b5317e57ce5d49160ff347cdecca599b6e0da8a8f679d99
 DIST metapost-1.902-src.tar.bz2 6170876 BLAKE2B 7b276fb4c9373a8ac43ef4c6c40c8e6c6726e93ab4cb82d4c34371025e448e985d1a5df587f8b108e786542bb1c4852977eaae964dd991824a506dca5eed9f53 SHA512 d1e38d9f6f16b6815999c1d05b70ece50668962660af0800c105075522a2d943156986aa8df76d7bd2b6d04f657295c15a04a6e67772ce1d8546b885c355aea3
-EBUILD metapost-1.780.ebuild 1531 BLAKE2B f3fe18e90b30648860e7115495b80650b26d8aa767c15389c4a72d949b726ab2fb264412ed255047ad28f865bbf01e936cc31cafeac515ac7a1a40b64748d248 SHA512 1202ce533f07d228823bd08741a33e39f7cd23f825ab14278544bac49791ef7b9f62c3a57b8fed128cdbc8fe32a0e53c8ccd09a2636efbcda2dd2d01e2cdb6b3
 EBUILD metapost-1.803.ebuild 1562 BLAKE2B 773a4b614e962b8e4b91d14f7582ec3ef635722fcdc283a0a1db8b4d038093c9a388d33e2e38b1fff91ff05d3e9e128f09c4be2889969eb73391114aab0ac415 SHA512 1b1914768c4627bb93d69653e85ebdb9660f8efcf1d16c6077a7e218ce3076290966c70d0b79b9cde0092b4024a1a7ada74b84d7e7ea33c05511e4440f1645ec
 EBUILD metapost-1.902.ebuild 1703 BLAKE2B f02a842b7f590e3afb8f69e4d315f6a955345e0bab0b91d6972019f6cedfe67715ac552e4b2f191e8fd4e086f983346f6fa81c61c3d061149107af6bff9329a8 SHA512 d8004e97cd5320688df8a0e54e269f28ec36549bb83bcea8d55a34bdca186f3714bea7404a4466564ed3a6f39092d12d4bb0a60ba2529bd22bfdc48911f9053e
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/metapost/metapost-1.780.ebuild b/dev-tex/metapost/metapost-1.780.ebuild
deleted file mode 100644
index ecc731318185..000000000000
--- a/dev-tex/metapost/metapost-1.780.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="System for producing graphics"
-HOMEPAGE="http://tug.org/metapost.html"
-SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/395/1879/${P}-src.tar.bz2"
-
-LICENSE="GPL-2 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/kpathsea
-	>=app-eselect/eselect-mpost-0.3
-	x11-libs/cairo
-	x11-libs/pixman
-	media-libs/libpng"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}/source/texk/web2c
-
-src_configure() {
-	econf \
-		--disable-all-pkgs \
-		--enable-shared    \
-		--disable-largefile \
-		--disable-ptex \
-		--enable-mp  \
-		--with-system-cairo \
-		--with-system-libpng \
-		--without-ptexenc \
-		--with-system-kpathsea \
-		--with-system-xpdf \
-		--with-system-freetype \
-		--with-system-freetype2 \
-		--with-system-gd \
-		--with-system-teckit \
-		--with-system-t1lib \
-		--with-system-icu \
-		--with-system-graphite \
-		--with-system-zziplib \
-		--with-system-poppler \
-		--with-system-zlib \
-		--with-system-pixman \
-		--disable-native-texlive-build \
-		--without-mf-x-toolkit --without-x
-}
-
-src_compile() {
-	emake mpost
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		SUBDIRS="" \
-		bin_PROGRAMS="mpost" \
-		nodist_man_MANS="" \
-		dist_man_MANS="" \
-		install-binPROGRAMS
-	# Rename it
-	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}" || die "renaming failed"
-
-	cd "${WORKDIR}/${P}"
-	dodoc README CHANGES
-}
-
-pkg_postinst(){
-	einfo "Calling eselect mpost update"
-	eselect mpost update
-}
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 1583461b9664..f4fb4d7ba700 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,5 +1,5 @@
 DIST pgf-3.1.4b-pgfmanual.pdf 10371181 BLAKE2B c619e56fd184fea8761175efed7130b37b10f719e04e87b40448a0a72641f2b7c6be0270ae0c2386d91caf06d9cd46f8eb3eb9293d8ff46d8f4a8400662cc1d8 SHA512 f18e836774b8ad8d7a2adb1c876e529240907b9a9c695ab6366d4bc321766106ced3085dc0d17394d6c19654a2232e10d782e93152c075f7915ffb2f0e09b680
 DIST pgf-3.1.4b-revisioned.xz 244 BLAKE2B b394702704aa5b16549df795bc4cf04e5a81839a7694a1773dee89f4db66a286a276e48bf080f82e4fe3e55e3a6bf3983394ed84a83a372becc5b8f0738162a7 SHA512 4f5ca04317e58a191eaf7225fdd9a2ff70ad80d601951be98870f77da598ba559b464e2bd0ca4f03cf54c0ccd536925deb8bd6061b9464b36a883727ae85dc40
 DIST pgf-3.1.4b.tar.gz 2426541 BLAKE2B 91f1b0ea1f2f3526da6a57cd2deec76b49b4204047b9dcdbeb064db48357055324ffe83bb5bd09dd8931a9c8e8768305a72b82ec77257e20badc543a5ca803b8 SHA512 4ba8d9c70d573ff69128d41b20525badf3a3bd0bbbf76ef3c2f2e54ccc05bc0bf1da1f20102df04f8188fe1733d469965228445e6c4af0611c2aa5737ed72180
-EBUILD pgf-3.1.4b-r2.ebuild 1355 BLAKE2B b10a8928d96418c20ab68d66fd0da04b059f3ca53b817e72b0e108e829d49e518df2d5bb10fadec64b6a402a0d99463a6f72c89f232fdabca0c997cb18c7be6e SHA512 2adbe75d8737574231a921e827e12927c735e95fdbfab17fa9264fed5ea9e60a2f3341eaaaffc17a6c189db5024df8a7fe9875ebc8d85b6991e964e9e472a8b2
+EBUILD pgf-3.1.4b-r2.ebuild 1329 BLAKE2B 92637a920a8197e768fa3facf7bca7721aa857af6923596929c02f85f8f01a14097094b22858ee50df47dc04cb07695966e9e99c70a06969a469747088d16ff4 SHA512 85cb5d89e7719b7869caf43eecbf0299fa493c0b003d7e2535ad5fc4acae2bac63fcba7825de12572fe44a87d6cc047d0ce0e1c6012f3e31062e563ac78ceee0
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
index a5f040467eeb..470ae06dc0e1 100644
--- a/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
+++ b/dev-tex/pgf/pgf-3.1.4b-r2.ebuild
@@ -31,12 +31,12 @@ src_install() {
 	cd "${S}/doc/generic/pgf" || die
 	dodoc AUTHORS ChangeLog README
 	if use doc; then
-		docinto /usr/share/doc/${P}/texdoc
+		docinto 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 "${ED}/usr/share/doc/${P}/texdoc" "${TEXMF}/doc/latex/${PN}"
+		dosym "../../../doc/${PF}/texdoc" "${TEXMF}/doc/latex/${PN}"
 		docompress -x "/usr/share/doc/${P}/texdoc/"
 	fi
 }