gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 44 deletions

diff --git a/media-libs/ganv/Manifest b/media-libs/ganv/Manifest
index e85c9aee6731..74acf6074296 100644
--- a/media-libs/ganv/Manifest
+++ b/media-libs/ganv/Manifest
@@ -1,5 +1,3 @@
-DIST ganv-1.6.0.tar.bz2 377068 BLAKE2B f78c4783f0188fd163b087c789d50eb67a54a77d26d261d3557fba46a7bee09fc3326204273ad496d6b2ae262368015c3f186c290f2b85e6d5297eeed7596677 SHA512 05900aa63e65646e75f805dfe6ae5901efb19ae31a3f0a6730a713bfaffc47bb93f683879ce2a75093ea09e84a9d3137966b68b4ad307707753dead1df439a09
 DIST ganv-1.8.0.tar.bz2 382822 BLAKE2B 4936b7f87fa7cf17ed86b8165558684f0f59387c9673144d57d8505e41f367735117e9f5b08508dcecb831b77b6bbc6559323417824a9f8defc43c81cc91d469 SHA512 00969879592af11d211ad790b970a8a3765ec0591515af856230e3fc9371b1611f2a4edc73d1fc59371a4c4a49c7479f279dc6f298d843296e6707cd2d495af4
-EBUILD ganv-1.6.0-r1.ebuild 987 BLAKE2B 228b9642a9eaf93b06f90ef12c3aadce32fa4e493afd901c5c9ed1279d3714753cc283565cbb822b728834a0d432c0f9a59fbb67e841de324d8c9acf222535fc SHA512 8ac137065435e1e5ceb7a5be97cd8bbd7682869e848c4307b78c2a15b94559613189b68a63197c16ba2e132b564093b87e561a85084ac87ac9e9448f61da302c
-EBUILD ganv-1.8.0.ebuild 989 BLAKE2B 61b0c5760462c2c51edb417f2ad02624f60563e735b95f5e6dc68610e7e1ad8e2c89147792dabcac6fbf084e7c1706ede8179569be9b806603afcb7b9d07a18a SHA512 805ec99663db18953bb323f00bf5474d378ad46e125d90e51af836eab94ee667a59d8825b7bcaf5e12c52c0c45b80687db8d67605a88c47ae9f18768aaedb084
+EBUILD ganv-1.8.0.ebuild 987 BLAKE2B a019168597a0f53d2bcc7622df85573f09865cf533b2f50c2f03c718a5b6d57907511081d258d794de197aa2ee1af5a32bc344d7d958f32be71e7c179abf76df SHA512 b775cac5f042ba88699175e7bf61e64eda654c7b32b5ca7ab7146927c1bd16b9d1c124ca29c44a42a53659cd6e91dea8f5cdca874713dbc68b9acf39f78c2055
 MISC metadata.xml 356 BLAKE2B 0ca0ad63495c9f314c3fe7bfc48a7538d07ad65f9b772996b86ffc268420bf9548002a920a9a7f53f25984c309fc50d9a1735281dd18421a82cef913e10d49da SHA512 f2b5f01deb2f8d879b4a4107571ac469caf163bd2c44a066b8758a9596445f0baaa125b5e3ea883008221aee90d98982222b40b43c10f694d2672842bc1103ef
diff --git a/media-libs/ganv/ganv-1.6.0-r1.ebuild b/media-libs/ganv/ganv-1.6.0-r1.ebuild
deleted file mode 100644
index 28aa4c0f5514..000000000000
--- a/media-libs/ganv/ganv-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils flag-o-matic waf-utils python-any-r1
-
-DESCRIPTION="A GTK+ widget for interactive graph-like environments"
-HOMEPAGE="http://drobilla.net/software/ganv/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fdgl +graphviz introspection nls"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	x11-libs/gtk+:2
-	graphviz? ( media-gfx/graphviz[gtk] )
-	introspection? (
-		app-text/yelp-tools
-		dev-libs/gobject-introspection:=[doctool] )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	nls? ( virtual/libintl )
-"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	waf-utils_src_configure \
-		$(use graphviz || echo "--no-graphviz") \
-		$(use fdgl || echo "--no-fdgl") \
-		$(use nls || echo "--no-nls") \
-		$(use introspection && echo "--gir")
-}
diff --git a/media-libs/ganv/ganv-1.8.0.ebuild b/media-libs/ganv/ganv-1.8.0.ebuild
index a71cd3506df1..58367e54c0b2 100644
--- a/media-libs/ganv/ganv-1.8.0.ebuild
+++ b/media-libs/ganv/ganv-1.8.0.ebuild
@@ -12,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="