Version bump

(Portage version: 2.2_rc13/cvs/Linux 2.6.26-tuxonice i686)

7 files changed, 20 insertions, 318 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 5a10f829976e..1e3928796c95 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.24 2008/11/01 18:42:49 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.25 2008/11/04 08:36:15 grozin Exp $
+
+*asymptote-1.49 (04 Nov 2008)
+
+  04 Nov 2008; Andrey Grozin <grozin@gentoo.org>
+  -files/asymptote-1.46-configure-ac.patch,
+  -files/asymptote-1.46-xdg-utils.patch,
+  -files/asymptote-1.47-configure-ac.patch,
+  -files/asymptote-1.47-xdg-utils.patch,
+  +files/asymptote-1.49-configure-ac.patch,
+  +files/asymptote-1.49-xdg-utils.patch, -asymptote-1.46.ebuild,
+  -asymptote-1.47.ebuild, +asymptote-1.49.ebuild:
+  Version bump
 
 *asymptote-1.47 (02 Nov 2008)
 
diff --git a/media-gfx/asymptote/asymptote-1.46.ebuild b/media-gfx/asymptote/asymptote-1.46.ebuild
deleted file mode 100644
index edac0bd5b4f1..000000000000
--- a/media-gfx/asymptote/asymptote-1.46.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.46.ebuild,v 1.2 2008/11/01 18:42:49 grozin Exp $
-EAPI=2
-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-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-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] )
-	fftw? ( >=sci-libs/fftw-3.0.1 )
-	gsl? ( sci-libs/gsl )
-	X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] )
-	python? ( dev-lang/python )
-	latex? ( virtual/latex-base )
-	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] )"
-
-pkg_setup() {
-	if use latex; then
-		# Calculating ASY_TEXMFDIR
-		local TEXMFPATH="$(kpsewhich -var-value=TEXMFSITE)"
-		local TEXMFCONFIGFILE="$(kpsewhich texmf.cnf)"
-
-		if [ -z "${TEXMFPATH}" ]; then
-			eerror "You haven't defined the TEXMFSITE variable in your TeX config."
-			eerror "Please do so in the file ${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf}"
-			die "Define TEXMFSITE in TeX configuration!"
-		else
-			# go through the colon separated list of directories
-			# (maybe only one) provided in the variable
-			# TEXMFPATH (generated from TEXMFSITE from TeX's config)
-			# and choose only the first entry.
-			# All entries are separated by colons, even when defined
-			# with semi-colons, kpsewhich changes
-			# the output to a generic format, so IFS has to be redefined.
-			local IFS="${IFS}:"
-
-			for strippedpath in ${TEXMFPATH}; do
-				if [ -d ${strippedpath} ]; then
-					ASY_TEXMFDIR="${strippedpath}"
-					break
-				fi
-			done
-
-			# verify if an existing path was chosen to prevent from
-			# installing into the wrong directory
-			if [ -z ${ASY_TEXMFDIR} ]; then
-				eerror "TEXMFSITE does not contain any existing directory."
-				eerror "Please define an existing directory in your TeX config file"
-				eerror "${TEXMFCONFIGFILE:-/var/lib/texmf/web2c/texmf.cnf} or create at least one of the there specified directories"
-				die "TEXMFSITE variable did not contain an existing directory"
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# Fixing fftwl, gsl, 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"
-
-	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_with fftw) \
-		$(use_with 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"
-		# html
-		einfo "Making html docs"
-		emake ${PN}/index.html
-		einfo "Making FAQ"
-		cd FAQ
-		emake
-		cd ..
-		# pdf
-		einfo "Making pdf docs"
-		export VARTEXFONTS="${T}"/fonts
-		emake asymptote.pdf
-		emake CAD.pdf
-	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
-		insinto /usr/share/${PN}/examples/animations
-		doins examples/animations/*.asy
-	fi
-
-	# LaTeX style
-	if use latex; then
-		cd doc
-		insinto "${ASY_TEXMFDIR}"/tex/latex
-		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_version
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doins base/${PN}.py
-	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*
-		dohtml ${PN}/*
-		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() {
-	if use python; then
-		python_version
-		python_mod_compile \
-			/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}.py
-	fi
-
-	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 latex && latex-package_rehash
-	use emacs && elisp-site-regen
-	use python && python_mod_cleanup
-}
diff --git a/media-gfx/asymptote/asymptote-1.47.ebuild b/media-gfx/asymptote/asymptote-1.49.ebuild
index 4c0f03cb54e9..7ddc66b99f9f 100644
--- a/media-gfx/asymptote/asymptote-1.47.ebuild
+++ b/media-gfx/asymptote/asymptote-1.49.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.47.ebuild,v 1.1 2008/11/01 18:42:49 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.49.ebuild,v 1.1 2008/11/04 08:36:15 grozin Exp $
 EAPI=2
 inherit eutils autotools elisp-common latex-package multilib python
 
diff --git a/media-gfx/asymptote/files/asymptote-1.46-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.46-configure-ac.patch
deleted file mode 100644
index 247d278c61ad..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.46-configure-ac.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -U2 -r asymptote-1.46.orig/configure.ac asymptote-1.46/configure.ac
---- asymptote-1.46.orig/configure.ac	2008-10-19 01:39:07.000000000 +0700
-+++ asymptote-1.46/configure.ac	2008-10-21 01:03:30.000000000 +0700
-@@ -77,8 +77,14 @@
- 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.1
-@@ -117,5 +123,5 @@
-       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 "
-@@ -183,5 +189,14 @@
- AC_CHECK_LIB([m], [sqrt])
- AC_CHECK_LIB([z], [deflate])
--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([readline], [rl_completion_matches],,
-@@ -200,9 +215,15 @@
-    AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***]))
- 
--AC_CHECK_HEADER(gsl/gsl_sf.h,
-+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
- 
- case "$MACHTYPE" in
diff --git a/media-gfx/asymptote/files/asymptote-1.46-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.46-xdg-utils.patch
deleted file mode 100644
index 8767ec6d297d..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.46-xdg-utils.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -U2 -r asymptote-1.46.orig/settings.cc asymptote-1.46/settings.cc
---- asymptote-1.46.orig/settings.cc	2008-10-19 01:38:49.000000000 +0700
-+++ asymptote-1.46/settings.cc	2008-10-21 01:07:49.000000000 +0700
-@@ -81,12 +81,12 @@
- const char *HOME="HOME";
- 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 defaultPython;
- const string docdir=ASYMPTOTE_DOCDIR;
diff --git a/media-gfx/asymptote/files/asymptote-1.47-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.49-configure-ac.patch
index ab5124bfc3a9..f7996cdcf1e4 100644
--- a/media-gfx/asymptote/files/asymptote-1.47-configure-ac.patch
+++ b/media-gfx/asymptote/files/asymptote-1.49-configure-ac.patch
@@ -1,6 +1,6 @@
-diff -r -U2 asymptote-1.47.orig/configure.ac asymptote-1.47/configure.ac
---- asymptote-1.47.orig/configure.ac	2008-10-23 14:06:31.000000000 +0700
-+++ asymptote-1.47/configure.ac	2008-11-02 03:57:58.000000000 +0600
+diff -r -U2 asymptote-1.49.orig/configure.ac asymptote-1.49/configure.ac
+--- asymptote-1.49.orig/configure.ac	2008-11-03 14:18:04.000000000 +0600
++++ asymptote-1.49/configure.ac	2008-11-04 20:20:54.000000000 +0600
 @@ -77,8 +77,14 @@
  fi
  
diff --git a/media-gfx/asymptote/files/asymptote-1.47-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.49-xdg-utils.patch
index f261af66529d..1ebdb1b2adec 100644
--- a/media-gfx/asymptote/files/asymptote-1.47-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-1.49-xdg-utils.patch
@@ -1,6 +1,6 @@
-diff -r -U2 asymptote-1.47.orig/settings.cc asymptote-1.47/settings.cc
---- asymptote-1.47.orig/settings.cc	2008-10-23 14:06:15.000000000 +0700
-+++ asymptote-1.47/settings.cc	2008-11-02 03:51:08.000000000 +0600
+diff -r -U2 asymptote-1.49.orig/settings.cc asymptote-1.49/settings.cc
+--- asymptote-1.49.orig/settings.cc	2008-11-03 14:17:47.000000000 +0600
++++ asymptote-1.49/settings.cc	2008-11-04 20:12:46.000000000 +0600
 @@ -81,12 +81,12 @@
  const char *HOME="HOME";
  const char pathSeparator=':';