Update to 1.26, mark 1.21 stable on x86.

(Portage version: 2.1.2.3)

6 files changed, 246 insertions, 5 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index e12e2b11a95b..64a13c699b00 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,17 +1,30 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.6 2007/04/10 10:29:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.7 2007/04/29 18:08:16 centic Exp $
+
+  29 Apr 2007; Dominik Stadler <centic@gentoo.org>
+  +files/asymptote-1.26-configure-ac.patch,
+  +files/asymptote-1.26-makefile.patch, asymptote-1.21.ebuild,
+  +asymptote-1.26.ebuild:
+  Mark 1.21 stable on x86
+
+*asymptote-1.26 (27 Apr 2007)
+
+  27 Apr 2007; Dominik Stadler <centic@gentoo.org>
+  +files/asymptote-1.26-configure-ac.patch,
+  +files/asymptote-1.26-makefile.patch, +asymptote-1.26.ebuild:
+  Add latest version 1.26
 
   10 Apr 2007; Marcus D. Hanwell <cryos@gentoo.org> asymptote-1.21.ebuild:
   Marked ~amd64.
 
+*asymptote-1.21 (03 Mar 2007)
+
   03 Mar 2007; Dominik Stadler <centic@gentoo.org>
   +files/asymptote-1.21-configure-ac.patch,
   +files/asymptote-1.21-makefile.patch, +asymptote-1.21.ebuild:
   Bump to version 1.21
 
-*asymptote-1.21 (03 Mar 2007)
-
   02 Mar 2007; Dominik Stadler <centic@gentoo.org> +files/64asy-gentoo.el,
   asymptote-1.20.ebuild:
   Add missing file 64asy-gentoo.el, add check for tk in python, add workaround
diff --git a/media-gfx/asymptote/asymptote-1.21.ebuild b/media-gfx/asymptote/asymptote-1.21.ebuild
index 611e5b99fb33..c79eeff03290 100644
--- a/media-gfx/asymptote/asymptote-1.21.ebuild
+++ b/media-gfx/asymptote/asymptote-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.21.ebuild,v 1.2 2007/04/10 10:29:30 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.21.ebuild,v 1.3 2007/04/29 18:08:16 centic Exp $
 
 inherit eutils elisp-common
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="boehm-gc doc fftw emacs gsl vim-syntax"
 
