metadata: update md5-cache

x11-misc/gpaste: die if libtool files pruning fail
x11-misc/plank: prune libtool files
2025-12-06 18:12:39 +01:00 · 2020-01-05 20:24:04 +01:00 · 2020-01-05 20:09:01 +01:00 · 2020-01-05 20:07:50 +01:00 · 2020-01-05 20:01:15 +01:00 · 2020-01-05 19:36:43 +01:00
82 changed files with 686 additions and 712 deletions
--- a/app-crypt/clevis/Manifest
+++ b/app-crypt/clevis/Manifest
@@ -1,5 +1,3 @@
-AUX clevis-10-dont-check-dracut.patch 420 BLAKE2B 98bbf8bf85b57041b4f0ac240f26ceea41f50960bc129140d36117bcb4a1908cd8060d4adcdb6a7148826e0ec993cd003313fa9c772052cfa668df8546a574d9 SHA512 967d2cb3cf4c9d9afd0a80611382d07acf6fd8037e83766b88935f120d780c8641c406f804c0fffe571c4a79b96242dc2ba10de1de0efd1277e076dbda3d3d4e
-DIST clevis-10.tar.bz2 137411 BLAKE2B 73118d7f924366a752251f37b5d9b17707e77d10582a6dc636bcac20a372c4920e190c137f0c8f24036bb2074bd877e312d18f8ea95509546479ef0cca202afc SHA512 4fb95790eef84be414a0b5bcc992097ed4eb36c89bb3ff76e09ea45d7106b980f6b5f79566488c58ca9558f533235e5f95580e2c40d9f1a291d0def89481352f
 DIST clevis-11.tar.xz 37216 BLAKE2B d6525237c4978862769d00120608ee1b5fb06e7a754b782421941ec236f32f87f4426820cdb656a08bc761f8466563b1c740fa50faaa21d03442afaf032146d4 SHA512 f15033a27f662986c48ca36390d3b0f127bc691b3cd7a35d437db2e2b123f8bbebd6385d799620b11f42db0d279a2030d5bf69e55e96a584800393bf47a00368
-EBUILD clevis-10.ebuild 997 BLAKE2B b29d4a2843cdf75848be7239b5464079f435b2c0fb9e733d24852ddccfee323bccdc0c3387e93b964840b7137f8924fd5ae3d87b14f8c4ea3670717b37adf497 SHA512 e84ef4ca720c94a716b642a984f03165e3422b4c00cfc7c0932bdf7ad3708371347ecd0f0923b10aabb12fb7e1a72d5281ddc5689b697f4f8433f71be48170dd
-EBUILD clevis-11.ebuild 741 BLAKE2B 411fb9ffceee17aa48442126d0cf4e6594c6f6acfd0f56ce9af432fd0a45dd50049dcdcb6fa9b2089889ab86090c9abecab6fd55a9b456182ae55012e75d0fc2 SHA512 7fd46a687c943b017e122a8307afa01b80e93ebeda99a5596cf69b03931217961dc1392638e5698f72ac824ff8ee90ad39b15533b3f24ea8a1cf39d089b96eb9
+EBUILD clevis-11.ebuild 733 BLAKE2B 30986c6cc3cc1ec4ce83160e8262a357a3da078c6a54f177dea6b9a5ad9dbe37496adfac14d242dc67446363efe76995ab56430044a7e172defb66171df892c0 SHA512 7a9526f0fe67a4e80c2baee596f4ae4c540d0a74469d0c9356bc3f3484983cb800c7abe7e0a951cab975898da2f75292b55607034647b12fb55bd8129cc9cee4
+MISC metadata.xml 336 BLAKE2B 2ce902afb3b2ee7c0f84a60cd5c17d8f83a688a01201c6a5e181ab89173dce3bbf8dd6d7ab1e7ac87a21fda7a26be847580d0813cc03aed080f152316cccd5c0 SHA512 5f722847b8b831841d13ef3e8175cfd324115927a2c2d06e267ee473fdfbf1132cd96af8274a28d282ab07c13ce95fda14d8e0ab5e0a15e98f20c0ed1e1e17ff
--- a/app-crypt/clevis/clevis-10.ebuild
+++ b/app-crypt/clevis/clevis-10.ebuild
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Clevis is a plugable framework for automated decryption"
-HOMEPAGE="https://latchset.github.io/"
-SRC_URI="https://github.com/latchset/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dracut"
-
-DEPEND=">=sys-fs/luksmeta-8
-	dev-libs/openssl:0=
-	>=dev-libs/jansson-2.10
-	>=dev-libs/jose-8
-	dev-libs/libpwquality
-	sys-fs/udisks:2
-	sys-apps/systemd
-	dracut? ( sys-kernel/dracut )
-	>=sys-process/audit-2.7.8"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-dont-check-dracut.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dracutmodulesdir="${PREFIX}/usr/lib/dracut/modules.d"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if ! use dracut; then
-		rm -rf ${D}/usr/lib/dracut
-	fi
-}
--- a/app-crypt/clevis/clevis-11.ebuild
+++ b/app-crypt/clevis/clevis-11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit meson systemd

--- a/app-crypt/clevis/files/clevis-10-dont-check-dracut.patch
+++ b/app-crypt/clevis/files/clevis-10-dont-check-dracut.patch
@@ -1,11 +0,0 @@
-diff -dNur a/configure.ac b/configure.ac
--- a/configure.ac	2018-03-21 19:16:33.000000000 +0100
-+++ b/configure.ac	2018-07-26 11:00:36.263883657 +0200
-@@ -17,7 +17,6 @@
- PKG_CHECK_MODULES([udisks2], [udisks2])
- PKG_CHECK_MODULES([jose], [jose >= 8])
- PKG_CHECK_MODULES([systemd], [systemd])
-PKG_CHECK_MODULES([dracut], [dracut])
- PKG_CHECK_MODULES([audit], [audit >= 2.7.8])
- 
- AC_CHECK_PROG([PWMAKE], [pwmake], [yes])
--- a/app-crypt/clevis/metadata.xml
+++ b/app-crypt/clevis/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/clevis</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-misc/piper/Manifest
+++ b/app-misc/piper/Manifest
@@ -1,6 +1,3 @@
-AUX piper-0.2.904-fix-python3-shebang.patch 917 BLAKE2B 42eb9e382d2c97a99e8bd0a1c38d7acf03e6e782cf4f6c5e313ec7a03987f516c88ce4eddd7c7d30769403b78f3dd61845ea949fd6b6810078e1a71d958ab9df SHA512 18fb338f3664bcf1a5d2bf69eb35139990ce4a549d1b728d6374d9526c21c08dbd91602fffa32a72222a1712a5d946eafd3463dc30fe39301f013501f345eff5
-DIST piper-0.2.904.tar.gz 178715 BLAKE2B ac5aa0cb47c1eadd1232ebab170c02e731da8686893a8ee231105cb064b320f339f3e834e56c61790d138151a7ed4416438604d743ca2e16d4fdbf5a974b9b63 SHA512 425d233a89eebf391650ae121134dd532bf75e0f6e15168c89ab86f3b5bac1adb6dfa985c0028a2285f85655226200b5cfe28f36cfd83814985f97ffa3774412
 DIST piper-0.3.tar.gz 180248 BLAKE2B 1bd1f2058d95ef8cbcec75d8612f70e27a4c1bd3246f7dec01cd5078a1f677be7534a8cbf1cc8362fb6d48d01196c60ec1ee0dcbd890e68efeaa7fc97e120a4a SHA512 baffa76047a9f509dd9cee3513b2dde2cc27bab26f626d836ac065da9a45d8ddad6a51409e8174634e03a82f32f2622b3e9a4a6ddbbcc7a09a489012b027c839
-EBUILD piper-0.2.904.ebuild 745 BLAKE2B 657578fd5a5091add205ad43e499ddef885e256b9bf1853e293dfe858f7dc9e07151a0e0d097913792e6649ee8af300b19b180febbf356cf1c60c91581095491 SHA512 f3b9da68bc763ac86aaf7ca6f457585747aea64fe36754e3258331f76000e09e69d9b0b7ebe9b5fe0a0889a8b5b62d4e992f93637c294c6344c407a6a09fb150
-EBUILD piper-0.3.ebuild 684 BLAKE2B ea42d5e03fd0def1ee561c0e3ec91c6451be29aa2b0737c46342e768426ae9534c42d11b29f214c099fb59e9c63b5213d4616c581bfff8a9c950958849c8efaf SHA512 2ba25c578367b2e3c5ae29f2cd56802f2e34508d7a9cd782547b98d5e8b2fad8c79aa6ed84616fb45611e26a584040d093a7ba6750ad4f8a1142867a7438a68a
-MISC metadata.xml 480 BLAKE2B 628471473bfa2fe2e495ef6daad43ab16bff6b2f62554ba987b7fa240efca9f54e4e42783590795c791ffcaf731b18736116152d75af91aa8339f7534ba4dd69 SHA512 1dd51740d531f6aa880af85346ddb0aceba018ba7de7fa4fe665eec9f074400416c48905d4adcd3a834ea2bf953713f0cbcf9ef01d1c507d1177a564085297c2
+EBUILD piper-0.3.ebuild 722 BLAKE2B 1046610816517a9e7242f611ddbeeee9bb55e24bea94861cb7fb613f7a34b70ee5e392db15619a2d8c9d01ed6750df1e698671d14d2a97b7ec6583809dc24a89 SHA512 f486200df177073fb095edc131dc14d8b91175fa3b2c33bb50742e3da326b5e6f7080fa5f0062e7882b3ca38d41317284066e277af47a205a8de8f73c950e520
+MISC metadata.xml 336 BLAKE2B 83b67c7a27d39c2a90b4f18e56f80221611d6f15d6081f9334e59665b85d33814d1208c7539c5b173582e7edc8bdbca94f507dbed4f7b7d369bb2489531c1629 SHA512 7f7344481ac90b3613047e7755d86bde8b5f448efb69cd806e3027d6024b5e66c7223c0c8a1cbb80a76e5b0d1f5d214f1d53a0b9470d3739c81c46be4324a927
--- a/app-misc/piper/files/piper-0.2.904-fix-python3-shebang.patch
+++ b/app-misc/piper/files/piper-0.2.904-fix-python3-shebang.patch
@@ -1,30 +0,0 @@
-From 63d760a3bbf420063cff3f978bc9c05e39de149a Mon Sep 17 00:00:00 2001
-From: David Guglielmi <david.guglielmi@gmail.com>
-Date: Sun, 3 Mar 2019 16:46:17 +0100
-Subject: [PATCH] svgs: use /usr/bin/env shebang for python3 scripts
-
---
- data/generate-piper-gresource.xml.py | 2 +-
- data/svgs/check-svg.py               | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/generate-piper-gresource.xml.py b/data/generate-piper-gresource.xml.py
-index 19bc43d..af12cac 100644
--- a/data/generate-piper-gresource.xml.py
-+++ b/data/generate-piper-gresource.xml.py
-@@ -1,4 +1,4 @@
-#!/bin/python3
-+#!/usr/bin/env python3
- 
- import sys
- 
-diff --git a/data/svgs/check-svg.py b/data/svgs/check-svg.py
-index fafc3f2..f62ccea 100755
--- a/data/svgs/check-svg.py
-+++ b/data/svgs/check-svg.py
-@@ -1,4 +1,4 @@
-#!/usr/bin/python3
-+#!/usr/bin/env python3
- # vim: set expandtab shiftwidth=4 tabstop=4:
- 
- import os
--- a/app-misc/piper/metadata.xml
+++ b/app-misc/piper/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">                                                    
-    <email>dg@accelance.fr</email>                                      
-    <name>David Guglielmi</name>                                                   
-  </maintainer>   
-  <upstream>
-    <remote-id type="github">libratbag/piper</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libratbag/piper</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/app-misc/piper/piper-0.2.904.ebuild
+++ b/app-misc/piper/piper-0.2.904.ebuild
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit gnome2 meson python-r1
-
-DESCRIPTION="GTK application to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/piper"
-SRC_URI="https://github.com/libratbag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${P}-fix-python3-shebang.patch )
-
-DEPEND="
-	virtual/pkgconfig
-	dev-python/pygobject:3
-	>=x11-libs/gtk+-3.22:3[introspection]
-"
-RDEPEND="
-	>=dev-libs/libratbag-0.9.905
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-"
-src_prepare() {
-	python_setup
-	default
-}
-
-src_configure() {
-	meson_src_configure
-}
--- a/app-misc/piper/piper-0.3.ebuild
+++ b/app-misc/piper/piper-0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )

