From: Andrey Grozin Date: Mon, 2 Jan 2012 15:14:11 +0000 (+0000) Subject: Version bump X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6856bc8e8cef8e96b619b435b04ccc8dcc72797a;p=gentoo.git Version bump Package-Manager: portage-2.2.0_alpha84/cvs/Linux i686 --- diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog index ae3e12631796..5ef4ea5e7951 100644 --- a/media-gfx/asymptote/ChangeLog +++ b/media-gfx/asymptote/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/asymptote -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.94 2011/11/17 10:46:28 grozin Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.95 2012/01/02 15:14:11 grozin Exp $ + +*asymptote-2.15 (02 Jan 2012) + + 02 Jan 2012; Andrey Grozin +asymptote-2.15.ebuild, + +files/asymptote-2.15-configure-ac.patch, +files/asymptote-2.15-info.patch, + +files/asymptote-2.15-xdg-utils.patch: + Version bump *asymptote-2.14 (17 Nov 2011) diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 178d0c39f884..7474f2ebc354 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -6,9 +6,14 @@ AUX asymptote-2.13-xdg-utils.patch 689 RMD160 f77ca5459908ad23b970f908fdf918e784 AUX asymptote-2.14-configure-ac.patch 1141 RMD160 2a55b72540f4bc8a7187c57e60013be45b67b9cf SHA1 590734afbe031d3ef80e52e3a1b1cb8976e31667 SHA256 528f8e5ac9dd964b0d7da290a425bb30529d5cc6b2dc064dcb8e673a59156fbe AUX asymptote-2.14-info.patch 436 RMD160 317446e31c0af04307702c53f3dfd1bc815c4ef0 SHA1 edbb2a36a78e742e024e7bc3d990d86194af9b41 SHA256 9d3dee0f7fd55f65effc5c3d0285aafdb4a015b766550722267e1597025f4456 AUX asymptote-2.14-xdg-utils.patch 689 RMD160 43620ae021d0f304be531ea3e3e9fcd2b87b79cb SHA1 9eddf1c94f0fad04bbb85ee83b7b9dd2c255fcba SHA256 bb9dfa94308da49442638840d01c7dd4cdcff09da50be5cce9e9a800a1f78ecc +AUX asymptote-2.15-configure-ac.patch 1141 RMD160 d3bec0fcd8ed5c6b76d5c121013b73b1ade1ce8e SHA1 3a73517f907bca13d72848af608ceeb6f3008c61 SHA256 a9a12703ca36dff62ffb7be9776eccd877b2ab293ad54b2ac508940392a5b8a6 +AUX asymptote-2.15-info.patch 436 RMD160 628fe2ef1cd7d00502520ce3fce0975acf053e1c SHA1 2add69f0b06a3d108418a145f3f3095172552e21 SHA256 9f412259459f34f9f673f17f5db26195ff496f3458921fcd0479d629d70404e3 +AUX asymptote-2.15-xdg-utils.patch 689 RMD160 6707f76b5a9866804cbfe80e61650861769ceade SHA1 b9c66eb11d5c7353316122340ac75cf2ded220ae SHA256 afda4fd90308a3e9b566a399e6ebc7cef7611ec11d6f3d7052f6da064f45917f DIST asymptote-2.13.src.tgz 1732439 RMD160 c38a9224da74bb97a7b63e5ac56ba326b49625d9 SHA1 b4f2b72c0a4e7a02b716bfd0ad64bab45c567bbd SHA256 a0ac4815aaa367a8bc5cb3fb462267959f73e982d07fd96392c019c9fdfb7a13 DIST asymptote-2.14.src.tgz 1763675 RMD160 31725c6900bc82dc1ba5c1d80e5e2ca5e9d60134 SHA1 124dba02bda6f1ef9cacda16783f0a8bb12992be SHA256 ba7604a7438f63a535fd3a36e90317e3c6761610d00801033e1fb1f881d8eec8 +DIST asymptote-2.15.src.tgz 1763773 RMD160 1916f4160034d4d76280bfed8ebe0bb898fc80ce SHA1 e0fb336c195fb21a39e3d0f3acd4881ce5e170a7 SHA256 89034b7f072fe0476bc00a9c4c52189f67cdc1cb9c07bab1fd88bc50b2e0c887 EBUILD asymptote-2.13.ebuild 4714 RMD160 8a52eb582fbb6c4f3a6d4b8035580c9a4125f2aa SHA1 c97c3925738f0abdf25e96280f7e2e857765d8a9 SHA256 3ed0ce3551409d2e9bff5a791de89a5240376e18ee8010b25892688e6ea7e807 EBUILD asymptote-2.14.ebuild 4713 RMD160 a5b8edf56196c479f83be5395355740eda4f566a SHA1 418aed8aff9149ba46ec406bb38c336b7cc96c3f SHA256 80f63d583efd3fe95eefc36d9a2078f663294ca2ab2a94af4ab3a012b627b024 -MISC ChangeLog 26528 RMD160 54d5242f608c3b1e1424f1f3af526b19924d6fb9 SHA1 2937fb0f97830e2189bf24149202404ec28b57d1 SHA256 eea33fa52ee35bfc8ed9c12247947a6f46a69dfa35a11ad23edad323892fa9b4 +EBUILD asymptote-2.15.ebuild 4713 RMD160 673e829cce32c55bbda924906f4f35198312adbf SHA1 dbc7900abf67958f12d2ec3d80f45042be79106d SHA256 2ec2132fa61ce27d38e8d455d23ed96b55729a9ceea66d5e80b859f936a7c7d6 +MISC ChangeLog 26767 RMD160 b97a0e9f7380ebcd61af34b06395696cf0c034b4 SHA1 80067bc2b0b8bfb453d8347a7abc59adb62f4104 SHA256 cc07d266686cf69a2ef4cd070312b246b2c47467d03c94799117cd5e0eb9aff1 MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5 diff --git a/media-gfx/asymptote/asymptote-2.15.ebuild b/media-gfx/asymptote/asymptote-2.15.ebuild new file mode 100644 index 000000000000..27c5ea717ab9 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.15.ebuild @@ -0,0 +1,194 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.15.ebuild,v 1.1 2012/01/02 15:14:11 grozin Exp $ + +EAPI=3 +SUPPORT_PYTHON_ABIS=1 +PYTHON_DEPEND="python? 2" +RESTRICT_PYTHON_ABIS="3.*" +inherit eutils autotools elisp-common latex-package multilib python + +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 python sigsegv vim-syntax X" + +RDEPEND=">=sys-libs/readline-4.3-r5 + >=sys-libs/ncurses-5.4-r5 + imagemagick? ( media-gfx/imagemagick[png] ) + 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 ) + X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) + latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) + emacs? ( virtual/emacs ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] )" + +TEXMF=/usr/share/texmf-site + +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_with sigsegv) +} + +src_compile() { + emake || die "emake failed" + + cd doc + emake asy.1 || die "emake asy.1 failed" + if use doc; then + # info + einfo "Making info" + emake ${PN}.info || die "emake ${PN}.info failed" + cd FAQ + emake || die "emake FAQ failed" + cd .. + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf || die "emake asymptote.pdf failed" + emake CAD.pdf || die "emake CAD.pdf failed" + fi + cd .. + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el || die "elisp-compile failed" + fi +} + +src_install() { + # the program + exeinto /usr/bin + doexe 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 + exeinto /usr/share/${PN}/GUI + doexe GUI/xasy.py + rm GUI/xasy.py + insinto /usr/share/${PN}/GUI + doins 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 + if use X; then + doins GUI/*.asy + fi + insinto /usr/share/${PN}/examples/animations + doins examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc + insinto "${TEXMF}"/tex/latex/${PN} + doins ${PN}.sty asycolors.sty + if use examples; then + insinto /usr/share/${PN}/examples + doins latexusage.tex + fi + cd .. + fi + + # asymptote.py + if use python; then + python_install() { + insinto "$(python_get_sitedir)" + doins base/${PN}.py + } + python_execute_function python_install + 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 + doinfo ${PN}.info* + cd FAQ + dodoc asy-faq.ascii + doinfo asy-faq.info + insinto /usr/share/doc/${PF}/html/FAQ + doins asy-faq.html/* + cd .. + insinto /usr/share/doc/${PF} + doins ${PN}.pdf CAD.pdf + fi +} + +pkg_postinst() { + use python && python_mod_optimize ${PN}.py + 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 python && python_mod_cleanup ${PN}.py + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/files/asymptote-2.15-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.15-configure-ac.patch new file mode 100644 index 000000000000..780baeb9aadf --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.15-configure-ac.patch @@ -0,0 +1,32 @@ +Index: asymptote-2.15/configure.ac +=================================================================== +--- asymptote-2.15.orig/configure.ac ++++ asymptote-2.15/configure.ac +@@ -150,7 +150,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])],[ +@@ -223,7 +223,17 @@ AC_MSG_ERROR([*** Please install libm on + AC_CHECK_LIB([z], [deflate],, + AC_MSG_ERROR([*** Please install libz on your system ***])) + AC_CHECK_LIB([pthread], [pthread_create]) +-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.15-info.patch b/media-gfx/asymptote/files/asymptote-2.15-info.patch new file mode 100644 index 000000000000..4892c93d6726 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.15-info.patch @@ -0,0 +1,13 @@ +Index: asymptote-2.15/doc/asymptote.texi +=================================================================== +--- asymptote-2.15.orig/doc/asymptote.texi ++++ asymptote-2.15/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.15-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.15-xdg-utils.patch new file mode 100644 index 000000000000..71aa19a453c1 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.15-xdg-utils.patch @@ -0,0 +1,22 @@ +Index: asymptote-2.15/settings.cc +=================================================================== +--- asymptote-2.15.orig/settings.cc ++++ asymptote-2.15/settings.cc +@@ -96,14 +96,14 @@ 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 defaultDisplay="display"; ++string defaultDisplay="xdg-open"; + string defaultAnimate="animate"; + void queryRegistry() {} + const string dirsep="/";