gentoo resync : 22.01.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/dev-libs/girara/Manifest b/dev-libs/girara/Manifest
index 344bd8628960..5308fa6b514e 100644
--- a/dev-libs/girara/Manifest
+++ b/dev-libs/girara/Manifest
@@ -1,6 +1,4 @@
-DIST girara-0.3.4.tar.gz 72981 BLAKE2B 690b8de0e906e43e32b7a1009a04d4bb1d5b029924ea5b85491ec740ba4b4363f8729bd9b8498f1f25309e2eabde6868f41a689ed06dfb6aa36b081676232624 SHA512 1eca68f4f28505d897c2f7cfb8804e67591e8327feb347c66da216d8f764cb0c88028d1c4c162579a882df7db1883b834c97d8488296ea5c0a8f709dfcea1f1a
 DIST girara-0.3.5.tar.xz 60488 BLAKE2B 2d0f2f0635e8e8906810b1425191f5d70b7f9af0985c461bd90654e83d87ad698da225d70064438fed4473295aca8dbd26c4ce1efd96f8a7399e7145b1f8c111 SHA512 e7c5bf887b29767878502224ad45d62e43b3da91bd8e754603256550d4f0126f1493f0fb7473a4ebb8cc5909306564249c6a60e99eba2b0b417b98c728fcdc84
-EBUILD girara-0.3.4.ebuild 1092 BLAKE2B 4799df2f151ed1189ec9595863cf32f753d3855e218d1fa2f4ce4d26538c1397743320f772fa0a9db842b773fb644d7e7654eb8be4c7d8b4e26f1d6b05971cb8 SHA512 91f1a78a23a4685d54d8ece01d4562be77817e3d43b67d0856f32a768c38943399622479cedf39d3791833d6247df8fd144ad94db9a6ce3beaea094270e6656d
-EBUILD girara-0.3.5.ebuild 958 BLAKE2B 8c9f1e35b434b1e3aa68da2afc475470a15c1e705aed9449f327d3aa79355a2c0c7ad93b4697ed9d0e4e2cfb024d99ba3abc17e724acfd0564e620f91c559c83 SHA512 ceeb4f0dfffe372f497af1d452e11d4d418a412742f2e77205a35c81f4d17e166a4a79edbdcca5e2ed83ff12cd62b834b9245e4861aa834bbd1a9d51e0c5ec48
+EBUILD girara-0.3.5.ebuild 957 BLAKE2B 90c9e5fedc9c3c16282fbc18874fa2a9e24dc51a0ba1f2e3a1adf223b75d367304a9862390fabdace5bfb8ac6c499f4a5c75c8e2fe53b2e8577ed8bb4df42ef2 SHA512 34c0367e79967f0fc8d54a701672a3609ae17e74cd5b0ea708e5183292753624bb47881d0c2c409a90112c3f776f9022aa5d95c7f41e1e143927e9330c49a3b9
 EBUILD girara-9999.ebuild 1095 BLAKE2B 698754899258090e0656a5509610de9b1157ce838dfabd7c03ae6163b0082a12fac3ec53efc14214a583e81ded8285fea701c3f41031859f2d95f050f912ff4e SHA512 893ae83c2331343b541c832fbdf281af219ca2ca6172ed7efaf4b558ca1e4f4d0553a29f03d3b405165b4174460bf2d1f876d39a4477437a8ae3cfeb5d45d3c7
 MISC metadata.xml 581 BLAKE2B 25933546f3727c17b48e8bde4136825202d34300d2a3049ceba68afeb7f2b88ea5430240fdbf118229751229c06d31aef3cf28c7e13182d008e56161eff133f2 SHA512 2b6f1590cc60c44d13394afb5c3815c227aff680f94510e5202d2b41614b6854effe32d4ade6ab4b2d36595d36fa636520e88ea514078c23ca881e00d3d7797f
diff --git a/dev-libs/girara/girara-0.3.4.ebuild b/dev-libs/girara/girara-0.3.4.ebuild
deleted file mode 100644
index e77e4d1de042..000000000000
--- a/dev-libs/girara/girara-0.3.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson virtualx
-
-DESCRIPTION="UI library that focuses on simplicity and minimalism"
-HOMEPAGE="https://pwmt.org/projects/girara/"
-
-if [[ ${PV} == *999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	SRC_URI="https://github.com/pwmt/girara/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm x86"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="doc libnotify test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-libs/glib:2
-	 dev-libs/json-c:=
-	 >=x11-libs/gtk+-3.20:3
-	 >=x11-libs/pango-1.14
-	 libnotify? ( x11-libs/libnotify )"
-
-DEPEND="${RDEPEND}
-	 doc? ( app-doc/doxygen )
-	 test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e '/'-Werror.*'/d' meson.build || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Djson=enabled
-		-Ddocs=$(usex doc enabled disabled)
-		-Dnotify=$(usex libnotify enabled disabled)
-		)
-		meson_src_configure
-}
-
-src_test() {
-	virtx meson_src_test
-}
diff --git a/dev-libs/girara/girara-0.3.5.ebuild b/dev-libs/girara/girara-0.3.5.ebuild
index 7962c3a508b0..b16354a30a1f 100644
--- a/dev-libs/girara/girara-0.3.5.ebuild
+++ b/dev-libs/girara/girara-0.3.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/girara/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 LICENSE="ZLIB"