-inherit gnome2 meson python-r1
+inherit meson python-r1

 DESCRIPTION="GTK application to configure gaming mice"
 HOMEPAGE="https://github.com/libratbag/piper"
@@ -15,15 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""

-DEPEND="
-	virtual/pkgconfig
+DEPEND="virtual/pkgconfig
 	dev-python/pygobject:3
-	>=x11-libs/gtk+-3.22:3[introspection]
-"
-RDEPEND="
-	>=dev-libs/libratbag-0.10
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-"
+	>=x11-libs/gtk+-3.22:3[introspection]"
+RDEPEND=">=dev-libs/libratbag-0.10
+	dev-python/python-evdev[${PYTHON_USEDEP}]"
+
 src_prepare() {
 	python_setup
 	default
@@ -32,3 +29,8 @@ src_prepare() {
 src_configure() {
 	meson_src_configure
 }
+
+src_install() {
+	meson_src_install
+	python_optimize "${D}"
+}
--- a/dev-libs/jose/Manifest
+++ b/dev-libs/jose/Manifest
@@ -1,2 +1,3 @@
 DIST jose-10.tar.bz2 398647 BLAKE2B 91f4a53e22a15e716459efe069b59a43c850be75f004261caf6842a0caaa099ec6c71954ed0cd37e2c256c409d9ab73e34f13fdeef6dbe4c48ee72794f64dba4 SHA512 596f71bf7f3ab65164556d8353c07a09283e80ad06f8cbb7b1a9609fe3c95888c94c032ae8d719ed3f3b361cb87188f4683728e649d454056841b8ca47828b9d
-EBUILD jose-10.ebuild 473 BLAKE2B f1ec42b759f625903014891b036217867545628c9314f1cc549d24b5836e6536aefd3b95114c82b3fb4ced8f2d4b3e1f27b0a4cc7079f8256921f4653df4cd26 SHA512 63a58df3dc4a7667988635b6d6c101d6a0be093b3ab0d181eb7a35d152f3637f0e31eb14a7fb942bab0c4196518cff2c3f2d8d1c7557f0eb399167a013b19ac1
+EBUILD jose-10.ebuild 465 BLAKE2B 62628a21d8cb8e140add33083d0c621a99fde6541b11628fee410f7ddd59af479926eedc606fb055d53bd15c9f4cc27fcb34475c9ee57f69e8f2351229f6959f SHA512 89c5eb2e9990f1754686202b187a9bb785ef4a77c03ec8ba23a427ba33dda68c680b879a401f410fdd1668b8bdec6b4f7b2a44f45eaf6fc6e699ff4f2c364372
+MISC metadata.xml 334 BLAKE2B 16320cd703ea2b4ae5788736fd4ff3b4ad7b5b69b431059552bb275c235d14788ff3f54a01d6fea3182a1f02ecf573a77551873db68a94dda698715ba10a43bc SHA512 5c8ac1bcdaa2c97afa4743f82a7f8305bf954e672f73e505c7b44d52c1bd99b96a4a1012487c329b8184b2f485ac19ff1321bb105a0db20e1222bd9bd3525e28
--- a/dev-libs/jose/jose-10.ebuild
+++ b/dev-libs/jose/jose-10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 DESCRIPTION="C-language implementation of Javascript Object Signing and Encryption"
 HOMEPAGE="https://latchset.github.io/"
--- a/dev-libs/jose/metadata.xml
+++ b/dev-libs/jose/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/jose</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,5 +1,3 @@
-DIST libratbag-0.10.tar.gz 236308 BLAKE2B f40f06a545355793dd7ae39c522438d2056e487c7b2796a8ed151335002a143d3021b103d803adbca1a35fbdd84ae1964ebf9d5058052e6d5932e461692f7efa SHA512 e8f7cd41f394dd72b5f7c4bde710965364dc5a45061f7837fb501b9adbf23429d1793041c52401992e8394ce81b9e854fcd66ec5cb8e99a81bee774cea95c45c
 DIST libratbag-0.11.tar.gz 237083 BLAKE2B 8258daaa78e81eeab5bdbfdcdcb33ab40bbd1daabced39d116770d59d32d3800919e0427ebede7cae8446f96c6dd71abebe173ad099f70d7c34949459375d071 SHA512 3eb7b2ff6ac28cd5ceda0e3cd8eca7951ee24d43459073588fa3126ff899cebcab277f7063a8de7d0f73be09d5fb09baa39bf9cda89b74c4948a1e888039b1d7
-EBUILD libratbag-0.10.ebuild 821 BLAKE2B d33e0f9bf9df4f3d5837b1e96d238002765c8d8fe3fe85cdae6c6d521ace6d80f13fea74d490a2eb4cadb1de13b29993a38d6c024a915d2fdf2302e070e11c93 SHA512 867ba947596caf7e67dbeb0fbf609e5c5cf7b450ec52e126396b6b506b87f2b7c3184943d449cad7ac04e9b68c992cac0d6bebc88f5b05a538a5be3433b60938
-EBUILD libratbag-0.11.ebuild 821 BLAKE2B d33e0f9bf9df4f3d5837b1e96d238002765c8d8fe3fe85cdae6c6d521ace6d80f13fea74d490a2eb4cadb1de13b29993a38d6c024a915d2fdf2302e070e11c93 SHA512 867ba947596caf7e67dbeb0fbf609e5c5cf7b450ec52e126396b6b506b87f2b7c3184943d449cad7ac04e9b68c992cac0d6bebc88f5b05a538a5be3433b60938
-MISC metadata.xml 227 BLAKE2B 28d940b98f9936bf19ab9451e948f62f1c6152380f70767ab8c3438a46a7ca6d6533fdbf050e5badb95d2c15fd503dd9874bb9e0505ce42e088d3575e713ba76 SHA512 3b08938ed5b0a9e61990c6fec8ffa9f288f0021f78fb3c59f298f3894edb1197524c263f363a3a18828de2b21d133d18d104d805e520d437a278a8c0d0eef0ca
+EBUILD libratbag-0.11.ebuild 803 BLAKE2B 9c5293a2a2118f37c4b6587716aab0747245c0bf4e30b0cdf25edb94bf8193c1e216c3d0608d489facd771ec7c78a674edf0badbfb4f660c50b919b309b6e029 SHA512 5cbd65375f72140edce88cb655a65c0ff680411ec1d2539ab2ca45606036038b6e78beb043460333cfb81ebf9e766c9ee0b74ed454f6d36bace300233f5cd37e
+MISC metadata.xml 342 BLAKE2B aaa8e3b5f121bc36b674f5233158761969a352f66076c5c044920c48475122a230cb4d5ed9517410fce06cea380d5f4054e1fd7a1d05130b8527739cb0bdecf1 SHA512 02919fc53d86e16c912dfde507e44758fc1980c608eb9f5020aec641b0a2cfd0c314794a28190ce2aeee02c1938569d4b046905cc7b5662881c9e55c2f50744a
--- a/dev-libs/libratbag/libratbag-0.10.ebuild
+++ b/dev-libs/libratbag/libratbag-0.10.ebuild
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit meson udev python-r1
-
-DESCRIPTION="Library to configure gaming mice"
-HOMEPAGE="https://github.com/libratbag/libratbag"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc systemd test"
-
-DEPEND="
-	virtual/pkgconfig
-	dev-lang/swig
-	doc? ( app-doc/doxygen )
-	!systemd? ( sys-auth/elogind )
-	test? ( dev-util/valgrind )
-"
-RDEPEND="
-	dev-libs/libevdev
-	virtual/libudev
-"
-
-src_prepare() {
-	python_setup
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddocumentation=$(usex doc true false)
-		-Dtests=$(usex test true false)
-		-Dudev-dir=$(get_udevdir)
-	)
-	meson_src_configure
-}
--- a/dev-libs/libratbag/libratbag-0.11.ebuild
+++ b/dev-libs/libratbag/libratbag-0.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )

 inherit meson udev python-r1

@@ -15,17 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc systemd test"

-DEPEND="
-	virtual/pkgconfig
+DEPEND="virtual/pkgconfig
 	dev-lang/swig
 	doc? ( app-doc/doxygen )
 	!systemd? ( sys-auth/elogind )
