commit: 8a5b7678eac9c2f33fbf8d1067ee47d848ddedcb Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Dec 13 17:40:39 2019 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Dec 13 17:40:39 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a5b7678
sci-libs/xgks-pmel: Port to EAPI 7 Closes: https://bugs.gentoo.org/455906 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: David Seifert <soap <AT> gentoo.org> sci-libs/xgks-pmel/files/aclocal.patch | 12 +++++------ sci-libs/xgks-pmel/xgks-pmel-2.5.5.ebuild | 35 ++++++++++++++----------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/sci-libs/xgks-pmel/files/aclocal.patch b/sci-libs/xgks-pmel/files/aclocal.patch index 48d44d74764..dbedb2e49f2 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 a329866fa00..cc8aa0b44b7 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
