jlec 15/05/07 15:33:32 Modified: gdl-0.9.4.ebuild metadata.xml ChangeLog Added: gdl-0.9.5.ebuild Log: Version Bump; fix compatibility with latest plplot, bug #547380; fix python support bug #530774 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path 1.4 dev-lang/gdl/gdl-0.9.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild?r1=1.3&r2=1.4 Index: gdl-0.9.4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gdl-0.9.4.ebuild 8 Apr 2015 08:22:09 -0000 1.3 +++ gdl-0.9.4.ebuild 7 May 2015 15:33:32 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild,v 1.3 2015/04/08 08:22:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.4.ebuild,v 1.4 2015/05/07 15:33:32 jlec Exp $ EAPI=5 @@ -9,7 +9,7 @@ inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx -DESCRIPTION="Interactive Data Language compatible incremental compiler" +DESCRIPTION="GNU Data Language" HOMEPAGE="http://gnudatalanguage.sourceforge.net/"; SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz" @@ -21,7 +21,7 @@ RDEPEND=" sci-libs/gsl:0= - sci-libs/plplot:0= + sci-libs/plplot:0=[-dynamic] sys-libs/ncurses:5= sys-libs/readline:0= sys-libs/zlib:0= @@ -31,13 +31,19 @@ gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( || ( + imagemagick? ( + || ( media-gfx/graphicsmagick[cxx] - media-gfx/imagemagick[cxx] ) ) + media-gfx/imagemagick[cxx] + ) + ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" @@ -49,14 +55,16 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}"/0.9.2-antlr.patch - "${FILESDIR}"/0.9.2-include.patch - "${FILESDIR}"/0.9.2-proj4.patch - "${FILESDIR}"/0.9.2-semaphore.patch - "${FILESDIR}"/0.9.3-plwidth.patch - "${FILESDIR}"/0.9.4-gsl.patch - "${FILESDIR}"/0.9.4-python.patch - "${FILESDIR}"/0.9.4-reorder.patch + "${FILESDIR}"/0.9.2-antlr.patch + "${FILESDIR}"/0.9.2-include.patch + "${FILESDIR}"/0.9.2-proj4.patch + "${FILESDIR}"/0.9.2-semaphore.patch + "${FILESDIR}"/0.9.3-plwidth.patch + "${FILESDIR}"/0.9.4-gsl.patch + "${FILESDIR}"/0.9.4-python.patch + "${FILESDIR}"/0.9.4-reorder.patch + "${FILESDIR}"/0.9.4-plplot.patch + "${FILESDIR}"/0.9.4-python2.patch ) pkg_setup() { @@ -117,7 +125,7 @@ mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON ) fi else - mycmakeargs+=( "-DGRAPHICSMAGICK=OFF -DMAGICK=OFF" ) + mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF ) fi configuration() { mycmakeargs+=( $@ ) @@ -141,9 +149,8 @@ cmake-utils_src_install if use python; then installation() { - python_export PYTHON_SITEDIR - exeinto "${PYTHON_SITEDIR#${EPREFIX}}" - newexe src/libgdl.so GDL.so + mv src/libgdl.so GDL.so || die + python_domodule GDL.so } python_foreach_impl run_in_build_dir installation dodoc PYTHON.txt 1.11 dev-lang/gdl/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/metadata.xml?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/metadata.xml?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/metadata.xml?r1=1.10&r2=1.11 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/metadata.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- metadata.xml 5 Feb 2015 14:59:03 -0000 1.10 +++ metadata.xml 7 May 2015 15:33:32 -0000 1.11 @@ -1,19 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> -<herd>sci</herd> -<longdescription lang="en"> + <herd>sci</herd> + <longdescription lang="en"> A free IDL (Interactive Data Language) compatible incremental compiler (ie. runs IDL programs). IDL is a registered trademark of ITT Visual Information Solutions. </longdescription> -<use> - <flag name='eigen'>Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag> - <flag name='hdf'>Add support for the Hierarchical Data Format v.4</flag> - <flag name='gshhs'>Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag> - - <flag name='grib'>Add support for the meteorological GRIB format with <pkg>sci-libs/grib_api</pkg></flag> - <flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag> - <flag name='udunits'>Add support for manipulating units of physical quantities</flag> -</use> + <use> + <flag name="eigen">Build matrix manipulation with <pkg>dev-cpp/eigen</pkg></flag> + <flag name="hdf">Add support for the Hierarchical Data Format v.4</flag> + <flag name="gshhs">Add support for projection adn continent maps with <pkg>sci-geosciences/gshhs-data</pkg></flag> + <flag name="grib">Add support for the meteorological GRIB format with <pkg>sci-libs/grib_api</pkg></flag> + <flag name="proj">Add support for <pkg>sci-libs/proj</pkg> (geographic projections)</flag> + <flag name="udunits">Add support for manipulating units of physical quantities</flag> + </use> </pkgmetadata> 1.48 dev-lang/gdl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/ChangeLog?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/ChangeLog?r1=1.47&r2=1.48 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 8 Apr 2015 08:22:09 -0000 1.47 +++ ChangeLog 7 May 2015 15:33:32 -0000 1.48 @@ -1,6 +1,15 @@ # ChangeLog for dev-lang/gdl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.47 2015/04/08 08:22:09 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/ChangeLog,v 1.48 2015/05/07 15:33:32 jlec Exp $ + +*gdl-0.9.5 (07 May 2015) + + 07 May 2015; Justin Lecher <[email protected]> +files/0.9.4-plplot.patch, + +files/0.9.4-python2.patch, +files/0.9.5-antlr.patch, +files/0.9.5-png.patch, + +files/0.9.5-proj4.patch, +files/0.9.5-testsuite.patch, +gdl-0.9.5.ebuild, + gdl-0.9.4.ebuild, metadata.xml: + Version Bump; fix compatibility with latest plplot, bug #547380; fix python + support bug #530774 08 Apr 2015; Michał Górny <[email protected]> gdl-0.9.4.ebuild: Drop old Python implementations 1.1 dev-lang/gdl/gdl-0.9.5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/gdl-0.9.5.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gdl/gdl-0.9.5.ebuild?rev=1.1&content-type=text/plain Index: gdl-0.9.5.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/gdl/gdl-0.9.5.ebuild,v 1.1 2015/05/07 15:33:32 jlec Exp $ EAPI=5 WX_GTK_VER="2.8" PYTHON_COMPAT=( python2_7 ) inherit cmake-utils eutils python-r1 wxwidgets toolchain-funcs virtualx DESCRIPTION="GNU Data Language" HOMEPAGE="http://gnudatalanguage.sourceforge.net/"; SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="+eigen fftw grib gshhs hdf hdf5 imagemagick netcdf openmp png proj postscript python static-libs udunits wxwidgets" RDEPEND=" sci-libs/gsl:0= sci-libs/plplot:0=[-dynamic] sys-libs/ncurses:5= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libX11:0= fftw? ( sci-libs/fftw:3.0= ) grib? ( sci-libs/grib_api:0= ) gshhs? ( sci-geosciences/gshhs-data sci-geosciences/gshhs:0= ) hdf? ( sci-libs/hdf:0= ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) netcdf? ( sci-libs/netcdf ) proj? ( sci-libs/proj ) postscript? ( dev-libs/pslib ) python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) udunits? ( sci-libs/udunits ) wxwidgets? ( x11-libs/wxGTK:2.8[X,-odbc] )" DEPEND="${RDEPEND} >=dev-java/antlr-2.7.7-r5:0[cxx,java,script] virtual/pkgconfig eigen? ( dev-cpp/eigen:3 )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( "${FILESDIR}"/0.9.5-antlr.patch "${FILESDIR}"/0.9.2-include.patch "${FILESDIR}"/0.9.4-plplot.patch #"${FILESDIR}"/0.9.5-testsuite.patch "${FILESDIR}"/0.9.5-png.patch ) 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() { cmake-utils_src_prepare use hdf5 && has_version sci-libs/hdf5[mpi] && export CXX=mpicxx # make sure antlr includes are from system and rebuild the sources with it # https://sourceforge.net/tracker/?func=detail&atid=618685&aid=3465878&group_id=97659 rm -r src/antlr || die einfo "Regenerating grammar" pushd src > /dev/null local i for i in *.g; do antlr ${i} || die ; done popd > /dev/null # 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 } src_configure() { # MPI is still very buggy # x11=off does not compile local mycmakeargs=( -DMPICH=OFF -DBUNDLED_ANTLR=OFF -DX11=ON $(cmake-utils_use fftw) $(cmake-utils_use eigen EIGEN3) $(cmake-utils_use grib) $(cmake-utils_use gshhs) $(cmake-utils_use hdf) $(cmake-utils_use hdf5) $(cmake-utils_use netcdf) $(cmake-utils_use openmp) $(cmake-utils_use png PNGLIB) $(cmake-utils_use proj LIBPROJ4) $(cmake-utils_use postscript PSLIB) $(cmake-utils_use udunits) $(cmake-utils_use wxwidgets) ) if use imagemagick; then if has_version media-gfx/graphicsmagick[cxx]; then mycmakeargs+=( -DGRAPHICSMAGICK=ON -DMAGICK=OFF ) else mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=ON ) fi else mycmakeargs+=( -DGRAPHICSMAGICK=OFF -DMAGICK=OFF ) fi configuration() { mycmakeargs+=( $@ ) cmake-utils_src_configure } configuration -DPYTHON_MODULE=OFF -DPYTHON=OFF use python && python_foreach_impl configuration -DPYTHON_MODULE=ON -DPYTHON=ON } src_compile() { cmake-utils_src_compile use python && python_foreach_impl cmake-utils_src_make } src_test() { # there is check target instead of the ctest to define some LDPATH Xemake -C "${BUILD_DIR}" check } src_install() { cmake-utils_src_install if use python; then installation() { mv src/libgdl.so GDL.so || die python_domodule GDL.so } python_foreach_impl run_in_build_dir installation dodoc PYTHON.txt fi echo "GDL_PATH=\"+${EROOT%/}/usr/share/gnudatalanguage\"" > 50gdl doenvd 50gdl }
