gentoo resync : 28.04.2021

4 files changed, 29 insertions, 17 deletions

diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index 1eed9a8242c4..e455a402a426 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,10 +1,10 @@
-AUX eboard-1.1.1-as-needed.patch 726 BLAKE2B 658dabc65b610d4a618ef9e5729c8616904abc6c231495f5c3c10b0c8e476699bb119db632c2a36ff3be8386b848bb25f12b8fda3e165ebc162ea2da716d68d6 SHA512 03543a8439eec92169fdc97adffb6f258332593240904636f69fe46d6cca89c63069ac794c9c2d66df64a3e0da579c89f6d5e6944afda10f7b4760da370ca6d9
+AUX eboard-1.1.1-as-needed.patch 654 BLAKE2B 846dd810ea08d5f9679d3292a3908f374dcd2f395cadb38cac21365ed63c85b28c19fd5b539fbaad6d150a9542fee5cca49e5539687f0b71680afc573c8170d2 SHA512 2bf0ec9f35069deeb0d78fee299fdad868a5bfb7dc67501da7e5e28affec92c06fd4a321db62d82e49a6fbc242f0168569057be9fc1bd8b2fc1b8a7f47504c0d
 AUX eboard-1.1.1-gcc44.patch 186 BLAKE2B e07e005b9cd99fef312baeee5d1d996e51c9c371bd8ff2898e8ebdc48f477e5ea90eb49e047d4a6d6369fd791d0a8c5f3a8d1b49f4c0e98264b1634c203688ab SHA512 74642d5990750fe66b04500d76917c08ba20d387bd86f93b2743881834954e6a2a4eb6c2d1030db620aab2f8754daded3f04140acdc11286bb75c5a7c20aa145
 AUX eboard-1.1.1-libpng15.patch 359 BLAKE2B 23c46aadd1d7e62a7a0c02b0baaf481072f922cd07f8efc455f53f55566b221bc43f943b9add694e4333488b5cb3edb76e9310dfeefd073f539b62d99f94ada5 SHA512 20be6a1173314aec40cd5cb84d759699160dd3542aebe554833c4a8b00c44198ecb72b087fb9f828b972f2c2fa35f47853d1a02af20b280d1c41dfccc3cd6599
-AUX eboard-1.1.1-ovflfix.patch 853 BLAKE2B 3f4aca968eb831227ea369a5e0a0d8091c44bfa7885da2f9e39678a1d25daa4ba7abfbbe6a1e90dc0b440769185f276e536bffaf5ae2343d099f7bef530e748f SHA512 8a2e479d0339516269fa407d6ec84da042aab786f6672ee4dc6d6ac60f9524cd32739fd2e75c0271fba601c852b195bac7017c8226e4a2dd97bf3f4ed47d13a4
+AUX eboard-1.1.1-ovflfix.patch 709 BLAKE2B 3637323a80be6aaf42f4e09c4f6e7d73389e369f695515d105c9e77ab87766cd210a0da2fb71d5dec91368de76bb6993a440469f1d26b290b896ab769e6fb566 SHA512 dfcd64b4b54fd159bfc75988fd5a2e2ebdf30d9ee6eea11e86d649c96a977edee16046ddc36a6939ccf19037a7397f8e4e49db0542b940eb6da2a51af8f381ab
 DIST eboard-1.1.1.tar.bz2 462386 BLAKE2B 93d702b24cd647029e50389eab8a1d34ef564d16e426534d925e4bc9596ed7c1055a6c519280580e19a26ae5c3c316030fa950b129e6c4e8f425d3708683826c SHA512 0e124abc786996070464c3d9ef5eafa107b990df7593d774bf302e01e0d07427f2a67bc33ab61a188d2902aa35abb8cec6356e4e088f4a6b40e189556b588704
 DIST eboard-extras-1pl2.tar.gz 361237 BLAKE2B b82911ea1cc4106f50ccc6a678ca0291d6b92549c2ac9890a29e6ff25b20bb436a60d254493279d9ef81503d57edab35423c18b4762066f851844507e254fcf7 SHA512 82243ef37c655d0a5d4bce9655be9b7cba35f4fe4e4edf9951a61baf5e2e0816cb3d8dea95ed61ed4d9fb9242fd31efeec498e055c2f0e2500acb3c7699b4555
 DIST eboard-extras-2.tar.gz 598909 BLAKE2B 4c1696bfd6fd6dd8926d38ea4c349b9f76ae8f1c00152ba69a54f5d58e286432ee50c0f7395eeafbd49905a15b7e6a46e97693d07e1c12a08de19d3bf8827d2b SHA512 e936a4a847b46c057677c0304dde41f0d365cc5f4bd23db39acdb45c6cb53d48fdc188e4f471ef4938a361e7f823c8c391c2b0324c290e1f2d8b5cfe430bb19b
 DIST eboard_1.1.1-4.1.diff.gz 17247 BLAKE2B 282cb7602d82e512ad8378ecf7e9bca54f539a65c85244a2455f2ac3d882897c7911ca5a94e0df5c3fb26a74bacf6ed6ab840435509e83fc07ada5e57b89259f SHA512 8856a69a2bad8639f38d7da97d7b2464f97101c4c2e38a340f5f8dabacbcc9aa12b200f2b669fc98134655f8c7f6d5b79fb3d5f3582135ef9a9b1fd0917c3e4f
