Fix for newer netcdf (bug #421213), fix conditional tests and add a patch to link posix semaphore when openmp is not set

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

6 files changed, 62 insertions, 159 deletions

diff --git a/dev-lang/gdl/ChangeLog b/dev-lang/gdl/ChangeLog
index 17cc44902b25..90fa5b8eea77 100644
--- a/dev-lang/gdl/ChangeLog
+++ b/dev-lang/gdl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/gdl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.30 2012/06/16 16:48:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.31 2012/06/20 23:11:51 bicatali Exp $
+
+  20 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/0.9.2-semaphore.patch, -gdl-0.9.2.ebuild, files/0.9.2-tests.patch,
+  gdl-0.9.2-r1.ebuild:
+  Fix for newer netcdf (bug #421213), fix conditional tests and add a patch to
+  link posix semaphore when openmp is not set
 
   16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> gdl-0.9.2.ebuild,
   gdl-0.9.2-r1.ebuild, metadata.xml:
diff --git a/dev-lang/gdl/Manifest b/dev-lang/gdl/Manifest
index 9d1bdf3a2553..c644fb758b2c 100644
--- a/dev-lang/gdl/Manifest
+++ b/dev-lang/gdl/Manifest
@@ -5,20 +5,16 @@ AUX 0.9.2-antlr.patch 2795 RMD160 4ccee6f6f3cc2ca585efe26308c3470882dc2abe SHA1
 AUX 0.9.2-include.patch 300 RMD160 51f78d4f28104889f0377d37f45ee1b84fbcfccd SHA1 f7b2db56b4f407b7e13ac287fca3fe31a54d8ebf SHA256 d82f1b8c16037b16e38a2ba2688fa16b6a5d6a3fc62abe387c49d2d96f167c39
 AUX 0.9.2-numpy.patch 557 RMD160 1906110caec6913f5fb691708ead513715927ff2 SHA1 529a142f40bc27e24a187e74b95affd03e8f2033 SHA256 a7c2f55cb652a711375c5b427112bc2fb5c6383e6350f5c05b3664827c545789
 AUX 0.9.2-proj4.patch 1185 RMD160 920acf7a98a53415a16701c2326c380b176dc7e9 SHA1 759c3c2745fa7ddcbba6cfd3bbdb0d5c0fe3d0bf SHA256 4c6b4d97823ddeebae4c3170dc80c14bb68681117de599077ce6a845fb2ae26f
-AUX 0.9.2-tests.patch 8519 RMD160 9328f1d39dd42301812fad3085fdb4fb5b329f4d SHA1 18a2574b9e996acb5dc6c875e544faceeb3078bf SHA256 43d1094a7c47840910b4320626185f92be5a05ace4e80d424f474655d2ba1eb2
+AUX 0.9.2-semaphore.patch 770 RMD160 3cf525ab4c3b15234ba74e3bb4e1268c758e522c SHA1 57d7c5b8bdc6de899e4227ef0caed33499ab541b SHA256 cbdfe65ddd23a62f04b2beee46f9f6e80bd12ff55a3563ea7059a7e2c083aac4
+AUX 0.9.2-tests.patch 8616 RMD160 7236c7eb811ccdced8beb0a47fae98e3577f4162 SHA1 8a41adb02bda342dacba11db5ffda6af7853dd92 SHA256 4cf7fa89353265361bdbcf38fbeb3bacb572f2b8920ca00a73ce1d66a57c5a9e
 DIST gdl-0.9.2.tar.gz 2436946 RMD160 6913b358de01550256ad38c920cc461e8ef94512 SHA1 0d6fe86e2971637310c6298379616b02f773e956 SHA256 59907d941877327e9653a9cda5d801ea0b45f67af4c7da22acfcdd7cad291acf
-EBUILD gdl-0.9.2-r1.ebuild 3493 RMD160 6e56095397df047e391af3c08b26526dd949bc7b SHA1 0ecacef6181394a8e1c701ff678721142bf0b82e SHA256 c92333f0688b6fda1262414e3e97559b261c6abc52f7e749202aca59bf766624
-EBUILD gdl-0.9.2.ebuild 3320 RMD160 81d428214ec5cf2881ec3230cafda92eeafabea4 SHA1 4b3c097cc8ec4f744c88892c36835ac076a39891 SHA256 ee39f3ab727d1f0f91b92c45b32dc8ecad15432cbfe7c33fb680270586ce7c16
-MISC ChangeLog 7095 RMD160 83bb256f3c8bd497556284de404456f21d3099b8 SHA1 ad9b48bb2d58777be733bd9196828ac315b1470d SHA256 dcff53cc55382df20db1ab4dee7468a6a82ffced08cc05dc812f9db82bfe0fe7
+EBUILD gdl-0.9.2-r1.ebuild 3647 RMD160 8bcf355080ea585b0bb12691f733d9b6ff6dc8fc SHA1 14734c12d68378c95897a4696f28639712e19bbd SHA256 7735f042f12e796e47f5dfd22aad42fa70e6f32661303d6c4c9e2a251c4d1ff0
+MISC ChangeLog 7374 RMD160 d7938a11663483bf827446ba11b5bfa2063101ca SHA1 a859f934276442b4e35410f7904a0588fcc8b76d SHA256 25c8a3b474ff8beb01768e73bbc6b1f69c3b8d02c29b64d86e67ce63a794c5fb
 MISC metadata.xml 868 RMD160 4a58201003c53d616ba172db44871d2b5167cfdd SHA1 891fbcd8fa32d24f994315df9a4b9b1251b48821 SHA256 8fe2970b31ca708b5948308b6de3ddb28c097df8f4a542bf051857ca724897d6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP3LfoAAoJEEdUh39IaPFN+HAIAIV+v6FETnEwF03uWl1HnNOY
-OJBU+C5rfbVtkquNYUM3sH1+S8UOJWK6U0RLR99lMttOP69qk1NNohQDriR2n+h7
-N2n696LYr4L86E6i1EGIhhVJOlfQ1j9fN8CuJarkJkZJbn0WqSbb5YfWO5eVDuFj
-WPi9PYP2C6Nv12amFz2OF9j9qbco8Cu/gKpD9ewujgHHZGIKRn5F+SjJZT5KL6Pq
-Rr+Jtx00H7VE21scs0GBrXhoRVEEJisVfi0n3NEXJf77eoVmntiXEQELaHM+hyf8
-2YIk6lvFau4mPy/jOti8Y3nGwcS/GlbmXaoMn9Nbi8RYeO27S/iuLdZ5j3/AYpo=
-=5c3G
+iEYEARECAAYFAk/iWL8ACgkQ1ycZbhPLE2A6rwCgp5gOcZSw+2/E4/Xe/NLXQC1B
+W0wAn2XPo5oTDvDVJoWAA8e5hMNTvbma
+=oADo
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/gdl/files/0.9.2-semaphore.patch b/dev-lang/gdl/files/0.9.2-semaphore.patch
new file mode 100644
index 000000000000..f2a28042f8d1
--- /dev/null
+++ b/dev-lang/gdl/files/0.9.2-semaphore.patch
@@ -0,0 +1,22 @@
+--- gdl-0.9.2/CMakeLists.txt	2011-11-06 22:39:45.000000000 +0000
++++ gdl-0.9.2/CMakeLists.txt.new	2012-06-21 00:02:42.000000000 +0100
+@@ -217,6 +217,19 @@
+ 		add_definitions(${OpenMP_CXX_FLAGS})
+ 		set(LIBRARIES ${LIBRARIES} ${OpenMP_CXX_FLAGS})
+ 	endif(OPENMP_FOUND)
++else(OPENMP)
++  # we need to define those semaphore posix symbols, do it with threads libs
++  find_package(Threads)
++  if(THREADS_FOUND)
++    set(LIBRARIES ${LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++  else(THREADS_FOUND)
++    check_library_exists(rt sem_unlink "" HAVE_RT)
++    if(HAVE_RT)
++      set(LIBRARIES ${LIBRARIES} rt)
++    else(HAVE_RT)
++	message(FATAL_ERROR "Missing a POSIX semaphore symbols (rt or threads).\n")
++    endif(HAVE_RT)
++  endif(THREADS_FOUND)
+ endif(OPENMP)
+ 
+ # GSL MANDATORY
diff --git a/dev-lang/gdl/files/0.9.2-tests.patch b/dev-lang/gdl/files/0.9.2-tests.patch
index 9e898883c7cf..464ac8e1f7d9 100644
--- a/dev-lang/gdl/files/0.9.2-tests.patch
+++ b/dev-lang/gdl/files/0.9.2-tests.patch
@@ -9,7 +9,7 @@ diff -Nur gdl-0.9.2.orig/testsuite/CMakeLists.txt gdl-0.9.2/testsuite/CMakeLists
  execl(\"${BASE_BINARY}/src/gdl\",\"-quiet\",\"-e\",v[1],(char*)0);
  }
  ")
-@@ -21,10 +22,117 @@
+@@ -21,10 +22,123 @@
  add_library(test_ce SHARED EXCLUDE_FROM_ALL libtest_ce.cpp)
  add_custom_target(check COMMAND ${CMAKE_BUILD_TOOL} test DEPENDS launchtest test_ce)
  get_target_property(LAUNCHTESTLOCATION launchtest LOCATION)
@@ -38,16 +38,18 @@ diff -Nur gdl-0.9.2.orig/testsuite/CMakeLists.txt gdl-0.9.2/testsuite/CMakeLists
 +endif(X11)
 +add_test(test_bug_3033108.pro ${LAUNCHTESTLOCATION} test_bug_3033108.pro)
 +add_test(test_bug_3054361.pro ${LAUNCHTESTLOCATION} test_bug_3054361.pro)
-+add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro)
-+add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro)
-+add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro)
-+add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro)
++iF(NETCDF)
++  add_test(test_bug_3055720.pro ${LAUNCHTESTLOCATION} test_bug_3055720.pro)
++  add_test(test_bug_3057511.pro ${LAUNCHTESTLOCATION} test_bug_3057511.pro)
++  add_test(test_bug_3057520.pro ${LAUNCHTESTLOCATION} test_bug_3057520.pro)
++  add_test(test_bug_3061072.pro ${LAUNCHTESTLOCATION} test_bug_3061072.pro)
++  add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro)
++endif(NETCDF)
 +add_test(test_bug_3081887.pro ${LAUNCHTESTLOCATION} test_bug_3081887.pro)
 +add_test(test_bug_3085858.pro ${LAUNCHTESTLOCATION} test_bug_3085858.pro)
 +add_test(test_bug_3086851.pro ${LAUNCHTESTLOCATION} test_bug_3086851.pro)
 +add_test(test_bug_3091599.pro ${LAUNCHTESTLOCATION} test_bug_3091599.pro)
 +add_test(test_bug_3091610.pro ${LAUNCHTESTLOCATION} test_bug_3091610.pro)
