gentoo resync : 15.01.2020

8 files changed, 11 insertions, 293 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 02be1684148f..d96c593ff3a2 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,17 +1,11 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
 AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd
-AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514307b826b9f85d42b44b427667f57db63bcbd4ca64cda502da2ed1110bd133968e2e95e0289b1179d126fcc7c4a1e55e79e SHA512 39403fbd218ca5a6c3a565e6f1955467c8e11296c69acfe529aca5566e03bfee395c360746288fe09d768c2cabd46faaa6efcb7e57595f0dc784b4ef2e0c416a
-AUX asymptote-2.41-info.patch 436 BLAKE2B 71987cc6fa4df197bed0dca7d4df27058ce28732cf8aea6a58f9bbd83e378757569bc39aa6fe0ff14f5dfbf7044e4f4ad27014814c318bb7a4993f9aafac761e SHA512 7d3ae35b2eb2b226ae3b7326d2e7d50524402d49be90303035a2872b5a109bb104f53376b9da681cc8d6922ddadec6a606540842745109edd3b55ce50725a6fb
-AUX asymptote-2.41-perl-5.26.patch 400 BLAKE2B 68d346f18f4021ac486dc06dd9dde7e118acb3050284e5aac8a5ef33baaed43a06bacbaaa0a75b0a49a7b8d03f7af65c8daf759d7a9e13b152ad6f7946a7a5df SHA512 bb333f4f42063be1c4a19d4cfd4209ac7b7d3c4318a5c3634581d63af2183cc27918b80e47148b1cbc256049b38cb85982ef7e00f7f021be3e714adabf15c87b
-AUX asymptote-2.41-xdg-utils.patch 744 BLAKE2B 9e36f5f04c7be761abb026fd894417ff5b7a90f46d2af14392d5a9e6fa6e666703892379954dd45044953519f59a235858b3ca91a84c9056d147591544bca09e SHA512 370fb078d926185ab7e10cbbc8afc4bfe0829e682fe89729a5d41bb3bda5dda96711f1fdcb99b9da69606563ce120383e5a1211372f3d8dd54ea3ddfc0838d7f
 AUX asymptote-2.60-info.patch 436 BLAKE2B 7e0848a620289fc5c5913a8e09c7f19bf08fcc28533b3326045b5c09cbc116de74f5d18984d410834ab175d7b8d21de8b70f3dc45058da02e6eada0839382315 SHA512 d2ff074572997bf2eafd49c41ea730a1a87c3bf9e18968a129ba94e741f2d673eb27aabdb43ae706b0296d9cbf2f000fa46c4ad119629b070d4f51295f9cff5b
 AUX asymptote-2.60-xdg-utils.patch 752 BLAKE2B 1723819dea49747cb995df9d9beef9878cbbc0379bfeed75cf52e5bc1ccc1a536d088e6f01770330bef2d86156b2699f1a6c9aa1c7ce0655689226f99fc99dfd SHA512 0e82e39cf26e6ccbfab9d9410f5ee7ab7574744036208fb742c3e894db33fd7f2bbb85ccea5f04068d7658eef1eddafdb6d1a505a80a2f38121c47c77184f176
 AUX asymptote-2.61-info.patch 436 BLAKE2B 34787bb4afb276074a16bbf36bf31ed71a1fd213d96f6124f4552497901c6b315009b33da74dbd554806089ce2ca1a35d3efbb4ce6388e4e05339c4ed36ab688 SHA512 4ec89ac4ddd7eb1b4b1757453000b88f509323f20995631e82a2923cd275d4ba3f7ffabef8293da943ab2ecf406e20e239ef7d2c956d6c441b287ae79e34da20
 AUX asymptote-2.61-xdg-utils.patch 752 BLAKE2B e73ad1bdda49fe95f494815571b21c7987e256450885077b89bb1dc6e192fb0cb5389dcbc1864750f6a3b6bb2762056df3c3ccea01edc42ca8f5cb435d1fc4f8 SHA512 a967c529c9e487fea3fedc46cfde81347aca98e470f7bae17879f4ca7c661ea658e764dfb352c73dc0860e152d5a0969e4ced034e1bbbd59f78d495365ce5f70
-DIST asymptote-2.41.src.tgz 3516426 BLAKE2B d4623609be58566e32de82c5c47f635ed737459fa27cd2da0622d639cd8207fc69988a7ecbf82993b051435fbf223c1f1178d213aea258a2b57fd3a698eee9cb SHA512 93f737a44b085c2290c4553c765cf49679820e6623bc5b6d0229818409868876275d6f0571abeb76033955fa95ee594e37d10c9901c54755b085e36760fd96cb
 DIST asymptote-2.60.src.tgz 4650347 BLAKE2B d969e4716a2493ae926ea1f58d0b247986e49a6a1902fb94859a45177ece4f149f5875cf788eace1c27c968652c49b2ace7b98aba02380cf8e1e3d4231560476 SHA512 a0653b9647d8c2a77656ea82faf8b69d28a43cf5ac61cfa9c6c62e2c51b4939e83202b95056495d10bee86a81e48b765ed4604a4d882a47a36b1dd6d5f9ad96b
 DIST asymptote-2.61.src.tgz 4623504 BLAKE2B 8432f07ce21f630c5bdae609650c0bb2bcd237a121df68030dc19d1cae986f0bfa56dd0e241570809f9fcb202440e8b9b3c6d47a22eeaabe3eb9523360a166ca SHA512 34bb610360b4536da70ca9edf1e069ebbf0c9225948b92b3d59ea25e8684587364fa7bbb03909ba02617e6ee81d41a2e530c9ed639141e4cda42096143cab5f7
