Version bump

(Portage version: 2.2.10/cvs/Linux i686, signed Manifest commit with key 0x3AFFCE974D34BD8C!)

5 files changed, 38 insertions, 31 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index aa2c6d3894a4..0a5dac4b4606 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.108 2014/05/05 10:28:41 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.109 2014/06/05 14:50:33 grozin Exp $
+
+*asymptote-2.32 (05 Jun 2014)
+
+  05 Jun 2014; Andrey Grozin <grozin@gentoo.org> -asymptote-2.24.ebuild,
+  +asymptote-2.32.ebuild, -files/asymptote-2.24-configure-ac.patch,
+  -files/asymptote-2.24-info.patch, -files/asymptote-2.24-xdg-utils.patch,
+  +files/asymptote-2.32-configure-ac.patch, +files/asymptote-2.32-info.patch,
+  +files/asymptote-2.32-xdg-utils.patch:
+  Version bump. USE-dependent python support switched to python-single-r1.
 
 *asymptote-2.27 (05 May 2014)
 
diff --git a/media-gfx/asymptote/asymptote-2.24.ebuild b/media-gfx/asymptote/asymptote-2.32.ebuild
index 99352acb2636..2ae0ab289af3 100644
--- a/media-gfx/asymptote/asymptote-2.24.ebuild
+++ b/media-gfx/asymptote/asymptote-2.32.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.24.ebuild,v 1.2 2014/03/09 14:26:45 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-2.32.ebuild,v 1.1 2014/06/05 14:50:33 grozin Exp $
 
-EAPI=4
-SUPPORT_PYTHON_ABIS=1
-PYTHON_DEPEND="python? 2"
-RESTRICT_PYTHON_ABIS="3.*"
-inherit eutils autotools elisp-common latex-package multilib python
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit eutils autotools elisp-common latex-package multilib python-single-r1
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
 HOMEPAGE="http://asymptote.sourceforge.net/"
@@ -27,7 +25,8 @@ RDEPEND=">=sys-libs/readline-4.3-r5
 	boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] )
 	fftw? ( >=sci-libs/fftw-3.0.1 )
 	gsl? ( sci-libs/gsl )
-	X? ( x11-misc/xdg-utils dev-lang/python virtual/python-imaging[tk] )
+	python? ( ${PYTHON_DEPS} )
+	X? ( x11-misc/xdg-utils ${PYTHON_DEPS} virtual/python-imaging[tk,${PYTHON_USEDEP}] )
 	latex? ( virtual/latex-base >=dev-texlive/texlive-latexextra-2013 )
 	emacs? ( virtual/emacs )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
@@ -36,6 +35,10 @@ DEPEND="${RDEPEND}
 
 TEXMF=/usr/share/texmf-site
 
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	# Fixing sigsegv enabling
 	epatch "${FILESDIR}/${P}-configure-ac.patch"
@@ -109,11 +112,10 @@ src_install() {
 
 	# 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
+		chmod 755 "${ED}"usr/share/${PN}/GUI/xasy.py
+		python_fix_shebang "${ED}"usr/share/${PN}/GUI
 		dosym /usr/share/${PN}/GUI/xasy.py /usr/bin/xasy
 		doman doc/xasy.1x
 	fi
@@ -148,11 +150,8 @@ src_install() {
 
 	# asymptote.py
 	if use python; then
-		python_install() {
-			insinto "$(python_get_sitedir)"
-			doins base/${PN}.py
-		}
-		python_execute_function python_install
+		python_moduleinto "$(python_get_sitedir)"
+		python_domodule base/${PN}.py
 	fi
 
 	# emacs mode
@@ -185,7 +184,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize ${PN}.py
 	use latex && latex-package_rehash
 	use emacs && elisp-site-regen
 
@@ -194,7 +192,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use python && python_mod_cleanup ${PN}.py
 	use latex && latex-package_rehash
 	use emacs && elisp-site-regen
 }
diff --git a/media-gfx/asymptote/files/asymptote-2.24-configure-ac.patch b/media-gfx/asymptote/files/asymptote-2.32-configure-ac.patch
index 10bb9b99afcc..597e915539be 100644
--- a/media-gfx/asymptote/files/asymptote-2.24-configure-ac.patch
+++ b/media-gfx/asymptote/files/asymptote-2.32-configure-ac.patch
@@ -1,8 +1,8 @@
-Index: asymptote-2.24/configure.ac
+Index: asymptote-2.32/configure.ac
 ===================================================================
---- asymptote-2.24.orig/configure.ac
-+++ asymptote-2.24/configure.ac
-@@ -154,7 +154,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
+--- asymptote-2.32.orig/configure.ac
++++ asymptote-2.32/configure.ac
+@@ -158,7 +158,7 @@ if test "x$ac_cv_use_gc" != "xno" ; then
        fi
        CPPFLAGS_SAVE=$CPPFLAGS
        CPPFLAGS=$CPPFLAGS" $INCL"
@@ -11,9 +11,9 @@ Index: asymptote-2.24/configure.ac
  	AC_CHECK_LIB([gc],[GC_malloc],[
  	  LIBS=$LIBS"-lgc "
  	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -227,7 +227,17 @@ AC_MSG_ERROR([*** Please install libm on
+@@ -232,7 +232,17 @@ AC_MSG_ERROR([*** Please install libm on
  AC_CHECK_LIB([z], [deflate],,
- AC_MSG_ERROR([*** Please install libz on your system ***]))
+ AC_MSG_ERROR([*** Please install libz or zlib-devel on your system ***]))
  AX_PTHREAD
 -AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
 +
diff --git a/media-gfx/asymptote/files/asymptote-2.24-info.patch b/media-gfx/asymptote/files/asymptote-2.32-info.patch
index a0af867e7e1b..8a1e3f464231 100644
--- a/media-gfx/asymptote/files/asymptote-2.24-info.patch
+++ b/media-gfx/asymptote/files/asymptote-2.32-info.patch
@@ -1,7 +1,7 @@
-Index: asymptote-2.24/doc/asymptote.texi
+Index: asymptote-2.32/doc/asymptote.texi
 ===================================================================
---- asymptote-2.24.orig/doc/asymptote.texi
-+++ asymptote-2.24/doc/asymptote.texi
+--- asymptote-2.32.orig/doc/asymptote.texi
++++ asymptote-2.32/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.24-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.32-xdg-utils.patch
index 790744d21655..2ac59e59f058 100644
--- a/media-gfx/asymptote/files/asymptote-2.24-xdg-utils.patch
+++ b/media-gfx/asymptote/files/asymptote-2.32-xdg-utils.patch
@@ -1,8 +1,8 @@
-Index: asymptote-2.24/settings.cc
+Index: asymptote-2.32/settings.cc
 ===================================================================
---- asymptote-2.24.orig/settings.cc
-+++ asymptote-2.24/settings.cc
-@@ -90,14 +90,14 @@ bool msdos=false;
+--- asymptote-2.32.orig/settings.cc
++++ asymptote-2.32/settings.cc
+@@ -90,15 +90,15 @@ bool msdos=false;
  string HOME="HOME";
  string docdir=ASYMPTOTE_DOCDIR;
  const char pathSeparator=':';
@@ -15,6 +15,7 @@ Index: asymptote-2.24/settings.cc
 +string defaultPDFViewer="xdg-open";
  #endif  
  string defaultGhostscript="gs";
+ string defaultGhostscriptLibrary="/usr/lib/libgs.so";
 -string defaultDisplay="display";
 +string defaultDisplay="xdg-open";
  string defaultAnimate="animate";