From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 793DA1382C5 for ; Sun, 28 Feb 2021 13:02:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB5A9E0884; Sun, 28 Feb 2021 13:02:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 91C7CE0884 for ; Sun, 28 Feb 2021 13:02:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B13534115D for ; Sun, 28 Feb 2021 13:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE0BD2A9 for ; Sun, 28 Feb 2021 13:02:32 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1614517313.c5dea7521772bdd8be77f1f9f910dfdb2cd8848d.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/asymptote/files/, media-gfx/asymptote/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/asymptote/Manifest media-gfx/asymptote/asymptote-2.69.ebuild media-gfx/asymptote/files/asymptote-2.69-info.patch media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch media-gfx/asymptote/metadata.xml X-VCS-Directories: media-gfx/asymptote/ media-gfx/asymptote/files/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: c5dea7521772bdd8be77f1f9f910dfdb2cd8848d X-VCS-Branch: master Date: Sun, 28 Feb 2021 13:02:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4b3b5980-c265-4884-af8e-8dbb3fd8c189 X-Archives-Hash: 173ee38b93b48a8ff8029cfc654c1842 commit: c5dea7521772bdd8be77f1f9f910dfdb2cd8848d Author: Andrey Grozin gentoo org> AuthorDate: Sun Feb 28 13:01:53 2021 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sun Feb 28 13:01:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5dea752 media-gfx/asymptote: bump to 2.69 xasy is currently broken and temporarily removed Closes: https://bugs.gentoo.org/716036 Closes: https://bugs.gentoo.org/766279 Closes: https://bugs.gentoo.org/737122 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrey Grozin gentoo.org> media-gfx/asymptote/Manifest | 1 + media-gfx/asymptote/asymptote-2.69.ebuild | 205 +++++++++++++++++++++ .../asymptote/files/asymptote-2.69-info.patch | 13 ++ .../asymptote/files/asymptote-2.69-xdg-utils.patch | 23 +++ media-gfx/asymptote/metadata.xml | 2 + 5 files changed, 244 insertions(+) diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 1d483a1867c..b4f108398f4 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,3 +1,4 @@ DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026 DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210 DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46 +DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791 diff --git a/media-gfx/asymptote/asymptote-2.69.ebuild b/media-gfx/asymptote/asymptote-2.69.ebuild new file mode 100644 index 00000000000..b7b0b25d288 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.69.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +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 curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax" +# FIXME: xasy is currently broken +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 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 ) + 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 curl) \ + $(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 + + # 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/files/asymptote-2.69-info.patch b/media-gfx/asymptote/files/asymptote-2.69-info.patch new file mode 100644 index 00000000000..63f2dc28176 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.69-info.patch @@ -0,0 +1,13 @@ +Index: asymptote-2.69/doc/asymptote.texi +=================================================================== +--- asymptote-2.69.orig/doc/asymptote.texi ++++ asymptote-2.69/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.69-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch new file mode 100644 index 00000000000..f07d23ac618 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch @@ -0,0 +1,23 @@ +Только в asymptote-2.67.orig: .pc +Index: asymptote-2.69/settings.cc +=================================================================== +--- asymptote-2.69.orig/settings.cc ++++ asymptote-2.69/settings.cc +@@ -101,13 +101,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="/"; diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml index fee8887be49..0f12983bc2f 100644 --- a/media-gfx/asymptote/metadata.xml +++ b/media-gfx/asymptote/metadata.xml @@ -20,10 +20,12 @@ Enables using the Boehm-Demers-Weiser conservative garbage collector + Enables running remote programs via net-misc/curl Enables using dev-libs/libsigsegv Enables off-screen rendering asymptote + vectorgraphics/asymptote