[gentoo-commits] proj/sci:master commit in: sci-libs/matc/

[Andrew Ammerlaan]

commit:     94800e0db0d66b5f75f269120efe541c32ced605
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Jan 30 12:06:55 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat Jan 30 12:06:55 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=94800e0d

sci-libs/matc: remove pack, included in elmer-fem

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-libs/matc/matc-6.0_p4651.ebuild | 43 -------------------------------------
 sci-libs/matc/matc-8.0.ebuild       | 40 ----------------------------------
 sci-libs/matc/matc-9.0.ebuild       | 21 ++++++++++++++++++
 sci-libs/matc/matc-9999.ebuild      | 30 ++++----------------------
 4 files changed, 25 insertions(+), 109 deletions(-)

diff --git a/sci-libs/matc/matc-6.0_p4651.ebuild b/sci-libs/matc/matc-6.0_p4651.ebuild
deleted file mode 100644
index c0234a2ef..000000000
--- a/sci-libs/matc/matc-6.0_p4651.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-SRC_URI="
-	http://elmerfem.svn.sourceforge.net/viewvc/${ELMER_ROOT}/release/${PV%_p*}/${MY_PN}/?view=tar&pathrev=4651 -> ${P}.tar.gz
-	doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf )
-	autotools-utils_src_install
-}

diff --git a/sci-libs/matc/matc-8.0.ebuild b/sci-libs/matc/matc-8.0.ebuild
deleted file mode 100644
index 8b7686f8d..000000000
--- a/sci-libs/matc/matc-8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-SRC_URI="
-	https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc debug static-libs"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/elmerfem-release-${PV}/${PN}"
-
-#PATCHES=( "${FILESDIR}"/${P}-shared.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf )
-	autotools-utils_src_install
-}

diff --git a/sci-libs/matc/matc-9.0.ebuild b/sci-libs/matc/matc-9.0.ebuild
new file mode 100644
index 000000000..3c8ea0923
--- /dev/null
+++ b/sci-libs/matc/matc-9.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library"
+HOMEPAGE="https://www.csc.fi/web/elmer"
+SRC_URI="https://github.com/ElmerCSC/elmerfem/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/elmerfem-release-${PV}/${PN}"

diff --git a/sci-libs/matc/matc-9999.ebuild b/sci-libs/matc/matc-9999.ebuild
index 7c520a9ff..c7862ce7a 100644
--- a/sci-libs/matc/matc-9999.ebuild
+++ b/sci-libs/matc/matc-9999.ebuild
@@ -1,24 +1,16 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils git-r3
-
-ELMER_ROOT="elmerfem"
-MY_PN=${PN/elmer-/}
+inherit cmake git-r3
 
 DESCRIPTION="Finite element programs, libraries, and visualization tools - math C library"
-HOMEPAGE="http://www.csc.fi/english/pages/elmer"
-SRC_URI="doc? ( http://www.nic.funet.fi/pub/sci/physics/elmer/doc/MATCManual.pdf )"
-EGIT_REPO_URI="https://github.com/ElmerCSC/elmerfem.git git://github.com/ElmerCSC/elmerfem.git"
+HOMEPAGE="https://www.csc.fi/web/elmer"
+EGIT_REPO_URI="https://github.com/ElmerCSC/elmerfem.git"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="doc debug static-libs"
 
 RDEPEND="
 	sys-libs/ncurses:0=
@@ -26,17 +18,3 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/${PN}"
-
-#PATCHES=( "${FILESDIR}"/${PN}-6.0_p4651-shared.patch )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with debug)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	use doc && DOCS=( "${DISTDIR}"/MATCManual.pdf )
-	autotools-utils_src_install
-}