gentoo resync : 16.06.2019

6 files changed, 45 insertions, 80 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 29aa49453f4b..60ddb52c56e7 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/culmus-latex/Manifest b/dev-tex/culmus-latex/Manifest
index 0f530291d18a..d146f8e38bf1 100644
--- a/dev-tex/culmus-latex/Manifest
+++ b/dev-tex/culmus-latex/Manifest
@@ -1,5 +1,3 @@
 DIST culmus-latex-0.7.tar.gz 121188 BLAKE2B f6af996aec4d944265cd7a2595107d43af83995375b23aac89e2f528ec3a1bd39f9bf95c412e69230d9aa552e1d82fb5dc1b6e235dbe3bcc7a5763a35dc33968 SHA512 81f0351687e831f304d0a4a2be3684ebc2fcad8e696425beaaebd945c3ae048dd87a5f8614ec181ce47e0debb58a86c2c2e369f37d9ff7c7f5c1ded34206fd02
-DIST culmus-latex-0.7_src.tar.gz 121188 BLAKE2B f6af996aec4d944265cd7a2595107d43af83995375b23aac89e2f528ec3a1bd39f9bf95c412e69230d9aa552e1d82fb5dc1b6e235dbe3bcc7a5763a35dc33968 SHA512 81f0351687e831f304d0a4a2be3684ebc2fcad8e696425beaaebd945c3ae048dd87a5f8614ec181ce47e0debb58a86c2c2e369f37d9ff7c7f5c1ded34206fd02
 EBUILD culmus-latex-0.7-r1.ebuild 986 BLAKE2B 29fceebd855c0d4206294b08c271a6592aea5e836ffcc9c49951ef29a73c71d5ff90543ab3a726504fdf39ce0fd8c5adaa159740de21dcaa944c1d5ecffa5fcf SHA512 fa5abb8790451e9d6c1515b71b6d752dede48409e0a5669e1ecb2145d39668ecfdefd52d9b9693e9c4407c356d5e3b6ce5da72fd340f66c8990ee7856070a02d
-EBUILD culmus-latex-0.7.ebuild 972 BLAKE2B 5e9589bfe3027780a4d5b547e6f1e443f5da5618e97645c1b3ec0fcb7ef7a127224cec0aa833bf1a4be853961b91b34fb34d989d228ef89344cb28c1beed37db SHA512 414403bf5e0b3d14b205fca0fbf76bdeb544e65abf8218fceda40ba501d7221ac300b1a1322b3b502e63fc52837051943feb34badf32fb1789bc1caf11f5d5c2
 MISC metadata.xml 326 BLAKE2B 680eecdb44819e32e195404a5e42e8146b6790a083a4814c92ba02e90f32c88fb7095d6350587f447d6bba5af72bad542f20e5938674d4df58ce57b924b34daa SHA512 fa28678ab1f602c9526daf6e072af11b07a298913277838b47ef0dad5df31819066d40ce86303d8d3e7ceb3f204dd4d479df598159bcbaccf93fab2e4fc68b26