diff --git a/media-gfx/asymptote/asymptote-1.26.ebuild b/media-gfx/asymptote/asymptote-1.26.ebuild
new file mode 100644
index 000000000000..8d752b43c54b
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-1.26.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.26.ebuild,v 1.1 2007/04/29 18:08:16 centic Exp $
+
+inherit eutils elisp-common
+
+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-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="boehm-gc doc fftw emacs gsl vim-syntax"
+
+RDEPEND=">=sys-libs/readline-4.3-r5
+	>=sys-libs/ncurses-5.4-r5
+	dev-libs/libsigsegv
+	boehm-gc? ( >=dev-libs/boehm-gc-6.7 )
+	virtual/tetex
+	fftw? ( >=sci-libs/fftw-3.0.1 )
+	emacs? ( virtual/emacs )
+	gsl? ( sci-libs/gsl )
+	vim-syntax? ( app-editors/vim )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.5
+	>=sys-devel/bison-1.875
+	>=sys-devel/flex-2.5.4a-r5
+	doc? ( >=media-gfx/imagemagick-6.1.3.2
+		virtual/ghostscript
+		>=sys-apps/texinfo-4.7-r1 )"
+
+pkg_setup() {
+	# checking if Boehm garbage collector was compiled with c++ support
+	if use boehm-gc ; then
+		if ! built_with_use dev-libs/boehm-gc nocxx ; then
+			einfo "dev-libs/boehm-gc has been compiled with nocxx use flag disabled"
+		else
+			echo
+			eerror "You have to rebuild dev-libs/boehm-gc enabling c++ support"
+			die
+		fi
+	fi
+
+	if ! built_with_use dev-lang/python tk; then
+		eerror "Please reemerge dev-lang/python with 'tk' support or xasy will"
+		eerror "not work. In order to fix this, execute the following:"
+		eerror "echo \"dev-lang/python tk\" >> /etc/portage/package.use"
+		eerror "and reemerge dev-lang/python before emerging asymptote."
+		die "requires dev-lang/python with use-flag 'tk'!!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	# Fixing fftw and gsl enabling
+	epatch ${FILESDIR}/${P}-configure-ac.patch
+	einfo "Patching configure.ac"
+	sed -i \
+		-e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \
+		configure.ac || die "sed configure.ac failed"
+
+	einfo "Building configure"
+	WANT_AUTOCONF=2.5 autoconf
+
+	epatch ${FILESDIR}/${P}-makefile.patch
+}
+
+src_compile() {
+	for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done
+
+	# for the CPPFLAGS see http://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349
+	myconf="--with-latex=/usr/share/texmf/tex/latex --disable-gc-debug CPPFLAGS=-DHAVE_SYS_TYPES_H"
+	if use boehm-gc; then
+		myconf="${myconf} --enable-gc=system"
+	else
+		myconf="${myconf} --disable-gc"
+	fi
+
+	econf ${myconf} $(use_with fftw) $(use_with gsl) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	for dir in `find /var/cache/fonts -type d`; do addwrite ${dir}; done
+
+	if use doc; then
+		target="install-all"
+	else
+		target="install"
+	fi
+
+	make DESTDIR=${D} ${target} || die "make install failed"
+
+	dodoc BUGS ChangeLog README ReleaseNotes TODO
+
+	if use emacs ; then
+		elisp-site-file-install base/asy-mode.el
+		elisp-site-file-install "${FILESDIR}"/64asy-gentoo.el
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins base/asy.vim
+	fi
+}
+
+pkg_postinst() {
+	einfo 'Updating TeX tree...'
+	texhash &> /dev/null
+
+	einfo 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	einfo 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer'
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	einfo 'Updating TeX tree...'
+	texhash &> /dev/null
+
+	[ -f "${SITELISP}"/site-gentoo.el ] && elisp-site-regen
+}
diff --git a/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch
new file mode 100644
index 000000000000..c6b495e25e75
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-1.26-configure-ac.patch
@@ -0,0 +1,37 @@
+--- configure.ac	2007-01-31 00:09:02.000000000 +0100
++++ configure.ac_new	2007-01-31 00:45:53.000000000 +0100
+@@ -66,10 +66,16 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_YACC
+ 
++AC_ARG_WITH(fftw,
++	    [  --with-fftw             use fftw3],
++	    [with_fftw=$withval],
++	    [with_fftw="no"])
++if test "$with_fftw" = "yes"; then
+ AC_CHECK_HEADER(fftw3.h,
+    AC_CHECK_LIB([fftw3], fftw_execute,,
+            AC_MSG_NOTICE([*** Could not find libfftw3: will compile without optional fast Fourier transforms. ***])),
+      AC_MSG_NOTICE([*** Header file fftw3.h not found: will compile without optional fast Fourier transforms. ***]))
++fi
+ 
+ GCVERSION=6.8
+ 
+@@ -152,11 +158,17 @@
+ 		   [Define if you have a working <rpc/rpc.h> header file])],
+    AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***]))
+ 
++AC_ARG_WITH(gsl,
++	    [  --with-gsl              use gsl libraries],
++	    [with_gsl=$withval],
++	    [with_gsl="no"])
++if test "$with_gsl" = "yes"; then
+ AC_CHECK_HEADER(gsl/gsl_sf.h,
+    AC_CHECK_LIB([gsl], gsl_sf_Si, [AC_DEFINE(HAVE_LIBGSL, 1,
+    [Define to 1 if you have the 'gsl' library (-lgsl). ]) LIBS=$LIBS"-lgsl -lgslcblas "],
+            AC_MSG_NOTICE([*** Could not find libgsl: will compile without optional special functions. ***]),[-lgslcblas]),
+      AC_MSG_NOTICE([*** Header file gsl_sf.h not found: will compile without optional special functions. ***]))
++fi
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_PID_T
diff --git a/media-gfx/asymptote/files/asymptote-1.26-makefile.patch b/media-gfx/asymptote/files/asymptote-1.26-makefile.patch
new file mode 100644
index 000000000000..4bb2db0f55b2
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-1.26-makefile.patch
@@ -0,0 +1,61 @@
+--- Makefile.in	2006-12-29 06:16:42.000000000 +0100
++++ ../asymptote-1.20_new/Makefile.in	2007-02-02 22:21:54.000000000 +0100
+@@ -44,7 +44,7 @@
+ datadir = $(DESTDIR)@datadir@
+ asydir = $(datadir)/asymptote
+ docdir = $(DESTDIR)@docdir@
+-exampledir = $(docdir)/examples
++exampledir = $(asydir)/examples
+ animationsdir = $(exampledir)/animations
+ latexdir = $(DESTDIR)@latexdir@
+ INSTALL = @INSTALL@
+@@ -116,11 +116,8 @@
+ 		doc/*.asy doc/*.csv doc/*.dat doc/latexusage.tex $(exampledir)
+ 	${INSTALL} -p -m 644 examples/animations/*.asy $(animationsdir)
+ 	-${INSTALL} -p -m 644 $(addprefix doc/,$(LATEXFILES)) $(latexdir)
+-	-if test -z "$(DESTDIR)"; then \
+-	  texhash; \
+-	fi
+ 
+-install-doc: doc
++install-doc:
+ 	cd doc; $(MAKE) install-all
+ 
+ install-man: man
+--- doc/Makefile	2007-02-02 20:17:18.000000000 +0100
++++ ../asymptote-1.20_new/doc/Makefile	2007-02-02 21:26:45.000000000 +0100
+@@ -4,9 +4,9 @@
+ ASY = ../asy -dir ../base
+ DOCFILES = asymptote.pdf CAD.pdf PDFAnim_temp_Guide.pdf
+ 
+-doc:	asymptote.dvi asymptote.info html man
++doc:	$(DOCFILES) asymptote.info html man
+ 
+-man:	asymptote.pdf CAD.pdf PDFAnim_temp_Guide.pdf asy.1
++man:	$(MANFILES)
+ 
+ faq:	
+ 	cd FAQ; $(MAKE) faq
+@@ -71,15 +71,15 @@
+ 	rm -f CAD.{aux,dvi,log,pdf,toc}
+ 	rm -rf asymptote
+ 
+-install: man faq
+-	cd FAQ; $(MAKE) install
+-	${INSTALL} -d -m 755 $(docdir) $(mandir)/man1
+-	${INSTALL} -p -m 644 $(DOCFILES) $(docdir)
++install: man
++	${INSTALL} -d -m 755 $(mandir)/man1
+ 	${INSTALL} -p -m 644 $(MANFILES) $(mandir)/man1
+ 
+-install-all: doc install
+-	cd FAQ; $(MAKE) install-info
+-	${INSTALL} -d -m 755 $(infodir)
++install-all: doc faq install
++	cd FAQ; $(MAKE) install-all
++	${INSTALL} -d -m 755 $(infodir) $(docdir)/html/asymptote
++	${INSTALL} -p -m 644 $(DOCFILES) $(docdir)
++	${INSTALL} -p -m 644 asymptote/* $(docdir)/html/asymptote
+ 	${INSTALL} -p -m 644 asymptote.info $(infodir)
+ 	-if test -z "$(DESTDIR)"; then \
+ 		install-info --infodir=$(infodir) asymptote.info; \
diff --git a/media-gfx/asymptote/files/digest-asymptote-1.26 b/media-gfx/asymptote/files/digest-asymptote-1.26
new file mode 100644
index 000000000000..eda60b10365a
--- /dev/null
+++ b/media-gfx/asymptote/files/digest-asymptote-1.26
@@ -0,0 +1,3 @@
+MD5 08ffbcf8ddf17644a408a86c8d2f0354 asymptote-1.26.src.tgz 930703
+RMD160 5c791beea7819c10b1b38af564e6bfbb73ce2964 asymptote-1.26.src.tgz 930703
+SHA256 727d3f6f3ce21d68d19177ddfaddccbef84a8c2fe3c79ec476b8cc2e5b7d1e80 asymptote-1.26.src.tgz 930703