From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 15 Dec 2019 18:09:03 +0000
Subject: gentoo resync : 15.12.2019

---
 sci-electronics/netgen/Manifest             |  2 +-
 sci-electronics/netgen/netgen-1.4.52.ebuild | 49 +++++++----------------------
 2 files changed, 13 insertions(+), 38 deletions(-)

(limited to 'sci-electronics/netgen')

diff --git a/sci-electronics/netgen/Manifest b/sci-electronics/netgen/Manifest
index bf5b6324712e..a91f7cd10638 100644
--- a/sci-electronics/netgen/Manifest
+++ b/sci-electronics/netgen/Manifest
@@ -1,5 +1,5 @@
 AUX netgen-1.3.10-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 AUX netgen-1.4.40-tcl-bin-name.patch 520 BLAKE2B 313fe29ce7f77c2af6a401a1953393e7baaa263ade4254645959b376f8c9663b3733d5bed201cb658c08635948e7bd1f3403632e4b45c5ae7cc94c58d76a84e7 SHA512 f7f89e1506806b37c9b54a12ca16d95a1f9bd6296c42bc813902151d048e5a58258941f454a0d73f12c146f2792bc972bc64dd503b899ca2ccc16bdf65ea86c0
 DIST netgen-1.4.52.tgz 408225 BLAKE2B 49b19832a9f3fa22eca82846f4cca0774c8ba8f0a342a350ef5bc8ffa72f5ccfc6917876c9d8cad3c9b25ad2923ec24d7e8d88e099dda79c6139680ebb84b767 SHA512 ecee6243181e90fbd277c1315b28c34539ebdf254a03544819dbeffe8ddd22fb7ca76c783364bbf97bfbf269cbb446dd6e16f95621774a6cbaa83f0e0b6dd703
-EBUILD netgen-1.4.52.ebuild 1048 BLAKE2B 024c1024692ef196993ef8d3169d54d73a57fb9e8adb15bd5ba4dc0284d9ea77fa8542b0e6357c4fa1594dacd0b77c60bd32d400747ccbf5be178eb931d38f64 SHA512 4fa6fcd208294ae47c4da52c1de3cd2bd140ca62f03123ed2cb705308157aac4590e39a4356827cb90618b12b0775921eac149034ddd5a61dd8e4446f26659ec
+EBUILD netgen-1.4.52.ebuild 691 BLAKE2B c3137571535fd1ad3513c10233d8c167f775317890c96573ce0fa3670649c27f2f00c8a79111704d8df6aac406d26499aca21f3b1257b1831c4cf5d89380c294 SHA512 eba6b310c10aee3c115527c79976e261d69a23af27c8bebd7790de4bb255b98b8f7d03882a6b447589dd59f8168aa9f4cf1a4db8d759d7eaa5ea78653778be7c
 MISC metadata.xml 651 BLAKE2B 4b8a58aef65f71f42a2b42e14369cc225e4053459014f3c31f98d3911b257c17040cae3e30ad83b603dff4ea14aba679b6e192b28c0b87cf8ce57e2fe669589f SHA512 bbbc71b7341a278582f2ca5547018ba250007470f1e5f09e4202060ab8ea3e7404698deaba6863c6cc44ded5b8095ee743778544a654bda1cd8d57d087c17225
diff --git a/sci-electronics/netgen/netgen-1.4.52.ebuild b/sci-electronics/netgen/netgen-1.4.52.ebuild
index 0c90872fda8b..c07ac1310bcb 100644
--- a/sci-electronics/netgen/netgen-1.4.52.ebuild
+++ b/sci-electronics/netgen/netgen-1.4.52.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="LVS tool (layout versus schematic comparison)"
 HOMEPAGE="http://www.opencircuitdesign.com/netgen/index.html"
@@ -14,46 +12,23 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="X"
 
-DEPEND="X? (
+DEPEND="
+	X? (
 		dev-lang/tcl:0
 		dev-lang/tk:0
-		x11-libs/libX11 )"
+		x11-libs/libX11
+	)"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.40-tcl-bin-name.patch
-
-	if $(use X) ; then
-		cp -r "${S}" "${WORKDIR}"/with-x || die
-	fi
-}
+PATCHES=( "${FILESDIR}"/${PN}-1.4.40-tcl-bin-name.patch )
 
 src_configure() {
-	cd scripts
-	econf --without-x
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x/scripts || die
-		econf --with-x
-	fi
-}
-
-src_compile() {
-	emake
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x || die
-		emake
-	fi
+	cd scripts || die
+	econf $(use_with X x)
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-
-	if $(use X) ; then
-		cd "${WORKDIR}"/with-x || die
-		emake DESTDIR="${D}" DOCDIR=/usr/share/doc/${PF} install
-	fi
-
-	dodoc Changes README TO_DO
+	emake DESTDIR="${D}" DOCDIR="${EPREFIX}"/usr/share/doc/${PF} install
+	einstalldocs
+	dodoc Changes TO_DO
 }
-- 
cgit v1.2.3