-	test? ( dev-util/valgrind )
-"
-RDEPEND="
-	dev-libs/libevdev
-	virtual/libudev
-"
+	test? ( dev-util/valgrind )"
+RDEPEND="dev-libs/libevdev
+	virtual/libudev"

 src_prepare() {
 	python_setup
--- a/dev-libs/libratbag/metadata.xml
+++ b/dev-libs/libratbag/metadata.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">libratbag/libratbag</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libratbag/libratbag</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-python/ftfy/Manifest
+++ b/dev-python/ftfy/Manifest
@@ -1,2 +1,5 @@
 DIST ftfy-5.5.1.tar.gz 57358 BLAKE2B 3c886a32c2422126f73ea73cc08554b6a3217feac64de430f37fe24cb8339669975f5a2b024877af7b39506a42a9f78fd54c78c730099d59bbad66d52897d569 SHA512 0a9c396855b40965b56ebef1daa308b6ff4876740498ef9c88cb4ad4a53cbda3151dc10b77eae348f2d96945d6f68cbcd809dfee2a3f67a244c7a6e9ffe0d7cc
-EBUILD ftfy-5.5.1.ebuild 428 BLAKE2B e7fdf0c27960f3cf2a603cd1d516cfb6d5ad8fe3718022abc910f2178d62b1a76b4e86f3210d8a8cdc671bbdba2065b5d7b1eec7861c1dd93c6de2b3620eee52 SHA512 f1f96b77787fe9f97ff5a82ab3bc8f6cdfc38efd9d7137388c13b445b548ebe318fb4db0e001ef54f312884c0a56673d050cb845d40a2fdb6fd4cfff592f11aa
+DIST ftfy-5.6.tar.gz 58808 BLAKE2B 3ccd4cca8fc1170602bd9a1b9cf131876344074815d006c6c3d01448dd454cccacade6473fa8e7af91d5535ad9a6bb545f841c28119c0d43b19566a318e0fcaf SHA512 3fab2fcab610f2b3a72b7bd96fa30b1880c926a2449c21d625f4a3d9eb8edd80057af1a8934e682c177a8307f24ce54582d25f4ae805012ad7d7e4285f8cf609
+EBUILD ftfy-5.5.1.ebuild 416 BLAKE2B e7e2fa13996ed07369652a72fc67b245d5fbf7c96d3a275a53dd66b1245751e69f05c4ec1c457d95cfafa7bb30ebfb33bc7d23d69397c756ef52202ca9b3cadc SHA512 278f2d96911d2cc3e21728f74f76fe7c1223d650706029b36809c09a7bd63e5a0aae91475496b199e4f750eeff4dfbf2eb3a63e8373d11849610279337fee84f
+EBUILD ftfy-5.6.ebuild 416 BLAKE2B e7e2fa13996ed07369652a72fc67b245d5fbf7c96d3a275a53dd66b1245751e69f05c4ec1c457d95cfafa7bb30ebfb33bc7d23d69397c756ef52202ca9b3cadc SHA512 278f2d96911d2cc3e21728f74f76fe7c1223d650706029b36809c09a7bd63e5a0aae91475496b199e4f750eeff4dfbf2eb3a63e8373d11849610279337fee84f
+MISC metadata.xml 348 BLAKE2B 64decc48d0836b10524ca4b209ebd8ab0152070ffe95846517861e635f5b5b539fc23941dca8163b45cfa378f33179918aa6773d2c394df137bc0ef4a6ce286d SHA512 fa61afeeee917b16c357d6769413042ff48803dc939b46150de6e0f052786ead8222cf3c407868ac1d2f667aef2e13660e5ccd0ce0a5784607c245b2a79120e5
--- a/dev-python/ftfy/ftfy-5.5.1.ebuild
+++ b/dev-python/ftfy/ftfy-5.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( python{3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{3_6,3_7} pypy )

 inherit distutils-r1

--- a/dev-python/ftfy/ftfy-5.6.ebuild
+++ b/dev-python/ftfy/ftfy-5.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that fixes text for you"
+HOMEPAGE="https://github.com/LuminosoInsight/python-ftfy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+RDEPEND="dev-python/wcwidth"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
--- a/dev-python/ftfy/metadata.xml
+++ b/dev-python/ftfy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">LuminosoInsight/python-ftfy</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/wikipedia/Manifest
+++ b/dev-python/wikipedia/Manifest
@@ -1,2 +1,2 @@
 DIST wikipedia-1.4.0.tar.gz 27748 BLAKE2B 9c7b2a69a0ed60d5c002fae8add0d6c0cef0d5baf13d363bd6677badd4d40ee4e2b0739e5fc2b43a3631b2b34360b91f75d344b09acce340f2cead093396404a SHA512 56d3382c784fd16205edc5b6f34a8bac5b6fefc21856993413ba339e9e9016b9b65602ed8eaeb1fe593f8eafc6b7b049dba14427cf08e08aabc03fd971504418
-EBUILD wikipedia-1.4.0.ebuild 512 BLAKE2B a2409639dffa082f210b9508c6be844cf561ea2fba12fc15fc8422aac291f401863c4976436f52ccc7f368a63f27b255c3f33147d44dc9bd4ea907b578740587 SHA512 9ee57a0d7271276ecbf9319381a41f3a9a5530997200d8506af685a371f1bcaacea4d708e1e6c0e3c5116f22802ad9a74b489a75269a32e8bb5996b411e8a061
+EBUILD wikipedia-1.4.0.ebuild 484 BLAKE2B b81e68f51a09fae09a8fbc258983dff735271813909704729dbe9ced30f583b1ca033d955051c2288a1a5ae4d5536f582f10b808bea1c96029c87a55edc3c443 SHA512 a52e7c4cf6581156d211ef71fefa208044445e61a882fddbe7e522f52ac817d4a65f1b79fba7d13faf4324ac535d3e4ac21721c1d4629091ce872cdec84f8f71
--- a/dev-python/wikipedia/wikipedia-1.4.0.ebuild
+++ b/dev-python/wikipedia/wikipedia-1.4.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $

-EAPI=5
+EAPI=7

-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy )

 inherit distutils-r1

@@ -12,10 +11,8 @@ DESCRIPTION="Python library that makes it easy to access and parse data from Wik
 HOMEPAGE="https://github.com/goldsmith/Wikipedia"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

-RDEPEND="
-	dev-python/beautifulsoup:4
-	>=dev-python/requests-2.6.0
-"
+RDEPEND="dev-python/beautifulsoup:4
+	>=dev-python/requests-2.6.0"

 LICENSE="MIT"
 SLOT="0"
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -0,0 +1,4 @@
+AUX sushi-3.32.1-port-to-GtkSourceView-4.patch 2671 BLAKE2B 04b5d50d51acf15971cff8f14dcefd134876db73069381a4035134c74df57e94c45f07f7198286f925b19c3e3bcadf07676f4e038f09e4758875b505391b08e0 SHA512 7e5ea7ada9ee698c9886619ea5010f3a6288e22db063616173dc578b16b2b17b33bc1abdac491d77c10bea8c5e4c5af9cfee811e23a8bafba4ab3bfb01ed6856
+DIST sushi-3.32.1.tar.xz 65172 BLAKE2B ad6d085e3c67527c988695195408e2dd8f82effeb0dacccb63eec9d3896c82fb1abf8d0fb92aeb6934146e67e8e203e438a900d4164d673b19cbe6af9d9a27b7 SHA512 db38b690591f7c7a5e55b7ad7a37022cd0624f48af6fe1c56ae05aa74598d767b61a1636d01ba207c399739c0cee6d266a52207a74f65f3e27216c5dfdd17909
+EBUILD sushi-3.32.1.ebuild 1410 BLAKE2B 220618d9452e982b791f8fb961bf99b058247ba61021975974b37f245eb841574aeb0363af521959dcae8272b478316e5ac1b7c669d4c5db5e5b3b571b3a7665 SHA512 3dc5ef02e76ed4cd1080a9ea6372d8b806c0fa6eedae9f8e8461c2b609f4af45461cfeb1dbccb3255efb8237118d5868b9d980866ceff25d76876fc9148b1b19
+MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
--- a/gnome-extra/sushi/files/sushi-3.32.1-port-to-GtkSourceView-4.patch
+++ b/gnome-extra/sushi/files/sushi-3.32.1-port-to-GtkSourceView-4.patch
@@ -0,0 +1,72 @@
+From bafeb19233325a7fc7c2e82b488abfb7a7556f61 Mon Sep 17 00:00:00 2001
+From: Martin Blanchard <tchaik@gmx.com>
+Date: Sun, 19 May 2019 22:31:37 +0200
+Subject: [PATCH] Port to GtkSourceView 4
+
+GtkSourceView 3 isn't maintained any more.
+
+https://gitlab.gnome.org/GNOME/sushi/issues/6
+---
+ flatpak/org.gnome.NautilusPreviewer.json | 4 ++--
+ meson.build                              | 2 +-
+ src/js/viewers/text.js                   | 2 +-
+ src/libsushi/meson.build                 | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/flatpak/org.gnome.NautilusPreviewer.json b/flatpak/org.gnome.NautilusPreviewer.json
+index 4565b82..9a60827 100644
+--- a/flatpak/org.gnome.NautilusPreviewer.json
+++ b/flatpak/org.gnome.NautilusPreviewer.json
+@@ -102,8 +102,8 @@
+             "sources": [
+                 {
+                     "type": "archive",
+-                    "url": "http://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.8.tar.xz",
+-                    "sha256": "1e9bb8ff190db705deb916dd23ff681f0e8803aec407bf0fd64c7e615ac436fe"
+                    "url": "https://download.gnome.org/sources/gtksourceview/4.2/gtksourceview-4.2.0.tar.xz",
+                    "sha256": "c431eb234dc83c7819e58f77dd2af973252c7750da1c9d125ddc94268f94f675"
+                 }
+             ]
+         },
+diff --git a/meson.build b/meson.build
+index 56398d9..538dc4b 100644
+--- a/meson.build
+++ b/meson.build
+@@ -19,7 +19,7 @@ gstreamer_base_dep = dependency('gstreamer-base-1.0')
+ gstreamer_pbutils_dep = dependency('gstreamer-pbutils-1.0')
+ gstreamer_tag_dep = dependency('gstreamer-tag-1.0')
+ gtk_dep = dependency('gtk+-3.0', version: '>=3.13.2')
+-gtksourceview_dep = dependency('gtksourceview-3.0')
+gtksourceview_dep = dependency('gtksourceview-4', version: '>=4.0.3')
+ harfbuzz_dep = dependency('harfbuzz', version: '>=0.9.9')
+ introspection_dep = dependency('gobject-introspection-1.0', version: '>=1.0.1')
+ musicbrainz_dep = dependency('libmusicbrainz5')
+diff --git a/src/js/viewers/text.js b/src/js/viewers/text.js
+index 9566adb..a044fbe 100644
+--- a/src/js/viewers/text.js
+++ b/src/js/viewers/text.js
+@@ -23,7 +23,7 @@
+  *
+  */
+ 
+-imports.gi.versions.GtkSource = '3.0';
+imports.gi.versions.GtkSource = '4';
+ 
+ const Gdk = imports.gi.Gdk;
+ const GtkClutter = imports.gi.GtkClutter;
+diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
+index c8ff6fa..66ef646 100644
+--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
+@@ -62,7 +62,7 @@ gnome.generate_gir(
+     'GstTag-1.0',
+     'GdkPixbuf-2.0',
+     'Gtk-3.0',
+-    'GtkSource-3.0',
+    'GtkSource-4',
+     'EvinceDocument-3.0',
+   ],
+   install: true,
+-- 
+2.22.0
+
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="office">Support viewing file formats such as generated by
+			<pkg>app-office/libreoffice</pkg></flag>
+	</use>
+</pkgmetadata>
--- a/gnome-extra/sushi/sushi-3.32.1.ebuild
+++ b/gnome-extra/sushi/sushi-3.32.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
+HOMEPAGE="https://git.gnome.org/browse/sushi"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="office"
+
+PATCHES=(
+	"${FILESDIR}/${P}-port-to-GtkSourceView-4.patch"
+)
+
+# Optional app-office/libreoffice support (OOo to pdf and then preview)
+# gtk+[X] optionally needed for sushi_create_foreign_window(); clutter-x11.h unconditionally included
+COMMON_DEPEND="
+	>=media-libs/clutter-1.11.4:1.0[X,introspection]
+	media-libs/clutter-gst:3.0[introspection]
+	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
+	>=app-text/evince-3.0[introspection]
+	media-libs/freetype:2
+	>=x11-libs/gdk-pixbuf-2.23.0[introspection]
+	>=dev-libs/gjs-1.40
+	>=dev-libs/glib-2.29.14:2
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	>=x11-libs/gtk+-3.13.2:3[X,introspection]
+	x11-libs/gtksourceview:4[introspection]
+	>=media-libs/harfbuzz-0.9.9:=
+	>=dev-libs/gobject-introspection-1.54:=
+	media-libs/musicbrainz:5=
+	net-libs/webkit-gtk:4[introspection]
+
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/nautilus-3.1.90
+	office? ( app-office/libreoffice )
+"
--- a/media-fonts/twemoji-ttf/Manifest
+++ b/media-fonts/twemoji-ttf/Manifest
@@ -0,0 +1,4 @@
+AUX 75-twemoji.conf 6473 BLAKE2B 458157320c6207a43371e55fe98772a484b63e6d0098dcd4c8c099d577ae41fa955acb009e40471ccf022581ae3aab6fe069d9a6941383520e0c26df52140ebd SHA512 107d95f22e82028320bf71442947fee66e2cf0e8ca966447a797af3efbb787a65a264ced95ae55d52e074c28f65e01d3bd51fc829fc1a42e30c87310b6e4e040
+DIST twitter-twemoji-fonts-12.1.4-1.fc32.noarch.rpm 2262243 BLAKE2B 9c245d2230892ee0dbd6621f8a46c47bb289c7ffb5273aa70cd4722651001a41339c32ea34104c02aaf5171909ec7a1f9c4ebd781e268ff55d80d624de70b12f SHA512 fcd4d4b3b71f392ffadc591e5bca52884542237975a6e819694edb52ab5c79e03d643303f6e41b40c05f51eb7c94be4123fa7590969574574fe26e960f340b16
+EBUILD twemoji-ttf-12.1.4.ebuild 671 BLAKE2B 127d89d7b8d5a18414ee0b6ae578ebc5a1a8ebcc52ebce67888d641f3f5dd903b7721b4090bf9a1bad42de34ae25841694e3f54ce3df714ad20a9dd1c37ad2a3 SHA512 4a787d256937152813b5cc83bcb109ff5f8f2d728845d1babae688863bac534c5c4af8b016524c01be3255c0ac0bcfabe3ce317a6d9b1527fff99f608f33a1b3
+MISC metadata.xml 435 BLAKE2B cf07b8ffe513952e5528bfaa035b7d356b3923ff0731dc270e909f2821329dac2656ea1b95cc5f9963e3996a0289c9a897f8d11f3401f7d2e9dbd58963bb5d67 SHA512 a1993663e5eb182113aa7bd63b75437f5c2498b3021d8b22924b88456481fbaecf2fbdbcb1fb0c5b996f11b480149d57148acf3b534bea2bf0d890234a56ae7f
--- a/media-fonts/twemoji-ttf/files/75-twemoji.conf
+++ b/media-fonts/twemoji-ttf/files/75-twemoji.conf
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!--
+	From Arch Linux AUR
+	https://aur.archlinux.org/cgit/aur.git/tree/?h=ttf-twemoji
+-->
+<fontconfig>
+
+    <!--
+    This config attempts to guarantee that colorful emojis from Twemoji will be displayed,
+    no matter how badly the apps and websites are written.
+
+    It uses a few different tricks, some of which introduce conflicts with other emoji fonts.
+
+    If you wish to simultaneously use multiple emoji fonts, make sure to adapt this config.
+    -->
+
+    <!--
+    This adds a generic family 'emoji',
+    aimed for apps that don't specify specific font family for rendering emojis.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    This adds Twemoji as a final fallback font for the default font families.
+    In this case, Twemoji will be selected if and only if no other font can provide a given symbol.
+
+    Note, usually other fonts will have some glyphs available (especilly Symbola font),
+    causing some emojis to be black&white and ugly.
+    -->
+    <match target="pattern">
+        <test name="family"><string>sans</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>serif</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>monospace</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    It seems Symbola is often selected as a fallback font before Twemoji.
+    This will try to remove Symbola from the list of fallback fonts.
+    -->
+    <selectfont>
+        <rejectfont>
+            <pattern>
+                <patelt name="family">
+                    <string>Symbola</string>
+                </patelt>
+            </pattern>
+        </rejectfont>
+    </selectfont>
+
+    <!--
+    Recognize alternative ways of writing Twemoji family name.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>Emoji One</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twemoji Color</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twemoji Mozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    Use Twemoji when other popular fonts are being specifically requested.
+
+    It is quite common that websites would only request Apple and Google emoji fonts, and then fallback to b&w Symbola.
+    These aliases will make Twemoji be selected in such cases to provide good-looking emojis.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>Apple Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Symbol</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>NotoColorEmoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Android Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twitter Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiOne</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twemoji Mozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>TwemojiMozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiTwo</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Emoji Two</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiSymbols</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Symbola</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+</fontconfig>
--- a/media-fonts/twemoji-ttf/metadata.xml
+++ b/media-fonts/twemoji-ttf/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jpizarrocallejas@gmail.com</email>
+		<name>Jorge Pizarro Callejas</name>
+		<description>Original ebuild author</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLGLIELMI</name>
+	</maintainer>
+</pkgmetadata>
--- a/media-fonts/twemoji-ttf/twemoji-ttf-12.1.4.ebuild
+++ b/media-fonts/twemoji-ttf/twemoji-ttf-12.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit font
+
+MY_PN="${PN%-ttf}"
+
+DESCRIPTION="Twitter Emoji for everyone"
+HOMEPAGE="https://twemoji.twitter.com/"
+SRC_URI="https://archives.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/t/twitter-${MY_PN}-fonts-${PV}-1.fc32.noarch.rpm"
+
+LICENSE=""
+LICENSE="MIT CC-BY-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+DEPEND="app-arch/libarchive[zstd]"
+
+S="${WORKDIR}/usr/share/fonts/${MY_PN}"
+FONT_S="${S}"
+FONT_CONF=( "${FILESDIR}/75-${MY_PN}.conf" )
+FONT_SUFFIX="ttf"
+
+src_unpack() {
+	bsdtar xf "${DISTDIR}/${A}" || die
+}
--- a/metadata/md5-cache/app-crypt/clevis-10
+++ b/metadata/md5-cache/app-crypt/clevis-10
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 dev-libs/libpwquality sys-fs/udisks:2 sys-apps/systemd dracut? ( sys-kernel/dracut ) >=sys-process/audit-2.7.8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Clevis is a plugable framework for automated decryption
-EAPI=6
-HOMEPAGE=https://latchset.github.io/
-IUSE=dracut
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 dev-libs/libpwquality sys-fs/udisks:2 sys-apps/systemd dracut? ( sys-kernel/dracut ) >=sys-process/audit-2.7.8
-SLOT=0
-SRC_URI=https://github.com/latchset/clevis/releases/download/v10/clevis-10.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=5ab48d1350787ab7141e1c5a05629b8d
--- a/metadata/md5-cache/app-crypt/clevis-11
+++ b/metadata/md5-cache/app-crypt/clevis-11
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install test
-DEPEND=app-text/asciidoc >=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 >=sys-fs/cryptsetup-2.0.4[pwquality] sys-apps/systemd dracut? ( sys-kernel/dracut ) udisks? ( sys-fs/udisks:2 >=sys-process/audit-2.7.8 ) bash-completion? ( app-shells/bash-completion ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEPEND=app-text/asciidoc >=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 >=sys-fs/cryptsetup-2.0.4[pwquality] sys-apps/systemd dracut? ( sys-kernel/dracut ) udisks? ( sys-fs/udisks:2 >=sys-process/audit-2.7.8 ) bash-completion? ( app-shells/bash-completion )
 DESCRIPTION=Clevis is a plugable framework for automated decryption
-EAPI=6
+EAPI=7
 HOMEPAGE=https://latchset.github.io/
 IUSE=bash-completion dracut udisks
 KEYWORDS=~amd64 ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=app-text/asciidoc >=sys-fs/luksmeta-8 dev-libs/openssl:0= >=dev-libs/jansson-2.10 >=dev-libs/jose-8 >=sys-fs/cryptsetup-2.0.4[pwquality] sys-apps/systemd dracut? ( sys-kernel/dracut ) udisks? ( sys-fs/udisks:2 >=sys-process/audit-2.7.8 ) bash-completion? ( app-shells/bash-completion )
 SLOT=0
 SRC_URI=https://github.com/latchset/clevis/releases/download/v11/clevis-11.tar.xz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=3136b3e2502cc2379d64557eefecbca3
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4e261bf5abb8dcfc75a2daf57f23dfbc
--- a/metadata/md5-cache/app-misc/piper-0.2.904
+++ b/metadata/md5-cache/app-misc/piper-0.2.904
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=virtual/pkgconfig dev-python/pygobject:3 >=x11-libs/gtk+-3.22:3[introspection] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=GTK application to configure gaming mice
-EAPI=6
-HOMEPAGE=https://github.com/libratbag/piper
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libratbag-0.9.905 dev-python/python-evdev[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-SLOT=0
-SRC_URI=https://github.com/libratbag/piper/archive/0.2.904.tar.gz -> piper-0.2.904.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5c00347fd4514c749642f76f77e7e943
--- a/metadata/md5-cache/app-misc/piper-0.3
+++ b/metadata/md5-cache/app-misc/piper-0.3
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=virtual/pkgconfig dev-python/pygobject:3 >=x11-libs/gtk+-3.22:3[introspection] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig dev-python/pygobject:3 >=x11-libs/gtk+-3.22:3[introspection]
 DESCRIPTION=GTK application to configure gaming mice
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/libratbag/piper
-IUSE=python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/libratbag-0.10 dev-python/python-evdev[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=>=dev-libs/libratbag-0.10 dev-python/python-evdev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.3.tar.gz -> piper-0.3.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e0b00dbee68f98148e45e5eb913b6988
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=4a7ec3dcfae13815b1e9a2063d08399d
--- a/metadata/md5-cache/dev-libs/jose-10
+++ b/metadata/md5-cache/dev-libs/jose-10
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=sys-libs/zlib >=dev-libs/jansson-2.10 dev-libs/openssl:0=
 DESCRIPTION=C-language implementation of Javascript Object Signing and Encryption
-EAPI=6
+EAPI=7
 HOMEPAGE=https://latchset.github.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=sys-libs/zlib >=dev-libs/jansson-2.10 dev-libs/openssl:0=
 SLOT=0
 SRC_URI=https://github.com/latchset/jose/releases/download/v10/jose-10.tar.bz2
-_md5_=9d00fd737e291861aa0155415084b92e
+_md5_=e5c11b49101cbfadc5163ad8a4ca5324
--- a/metadata/md5-cache/dev-libs/libratbag-0.10
+++ b/metadata/md5-cache/dev-libs/libratbag-0.10
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig dev-lang/swig doc? ( app-doc/doxygen ) !systemd? ( sys-auth/elogind ) test? ( dev-util/valgrind ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=Library to configure gaming mice
-EAPI=6
-HOMEPAGE=https://github.com/libratbag/libratbag
-IUSE=doc systemd test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libevdev virtual/libudev
-SLOT=0
-SRC_URI=https://github.com/libratbag/libratbag/archive/v0.10.tar.gz -> libratbag-0.10.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=01944fd1a1787d682c0925d7737d73d4
--- a/metadata/md5-cache/dev-libs/libratbag-0.11
+++ b/metadata/md5-cache/dev-libs/libratbag-0.11
@@ -1,13 +1,14 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig dev-lang/swig doc? ( app-doc/doxygen ) !systemd? ( sys-auth/elogind ) test? ( dev-util/valgrind ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DEPEND=virtual/pkgconfig dev-lang/swig doc? ( app-doc/doxygen ) !systemd? ( sys-auth/elogind ) test? ( dev-util/valgrind )
 DESCRIPTION=Library to configure gaming mice
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/libratbag/libratbag
-IUSE=doc systemd test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=doc systemd test python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.11.tar.gz -> libratbag-0.11.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=01944fd1a1787d682c0925d7737d73d4
+_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=c7a004a625cf9bc5f0a517b2e18b5ed1
--- a/metadata/md5-cache/dev-libs/libratbag-0.9.905
+++ b/metadata/md5-cache/dev-libs/libratbag-0.9.905
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig dev-lang/swig doc? ( app-doc/doxygen ) test? ( dev-util/valgrind ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
-DESCRIPTION=Library to configure gaming mice
-EAPI=6
-HOMEPAGE=https://github.com/libratbag/libratbag
-IUSE=doc test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/libevdev virtual/libudev
-SLOT=0
-SRC_URI=https://github.com/libratbag/libratbag/archive/v0.9.905.tar.gz -> libratbag-0.9.905.tar.gz
-_eclasses_=meson	b5ee7a05833ab91225acf30ffdeed006	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	25291c381052933ddf86bcffbfaff2ed	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
-_md5_=603de91a20d9398fffb0af7e39aece17
--- a/metadata/md5-cache/dev-python/ftfy-5.5.1
+++ b/metadata/md5-cache/dev-python/ftfy-5.5.1
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library that fixes text for you
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
-IUSE=python_targets_pypy python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/wcwidth python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/wcwidth python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/f/ftfy/ftfy-5.5.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8652a8dd29135811ffc687f9b07055fc
+_eclasses_=distutils-r1	48c123e514b2cd2128d36eb3bbb9a6fa	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=455dba7f17e7449486a1c546d84d7f16
--- a/metadata/md5-cache/dev-python/ftfy-5.6
+++ b/metadata/md5-cache/dev-python/ftfy-5.6
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library that fixes text for you
+EAPI=7
+HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
+IUSE=python_targets_python3_6 python_targets_python3_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=dev-python/wcwidth python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/f/ftfy/ftfy-5.6.tar.gz
+_eclasses_=distutils-r1	48c123e514b2cd2128d36eb3bbb9a6fa	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=455dba7f17e7449486a1c546d84d7f16
--- a/metadata/md5-cache/dev-python/wikipedia-1.4.0
+++ b/metadata/md5-cache/dev-python/wikipedia-1.4.0
@@ -1,14 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library that makes it easy to access and parse data from Wikipedia
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/goldsmith/Wikipedia
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup:4 >=dev-python/requests-2.6.0 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/beautifulsoup:4 >=dev-python/requests-2.6.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wikipedia/wikipedia-1.4.0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	distutils-r1	cf4de3b8bc5cae734e3faa4b36e64cf7	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=16d47931dde2290ba814b422fc523b52
+_eclasses_=distutils-r1	48c123e514b2cd2128d36eb3bbb9a6fa	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=11524fde3aeb92ae52a01e8299b8d6a0
--- a/metadata/md5-cache/gnome-extra/sushi-3.32.1
+++ b/metadata/md5-cache/gnome-extra/sushi-3.32.1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
+EAPI=7
+HOMEPAGE=https://git.gnome.org/browse/sushi
+IUSE=office
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/clutter-1.11.4:1.0[X,introspection] media-libs/clutter-gst:3.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[X,introspection] x11-libs/gtksourceview:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] >=gnome-base/nautilus-3.1.90 office? ( app-office/libreoffice )
+SLOT=0
+SRC_URI=mirror://gnome/sources/sushi/3.32/sushi-3.32.1.tar.xz
+_eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f8c974ba7698fe9fe61a8a5214801840
--- a/metadata/md5-cache/media-fonts/twemoji-ttf-12.1.4
+++ b/metadata/md5-cache/media-fonts/twemoji-ttf-12.1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm setup unpack
+DEPEND=app-arch/libarchive[zstd] X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=Twitter Emoji for everyone
+EAPI=7
+HOMEPAGE=https://twemoji.twitter.com/
+IUSE=X
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT CC-BY-4.0
+SLOT=0
+SRC_URI=https://archives.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/t/twitter-twemoji-fonts-12.1.4-1.fc32.noarch.rpm
+_eclasses_=font	af70de9a23b2f34d4fe4dcb222be0346
+_md5_=c23f131c0b97bea7a62c1420b1a5a1f6
--- a/metadata/md5-cache/net-misc/ipcalc-ng-0.2.5
+++ b/metadata/md5-cache/net-misc/ipcalc-ng-0.2.5
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=!net-misc/ipcalc geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )
-DESCRIPTION=an IPv4/IPv6 ipcalc tool
-EAPI=6
-HOMEPAGE=https://gitlab.com/ipcalc/ipcalc
-IUSE=geoip +geoip2
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!net-misc/ipcalc geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxminddb:= )
-REQUIRED_USE=?? ( geoip geoip2 )
-SLOT=0
-SRC_URI=https://gitlab.com/ipcalc/ipcalc/repository/archive.tar.bz2?ref=0.2.5 -> ipcalc-ng-0.2.5.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=7938624db6da6d0941ce47973fd58323
--- a/metadata/md5-cache/net-misc/ipcalc-ng-0.3.0
+++ b/metadata/md5-cache/net-misc/ipcalc-ng-0.3.0
@@ -11,5 +11,5 @@ RDEPEND=!net-misc/ipcalc geoip? ( dev-libs/geoip ) geoip2? ( dev-libs/libmaxmind
 REQUIRED_USE=?? ( geoip geoip2 )
 SLOT=0
 SRC_URI=https://gitlab.com/ipcalc/ipcalc/repository/archive.tar.bz2?ref=0.3.0 -> ipcalc-ng-0.3.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
-_md5_=a48cbb1efb8dbe9712ce713f9fe25763
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_md5_=ce3f66ff8e78fc10a97e0998733bbb92
--- a/metadata/md5-cache/sys-fs/luksmeta-8
+++ b/metadata/md5-cache/sys-fs/luksmeta-8
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=sys-fs/cryptsetup
-DESCRIPTION=LUKSMeta is a simple library for storing metadata in the LUKSv1 header
-EAPI=6
-HOMEPAGE=https://latchset.github.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=sys-fs/cryptsetup
-SLOT=0
-SRC_URI=https://github.com/latchset/luksmeta/releases/download/v8/luksmeta-8.tar.bz2
-_md5_=0d145baf2b1ae35bacce622fa088cc3d
--- a/metadata/md5-cache/sys-fs/luksmeta-9
+++ b/metadata/md5-cache/sys-fs/luksmeta-9
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
 DEPEND=app-text/asciidoc sys-fs/cryptsetup
 DESCRIPTION=LUKSMeta is a simple library for storing metadata in the LUKSv1 header
-EAPI=6
+EAPI=7
 HOMEPAGE=https://latchset.github.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
 RDEPEND=app-text/asciidoc sys-fs/cryptsetup
 SLOT=0
 SRC_URI=https://github.com/latchset/luksmeta/releases/download/v9/luksmeta-9.tar.bz2
-_md5_=6763a9ff958d301c774658935b4b02a5
+_md5_=54eb319024c0a34cb462894ca4a17f99
--- a/metadata/md5-cache/www-servers/tang-6
+++ b/metadata/md5-cache/www-servers/tang-6
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-libs/jose-8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Tang is a server for binding data to network presence
-EAPI=6
-HOMEPAGE=https://latchset.github.io/
-IUSE=nagios
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-libs/jose-8
-SLOT=0
-SRC_URI=https://github.com/latchset/tang/releases/download/v6/tang-6.tar.bz2
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=48c20239d95afe65e1dd46628cfb2ae9
--- a/metadata/md5-cache/www-servers/tang-7
+++ b/metadata/md5-cache/www-servers/tang-7
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure
-DEPEND=app-text/asciidoc >=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-libs/jose-8 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEPEND=app-text/asciidoc >=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-libs/jose-8
 DESCRIPTION=Tang is a server for binding data to network presence
-EAPI=6
+EAPI=7
 HOMEPAGE=https://latchset.github.io/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
@@ -9,4 +10,4 @@ RDEPEND=app-text/asciidoc >=net-libs/http-parser-2.8.0 sys-apps/systemd >=dev-li
 SLOT=0
 SRC_URI=https://github.com/latchset/tang/releases/download/v7/tang-7.tar.bz2
 _eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
-_md5_=04fd4d35dcd0cc4b1b8f9b5395ddded6
+_md5_=623958d408184a316e8046ca8ae0c123
--- a/metadata/md5-cache/x11-libs/bamf-0.5.4
+++ b/metadata/md5-cache/x11-libs/bamf-0.5.4
@@ -10,5 +10,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/dbus-glib dev-util/gdbus-codegen dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libwnck-3.4.7:3
 SLOT=0
 SRC_URI=http://launchpad.net/bamf/0.5/0.5.4/+download/bamf-0.5.4.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	c037bf23d7eff50e222b067cd54e5f27	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd
-_md5_=ed1ecdb74ba64ae59cc7b63565a26f6b
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	4eed5e0c72d4544a2291ae46515f5d79	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd
+_md5_=4c8e072eca947a4df34dcc0a4dc3c551
--- a/metadata/md5-cache/x11-misc/desktopfolder-1.1.1
+++ b/metadata/md5-cache/x11-misc/desktopfolder-1.1.1
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 x11-libs/gtksourceview:3 x11-libs/cairo[X] || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Organize your desktop with panels that hold your things
-EAPI=6
-HOMEPAGE=https://github.com/spheras/desktopfolder
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 x11-libs/gtksourceview:3 x11-libs/cairo[X]
-SLOT=0
-SRC_URI=https://github.com/spheras/desktopfolder/archive/v1.1.1.tar.gz -> desktopfolder-1.1.1.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	f7aef159261e9835066ddf8d3a0e3487	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9983cdd2eab14910a9102ae016f7fd4
--- a/metadata/md5-cache/x11-misc/desktopfolder-1.1.2
+++ b/metadata/md5-cache/x11-misc/desktopfolder-1.1.2
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 x11-libs/gtksourceview:3.0 || ( dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.42 dev-lang/vala:0.40 dev-lang/vala:0.36 )
+DESCRIPTION=Organize your desktop with panels that hold your things
+EAPI=7
+HOMEPAGE=https://github.com/spheras/desktopfolder
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgee:0.8 x11-libs/cairo[X] dev-libs/json-glib x11-libs/gdk-pixbuf x11-libs/libwnck:3 x11-libs/gtksourceview:3.0
+SLOT=0
+SRC_URI=https://github.com/spheras/desktopfolder/archive/v1.1.2.tar.gz -> desktopfolder-1.1.2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	meson	b5ee7a05833ab91225acf30ffdeed006	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	611c493a4cfef5254350fabc04b606f5	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f1a9e92bb85b51c63c3054198563c773
--- a/metadata/md5-cache/x11-misc/gpaste-3.30.2
+++ b/metadata/md5-cache/x11-misc/gpaste-3.30.2
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.30.0:0/3 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clipboard management system
-EAPI=6
-HOMEPAGE=https://github.com/Keruspe/GPaste
-IUSE=X bash-completion gnome vala zsh-completion
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.30.0:0/3 ) gnome? ( gnome-base/gnome-shell )
-SLOT=0
-SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.30.2.tar.gz -> gpaste-3.30.2.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bf18fe73866f7dbf51510431a128575e
--- a/metadata/md5-cache/x11-misc/gpaste-3.32.0
+++ b/metadata/md5-cache/x11-misc/gpaste-3.32.0
@@ -1,7 +1,8 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.32.0:0/4 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.32.0:0/4 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) )
 DESCRIPTION=Clipboard management system
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/Keruspe/GPaste
 IUSE=X bash-completion gnome vala zsh-completion
 KEYWORDS=~amd64 ~x86
@@ -9,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.32.0:0/4 ) gnome? ( gnome-base/gnome-shell )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.32.0.tar.gz -> gpaste-3.32.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8f6527f71f355dab1d82322dddbdd2f4
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=95343f98990e4f4ee93924c97cba311b
--- a/metadata/md5-cache/x11-misc/gpaste-3.34.0
+++ b/metadata/md5-cache/x11-misc/gpaste-3.34.0
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.34.0:0/5 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clipboard management system
-EAPI=6
-HOMEPAGE=https://github.com/Keruspe/GPaste
-IUSE=X bash-completion gnome vala zsh-completion
-LICENSE=GPL-3
-RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.34.0:0/5 ) gnome? ( gnome-base/gnome-shell )
-SLOT=0
-SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.34.0.tar.gz -> gpaste-3.34.0.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d114ceb38610720353317fb4b3ee5c91
--- a/metadata/md5-cache/x11-misc/gpaste-3.34.1
+++ b/metadata/md5-cache/x11-misc/gpaste-3.34.1
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.34.0:0/5 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.34.0:0/5 ) virtual/pkgconfig vala? ( || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] ) )
 DESCRIPTION=Clipboard management system
