Version bump

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.26-tuxonice i686

5 files changed, 42 insertions, 59 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/Manifest b/media-gfx/asymptote/Manifest
index c3ae466e5a31..edffc0100eae 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -3,15 +3,15 @@ AUX 64asymptote-gentoo.el 337 RMD160 423330249638e628cb0f7d0b8196042a34cffa03 SH
 AUX asy-ftd.vim 60 RMD160 a08d3dbd7535d3de0897dd73b00f8866a72db731 SHA1 426086e8ed8d9f45518df1380ab62703cd5f1e0d SHA256 c766fccb0e3e43a6fb78eaa56cf6c45398d48b08566ea4794726f4a6ae3c9dc1
 AUX asymptote-1.29-configure-ac.patch 1443 RMD160 497a336b5b4155f7fb4f36f71f96c8a5a0ef3681 SHA1 d108963f7b75a9d8a185ff54e6eb40cf7d3d58ef SHA256 49109223e505d778a58824a30c3d58775b0ab47f653821e7ca262b22b566df4d
 AUX asymptote-1.29-makefile.patch 1932 RMD160 8461c1f74ced939209803b0e88aaad6022942cc1 SHA1 6d3c4d4618293776722dd351d3cbf3a644dddff4 SHA256 206b2c548627ba5bd40c9ab9278851834dbac99d10844bc7444bb7ad21ddf816
-AUX asymptote-1.52-configure-ac.patch 2312 RMD160 bf8731bb39853bc03bec3d312e7617ebef770e69 SHA1 be173fee2d9e7cdf12effce5936c0ecc1739ddc5 SHA256 f39400b9c057c310741492e9287aa055989cf3f39e8174a5f6e51f9b75cf5ae6
-AUX asymptote-1.52-xdg-utils.patch 661 RMD160 ceb879479a2cfc6440dc6f499382243e19c4d6b5 SHA1 fc69814816c06d33af01bd1eb82d9dc20fcfb0a1 SHA256 7bfec5aca09ae4d8d1f9bc114804b3a7a6e99dda979f06310462107616d825b8
 AUX asymptote-1.53-configure-ac.patch 2312 RMD160 74c11e4fd398dde24c78eed3086ff71b9bc0e9fb SHA1 73e25964cc581c218f4ea6bb1bf12abe711a4406 SHA256 32222c7381ba05fafac53bc3ac2a2fb703bad1e62449dbc73f5bf6fd6b648302
 AUX asymptote-1.53-xdg-utils.patch 661 RMD160 ade1be4a8979dccf152ce8dafc85fe8e56d969ee SHA1 eee0d908d8271ff441b10755920c07725ea317d4 SHA256 b796723fbaeb6814fb781912aae3eb05346b29394ab1346cadeb3ba6701bfcee
+AUX asymptote-1.54-configure-ac.patch 2727 RMD160 199d5bee4b1688ae84de5fd725b7f1bf163013a3 SHA1 f6b979c0db54b9b3b750b6c9a191bb84f44bcbc9 SHA256 cfbc0b0ebe9938e7d89dfe369dfc0e2e7d7b7b938d99643a0f98b22a9a144f52
+AUX asymptote-1.54-xdg-utils.patch 691 RMD160 f7595a788a32fb7fa9b4678e7176dc87feba6180 SHA1 dd527d26ec3c8abdf1cc64750a13e2170f12a9f1 SHA256 4e9f1936f834f34011806c292c45cf782c382932410fbbc8f0981b25e9dace3a
 DIST asymptote-1.29.src.tgz 933266 RMD160 013a5f8f706159ea564811cd044a12fe4b6e58da SHA1 366a42e95796fe88863a2d82624e25630be8619e SHA256 2b4eea7b3a016295b4543e3d3c9fca80fa278fc2fb7824306130a2c37e602366
-DIST asymptote-1.52.src.tgz 1291847 RMD160 04dbf2a951546074ca7d0ec66e2ddf234d8ee730 SHA1 88b100783d4f97d1b26f9e66da401f5ea7a34e5b SHA256 aa11cef81d62cac053dbb2962b6e4a2f009f3b75c640d5042094294d512aae64
 DIST asymptote-1.53.src.tgz 1294628 RMD160 4fa9327dcd1c582855ebc3ffa095ef9de91bfe9c SHA1 9ac51755af8cae3d1e24015c32b8fdef945d1b6e SHA256 6ecd82d7bb73a6da0c4e72aa9007d8cb14bf13b399b2c6276e068d4da9ad2757
+DIST asymptote-1.54.src.tgz 1296177 RMD160 e15664a2a74f097f376ec7926abff6eafb2b316b SHA1 07b606c2b5425a6df4c998e961a65dc52f6b0af1 SHA256 5cbca5c626338f8e792756bf3412a96a6b3aea0462807341f498f43b981181f0
 EBUILD asymptote-1.29.ebuild 3491 RMD160 b14992d5aeeedd20f699c1c0c3aaa419bc2c3930 SHA1 bd68cb47a22ac889c9c25527dcff8a9ed8d615c4 SHA256 fd4f867553841368d2e2b19e623e796f89574ab2473efd0f23bfb5386db671cc
-EBUILD asymptote-1.52.ebuild 5952 RMD160 5f5885f1d5bc8de382b7f64cad4695b3551af200 SHA1 32f046445876aa0d2ae786eecea86efef21612e7 SHA256 9b6607354a5206b2c9a140a1a747a4456ced7a886cb29e6cfa9be7f37b143162
 EBUILD asymptote-1.53.ebuild 4549 RMD160 8a32e4418ac8e608786d776958c263f69c02ea70 SHA1 95baeb0966238778b695421cb964c1762a495093 SHA256 0e46c98e50d985822dc10a4512d3e66b805913e859fecee9a0ac5c55611cef7f
-MISC ChangeLog 7921 RMD160 224238d1dd5eb6b5367064a8bca45b05d711c3a4 SHA1 a1a16e4d52a92521807ff7bf158509c2050d982d SHA256 2645ff7a267cc6a35280dca097becb0740be264d9d558a7c5b3bc572dc071118
+EBUILD asymptote-1.54.ebuild 4549 RMD160 cc454ed7ac8075cf79607d2379cd63508ca7b85a SHA1 d57f0609f86c265fa90719f9f889c435bfb334e9 SHA256 c0d2f125b75d7b58baf7ae6258166ac8d315a7cdafc54580653b283ab3fc9c58
+MISC ChangeLog 8237 RMD160 18d6d4cbdfedca9350dcecffea917c75b44a8a78 SHA1 b8e5f5cb661a15d4a4a1ef64ba5cd77c86b69fe0 SHA256 d4d1796742efcc85ba54cb6866789c33064f7d05496bf8d9871067bdd8771fc0
 MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5
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() {}