Version bump

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

4 files changed, 37 insertions, 54 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 133a8dbdf1f9..522cd54d2c39 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.28 2008/11/28 15:45:33 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.29 2008/12/02 16:11:48 grozin Exp $
+
+*asymptote-1.54 (02 Dec 2008)
+
+  02 Dec 2008; Andrey Grozin <grozin@gentoo.org>
+  -files/asymptote-1.52-configure-ac.patch,
+  -files/asymptote-1.52-xdg-utils.patch,
+  +files/asymptote-1.54-configure-ac.patch,
+  +files/asymptote-1.54-xdg-utils.patch, -asymptote-1.52.ebuild,
+  +asymptote-1.54.ebuild:
+  Version bump
 
 *asymptote-1.53 (28 Nov 2008)
 
diff --git a/media-gfx/asymptote/asymptote-1.52.ebuild b/media-gfx/asymptote/asymptote-1.54.ebuild
index 373d9f892940..4ba1eb58d604 100644
--- a/media-gfx/asymptote/asymptote-1.52.ebuild
+++ b/media-gfx/asymptote/asymptote-1.54.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.52.ebuild,v 1.1 2008/11/26 17:57:10 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.54.ebuild,v 1.1 2008/12/02 16:11:48 grozin Exp $
 EAPI=2
 inherit eutils autotools elisp-common latex-package multilib python
 
@@ -8,10 +8,8 @@ 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
@@ -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.52-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.54-configure-ac.patch
index 33b0b7090059..7a09244e2db0 100644
--- a/media-gfx/asymptote/files/asymptote-1.52-configure-ac.patch
+++ b/media-gfx/asymptote/files/asymptote-1.54-configure-ac.patch
@@ -1,7 +1,9 @@
-diff -r -U2 asymptote-1.52.orig/configure.ac asymptote-1.52/configure.ac
---- asymptote-1.52.orig/configure.ac	2008-11-25 15:10:32.000000000 +0600
-+++ asymptote-1.52/configure.ac	2008-11-27 04:40:24.000000000 +0600
-@@ -80,8 +80,14 @@
+Index: asymptote-1.54/configure.ac
+===================================================================
+--- asymptote-1.54.orig/configure.ac
++++ asymptote-1.54/configure.ac
+@@ -79,10 +79,16 @@ if test "$GXX" = yes ; then
+    fi
  fi
  
 -AC_CHECK_HEADER(fftw3.h,
@@ -18,14 +20,18 @@ diff -r -U2 asymptote-1.52.orig/configure.ac asymptote-1.52/configure.ac
 +fi
  
  GCVERSION=gc-7.1
-@@ -120,5 +126,5 @@
+ 
+@@ -119,7 +125,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 "
-@@ -187,5 +193,14 @@
+ 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
+@@ -186,7 +192,16 @@ AC_CHECK_LIB([ncurses], [setupterm], [AC
+ AC_CHECK_LIB([m], [sqrt])
  AC_CHECK_LIB([z], [deflate])
  AC_CHECK_LIB([pthread], [pthread_create])
 -AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
@@ -41,7 +47,9 @@ diff -r -U2 asymptote-1.52.orig/configure.ac asymptote-1.52/configure.ac
 +fi
  
  AC_CHECK_LIB([readline], [rl_completion_matches],,
-@@ -204,9 +219,15 @@
+ AC_MSG_NOTICE(*** Could not find GNU readline 4.2 or later: will compile without readline support ***))
+@@ -203,11 +218,17 @@ AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#incl
+ 		   [Define if you have a working <rpc/rpc.h> header file])],
     AC_MSG_WARN([*** Broken rpc headers; XDR support disabled ***]))
  
 -AC_CHECK_HEADER(gsl/gsl_sf.h,
@@ -58,3 +66,4 @@ diff -r -U2 asymptote-1.52.orig/configure.ac asymptote-1.52/configure.ac
 +fi
  
  case "$OSTYPE" in
+      cygwin) AC_CHECK_HEADER(GL/glut.h,
diff --git a/media-gfx/asymptote/files/asymptote-1.52-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.54-xdg-utils.patch
index dd249733abea..1575eda2ec4b 100644
--- a/media-gfx/asymptote/files/asymptote-1.52-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-1.54-xdg-utils.patch
@@ -1,7 +1,9 @@
-diff -r -U2 asymptote-1.52.orig/settings.cc asymptote-1.52/settings.cc
---- asymptote-1.52.orig/settings.cc	2008-11-25 15:09:27.000000000 +0600
-+++ asymptote-1.52/settings.cc	2008-11-27 04:42:58.000000000 +0600
-@@ -81,12 +81,12 @@
+Index: asymptote-1.54/settings.cc
+===================================================================
+--- asymptote-1.54.orig/settings.cc
++++ asymptote-1.54/settings.cc
+@@ -80,14 +80,14 @@ const bool haveglut=false;
+ bool msdos=false;
  const char *HOME="HOME";
  const char pathSeparator=':';
 -string defaultPSViewer="gv";
@@ -17,3 +19,4 @@ diff -r -U2 asymptote-1.52.orig/settings.cc asymptote-1.52/settings.cc
 +string defaultDisplay="xdg-open";
  string defaultPython;
  const string docdir=ASYMPTOTE_DOCDIR;
+ void queryRegistry() {}