gentoo resync : 25.08.2020

3 files changed, 21 insertions, 18 deletions

diff --git a/games-board/cgoban/Manifest b/games-board/cgoban/Manifest
index c08e097d601f..0a5f24e0d921 100644
--- a/games-board/cgoban/Manifest
+++ b/games-board/cgoban/Manifest
@@ -1,4 +1,4 @@
-AUX cgoban-1.9.14-cflags.patch 1053 BLAKE2B c0eaaf1b08fedf89b8eb93e37665f6857b8de6421e4ca8c2c43b318ce7488b2334b88a4b07cecd754fdcb8b0e0bbcf9810fb620df05bf93417a8e0a2efd907be SHA512 fef74fd04ea9001e697f11e615705c45ee8660c905b9049debee88cf13e8657518cbbaba5a814a8874956c305c6c5c73592f62ad9a29389482f9c2bd04b120f7
+AUX cgoban-1.9.14-cflags.patch 920 BLAKE2B e9c03262a68b0cffacbc1aeb92ae5a8f5d0766595d71ca59d875a21528ef2d49508e2b792161e189afaa1faaf9d81fdb260e9024a51b537d843c0da49cdd7386 SHA512 eaefc191dbcd9877bcaf418273f50aca2acd5adf3b4b3f747e7db30e5d942e83c6628cf48e9965226c8b1023a3ae0e780fa29b6e80477451d81008ef43233838
 DIST cgoban-1.9.14.tar.gz 417691 BLAKE2B e6eb97b5368704f5c431b6439faf8a319a586f911843a906215cbfd2c271bad15b4cd9dd9cc28f5bc43b8f76e6d0b46c2e68cf7fd6a07d63fc9e286f48f7a246 SHA512 0a471845dbfb3029c2371ba91375aa19ca23591f355452d87eeef2ed56e948a60aedb21923658e74923f16b40ce00f5d74f40f44facf93695d20615b874b354c
-EBUILD cgoban-1.9.14-r2.ebuild 720 BLAKE2B 99c7f601d3bba2b6964e8266c2181f007d213942faea501572c8b8fe45e0b0f946dc0cb7e9da5b358dcb9807a5138ea407945da9148e9e2c36ca027c94614df0 SHA512 567ae1af4358e2a0e9d2613bac734aec8b08e66a420b715bf29bb720f5cfbad5fd97308a24d8425e21a04a1d8de9404a72ab1da0d1394b836b93e0f4f036fd51
+EBUILD cgoban-1.9.14-r2.ebuild 659 BLAKE2B fa044586bd6837841ef5ba690e6dd95d84096eda241aac2584b262b631605b30b53d5ac5cbfdc5404f3feb3368b9a05056b4c1d7fb697e42e20c6d7040289787 SHA512 b0e172295af13c6518c958c788df1c1b14041bca1f86b2ab0d5e13ea7549d4655d147d77c6abfa107181a5f46cff7a64f1299cc8140256da8c5cb2c0855e0c86
 MISC metadata.xml 330 BLAKE2B f44eb19307bc266f86ef6579284d24583a973b0885e45a9b146ff453c470aea6f6b3d9b4e3a6610075c3522f45ec56dc96f85eac6b1935e8781ecb4692015514 SHA512 70ecac92daf0c24d24deb6bd6ec575d74b078f0ccd9c88108b99b226ffc78d787786f4b39a7888f75f9373712a3f537c12ecf9bb412f76771aa62d004b95ce56
diff --git a/games-board/cgoban/cgoban-1.9.14-r2.ebuild b/games-board/cgoban/cgoban-1.9.14-r2.ebuild
index ad2c9a790a3d..2abce46ebda7 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 a496dbf0602d..cf6d0edfc7ae 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