Added a test for openmp, install pro routines in default directory (/usr/shared/gnudatalanguage/lib), bug #401703 thanks Ben Kohler, and force libX11 dependency since it does not compile without

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

3 files changed, 143 insertions, 14 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index e7197462932d..3294c084a5f2 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/gdl
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.26 2011/12/27 08:01:38 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.27 2012/02/01 17:43:25 bicatali Exp $
+
+*gdl-0.9.2-r1 (01 Feb 2012)
+
+  01 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +gdl-0.9.2-r1.ebuild:
+  Added a test for openmp, install pro routines in default directory
+  (/usr/shared/gnudatalanguage/lib), bug #401703 thanks Ben Kohler, and force
+  libX11 dependency since it does not compile without
 
 *gdl-0.9.2 (27 Dec 2011)
 
diff --git a/dev-lang/gdl/gdl-0.9.2-r1.ebuild b/dev-lang/gdl/gdl-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..a9a2eab6e0da
--- /dev/null
+++ b/dev-lang/gdl/gdl-0.9.2-r1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r1.ebuild,v 1.1 2012/02/01 17:43:25 bicatali Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit cmake-utils eutils wxwidgets python virtualx
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+DESCRIPTION="Interactive Data Language compatible incremental compiler"
+HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fftw grib gshhs hdf hdf5 imagemagick netcdf openmp proj ps python
+	static-libs udunits wxwidgets X"
+
+RDEPEND="sci-libs/gsl
+	sci-libs/plplot
+	sys-libs/ncurses
+	sys-libs/readline
+	sys-libs/zlib
+	x11-libs/libX11
+	fftw? ( >=sci-libs/fftw-3 )
+	grib? ( sci-libs/grib_api )
+	gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs )
+	hdf? ( sci-libs/hdf )
+	hdf5? ( sci-libs/hdf5 )
+	imagemagick? ( media-gfx/imagemagick )
+	netcdf? ( sci-libs/netcdf )
+	proj? ( sci-libs/proj )
+	ps? ( dev-libs/pslib )
+	python? ( dev-python/numpy )
+	udunits? ( sci-libs/udunits )
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
+
+DEPEND="${RDEPEND}
+	>=dev-java/antlr-2.7.7-r5:0[cxx]"
+
+pkg_setup() {
+	use wxwidgets && wxwidgets_pkg_setup
+	use python && python_pkg_setup
+	use openmp && [[ $(tc-getCXX)$ == *g++* ]] && ! tc-has-openmp && \
+		die "You have openmp enabled but your current g++ does not support it"
+}
+
+src_prepare() {
+	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
+	epatch "${FILESDIR}"/${PV}-{antlr,numpy,proj4,include,tests}.patch
+	# make sure antlr includes are from system
+	rm -rf src/antlr
+	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
+	sed -i \
+		-e 's:proj4:proj:' \
+		-e 's:lib_proj\.h:proj_api\.h:g' \
+		CMakeModules/FindLibproj4.cmake src/math_utl.hpp || die
+	# gentoo: avoid install files in datadir directory
+	sed -i \
+		-e '/AUTHORS/d' \
+		CMakeLists.txt || die
+
+	if use python; then
+		local abi
+		for abi in ${PYTHON_ABIS}; do
+			mkdir "${S}"-${abi}
+		done
+	fi
+}
+
+src_configure() {
+	# MPI is still very buggy
+	# x11=off does not compile
+	mycmakeargs+=(
+		-DMPICH=OFF
+		-DBUNDLED_ANTLR=OFF
+		-DX11=ON
+		$(cmake-utils_use fftw)
+		$(cmake-utils_use grib)
+		$(cmake-utils_use gshhs)
+		$(cmake-utils_use hdf)
+		$(cmake-utils_use hdf5)
+		$(cmake-utils_use imagemagick MAGICK)
+		$(cmake-utils_use netcdf)
+		$(cmake-utils_use openmp)
+		$(cmake-utils_use proj LIBPROJ4)
+		$(cmake-utils_use ps PSLIB)
+		$(cmake-utils_use udunits)
+		$(cmake-utils_use wxwidgets)
+	)
+	configuration() {
+		mycmakeargs+=( $@ )
+		CMAKE_BUILD_DIR="${BUILDDIR:-${S}_build}" cmake-utils_src_configure
+	}
+	configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF
+	use python && python_execute_function -s \
+		configuration -DPYTHON_MODULE=ON -DPYTHON=ON
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && python_src_compile
+}
+
+src_test() {
+	# defines a check target instead of the ctest to define some LDPATH
+	if use X; then
+		Xemake -j1 -C ${CMAKE_BUILD_DIR} check
+	else
+		emake -j1 -C ${CMAKE_BUILD_DIR} check
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		installation() {
+			exeinto $(python_get_sitedir)
+			newexe "${S}"-${PYTHON_ABI}/src/libgdl.so GDL.so
+		}
+		python_execute_function -s installation
+		dodoc PYTHON.txt
+	fi
+	echo "GDL_PATH=\"+${EPREFIX}/usr/share/gnudatalanguage\"" > 50gdl
+	doenvd 50gdl
+}
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index acbf6b1ebf9e..6086f88eaf0c 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 DIST yap-6.2.0-gentoo-patchset-5.tar.gz 8634 RMD160 39f1470e71adeddc5d310597ee9ef28946aa2a3d SHA1 74061482736e87953ad314785cecc89391be390d SHA256 98d4c88da2faf0802ffee5d5b0617ef0410f6acbddde361b2e04e4b5a9e167ef
 DIST yap-6.2.0.tar.gz 4990807 RMD160 af5bb81590105234644dc072f14c37f696e7db2a SHA1 884406c6a6333c796ab19d0f40529918be6cae97 SHA256 47cffa403099062c79e01ad19499fc5b3299c8e7a3c3bd3aadba26c91ae125c4
 DIST yap-6.2.2-gentoo-patchset-2.tar.gz 5736 RMD160 64d051a58a7bcdf9c167adf02b60e1510d4c875b SHA1 81a3d4d414e0336499c3f732e8b9e93a2a899caf SHA256 a4c74594a1342ae748c6f00b2ddd28c0d2b8decaa42d0d481617c98a1a34fdae
