From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3CA7E1387B1 for ; Mon, 21 Sep 2015 19:06:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92F9221C057; Mon, 21 Sep 2015 19:05:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D289621C056 for ; Mon, 21 Sep 2015 19:05:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFA3D3408E5 for ; Mon, 21 Sep 2015 19:05:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74FAE23F for ; Mon, 21 Sep 2015 19:05:44 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1442861657.55066272be3a52a2cb2c012c201537c6ee4782cd.jlec@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 X-VCS-Directories: sci-mathematics/netgen/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 55066272be3a52a2cb2c012c201537c6ee4782cd X-VCS-Branch: master Date: Mon, 21 Sep 2015 19:05:44 +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-Archives-Salt: 9a2410bb-6cb6-4613-ae27-db52470113b1 X-Archives-Hash: 119d3deadbe6e67267b106f59b7021cf commit: 55066272be3a52a2cb2c012c201537c6ee4782cd Author: Justin Lecher gentoo org> AuthorDate: Mon Sep 21 18:54:17 2015 +0000 Commit: Justin Lecher gentoo 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 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