From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F04101382C5 for ; Thu, 28 Jan 2021 19:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38686E0ACC; Thu, 28 Jan 2021 19:26:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 13C27E0ACC for ; Thu, 28 Jan 2021 19:26:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C64F8340D28 for ; Thu, 28 Jan 2021 19:26:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6633B476 for ; Thu, 28 Jan 2021 19:26:46 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1611861995.87f3353e9c170e07a5f21e2d295e93a2d50f9c7d.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/ X-VCS-Repository: proj/sci X-VCS-Files: sci-mathematics/netgen/netgen-4.9.13.ebuild sci-mathematics/netgen/netgen-5.0.0.ebuild sci-mathematics/netgen/netgen-5.3.1.ebuild sci-mathematics/netgen/netgen-6.0_beta.ebuild X-VCS-Directories: sci-mathematics/netgen/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 87f3353e9c170e07a5f21e2d295e93a2d50f9c7d X-VCS-Branch: master Date: Thu, 28 Jan 2021 19:26:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 958ea5a8-7006-4fcc-85c2-7cad538c7bbe X-Archives-Hash: 81c79f2b100b15f3b84b2dcb8d67c543 commit: 87f3353e9c170e07a5f21e2d295e93a2d50f9c7d Author: Andrew Ammerlaan riseup net> AuthorDate: Thu Jan 28 19:26:35 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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