gentoo resync : 07.05.2021

5 files changed, 2 insertions, 259 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 2c5e907849a6..0696025bbc1f 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,14 +1,10 @@
 AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86
-AUX asymptote-2.68-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207
-AUX asymptote-2.68-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010
 AUX asymptote-2.69-info.patch 436 BLAKE2B cf8510e1f0135eb1e16e0e3913572418761a6eec863efff59c29d84a0f5f1b863febdb965120e1661bca743cf5d0d6e752a929cbe197ec7ae8fca162eb47ade1 SHA512 5a7c19d64609ed8c287a598b57331a318fbc47aac8770d0a9e1451b3b4f4f715a4fc30b8dc7238fd3498ca10ab4fcf2bf6373cc2e576c11d5d8eeaeadf9324c5
 AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b52e51d874504f2b586df647ecf940f730b6564cab8c5bf5e2fbff1e5eee8b84dd882f312e2492afa0ae6490d401ee7fd SHA512 003dd1867fb4d44d9e9dd414e908adda6f3802d44a614732e28df415c6591aaa4cb053dd7848c857c7b9cc3ae253cf3cc51699242e3d5629395070d29da226da
 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4
 AUX asymptote-2.70-xdg-utils.patch 791 BLAKE2B 971b2f1c6a4db7e39cc2d4bac0e3e6cc951733fb0718ace6e6807f63585fe8f4aa6f8519c6e03ed75f0176dca87e705d1b7175e0c1c7a1e79eb6c15dc4f2df76 SHA512 f78359aa71adfcea4ba31e3cae4c30aca47e39337b647f6fb2ad5264bd318a45071fcc47b1bbe5cc4c59c6b707b7b17461af62add2ee2477027d95d369f29994
-DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46
 DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791
 DIST asymptote-2.70.src.tgz 4674495 BLAKE2B 126b2e99222e6ae438aaef89df00b8eae19118c3ef42d2fab0b0117f343911939e680d22e903b784213186a5d2eeeecb112afba1467562e7127c34de4bc66773 SHA512 24d60af361e3f0309a896ce8163da6fc0a9d6587efe726c5acf874dcb74f4d51b4bad8146a615ff54173ef06dac53117fd1cc09c77940271adc9f64cac6bcfe6
-EBUILD asymptote-2.68.ebuild 4806 BLAKE2B d024e46c7c697e624c27f938f96afc1f65403d36995d62050bc3ec8313d2b81aeb2516ae1c5c7442db4345863fca106e7182da4f22d7d601f766366d816f4e2d SHA512 3bb36ddf4578fafba5644e29b98e743ae71c1484e2d7dc7845d8f96fc8315fd9f8e28b7368f5893de217e87cad60960a99cde5e33a39265cc5b17281b6873c5d
 EBUILD asymptote-2.69-r1.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
-EBUILD asymptote-2.70.ebuild 5394 BLAKE2B a27ece88ae76bfd52f81536a569040f377617419bcc28771121908e1658c0ad1547eefb4370a0846b9b52b0be1e38d4245345a34f6b148d8869732504d4776f7 SHA512 a6d9ac4a6a69aca723938c2fdd6128b3312bc3c612573864ea479bf5f8c38bda65440e9c14c99d7f17bb531f769c8dc9010fc756c11439ba1e4df6ed4fef450d
+EBUILD asymptote-2.70.ebuild 5392 BLAKE2B 236300d0b1ceb9ea8d9114e4c49100513b7e2bacd98976144f9205cc00f010a0ddba7a3ae8b43530956345cb53d8e6a9b6609597333bdae317f928af97d54422 SHA512 a0c571bbb3870ddbe6655e8e93bf93b9528071725f490eeabc15ae5b642d581b755e602349e96b5c2ecb3f2646f4bb3fa272a83498b9491f8496bb0fa44998a8
 MISC metadata.xml 1363 BLAKE2B d1ff4a713593a568879201c3d7165a633af6446844bc2128396a8f2cfc4ebc0764aef67b61bd0b0c2bcc9cad5ae442dd35b4c1610239f047f4baf3de225cda3f SHA512 e3c7c10ca9c129e0f988235a2f4ad7c8d306517e7a1966e1f4cb734d1c4d30bb143f9178bc744a85012ccc031fa453177d18452ed7991c8ae18a86bbb88283fc
diff --git a/media-gfx/asymptote/asymptote-2.68.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild
deleted file mode 100644
index 55f17d507ae8..000000000000
--- a/media-gfx/asymptote/asymptote-2.68.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit autotools elisp-common latex-package python-r1
-
-DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
-HOMEPAGE="https://asymptote.sourceforge.io/"
-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 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 )
-	doc? ( boehm-gc )"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.4-r5:0=
-	>=sys-libs/readline-4.3-r5:0=
-	imagemagick? ( media-gfx/imagemagick[png] )
-	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 )
-	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}
-		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
-		)
-	emacs? ( >=app-editors/emacs-23.1:* )
-	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=(
-	# Changing pdf, ps, image viewers to xdg-open
-	"${FILESDIR}/${P}-xdg-utils.patch"
-
-	# Bug #322473
-	"${FILESDIR}/${P}-info.patch"
-)
-
-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 -r base/*.asy base/shaders base/webgl
-
-	# documentation
-	dodoc BUGS ChangeLog README ReleaseNotes TODO
-	doman doc/asy.1
-
-	# X GUI
-	if use X; then
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py
-		dosym ../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/*.views \
-			examples/*.dat \
-			examples/*.bib \
-			examples/piicon.png \
-			examples/100d.pdb1 \
-			doc/*.asy \
-			doc/*.csv \
-			doc/*.dat \
-			doc/pixel.pdf \
-			doc/extra/*.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 externalprc.tex
-			insinto /usr/share/${PN}/examples/animations
-			doins ../examples/animations/*.tex
-		fi
-		cd .. || die
-	fi
-
-	# asymptote.py
-	if use python; then
-		python_foreach_impl python_domodule base/${PN}.py
-	fi
-
-	# emacs mode
-	if use emacs; then
-		elisp-install ${PN} base/*.el base/*.elc asy-keywords.el
-		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 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() {
-	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.70.ebuild b/media-gfx/asymptote/asymptote-2.70.ebuild
index 11723a29a480..494c8467ccbf 100644
--- a/media-gfx/asymptote/asymptote-2.70.ebuild
+++ b/media-gfx/asymptote/asymptote-2.70.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/asymptote/files/asymptote-2.68-info.patch b/media-gfx/asymptote/files/asymptote-2.68-info.patch
deleted file mode 100644
index c0812477115f..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.68-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.67/doc/asymptote.texi
-===================================================================
---- asymptote-2.67.orig/doc/asymptote.texi
-+++ asymptote-2.67/doc/asymptote.texi
-@@ -23,7 +23,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.68-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
deleted file mode 100644
index a6a2c7daba0c..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.68-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Только в asymptote-2.67.orig: .pc
-Index: asymptote-2.67/settings.cc
-===================================================================
---- asymptote-2.67.orig/settings.cc
-+++ asymptote-2.67/settings.cc
-@@ -100,13 +100,13 @@ string defaultPSViewer="open";
- string defaultPDFViewer="open";
- string defaultHTMLViewer="open";
- #else
--string defaultPSViewer="gv";
--string defaultPDFViewer="acroread";
--string defaultHTMLViewer="google-chrome";
-+string defaultPSViewer="xdg-open";
-+string defaultPDFViewer="xdg-open";
-+string defaultHTMLViewer="xdg-open";
- #endif
- string defaultGhostscript="gs";
- string defaultGhostscriptLibrary="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";