@@ -8,14 +5,7 @@ DIST yap-6.2.2.tar.gz 5496746 RMD160 116dc877aa4bf5f89ce86127ca17e85691960358 SH
 DIST yap-6.3.0-gentoo-patchset-1.tar.gz 5405 RMD160 59becff941dfa34d2bd691bfe08f051c1619ee9b SHA1 1c7bb8153743709f304e90fe71a97212b2037c1b SHA256 1f63e18419933b9a2b9adce2bc3d3e6dbcbb98aa10abc69d7731e8a555ab2e3a
 DIST yap-6.3.0.tar.gz 5626436 RMD160 88acf118abdbf65b0a4c1d9cc87ed9df03557af5 SHA1 43a4e784fa002dee2748fa7d690c8c8a75fd785f SHA256 db1d0c46617eab2c5c2e44788252e85a8c667dc9c73e218c9dcf8a20ecbaf94e
 EBUILD yap-6.2.0-r1.ebuild 2638 RMD160 c1ea23aa51e43e68c22c30aac9d27ff8e0220056 SHA1 fe5eded73338853c346f2296c775a108fa9816e6 SHA256 b6975c36e1f1e7720c495893c82d8c1d0a9ccf5d1de732fc0bef40c5c1fe1b64
-EBUILD yap-6.2.2.ebuild 2659 RMD160 c2d73fc8f37492b7d1ef51dd2cfe50f1f1b60b87 SHA1 a9b9f9e892bdc54a063946023559c1117867bfb9 SHA256 00dd6bd2fb469c6c0b5e8fbb332869141d2151553eaf96a8a554a7542b3fec12
+EBUILD yap-6.2.2.ebuild 2654 RMD160 227eaed86cc3582f887821bc573b01bab7379fe8 SHA1 d792437af8f46da314b48e9c44858ac688760344 SHA256 79c232382b81f928a3561d2fe014b4e71db65cc8e8a3fe3cbfbe32af2076d8b7
 EBUILD yap-6.3.0.ebuild 2632 RMD160 a21511f264529ebaa60f3d725a35c7a272aedc6a SHA1 213d07d3ed875253b1d10f1a373b1dd3a4a2b66b SHA256 7b9db54a517bbf2259a8c0a4648177e020460db2fb2c53fa0e844dced1cdc953
-MISC ChangeLog 12817 RMD160 4ec5ab5b0d0e92989df228405cc40a692e9db99e SHA1 9d59ce290ee18cda15c74ce68c222f90aa0ad1ba SHA256 c3af9f2031eba35b3372aef97d9af42b61d0bedb9b6c4b73f4e2c4fcc814e323
+MISC ChangeLog 12918 RMD160 e0d7f9ce28e0c157aa090f0afba44049b34fb3cc SHA1 ab7980f017d2f8985470cd4bae861c5d4152ae1c SHA256 48cf5de03564779e7e170bc90ccfe11c2770e291ab63cf436a6c45833084eb2f
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk8kENcACgkQuUQtlDBCeQJ9rgCfTjVUYwF3b3/HkNMN5osg6uJH
-5sQAmwWxhcTlhTEpqLODf86UfDyEm5ti
-=qlot
------END PGP SIGNATURE-----