[gentoo-commits] proj/sci:master commit in: sci-mathematics/netgen/

["Justin Lecher" <jlec@gentoo.org>]

commit:     55066272be3a52a2cb2c012c201537c6ee4782cd
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:54:17 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:54:17 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=55066272

sci-mathematics/netgen: Add subslot operators

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-mathematics/netgen/netgen-4.9.13.ebuild | 21 +++++++++++----------
 sci-mathematics/netgen/netgen-5.0.0.ebuild  | 14 +++++++-------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/sci-mathematics/netgen/netgen-4.9.13.ebuild b/sci-mathematics/netgen/netgen-4.9.13.ebuild
index 2a0d501..fac506b 100644
--- a/sci-mathematics/netgen/netgen-4.9.13.ebuild
+++ b/sci-mathematics/netgen/netgen-4.9.13.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI=5
 
 inherit eutils flag-o-matic multilib versionator
 
-DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
+DESCRIPTION="Automatic 3d tetrahedral mesh generator"
 HOMEPAGE="http://www.hpfem.jku.at/netgen/"
 SRC_URI="mirror://sourceforge/netgen-mesher/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~amd64 ~x86"
 IUSE="-ffmpeg jpeg -mpi opencascade"
-SLOT="0"
 
-DEPEND="dev-tcltk/tix
+DEPEND="
+	dev-tcltk/tix
 	dev-tcltk/togl:1.7
 	virtual/opengl
 	x11-libs/libXmu
-	opencascade? ( sci-libs/opencascade )
+	opencascade? ( sci-libs/opencascade:* )
 	ffmpeg? ( media-video/ffmpeg )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0= )
 	mpi? ( virtual/mpi ) "
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
@@ -60,12 +61,12 @@ src_install() {
 	echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen
 	doenvd 99netgen
 
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 	mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}"
 
 	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/${PN}.png || die "doicon failed"
-	domenu "${FILESDIR}"/${PN}.desktop || die "domenu failed"
+	doicon "${FILESDIR}"/${PN}.png
+	domenu "${FILESDIR}"/${PN}.desktop
 }
 
 pkg_postinst() {

diff --git a/sci-mathematics/netgen/netgen-5.0.0.ebuild b/sci-mathematics/netgen/netgen-5.0.0.ebuild
index 071a89b..96434c2 100644
--- a/sci-mathematics/netgen/netgen-5.0.0.ebuild
+++ b/sci-mathematics/netgen/netgen-5.0.0.ebuild
@@ -12,24 +12,24 @@ DESCRIPTION="NETGEN is an automatic 3d tetrahedral mesh generator"
 HOMEPAGE="http://www.hpfem.jku.at/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"
-SLOT="0"
 
-DEPEND="dev-tcltk/tix
+DEPEND="
+	dev-tcltk/tix
 	dev-tcltk/togl:1.7
 	virtual/opengl
 	x11-libs/libXmu
-	opencascade? ( sci-libs/opencascade )
+	opencascade? ( sci-libs/opencascade:* )
 	ffmpeg? ( media-video/ffmpeg )
-	jpeg? ( virtual/jpeg )
+	jpeg? ( virtual/jpeg:0= )
 	mpi? ( virtual/mpi ( || ( sci-libs/parmetis sci-libs/metis ) ) ) "
 RDEPEND="${DEPEND}"
 # Note, MPI has not be tested.
 
-src_prepare()
-{
+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"
@@ -72,7 +72,7 @@ src_install() {
 	echo -e "NETGENDIR=${NETGENDIR} \nLDPATH=/usr/$(get_libdir)/Togl1.7" > ./99netgen
 	doenvd 99netgen
 
-	emake DESTDIR="${D}" install
+	default
 	mv "${D}"/usr/bin/{*.tcl,*.ocf} "${D}${NETGENDIR}" || die
 
 	# Install icon and .desktop for menu entry