gentoo resync : 12.03.2021

3 files changed, 71 insertions, 39 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 444ebb8a561b..538aa384b011 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -6,5 +6,5 @@ AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b5
 DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
 DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791
 EBUILD asymptote-2.68.ebuild 4806 BLAKE2B d024e46c7c697e624c27f938f96afc1f65403d36995d62050bc3ec8313d2b81aeb2516ae1c5c7442db4345863fca106e7182da4f22d7d601f766366d816f4e2d SHA512 3bb36ddf4578fafba5644e29b98e743ae71c1484e2d7dc7845d8f96fc8315fd9f8e28b7368f5893de217e87cad60960a99cde5e33a39265cc5b17281b6873c5d
-EBUILD asymptote-2.69.ebuild 4573 BLAKE2B b47fb58c4182a71e30b40761284fb9c1c5b0dc42ab68c4be13e1dccdf96627b92fe094ae678eee077f8cd856abd4ffeb5fe56aa62d770ce6014517d56b5d2ee3 SHA512 c800a7fc586711e62b6f5b187078086a877df89215d1a39124a4d1a698e65958cb370a9fe4840bca003dcd80ba2cfd3923b96517649bb9dfa8277cd1f7d9fd6f
-MISC metadata.xml 1257 BLAKE2B 93f3f42b625d44d9340a224ad8bb4c605044b008b56bca48e3b6e0ed7e8be58b2b50fc8a0899731373251490d62c0e6b3d56129786a27a57d8fe9b5d903b60fd SHA512 b74ba76e922f253bf9a2e44d50152a700e9725a4a899392c7ab0074a3716ab4bd6330d3acb87b09eb59fd48f904684a2339a87d4db965c74bc833487011dbb56
+EBUILD asymptote-2.69-r1.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
+MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc
diff --git a/media-gfx/asymptote/asymptote-2.69.ebuild b/media-gfx/asymptote/asymptote-2.69-r1.ebuild
index b7b0b25d2885..11723a29a480 100644
--- a/media-gfx/asymptote/asymptote-2.69.ebuild
+++ b/media-gfx/asymptote/asymptote-2.69-r1.ebuild
@@ -14,8 +14,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="+boehm-gc curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax"
-# FIXME: xasy is currently broken
+IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
@@ -28,7 +27,7 @@ RDEPEND="
 	>=sys-libs/readline-4.3-r5:0=
 	net-libs/libtirpc
 	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
+	opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
 	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )
@@ -37,15 +36,23 @@ RDEPEND="
 	gsl? ( sci-libs/gsl )
 	python? ( ${PYTHON_DEPS} )
 	curl? ( net-misc/curl )
+	X? (
+		${PYTHON_DEPS}
+		dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg]
+		dev-python/numpy
+		dev-python/pycson
+		>=gnome-base/librsvg-2.40
+		)
 	latex? (
 		virtual/latex-base
 		>=dev-texlive/texlive-latexextra-2013
 		)
+	context? ( dev-texlive/texlive-context )
 	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