-EAPI=6
+EAPI=7
 HOMEPAGE=https://github.com/Keruspe/GPaste
 IUSE=X bash-completion gnome vala zsh-completion
 LICENSE=GPL-3
 RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=dev-libs/gobject-introspection-1.58.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.38:2 >=x11-libs/gtk+-3.24:3 X? ( x11-libs/libX11 x11-libs/libXi ) gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango >=x11-wm/mutter-3.34.0:0/5 ) gnome? ( gnome-base/gnome-shell )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.34.1.tar.gz -> gpaste-3.34.1.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d114ceb38610720353317fb4b3ee5c91
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=66d6c95945120eaf4cc3d6d611321bb1
--- a/metadata/md5-cache/x11-misc/plank-0.11.89
+++ b/metadata/md5-cache/x11-misc/plank-0.11.89
@@ -1,7 +1,7 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8 x11-libs/gtk+:3 x11-libs/bamf x11-libs/libX11 dev-libs/libdbusmenu x11-libs/libwnck:3 || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) gnome-base/gnome-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8 x11-libs/gtk+:3 x11-libs/bamf x11-libs/libX11 dev-libs/libdbusmenu x11-libs/libwnck:3 || ( dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.42[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) gnome-base/gnome-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig
 DESCRIPTION=Dock panel famious docky
-EAPI=6
+EAPI=7
 HOMEPAGE=https://launchpad.net/plank
 IUSE=+introspection doc static-libs
 KEYWORDS=~amd64 ~x86
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8 x11-libs/gtk+:3 x11-libs/bamf x11-libs/libX11 dev-libs/libdbusmenu x11-libs/libwnck:3
 SLOT=0
 SRC_URI=http://launchpad.net/plank/1.0/0.11.89/+download/plank-0.11.89.tar.xz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	1a42e8c41af42cb294817dcc5b7e3df6	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40c2c4e2b6569c1df5fb836e17b09e2b
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	682da46cf615b9f7a7d3680058139dcd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=795d5adb95163c47a829645d6538cc5b
--- a/net-misc/ipcalc-ng/Manifest
+++ b/net-misc/ipcalc-ng/Manifest
@@ -1,4 +1,2 @@
-DIST ipcalc-ng-0.2.5.tar.bz2 33161 BLAKE2B 40989eb8733d927f9fcb9c0333c94c975f20a59eb74a34610affdf8aad8dcf2379a990c295fc97e31f4dd2e9e6cf486989958cd2657630895574302343c7a7ec SHA512 fb671df613e0151fcd3c69b1513e20afe5234460794d596f0c4bf263a65af22636bb75a184a54ec13304ddf9d76144770b3f7dfa192100aad95f4ef9c9e1d800
 DIST ipcalc-ng-0.3.0.tar.bz2 40043 BLAKE2B eb7b4a07ef7075bed5fb35250a7d525949bcb3f14d00723de85bf47301db6dc45929dff6dfec8ca5b8c7db6890d0888302f45ee84411e1214793a3a27c1b1b6b SHA512 6fc64ca324ddbab43dec6819dd8cfd4509d3784c66e578357b6cb897e967d431552d309f6c9410e8ed51001428f721ad8338629a5b0a04f0924ca48b3163ad5c
-EBUILD ipcalc-ng-0.2.5.ebuild 821 BLAKE2B 1ca99f009b916550bba85759d0b500f30b2805a79d935afdcaf7320988f47d1a3f4a7edc74f77998e76fe875f6a9cf62b63bfb84dddd4164ddc67c2580b42196 SHA512 2aca1d3369624536019942228677885a98869ac709cc91f2ce768a9248b52e9734fff6445010a8781d3eb4b8aef80138df9eb3a146dd05f121aaf3a3046c39b7
-EBUILD ipcalc-ng-0.3.0.ebuild 742 BLAKE2B 99c15df474a400e4ee5385b6497f5c13437b5186b7d9087938c8a1fab457428e284149f06c36b2817d3d65cf2022594c736138c5cb305f0929b86f55b8fff4a6 SHA512 6738f3f2569c47698f8062339bfae2400b19ce367dd66620b235b8304f32434e2c24e405379b13588936ee78edf3d9d6e57f9eafe853cfe0611b0cf4e5318e3e
+EBUILD ipcalc-ng-0.3.0.ebuild 734 BLAKE2B 7ebd64c9a79a00114381ae8840532be06b06bc01256a12d9d71f1dd4eec5a439a99d3c5be556aa3e6ca07eec63fad91a66c1f6bf1bf6ef673ecb2254cab03d2f SHA512 22081e4cf690f65f3ee08763062b906f51aedd75950d6ff97e900eb3bb9606573f598e6cea12742dd09acc56796fffae5c7f89c965e706b53f1d75a07ac30beb
--- a/net-misc/ipcalc-ng/ipcalc-ng-0.2.5.ebuild
+++ b/net-misc/ipcalc-ng/ipcalc-ng-0.2.5.ebuild
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils vcs-snapshot toolchain-funcs
-
-MY_PN=${PN%%-ng}
-
-DESCRIPTION="an IPv4/IPv6 ipcalc tool"
-HOMEPAGE="https://gitlab.com/ipcalc/ipcalc"
-SRC_URI="https://gitlab.com/${MY_PN}/${MY_PN}/repository/archive.tar.bz2?ref=${PV} -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="geoip +geoip2"
-
-DEPEND="!net-misc/ipcalc
-	geoip? ( dev-libs/geoip )
-	geoip2? ( dev-libs/libmaxminddb:= )"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="?? ( geoip geoip2 )"
-
-src_compile() {
-	emake \
-	CC="$(tc-getCC)" LIBS="${LDFLAGS}" \
-	USE_GEOIP="$(usex geoip yes no)" \
-	USE_MAXMIND="$(usex geoip2 yes no)" \
-	USE_RUNTIME_LINKING="no"
-}
-
-src_install() {
-	dobin ${MY_PN}
-	doman ${MY_PN}.1
-	dodoc NEWS README.md
-}
--- a/net-misc/ipcalc-ng/ipcalc-ng-0.3.0.ebuild
+++ b/net-misc/ipcalc-ng/ipcalc-ng-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/sys-fs/luksmeta/Manifest
+++ b/sys-fs/luksmeta/Manifest
@@ -1,4 +1,3 @@
-DIST luksmeta-8.tar.bz2 282550 BLAKE2B bcff45194c0fe757a51527f5aaf7e6555ae7c7b1091b0da8ed59882486d5ec502b332f690a34697ffef39ae453e05211e1d6fe5aa87e18e33fe7298fee1c8a42 SHA512 463d3d9d9d034f19df9b3a0ef86577fead357b6e540ee364b5b1a06dd38d16de7b2096486de17ca76f7488af35a8a02170803f62d7a1c5c492cd8c2a59d72e73
 DIST luksmeta-9.tar.bz2 267561 BLAKE2B e131e918d7b080599d89bb5d7b63bff622371f2d97fe775929cc6fba21ee3c9581b0f0042fe7a7581eff16dc0a5e9d9bb3c668883b87ba2419c07328cfe15ef2 SHA512 eeecc3de9d621c380d29b2f2ca6ce715f09c20aac8ffc6a3d3cc7dc30c5dc46df686e61928d0accf7e7281ad9baa6ee59a0cf5b58635a311769d8e08c5cc94bd
-EBUILD luksmeta-8.ebuild 429 BLAKE2B ae65321bb413c6b95ff071d58e158199d5a3b4179b3dcdd02da619dcca0085f4fa830c9713a913990492e064f65a8191095eaeda88374981528ba16ca44975f6 SHA512 dd3e03f660eb2c675077bffee004a37e40ad9187d10eeda003cdf5150007fad5d109e77ae4af6f3b7422e6e200f46947605c58348e15ca947ee12bcc24ac9957
-EBUILD luksmeta-9.ebuild 448 BLAKE2B 5a680437859b9d16adeb52bb27e670cd13fd901ba6310dd8bdecd0afee50b313c78016e374925ccb89fc9af115b5d4d1a305927ec6fc6d90c24d93b4966d7532 SHA512 caf00e0e14c602bd8c510c3faa74784c6d27dc107e6f8dc2d5a31bc0466932428dd003bac6afbf6dbd9faa74377707f5d39b83fb8fbb80f6a59f9248f4e5af9f
+EBUILD luksmeta-9.ebuild 440 BLAKE2B 63282f25f344e861007474ecf077c94b771fea35b76b8ec86a2258099ebb62beb6973179a85fb741bb3b2a0a9ed840709917bdc9152ff351e92ae1f7fc69e97f SHA512 af04806ddb7b53766eb7952e4d6c18299351cefa68437bd13ee0ab07b90efa8390122bd778b1ac3a151a16d276233a214f5b2141621da9f121e13643606a51dd
+MISC metadata.xml 338 BLAKE2B 38c20081c3e9e7eb4e2fded0c2cd35509796e67f2c518e937f48e95e7e77a1670f5feec6cd30daf11cb7b6721fa6844a7b62fa54a6721705810538a5b541dbb1 SHA512 4031852ef2ed84c111a12e1b509a12d99b9f3907bac12f4c273acac91cec5537424babe76c8e37d70183280e78b6771f32cec7511e464099f0968d180e767f0d
--- a/sys-fs/luksmeta/luksmeta-8.ebuild
+++ b/sys-fs/luksmeta/luksmeta-8.ebuild
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="LUKSMeta is a simple library for storing metadata in the LUKSv1 header"
-HOMEPAGE="https://latchset.github.io/"
-SRC_URI="https://github.com/latchset/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-fs/cryptsetup"
-RDEPEND="${DEPEND}"
--- a/sys-fs/luksmeta/luksmeta-9.ebuild
+++ b/sys-fs/luksmeta/luksmeta-9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 DESCRIPTION="LUKSMeta is a simple library for storing metadata in the LUKSv1 header"
 HOMEPAGE="https://latchset.github.io/"
--- a/sys-fs/luksmeta/metadata.xml
+++ b/sys-fs/luksmeta/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/luksmeta</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/www-servers/tang/Manifest
+++ b/www-servers/tang/Manifest
@@ -1,5 +1,3 @@
-AUX tang-6-optional-nagios.patch 1644 BLAKE2B d267fbc83b869b902ccc726526aae1bf1184fc522a601c4eaf545bce07231879e1bedb9f4968a1d2bb71eaeef6684ed88cfb1ac07a5c50f9a26d2c9d71563c29 SHA512 f7cacc3248acccbe8cac0dc60e034b4e2ceaef127357b4e416f2ea8dfae7acab39881b39c3c32aa3a3235c9a94996e6bc9a20c6f486ffa0313001d056a87236f
-DIST tang-6.tar.bz2 118040 BLAKE2B 22b0ae89db9d742f488037ce0fb99893d7b963917dd843e36c66650893678e82b312f1fdbe29c7dd7898d473ac69064182836bc3eeae666379a4a2599eb99d42 SHA512 60883e45373a991c1e5e60e2313232bf36eacd0b3fcdc025a5358298636c92a074ac1a6b17f7b4096a20dcfca4402e162ae79137b3447a64d5091e6f96a95e5f
 DIST tang-7.tar.bz2 115130 BLAKE2B bb6c7cdf39aa012e51c9e4f9dc60fa5c4c9c7f6ff436570fa06ef5051d448e5e8ba24466d3be2bc990736fa287cfe7a8bcb3d46a8fd0033ccae4002d3affbe32 SHA512 dd4187fa6962523ac2a745ef05a27cdf7e5264c595942e63d406d67a1c595e87bd7e74091cb2e16362f369480cdf8e3b4bfe1fee13b9cb73d5308f42c52f138a
-EBUILD tang-6.ebuild 781 BLAKE2B 5b65428a905e9ce6b6c98e0cd14beec4000ee6467a8e7f670580823bd6249eeacb28e729fdc20d86593406075b462ed142e08bd5f9ca6f826ac362a531c0783b SHA512 23e34ebcf225abacc7779f02aef6dd407bfba3f4353ec23e63c820741ade5d13312132e3cbf6a689087892f379b326001eb3fc28e8c1e4db3d9da0ca340c90af
-EBUILD tang-7.ebuild 663 BLAKE2B 5be1a3c0731a32cfb919683f2b7d3acb126c34e01a737b602db2ba57aa7bf472305a567d8a1574a0e1d87b55192873432371a4aab8bd824a83dcda99033c864e SHA512 d0d25192626ecab7a0627d8d2fde8f61c46d283d5f5898b0bbbde09065a586c104a03fd43ac9335c0f36889c39009bf5b5a76ad0cb18b9e1538d95835063cde7
+EBUILD tang-7.ebuild 655 BLAKE2B 3ac63592505b4f5fada059ae0515f5ed578d98911903b872212dc3e549c0f99a7789857b6b7b7035d48775ea07bea064394b2bf0ab81d7c1d848fd5134da7ac1 SHA512 16704e3f11f7f7beff46ec81433ff5071337172b36cba5477222dde735ba48fd6abe991971d5119677890c64cd9888de649bcbe541f143bc3b525f3d68a97d14
+MISC metadata.xml 334 BLAKE2B 4b8d934cf034b5ce3636acc13d34b08aa36515da870995e80e7fece45f253aa4f79ef4ccebef444ac2ea4d10c1a402aa120449aae0ff70be970f73cda1964eae SHA512 b00716891bde2430054646106c60a4971201fdf4528ef9af009ae079c8ced3f003daa3fe49f74a3c5b4e4378c92c9ad518a034199c368c844c0326360eaea5be
--- a/www-servers/tang/files/tang-6-optional-nagios.patch
+++ b/www-servers/tang/files/tang-6-optional-nagios.patch
@@ -1,56 +0,0 @@
-diff -dNur a/configure.ac b/configure.ac
--- a/configure.ac	2017-06-14 14:20:42.000000000 +0200
-+++ b/configure.ac	2018-07-25 17:19:37.832581622 +0200
-@@ -29,6 +29,11 @@
- PKG_CHECK_MODULES([jose], [jose >= 8])
- PKG_CHECK_MODULES([systemd], [systemd])
- 
-+AC_ARG_ENABLE([nagiosplugin],
-+              AS_HELP_STRING([--disable-nagiosplugin], [Disable Nagios plugin]))
-+
-+AM_CONDITIONAL([NAGIOSPLUGIN], [test "x$enable_nagiosplugin" != "xno"])
-+
- AC_ARG_WITH([systemdsystemunitdir],
-             [AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files])],
-             [],
-diff -dNur a/Makefile.am b/Makefile.am
--- a/Makefile.am	2017-06-10 15:29:39.000000000 +0200
-+++ b/Makefile.am	2018-07-25 17:21:39.342292389 +0200
-@@ -16,12 +16,16 @@
- 
- dist_libexec_SCRIPTS = src/tangd-update src/tangd-keygen
- libexec_PROGRAMS = src/tangd
-+if NAGIOSPLUGIN
- nagios_PROGRAMS = src/tang
- man1_MANS = doc/tang-nagios.1
-+endif
- man8_MANS = doc/tang.8
- 
- src_tangd_SOURCES = src/http.c src/http.h src/tangd.c
-+if NAGIOSPLUGIN
- src_tang_SOURCES = src/nagios.c
-+endif
- 
- %: %.in
- 	$(AM_V_GEN)mkdir -p "`dirname "$@"`"
-@@ -32,12 +36,18 @@
- 		$(srcdir)/$@.in > $@
- 
- AM_TESTS_ENVIRONMENT = SD_ACTIVATE="@SD_ACTIVATE@" PATH=$(srcdir)/src:$(builddir)/src:$(PATH)
-TESTS = tests/adv tests/rec tests/nagios
-+TESTS = tests/adv tests/rec
-+if NAGIOSPLUGIN
-+TESTS += tests/nagios
-+endif
- 
- CLEANFILES = $(nodist_systemdsystemunit_DATA)
- EXTRA_DIST = \
-     $(foreach unit,$(nodist_systemdsystemunit_DATA),$(unit).in) \
-     COPYING \
-     $(TESTS) \
-    $(man1_MANS) \
-     $(man8_MANS)
-+
-+if NAGIOSPLUGIN
-+EXTRA_DIST += $(man1_MANS)
-+endif
--- a/www-servers/tang/metadata.xml
+++ b/www-servers/tang/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">latchset/tang</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/www-servers/tang/tang-6.ebuild
+++ b/www-servers/tang/tang-6.ebuild
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd
-
-DESCRIPTION="Tang is a server for binding data to network presence"
-HOMEPAGE="https://latchset.github.io/"
-SRC_URI="https://github.com/latchset/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nagios"
-
-DEPEND=">=net-libs/http-parser-2.8.0
-	sys-apps/systemd
-	>=dev-libs/jose-8"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-optional-nagios.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable nagios nagiosplugin)
-		--localstatedir="${EPREFIX}/var"
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	econf "${myconf[@]}"
-}
--- a/www-servers/tang/tang-7.ebuild
+++ b/www-servers/tang/tang-7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit autotools systemd

