Install both python with gdl as a library and regular gdl exec. Also now uses bundled antlr to make it work on amd64.

Package-Manager: portage-2.1.9.26/cvs/Linux x86_64

5 files changed, 61 insertions, 135 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index bca397a09b97..e5ed9e527eab 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.22 2010/12/21 19:52:08 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.23 2011/01/04 05:04:15 bicatali Exp $
+
+*gdl-0.9-r1 (04 Jan 2011)
+
+  04 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org> -gdl-0.9.ebuild,
+  +gdl-0.9-r1.ebuild, -files/gdl-0.9_rc4-antlr.patch,
+  -files/gdl-0.9_rc4-wxwidgets.patch:
+  Install both python with gdl as a library and regular gdl exec. Also now uses
+  bundled antlr to make it work on amd64.
 
 *gdl-0.9 (21 Dec 2010)
 
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 464178f32d1f..8ad2cf9d896c 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -4,18 +4,16 @@ Hash: SHA1
 AUX gdl-0.9-configure.patch 1678 RMD160 d766294518e0ff3b5f59743d28315efec1002637 SHA1 a5e1f020bc9a45b6c5c3e955bb4460b4b8d0531a SHA256 6c41bafe4a04cd3405b7998bafd8ddc93edaac50ae3260a295c1a7d1c2a80e68
 AUX gdl-0.9-numpy.patch 7734 RMD160 d77c4793e7e43ce38db234f84079b893b1281707 SHA1 aac5d20d82f26281658de9f997555e1bc3e0d81c SHA256 feb1653341a0e04350197a449ef2ae779ca4aea3e0aa302f0b41f8c7650e853e
 AUX gdl-0.9_rc2-gcc4.4.patch 372 RMD160 e1f5eed5e509981f5f408b0091eee25fac2ec913 SHA1 44fbcbb7c60ed9efd3145b983a7d8549a1b3a4be SHA256 57a1bab2e97953a7181c9da325c5d9fa17755568d2c4df1febbcc64035a11ac6
-AUX gdl-0.9_rc4-antlr.patch 1660 RMD160 29b275369d39e1ce53a8844c7cfeb2a897246220 SHA1 34d42ac6a2af794fac47ffa9578eae99b5f6cd63 SHA256 82f6211f9171438802372d7d1cd2fd141036bcc4abd8364e84a8b036c811f7d0
 AUX gdl-0.9_rc4-gcc4.3.patch 377 RMD160 b32e74d24fde6c37292b5a70450ad892a8ebbe46 SHA1 223bfc83e74f3ef788fd8e0c78f3cc82019834b4 SHA256 81d769b09bead8a103b85ff17083d3a8aac1b68b06db8d7cf2d2330787dd5f1c
 AUX gdl-0.9_rc4-gcc4.5.patch 756 RMD160 e9129082b199bf69e0ac06fbad268e4ffa02bb35 SHA1 98c2cfcf10d5bd38d4869ef13e78b2a484507b4f SHA256 4cf2cec2310285e76b563684f282f2cd6358e8942395170b051b64217ef3ff6b
-AUX gdl-0.9_rc4-wxwidgets.patch 2713 RMD160 66f4367194459e92261a99b9edfb63eccaf3a24a SHA1 9323d77de686f1ec41c891ce97962dc6c56278c3 SHA256 902d80ab95b22d5ba9f334289e2a8709e947815a301d3d3dc10918a138d5a86a
 DIST gdl-0.9.tar.gz 1454786 RMD160 5d25e1b899a072fcd23aadd7fd1b701a26c4ba0f SHA1 93a71bad8ad0c16a6e79edaae0489c372f442bcf SHA256 def5bc2887d506d3f7b14c47bb6ccbd59532e535ab333b38456955b00a3f5da6
-EBUILD gdl-0.9.ebuild 2322 RMD160 fc83aed092c5ba0a6d43dfe1d17241879937117a SHA1 4546e225bf2063eff0bb0e28a45fbb48915fd070 SHA256 4d83cd97f74ad3a26de67f28c1f58c5f19aae7123d31826095724911efc9fb17
-MISC ChangeLog 5037 RMD160 aec78717ac28b8f2443b3a9bc35d0c6954cc7ed9 SHA1 6895936366fa3220d6dfe740a633e7220ab05a66 SHA256 3541af6a67bfc6293cec71a11c221dde3202b6989568437329a2e01408c01359
+EBUILD gdl-0.9-r1.ebuild 2501 RMD160 f8643c56b8ce2f40b3dd9ef3817de1d67358f040 SHA1 e0d9ede26c88b2acaff4e0378d0087cd83a42876 SHA256 d47fdc1de071625ee8eca95fe33e9c4197a1e4fb5f67300584edf255f31b4079
+MISC ChangeLog 5351 RMD160 6b148c03dcc8fb621f16147fe88ae510d0ec3bae SHA1 3004a11506b459142f44acf28e4d36c5674fda3d SHA256 6a3cce19f3b618eefbada09aad3ce4feaf127538e43f6c328ff892131cd958c8
 MISC metadata.xml 712 RMD160 60ac7c45aeb084c6a4a9bb12ffe74d5337ce4d80 SHA1 71d0a54d4967de3f21ca235592a6f027e2c84e50 SHA256 cc726f9cdf42b1f5cc6446aa48247c614f1e41755f4d50b98cb4960f89e24f2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0RBXIACgkQ1ycZbhPLE2CjLgCfc41zZTl3NmHN3NVGWwdK3Axu