-+add_test(test_bug_3100945.pro ${LAUNCHTESTLOCATION} test_bug_3100945.pro)
 +add_test(test_bug_3104209.pro ${LAUNCHTESTLOCATION} test_bug_3104209.pro)
 +add_test(test_bug_3104214.pro ${LAUNCHTESTLOCATION} test_bug_3104214.pro)
 +add_test(test_bug_3104326.pro ${LAUNCHTESTLOCATION} test_bug_3104326.pro)
@@ -66,11 +68,15 @@ diff -Nur gdl-0.9.2.orig/testsuite/CMakeLists.txt gdl-0.9.2/testsuite/CMakeLists
 +add_test(test_bug_3298378.pro ${LAUNCHTESTLOCATION} test_bug_3298378.pro)
 +add_test(test_bug_3300626.pro ${LAUNCHTESTLOCATION} test_bug_3300626.pro)
 +add_test(test_bug_3313522.pro ${LAUNCHTESTLOCATION} test_bug_3313522.pro)
-+add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro)
++if(MAGICK)
++  add_test(test_bug_3376577.pro ${LAUNCHTESTLOCATION} test_bug_3376577.pro)
++endif(MAGICK)
 +add_test(test_ce.pro ${LAUNCHTESTLOCATION} test_ce.pro)
 +add_test(test_clip.pro ${LAUNCHTESTLOCATION} test_clip.pro)
 +add_test(test_common.pro ${LAUNCHTESTLOCATION} test_common.pro)
