From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7EADA59CA2 for ; Sat, 13 Feb 2016 21:43:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C8386E07D9; Sat, 13 Feb 2016 21:43:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C125E07D9 for ; Sat, 13 Feb 2016 21:43:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EB333340BCD for ; Sat, 13 Feb 2016 21:43:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 221A18E9 for ; Sat, 13 Feb 2016 21:43:35 +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: <1455399226.400077d5778ecfb7926b35547d346b4df1ac0e14.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/asymptote/, media-gfx/asymptote/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/asymptote/Manifest media-gfx/asymptote/asymptote-2.36.ebuild media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch media-gfx/asymptote/files/asymptote-2.36-info.patch media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch X-VCS-Directories: media-gfx/asymptote/files/ media-gfx/asymptote/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 400077d5778ecfb7926b35547d346b4df1ac0e14 X-VCS-Branch: master Date: Sat, 13 Feb 2016 21:43:35 +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-Archives-Salt: ca672f1a-bd62-4cfd-80c6-c4ce97556ba4 X-Archives-Hash: 07e698310d410a016c8e535005b6a0b3 commit: 400077d5778ecfb7926b35547d346b4df1ac0e14 Author: Andrey Grozin gentoo org> AuthorDate: Sat Feb 13 21:33:46 2016 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sat Feb 13 21:33:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400077d5 media-gfx/asymptote: version bump Compatible with sci-libs/gsl-2.1 Bug: 574622 Package-Manager: portage-2.2.27 media-gfx/asymptote/Manifest | 1 + media-gfx/asymptote/asymptote-2.36.ebuild | 211 +++++++++++++++++++++ .../files/asymptote-2.36-configure-ac.patch | 32 ++++ .../asymptote/files/asymptote-2.36-info.patch | 13 ++ .../asymptote/files/asymptote-2.36-xdg-utils.patch | 23 +++ 5 files changed, 280 insertions(+) diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 9dde0f1..4e33bd1 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,2 +1,3 @@ DIST asymptote-2.32.src.tgz 1794495 SHA256 2035035e02774598312d5588da2685d20fb85a378ea2bbe48b825c5442b18fa5 SHA512 a0663f1768cb4340bb6e9224d4fbc6e2f8b41501b1f59793d84db2e0f99b9ff071d3dd8fa5c4715c1874f8ef1af713a54b27de37ff40d8ca042f0f48579a57f9 WHIRLPOOL 38a8aaa581acb07bcc7ac0c802222501acf77abaf609d5ae758d9b5668ac6b8b1343640259cc3948e62a39862404709ddb64b4bbd11bcf20dbb7ce29d4fc25d1 DIST asymptote-2.35.src.tgz 3348122 SHA256 ff3cf5b6a6a65fb1fe5b3ef1e94bf9cff8c3376f0cd7be0fdd7079c0fb46c285 SHA512 671ffdde35b444b645d5ebea016b7fec583c4cecee67cf1700c4b3e2c783abfcc45dfa964864c8bd66be32c13fb109c139346c0dbcfb1b597d4d387ad19c6c97 WHIRLPOOL 70cde1fb0821bd7efa27629183fe36871b45d7f352f5a1e529fbdf3c0d50c53059a7d4befcd4d87663da365733b43006ef1399b5541095d85068c63200e1ddf7 +DIST asymptote-2.36.src.tgz 3449528 SHA256 cd3276cba498965f8c9e6c56b157d2f22304b0453d175bd9017b4c62b3fd1750 SHA512 18b079829f90561f88ebde0391f5d842d89ea28bf7b00306b908faeeca21b421127423af3a335bab9afa22036b3d93611702a579513d8a458be2f8cdd542222f WHIRLPOOL 532b221d619c8af077e0ef4cda960e6bc1b2c2eab263cfa1eb729df5928f7ae1d9e05459efee18a5a4fa4464b0b3aacd7f5ab42076e8af4e1fc3745f75dd9b6c diff --git a/media-gfx/asymptote/asymptote-2.36.ebuild b/media-gfx/asymptote/asymptote-2.36.ebuild new file mode 100644 index 0000000..6ea5ef6 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.36.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit autotools elisp-common eutils 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 vim-syntax X" + +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 ) + 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 + )" + +TEXMF=/usr/share/texmf-site + +pkg_setup() { + (use python || use X) && python-single-r1_pkg_setup +} + +src_prepare() { + # Fixing sigsegv enabling + epatch "${FILESDIR}/${P}-configure-ac.patch" + einfo "Patching configure.ac" + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + # Changing pdf, ps, image viewers to xdg-open + epatch "${FILESDIR}/${P}-xdg-utils.patch" + + # Bug #322473 + epatch "${FILESDIR}/${P}-info.patch" + + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # http://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_with 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/files/asymptote-2.36-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch new file mode 100644 index 0000000..ea8bc45 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.36-configure-ac.patch @@ -0,0 +1,32 @@ +Index: asymptote-2.36/configure.ac +=================================================================== +--- asymptote-2.36.orig/configure.ac ++++ asymptote-2.36/configure.ac +@@ -156,7 +156,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])],[ +@@ -231,7 +231,17 @@ AC_MSG_ERROR([*** Please install libm on + AC_CHECK_LIB([z], [deflate],, + AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***])) + AX_PTHREAD +-AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]) ++ ++AC_ARG_WITH(sigsegv, ++ [ --with-sigsegv use libsigsegv], ++ [with_sigsegv=$withval], ++ [with_sigsegv="no"]) ++if test "$with_sigsegv" = "yes"; then ++AC_CHECK_HEADER([sigsegv.h], ++ AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]), ++ AC_MSG_NOTICE([*** Header file sigsegv.h not found ***])) ++fi ++ + AC_CHECK_LIB([rt], [sched_yield]) + + AC_ARG_ENABLE(readline, diff --git a/media-gfx/asymptote/files/asymptote-2.36-info.patch b/media-gfx/asymptote/files/asymptote-2.36-info.patch new file mode 100644 index 0000000..9507328 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.36-info.patch @@ -0,0 +1,13 @@ +Index: asymptote-2.36/doc/asymptote.texi +=================================================================== +--- asymptote-2.36.orig/doc/asymptote.texi ++++ asymptote-2.36/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.36-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch new file mode 100644 index 0000000..4763a52 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.36-xdg-utils.patch @@ -0,0 +1,23 @@ +Index: asymptote-2.36/settings.cc +=================================================================== +--- asymptote-2.36.orig/settings.cc ++++ asymptote-2.36/settings.cc +@@ -90,15 +90,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="/";