gentoo resync : 15.12.2019

12 files changed, 20 insertions, 561 deletions

diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index c426f2124028..02be1684148f 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -4,24 +4,14 @@ AUX asymptote-2.41-configure-ac.patch 475 BLAKE2B fbc6e09ab9bfba21bd0deb6cf12514
 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.47-configure-ac.patch 475 BLAKE2B d47a0b93bc890f2bbe528458768f1ea66745d8f3341b8870a155fb066fecdc224bdfb8fde78bdb00f671ee11f2222c43d83d79dfd32b47cc8cc26a61fac223bc SHA512 20a3b965aa892f70de432cd201025bea61e1635767b43a890e0c40d3098f982b2c6de663b613b5fac0ceb6c2392935df85f590716f7d92beb0880d0250e28a0e
-AUX asymptote-2.47-info.patch 436 BLAKE2B bb74a841ea91483fb46845d6f5fe7a5ff98d6b890632fd1bc6fdb24a182aed1a7ba531f8ad472201b1b6e898985ca3981f3a3ad6eea312059081188077fb9082 SHA512 df36a1a7987538ec93acdb99513da5bd45835137b0e82b17a686daf1821a4111b24400fb090d79de9d477930a6258b91af526bf653e8ca8cf5c7e88969f253d3
-AUX asymptote-2.47-xdg-utils.patch 727 BLAKE2B e49045dac05319382a1c1b649ce525d8bc806dbd4e9cf080103b4371025e57880d82b578c7e85f0f41c9b728ad29acce073629a5b04e4382897632c2ed18dbf8 SHA512 c30b8190f008730846364b4e97667053fc31308eac5173226617d7f1d41f828ebb8f9307012be9eab7dfa99163aa00d5c0d7d49c3765740561acc9e90772208b
-AUX asymptote-2.48-configure-ac.patch 475 BLAKE2B 9794a455eef50cab9bf0bfe306adc39971f4255eaf2dae3357e16d3754d6b577cfd28efafc887a2a4ed22a9569f2e6211e74d61ee85b351690e4390f74ebf507 SHA512 10f60794c7fd79d1fd11cbec7afe0fdbd82ff62add1ed13c1089f24d896867a35b54f6e245dfa2c757193b8575cf582a92390fedba69331159fa9107fd3dc8c7
-AUX asymptote-2.48-info.patch 436 BLAKE2B 549c1dabc62651789889ae78d82dc59326982aa37e8903474a7023481f514a1c0632cd114c347b607ea08901c1f93e751e41d064d16e1dcd4bb8eeedb2a4d5d4 SHA512 f38f45e1148ddd97c231221995cdc04527ed711a60820a7b07ac30272ae3cade1a27786215064a1ca42055b5a3edbc49780b587e3f4d074a3eb2d9ee229cdba6
-AUX asymptote-2.48-xdg-utils.patch 727 BLAKE2B 0352df07cb5930daa71d3fdbf2fb6230b22d3423e06e596e4c92358ba5f84b473900c76c28a083ed583fed21ed644bbe43ec59e7e65ce91257d72ee5d31b794e SHA512 ea5d83b50973bb361e5ad3ad409c2fa0f634fb390a52d17d4a1915960dcff1a84a56e5a59e79cb2fcdd7a02dd7544ee7c58bade22e3c519641e94019bd1d3ffc
-AUX asymptote-2.49-info.patch 436 BLAKE2B bd620511b6c695bd30f91c2e2d3455f35ce328c769f075c862ef884021c44b2363b2dbe045487d7a1d362953782fcef4cc7aaad331e9479371193ef9dbd6facf SHA512 6dfca4a63df4d2735b7f957aa5f6c193a9f2ab81a8d45249d09903c454b2a95e3f480eadeb545d7adfe8efcebb80e4c59f7d240140f197190313272d6e7df57b
-AUX asymptote-2.49-xdg-utils.patch 727 BLAKE2B f2ba7a7cdded26eee90926b62a077be99e84e8ede15e3ffa8c923147c16316bcddff63970b4967d792035c253b4d300ea9139a55b0ad30562c1a6dd279b7ebdb SHA512 64eb6e626ad8a8dd96d9cac5e6ac0c798f317b1d3120bcaffcab4e6c4dff69b07c12108ab78812e54eae862f7946c75edb94dc3c3501996284ac98f54a6ded9d
 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.47.src.tgz 3621676 BLAKE2B 575032093276b9df6b8d74897a4721dd0d5419b3380bce7962afc9dcdd20ec3bd47b5c4b882f2276a2ac4c0d99e657d7385122d7dc400efbfb52ceec753ee8f4 SHA512 9efc4a70e8d29d6d50ba49c54c48da38beb00f64e5b39f23dbaec5cb12b714e427473fdffbf71f2d636a007cbfc993fa3237a8beab01e3419c1da1287823c159