diff --git a/dev-tex/culmus-latex/culmus-latex-0.7.ebuild b/dev-tex/culmus-latex/culmus-latex-0.7.ebuild
deleted file mode 100644
index 622d8727ae09..000000000000
--- a/dev-tex/culmus-latex/culmus-latex-0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit latex-package
-
-DESCRIPTION="Culmus fonts support for latex"
-HOMEPAGE="http://ivritex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ivritex/${P}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND="virtual/latex-base"
-DEPEND="${RDEPEND}
-	>=media-fonts/culmus-0.110[fancy]
-	app-text/t1utils"
-
-src_compile() {
-	emake CULMUSDIR=/usr/share/fonts/culmus/ || die "failed to build fonts"
-	echo "Map culmus.map" > ${PN}.cfg
-}
-
-src_install() {
-	emake CULMUSDIR=/usr/share/fonts/culmus/ DESTDIR="${D}" TEXMFROOT=/usr/share/texmf-site pkginstall || die "failed to install"
-	insinto /etc/texmf/updmap.d
-	doins ${PN}.cfg
-	dodoc README
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		insinto /usr/share/doc/${PF}/examples/hiriq
-		doins examples/hiriq/*
-	fi
-}
diff --git a/dev-tex/pgf/Manifest b/dev-tex/pgf/Manifest
index 2f3b3db24f7c..947b974cdcdc 100644
--- a/dev-tex/pgf/Manifest
+++ b/dev-tex/pgf/Manifest
@@ -1,5 +1,6 @@
 AUX pgfsys-luatex.def 13997 BLAKE2B 4d682ac413f03fc2c5f4bb27ffd367af121da27ba14631b1d9a30a3b80181178fa84e07a331efb2b46a0c04749c3f7ac56527b3c65259da7ca2a32a2fde4b294 SHA512 cb946ce0a946048acb03d45452c155a81d82a86cd4673ee70a07ff1e6553aa45be6d56e38cfd51988b095c540e8a3e1ff113958f6eae5255ac9dba8c46b6161d
 DIST pgf_3.0.1.tds.zip 10423731 BLAKE2B ca1513213f47279f7cb67cd6459e01082c6693c0da97e873205f2ed5dad1d3e83ccd036d6b56c245d334a4c9eff44bb81cd673962def80f075b56e6b7e0b7477 SHA512 0899e0fbd6d196504c5d15176015557d38e027429a84de661a5627fa003bfeffdb3f013df23c298b32c3a5605388160f42621e92d626e3ce88561fe4b4b7bddf
+DIST pgf_3.1.tds.zip 12852844 BLAKE2B 5214bc0a8dd4ee521023be245602c8fecff4f7ef5a37abba060c507355351621863aaa4b16de10383e900ed8eccc26e95f77b291f352c7ad36738451102675da SHA512 c8a0ae2ddb4769e640c487968c6f3e18b778c5eb24fe40d38a85936ce45597db7e90281571b56a92619f2e2ec7cb17019f31deaa8f93fddb2b7adf87e84b555c
 EBUILD pgf-3.0.1-r1.ebuild 1192 BLAKE2B a9d422f622d0bc9e9cd8758aad39b0c77c8d46cbdee8841af8fef6f33634828106e74f2767fe4c1fb548eb615f8c9c890a390b4a29ea76ab6af548b92be040b1 SHA512 b01bbbc2527d1b5dc330d68e70d843bd4bdbcc74e88e4d56314c0be60c2ece52d52baf13dec22f6aac30737bd12c75513171cc4a1e3de8a93f5b55113b06b50d
-EBUILD pgf-3.0.1.ebuild 1089 BLAKE2B a7b0f941cd2887c17c7d4954a624718408d6a213dfcd2178e6e70bed145a60da14f6e621b387c0e24c9e04ad773e686199cd44c685891a4d93b1bf6781d730ae SHA512 53e46184352c2f05f83348eeb67c6d983c255b3243d0ccae143faff44ede9e8dc1832da5d352485c1407e0b13ef58ebea403c07d9d2f7d5172366b6af21a1bbc
+EBUILD pgf-3.1.ebuild 1162 BLAKE2B 053fee5ad2c337beb804d96f73ec044f050b040990f9553bd3118bbafbd24be836897710285ac0f2cac2c325c95ecefa1e723e7576ecb7e4edfdf4f252ac595d SHA512 570342c3433029435bea23e640a0ee1fd5da793c8d0b8e0145999907653dba9286cda675f43031d75f60f0b7f19ff91e9738fb162356d0a187f4fa10d97a20d3
 MISC metadata.xml 322 BLAKE2B 1c28b0fcafac554548ea1862a338974f28c5d6b62745847627ffdba18494551b1fbc596c2e155787e5fc0b3410814a284f1792ee8fbb241cbae774c140a1d00a SHA512 09860d1821637bfc17aef0aae7b14913af3b5171c95a3a9edf7ab00a3b006e5335cd1d7770953a3d4956f7b876cd990affbad468b0a24d9290c69b5e1ef95ae4
diff --git a/dev-tex/pgf/pgf-3.0.1.ebuild b/dev-tex/pgf/pgf-3.0.1.ebuild
deleted file mode 100644
index 0d20dd1bbdba..000000000000
--- a/dev-tex/pgf/pgf-3.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 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() {
-	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.ebuild b/dev-tex/pgf/pgf-3.1.ebuild
new file mode 100644
index 000000000000..07a239a76b8e
--- /dev/null
+++ b/dev-tex/pgf/pgf-3.1.ebuild
@@ -0,0 +1,43 @@
+# 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://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"
+BDEPEND="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
+
+	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
+		doins 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
+}