--- a/x11-libs/bamf/Manifest
+++ b/x11-libs/bamf/Manifest
@@ -1,2 +1,2 @@
 DIST bamf-0.5.4.tar.gz 638756 BLAKE2B 2ef28361ed5fc01a113c3b2a78617720d8d30a8403635951999633065f8a742bb4693f0ec76390639066a315a0007045db90777643b8b8656db1977fa81d844e SHA512 68a587d387ea1190b59207af81c9617aa8ebacb36b8eb6a790c62ccbd534c13bfd7cdb7b3b40a0c9109f5ec8da341b13743362506b080579a56ccf10e340de94
-EBUILD bamf-0.5.4.ebuild 1066 BLAKE2B 6c09a4e9a3f0fcf4f44b120e9815ad6ee6436052ed0088cbd1b069e0f4cae8b79c9cecc0616f9a08e9f1193884d4b675cc5b42b391eb9a4611c2a13dc58e5b26 SHA512 172e66a24513f266c1b32634fc9a6f7667e07023e7f5c2ed778e392c883eeec6988f11334a4a947b4cc916b535eb6268ba341f35b8bfbd616794378496a16ddf
+EBUILD bamf-0.5.4.ebuild 1056 BLAKE2B 6f93e7a2bcfd137ba67a6e5ade6c53f63b4f82989aa11103e8852d4f4c7a8e9099f0df1fd111c64014c4ab35f8a03299bfd4c65aa2c3be7798082ce066ebb47b SHA512 c5af432b55b775136c330b769d9751b66956b2ffff3c3ffdf265030da18455f183c9529b07ec5720628237509ff8257b5115458a5af979c9f354dace6d0fa926
--- a/x11-libs/bamf/bamf-0.5.4.ebuild
+++ b/x11-libs/bamf/bamf-0.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@@ -18,8 +18,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection doc static-libs"

