gentoo resync : 25.08.2020

4 files changed, 5 insertions, 55 deletions

diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index 18ffb15b7722..f6d5a2c5c7fa 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,6 +1,4 @@
-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
 DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
-EBUILD ganv-1.4.2-r1.ebuild 1056 BLAKE2B 1f2c2c92f244b04cd2c45fda244c9d45f4ebb483cbf14af2900715152de856e3e35c31c54a68acc12dc54bc72cdff1aa400aeff4c5e745b0582f8ef88b1c6ead SHA512 197393a1a1eb0f37ea3bf571805b014f845d878329ed0d0e4cc385672f1215099ef46ac13abce415a474800105b9725a45456cc497ba358d77ea752f48b19daa
-EBUILD ganv-1.6.0.ebuild 1011 BLAKE2B d4687ad27eacf1692259cfbce92daf28cd85dce5834a98bc12546d0725fe466f1d9b3b7ea1122b8b2a69670f4640fcd41b7e3ba938f99213f1a32f7d5b675017 SHA512 c50c3da14cceb7eeaf334dae40828025f065fa30d6d066349086e1dcc5e5e58173fb9bc23e96e42538360f8814077b048db9c83f6c69f985364d330dbe283fc9
+EBUILD ganv-1.6.0-r1.ebuild 991 BLAKE2B 2e1e77a083e189cc07d7ae283074082b50e6ae81f30c0e6dbdd2eb10b5ff1c1321b915017ee64fbcbba6476fdd2d7acd6bae0f3449a7da0460af445548fd98fa SHA512 b97f6e76a5faa15d68413f41d4333e52ed4858331ee6dc6f87a64449dd62a844b2e03f9d1868be4b1c70d2363fe3c4fa06b4f3ba94ba2e2a40840878c45cfb49
+EBUILD ganv-1.6.0.ebuild 981 BLAKE2B 4e89d763ac96e2d847638c43461844339857395c020a480d9a3c8f832e2d5164235d40ceeed40692bd031f3b1f046256c8e9d21dae4dc04fa2295d8531fd8bab SHA512 7753b095c07a859de04e521d689a1ecddb8d4c23747cdddd30820b0033548bf5972d3e2c94788c1100908e58eec0d3caee44e53c3ebafc3f4290b3b6ace141cd
 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
deleted file mode 100644
index 3fb29a7f0b54..000000000000
--- a/media-libs/ganv/files/ganv-1.4.2-no-fdgl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
- 
-+inline uint64_t
-+get_monotonic_time()
-+{
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+	return g_get_monotonic_time();
-+#else
-+	GTimeVal time;
-+	g_get_current_time(&time);
-+	return time.tv_sec + time.tv_usec;
-+#endif
-+}
-+
- #ifdef GANV_FDGL
- 
- inline Region
-@@ -788,18 +800,6 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f)
- 	b->impl->force = vec_sub(b->impl->force, f);
- }
- 
--inline uint64_t
--get_monotonic_time()
--{
--#if GLIB_CHECK_VERSION(2, 28, 0)
--	return g_get_monotonic_time();
--#else
--	GTimeVal time;
--	g_get_current_time(&time);
--	return time.tv_sec + time.tv_usec;
--#endif
--}
--
- gboolean
- GanvCanvasImpl::layout_iteration()
- {
diff --git a/media-libs/ganv/ganv-1.4.2-r1.ebuild b/media-libs/ganv/ganv-1.6.0-r1.ebuild
index 1928d7753de0..8f7045e0bab4 100644
--- a/media-libs/ganv/ganv-1.4.2-r1.ebuild
+++ b/media-libs/ganv/ganv-1.6.0-r1.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-# oes not work with python3
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE='threads(+)'
 inherit eutils flag-o-matic waf-utils python-any-r1
 
@@ -13,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="
@@ -31,10 +30,6 @@ DEPEND="${RDEPEND}
 	nls? ( virtual/libintl )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-no-fdgl.patch
-)
-
 src_configure() {
 	append-cxxflags -std=c++11
 	waf-utils_src_configure \
diff --git a/media-libs/ganv/ganv-1.6.0.ebuild b/media-libs/ganv/ganv-1.6.0.ebuild
index 516ec4cbc85d..54805ef9a7f8 100644
--- a/media-libs/ganv/ganv-1.6.0.ebuild
+++ b/media-libs/ganv/ganv-1.6.0.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 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
@@ -13,7 +12,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+fdgl +graphviz introspection nls"
 
 RDEPEND="