-1OkAoJtFalUzrZEZsz4JIKvN+zqJXMhd
-=LNXP
+iEYEARECAAYFAk0iqlkACgkQ1ycZbhPLE2B1CQCeJonPLzHrDbZu0Xkmn0CistJg
+towAn1pGcmWwx/O514buOUxjEIW+zmyh
+=iU4l
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch b/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
deleted file mode 100644
index ab1ba5ee5431..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc4-antlr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur gdl-0.9rc4/configure.in gdl-0.9rc4.new/configure.in
---- gdl-0.9rc4/configure.in	2010-02-02 13:13:51.000000000 -0500
-+++ gdl-0.9rc4.new/configure.in	2010-02-04 22:39:56.000000000 -0500
-@@ -989,7 +989,7 @@
- dnl perform program name transformation
- dnl AC_ARG_PROGRAM
- 
--AC_CONFIG_FILES(Makefile src/Makefile src/antlr/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
-+AC_CONFIG_FILES(Makefile src/Makefile src/pro/Makefile src/pro/dicom/Makefile testsuite/Makefile doc/Makefile)
- AC_OUTPUT
- 
- dnl == summary table =======================================
-diff -Naur gdl-0.9rc4/src/Makefile.am gdl-0.9rc4.new/src/Makefile.am
---- gdl-0.9rc4/src/Makefile.am	2010-02-02 13:13:51.000000000 -0500
-+++ gdl-0.9rc4.new/src/Makefile.am	2010-02-04 22:40:42.000000000 -0500
-@@ -1,6 +1,6 @@
- # set the include path found by configure
- INCLUDES = $(EXT_INCLUDES) $(all_includes)
--SUBDIRS = antlr pro
-+SUBDIRS = pro
- noinst_HEADERS = gdlwidget.hpp prognode.hpp prognodeexpr.hpp
- 
- cpp_hpp_files = accessdesc.hpp arrayindex.hpp assocdata.cpp assocdata.hpp \
-@@ -56,7 +56,7 @@
- gdl_CXXFLAGS = $(AM_CXXFLAGS)
- # the library search path.
- gdl_LDFLAGS = $(all_libraries)
--gdl_LDADD = $(top_builddir)/src/antlr/libantlr.a -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+gdl_LDADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
- 
- # build as library (for python module)
-@@ -72,6 +72,6 @@
- libgdl_la_LDFLAGS = $(all_libraries) -Wl,-z,muldefs
- endif 
- 
--libgdl_la_LIBADD = $(top_builddir)/src/antlr/libantlr.la -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
-+libgdl_la_LIBADD = ANTLR_LIB -L/usr/X11R6/lib64 -L/usr/X11R6/lib -lX11
- endif
- 
diff --git a/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch b/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch
deleted file mode 100644
index 0d9b87b6246b..000000000000
--- a/dev-lang/gdl/files/gdl-0.9_rc4-wxwidgets.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/configure.in b/configure.in
-index e77afe3..a012c7c 100644
---- a/configure.in
-+++ b/configure.in
-@@ -324,21 +324,25 @@ if test "x$with_wxWidgets" != "xno"; then
-     dnl LDFLAGS="$LDFLAGS -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-   fi
- 
--  tmp="`wx-config --basename`-`wx-config --release`"
--  AC_CHECK_LIB($tmp, wxFatalSignalHandler, 
--    [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [
--      dnl SA: handling the multi-port wxWidgets installation case	 
--      tmp="`wx-config --basename --toolkit=base`-`wx-config --release`"	 
--      AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [
--        echo ""
--        echo "Error! wxWidgets version 2.8 or later is required but was not found"
--        echo "       Use --with-wxWidgets=DIR to specify the wxWidgets directory tree"
--        echo "       Use --with-wxWidgets=no  to not use it"
--        echo "       Check the README or use configure --help for other libraries needed"
--        echo "       (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))"
--        exit -1
--      ])
--  ])
-+  AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])
-+
-+  # SA: the code below worked for me on Ubuntu and Macports... but it does not work e.g. on Fedora
-+  #
-+  #tmp="`wx-config --basename`-`wx-config --release`"
-+  #AC_CHECK_LIB($tmp, wxFatalSignalHandler, 
-+  #  [AC_DEFINE([HAVE_LIBWXWIDGETS], [1], [wxWidgets library])], [
-+  #    dnl SA: handling the multi-port wxWidgets installation case	 
-+  #    tmp="`wx-config --basename --toolkit=base`-`wx-config --release`"	 
-+  #    AC_CHECK_LIB($tmp, wxInteger_compare, [AC_DEFINE([HAVE_LIBWXWIDGETS], [1])], [
-+  #      echo ""
-+  #      echo "Error! wxWidgets version 2.8 or later is required but was not found"
-+  #      echo "       Use --with-wxWidgets=DIR to specify the wxWidgets directory tree"
-+  #      echo "       Use --with-wxWidgets=no  to not use it"
-+  #      echo "       Check the README or use configure --help for other libraries needed"
-+  #      echo "       (--with-xxxdir = obligatory, --with-xxx = optional (--with-xxx=no to disable))"
-+  #      exit -1
-+  #    ])
-+  #])
- fi
- 
- dnl == ImageMagick =========================================
-diff --git a/src/widget.cpp b/src/widget.cpp
-index dc65ad1..316d599 100644
---- a/src/widget.cpp
-+++ b/src/widget.cpp
-@@ -589,7 +589,7 @@ namespace lib {
- 
-       RefDNode theAST;
- 
--      GDLLexer lexer(istr, "");
-+      GDLLexer lexer(istr, "", GDLParser::NONE);
-       GDLParser& parser = lexer.Parser();
-       parser.interactive();
- 
diff --git a/dev-lang/gdl/gdl-0.9.ebuild b/dev-lang/gdl/gdl-0.9-r1.ebuild
index 2cf4ca46ce1c..0874d4f87bcf 100644
--- a/dev-lang/gdl/gdl-0.9.ebuild
+++ b/dev-lang/gdl/gdl-0.9-r1.ebuild
@@ -1,12 +1,16 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.ebuild,v 1.1 2010/12/21 19:52:08 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9-r1.ebuild,v 1.1 2011/01/04 05:04:15 bicatali Exp $
 
-EAPI="2"
+EAPI=3
 
 WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit autotools eutils wxwidgets
+inherit autotools eutils wxwidgets python
+
+RESTRICT_PYTHON_ABIS="3.*"
 
 DESCRIPTION="An Interactive Data Language compatible incremental compiler"
 HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
@@ -32,7 +36,7 @@ RDEPEND="sys-libs/readline
 	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 
 DEPEND="${RDEPEND}
-	dev-java/antlr[cxx]"
+	dev-java/antlr"
 
 pkg_setup() {
 	use wxwidgets && wxwidgets_pkg_setup
@@ -40,40 +44,47 @@ pkg_setup() {
 
 src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+
 	epatch \
-		"${FILESDIR}"/${PN}-0.9_rc4-antlr.patch \
 		"${FILESDIR}"/${PN}-0.9_rc2-gcc4.4.patch \
 		"${FILESDIR}"/${PN}-0.9_rc4-gcc4.3.patch \
 		"${FILESDIR}"/${PN}-0.9-numpy.patch \
 		"${FILESDIR}"/${PN}-0.9-configure.patch
 
-	# we need to blow away the directory with antlr
-	# otherwise the build system picks up bogus
-	# header files
-	rm -fr "${S}"/src/antlr || die "failed to remove antlr directory"
-
 	# adjust the *.pro file install path
-	sed -i -e "s:datasubdir=.*$:datasubdir=\"${PN}\":" configure.in \
-		|| die "Failed to fix *.pro install patch."
-
-	sed -i -e "s:ANTLR_LIB:-lantlr:" src/Makefile.am \
-		|| die "Failed to adjust link to libantlr."
+	sed -i \
+		-e "s:datasubdir=.*$:datasubdir=\"${PN}\":" \
+		configure.in || die "Failed to fix *.pro install patch."
 	eautoreconf
+	use python && python_copy_sources
 }
 
 src_configure() {
-	econf \
-		$(use_enable python python_module) \
-		$(use_with X x) \
-		$(use_with fftw) \
-		$(use_with grib) \
-		$(use_with hdf) \
-		$(use_with hdf5) \
-		$(use_with netcdf) \
-		$(use_with imagemagick Magick) \
-		$(use_with openmp) \
-		$(use_with udunits) \
-		$(use_with wxwidgets wxWidgets)
+	configuration() {
+		econf \
+			$(use_with X x) \
+			$(use_with fftw) \
+			$(use_with grib) \
+			$(use_with hdf) \
+			$(use_with hdf5) \
+			$(use_with netcdf) \
+			$(use_with imagemagick Magick) \
+			$(use_with openmp) \
+			$(use_with udunits) \
+			$(use_with wxwidgets wxWidgets) \
+			$@
+	}
+	configuration --disable-python_module
+	if use python; then
+		python_execute_function -s configuration --enable-python_module
+	fi
+}
+
+src_compile() {
+	default
+	if use python; then
+		python_src_compile
+	fi
 }
 
 src_test() {
@@ -83,5 +94,12 @@ src_test() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
+	if use python; then
+		installation() {
+			exeinto $(python_get_sitedir)
+			newexe src/.libs/libgdl.so.0.0.0 GDL.so || die
+		}
+		python_execute_function -s installation
+	fi
 	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO HACKING
 }