gentoo resync : 15.01.2020

3 files changed, 15 insertions, 13 deletions

diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index e3920040b37f..a3023e9c1d37 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,4 +1,4 @@
-AUX ganv-1.4.2-no-fdgl.patch 775 BLAKE2B f89f72f91941325ce8912f8f107dd36c2519dda6837e1103a23a2c2cb085c55795cedc38a14667d2f59a1a326420215f1fe3e62a09cebb8ffcd54aa88177e6e2 SHA512 760d5332df51f91f4045d80a21f8d06e08578dda8ddf383d0ff2cbd150cb0553db253b6cb8b9d45cc6c8bbdccf97c11fd164babf42965809110c452e2e8243c5
+AUX ganv-1.4.2-no-fdgl.patch 843 BLAKE2B ae7007f466712536681a5736d73e585315a6129538642fb20676fb967aa978bb3f4acbd61be6652b2918bbff235faa4c2e6f38cd96158e3f04ee13a784c82f62 SHA512 94f0cf7536ae6ae844088cabce0a22caa61113145c51332fda0831878af23267d24780416e2157eb6b50e9690deb508b9474c9b50b08186fb367406a896de55c
 DIST ganv-1.4.2.tar.bz2 175510 BLAKE2B 4e6d7e411c78a516ea6603245ae13787607591b061d3856f305bcc4731f27ef46897d032a9b8a1f672776b41351823f89a2ddfeac40b47f584dbf638af79d466 SHA512 0609dea81cceb0c560286ad2f132f318c2d583af5163dcea4511155e78a022248dcb7ae535233493bdf906fb036422ebd4368d688123f3e1676c4e0398cbc6c2
-EBUILD ganv-1.4.2.ebuild 1025 BLAKE2B b95c91f7e4849cfb0978d2303ab5144930dfa5855252bb95bf15e28c64b04b3493c02712380fb34b60ea0f7c9ca1ec79c02a99f5d8615d133e2aa9363d79a0d5 SHA512 e0a423a6d9347f4232f6ee326c6dbc34e4994e27046a4cefba841b5079050caaba991e8eedec94b32a6c0bee9db43288cf38763e5a420c064a6ec0d4378494ee
+EBUILD ganv-1.4.2-r1.ebuild 1058 BLAKE2B de1464cd90a78ae10ce2ad2ab11ab501a37c7328f7b60520e753cf3c3d9148a76b65d8da86be0cd4c4aee9ed85bb4c2cc22f23f5e3f0f0f0205704055c914c0f SHA512 a8b3f3c1351dba62c362f82fb5f8f5d037994ca8df0d57d53a027865c8d93f915aaf4e6770b1dbb0902c898b72eb1159540b595ab864d5f609449e20cf835a99
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
index 17cc2432d0ec..3fb29a7f0b54 100644
--- a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
+++ b/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
@@ -1,8 +1,8 @@
-Index: src/Canvas.cpp
-===================================================================
---- src/Canvas.cpp	(revision 5479)
-+++ src/Canvas.cpp	(revision 5480)
-@@ -760,6 +760,18 @@
+diff --git a/src/Canvas.cpp b/src/Canvas.cpp
+index c01021c..1c66a6c 100644
+--- a/src/Canvas.cpp
++++ b/src/Canvas.cpp
+@@ -760,6 +760,18 @@ GanvCanvasImpl::layout_dot(const std::string& filename)
  }
  #endif
  
@@ -21,7 +21,7 @@ Index: src/Canvas.cpp
  #ifdef GANV_FDGL
  
  inline Region
-@@ -788,18 +800,6 @@
+@@ -788,18 +800,6 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f)
  	b->impl->force = vec_sub(b->impl->force, f);
  }
  
diff --git a/media-libs/ganv/ganv-1.4.2.ebuild b/media-libs/ganv/ganv-1.4.2-r1.ebuild
index dafedc72ffda..3d19184be690 100644
--- a/media-libs/ganv/ganv-1.4.2.ebuild
+++ b/media-libs/ganv/ganv-1.4.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+# oes not work with python3
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
@@ -26,12 +27,13 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	dev-util/glib-utils
 	nls? ( virtual/libintl )
 "
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-fdgl.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-no-fdgl.patch
+)
 
 src_configure() {
 	append-cxxflags -std=c++11