Version bump; latex-related fixes

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

4 files changed, 26 insertions, 55 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 927542b27311..133a8dbdf1f9 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,16 @@
 # 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.27 2008/11/26 17:57:10 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.28 2008/11/28 15:45:33 grozin Exp $
+
+*asymptote-1.53 (28 Nov 2008)
+
+  28 Nov 2008; Andrey Grozin <grozin@gentoo.org>
+  -files/asymptote-1.51-configure-ac.patch,
+  -files/asymptote-1.51-xdg-utils.patch,
+  +files/asymptote-1.53-configure-ac.patch,
+  +files/asymptote-1.53-xdg-utils.patch, -asymptote-1.51.ebuild,
+  +asymptote-1.53.ebuild:
+  Version bump; latex-related fixes
 
 *asymptote-1.52 (26 Nov 2008)
 
diff --git a/media-gfx/asymptote/asymptote-1.51.ebuild b/media-gfx/asymptote/asymptote-1.53.ebuild
index 421bb1211aac..9a76dbd4c4f4 100644
--- a/media-gfx/asymptote/asymptote-1.51.ebuild
+++ b/media-gfx/asymptote/asymptote-1.53.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.51.ebuild,v 1.1 2008/11/15 13:20:30 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.53.ebuild,v 1.1 2008/11/28 15:45:33 grozin Exp $
 EAPI=2
 inherit eutils autotools elisp-common latex-package multilib python
 
@@ -8,17 +8,15 @@ DESCRIPTION="A vector graphics language that provides a framework for technical
 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] )
+	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] )
@@ -29,44 +27,7 @@ RDEPEND=">=sys-libs/readline-4.3-r5
 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
-}
+TEXMF=/usr/share/texmf-site
 
 src_prepare() {
 	# Fixing fftwl, gsl, sigsegv enabling
@@ -166,7 +127,7 @@ src_install() {
 	# LaTeX style
 	if use latex; then
 		cd doc
-		insinto "${ASY_TEXMFDIR}"/tex/latex
+		insinto ${TEXMF}/tex/latex/${PN}
 		doins ${PN}.sty asycolors.sty
 		if use examples; then
 			insinto /usr/share/${PN}/examples
diff --git a/media-gfx/asymptote/files/asymptote-1.51-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.53-configure-ac.patch
index 703fb7e619e2..fd41a3e2db78 100644
--- a/media-gfx/asymptote/files/asymptote-1.51-configure-ac.patch
+++ b/media-gfx/asymptote/files/asymptote-1.53-configure-ac.patch
@@ -1,7 +1,7 @@
-diff -r -U2 asymptote-1.51.orig/configure.ac asymptote-1.51/configure.ac
---- asymptote-1.51.orig/configure.ac	2008-11-11 15:34:58.000000000 +0600
-+++ asymptote-1.51/configure.ac	2008-11-15 18:20:10.000000000 +0600
-@@ -77,8 +77,14 @@
+diff -r -U2 asymptote-1.53.orig/configure.ac asymptote-1.53/configure.ac
+--- asymptote-1.53.orig/configure.ac	2008-11-28 00:44:44.000000000 +0600
++++ asymptote-1.53/configure.ac	2008-11-29 03:20:21.000000000 +0600
+@@ -80,8 +80,14 @@
  fi
  
 -AC_CHECK_HEADER(fftw3.h,
@@ -18,16 +18,16 @@ diff -r -U2 asymptote-1.51.orig/configure.ac asymptote-1.51/configure.ac
 +fi
  
  GCVERSION=gc-7.1
-@@ -117,5 +123,5 @@
+@@ -120,5 +126,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])
+@@ -187,5 +193,14 @@
  AC_CHECK_LIB([z], [deflate])
+ AC_CHECK_LIB([pthread], [pthread_create])
 -AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
 +
 +AC_ARG_WITH(sigsegv,
@@ -41,7 +41,7 @@ diff -r -U2 asymptote-1.51.orig/configure.ac asymptote-1.51/configure.ac
 +fi
  
  AC_CHECK_LIB([readline], [rl_completion_matches],,
-@@ -200,9 +215,15 @@
+@@ -204,9 +219,15 @@
     AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***]))
  
 -AC_CHECK_HEADER(gsl/gsl_sf.h,
diff --git a/media-gfx/asymptote/files/asymptote-1.51-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.53-xdg-utils.patch
index e0288f81b260..544965d8c674 100644
--- a/media-gfx/asymptote/files/asymptote-1.51-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-1.53-xdg-utils.patch
@@ -1,6 +1,6 @@
-diff -r -U2 asymptote-1.51.orig/settings.cc asymptote-1.51/settings.cc
---- asymptote-1.51.orig/settings.cc	2008-11-11 15:34:40.000000000 +0600
-+++ asymptote-1.51/settings.cc	2008-11-15 18:14:37.000000000 +0600
+diff -r -U2 asymptote-1.53.orig/settings.cc asymptote-1.53/settings.cc
+--- asymptote-1.53.orig/settings.cc	2008-11-28 00:43:50.000000000 +0600
++++ asymptote-1.53/settings.cc	2008-11-29 03:15:52.000000000 +0600
 @@ -81,12 +81,12 @@
  const char *HOME="HOME";
  const char pathSeparator=':';