-RDEPEND="
-	dev-libs/dbus-glib
+RDEPEND="dev-libs/dbus-glib
 	dev-util/gdbus-codegen
 	dev-libs/glib:2
 	gnome-base/libgtop:2
--- a/x11-misc/desktopfolder/Manifest
+++ b/x11-misc/desktopfolder/Manifest
@@ -1,3 +1,4 @@
-DIST desktopfolder-1.1.1.tar.gz 10775341 BLAKE2B 7a8086a5553e0d1d33d0606549d30ef6b73c44c9a6741ac831a1bc71952071e5ca2121d3db6b80395cbca4e1857659bf6210106444134a3cfcfc5792308291a2 SHA512 126374f23f714f97e8e42831b857b3d7079f1f5e197ead33848e82d157d2adea9045199c5bd761e6f75e18ffbd562394194b2e684d9816505612f5aee2cb9e93
-EBUILD desktopfolder-1.1.1.ebuild 683 BLAKE2B 3e179e2ecc426fac38f2eaa6008ae3654be477ee18fcdc362471a35da8cedd626cfa62cac928c92c1f3b1295bb95c8874fd9d17d9f6c690985256e86a70c70f8 SHA512 adec3ea4eee9a14a1742860b34d25cad803e35b9cf11f57c176e9326e65a65c2e227ebc6d432e1afdccd2d28ac60082c7512e13d542240997c500ff6a0eb828f
-MISC metadata.xml 342 BLAKE2B 8267eafecf7f85f0930a7950137ccfb33449ef93f57d298fd9b5bfe615a7305be4cdb4294d6c45359dcbe9e6f24c8a27aa39b4033366cf8e10b40393fdd01544 SHA512 286ae4ba615b5ee79f2c2c8a7d9878813fa5a2b513dae743b86653766e3702ea2c79ebbc51b315ef2af2263a1e4b9f6941ef2ac9ab945b4e6e52a6115e46f88e
+AUX desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch 403 BLAKE2B 0e2e35cd5e730021e2264dd429b2b39a1cec0cd0befae5595d4e65063d5cc53059ff5832b4d6f8f3c2f6360cbfffc4b586d53ad3a7449bffbe37a150b4bb1195 SHA512 d6ebfce3676bacb51ceb4268828fc09224c917b78f4772415a0a4441a6e20aeac3bf14c84d37df49277858dada0b53b5928ad90186585f725382202447b68c99
+DIST desktopfolder-1.1.2.tar.gz 10785764 BLAKE2B 051446427c775bd29706ea7214afa889b2d39389be5b8ef57cc2192417d81d9a7ee378063c0fc3518f1bde9f3174688ea5071a1fae34697dbf3b6140868f0473 SHA512 625b94b4dfefb8bf231969afb8b0244028d06ad6e81e978f303867126742a2f525e43725f6508810022d083212b07e3da0fb40c00d962e97fafabb5e74beadf4
+EBUILD desktopfolder-1.1.2.ebuild 912 BLAKE2B 9792be8b671149b5495f3e1144ea806924966e9147f84840a7a87d2477c807f38574eacc6606620a0083e2e4515abb1e6fe4a8be408870c96ac860475157180c SHA512 c40ff4b803b237aed938f7bf23e4f86d3bfcf435a3b00ccedb1f85eb6ae0b911f1994d7409039599058e385aed4908680f27911934a5fe610c553d8bc9d587a2
+MISC metadata.xml 342 BLAKE2B c1deb85332484882b97677db8ae5b7bbbeb9928e4be049417cce16a6d538a91159b8cc3671a4ad5ec37ef105f75f721bd282777c3edb3a29f794ccc21b82f62c SHA512 477075e44b7df03a1b69fa9871013006ffb2e7ab8e5acd0afe5400fc6cd77c20edc98a2063ad5cfec477873e7b5d11ba5ef6af6ed58db0670b3aeefa3c4c3df5
--- a/x11-misc/desktopfolder/desktopfolder-1.1.2.ebuild
+++ b/x11-misc/desktopfolder/desktopfolder-1.1.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 VALA_MIN_API_VERSION=0.34

