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

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 23 insertions, 75 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/Manifest b/media-gfx/asymptote/Manifest
index ea5231aa5507..eb4c75ab3182 100644
--- a/media-gfx/asymptote/Manifest
+++ b/media-gfx/asymptote/Manifest
@@ -2,15 +2,12 @@ AUX 64asymptote-gentoo.el 337 RMD160 423330249638e628cb0f7d0b8196042a34cffa03 SH
 AUX asy-ftd.vim 60 RMD160 a08d3dbd7535d3de0897dd73b00f8866a72db731 SHA1 426086e8ed8d9f45518df1380ab62703cd5f1e0d SHA256 c766fccb0e3e43a6fb78eaa56cf6c45398d48b08566ea4794726f4a6ae3c9dc1
 AUX asymptote-1.86-configure-ac.patch 1141 RMD160 423165b11a7020f23af9c10743d7681669858840 SHA1 39c1b7276454f58bb7ee110853e2cea9f3b710e7 SHA256 996485ff6d0f6315ceac59dda6352098ec585efc4de9f6451282d4e877deaaab
 AUX asymptote-1.86-xdg-utils.patch 688 RMD160 dac5aabf6f88ed30e79ca9a258b6422e4558c1bd SHA1 26380cbce501404484993a4b7623b93e85bd7b47 SHA256 469b5d377a11ecb51e21a9ed47d28974968969e8a13c60d0126a79289702714e
-AUX asymptote-1.90-configure-ac.patch 1141 RMD160 00ad5bf23d5d8af2b15d92ed00586b496b933929 SHA1 12ede6a3b22eaeb9b7b544e6d005957deb9a1540 SHA256 6e77851f3d3df2415d427bd7bd32226ff4b7d993ea95af8d1fff4a872311c5e0
-AUX asymptote-1.90-xdg-utils.patch 688 RMD160 0ea76ce48fd429900b906d71db7ae5973a02e26e SHA1 9c38056521ec08f10a54a85f385cbe922ee9df9f SHA256 a05f4d2d3ed012ea50faeec92594bdc678994d75ad63c01310f5863a23c9327a
 AUX asymptote-1.91-configure-ac.patch 1141 RMD160 2e06cc4dda7b18e0a3804ad4b0241a59108fde18 SHA1 1f756c95ab106ce917a949d402f0f999033d23c2 SHA256 18e4807d68bbdcc80137a4c7f13539d00f7d02c8415b35c5a351f023d0f4663c
 AUX asymptote-1.91-xdg-utils.patch 688 RMD160 d835b72da3bb855a17e9b522f81f7e024f7f7973 SHA1 a093b787aeb12dda0aea5ea91c59b11b5fc76472 SHA256 e23ff35d41488e2fe158223320393822226772e5274065efeecd31bb4753eba4
 DIST asymptote-1.86.src.tgz 1523200 RMD160 6e8d054253cae75e77c79ead65433f8d64b161e6 SHA1 20158c38a079d20c30fbe8e6e5e39420df3da338 SHA256 fc138a73669e1d43e2edf9e3853257a4831c4bc5fcce61be4d7da5658f2c05e1
-DIST asymptote-1.90.src.tgz 1541488 RMD160 99e4bf12eb8330cbc79a5989049f6f202bb6b903 SHA1 ad966a2f7aff386dd8d3864fff15274d1e23e42f SHA256 5651ba73720f16e37f6cea79f317dd258d76de3198d33ac61984ed350a4afd82
 DIST asymptote-1.91.src.tgz 1553086 RMD160 7b6323213d83a873168b8f2f4bc8ea3c6b3f23ab SHA1 0294d778cfd4725732c700a59cc41b3ef161eec0 SHA256 5707b988cc060e1d0da1a3e364f44ce03620b50715995c0ff912c2cf10fd90ad
 EBUILD asymptote-1.86.ebuild 4594 RMD160 262b6acbae79036e27a291969bce3f36a6463413 SHA1 c37dcbf957d46a39f55597c2e0480b9ff262c8e3 SHA256 f7155327cc2635e4ded9e886dc298ef2daea3304333897026f8fe50111505acf
-EBUILD asymptote-1.90.ebuild 4596 RMD160 11eaa090b2cdbff59a332e7ac4a7c15d37811b27 SHA1 b30b2488e18e0bcfaf1fa248053c1213e11e7209 SHA256 d897498a98d6000487c31fc63ea3950805561418087ead0d8bd63b22f6680a10
+EBUILD asymptote-1.91-r1.ebuild 4598 RMD160 8420e7bbad57533ffc48f5ddab6b5e95afaa73bc SHA1 1005d2683fcc5a9ea9f47d461fed4cd33a114544 SHA256 83e1add459f9a4e97091ba9a6d2602aea81a9445ee38f254e9b82a2f2ab2a87b
 EBUILD asymptote-1.91.ebuild 4596 RMD160 46faf8b2b9472f697413d52c22196f6ee0329c6d SHA1 8f1f140e7b39717a8d7f3e4cd8f8ae1ff9f5996e SHA256 dda0f4f23501d51a6c053b7692103113d96e110d8c449180561d5d0b2c8ba283
-MISC ChangeLog 18648 RMD160 92fdb6ec6160bc47f447a79d1c66a373fe3d3890 SHA1 4e57eeeef408bfddc676c5bd0ca7da01438f625c SHA256 2d4d0fcb3a52932cc063161bc03ce935c2f88985dc0ea114e3e16f1fee221a64
+MISC ChangeLog 18932 RMD160 cd3d01799fec563f7fd9caa12220ecd4418e1cb8 SHA1 e7404fe2c66596f649bbc9f0cc37d778fd2db59e SHA256 371e86cdf8f1e25701eb95b99aef30bc9cfb8b4d4d64e4e892cbb74fe0933d58
 MISC metadata.xml 869 RMD160 4719ac66d805256a91cf9c311ea75e6d53db256e SHA1 f00600bb09e08fd31ba4fa15414bd3d578a4f136 SHA256 41c4190d40edabcbed20b712c8dca48783e336c7cd14bff51015966b263865b5
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;