-+add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro)
++if(UDUNITS)
++  add_test(test_constants.pro ${LAUNCHTESTLOCATION} test_constants.pro)
++endif(UDUNITS)
 +add_test(test_correlate.pro ${LAUNCHTESTLOCATION} test_correlate.pro)
 +add_test(test_deriv.pro ${LAUNCHTESTLOCATION} test_deriv.pro)
 +add_test(test_device.pro ${LAUNCHTESTLOCATION} test_device.pro)
diff --git a/dev-lang/gdl/gdl-0.9.2-r1.ebuild b/dev-lang/gdl/gdl-0.9.2-r1.ebuild
index 13c69228627a..27fb9cbb42f7 100644
--- a/dev-lang/gdl/gdl-0.9.2-r1.ebuild
+++ b/dev-lang/gdl/gdl-0.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2012/06/16 16:48:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.2-r1.ebuild,v 1.5 2012/06/20 23:11:51 bicatali Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="fftw grib gshhs hdf hdf5 imagemagick netcdf openmp proj postscript python
-	static-libs udunits wxwidgets X"
+	static-libs udunits wxwidgets"
 
 RDEPEND="sci-libs/gsl
 	sci-libs/plplot
@@ -34,7 +34,7 @@ RDEPEND="sci-libs/gsl
 	hdf? ( sci-libs/hdf )
 	hdf5? ( sci-libs/hdf5 )
 	imagemagick? ( media-gfx/imagemagick )
