Version bump

Package-Manager: portage-2.2.0_alpha74/cvs/Linux i686

6 files changed, 275 insertions, 12 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 3760ad7bbf06..ae3e12631796 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.93 2011/11/14 11:23:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.94 2011/11/17 10:46:28 grozin Exp $
+
+*asymptote-2.14 (17 Nov 2011)
+
+  17 Nov 2011; Andrey Grozin <grozin@gentoo.org> +asymptote-2.14.ebuild,
+  +files/asymptote-2.14-configure-ac.patch, +files/asymptote-2.14-info.patch,
+  +files/asymptote-2.14-xdg-utils.patch:
+  Version bump
 
   14 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> asymptote-2.13.ebuild:
   QA: cxx conditional was broken, fix it.
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index c7273ca5e069..178d0c39f884 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -1,19 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 64asymptote-gentoo.el 337 RMD160 423330249638e628cb0f7d0b8196042a34cffa03 SHA1 0ab1578ba7989941567f3f855481b8e9805420c2 SHA256 28dde57a1b6b39e583739c387eaef205dc16eea97c5980fddd2e3d0dd7023ed3
 AUX asy-ftd.vim 60 RMD160 a08d3dbd7535d3de0897dd73b00f8866a72db731 SHA1 426086e8ed8d9f45518df1380ab62703cd5f1e0d SHA256 c766fccb0e3e43a6fb78eaa56cf6c45398d48b08566ea4794726f4a6ae3c9dc1
 AUX asymptote-2.13-configure-ac.patch 1141 RMD160 961f908deb855ce7fe045a40e786821918585472 SHA1 a4d6c74c65f143076e5726701a02b5a61f4462a9 SHA256 75743d5ae1df3b617cd20a757a0bb5ecf0a0b7ed6cd6bf27e7da1b17c862a050
 AUX asymptote-2.13-info.patch 436 RMD160 687ea151330bace3daa5c82270be1ae2068c33b6 SHA1 54efde9746166049cf284557cb61e8902310dff2 SHA256 02cadcaa6e1a13eea2ce35359f02308bef008485adae217e7ddd0cf5b846dbca
 AUX asymptote-2.13-xdg-utils.patch 689 RMD160 f77ca5459908ad23b970f908fdf918e7849535d3 SHA1 0dda8a1d1abfe58582f3156569f0f06685c72011 SHA256 fa1fa33ef208930050231ca518381f4c0a1d8432cbb326c6bc5a61973f309624
+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
 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
 EBUILD asymptote-2.13.ebuild 4714 RMD160 8a52eb582fbb6c4f3a6d4b8035580c9a4125f2aa SHA1 c97c3925738f0abdf25e96280f7e2e857765d8a9 SHA256 3ed0ce3551409d2e9bff5a791de89a5240376e18ee8010b25892688e6ea7e807
-MISC ChangeLog 26292 RMD160 24a3d308ebd78e29e94f2781517abc1a24ed7c09 SHA1 b42d6b165feee6d8eb2fd87523a327208906a206 SHA256 18f40e275475c22e21a73f183eabd73ad75ff5b81456a89dbbaac410aa9f5dc0
+EBUILD asymptote-2.14.ebuild 4713 RMD160 a5b8edf56196c479f83be5395355740eda4f566a SHA1 418aed8aff9149ba46ec406bb38c336b7cc96c3f SHA256 80f63d583efd3fe95eefc36d9a2078f663294ca2ab2a94af4ab3a012b627b024
+MISC ChangeLog 26528 RMD160 54d5242f608c3b1e1424f1f3af526b19924d6fb9 SHA1 2937fb0f97830e2189bf24149202404ec28b57d1 SHA256 eea33fa52ee35bfc8ed9c12247947a6f46a69dfa35a11ad23edad323892fa9b4
 MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7A+j0ACgkQAiZjviIA2XjoKwCgv5hH39NloC2xOltwi31rFqcZ
-+3gAni5LNO5hr6PWzcopFUudVw/0rKFo
-=rnTr
------END PGP SIGNATURE-----
diff --git a/media-gfx/asymptote/asymptote-2.14.ebuild b/media-gfx/asymptote/asymptote-2.14.ebuild
new file mode 100644
index 000000000000..8a9e7d62a886
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.14.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.14.ebuild,v 1.1 2011/11/17 10:46:28 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.14-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.14-configure-ac.patch
new file mode 100644
index 000000000000..cda852165501
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-configure-ac.patch
@@ -0,0 +1,32 @@
+Index: asymptote-2.14/configure.ac
+===================================================================
+--- asymptote-2.14.orig/configure.ac
++++ asymptote-2.14/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.14-info.patch b/media-gfx/asymptote/files/asymptote-2.14-info.patch
new file mode 100644
index 000000000000..cb836fc1bf80
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.14/doc/asymptote.texi
+===================================================================
+--- asymptote-2.14.orig/doc/asymptote.texi
++++ asymptote-2.14/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.14-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.14-xdg-utils.patch
new file mode 100644
index 000000000000..8bce2be44bd4
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.14-xdg-utils.patch
@@ -0,0 +1,22 @@
+Index: asymptote-2.14/settings.cc
+===================================================================
+--- asymptote-2.14.orig/settings.cc
++++ asymptote-2.14/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="/";