commit: f34a463a52fe83ffed114664b6626ab78896daef Author: MarcvdSluys <git <AT> vandersluys <DOT> nl> AuthorDate: Sat Nov 21 12:19:10 2020 +0000 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> CommitDate: Thu Dec 31 17:13:41 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f34a463a
sci-libs/pg2plplot: sci-libs/pg2plplot: version bump. Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: MarcvdSluys <git <AT> vandersluys.nl> Closes: https://bugs.gentoo.org/755812 Closes: https://github.com/gentoo/sci/pull/988 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> sci-libs/pg2plplot/pg2plplot-0.3.1.ebuild | 39 ---------------------- ...plplot-0.2.0.ebuild => pg2plplot-5.13.0.ebuild} | 21 +++++++----- 2 files changed, 12 insertions(+), 48 deletions(-) diff --git a/sci-libs/pg2plplot/pg2plplot-0.3.1.ebuild b/sci-libs/pg2plplot/pg2plplot-0.3.1.ebuild deleted file mode 100644 index 139ac426e..000000000 --- a/sci-libs/pg2plplot/pg2plplot-0.3.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -FORTRAN_STANDARD=90 - -inherit cmake-utils fortran-2 - -DESCRIPTION="Assist the transition from PGPlot to PLplot in Fortran programs" -HOMEPAGE="http://pg2plplot.sourceforge.net"; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="X png postscript static-libs" - -DEPEND="sci-libs/plplot[fortran]" - -# If USE="png" or "postscript", ensure PLplot has USE="cairo": -RDEPEND="${DEPEND} - sci-libs/plplot[fortran,X?] - png? ( sci-libs/plplot[cairo] ) - postscript? ( sci-libs/plplot[cairo] )" - -DOCS=( CHANGELOG README VERSION ) - -src_prepare() { - sed -i -e "s:/usr:${EPREFIX}/usr:g" CMake/CMakeLocations.cmake || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use static-libs CREATE_STATICLIB) - ) - cmake-utils_src_configure -} diff --git a/sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild b/sci-libs/pg2plplot/pg2plplot-5.13.0.ebuild similarity index 58% rename from sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild rename to sci-libs/pg2plplot/pg2plplot-5.13.0.ebuild index 7810ecee6..5b5373e58 100644 --- a/sci-libs/pg2plplot/pg2plplot-0.2.0.ebuild +++ b/sci-libs/pg2plplot/pg2plplot-5.13.0.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit cmake-utils fortran-2 +CMAKE_BUILD_TYPE=Release +inherit cmake fortran-2 +CMAKE_MAKEFILE_GENERATOR="emake" DESCRIPTION="Assist the transition from PGPlot to PLplot in Fortran programs" HOMEPAGE="http://pg2plplot.sourceforge.net"; @@ -14,19 +16,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X png postscript static-libs" -DEPEND="sci-libs/plplot[fortran]" +DEPEND="virtual/fortran + sci-libs/plplot[fortran]" # If USE="png" or "postscript", ensure PLplot has USE="cairo": RDEPEND="${DEPEND} - sci-libs/plplot[fortran,X?] - png? ( sci-libs/plplot[cairo] ) - postscript? ( sci-libs/plplot[cairo] )" + sci-libs/plplot[fortran,X?] + png? ( sci-libs/plplot[cairo] ) + postscript? ( sci-libs/plplot[cairo] )" src_configure() { local mycmakeargs=( - $(cmake-utils_use static-libs CREATE_STATICLIB) + -DCREATE_STATICLIB="$(usex static-libs)" ) - cmake-utils_src_configure + cmake_src_configure } DOCS="CHANGELOG README VERSION"
