commit: e3cfb450bae23266b729bcf1db8bce1a6bdf8ad9 Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Apr 14 16:20:05 2015 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Apr 14 16:20:05 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=e3cfb450
Package release Package-Manager: portage-2.2.14 sci-visualization/labplot/ChangeLog | 9 +++++-- .../labplot/files/labplot-9999-liborigin2.patch | 12 --------- sci-visualization/labplot/labplot-2.0.2.ebuild | 30 ++++++++++++++++++++++ sci-visualization/labplot/labplot-9999.ebuild | 27 ++++++++----------- 4 files changed, 47 insertions(+), 31 deletions(-) diff --git a/sci-visualization/labplot/ChangeLog b/sci-visualization/labplot/ChangeLog index e046a74..bd4df8c 100644 --- a/sci-visualization/labplot/ChangeLog +++ b/sci-visualization/labplot/ChangeLog @@ -1,8 +1,13 @@ # ChangeLog for sci-visualization/labplot -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*labplot-2.0.2 (14 Apr 2015) + + 14 Apr 2015; Andreas K. Hüttel <[email protected]> +labplot-2.0.2.ebuild, + -files/labplot-9999-liborigin2.patch, labplot-9999.ebuild: + Package release + 06 Jan 2014; Justin Lecher <[email protected]> labplot-9999.ebuild, metadata.xml: Bump EAPI - diff --git a/sci-visualization/labplot/files/labplot-9999-liborigin2.patch b/sci-visualization/labplot/files/labplot-9999-liborigin2.patch deleted file mode 100644 index 1af610b..0000000 --- a/sci-visualization/labplot/files/labplot-9999-liborigin2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN labplot.orig/CMakeLists.txt labplot/CMakeLists.txt ---- labplot.orig/CMakeLists.txt 2012-01-21 15:09:43.792562578 +0100 -+++ labplot/CMakeLists.txt 2012-01-21 15:13:07.421573963 +0100 -@@ -105,7 +105,7 @@ - - ### OPJ ##################################### - FIND_LIBRARY(OPJ_LIBRARY -- NAMES origin -+ NAMES origin origin2 - ) - IF(OPJ_LIBRARY) - MESSAGE ("-- Found liborigin library: ${OPJ_LIBRARY}") diff --git a/sci-visualization/labplot/labplot-2.0.2.ebuild b/sci-visualization/labplot/labplot-2.0.2.ebuild new file mode 100644 index 0000000..8906e96 --- /dev/null +++ b/sci-visualization/labplot/labplot-2.0.2.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +if [[ "${PV}" != "9999" ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + inherit kde4-base +else + EGIT_REPO_URI="git://anongit.kde.org/labplot" + inherit kde4-base git-r3 +fi + +MY_PN=LabPlot +MY_P=${MY_PN}-${PV} + +DESCRIPTION="KDE data analysis and visualisation program" +HOMEPAGE="https://edu.kde.org/applications/science/labplot/"; + +LICENSE="GPL-2" +SLOT="4" +KEYWORDS="" +IUSE="" + +DEPEND=" + sci-libs/gsl +" +RDEPEND="$DEPEND" diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild index fbf5b0f..8906e96 100644 --- a/sci-visualization/labplot/labplot-9999.ebuild +++ b/sci-visualization/labplot/labplot-9999.ebuild @@ -1,19 +1,23 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -inherit subversion kde4-base +if [[ "${PV}" != "9999" ]]; then + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + inherit kde4-base +else + EGIT_REPO_URI="git://anongit.kde.org/labplot" + inherit kde4-base git-r3 +fi MY_PN=LabPlot MY_P=${MY_PN}-${PV} DESCRIPTION="KDE data analysis and visualisation program" -HOMEPAGE="http://labplot.sourceforge.net/"; - -# SRC_URI="http://prdownloads.sourceforge.net/${PN}/${MY_P}.tar.gz"; -ESVN_REPO_URI="https://labplot.svn.sourceforge.net/svnroot/labplot/2.0/"; +HOMEPAGE="https://edu.kde.org/applications/science/labplot/"; LICENSE="GPL-2" SLOT="4" @@ -21,17 +25,6 @@ KEYWORDS="" IUSE="" DEPEND=" - sci-libs/cdf sci-libs/gsl - sci-libs/hdf5 - sci-libs/liborigin - sci-libs/netcdf " RDEPEND="$DEPEND" - -S=${WORKDIR}/${PN} - -PATCHES=( "${FILESDIR}/${P}-liborigin2.patch" ) - -# this is partly hardwired in the build system :( -CMAKE_BUILD_DIR=${S}/build
