With USE=python, now installs python support for several ABIs

(Portage version: 2.2_rc67/cvs/Linux i686)

4 files changed, 21 insertions, 70 deletions

diff --git a/media-gfx/asymptote/ChangeLog b/media-gfx/asymptote/ChangeLog
index 4de196e794ff..bb58fe0bcea9 100644
--- a/media-gfx/asymptote/ChangeLog
+++ b/media-gfx/asymptote/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/asymptote
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.65 2010/01/03 06:56:48 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/ChangeLog,v 1.66 2010/03/24 20:01:17 grozin Exp $
+
+*asymptote-1.91-r1 (25 Mar 2010)
+
+  25 Mar 2010; Andrey Grozin <grozin@gentoo.org> -asymptote-1.90.ebuild,
+  -files/asymptote-1.90-configure-ac.patch,
+  -files/asymptote-1.90-xdg-utils.patch, +asymptote-1.91-r1.ebuild:
+  With USE=python, now installs python support for several ABIs
 
 *asymptote-1.91 (03 Jan 2010)
 
diff --git a/media-gfx/asymptote/asymptote-1.90.ebuild b/media-gfx/asymptote/asymptote-1.91-r1.ebuild
index a2ffc111830d..5ce1344f29ad 100644
--- a/media-gfx/asymptote/asymptote-1.90.ebuild
+++ b/media-gfx/asymptote/asymptote-1.91-r1.ebuild
@@ -1,7 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.90.ebuild,v 1.1 2009/12/02 17:20:29 grozin Exp $
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/asymptote/asymptote-1.91-r1.ebuild,v 1.1 2010/03/24 20:01:17 grozin Exp $
+EAPI=3
+SUPPORT_PYTHON_ABIS=1
+PYTHON_DEPEND="python? 2"
+RESTRICT_PYTHON_ABIS="3.*"
 inherit eutils autotools elisp-common latex-package multilib python
 
 DESCRIPTION="A vector graphics language that provides a framework for technical drawing"
@@ -20,7 +23,6 @@ RDEPEND=">=sys-libs/readline-4.3-r5
 	fftw? ( >=sci-libs/fftw-3.0.1 )
 	gsl? ( sci-libs/gsl )
 	X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] )
-	python? ( dev-lang/python )
 	latex? ( virtual/latex-base )
 	emacs? ( virtual/emacs )
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
@@ -139,9 +141,11 @@ src_install() {
 
 	# asymptote.py
 	if use python; then
-		python_version
-		insinto /usr/$(get_libdir)/python${PYVER}/site-packages
-		doins base/${PN}.py
+		python_install() {
+			insinto "$(python_get_sitedir)"
+			doins base/${PN}.py
+		}
+		python_execute_function python_install
 	fi
 
 	# emacs mode
@@ -174,14 +178,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use python; then
-		python_version
-		python_mod_compile \
-			/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}.py
-	fi
-
+	use python && python_mod_optimize ${PN}.py
 	use latex && latex-package_rehash
-
 	use emacs && elisp-site-regen
 
 	elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer'
@@ -189,7 +187,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	use python && python_mod_cleanup ${PN}.py
 	use latex && latex-package_rehash
 	use emacs && elisp-site-regen
-	use python && python_mod_cleanup
 }
diff --git a/media-gfx/asymptote/files/asymptote-1.90-configure-ac.patch b/media-gfx/asymptote/files/asymptote-1.90-configure-ac.patch
deleted file mode 100644
index d3d4c16b791c..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.90-configure-ac.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: asymptote-1.90/configure.ac
-===================================================================
---- asymptote-1.90.orig/configure.ac
-+++ asymptote-1.90/configure.ac
-@@ -148,7 +148,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 "
- 	  AC_MSG_NOTICE([enabling system $GCNAME])],[
-@@ -215,7 +215,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])
--AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler])
-+
-+AC_ARG_WITH(sigsegv,
-+           [  --with-sigsegv          use libsigsegv],
-+           [with_sigsegv=$withval],
-+           [with_sigsegv="no"])
-+if test "$with_sigsegv" = "yes"; then
-+AC_CHECK_HEADER([sigsegv.h],
-+   AC_CHECK_LIB([sigsegv], [stackoverflow_install_handler]),
-+   AC_MSG_NOTICE([*** Header file sigsegv.h not found ***]))
-+fi
-+
- AC_CHECK_LIB([rt], [sched_yield])
- 
- AC_ARG_ENABLE(readline,
diff --git a/media-gfx/asymptote/files/asymptote-1.90-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-1.90-xdg-utils.patch
deleted file mode 100644
index 2e99a7311609..000000000000
--- a/media-gfx/asymptote/files/asymptote-1.90-xdg-utils.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: asymptote-1.90/settings.cc
-===================================================================
---- asymptote-1.90.orig/settings.cc
-+++ asymptote-1.90/settings.cc
-@@ -86,14 +86,14 @@ mode_t mask;
- bool msdos=false;
- string HOME="HOME";
- const char pathSeparator=':';
--string defaultPSViewer="gv";
-+string defaultPSViewer="xdg-open";
- #ifdef __APPLE__
- string defaultPDFViewer="open";
- #else  
--string defaultPDFViewer="acroread";
-+string defaultPDFViewer="xdg-open";
- #endif  
- string defaultGhostscript="gs";
--string defaultDisplay="display";
-+string defaultDisplay="xdg-open";
- string defaultAnimate="animate";
- string systemDir=ASYMPTOTE_SYSDIR;
- string docdir=ASYMPTOTE_DOCDIR;