-inherit gnome2 meson vala vcs-snapshot
+inherit gnome2-utils meson vala xdg-utils

 DESCRIPTION="Organize your desktop with panels that hold your things"
 HOMEPAGE="https://github.com/spheras/desktopfolder"
@@ -21,12 +21,29 @@ RDEPEND="dev-libs/libgee:0.8
 	dev-libs/json-glib
 	x11-libs/gdk-pixbuf
 	x11-libs/libwnck:3
-    x11-libs/gtksourceview:3
-	x11-libs/cairo[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)"
+	x11-libs/gtksourceview:3.0"
+DEPEND="
+	${RDEPEND}
+	$(vala_depend)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Port-to-GtkSourceView-4.patch"
+)

 src_prepare() {
 	default
 	vala_src_prepare
 }
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
--- a/x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch
+++ b/x11-misc/desktopfolder/files/desktopfolder-1.1.2-Port-to-GtkSourceView-4.patch
@@ -0,0 +1,12 @@
+diff -dNur a/meson.build b/meson.build
+--- a/meson.build	2020-01-02 12:08:47.000000000 +0100
+++ b/meson.build	2020-01-05 18:51:57.029831519 +0100
+@@ -92,7 +92,7 @@
+         dependency('json-glib-1.0'),
+         dependency('gdk-pixbuf-2.0'),
+         dependency('libwnck-3.0'),
+-        dependency('gtksourceview-3.0'),
+        dependency('gtksourceview-4'),
+         m_dep
+     ],
+     install : true
--- a/x11-misc/desktopfolder/metadata.xml
+++ b/x11-misc/desktopfolder/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>david.guglielmi@gmail.com</email>
-		<name>David Guglielmi</name>
+		<name>David GUGLIELMI</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">spheras/desktopfolder</remote-id>
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,7 +1,5 @@
-DIST gpaste-3.30.2.tar.gz 175087 BLAKE2B a819347f7f5db972d32543d1e7b0fad3813bbe344ab4ec178386954e81debe88f56d8ad140b88b3e0d611cc3ffad42756d6dad7a06074e560919ed51c54027e6 SHA512 1c1df57f22ff43bc11867f4f3acd94933c843a77fbb55ca2d6e9d69d17f6e294addcff6b50f618efc53abaa9ed744dd337ccd3748cbb7bf8696040182c71669c
 DIST gpaste-3.32.0.tar.gz 181159 BLAKE2B 664151a5cb9653158ad8c137951fbfc402c400421bbd0324598804135aa654407ff0e67ccd8c4f9c025423aa609df3278e64ac50af09033933ef3f0e26d88032 SHA512 f60983c50742c05bf42347ffdaeb00ad1bb691f7d752d8773545dd59f7bf7485e095e26e799983261ee41180b66631e99fa4b6c196057c1ec47e2e138dfa8160
 DIST gpaste-3.34.1.tar.gz 184922 BLAKE2B 3498d949706d79ae59dc1dae6cf547a9c6a32d539b3ede737b243abe4eea057869d9c06ed7fa7f81741f901f80f44554502a00b1b047d957086eb86898fb0b88 SHA512 0560b7a0616eaf271d13e2db98f924894236e2714f97d80e6dce1bbb3589073b812b4c641d5fe0557a17e4e05b7506ab90418c7b45ddf953059b970fd4eac52e
