From 6b89cba67f554b60d139fd07623aef5cc724ec91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 20 Jul 2023 19:08:44 +0100 Subject: gentoo auto-resync : 20:07:2023 - 19:08:44 --- media-gfx/asymptote/Manifest | 3 + media-gfx/asymptote/asymptote-2.86.ebuild | 245 +++++++++++++++++++++ .../files/asymptote-2.86-without-lsp.patch | 50 +++++ 3 files changed, 298 insertions(+) create mode 100644 media-gfx/asymptote/asymptote-2.86.ebuild create mode 100644 media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch (limited to 'media-gfx/asymptote') diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index cac03aef6acd..5dc365024628 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,6 +1,9 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86 AUX asymptote-2.70-info.patch 436 BLAKE2B 70eac7625341e21f9cf03cf1ea08e4864fe102627349f2411680b9c18f4df508f5cd6972f9e6dc719795f0323c51b6a5d096e9e3cae81cc1ee497f3f9325fafd SHA512 5b7494351bef5240bd4dba531a3eb68d3a6025990f32fe4064df31e351df9cfb27be29c69b16309929a63ec8d164eb4f2b14315406e546c7dba9dc416ae6b8d4 AUX asymptote-2.85-xdg-utils.patch 762 BLAKE2B 4b5ea874e89723e0a26b3a16a55660703a78316bc0df1b8cc2a23963aac51d4d0b2107598c67316cfcee132a1b88b90b3c600bc279b098f2e709c65911f37a51 SHA512 8c6f85518968fbf10ac66b7bc1819bcc90562076475c5405d4f21da0de64406de4c26de2ba9481e15dc21d9f086cd2920b263c7bb483c90a5ed40900dfaf937c +AUX asymptote-2.86-without-lsp.patch 1045 BLAKE2B 9e212ea9f00f5c49171679cca577b8a37e165d73514f6ecf20c06ce2b3f2fa7f2696f8ba66f9775b7b71ebacadee39e9c398bc9a6c7a001e904f41be7a1f6e55 SHA512 3a4ceb7c356b4abe7eaceb1b0b9a805d0325a8a7d6b9d2eff8c4462abcad215783842412c4cb4f89e737d9bb0e07fc8eeaea0075f0894aa1c8c8e4e5c0312179 DIST asymptote-2.85.src.tgz 15073771 BLAKE2B 5fb965d6fad5c138c00b76a55158c3808022de84ba2a5568af551fe744e5ab0dc3caf168f9467517d917c9716a89a3fd1064324991e8d058a7a27138648903fc SHA512 81e62c3b5c1a4d8a12b37c9ca45f0141cf4034719f08155c2eb61989a2132a79053d611dee29bc0ea24b0aa05d2b4cb2b0dfeadec51e754cd65caf4ace7cc5b1 +DIST asymptote-2.86.src.tgz 15118426 BLAKE2B 305edae6653094a5daa9f136951cfcc3f8ece1dc8e616593710e0bace350a95f61729f8d7a9522a14704300a6cfd15decb1bb634e58dba1626f09c053b6b368b SHA512 9e11dbfca10379f07b50dcce0d63c12b793f47741651b1804cf0825e87604c40b5b94acf343ce7f5ca7da83b5ebb0e213090ada80e0b6ebe4f6cec9db67209d6 EBUILD asymptote-2.85-r1.ebuild 5535 BLAKE2B 0b32607680560aabef0873e89cad7f3a751cd7efacea1d7327a18e49aac3905a331b05cc1770b8457764324eed16c5b27f0f98e23b243e84783bec47245a45d9 SHA512 447c5cf46bd62e61b8de8f616648a89616a911cdc257dfe5ce1db7ab2bee22de12b757605fae3a3b0f2df8dcadb0583246b79eca33f706bf58715d4fef1c6c1d +EBUILD asymptote-2.86.ebuild 5582 BLAKE2B 09181f47da4506a8d46dbb784ce44086169bff3011d83379ade6868ec3ecedca00f008d7f1092a2e0f481ab2b5517f05b16a2dc45dc10f3a61c678a14ae43bb6 SHA512 06e8aae3115e08751ae4af973ae4b4675d775bcab054c3c76f76647a4466dfea1ca21c1eb7c03c3202a64ee9e34db7c254c797184baf433d77089c0ff9619292 MISC metadata.xml 1423 BLAKE2B 64dd5d6c928a11d4a47297362223164cb19d91f6a08a0582b66831e2e8e2d7594389c2244fa1527dfe945da0e67985f5c639e3dae2482f57b510bf828a4605ed SHA512 1561e416e56bca130a72f90886981f63224c21e2a077a7b93e6fdd877f38dd12dfa9e0b747840e7f459e2df16c5b08e0177d26c526eb21bebe00fa8c91326bc9 diff --git a/media-gfx/asymptote/asymptote-2.86.ebuild b/media-gfx/asymptote/asymptote-2.86.ebuild new file mode 100644 index 000000000000..dcccb01b39d5 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.86.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +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 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+boehm-gc context curl doc emacs examples fftw gsl +imagemagick latex lsp 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= + net-libs/libtirpc:= + 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} ) + curl? ( net-misc/curl ) + lsp? ( + dev-libs/boost + dev-libs/rapidjson + dev-libs/utfcpp + ) + 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 + ) + 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? ( + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + dev-texlive/texlive-latexextra + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${PN}-2.85-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${PN}-2.70-info.patch" + + "${FILESDIR}/${PN}-2.86-without-lsp.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 \ + --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 lsp) \ + $(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 + einfo "Making info" + cd png || die + emake ${PN}.info + cd .. || die + if use doc; then + 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 asy-latex.pdf asyRefCard.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/*.js base/*.sh base/*.ps base/shaders base/webgl + chmod 755 "${D}"/usr/share/${PN}/shaders/* + + # documentation + 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 + docinto examples + dodoc \ + examples/*.asy \ + examples/*.views \ + examples/*.dat \ + examples/*.bib \ + examples/*.png \ + examples/*.pdb1 \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/pixel.pdf \ + doc/extra/*.asy + docinto examples/animations + dodoc examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins *.sty latexmkrc + if use examples; then + docinto examples + dodoc latexusage.tex externalprc.tex + docinto examples/animations + dodoc ../examples/animations/*.tex + fi + cd .. || die + fi + + # ConTeXt + if use context; then + insinto /usr/share/texmf-site/tex/context + doins doc/colo-asy.tex + 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 +} + +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/files/asymptote-2.86-without-lsp.patch b/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch new file mode 100644 index 000000000000..2f70cd0d9725 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.86-without-lsp.patch @@ -0,0 +1,50 @@ +From 29caaed5ead5a62787475286afd22e40585b8bb8 Mon Sep 17 00:00:00 2001 +From: John Bowman +Date: Wed, 14 Jun 2023 22:36:35 -0600 +Subject: [PATCH] Fix --without-lsp (issue #379). + +--- + common.h | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/common.h b/common.h +index 13f8be106..6ee3d971f 100644 +--- a/common.h ++++ b/common.h +@@ -17,28 +17,27 @@ + #include "config.h" + #endif + +-#ifdef HAVE_LSP + #if __cplusplus < 201703L ++ ++#ifdef HAVE_LSP + #include + #include + using boost::optional; + #define nullopt boost::none + using boost::make_optional; + #else +-#include +-using std::optional; +-using std::nullopt; +-using std::make_optional; +-#endif +- +-#else +-#if __cplusplus < 201703L + #include "optional.hpp" + #define boost nonstd + using nonstd::optional; + using nonstd::nullopt; + using nonstd::make_optional; + #endif ++ ++#else ++#include ++using std::optional; ++using std::nullopt; ++using std::make_optional; + #endif + + using std::make_pair; -- cgit v1.2.3