+	dev-lang/perl
 	doc? (
-		dev-lang/perl
 		media-gfx/imagemagick[png]
 		virtual/texi2dvi
 		virtual/latex-base
@@ -78,6 +85,9 @@ src_configure() {
 		CPPFLAGS=-DHAVE_SYS_TYPES_H \
 		CFLAGS="${CXXFLAGS}" \
 		--disable-gc-debug \
+		--disable-gc-full-debug \
+		--with-latex=/usr/share/texmf-site/tex/latex \
+		--with-context=/usr/share/texmf-site/tex/context \
 		$(use_enable boehm-gc gc system) \
 		$(use_enable curl) \
 		$(use_enable fftw) \
@@ -92,10 +102,11 @@ src_compile() {
 
 	cd doc || die
 	emake asy.1
+	einfo "Making info"
+	cd png || die
+	emake ${PN}.info
+	cd .. || die
 	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
 		cd FAQ || die
 		emake
 		cd .. || die
@@ -104,7 +115,7 @@ src_compile() {
 		export VARTEXFONTS="${T}"/fonts
 		# see bug #260606
 		emake -j1 asymptote.pdf
-		emake CAD.pdf
+		emake CAD.pdf asy-latex.pdf asyRefCard.pdf
 	fi
 	cd .. || die
 
@@ -120,48 +131,80 @@ src_install() {
 
 	# .asy files
 	insinto /usr/share/${PN}
-	doins -r base/*.asy base/shaders base/webgl
+	doins -r base/*.asy base/*.js base/*.sh base/*.ps base/shaders base/webgl
+	chmod 755 "${D}"/usr/share/${PN}/shaders/*
 
 	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
+	dodoc README ReleaseNotes ChangeLog
+	cd doc || die
+	doman asy.1
+	doinfo png/${PN}.info
+	if use doc; then
+		dodoc FAQ/asy-faq.ascii
+		dodoc CAD.pdf asy-latex.pdf asyRefCard.pdf asymptote.pdf
+	fi
+	cd .. || die
+
+	# asymptote.py
+	if use python; then
+		python_moduleinto ${PN}
+		python_foreach_impl python_domodule aspy.py
+		python_foreach_impl python_domodule base/${PN}.py
+	fi
+
+	# X GUI
+	if use X; then
+		cd GUI || die
+		python_setup
+		sed -e 1d -i xasy.py
+		echo "#!/usr/bin/env ${EPYTHON}" > xasy1
+		cat xasy1 xasy.py > xasy
+		rm xasy1 xasy.py
+		mv xasy xasy.py
+		cd .. || die
+		python_domodule GUI
+		chmod 755 "${D}/$(python_get_sitedir)/${PN}/GUI/xasy.py"
+		dosym "$(python_get_sitedir)/${PN}/GUI/xasy.py" /usr/bin/xasy
+		doman doc/xasy.1x
+	fi
 
 	# examples
 	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
+		docinto examples
+		dodoc \
 			examples/*.asy \
 			examples/*.views \
 			examples/*.dat \
 			examples/*.bib \
-			examples/piicon.png \
-			examples/100d.pdb1 \
+			examples/*.png \
+			examples/*.pdb1 \
 			doc/*.asy \
 			doc/*.csv \
 			doc/*.dat \
 			doc/pixel.pdf \
 			doc/extra/*.asy
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
+		docinto examples/animations
+		dodoc examples/animations/*.asy
 	fi
 
 	# LaTeX style
 	if use latex; then
 		cd doc || die
 		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
+		doins *.sty latexmkrc
 		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex externalprc.tex
-			insinto /usr/share/${PN}/examples/animations
-			doins ../examples/animations/*.tex
+			docinto examples
+			dodoc latexusage.tex externalprc.tex
+			docinto examples/animations
+			dodoc ../examples/animations/*.tex
 		fi
 		cd .. || die
 	fi
 
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
+	# ConTeXt
+	if use context; then
+		insinto /usr/share/texmf-site/tex/context
+		doins doc/colo-asy.tex
 	fi
 
 	# emacs mode
@@ -177,18 +220,6 @@ src_install() {
 		insinto /usr/share/vim/vimfiles/ftdetect
 		doins base/asy_filetype.vim
 	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		dodoc ${PN}.pdf CAD.pdf
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		docinto html/FAQ
-		dodoc asy-faq.html/*
-	fi
 }
 
 pkg_postinst() {
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 0f12983bc2ff..9a6acb07f784 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -20,6 +20,7 @@
 	</longdescription>
 	<use>
 		<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+		<flag name="context">Enables support for ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
 		<flag name="curl">Enables running remote programs via <pkg>net-misc/curl</pkg></flag>
 		<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
 		<flag name="offscreen">Enables off-screen rendering</flag>