Add version 1.33 including fix for boehm-gc 7.0, fixes Bug 188518, thanks to Peter Ansell for the patches. Also stated boehm-gc < 7.0 for 1.29.

(Portage version: 2.1.3_rc9)

6 files changed, 257 insertions, 3 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index dac7c390f41c..5a50cecc0230 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,15 @@
 # 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.10 2007/08/03 06:50:43 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.11 2007/08/28 21:13:22 centic Exp $
+
+*asymptote-1.33 (28 Aug 2007)
+
+  28 Aug 2007; Dominik Stadler <centic@gentoo.org>
+  +files/asymptote-1.33-configure-ac.patch,
+  +files/asymptote-1.33-makefile.patch, asymptote-1.29.ebuild,
+  +asymptote-1.33.ebuild:
+  Add version 1.33 including fix for boehm-gc 7.0, fixes Bug 188518, thanks to
+  Peter Ansell for the patches. Also stated boehm-gc < 7.0 for 1.29
 
   03 Aug 2007; Dominik Stadler <centic@gentoo.org> asymptote-1.26.ebuild,
   asymptote-1.29.ebuild:
diff --git a/media-gfx/asymptote/asymptote-1.29.ebuild b/media-gfx/asymptote/asymptote-1.29.ebuild
index 263e8777d047..02d003306559 100644
--- a/media-gfx/asymptote/asymptote-1.29.ebuild
+++ b/media-gfx/asymptote/asymptote-1.29.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.29.ebuild,v 1.2 2007/08/03 06:50:43 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.29.ebuild,v 1.3 2007/08/28 21:13:22 centic Exp $
 
 inherit eutils elisp-common
 
@@ -17,7 +17,7 @@ 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 )
+	boehm-gc? ( >=dev-libs/boehm-gc-6.7 <dev-libs/boehm-gc-7.0 )
 	virtual/tetex
 	fftw? ( >=sci-libs/fftw-3.0.1 )
 	emacs? ( virtual/emacs )
diff --git a/media-gfx/asymptote/asymptote-1.33.ebuild b/media-gfx/asymptote/asymptote-1.33.ebuild
new file mode 100644
index 000000000000..84d99ce2dc24
--- /dev/null
+++ b/media-gfx/asymptote/asymptote-1.33.ebuild
@@ -0,0 +1,128 @@
+# 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.33.ebuild,v 1.1 2007/08/28 21:13:22 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-7.0 )
+	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 base/asy-keywords.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
+
+	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
+	elog '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.33-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch
new file mode 100644
index 000000000000..cf4fc235481a
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-1.33-configure-ac.patch
@@ -0,0 +1,49 @@
+--- configure.ac	2007-07-30 02:28:12.000000000 +1000
++++ ../configure.ac.new	2007-08-19 09:19:39.000000000 +1000
+@@ -76,10 +76,16 @@
+    fi
+ fi
+ 
+-AC_CHECK_HEADER(fftw3.h,
+-   AC_CHECK_LIB([fftw3], fftw_execute,,
++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=gc-7.0
+ 
+@@ -108,7 +114,8 @@
+       then INCL="-I$prefix/include/gc" 
+       else INCL="-I$ac_cv_use_gc/include/gc"
+       fi
+-      AC_CHECK_HEADER(gc.h,
++	
++      AC_CHECK_HEADER([gc/gc.h],
+ 	AC_CHECK_LIB([gc],[GC_malloc],[
+ 	  LIBS=$LIBS"-lgc "
+ #	  LIBS=$LIBS"-lgccpp -lgc "
+@@ -183,11 +190,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.33-makefile.patch b/media-gfx/asymptote/files/asymptote-1.33-makefile.patch
new file mode 100644
index 000000000000..d4d5b1a5cac4
--- /dev/null
+++ b/media-gfx/asymptote/files/asymptote-1.33-makefile.patch
@@ -0,0 +1,65 @@
+--- ../media-gfx/asymptote-1.33/work/asymptote-1.33/Makefile.in	2007-07-30 02:27:31.000000000 +1000
++++ Makefile.in	2007-08-12 08:15:32.000000000 +1000
+@@ -49,7 +49,7 @@
+ datadir = $(DESTDIR)@datadir@
+ asydir = $(datadir)/asymptote
+ docdir = $(DESTDIR)@docdir@
+-exampledir = $(docdir)/examples
++exampledir = $(asydir)/examples
+ animationsdir = $(exampledir)/animations
+ latexdir = $(DESTDIR)@latexdir@
+ INSTALL = @INSTALL@
+@@ -127,11 +127,9 @@
+ 	  doc/extra/*.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: html
++
++install-doc:
+ 	cd doc; $(MAKE) install-all
+ 
+ install-man: man
+--- ../media-gfx/asymptote-1.33/work/asymptote-1.33/doc/Makefile	2007-07-30 02:28:22.000000000 +1000
++++ doc/Makefile	2007-08-12 08:21:29.000000000 +1000
+@@ -16,12 +16,12 @@
+ 
+ html:	asymptote/index.html
+ 
+-man:	$(DOCFILES) asy.1
++man:	$(MANFILES) asy.1
+ 
+ faq:	
+ 	cd FAQ; $(MAKE) faq
+ 
+-doc:	asymptote.dvi asymptote.info html man faq
++doc:	$(DOCFILES) asymptote.info html man faq
+ 
+ %.png:	%.asy
+ 	$(ASY) -f png $<
+@@ -84,15 +84,14 @@
+ 	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} -p -m 644 $(MANFILES) $(mandir)/man1
++install: man
++	${INSTALL} -d -m 755 $(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)
+ 	-${INSTALL} -p -m 644 asymptote.info-* $(infodir)
+ 	-if test -z "$(DESTDIR)"; then \
diff --git a/media-gfx/asymptote/files/digest-asymptote-1.33 b/media-gfx/asymptote/files/digest-asymptote-1.33
new file mode 100644
index 000000000000..d2933540e3f0
--- /dev/null
+++ b/media-gfx/asymptote/files/digest-asymptote-1.33
@@ -0,0 +1,3 @@
+MD5 2351b2c74d8808a84944bd972407e61a asymptote-1.33.src.tgz 1015680
+RMD160 2b54bbf4aa0c858e34fc34b041d95e6c62013553 asymptote-1.33.src.tgz 1015680
+SHA256 df0cd4532f3e481f2cbb71020c90830b99cd5b7b276453e04edb651820415ba1 asymptote-1.33.src.tgz 1015680