-	netcdf? ( sci-libs/netcdf )
+	netcdf? ( || ( sci-libs/netcdf-cxx sci-libs/netcdf[cxx] ) )
 	proj? ( sci-libs/proj )
 	postscript? ( dev-libs/pslib )
 	python? ( dev-python/numpy )
@@ -53,7 +53,7 @@ pkg_setup() {
 
 src_prepare() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx
-	epatch "${FILESDIR}"/${PV}-{antlr,numpy,proj4,include,tests}.patch
+	epatch "${FILESDIR}"/${PV}-{antlr,numpy,proj4,include,tests,semaphore}.patch
 	# make sure antlr includes are from system
 	rm -rf src/antlr
 	# gentoo: use proj instead of libproj4 (libproj4 last update: 2004)
@@ -72,6 +72,12 @@ src_prepare() {
 			mkdir "${S}"-${abi}
 		done
 	fi
+	if has_version sci-libs/netcdf-cxx; then
+		sed -i \
+			-e 's/netcdfcpp.h/netcdf/g' \
+			CMakeLists.txt src/ncdf_var_cl.cpp \
+			src/ncdf_cl.hpp src/ncdf_{att,dim}_cl.cpp || die
+	fi
 }
 
 src_configure() {
@@ -110,11 +116,7 @@ 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
+	Xemake -j1 -C ${CMAKE_BUILD_DIR} check
 }
 
 src_install() {
diff --git a/dev-lang/gdl/gdl-0.9.2.ebuild b/dev-lang/gdl/gdl-0.9.2.ebuild
deleted file mode 100644
index 7d2e5a741aa2..000000000000
--- a/dev-lang/gdl/gdl-0.9.2.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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.ebuild,v 1.2 2012/06/16 16:48:40 ssuominen 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 postscript python
-	static-libs udunits wxwidgets X"
-
-RDEPEND="sci-libs/gsl
-	sci-libs/plplot
-	sys-libs/ncurses
-	sys-libs/readline
-	sys-libs/zlib
-	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 )
-	postscript? ( 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
-}
-
-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
-	mycmakeargs+=(
-		-DMPICH=OFF
-		-DBUNDLED_ANTLR=OFF
-		-DGDL_DATA_DIR=share/gdl/pro/gdl
-		$(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 postscript PSLIB)
-		$(cmake-utils_use udunits)
-		$(cmake-utils_use wxwidgets)
-		$(cmake-utils_use X X11)
-	)
-	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/gdl/pro\"" > 50gdl
-	doenvd 50gdl
-}