gentoo resync : 15.12.2019

3 files changed, 24 insertions, 27 deletions

diff --git a/sci-libs/xgks-pmel/Manifest b/sci-libs/xgks-pmel/Manifest
index 382d817069ab..bb33fa47529c 100644
--- a/sci-libs/xgks-pmel/Manifest
+++ b/sci-libs/xgks-pmel/Manifest
@@ -1,4 +1,4 @@
-AUX aclocal.patch 3851 BLAKE2B c8ffc8621b9453dfc905909d9e44b24d4a4be5cd92e7cab917199e810cee510719f4c34c0d0e72ab509a4036cf99252c5d5e9118f9226b2a502ed7a612499772 SHA512 f926c8f1b30dc7f960442f53b9f5facf8d9083e378c896e765284565e9b871434967a77b82303e5bbdbb62ca140cccf65f9a8e5e07a2cfc726a7317eb7706b45
+AUX aclocal.patch 3632 BLAKE2B 09c84b06a83821cb8bc8131963e3c9c384883bb0f7c2fd30fb98c4d72f934e118c76b482df52abc72910f2ede5327cfbe5599817c45f3adcec1eeae775db1429 SHA512 ec3d6bf45993cf180b98898cafc3dc72f0ecc5c4868d5e5c478cac1c5748e812609a2ff3f1981a11c0eb1830ef5f1aefad6d88d3db7aaee184d8b95fad7f927e
 DIST xgks-pmel-2.5.5.tar.gz 1006581 BLAKE2B d44a956080382a7cb9758d54bc16528007a1b06abdb591cdff5cbdec4a292122916ff38503baca7ffb5a059eab21f26e5d9d6d71720a484201027032a62bf721 SHA512 001ef5742ebd93534569d650833ef04a82b01de819ceb2c3d3c750df58fd5bf9bbd538a79370b1d553db54477f409f6ab24958d3708260fb9ba7c8894ceb91c8
-EBUILD xgks-pmel-2.5.5.ebuild 1749 BLAKE2B ebf8c3069324080c8c18a1213d8e6370940d89c3538f229a9038d0655a11051227dd98dbf61f35098d1308eca3cdc987395d62f54a606353d1d0ada78f012b37 SHA512 9644d831b3d1ccba28389ded8716580e659008de0306ca4d2e2a70775dfc7219e2b02f33d41fc7112de18b7b872931212b36a86fe80383fb308c7819feddbe00
+EBUILD xgks-pmel-2.5.5.ebuild 1732 BLAKE2B a6590192ebf7ac1893b2c6ddf6527186a5a295faa3db29bffc8da7dd8f91edaa3c19794705bfe2a5493570300c9fa2f33f4e683b94ee89d5c3a4597d4add82da SHA512 099ae50b9dfc64b7ca8da8f74a4ec8279c19a46c2e74958f8e56f87d7dd8d4375b417d9bca6a893099403b6bda4c5386bb26ca7e95c276d27fa90db3356b2840
 MISC metadata.xml 495 BLAKE2B 86505d7994404c5ea76044d131939ea16a845728eda3730e7397d8b79d48312cca1a71a748684b7414ba8e61bb323ad16f639cea1439c5e5cf0c62deed10f337 SHA512 2adc6d6866325d603ad8e0cf2b4f0175f0dbaefbdffd1081b5742f2a5951c342ab5031e01cf29f52e4d090f0bb0d495eb4c289e21116caec377de62878df50dc
diff --git a/sci-libs/xgks-pmel/files/aclocal.patch b/sci-libs/xgks-pmel/files/aclocal.patch
index 48d44d747647..dbedb2e49f29 100644
--- a/sci-libs/xgks-pmel/files/aclocal.patch
+++ b/sci-libs/xgks-pmel/files/aclocal.patch
@@ -1,5 +1,5 @@
---- port/aclocal.m4.orig	2009-04-26 13:33:51.434402251 -0700
-+++ port/aclocal.m4	2009-04-26 13:43:33.466651210 -0700
+--- a/port/aclocal.m4
++++ b/port/aclocal.m4
 @@ -582,26 +582,6 @@
  ])])
  
@@ -122,8 +122,8 @@
  # Check for udres(3) library.
  #
  define([UC_LIB_UDRES], [dnl
---- port/configure.in.orig	2009-04-26 13:34:08.430308009 -0700
-+++ port/configure.in	2009-04-26 13:44:26.218430537 -0700
+--- a/port/configure.in
++++ b/port/configure.in
 @@ -24,8 +24,6 @@
  UC_PROG_FORTC
  UC_PROG_NEQN
@@ -133,8 +133,8 @@
  UC_PROG_INSTALL
  
  UC_UDPOSIX
---- port/master.mk.in.orig	2009-04-26 13:34:18.848400960 -0700
-+++ port/master.mk.in	2009-04-26 13:45:03.187651071 -0700
+--- a/port/master.mk.in
++++ b/port/master.mk.in
 @@ -19,8 +19,6 @@
  INSTALL_DATA	= @INSTALL_DATA@
  INSTALL_PROGRAM	= @INSTALL_PROGRAM@
diff --git a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
index a329866fa003..cc8aa0b44b78 100644
--- a/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
+++ b/sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils fortran-2 toolchain-funcs multilib
+inherit fortran-2 toolchain-funcs
 
 DESCRIPTION="PMEL fork of XGKS, an X11-based version of the ANSI Graphical Kernel System"
 HOMEPAGE="http://www.gentoogeek.org/viewvc/Linux/xgks-pmel/"
@@ -14,15 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
-RDEPEND="
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-apps/groff"
 
-src_prepare() {
-	epatch "${FILESDIR}"/aclocal.patch
-}
+PATCHES=( "${FILESDIR}"/aclocal.patch )
 
 src_configure() {
 	sed -i -e "s:lib64:$(get_libdir):g" port/master.mk.in \
@@ -40,28 +38,27 @@ src_compile() {
 
 	# Fails parallel build, bug #295724
 	emake -j1
-
-	cd src/fortran
-	emake -j1
+	emake -C src/fortran -j1
 }
 
 src_install() {
-	cd "${S}"/progs
-
-	for tool in {defcolors,font,mi,pline,pmark}; do
+	pushd progs >/dev/null || die
+	local tool
+	for tool in defcolors font mi pline pmark; do
 		newbin ${tool} xgks-${tool}
 	done
+	popd >/dev/null || die
 
-	cd "${S}"
 	dolib.a src/lib/libxgks.a
 
-	dodoc COPYRIGHT HISTORY INSTALL README
+	dodoc COPYRIGHT HISTORY README
 	doman doc/{xgks.3,xgks_synop.3}
 	if use doc; then
 		newdoc doc/binding/cbinding.me cbinding
 		newdoc doc/userdoc/userdoc.me userdoc
-		insinto /usr/share/doc/${P}/examples
-		doins progs/{hanoi.c,star.c}
+
+		docinto examples
+		dodoc progs/{hanoi.c,star.f}
 	fi
 
 	insinto /usr/include/xgks