commit: 87f3353e9c170e07a5f21e2d295e93a2d50f9c7d
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Jan 28 19:26:35 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Jan 28 19:26:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=87f3353e
sci-mathematics/netgen: EAPI bump, add 6.0-beta
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-mathematics/netgen/netgen-4.9.13.ebuild | 77 -------------------
sci-mathematics/netgen/netgen-5.0.0.ebuild | 88 ----------------------
sci-mathematics/netgen/netgen-5.3.1.ebuild | 14 ++--
...{netgen-5.3.1.ebuild => netgen-6.0_beta.ebuild} | 22 +++---
4 files changed, 22 insertions(+), 179 deletions(-)
diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild
b/sci-mathematics/netgen/netgen-4.9.13.ebuild
deleted file mode 100644
index 1e98480e3..000000000
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="Automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://sourceforge.net/projects/netgen/";
-SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade"
-
-DEPEND="
- dev-tcltk/tix
- dev-tcltk/togl:1.7
- virtual/opengl
- x11-libs/libXmu
- opencascade? ( sci-libs/opencascade:* )
- ffmpeg? ( media-video/ffmpeg )
- jpeg? ( virtual/jpeg:0= )
- mpi? ( virtual/mpi ) "
-RDEPEND="${DEPEND}"
-# Note, MPI has not be tested.
-
-src_configure() {
- # This is not the most clever way to deal with these flags
- # but --disable-xxx does not seem to work correcly, so...
- local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
-
- if use opencascade; then
- myconf="${myconf} --enable-occ --with-occ=$CASROOT"
- append-ldflags -L$CASROOT/lin/$(get_libdir)
- fi
-
- use mpi && myconf="${myconf} --enable-parallel"
- use ffmpeg && myconf="${myconf} --enable-ffmpeg"
- use jpeg && myconf="${myconf} --enable-jpeglib"
-
- append-flags -I/usr/include/togl-1.7
-
- econf \
- ${myconf}
-
- # This would be the more elegant way:
-# econf \
-# $(use_enable opencascade occ) \
-# $(use_with opencascade "occ=$CASROOT") \
-# $(use_enable mpi parallel) \
-# $(use_enable ffmpeg) \
-# $(use_enable jpeg jpeglib)
-}
-
-src_install() {
- local NETGENDIR="/usr/share/netgen"
-
- echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" >
./99netgen
- doenvd 99netgen
-
- default
- mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}"
-
- # Install icon and .desktop for menu entry
- doicon "${FILESDIR}"/${PN}.png
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- elog "Please make sure to update your environment variables:"
- elog "env-update && source /etc/profile"
- elog "Netgen ebuild is still under development."
- elog "Help us improve the ebuild in:"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=155424";
-}
diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild
b/sci-mathematics/netgen/netgen-5.0.0.ebuild
deleted file mode 100644
index 639122f31..000000000
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_PN=${PN}-mesher
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
-HOMEPAGE="https://sourceforge.net/projects/netgen/";
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade"
-
-DEPEND="
- dev-tcltk/tix
- dev-tcltk/togl:1.7
- virtual/opengl
- x11-libs/libXmu
- opencascade? ( sci-libs/opencascade:* )
- ffmpeg? ( media-video/ffmpeg )
- jpeg? ( virtual/jpeg:0= )
- mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
-RDEPEND="${DEPEND}"
-# Note, MPI has not be tested.
-
-src_prepare() {
- # Adapted from
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
- epatch "${FILESDIR}/${PN}-5.x-compile-against-occ-6.5.x.patch"
- epatch "${FILESDIR}/${PN}-5.x-missing-define.patch"
- eautoreconf
-}
-
-src_configure() {
- # This is not the most clever way to deal with these flags
- # but --disable-xxx does not seem to work correcly, so...
- sed -i -e 's:-lTogl:-lTogl1.7:' ng/Makefile.am || die
- local myconf="--with-togl=/usr/$(get_libdir)/Togl1.7"
-
- if use opencascade; then
- myconf="${myconf} --enable-occ --with-occ=$CASROOT"
- append-ldflags -L$CASROOT/lin/$(get_libdir)
- fi
- if use mpi; then
- myconf="${myconf} --enable-parallel"
- append-cppflags -I/usr/include/metis
- fi
- use ffmpeg && myconf="${myconf} --enable-ffmpeg"
- use jpeg && myconf="${myconf} --enable-jpeglib"
- append-cppflags -I/usr/include/togl-1.7
-
- econf \
- ${myconf}
-
- # This would be the more elegant way:
-# econf \
-# $(use_enable opencascade occ) \
-# $(use_with opencascade "occ=$CASROOT") \
-# $(use_enable mpi parallel) \
-# $(use_enable ffmpeg) \
-# $(use_enable jpeg jpeglib)
-}
-
-src_install() {
- local NETGENDIR="/usr/share/netgen"
-
- echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" >
./99netgen
- doenvd 99netgen
-
- default
- mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
-
- # Install icon and .desktop for menu entry
- doicon "${FILESDIR}"/${PN}.png
- domenu "${FILESDIR}"/${PN}.desktop
-}
-
-pkg_postinst() {
- elog "Please make sure to update your environment variables:"
- elog "env-update && source /etc/profile"
- elog "Netgen ebuild is still under development."
- elog "Help us improve the ebuild in:"
- elog "https://bugs.gentoo.org/show_bug.cgi?id=155424";
-}
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-5.3.1.ebuild
index 25b4da389..594347da5 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-5.3.1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils flag-o-matic multilib versionator
+inherit autotools flag-o-matic multilib xdg
MY_PN=${PN}-mesher
-MY_PV=$(get_version_component_range 1-2)
+MY_PV=$(ver_cut 1-2)
+
DESCRIPTION="Automatic 3d tetrahedral mesh generator"
HOMEPAGE="https://sourceforge.net/projects/netgen/";
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
@@ -14,7 +15,8 @@
SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade openmp"
+
+IUSE="ffmpeg jpeg mpi opencascade openmp"
DEPEND="
dev-lang/tcl:0
@@ -27,7 +29,8 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
- mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 )
opencascade? ( sci-libs/hdf5[mpi] ) ) "
+ mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 )
opencascade? ( sci-libs/hdf5[mpi] ) )
+"
RDEPEND="${DEPEND}"
# Note, MPI has not be tested.
@@ -111,6 +114,7 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
elog "Please make sure to update your environment variables:"
elog "env-update && source /etc/profile"
elog "Netgen ebuild is still under development."
diff --git a/sci-mathematics/netgen/netgen-5.3.1.ebuild
b/sci-mathematics/netgen/netgen-6.0_beta.ebuild
similarity index 88%
copy from sci-mathematics/netgen/netgen-5.3.1.ebuild
copy to sci-mathematics/netgen/netgen-6.0_beta.ebuild
index 25b4da389..ffdac83dd 100644
--- a/sci-mathematics/netgen/netgen-5.3.1.ebuild
+++ b/sci-mathematics/netgen/netgen-6.0_beta.ebuild
@@ -1,20 +1,22 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools eutils flag-o-matic multilib versionator
+inherit autotools flag-o-matic multilib xdg
MY_PN=${PN}-mesher
-MY_PV=$(get_version_component_range 1-2)
+MY_PV=${PV//_/-}
+
DESCRIPTION="Automatic 3d tetrahedral mesh generator"
HOMEPAGE="https://sourceforge.net/projects/netgen/";
-SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/${MY_PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/${MY_PN}/${MY_PN}/$(ver_cut
1-2)/${PN}-${MY_PV}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~x86"
-IUSE="-ffmpeg jpeg -mpi opencascade openmp"
+
+IUSE="ffmpeg jpeg mpi opencascade openmp"
DEPEND="
dev-lang/tcl:0
@@ -27,24 +29,25 @@ DEPEND="
opencascade? ( sci-libs/opencascade:* )
ffmpeg? ( media-video/ffmpeg )
jpeg? ( virtual/jpeg:0= )
- mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 )
opencascade? ( sci-libs/hdf5[mpi] ) ) "
+ mpi? ( virtual/mpi || ( sci-libs/parmetis <sci-libs/metis-5.0 )
opencascade? ( sci-libs/hdf5[mpi] ) )
+"
RDEPEND="${DEPEND}"
# Note, MPI has not be tested.
PATCHES=(
# Adapted from
http://sourceforge.net/projects/netgen-mesher/forums/forum/905307/topic/5422824
- "${FILESDIR}"/${PN}-5.x-missing-define.patch
+
# Adapted from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_metis.patch
"${FILESDIR}"/${PN}-5.x-metis-fixes.patch
"${FILESDIR}"/${PN}-5.x-occ-stl-api-change.patch
# Adapted from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.1_build.patch
- "${FILESDIR}"/${PN}-5.x-makefiles-fixes.patch
# Adapted from
http://pkgs.fedoraproject.org/cgit/rpms/netgen-mesher.git/tree/netgen-5.3.0_fixes.patch
- "${FILESDIR}"/${PN}-5.x-fedora-fixes.patch
"${FILESDIR}"/${PN}-5.x-includes-fixes.patch
"${FILESDIR}"/${PN}-5.x-parallelmetis4-fix.patch
)
+S="${WORKDIR}/${PN}-${MY_PV}"
+
src_prepare() {
default
if use mpi; then
@@ -111,6 +114,7 @@ src_install() {
}
pkg_postinst() {
+ xdg_pkg_postinst
elog "Please make sure to update your environment variables:"
elog "env-update && source /etc/profile"
elog "Netgen ebuild is still under development."
