commit: fd72f6ad8626cf82c45b94ac3adffe4e6002f57c Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Jul 5 20:05:38 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Jul 5 20:05:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd72f6ad
games-board/cgoban: Call AM_PROG_AR Closes: https://bugs.gentoo.org/730788 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: David Seifert <soap <AT> gentoo.org> games-board/cgoban/cgoban-1.9.14-r2.ebuild | 15 +++++++-------- games-board/cgoban/files/cgoban-1.9.14-cflags.patch | 20 ++++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/games-board/cgoban/cgoban-1.9.14-r2.ebuild b/games-board/cgoban/cgoban-1.9.14-r2.ebuild index ad2c9a790a3..2abce46ebda 100644 --- a/games-board/cgoban/cgoban-1.9.14-r2.ebuild +++ b/games-board/cgoban/cgoban-1.9.14-r2.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils autotools +EAPI=7 + +inherit autotools desktop DESCRIPTION="A Go-frontend" HOMEPAGE="http://cgoban1.sourceforge.net/"; @@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/cgoban1/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" virtual/imagemagick-tools @@ -25,17 +25,16 @@ PATCHES=( ) src_prepare() { - # ${P}-cflags.patch patches configure.ac, not .in: - mv configure.{in,ac} || die - default - cp cgoban_icon.png ${PN}.png || die + + mv configure.{in,ac} || die eautoreconf } src_install() { default + doicon ${PN}.png make_desktop_entry cgoban Cgoban } diff --git a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch index a496dbf0602..cf6d0edfc7a 100644 --- a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch +++ b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch @@ -1,5 +1,5 @@ ---- a/configure.ac 2012-09-03 18:34:15.358122626 +0200 -+++ b/configure.ac 2012-09-03 18:35:30.279156534 +0200 +--- a/configure.in ++++ b/configure.in @@ -1,8 +1,9 @@ #for autoconf 2.1x start configure script with next three lines @@ -12,9 +12,7 @@ #for autoconf 2.5x start configure script with next four lines # AC_PREREQ(2.50) ---- a/configure.ac 2012-09-03 20:17:48.037549487 +0200 -+++ b/configure.ac 2012-09-03 20:18:00.267371203 +0200 -@@ -146,7 +146,7 @@ +@@ -145,7 +146,7 @@ ###################################################################### export VERSION @@ -23,9 +21,15 @@ AC_PREFIX_DEFAULT(/usr/games) dayNum=`echo $date | awk '{ print $1 }'` ---- a/configure.ac 2012-09-03 20:23:29.174470309 +0200 -+++ b/configure.ac 2012-09-03 20:23:51.895996955 +0200 -@@ -169,7 +169,6 @@ +@@ -160,6 +161,7 @@ + AC_DEFINE_UNQUOTED(DATE,$DATE) + AC_DEFINE_UNQUOTED(DATE_FRENCH,$DATE_FRENCH) + ++AM_PROG_AR + AC_PROG_MAKE_SET + AC_PROG_INSTALL + AC_PROG_CC +@@ -168,7 +170,6 @@ AC_MINIX AC_PROG_CPP AC_EXEEXT
