gentoo resync : 17.02.2020

4 files changed, 3 insertions, 109 deletions

diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index e18852d89e7d..db64dd544cff 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,8 +1,4 @@
-DIST mako-1.3.tar.gz 46482 BLAKE2B ea7699f713aded0476f3a9b88d90fa8d3bbd4e64e888caa68a98208625cdd15f1261c389dcb8ab43c6fbc77e1ebc0840b378443a1b350ff16adc59b98b9be0a8 SHA512 efada6ac413d80949669df3124ab9979537dcedd535132de57338b484ff2c81da8da59503a14dc2e9bbb266101659dd1d399d66456d383fdd1853d9137587259
 DIST mako-1.4.1.tar.gz 49442 BLAKE2B aa242d905d33dcfd2e30317a65d3826ba43ad344e93d1f41ed8b28f75310f724ed0eb5ae163f97a441ae07a4bb3465aa01f974cd95f97ba981a907fb761ad3d4 SHA512 25b0f59645c1815d8bdba42cedd6f56163ff663cd801a534c4c725c99e9a8cc28aef1d2c899d30cca06f0c6ddfa4a8e6efa01e5e98091347bcfc80d596f16d43
-DIST mako-1.4.tar.gz 48418 BLAKE2B ebd3c2f6fb7d51df826cab469c3e12477ec4503e3dfdfb4e9700393c0d994f6d7fcce6f3471d5faf90c5eb4bfa766941b97b0c8a8a556b5639ad5f3612df3082 SHA512 6059103e3a0c0cca5b0f717fbd7522f9a13f3dd3d65fe674e65cc175122a3372041bee2050d253ccb47a2adaa1dfa3180a19276bcdcb20c1e00813d75e1b3683
-EBUILD mako-1.3.ebuild 891 BLAKE2B 428e070928f0ed53fcd04655625b5098a639adb7bc5cf5ca6a2e355799147d9b4e7d7d81c87aeaac01f90a6a01be2cd6853097025879193b86cec3642cf44432 SHA512 48c897b77b1cb6ca55124eba4b9c7763878e48a70ae84514f57f64e66c8f7376b79f64f99ab9c52b92d973f1bb5814ee4ac0dc2ca0cb88afeb6597626b387175
-EBUILD mako-1.4.1.ebuild 894 BLAKE2B 3456ff5617d646085cd1fe3e1b6b060926b6944c4091d462644d2fa15aca2dfa10d3054d1b1b638f0cc1c546625a614b3982b7d4204d99bad2249ff216ad02a0 SHA512 548759be6f03cc92eb7a2b4c3d8f61ac694422c9dce4d9626a28f11777defd7e046c3d6af1b610ae42a1fa98b53ab2d9b23dd48e713f8921278f7280cb9e42c4
-EBUILD mako-1.4.ebuild 891 BLAKE2B 428e070928f0ed53fcd04655625b5098a639adb7bc5cf5ca6a2e355799147d9b4e7d7d81c87aeaac01f90a6a01be2cd6853097025879193b86cec3642cf44432 SHA512 48c897b77b1cb6ca55124eba4b9c7763878e48a70ae84514f57f64e66c8f7376b79f64f99ab9c52b92d973f1bb5814ee4ac0dc2ca0cb88afeb6597626b387175
+EBUILD mako-1.4.1.ebuild 899 BLAKE2B 181dac2bc3ddeca70ad3ff9882f9fbb1ff41e9c8f974fadaf2d6052335bbade046e8bf5cae20e1df10798fbc8f3a607a1f0e9d8c3b3b3b3c07c82dd40c1f3f66 SHA512 60dfc7202d36ea8842d6b36760f01815e75a549d090816277ebdbaceb320a11c0437949280d04d6517af23ba8c181f431922b5eb3ddf8d8a927f52a910d380a9
 EBUILD mako-9999.ebuild 894 BLAKE2B 5d7a5aa5cbac293bc0b1f9e0e5bed07c38a2c2548da92a95c907f48c2ce310fd20f88e695bbd956be3044178a268198abcffb62c104b1ca075318528981baa50 SHA512 c30b91982ab4b20a31831a16df7807a14ad46fcfab6ad5f6b7a7ff6ca28b54188abc95dec2c08aac90bbd132a815b1ec88fd106d6a3a1d682938b645791524c0
 MISC metadata.xml 642 BLAKE2B 4b96d18b0cf351347a12d6e520d7aace4de2f7df8532953288dcfa2549cde936417b73499e0d0b7debd7716d1b49431db6529a213da0b69491df081400af8ae8 SHA512 51c3f7458f486883613916701f721045c3f7f82c9be1b8feb781632e38489e08c1d84411daaf56e01bc07d06c3b1c1683f55a79a51b4d6fd0f522ce97d303c8a
diff --git a/gui-apps/mako/mako-1.3.ebuild b/gui-apps/mako/mako-1.3.ebuild
deleted file mode 100644
index 3b9ffdde2139..000000000000
--- a/gui-apps/mako/mako-1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A lightweight notification daemon for Wayland. Works on Sway."
-HOMEPAGE="https://github.com/emersion/mako"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+icons"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/pango
-	x11-libs/cairo
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	sys-apps/dbus[user-session]
-	icons? (
-		x11-libs/gtk+:3
-		x11-libs/gdk-pixbuf
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	app-text/scdoc
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dicons=$(usex icons enabled disabled)
-		"-Dwerror=false"
-	)
-	meson_src_configure
-}
diff --git a/gui-apps/mako/mako-1.4.1.ebuild b/gui-apps/mako/mako-1.4.1.ebuild
index d77f7073b6ad..3596f2bb1465 100644
--- a/gui-apps/mako/mako-1.4.1.ebuild
+++ b/gui-apps/mako/mako-1.4.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 LICENSE="MIT"
@@ -39,7 +39,7 @@ RDEPEND="
 "
 BDEPEND="
 	virtual/pkgconfig
-	app-text/scdoc
+	>=app-text/scdoc-1.9.7
 "
 
 src_configure() {
diff --git a/gui-apps/mako/mako-1.4.ebuild b/gui-apps/mako/mako-1.4.ebuild
deleted file mode 100644
index 3b9ffdde2139..000000000000
--- a/gui-apps/mako/mako-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="A lightweight notification daemon for Wayland. Works on Sway."
-HOMEPAGE="https://github.com/emersion/mako"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
-else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+icons"
-
-DEPEND="
-	dev-libs/wayland
-	x11-libs/pango
-	x11-libs/cairo
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	sys-apps/dbus[user-session]
-	icons? (
-		x11-libs/gtk+:3
-		x11-libs/gdk-pixbuf
-	)
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	app-text/scdoc
-"
-
-src_configure() {
-	local emesonargs=(
-		-Dicons=$(usex icons enabled disabled)
-		"-Dwerror=false"
-	)
-	meson_src_configure
-}