Version bump, USE flags opengl and offscreen added

(Portage version: 2.2.0_alpha129/cvs/Linux i686)

6 files changed, 41 insertions, 24 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index ec76f27564e0..535459f135e2 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.97 2012/06/02 18:17:12 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.98 2012/09/20 12:16:43 grozin Exp $
+
+*asymptote-2.17 (20 Sep 2012)
+
+  20 Sep 2012; Andrey Grozin <grozin@gentoo.org> -asymptote-2.15.ebuild,
+  -files/asymptote-2.15-configure-ac.patch, -files/asymptote-2.15-info.patch,
+  -files/asymptote-2.15-xdg-utils.patch, +asymptote-2.17.ebuild,
+  +files/asymptote-2.17-configure-ac.patch, +files/asymptote-2.17-info.patch,
+  +files/asymptote-2.17-xdg-utils.patch, metadata.xml:
+  Version bump, USE flags opengl and offscreen added
 
 *asymptote-2.16 (02 Jun 2012)
 
diff --git a/media-gfx/asymptote/asymptote-2.15.ebuild b/media-gfx/asymptote/asymptote-2.17.ebuild
index d587adb637d3..1d30b433fffe 100644
--- a/media-gfx/asymptote/asymptote-2.15.ebuild
+++ b/media-gfx/asymptote/asymptote-2.17.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.15.ebuild,v 1.2 2012/04/12 20:13:56 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.17.ebuild,v 1.1 2012/09/20 12:16:44 grozin Exp $
 
-EAPI=3
+EAPI=4
 SUPPORT_PYTHON_ABIS=1
 PYTHON_DEPEND="python? 2"
 RESTRICT_PYTHON_ABIS="3.*"
@@ -14,11 +14,14 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex python sigsegv svg vim-syntax X"
+IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg vim-syntax X"
+REQUIRED_USE="offscreen? (  )"
 
 RDEPEND=">=sys-libs/readline-4.3-r5
 	>=sys-libs/ncurses-5.4-r5
 	imagemagick? ( media-gfx/imagemagick[png] )
+	opengl? ( >=media-libs/mesa-8 )
+	offscreen? ( media-libs/mesa[osmesa] )
 	svg? ( app-text/dvisvgm )
 	sigsegv? ( dev-libs/libsigsegv )
 	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
@@ -59,33 +62,35 @@ src_configure() {
 		$(use_enable boehm-gc gc system) \
 		$(use_enable fftw) \
 		$(use_enable gsl) \
+		$(use_enable opengl gl) \
+		$(use_enable offscreen) \
 		$(use_with sigsegv)
 }
 
 src_compile() {
-	emake || die "emake failed"
+	emake
 
 	cd doc
-	emake asy.1 || die "emake asy.1 failed"
+	emake asy.1
 	if use doc; then
 		# info
 		einfo "Making info"
-		emake ${PN}.info || die "emake ${PN}.info failed"
+		emake ${PN}.info
 		cd FAQ
-		emake || die "emake FAQ failed"
+		emake
 		cd ..
 		# pdf
 		einfo "Making pdf docs"
 		export VARTEXFONTS="${T}"/fonts
 		# see bug #260606
-		emake -j1 asymptote.pdf || die "emake asymptote.pdf failed"
-		emake CAD.pdf || die "emake CAD.pdf failed"
+		emake -j1 asymptote.pdf
+		emake CAD.pdf
 	fi
 	cd ..
 
 	if use emacs; then
 		einfo "Compiling emacs lisp files"
-		elisp-compile base/*.el || die "elisp-compile failed"
+		elisp-compile base/*.el
 	fi
 }
 
diff --git a/media-gfx/asymptote/files/asymptote-2.15-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.17-configure-ac.patch
index 780baeb9aadf..b692e02e96d6 100644
--- a/media-gfx/asymptote/files/asymptote-2.15-configure-ac.patch
+++ b/media-gfx/asymptote/files/asymptote-2.17-configure-ac.patch
@@ -1,8 +1,8 @@
-Index: asymptote-2.15/configure.ac
+Index: asymptote-2.17/configure.ac
 ===================================================================
---- asymptote-2.15.orig/configure.ac
-+++ asymptote-2.15/configure.ac
-@@ -150,7 +150,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+--- asymptote-2.17.orig/configure.ac
++++ asymptote-2.17/configure.ac
+@@ -154,7 +154,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
        fi
        CPPFLAGS_SAVE=$CPPFLAGS
        CPPFLAGS=$CPPFLAGS" $INCL"
@@ -11,10 +11,10 @@ Index: asymptote-2.15/configure.ac
  	AC_CHECK_LIB([gc],[GC_malloc],[
  	  LIBS=$LIBS"-lgc "
  	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -223,7 +223,17 @@ AC_MSG_ERROR([*** Please install libm on
+@@ -227,7 +227,17 @@ AC_MSG_ERROR([*** Please install libm on
  AC_CHECK_LIB([z], [deflate],,
  AC_MSG_ERROR([*** Please install libz on your system ***]))
- AC_CHECK_LIB([pthread], [pthread_create])
+ AX_PTHREAD
 -AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
 +
 +AC_ARG_WITH(sigsegv,
diff --git a/media-gfx/asymptote/files/asymptote-2.15-info.patch b/media-gfx/asymptote/files/asymptote-2.17-info.patch
index 4892c93d6726..5d93d1e2b2e6 100644
--- a/media-gfx/asymptote/files/asymptote-2.15-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.17-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.15/doc/asymptote.texi
+Index: asymptote-2.17/doc/asymptote.texi
 ===================================================================
---- asymptote-2.15.orig/doc/asymptote.texi
-+++ asymptote-2.15/doc/asymptote.texi
+--- asymptote-2.17.orig/doc/asymptote.texi
++++ asymptote-2.17/doc/asymptote.texi
 @@ -21,7 +21,7 @@ file LICENSE in the top-level source dir
       
  @dircategory Languages
diff --git a/media-gfx/asymptote/files/asymptote-2.15-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.17-xdg-utils.patch
index 71aa19a453c1..febe4f292f13 100644
--- a/media-gfx/asymptote/files/asymptote-2.15-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.17-xdg-utils.patch
@@ -1,8 +1,8 @@
-Index: asymptote-2.15/settings.cc
+Index: asymptote-2.17/settings.cc
 ===================================================================
---- asymptote-2.15.orig/settings.cc
-+++ asymptote-2.15/settings.cc
-@@ -96,14 +96,14 @@ bool msdos=false;
+--- asymptote-2.17.orig/settings.cc
++++ asymptote-2.17/settings.cc
+@@ -90,14 +90,14 @@ bool msdos=false;
  string HOME="HOME";
  string docdir=ASYMPTOTE_DOCDIR;
  const char pathSeparator=':';
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 31fd956a8cc7..95f7e2748c23 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -22,5 +22,8 @@
 		<flag name='sigsegv'>
 			Enables using <pkg>dev-libs/libsigsegv</pkg>
 		</flag>
+		<flag name='offscreen'>
+			Enables off-screen rendering
+		</flag>
 	</use>
 </pkgmetadata>