-EBUILD gpaste-3.30.2.ebuild 1530 BLAKE2B e6f98051b6bc7275d47fc3b1bff81d6cf531ac0f684086000b5b92f1a6f2b71a40c5e564be8e0f72ecfdc7f86aa3f6a19789a91c65741f3916613e5eb1b428ea SHA512 ac2ff5696250f563650eb585be2602cc3943dd11b00cd6b244a23b781e566985b33c769938c271ddc8873e948e9b65f1af0ef5e3c552fdf6d53cfe6459a40609
-EBUILD gpaste-3.32.0.ebuild 1530 BLAKE2B cb415f57936c2b786be9c8dfdd9c560a365e9554c8c1af73e376dc76f60333573ca613b778d3c08c3f6c58d5a6b13e266c57bf3501010ffe0cd324ef76cffd51 SHA512 12e3b7b021f27b3012658da0f9eb7da8b766502e8c57c80a1ef5fd8314d8e9c2cd344c9f46688688a729c801e157b35b97ad7bd7e51b8e162ae2b15234d9f260
-EBUILD gpaste-3.34.1.ebuild 1519 BLAKE2B 4e29f29b3720093984b184814f8cc2e5ff2f97264e4edb09761cd01d3d91b4cb968fd826c2dd0b13b988731bbcb1cb066cf2354bdf13bbab0fd9909a9a7b2dc4 SHA512 d2720632842535db4309959cbb727763028077eaac62d14a679e3ef6901a8c141c66c3ba2e0239a324d517b3ab6769066739cc176cd4263897d1467307143ee8
+EBUILD gpaste-3.32.0.ebuild 1534 BLAKE2B 8a7afb1cdad5725e1b3f432998984a47784affe793156ce880044f9ec647656b78c7e3ccd94ff4a35f9a5d73a59756a8856edd72a4df194ab66548199ad49351 SHA512 23bde3de55c201bace9d7e6c60926e1d5fc87b4a39b6004a74e3d34b3e1040cb204bf432d9249360c94e050292c47d5d08b65a1a06ca6982c626647481c0415f
+EBUILD gpaste-3.34.1.ebuild 1523 BLAKE2B 82ebc1125a4e84fc1435d5207eed986abc89f13dabc48bdcc3f38ee2a7f651c7f2dbf60b9413ab4be4d406c607a9605b717223f467097d3b01f299029dc98953 SHA512 69fb53a1fb3e667e3d48adade3bb84343beea85fbc138dd23eabb10567d4b2879df9048fb99a3afff79fd455523c28d10df24305b2711db3ddaa6117ac781d58
 MISC metadata.xml 595 BLAKE2B 7a8327f78e0e4cb106350051ff89a5677401e9ffa2d833e424da1f14a89c3147e59be124e6e0a26a3609f57c8a6078a00b6fce6a8f36889bafa5021539c0d89a SHA512 8fca7baa9d40775abe8ce7db98c5fc8e882d96e6200db5d84b6b1964369d6c499e344b30826c405368a18ca0f2caeab94d8dc44f648fe10f317075d82f60ca3d
--- a/x11-misc/gpaste/gpaste-3.30.2.ebuild
+++ b/x11-misc/gpaste/gpaste-3.30.2.ebuild
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VALA_MIN_API_VERSION="0.42"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils autotools gnome2-utils vala vcs-snapshot
-
-DESCRIPTION="Clipboard management system"
-HOMEPAGE="https://github.com/Keruspe/GPaste"
-SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X bash-completion gnome vala zsh-completion"
-
-CDEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/gjs-1.54.0
-	>=dev-libs/glib-2.58:2
-	>=dev-libs/gobject-introspection-1.58.0
-	sys-apps/dbus
-	>=x11-libs/gdk-pixbuf-2.38:2
-	>=x11-libs/gtk+-3.24:3
-	X? (
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	gnome? (
-		gnome-base/gnome-control-center:2
-		media-libs/clutter
-		x11-libs/pango
-		>=x11-wm/mutter-3.30.0:0/3
-	)
-"
-RDEPEND="${CDEPEND}
-	gnome? (
-		gnome-base/gnome-shell
-	)
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-	eautoreconf
-	vala_src_prepare
-
-	if ! use gnome ; then
-		echo "" > data/control-center.mk || die
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable X x-keybinder) \
-		$(use_enable bash-completion) \
-		$(use_enable vala) \
-		$(use_enable gnome gnome-shell-extension) \
-		$(use_enable zsh-completion) \
-		--disable-static \
-		--disable-schemas-compile
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
--- a/x11-misc/gpaste/gpaste-3.32.0.ebuild
+++ b/x11-misc/gpaste/gpaste-3.32.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 VALA_MIN_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

-inherit eutils autotools gnome2-utils vala vcs-snapshot
+inherit autotools eutils gnome2-utils vala vcs-snapshot

 DESCRIPTION="Clipboard management system"
 HOMEPAGE="https://github.com/Keruspe/GPaste"
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="X bash-completion gnome vala zsh-completion"

-CDEPEND="
-	dev-libs/appstream-glib
+CDEPEND="dev-libs/appstream-glib
 	>=dev-libs/gjs-1.54.0
 	>=dev-libs/glib-2.58:2
 	>=dev-libs/gobject-introspection-1.58.0
@@ -34,17 +33,12 @@ CDEPEND="
 		media-libs/clutter
 		x11-libs/pango
 		>=x11-wm/mutter-3.32.0:0/4
-	)
-"
+	)"
 RDEPEND="${CDEPEND}
-	gnome? (
-		gnome-base/gnome-shell
-	)
-"
+	gnome? ( gnome-base/gnome-shell )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
+	vala? ( $(vala_depend) )"

 src_prepare() {
 	default
@@ -69,7 +63,7 @@ src_configure() {

 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }

 pkg_preinst() {
--- a/x11-misc/gpaste/gpaste-3.34.1.ebuild
+++ b/x11-misc/gpaste/gpaste-3.34.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 VALA_MIN_API_VERSION="0.42"
 VALA_USE_DEPEND="vapigen"

-inherit eutils autotools gnome2-utils vala vcs-snapshot
+inherit autotools eutils gnome2-utils vala vcs-snapshot

 DESCRIPTION="Clipboard management system"
 HOMEPAGE="https://github.com/Keruspe/GPaste"
@@ -17,8 +17,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="X bash-completion gnome vala zsh-completion"

-CDEPEND="
-	dev-libs/appstream-glib
+CDEPEND="dev-libs/appstream-glib
 	>=dev-libs/gjs-1.54.0
 	>=dev-libs/glib-2.58:2
 	>=dev-libs/gobject-introspection-1.58.0
@@ -34,17 +33,12 @@ CDEPEND="
 		media-libs/clutter
 		x11-libs/pango
 		>=x11-wm/mutter-3.34.0:0/5
-	)
-"
+	)"
 RDEPEND="${CDEPEND}
-	gnome? (
-		gnome-base/gnome-shell
-	)
-"
+	gnome? ( gnome-base/gnome-shell )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
+	vala? ( $(vala_depend) )"

 src_prepare() {
 	default
@@ -69,7 +63,7 @@ src_configure() {

 src_install() {
 	default
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }

 pkg_preinst() {
--- a/x11-misc/plank/Manifest
+++ b/x11-misc/plank/Manifest
@@ -1,3 +1,3 @@
 AUX plank-0.11.89-allow-building-with-gettext-0.20.patch 1653 BLAKE2B d391c5053e091b8f54eb6cc6900d4535c08249011abe836242edb58a94fbe215bb5e3e3e0566b8deb33c51f5b45b98202249f711ce6881089c66f9b7a1a185ae SHA512 8847ef839d8d0b03ee71ebdd137a4d0d41117e002edf3ca863d27afbdfb197d8267459fd59980aeddb56ffd99f4a2fa1573c10070c05338a7dbf215a43923416
 DIST plank-0.11.89.tar.xz 593940 BLAKE2B b772cd8f728773be435327bf4cd36261d46b704305cc2a407f39bd8cefa77ad8e3b1f269dbbc96e45c9ab9e93ee1f5daf6c5c506c21380dfff378905a083188a SHA512 de78bcfb0614924980100b8f3067e10469163dffc34b2b7f2f2a5fa7798c5eea032bdc81a5136f17d93f485c7a4de680eb397835d2d1928ec1db06dd8b12ac40
-EBUILD plank-0.11.89.ebuild 882 BLAKE2B 7691010b41faacac7b8145da0a01b3a8a1f8e908268c598140961c26717c6eeba4ed53933418d0e06173decd373ac25bba30cc4fe8638c988df9024de8cea266 SHA512 54bbf5b19d66f0399dfda043190ca92bb3c980e4ff5ed71fceaa458caad2e53fca625bd76a4e0354530e65e903d2e5b2eabeae65b2c50a2d030848c153676637
+EBUILD plank-0.11.89.ebuild 1147 BLAKE2B 9e50800dd69969eb1c409d81142245b9939b0a8b310b5be5726ef143fb0ee0a9bf8ebda6b9ef4590f22d92d9b7f8a13e7f28920853bccfe75d1a39888fdd2f8c SHA512 70b65768223ed692591a396296cc0a953c7281f1d20c4b95693aa64b0ea7e19530729a77cee25c5e005bdbc659322c1fa8393e766aff704df0d6c41f9c906893
--- a/x11-misc/plank/plank-0.11.89.ebuild
+++ b/x11-misc/plank/plank-0.11.89.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 VALA_MIN_API_VERSION=0.26
 VALA_USE_DEPEND=vapigen

-inherit vala gnome2
+inherit vala gnome2-utils xdg-utils

 DESCRIPTION="Dock panel famious docky"
 HOMEPAGE="https://launchpad.net/plank"
@@ -40,3 +40,20 @@ src_prepare() {
 	NOCONFIGURE=1 REQUIRED_PKG_CONFIG_VERSION=0.1 ./autogen.sh
 	vala_src_prepare
 }
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
Author	SHA1	Message	Date
David Guglielmi	f2cc81f17b	metadata: update md5-cache	2020-01-05 20:24:04 +01:00
David Guglielmi	c01488918e	x11-misc/gpaste: die if libtool files pruning fail	2020-01-05 20:09:01 +01:00
David Guglielmi	ffa6d568cd	x11-misc/plank: prune libtool files	2020-01-05 20:07:50 +01:00
David Guglielmi	65108c2939	x11-misc/gpaste: fix prune_libtool_files command not found	2020-01-05 20:01:15 +01:00
David Guglielmi	bc38b5645b	overlay: cosmetic changes on ebuild syntax	2020-01-05 19:36:43 +01:00
David Guglielmi	18959c001f	x11-misc/plank: Port to EAPI 7	2020-01-05 19:36:29 +01:00
David Guglielmi	f34ab44d5b	x11-misc/gpaste: Port to EAPI 7, drop old 3.30.2	2020-01-05 19:20:42 +01:00
David Guglielmi	474eb1d077	x11-misc/desktopfolder: Bump to 1.1.2, Port to EAPI 7, Drop old 1.1.1	2020-01-05 19:15:08 +01:00
David Guglielmi	c420f98eb9	www-servers/tang: Port to EAPI 7, drop old 6	2020-01-05 18:34:38 +01:00
David Guglielmi	f09041962d	sys-fs/luksmeta: Port to EAPI 7, drop old 8	2020-01-05 18:31:29 +01:00
David Guglielmi	419cdfbf96	net-misc/ipcalc-ng: Drop old 0.2.5	2020-01-05 18:26:43 +01:00
David Guglielmi	e95d8622ce	dev-python/wikipedia: Port to EAPI 7	2020-01-05 18:23:52 +01:00
David Guglielmi	5a5825d600	dev-python/ftfy: Port to EAPI 7, Bump to 5.6	2020-01-05 18:17:54 +01:00
David Guglielmi	6868e3e4f8	dev-libs/jose: Port to EAPI 7	2020-01-05 18:13:37 +01:00
David Guglielmi	79c1bffb02	app-crypt/clevis: Port to EAPI 7, drop old	2020-01-05 18:09:52 +01:00
David Guglielmi	e5fd0a2f7a	app-misc/piper: Port to EAPI 7, drop old 0.2.904	2020-01-05 18:03:08 +01:00
David Guglielmi	c77fdd002e	dev-libs/libratbag: Port to EAPI 7, drop old 0.10	2020-01-05 18:02:01 +01:00
David Guglielmi	0b9b794493	gnome-extra/sushi: add upstream patch to depend on GtkSourceView 4	2020-01-05 16:30:06 +01:00
David Guglielmi	e21370b6f7	media-fonts/twemoji-ttf: add twemoji-ttf 12.1.4	2020-01-05 16:29:06 +01:00