-DIST asymptote-2.48.src.tgz 3729763 BLAKE2B 5820ddbbd27f6e7296501f50f25051d8417a0ab24d7c4c777013bf23601b5cbe34a69ba781e16e05141fda4e2e7a8bc527a41829f8d9e983aadc19bd05743122 SHA512 cd8b756185ae6627ea66bcaea224152f6644df633fe7ed40c1738f3b2ec31fbaa7ba97f2b1e290b073995779768ee3a264dd942f609b768cab7624d12807583d
-DIST asymptote-2.49.src.tgz 3730453 BLAKE2B b52c2fbac5ea9c6046f2bd2990c7f3792823ae0ecd749c58990bcee898b8af7d26c4b457bee6aa15fb11e3c63a7cdc6d7e4976418ee96fc4470a17f3202d79cd SHA512 08c20e45ab764281b480a97c5e2294cdfcc18b179cbdc85cf9956806b40fe305360d589077bd3ac429985503b0e7d17c889a37349d8c6fdf8ccbd8d822544226
 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.47.ebuild 4642 BLAKE2B 2a1074a1e15004e007aa5677d1b28f4691a34437a2b2ad00aa7bb3274e0c074436011f0fe61f18fa04ccf75ebc8f639a226249304ed9cc281fbeb9448ad4ea72 SHA512 673eae19940ac799f9e997c7c199b84aa0daea590ceddf92d580bad25dc74506e4890901ec86f5cf1c4160f26243f31455cd686717d9b91d63381b0c501f9dc3
-EBUILD asymptote-2.48-r1.ebuild 4688 BLAKE2B a7ee10f84a9d9e1288813f986ca555f9ab597b1849a87cf89e8ed267bc57db2ecb13ae19c29db62884b6a1841d8b0f2ca111bc18a21af194d57c176033bf3ad3 SHA512 b2484d43cdc0a9d70cbf4bbdf137059e2330c86d625b2c02b50254dff966a39762f53e83e63dda5e76d2d2ecca33d4dc5dab667baa450314beeb4d77ad304800
-EBUILD asymptote-2.49.ebuild 4629 BLAKE2B 374f0d52308a20a93dd2d87ef49d6a1b3df60a41f8581277611905d4521a1b137b4fd45fbaa4f9cd0c45f52bc1d777d0c1db4dcbac986d4c0dae939056de4fb5 SHA512 74f2ca8df36bcdc97ad7ad1127e714839830d4b812bfae2dc125b59b7a26f4dbaa0cd406d20c71327363a41d305e6d5a15caa274d94ed0aa505cbd73da848bee
 EBUILD asymptote-2.60.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
+EBUILD asymptote-2.61.ebuild 4560 BLAKE2B e051d01f655a987b8d95a7e8ecaeb531504d2294a3f1c896e4a8956f4df2efec3e1f48d2d9016b308e50dc3737a1b8c554f6e7612da4339a9cef6128df2b9d62 SHA512 15855d03cbd9510b6bcf72cf1edf1b8e5d5f514169fcadc21e76f4d0f81c8bed00f2062ccfb854f302d6213548864b5b013a706276e6d779001a3d380b142ff2
 MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee
diff --git a/media-gfx/asymptote/asymptote-2.47.ebuild b/media-gfx/asymptote/asymptote-2.47.ebuild
deleted file mode 100644
index 77448ad65450..000000000000
--- a/media-gfx/asymptote/asymptote-2.47.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-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 )
-	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-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}
-		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? ( 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"
-)
-
-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
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"usr/share/${PN}/GUI/xasy.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
-		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
-	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
-		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.48-r1.ebuild b/media-gfx/asymptote/asymptote-2.48-r1.ebuild
deleted file mode 100644
index 2c4a4f4d8894..000000000000
--- a/media-gfx/asymptote/asymptote-2.48-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit autotools elisp-common latex-package multilib python-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 )
-	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? ( 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"
-)
-
-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
-		insinto /usr/share/${PN}
-		doins -r GUI
-		chmod +x "${D}"usr/share/${PN}/GUI/xasy.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
-		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
-	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
-		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.49.ebuild b/media-gfx/asymptote/asymptote-2.61.ebuild
index 22a6d01b693b..bef7be52b544 100644
--- a/media-gfx/asymptote/asymptote-2.49.ebuild
+++ b/media-gfx/asymptote/asymptote-2.61.ebuild
@@ -134,7 +134,7 @@ src_install() {
 		insinto /usr/share/${PN}
 		doins -r GUI
 		chmod +x "${D}"usr/share/${PN}/GUI/xasy.py
-		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
+		dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy
 		doman doc/xasy.1x
 	fi
 
@@ -187,14 +187,12 @@ src_install() {
 	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
-		insinto /usr/share/doc/${PF}/html/FAQ
-		doins asy-faq.html/*
-		cd .. || die
-		insinto /usr/share/doc/${PF}
-		doins ${PN}.pdf CAD.pdf
+		docinto html/FAQ
+		dodoc asy-faq.html/*
 	fi
 }
 
diff --git a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
deleted file mode 100644
index e0c372a095d2..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.47/configure.ac
-===================================================================
---- asymptote-2.47.orig/configure.ac
-+++ asymptote-2.47/configure.ac
-@@ -169,7 +169,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.47-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
deleted file mode 100644
index d26b6c098d62..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.47-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.47/settings.cc
-===================================================================
---- asymptote-2.47.orig/settings.cc
-+++ asymptote-2.47/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="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
deleted file mode 100644
index ef6fc52c934b..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-configure-ac.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/configure.ac
-===================================================================
---- asymptote-2.48.orig/configure.ac
-+++ asymptote-2.48/configure.ac
-@@ -162,7 +162,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.48-info.patch b/media-gfx/asymptote/files/asymptote-2.48-info.patch
deleted file mode 100644
index cd1577037f1f..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.48-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.48/doc/asymptote.texi
-===================================================================
---- asymptote-2.48.orig/doc/asymptote.texi
-+++ asymptote-2.48/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.49-info.patch b/media-gfx/asymptote/files/asymptote-2.49-info.patch
deleted file mode 100644
index e2b51860c3d6..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.49-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: asymptote-2.49/doc/asymptote.texi
-===================================================================
---- asymptote-2.49.orig/doc/asymptote.texi
-+++ asymptote-2.49/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.49-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
deleted file mode 100644
index d5d719de25da..000000000000
--- a/media-gfx/asymptote/files/asymptote-2.49-xdg-utils.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: asymptote-2.49/settings.cc
-===================================================================
---- asymptote-2.49.orig/settings.cc
-+++ asymptote-2.49/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="";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- void queryRegistry() {}
- const string dirsep="/";
diff --git a/media-gfx/asymptote/files/asymptote-2.47-info.patch b/media-gfx/asymptote/files/asymptote-2.61-info.patch
index dd2850211c1a..0046ab9628a0 100644
--- a/media-gfx/asymptote/files/asymptote-2.47-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.47/doc/asymptote.texi
+Index: asymptote-2.61/doc/asymptote.texi
 ===================================================================
---- asymptote-2.47.orig/doc/asymptote.texi
-+++ asymptote-2.47/doc/asymptote.texi
+--- asymptote-2.61.orig/doc/asymptote.texi
++++ asymptote-2.61/doc/asymptote.texi
 @@ -23,7 +23,7 @@ file LICENSE in the top-level source dir
       
  @dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
index fe4ca556a73c..269691eecfe9 100644
--- a/media-gfx/asymptote/files/asymptote-2.48-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.61-xdg-utils.patch
@@ -1,18 +1,17 @@
-Index: asymptote-2.48/settings.cc
+Index: asymptote-2.61/settings.cc
 ===================================================================
---- asymptote-2.48.orig/settings.cc
-+++ asymptote-2.48/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__
+--- asymptote-2.61.orig/settings.cc
++++ asymptote-2.61/settings.cc
+@@ -98,13 +98,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="";