Version bump

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

6 files changed, 274 insertions, 3 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 5e7bfd936faa..499c3c5a2a7b 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/asymptote
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.84 2010/12/26 07:15:29 grozin Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.85 2011/05/29 19:39:36 grozin Exp $
+
+*asymptote-2.10 (29 May 2011)
+
+  29 May 2011; Andrey Grozin <grozin@gentoo.org> +asymptote-2.10.ebuild,
+  +files/asymptote-2.10-configure-ac.patch, +files/asymptote-2.10-info.patch,
+  +files/asymptote-2.10-xdg-utils.patch:
+  Version bump
 
   26 Dec 2010; Andrey Grozin <grozin@gentoo.org> -asymptote-1.86.ebuild,
   -files/asymptote-1.86-configure-ac.patch,
diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest
index 1fa0c9b3273e..3dc990e1dc0c 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -3,7 +3,12 @@ AUX asy-ftd.vim 60 RMD160 a08d3dbd7535d3de0897dd73b00f8866a72db731 SHA1 426086e8
 AUX asymptote-2.08-configure-ac.patch 1141 RMD160 2e04327c6248bdf634d3bf6fc58e6d788ebab882 SHA1 c578936c0a83ad1548dad4b7f83955e98661ea95 SHA256 8daf97cd5fab054dfb98678daf29fd94dbac890249607f86de51a02fc5a3abe6
 AUX asymptote-2.08-info.patch 436 RMD160 a542eab62442717a3874e75149b93822fb8f264c SHA1 95f34e9ad89b86d7fb7dc573eb0f1b8d6486a6b9 SHA256 d566ec90560ba91cf8abf52eac28f89e01ea4020b2254649c9dbcb7fd48228e0
 AUX asymptote-2.08-xdg-utils.patch 689 RMD160 307e33beeba7e55c25bf9a4b5b91c704596075b0 SHA1 a3d4dd2c163f5df357f553bf19117a6b6341a4bc SHA256 d7d1e992a30a56737a71ace28f856d923115e41d301ab18aeee0d23f46436603
+AUX asymptote-2.10-configure-ac.patch 1141 RMD160 a3cf196dc427ce2ba4d964ba850443ee84eab10d SHA1 e5240ecdb1cbd9380afb531f02ffe006eb36270f SHA256 92d90f82c91666bb3e9ff26d4faad54d7d6ba52a03ebde1d9d9b87b96ef095c8
+AUX asymptote-2.10-info.patch 436 RMD160 beeece4bd959e7183397fdb1553a350cd96c158b SHA1 5105ed30dec22ce33d69693460dc68df165be644 SHA256 3c9a6093cd9e27cb41e12938379e6ac6b74ea3c5a61893a8fe553933d4652c01
+AUX asymptote-2.10-xdg-utils.patch 689 RMD160 d0fd25bea6b4c28bf13a8df0e28a16b85d608573 SHA1 07ca407e9fb6e7600111520a9f312f497f9a2313 SHA256 25aeb8e592fdb27ae097aa8d34a072e0adc81a94f752a292ba153c28fe9a15fb
 DIST asymptote-2.08.src.tgz 1727080 RMD160 a9a2c80410eb9a7f9371a7a1a1634fed0e0be6ab SHA1 6b81336727458f7fdcc3db972f1e63b3bfc1a93b SHA256 40abd65b35fc6f3192885f160a2e780ce8af4897e37a4b0cbece14fd6290ad2e
+DIST asymptote-2.10.src.tgz 1729028 RMD160 8a214947ff7599956bb5c27cee13db23aa62b1f2 SHA1 46e14d3ffd7711cee83832515608f26e73172906 SHA256 2128c2a0fdcd254889e8a5deb0497f0a8bf94121620960e8126bc87f14f65d6d
 EBUILD asymptote-2.08.ebuild 4690 RMD160 7e300fd888b84892180bf48fd5a7327e9d32dd5b SHA1 15602ee92e4d6e2487afd5cf9c01955168317bbe SHA256 dc14031335767f28f75b5187778608a57258ee5268b6f3387c139439f3fa823a
-MISC ChangeLog 24518 RMD160 a1123495947356f9350ba18a827e3baf79312da5 SHA1 4cbea3001834d5ce370e0aa0d4b007c28de5a278 SHA256 258abb1e67d7778fc3514b845c13acdf4073daf5210a32a1124e9d4e1cd13e2c
+EBUILD asymptote-2.10.ebuild 4690 RMD160 7d98f09f65e2815ee14b95e46ef9511600ca2c95 SHA1 5939e34253f1b69409915c789e9e0665e356254e SHA256 d6cefae9c447508321708cfe91d40484b91693153662569cadeeb98ec06d7777
+MISC ChangeLog 24757 RMD160 e29b5d030cfc60301491d65e3383971f9ddf779a SHA1 7a834c16b731876b57bf41849e95309af2a02c32 SHA256 8e72a30bad6a26cee6652c8e43825835ca98a520d8b4a511f47b67b397945c1d
 MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5
diff --git a/media-gfx/asymptote/asymptote-2.10.ebuild b/media-gfx/asymptote/asymptote-2.10.ebuild
new file mode 100644
index 000000000000..1e0d8ba2cdcd
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-2.10.ebuild
@@ -0,0 +1,192 @@
+# 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.10.ebuild,v 1.1 2011/05/29 19:39:36 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[-nocxx,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 \
+		--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.10-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.10-configure-ac.patch
new file mode 100644
index 000000000000..0cff88d70c40
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.10-configure-ac.patch
@@ -0,0 +1,32 @@
+Index: asymptote-2.10/configure.ac
+===================================================================
+--- asymptote-2.10.orig/configure.ac
++++ asymptote-2.10/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])],[
+@@ -218,7 +218,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.10-info.patch b/media-gfx/asymptote/files/asymptote-2.10-info.patch
new file mode 100644
index 000000000000..63b7836c12da
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.10-info.patch
@@ -0,0 +1,13 @@
+Index: asymptote-2.10/doc/asymptote.texi
+===================================================================
+--- asymptote-2.10.orig/doc/asymptote.texi
++++ asymptote-2.10/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.10-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.10-xdg-utils.patch
new file mode 100644
index 000000000000..00522c7f17c1
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-2.10-xdg-utils.patch
@@ -0,0 +1,22 @@
+Index: asymptote-2.10/settings.cc
+===================================================================
+--- asymptote-2.10.orig/settings.cc
++++ asymptote-2.10/settings.cc
+@@ -89,14 +89,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="/";