-EBUILD asymptote-2.41-r1.ebuild 4699 BLAKE2B 59a57de3618882d0d6068980358ad0a6477eee4359e9284051a94d3a045a8853292f21cf299869035ca329120fea658494f8189e9871c1fd5af45959d7f520c8 SHA512 08918fb1af35f5d3729257fc274ef19c8c37518c65b3dbe5833c0039fa8b751bb86613a4c7b93f48d78e695195645c5623f940a91505a4ba8fc21e272d769448
-EBUILD asymptote-2.60.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
-EBUILD asymptote-2.61.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
+EBUILD asymptote-2.60.ebuild 4571 BLAKE2B 4cdc3585c7680d97a6aabc8190c0e06a78a5f1d962cda7b483ee7a9ae7976f3ed12b9f5d4b50a3753d6a70f327bc548c783d41af3a624640b3ca71e158d6ee9c SHA512 c3a1e17e3dbbd9c3068d87fbd352401b87ba4d72b90cfc93f87251fe8d551692807a1a46b5515ce71486aa1305207566d99ff3e0b63e3957f7e5987f55af53de
+EBUILD asymptote-2.61.ebuild 4635 BLAKE2B 8ac6b425bb7e0431520646a192dea5ddbd8744b9286a48148ed5528e2ba17ee4c95fcb34e8981be3d2f1b9c0ad437188d8dc4caea75b1a9368aba46a0155d5d6 SHA512 22dfd6b7ec9da554e6b3b621de3157122bc47f48fe2c1ca4b9b3d531e31e294335a55e262a0b4863cfb7d5ad0916505ae54720aa068402639810208ed77b490a
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.41-r1.ebuild b/media-gfx/asymptote/asymptote-2.41-r1.ebuild
deleted file mode 100644
index a9cac4411335..000000000000
--- a/media-gfx/asymptote/asymptote-2.41-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common latex-package multilib python-single-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="http://asymptote.sourceforge.net/"
-SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	offscreen? ( opengl )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	opengl? ( >=media-libs/mesa-8[X(+)] )
-	offscreen? ( media-libs/mesa[osmesa] )
-	svg? ( app-text/dvisvgm )
-	sigsegv? ( dev-libs/libsigsegv )
-	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	python? ( ${PYTHON_DEPS} )
-	X? (
-		${PYTHON_DEPS}
-		x11-misc/xdg-utils
-		dev-python/pillow[tk,${PYTHON_USEDEP}]
-		)
-	latex? (
-		virtual/latex-base
-		>=dev-texlive/texlive-latexextra-2013
-		)
-	emacs? ( virtual/emacs )
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-lang/perl
-		media-gfx/imagemagick[png]
-		virtual/texi2dvi
-		virtual/latex-base
-		app-text/ghostscript-gpl )
-	test? ( app-text/ghostscript-gpl )"
-
-TEXMF=/usr/share/texmf-site
-
-PATCHES=(
-	# gc.h -> gc/gc.h
-	"${FILESDIR}/${P}-configure-ac.patch"
-
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-
-	# Bug #635984 - perl-5.26 no longer has . in @INC
-	"${FILESDIR}/${P}-perl-5.26.patch"
-)
-
-pkg_setup() {
-	(use python || use X) && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
-		-i configure.ac \
-		|| die "sed configure.ac failed"
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# for the CPPFLAGS see
-	# https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
-	econf \
-		CPPFLAGS=-DHAVE_SYS_TYPES_H \
-		CFLAGS="${CXXFLAGS}" \
-		--disable-gc-debug \
-		$(use_enable boehm-gc gc system) \
-		$(use_enable fftw) \
-		$(use_enable gsl) \
-		$(use_enable opengl gl) \
-		$(use_enable offscreen) \
-		$(use_enable sigsegv)
-}
-
-src_compile() {
-	default
-
-	cd doc || die
-	emake asy.1
-	if use doc; then
-		# info
-		einfo "Making info"
-		emake ${PN}.info
-		cd FAQ || die
-		emake
-		cd .. || die
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		# see bug #260606
-		emake -j1 asymptote.pdf
-		emake CAD.pdf
-	fi
-	cd .. || die
-
-	if use emacs; then
-		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el
-	fi
-}
-
-src_install() {
-	# the program
-	dobin asy
-
-	# .asy files
-	insinto /usr/share/${PN}
-	doins base/*.asy
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		python_scriptinto /usr/share/${PN}/GUI
-		python_doscript GUI/*.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
-		doman doc/xasy.1x
-	fi
-
-	# examples
-	if use examples; then
-		insinto /usr/share/${PN}/examples
-		doins \
-			examples/*.asy \
-			examples/*.eps \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/extra/*.asy
-		use X && doins GUI/*.asy
-
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc || die
-		insinto "${TEXMF}"/tex/latex/${PN}
-		doins ${PN}.sty asycolors.sty
-		if use examples; then
-			insinto /usr/share/${PN}/examples
-			doins latexusage.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	use python && python_domodule base/${PN}.py
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc
-		elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el
-	fi
-
-	# vim syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins base/asy.vim
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/asy-ftd.vim
-	fi
-
-	# extra documentation
-	if use doc; then
-		cd doc || die
-		doinfo ${PN}.info*
-		cd FAQ || die
-		dodoc asy-faq.ascii
-		doinfo asy-faq.info
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
-	fi
-}
-
-pkg_postinst() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-
-	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
-	elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
-}
-
-pkg_postrm() {
-	use latex && latex-package_rehash
-	use emacs && elisp-site-regen
-}
diff --git a/media-gfx/asymptote/asymptote-2.60.ebuild b/media-gfx/asymptote/asymptote-2.60.ebuild
index bef7be52b544..9d8d5d64326c 100644
--- a/media-gfx/asymptote/asymptote-2.60.ebuild
+++ b/media-gfx/asymptote/asymptote-2.60.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common latex-package multilib python-r1
 
@@ -45,7 +45,7 @@ RDEPEND="
 		virtual/latex-base
 		>=dev-texlive/texlive-latexextra-2013
 		)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	doc? (
diff --git a/media-gfx/asymptote/asymptote-2.61.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index bef7be52b544..bd19e8e0995d 100644
--- a/media-gfx/asymptote/asymptote-2.61.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools elisp-common latex-package multilib python-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
@@ -45,7 +45,7 @@ RDEPEND="
 		virtual/latex-base
 		>=dev-texlive/texlive-latexextra-2013
 		)
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${RDEPEND}
 	doc? (
@@ -143,7 +143,6 @@ src_install() {
 		insinto /usr/share/${PN}/examples
 		doins \
 			examples/*.asy \
-			examples/*.eps \
 			doc/*.asy \
 			doc/*.csv \
 			doc/*.dat \
@@ -160,6 +159,8 @@ src_install() {
 		if use examples; then
 			insinto /usr/share/${PN}/examples
 			doins latexusage.tex
+			insinto /usr/share/${PN}/examples/animations
+			doins ../examples/animations/*.tex
 		fi
 		cd .. || die
 	fi
diff --git a/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch
deleted file mode 100644
index 984ec7c2e951..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.41/configure.ac
-===================================================================
---- asymptote-2.41.orig/configure.ac
-+++ asymptote-2.41/configure.ac
-@@ -159,7 +159,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
-       fi
-       CPPFLAGS_SAVE=$CPPFLAGS
-       CPPFLAGS=$CPPFLAGS" $INCL"
--      AC_CHECK_HEADER(gc.h,
-+      AC_CHECK_HEADER([gc/gc.h],
- 	AC_CHECK_LIB([gc],[GC_malloc],[
- 	  LIBS=$LIBS"-lgc "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
diff --git a/media-gfx/asymptote/files/asymptote-2.41-info.patch b/media-gfx/asymptote/files/asymptote-2.41-info.patch
deleted file mode 100644
index f1dc4309aa8c..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.41/doc/asymptote.texi
-===================================================================
---- asymptote-2.41.orig/doc/asymptote.texi
-+++ asymptote-2.41/doc/asymptote.texi
-@@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
-      
- @dircategory Languages
- @direntry
--* asymptote: (asymptote/asymptote). Vector graphics language.
-+* asymptote: (asymptote). Vector graphics language.
- @end direntry
- 
- @titlepage
diff --git a/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch b/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
deleted file mode 100644
index 54499b74e6cb..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-perl-5.26.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 asymptote-2.41.orig/doc/FAQ/bfnnconv.pl asymptote-2.41/doc/FAQ/bfnnconv.pl
---- asymptote-2.41.orig/doc/FAQ/bfnnconv.pl	2017-03-22 14:56:46.000000000 +0700
-+++ asymptote-2.41/doc/FAQ/bfnnconv.pl	2017-10-31 23:44:05.511045390 +0700
-@@ -62,5 +62,5 @@
- open(U,">$prefix.xrefdb-new");
- 
--for $x (@outputs) { require("m-$x.pl"); }
-+for $x (@outputs) { require("./m-$x.pl"); }
- 
- &call('init');
diff --git a/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch
deleted file mode 100644
index 7f9b33440352..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.41-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.41/settings.cc
-===================================================================
---- asymptote-2.41.orig/settings.cc
-+++ asymptote-2.41/settings.cc
-@@ -91,15 +91,15 @@ bool msdos=false;
- string HOME="HOME";
- string docdir=ASYMPTOTE_DOCDIR;
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="/usr/lib/libgs.so";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";