-EBUILD eboard-1.1.1-r2.ebuild 1601 BLAKE2B 609fe6c2bb5759ed0a13c8933e60029c8f317021f3622e7f7968557f1ac391e8d8538618469cd5ff6df90f7e4e6118bf292763eab4ed42b03bd354be37062f3b SHA512 86f6a5c92c6143d89cad02a3a9f55ac7d667164fd7c5f2ccda2deabadee27d23b704e6cc54e9869d2b7125e148f3f93f641cb74f4eca1b5d2fa9eeefb17375b1
+EBUILD eboard-1.1.1-r2.ebuild 1799 BLAKE2B 73b18ae50f2cdb1490de60b492062491ab7a4d18f100eeab18eaafe16062a446ad8514d4068b004ea76323797bf383a66e4aad4745011144150ebddb42cf7856 SHA512 fb8b992f820ba51b781fec23140509b93828786e2779cb8d1fb8243775f7a3634fd007699bc8bfdd59dfa60d8a12dfb6a8da1eafa900a9298641cfbea8329eb9
 MISC metadata.xml 329 BLAKE2B 596a8bbc8fd0317bd18db02f1184fa5d5c9edf8189f095836b329305da0bc2ddf5def4a80b0090c58661bc69aba7cab729655a26a7b4831f30c1487453bd8b5c SHA512 291c53cc59c042c10161d9bd7792899796e58dbe3800962f9155c8b8ea88519b9278f7541a85772cd3425ba15641897392a02451467424e8b59d9e7205f33635
diff --git a/games-board/eboard/eboard-1.1.1-r2.ebuild b/games-board/eboard/eboard-1.1.1-r2.ebuild
index b1bc8ad5f823..78fc1bebf651 100644
--- a/games-board/eboard/eboard-1.1.1-r2.ebuild
+++ b/games-board/eboard/eboard-1.1.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
 DEB_V=${PV}-4.1
 EXTRAS1="eboard-extras-1pl2"
@@ -21,11 +21,23 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
+	dev-libs/atk
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	media-libs/fontconfig
+	media-libs/freetype
 	media-libs/libpng:0=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-lang/perl
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}_${DEB_V}.diff
@@ -60,7 +72,7 @@ src_install() {
 	newicon icon-eboard.xpm ${PN}.xpm
 	make_desktop_entry ${PN} ${PN} ${PN}
 
-	cd "${WORKDIR}"/${EXTRAS1}
+	cd "${WORKDIR}"/${EXTRAS1} || die
 	insinto /usr/share/${PN}
 	doins *.png *.wav
 	newins extras1.conf themeconf.extras1
@@ -68,7 +80,7 @@ src_install() {
 	newdoc README README.extras
 	dodoc CREDITS
 
-	cd "${WORKDIR}"/${EXTRAS2}
+	cd "${WORKDIR}"/${EXTRAS2} || die
 	doins *.png *.wav
 	newins extras2.conf themeconf.extras2
 }
diff --git a/games-board/eboard/files/eboard-1.1.1-as-needed.patch b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
index 199dd0e70a2d..bcd1c4564226 100644
--- a/games-board/eboard/files/eboard-1.1.1-as-needed.patch
+++ b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
@@ -1,5 +1,5 @@
---- a/configure	2009-02-03 14:46:21.000000000 +0100
-+++ b/configure	2009-02-03 14:48:13.000000000 +0100
+--- a/configure
++++ b/configure
 @@ -638,7 +638,7 @@
  
  print CONFIGMAKE "CXX       = $cxx\n";
diff --git a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
index b09c4dba880f..60c428d3a292 100644
--- a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
+++ b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
@@ -1,5 +1,5 @@
---- a/proto_xboard.cc	2010-11-03 16:42:15.000000000 +0100
-+++ b/proto_xboard.cc	2010-11-03 16:43:14.000000000 +0100
+--- a/proto_xboard.cc
++++ b/proto_xboard.cc
 @@ -1084,7 +1084,7 @@
    snprintf(EngineCommandLine,512,"crafty bookpath=%s logpath=%s tbpath=%s",
  	   BookPath,LogPath,LogPath);
@@ -9,8 +9,8 @@
    else
      strcpy(EngineRunDir,"/tmp");
  
---- a/util.cc	2010-11-03 16:42:24.000000000 +0100
-+++ b/util.cc	2010-11-03 16:43:42.000000000 +0100
+--- a/util.cc
++++ b/util.cc
 @@ -783,7 +783,7 @@
    int i,n;
    char cmd[1024];