metadata: update md5-cache

gnome-extra/sushi: drop from my ovelay
2025-12-06 11:42:40 +01:00 · 2020-05-01 15:44:22 +02:00 · 2020-05-01 15:44:07 +02:00 · 2020-05-01 15:13:56 +02:00 · 2020-05-01 15:13:32 +02:00
26 changed files with 719 additions and 184 deletions
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -1,4 +0,0 @@
-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
@@ -1,72 +0,0 @@
-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
@@ -1,12 +0,0 @@
-<?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
@@ -1,48 +0,0 @@
-# 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/metadata/md5-cache/app-crypt/clevis-11
+++ b/metadata/md5-cache/app-crypt/clevis-11
@@ -10,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	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=ef577e95267ef2c40bfec2b4860e8abe
--- a/metadata/md5-cache/app-crypt/clevis-12
+++ b/metadata/md5-cache/app-crypt/clevis-12
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=tpm2? ( app-crypt/tpm2-tools ) 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/v12/clevis-12.tar.xz
-_eclasses_=meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=1d00d497502acbce9e7ad7afd2f2fa31
--- a/metadata/md5-cache/app-misc/piper-0.3
+++ b/metadata/md5-cache/app-misc/piper-0.3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libratbag-0.10 dev-python/python-evdev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.3.tar.gz -> piper-0.3.tar.gz
-_eclasses_=meson	7e1b57786f9b4f7aa3bb403dbd65475f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73b31964b974668e7d0c93243793612d
--- a/metadata/md5-cache/app-misc/piper-0.4
+++ b/metadata/md5-cache/app-misc/piper-0.4
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libratbag-0.10 dev-python/python-evdev[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 SLOT=0
 SRC_URI=https://github.com/libratbag/piper/archive/0.4.tar.gz -> piper-0.4.tar.gz
-_eclasses_=meson	7e1b57786f9b4f7aa3bb403dbd65475f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=73b31964b974668e7d0c93243793612d
--- a/metadata/md5-cache/dev-libs/libratbag-0.12
+++ b/metadata/md5-cache/dev-libs/libratbag-0.12
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.12.tar.gz -> libratbag-0.12.tar.gz
-_eclasses_=meson	7e1b57786f9b4f7aa3bb403dbd65475f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=96ba168cd080217f0ef912dc944f0b0f
--- a/metadata/md5-cache/dev-libs/libratbag-0.13
+++ b/metadata/md5-cache/dev-libs/libratbag-0.13
@@ -10,5 +10,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libevdev virtual/libudev
 SLOT=0
 SRC_URI=https://github.com/libratbag/libratbag/archive/v0.13.tar.gz -> libratbag-0.13.tar.gz
-_eclasses_=meson	7e1b57786f9b4f7aa3bb403dbd65475f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
+_eclasses_=meson	ec6bf50968c54cd38e70bf708c92c299	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	udev	452708c3f55cf6e918b045adb949a9e6
 _md5_=96ba168cd080217f0ef912dc944f0b0f
--- a/metadata/md5-cache/dev-python/ftfy-5.5.1
+++ b/metadata/md5-cache/dev-python/ftfy-5.5.1
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that fixes text for you
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/wcwidth python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-python/wcwidth python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/ftfy/ftfy-5.5.1.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f219a6e03eeea27e128bf4e34bf6091
--- a/metadata/md5-cache/dev-python/ftfy-5.6
+++ b/metadata/md5-cache/dev-python/ftfy-5.6
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that fixes text for you
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/LuminosoInsight/python-ftfy
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/wcwidth python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+RDEPEND=dev-python/wcwidth python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/ftfy/ftfy-5.6.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=8f219a6e03eeea27e128bf4e34bf6091
--- a/metadata/md5-cache/dev-python/python-evdev-1.3.0
+++ b/metadata/md5-cache/dev-python/python-evdev-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1: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-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+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-42.0.2[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=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 DESCRIPTION=Python library for evdev bindings
@@ -7,9 +7,9 @@ HOMEPAGE=https://python-evdev.readthedocs.org/
 IUSE=python_targets_python3_6 python_targets_python3_7
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1: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(-)]
+RDEPEND=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=https://github.com/gvalkov/python-evdev/archive/v1.3.0.tar.gz -> python-evdev-1.3.0.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=e86d75c776e05ff98dfa014f74d09b86
--- a/metadata/md5-cache/dev-python/wikipedia-1.4.0
+++ b/metadata/md5-cache/dev-python/wikipedia-1.4.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7 ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library that makes it easy to access and parse data from Wikipedia
 EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/goldsmith/Wikipedia
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 x86
 LICENSE=MIT
-RDEPEND=dev-python/beautifulsoup:4 >=dev-python/requests-2.6.0 python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7 ) python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+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 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/w/wikipedia/wikipedia-1.4.0.tar.gz
-_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_eclasses_=distutils-r1	b33fa13a5178ad9bf895a5190d20cdc7	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
 _md5_=9c681e1938e95c94be144af6ffcaf37b
--- a/metadata/md5-cache/gnome-extra/sushi-3.32.1
+++ b/metadata/md5-cache/gnome-extra/sushi-3.32.1
@@ -1,14 +0,0 @@
-BDEPEND=app-arch/xz-utils >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.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	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f8c974ba7698fe9fe61a8a5214801840
--- 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	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=ce3f66ff8e78fc10a97e0998733bbb92
--- a/metadata/md5-cache/net-misc/ipcalc-ng-0.4.0
+++ b/metadata/md5-cache/net-misc/ipcalc-ng-0.4.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.4.0 -> ipcalc-ng-0.4.0.tar.bz2
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd
 _md5_=ce3f66ff8e78fc10a97e0998733bbb92
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
+++ b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
@@ -1,15 +1,15 @@
 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 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=xspice? ( app-emulation/spice python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+DEPEND=xspice? ( app-emulation/spice python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 DESCRIPTION=QEMU QXL paravirt video driver
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
 IUSE=xspice python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=xspice? ( app-emulation/spice python_targets_python3_6? ( >=dev-lang/python-3.6.10:3.6 ) python_targets_python3_7? ( >=dev-lang/python-3.7.7-r1:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.2:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
+RDEPEND=xspice? ( app-emulation/spice python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xorg-3	f7ca8dca6425a439b1b40844e6eb1ae7
 _md5_=22c150b899c9fe40a9d40507b22fb7a9
--- a/metadata/md5-cache/x11-libs/bamf-0.5.4
+++ b/metadata/md5-cache/x11-libs/bamf-0.5.4
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig >=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 prepare
-DEPEND=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 || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.17-r1:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] dev-libs/libxslt[python] introspection? ( dev-libs/gobject-introspection )
+DEPEND=dev-libs/dbus-glib dev-util/gdbus-codegen >=dev-libs/glib-2.38.0:2 gnome-base/libgtop:2 x11-libs/gtk+:3 x11-libs/libX11 >=x11-libs/libwnck-3.4.7:3 || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python] dev-libs/libxslt[python] introspection? ( dev-libs/gobject-introspection )
 DESCRIPTION=BAMF Application Matching Framework
 EAPI=7
 HOMEPAGE=https://launchpad.net/bamf
 IUSE=+introspection doc static-libs python_targets_python2_7
 KEYWORDS=amd64 x86
 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
+RDEPEND=dev-libs/dbus-glib dev-util/gdbus-codegen >=dev-libs/glib-2.38.0: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	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
-_md5_=1257663cf8b5397e20c6c772703153a7
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	python-r1	8386b016a2b3bbefa88443fdaa898057	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_md5_=6d26e9f64bab05f7a2602a603aca7e7d
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-0.0.1
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-0.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=media-libs/libwebp-0.4.3 >=x11-libs/gdk-pixbuf-2.22
 SLOT=0
 SRC_URI=https://github.com/aruiz/webp-pixbuf-loader/archive/0.0.1.tar.gz -> gdk-pixbuf-loader-webp-0.0.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=fc815f48c0a6a7d5dad45fa31d0e3127
--- a/metadata/md5-cache/x11-misc/desktopfolder-1.1.2
+++ b/metadata/md5-cache/x11-misc/desktopfolder-1.1.2
@@ -9,5 +9,5 @@ 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:4
 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	893e828f0f25f070f0b38d20c83c7670	meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=2bf812ff2b34805c394c30b1d46a7e7c
--- a/metadata/md5-cache/x11-misc/gpaste-3.32.1
+++ b/metadata/md5-cache/x11-misc/gpaste-3.32.1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.32.1.tar.gz -> gpaste-3.32.1.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=a092afd4d0729423372a3c1f12a114d6
--- a/metadata/md5-cache/x11-misc/gpaste-3.34.4
+++ b/metadata/md5-cache/x11-misc/gpaste-3.34.4
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/appstream-glib >=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.58:2 >=d
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.34.4.tar.gz -> gpaste-3.34.4.tar.gz
-_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	7e1b57786f9b4f7aa3bb403dbd65475f	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	727554821dab8292d3a8198893c2ef8b	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	ec6bf50968c54cd38e70bf708c92c299	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	dd532a387632f19bfc5523fc2289a9a0	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vala	5b72a65a36d681d65aef5f7b4b8b2cb6	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=bd78b070f287b0f083bcad3336d047d4
--- a/x11-libs/bamf/Manifest
+++ b/x11-libs/bamf/Manifest
@@ -1,2 +1,3 @@
+AUX bamf-0.5.4-fix-deprecated-g-type-class-add-private.patch 23068 BLAKE2B 154833041ff2ab30691d768519a907fbfb44a3e7d2686e61e0a7ccc9b4a923642b69f301b47143a8b94c889a03d13c7bd74dc7c7b1a1c4c0b65821644946ce18 SHA512 68682468c0a1829d2c66e00af54edae7bb438a4ffb779e3ab36688e460bd2d9ab10dcf54d62f0539ad884a284ffb94acffe785b854f704212cab440d1c5bd33c
 DIST bamf-0.5.4.tar.gz 638756 BLAKE2B 2ef28361ed5fc01a113c3b2a78617720d8d30a8403635951999633065f8a742bb4693f0ec76390639066a315a0007045db90777643b8b8656db1977fa81d844e SHA512 68a587d387ea1190b59207af81c9617aa8ebacb36b8eb6a790c62ccbd534c13bfd7cdb7b3b40a0c9109f5ec8da341b13743362506b080579a56ccf10e340de94
-EBUILD bamf-0.5.4.ebuild 1065 BLAKE2B 6da611f45acf108a07bff9b8d6bffaf1b7358abc039188056fa9f72098e054387ad3d8ef7a94c0c88cbf3a94f978d5ed573df9e2bd3194e0a085489c9b2bd4d3 SHA512 f89ba49fc6ebd148c4b2d59443f3f583dd92bfad3f42c616bd4dcddd6c729d8f8dd3f458f4f2df80fecea9de6798c0031ee2ef87cb5da086258b1ca0d1d515d7
+EBUILD bamf-0.5.4.ebuild 1153 BLAKE2B 6d8024565425813a78843d3b053f6b8c8137c9c9d0f0297439bd4f690864d725837f4c63dad3356ee3a887426cdd4365f7abc222d7e91497fba9266897f580a4 SHA512 49b139b5b521f77c68ae6f9489dab9b6912f0d529b8bf63157cd4d1b087b403efd599f5a07e4930fc38b4b088ebc6fcc75dd5745678fe6adfdd7bf4873ad7d90
--- a/x11-libs/bamf/bamf-0.5.4.ebuild
+++ b/x11-libs/bamf/bamf-0.5.4.ebuild
@@ -20,7 +20,7 @@ IUSE="+introspection doc static-libs"

 RDEPEND="dev-libs/dbus-glib
 	dev-util/gdbus-codegen
-	dev-libs/glib:2
+	>=dev-libs/glib-2.38.0:2
 	gnome-base/libgtop:2
 	x11-libs/gtk+:3
 	x11-libs/libX11
@@ -35,14 +35,18 @@ BDEPEND="virtual/pkgconfig"

 DOCS=(AUTHORS COPYING COPYING.LGPL ChangeLog NEWS README TODO)

+PATCHES=(
+	"${FILESDIR}/${P}-fix-deprecated-g-type-class-add-private.patch"
+)
+
 src_prepare() {
 	if use introspection; then
 		vala_src_prepare
 		export VALA_API_GEN="${VAPIGEN}"
 	fi

-	eautoreconf
 	default
+	eautoreconf
 }

 src_configure() {
--- a/x11-libs/bamf/files/bamf-0.5.4-fix-deprecated-g-type-class-add-private.patch
+++ b/x11-libs/bamf/files/bamf-0.5.4-fix-deprecated-g-type-class-add-private.patch
@@ -0,0 +1,680 @@
+diff -dNur a/configure.ac b/configure.ac
+--- a/configure.ac	2018-11-07 23:39:11.355315678 +0100
+++ b/configure.ac	2020-05-01 14:46:45.746228789 +0200
+@@ -44,7 +44,7 @@
+ #
+ # glib
+ #
+-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.38.0 gio-2.0 >= 2.30.0 gio-unix-2.0)
+ 
+ #
+ # gdbus-codegen
+diff -dNur a/lib/libbamf/bamf-application.c b/lib/libbamf/bamf-application.c
+--- a/lib/libbamf/bamf-application.c	2018-11-07 23:39:11.363315942 +0100
+++ b/lib/libbamf/bamf-application.c	2020-05-01 14:46:45.746228789 +0200
+@@ -45,11 +45,6 @@
+ #include <gio/gdesktopappinfo.h>
+ #include <string.h>
+ 
+-G_DEFINE_TYPE (BamfApplication, bamf_application, BAMF_TYPE_VIEW);
+-
+-#define BAMF_APPLICATION_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_APPLICATION, BamfApplicationPrivate))
+-
+ enum
+ {
+   DESKTOP_FILE_UPDATED,
+@@ -71,6 +66,8 @@
+   int                      show_stubs;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfApplication, bamf_application, BAMF_TYPE_VIEW);
+
+ /**
+  * bamf_application_get_supported_mime_types:
+  * @application: a #BamfApplication
+@@ -711,8 +708,6 @@
+   view_class->set_sticky = bamf_application_set_sticky;
+   view_class->click_behavior = bamf_application_get_click_suggestion;
+ 
+-  g_type_class_add_private (obj_class, sizeof (BamfApplicationPrivate));
+-
+   application_signals [DESKTOP_FILE_UPDATED] =
+     g_signal_new (BAMF_APPLICATION_SIGNAL_DESKTOP_FILE_UPDATED,
+                   G_OBJECT_CLASS_TYPE (klass),
+@@ -743,7 +738,7 @@
+ {
+   BamfApplicationPrivate *priv;
+ 
+-  priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
+  priv = self->priv = bamf_application_get_instance_private (self);
+   priv->show_stubs = -1;
+ 
+   g_signal_connect (self, "child-added", G_CALLBACK (bamf_application_on_child_added), NULL);
+diff -dNur a/lib/libbamf/bamf-control.c b/lib/libbamf/bamf-control.c
+--- a/lib/libbamf/bamf-control.c	2018-11-07 23:39:11.363315942 +0100
+++ b/lib/libbamf/bamf-control.c	2020-05-01 14:46:45.746228789 +0200
+@@ -39,16 +39,13 @@
+ #include "bamf-control.h"
+ #include "bamf-view-private.h"
+ 
+-G_DEFINE_TYPE (BamfControl, bamf_control, G_TYPE_OBJECT);
+-
+-#define BAMF_CONTROL_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_CONTROL, BamfControlPrivate))
+-
+ struct _BamfControlPrivate
+ {
+   BamfDBusControl *proxy;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfControl, bamf_control, G_TYPE_OBJECT);
+
+ /* Globals */
+ static BamfControl * default_control = NULL;
+ 
+@@ -87,7 +84,6 @@
+   obj_class->dispose = bamf_control_dispose;
+   obj_class->finalize = bamf_control_finalize;
+ 
+-  g_type_class_add_private (obj_class, sizeof (BamfControlPrivate));
+   obj_class->dispose = bamf_control_dispose;
+ }
+ 
+@@ -97,7 +93,7 @@
+   BamfControlPrivate *priv;
+   GError           *error = NULL;
+ 
+-  priv = self->priv = BAMF_CONTROL_GET_PRIVATE (self);
+  priv = self->priv = bamf_control_get_instance_private (self);
+ 
+   priv->proxy = _bamf_dbus_control_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+diff -dNur a/lib/libbamf/bamf-factory.c b/lib/libbamf/bamf-factory.c
+--- a/lib/libbamf/bamf-factory.c	2018-11-07 23:39:11.363315942 +0100
+++ b/lib/libbamf/bamf-factory.c	2020-05-01 14:46:45.746228789 +0200
+@@ -40,17 +40,14 @@
+ #include "bamf-application-private.h"
+ #include "bamf-view-private.h"
+ 
+-G_DEFINE_TYPE (BamfFactory, bamf_factory, G_TYPE_OBJECT);
+-
+-#define BAMF_FACTORY_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_FACTORY, BamfFactoryPrivate))
+-
+ struct _BamfFactoryPrivate
+ {
+   GHashTable *open_views;
+   GList *allocated_views;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfFactory, bamf_factory, G_TYPE_OBJECT);
+
+ static BamfFactory *static_factory = NULL;
+ 
+ static void on_view_weak_unref (BamfFactory *self, BamfView *view_was_here);
+@@ -107,15 +104,13 @@
+ 
+   obj_class->dispose = bamf_factory_dispose;
+   obj_class->finalize = bamf_factory_finalize;
+-
+-  g_type_class_add_private (obj_class, sizeof (BamfFactoryPrivate));
+ }
+ 
+ 
+ static void
+ bamf_factory_init (BamfFactory *self)
+ {
+-  self->priv = BAMF_FACTORY_GET_PRIVATE (self);
+  self->priv = bamf_factory_get_instance_private (self);
+   self->priv->open_views = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                                   g_free, g_object_unref);
+ }
+diff -dNur a/lib/libbamf/bamf-matcher.c b/lib/libbamf/bamf-matcher.c
+--- a/lib/libbamf/bamf-matcher.c	2018-11-07 23:39:11.363315942 +0100
+++ b/lib/libbamf/bamf-matcher.c	2020-05-01 14:47:19.098227093 +0200
+@@ -42,11 +42,6 @@
+ #include "bamf-view-private.h"
+ #include "bamf-factory.h"
+ 
+-G_DEFINE_TYPE (BamfMatcher, bamf_matcher, G_TYPE_OBJECT);
+-
+-#define BAMF_MATCHER_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_MATCHER, BamfMatcherPrivate))
+-
+ enum
+ {
+   VIEW_OPENED,
+@@ -68,6 +63,8 @@
+   BamfApplication *active_application;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfMatcher, bamf_matcher, G_TYPE_OBJECT);
+
+ static BamfMatcher * default_matcher = NULL;
+ 
+ static void bamf_matcher_dispose (GObject *object);
+@@ -87,7 +84,6 @@
+ {
+   GObjectClass *obj_class = G_OBJECT_CLASS (klass);
+ 
+-  g_type_class_add_private (obj_class, sizeof (BamfMatcherPrivate));
+   obj_class->dispose = bamf_matcher_dispose;
+   obj_class->finalize = bamf_matcher_finalize;
+ 
+@@ -279,7 +275,7 @@
+   BamfMatcherPrivate *priv;
+   GError *error = NULL;
+ 
+-  priv = self->priv = BAMF_MATCHER_GET_PRIVATE (self);
+  priv = self->priv = bamf_matcher_get_instance_private (self);
+   priv->cancellable = g_cancellable_new ();
+   priv->proxy = _bamf_dbus_matcher_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+                                                            G_DBUS_PROXY_FLAGS_NONE,
+diff -dNur a/lib/libbamf/bamf-tab.c b/lib/libbamf/bamf-tab.c
+--- a/lib/libbamf/bamf-tab.c	2018-11-07 23:39:11.367316076 +0100
+++ b/lib/libbamf/bamf-tab.c	2020-05-01 14:46:45.750228789 +0200
+@@ -29,8 +29,6 @@
+ #include "bamf-tab.h"
+ #include "bamf-view-private.h"
+ 
+-#define BAMF_TAB_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE (object, BAMF_TYPE_TAB, BamfTabPrivate))
+-
+ enum
+ {
+   PROP_0,
+@@ -47,7 +45,7 @@
+ 
+ static void bamf_tab_unset_proxy (BamfTab *self);
+ 
+-G_DEFINE_TYPE (BamfTab, bamf_tab, BAMF_TYPE_VIEW);
+G_DEFINE_TYPE_WITH_PRIVATE (BamfTab, bamf_tab, BAMF_TYPE_VIEW);
+ 
+ static void
+ on_proxy_property_change (GObject *gobject, GParamSpec *pspec, gpointer user_data)
+@@ -169,14 +167,12 @@
+   pspec = g_param_spec_boolean("is-foreground-tab", "Foreground tab", "Whether the tab is the foreground tab in it's toplevel container",
+                                FALSE, G_PARAM_READABLE);
+   g_object_class_install_property (obj_class, PROP_IS_FOREGROUND_TAB, pspec);
+-
+-  g_type_class_add_private (obj_class, sizeof(BamfTabPrivate));
+ }
+ 
+ static void
+ bamf_tab_init (BamfTab *self)
+ {
+-  self->priv = BAMF_TAB_GET_PRIVATE (self);
+  self->priv = bamf_tab_get_instance_private (self);
+ }
+ 
+ BamfTab *
+diff -dNur a/lib/libbamf/bamf-view.c b/lib/libbamf/bamf-view.c
+--- a/lib/libbamf/bamf-view.c	2018-11-07 23:39:11.371316208 +0100
+++ b/lib/libbamf/bamf-view.c	2020-05-01 14:46:45.750228789 +0200
+@@ -43,11 +43,6 @@
+ #include "bamf-tab.h"
+ #include "bamf-window.h"
+ 
+-G_DEFINE_TYPE (BamfView, bamf_view, G_TYPE_INITIALLY_UNOWNED);
+-
+-#define BAMF_VIEW_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_VIEW, BamfViewPrivate))
+-
+ enum
+ {
+   ACTIVE_CHANGED,
+@@ -93,6 +88,8 @@
+   gboolean          sticky;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfView, bamf_view, G_TYPE_INITIALLY_UNOWNED);
+
+ static void bamf_view_unset_proxy (BamfView *self);
+ 
+ /**
+@@ -943,8 +940,6 @@
+   properties[PROP_USER_VISIBLE] = g_param_spec_boolean ("user-visible", "user-visible", "user-visible", FALSE, G_PARAM_READABLE);
+   g_object_class_install_property (obj_class, PROP_USER_VISIBLE, properties[PROP_USER_VISIBLE]);
+ 
+-  g_type_class_add_private (obj_class, sizeof (BamfViewPrivate));
+-
+   view_signals [ACTIVE_CHANGED] =
+     g_signal_new (BAMF_VIEW_SIGNAL_ACTIVE_CHANGED,
+                   G_OBJECT_CLASS_TYPE (klass),
+@@ -1050,7 +1045,7 @@
+ {
+   BamfViewPrivate *priv;
+ 
+-  priv = self->priv = BAMF_VIEW_GET_PRIVATE (self);
+  priv = self->priv = bamf_view_get_instance_private (self);
+   priv->cancellable = g_cancellable_new ();
+   priv->is_closed = TRUE;
+   priv->reload_children = TRUE;
+diff -dNur a/lib/libbamf/bamf-window.c b/lib/libbamf/bamf-window.c
+--- a/lib/libbamf/bamf-window.c	2018-11-07 23:39:11.371316208 +0100
+++ b/lib/libbamf/bamf-window.c	2020-05-01 14:46:45.750228789 +0200
+@@ -40,11 +40,6 @@
+ #include "bamf-window.h"
+ #include "bamf-factory.h"
+ 
+-G_DEFINE_TYPE (BamfWindow, bamf_window, BAMF_TYPE_VIEW);
+-
+-#define BAMF_WINDOW_GET_PRIVATE(o) \
+-  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BAMF_TYPE_WINDOW, BamfWindowPrivate))
+-
+ struct _BamfWindowPrivate
+ {
+   BamfDBusItemWindow        *proxy;
+@@ -56,6 +51,8 @@
+   BamfWindowMaximizationType maximized;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfWindow, bamf_window, BAMF_TYPE_VIEW);
+
+ enum
+ {
+   MONITOR_CHANGED,
+@@ -412,8 +409,6 @@
+   GObjectClass  *obj_class  = G_OBJECT_CLASS (klass);
+   BamfViewClass *view_class = BAMF_VIEW_CLASS (klass);
+ 
+-  g_type_class_add_private (obj_class, sizeof (BamfWindowPrivate));
+-
+   obj_class->dispose = bamf_window_dispose;
+   view_class->active_changed = bamf_window_active_changed;
+   view_class->set_path = bamf_window_set_path;
+@@ -442,7 +437,7 @@
+ {
+   BamfWindowPrivate *priv;
+ 
+-  priv = self->priv = BAMF_WINDOW_GET_PRIVATE (self);
+  priv = self->priv = bamf_window_get_instance_private (self);
+   priv->xid = 0;
+   priv->pid = 0;
+   priv->type = BAMF_WINDOW_UNKNOWN;
+diff -dNur a/src/bamf-application.c b/src/bamf-application.c
+--- a/src/bamf-application.c	2018-11-07 23:39:11.375316341 +0100
+++ b/src/bamf-application.c	2020-05-01 14:46:45.750228789 +0200
+@@ -27,13 +27,7 @@
+ #include <string.h>
+ #include <gio/gdesktopappinfo.h>
+ 
+-#define BAMF_APPLICATION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_APPLICATION, BamfApplicationPrivate))
+-
+ static void bamf_application_dbus_application_iface_init (BamfDBusItemApplicationIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfApplication, bamf_application, BAMF_TYPE_VIEW,
+-                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_APPLICATION,
+-                                                bamf_application_dbus_application_iface_init));
+ 
+ struct _BamfApplicationPrivate
+ {
+@@ -48,6 +42,11 @@
+   gboolean show_stubs;
+ };
+ 
+G_DEFINE_TYPE_WITH_CODE (BamfApplication, bamf_application, BAMF_TYPE_VIEW,
+                         G_ADD_PRIVATE(BamfApplication)
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_APPLICATION,
+                                                bamf_application_dbus_application_iface_init));
+
+ enum
+ {
+   SUPPORTED_MIMES_CHANGED,
+@@ -1377,7 +1376,7 @@
+ bamf_application_init (BamfApplication * self)
+ {
+   BamfApplicationPrivate *priv;
+-  priv = self->priv = BAMF_APPLICATION_GET_PRIVATE (self);
+  priv = self->priv = bamf_application_get_instance_private (self);
+ 
+   priv->app_type = BAMF_APPLICATION_SYSTEM;
+   priv->show_stubs = TRUE;
+@@ -1447,8 +1446,6 @@
+   klass->get_close_when_empty = bamf_application_default_get_close_when_empty;
+   klass->supported_mimes_changed = bamf_application_supported_mime_types_changed;
+ 
+-  g_type_class_add_private (klass, sizeof (BamfApplicationPrivate));
+-
+   application_signals[SUPPORTED_MIMES_CHANGED] =
+     g_signal_new ("supported-mimes-changed",
+                   G_OBJECT_CLASS_TYPE (klass),
+diff -dNur a/src/bamf-control.c b/src/bamf-control.c
+--- a/src/bamf-control.c	2018-11-07 23:39:11.375316341 +0100
+++ b/src/bamf-control.c	2020-05-01 14:46:45.750228789 +0200
+@@ -26,10 +26,6 @@
+ #include "bamf-daemon.h"
+ #include "bamf-matcher.h"
+ 
+-G_DEFINE_TYPE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
+-#define BAMF_CONTROL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_CONTROL, BamfControlPrivate))
+-
+ struct _BamfControlPrivate
+ {
+   GDBusConnection *connection;
+@@ -37,6 +33,8 @@
+   GList *sources;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfControl, bamf_control, BAMF_DBUS_TYPE_CONTROL_SKELETON);
+
+ static void
+ bamf_control_on_launched_callback (GDBusConnection *connection,
+                                    const gchar *sender_name,
+@@ -147,7 +145,7 @@
+ static void
+ bamf_control_init (BamfControl * self)
+ {
+-  self->priv = BAMF_CONTROL_GET_PRIVATE (self);
+  self->priv = bamf_control_get_instance_private (self);
+   self->priv->sources = NULL;
+ 
+   /* Registering signal callbacks to reply to dbus method calls */
+@@ -193,8 +191,6 @@
+ 
+   obj_class->constructed = bamf_control_constructed;
+   obj_class->finalize = bamf_control_finalize;
+-
+-  g_type_class_add_private (klass, sizeof (BamfControlPrivate));
+ }
+ 
+ void
+diff -dNur a/src/bamf-daemon.c b/src/bamf-daemon.c
+--- a/src/bamf-daemon.c	2018-11-07 23:39:11.379316473 +0100
+++ b/src/bamf-daemon.c	2020-05-01 14:46:45.750228789 +0200
+@@ -21,10 +21,6 @@
+ #include "bamf-matcher.h"
+ #include "bamf-control.h"
+ 
+-G_DEFINE_TYPE (BamfDaemon, bamf_daemon, G_TYPE_OBJECT);
+-#define BAMF_DAEMON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-                                      BAMF_TYPE_DAEMON, BamfDaemonPrivate))
+-
+ static BamfDaemon *instance = NULL;
+ 
+ struct _BamfDaemonPrivate
+@@ -34,6 +30,8 @@
+   GMainLoop *loop;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfDaemon, bamf_daemon, G_TYPE_OBJECT);
+
+ gboolean
+ bamf_daemon_is_running (BamfDaemon *self)
+ {
+@@ -165,7 +163,7 @@
+ bamf_daemon_init (BamfDaemon *self)
+ {
+   BamfDaemonPrivate *priv;
+-  priv = self->priv = BAMF_DAEMON_GET_PRIVATE (self);
+  priv = self->priv = bamf_daemon_get_instance_private (self);
+ 
+   priv->loop = g_main_loop_new (NULL, FALSE);
+ }
+@@ -177,8 +175,6 @@
+ 
+   object_class->dispose  = bamf_daemon_dispose;
+   object_class->finalize = bamf_daemon_finalize;
+-
+-  g_type_class_add_private (klass, sizeof (BamfDaemonPrivate));
+ }
+ 
+ BamfDaemon *
+diff -dNur a/src/bamf-legacy-screen.c b/src/bamf-legacy-screen.c
+--- a/src/bamf-legacy-screen.c	2018-11-07 23:39:11.383316606 +0100
+++ b/src/bamf-legacy-screen.c	2020-05-01 14:46:45.750228789 +0200
+@@ -26,10 +26,6 @@
+ #include <libsn/sn.h>
+ #undef SN_API_NOT_YET_FROZEN
+ 
+-G_DEFINE_TYPE (BamfLegacyScreen, bamf_legacy_screen, G_TYPE_OBJECT);
+-#define BAMF_LEGACY_SCREEN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_LEGACY_SCREEN, BamfLegacyScreenPrivate))
+-
+ static BamfLegacyScreen *static_screen = NULL;
+ 
+ enum
+@@ -61,6 +57,8 @@
+   GDataInputStream *stream;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfLegacyScreen, bamf_legacy_screen, G_TYPE_OBJECT);
+
+ static void
+ handle_window_closed (BamfLegacyWindow *window, BamfLegacyScreen *self)
+ {
+@@ -459,7 +457,7 @@
+ static void
+ bamf_legacy_screen_init (BamfLegacyScreen * self)
+ {
+-  self->priv = BAMF_LEGACY_SCREEN_GET_PRIVATE (self);
+  self->priv = bamf_legacy_screen_get_instance_private (self);
+ }
+ 
+ static void
+@@ -469,8 +467,6 @@
+ 
+   object_class->finalize = bamf_legacy_screen_finalize;
+ 
+-  g_type_class_add_private (klass, sizeof (BamfLegacyScreenPrivate));
+-
+   legacy_screen_signals [WINDOW_OPENING] =
+     g_signal_new (BAMF_LEGACY_SCREEN_SIGNAL_WINDOW_OPENING,
+                   G_OBJECT_CLASS_TYPE (klass),
+diff -dNur a/src/bamf-legacy-window.c b/src/bamf-legacy-window.c
+--- a/src/bamf-legacy-window.c	2018-11-07 23:39:11.387316739 +0100
+++ b/src/bamf-legacy-window.c	2020-05-01 14:46:45.750228789 +0200
+@@ -29,10 +29,6 @@
+ #include <glibtop/procuid.h>
+ #include <stdio.h>
+ 
+-G_DEFINE_TYPE (BamfLegacyWindow, bamf_legacy_window, G_TYPE_OBJECT);
+-#define BAMF_LEGACY_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_LEGACY_WINDOW, BamfLegacyWindowPrivate))
+-
+ #define WNCK_WINDOW_BAMF_DATA "bamf-legacy-window"
+ 
+ enum
+@@ -59,6 +55,8 @@
+   gboolean     is_closed;
+ };
+ 
+G_DEFINE_TYPE_WITH_PRIVATE (BamfLegacyWindow, bamf_legacy_window, G_TYPE_OBJECT);
+
+ gboolean
+ bamf_legacy_window_is_active (BamfLegacyWindow *self)
+ {
+@@ -704,7 +702,7 @@
+ static void
+ bamf_legacy_window_init (BamfLegacyWindow * self)
+ {
+-  self->priv = BAMF_LEGACY_WINDOW_GET_PRIVATE (self);
+  self->priv = bamf_legacy_window_get_instance_private (self);
+ 
+   g_signal_connect (wnck_screen_get_default (), "window-closed",
+                     (GCallback) handle_window_closed, self);
+@@ -717,8 +715,6 @@
+ 
+   object_class->dispose = bamf_legacy_window_dispose;
+ 
+-  g_type_class_add_private (klass, sizeof (BamfLegacyWindowPrivate));
+-
+   legacy_window_signals [NAME_CHANGED] =
+     g_signal_new (BAMF_LEGACY_WINDOW_SIGNAL_NAME_CHANGED,
+                   G_OBJECT_CLASS_TYPE (klass),
+diff -dNur a/src/bamf-matcher.c b/src/bamf-matcher.c
+--- a/src/bamf-matcher.c	2018-11-07 23:39:11.387316739 +0100
+++ b/src/bamf-matcher.c	2020-05-01 14:46:45.750228789 +0200
+@@ -33,9 +33,7 @@
+ #define EXEC_DESKTOP_FILE_OVERRIDE "--desktop_file_hint"
+ #define ENV_DESKTOP_FILE_OVERRIDE "BAMF_DESKTOP_FILE_HINT"
+ 
+-G_DEFINE_TYPE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
+-#define BAMF_MATCHER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-                                       BAMF_TYPE_MATCHER, BamfMatcherPrivate))
+G_DEFINE_TYPE_WITH_PRIVATE (BamfMatcher, bamf_matcher, BAMF_DBUS_TYPE_MATCHER_SKELETON);
+ 
+ enum
+ {
+@@ -3111,7 +3109,7 @@
+   BamfLegacyScreen *screen;
+   int i;
+ 
+-  priv = self->priv = BAMF_MATCHER_GET_PRIVATE (self);
+  priv = self->priv = bamf_matcher_get_instance_private (self);
+ 
+   priv->bad_prefixes = g_array_sized_new (FALSE, TRUE, sizeof (GRegex *),
+                                           G_N_ELEMENTS (EXEC_BAD_PREFIXES));
+@@ -3274,7 +3272,6 @@
+ {
+   GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ 
+-  g_type_class_add_private (klass, sizeof (BamfMatcherPrivate));
+   object_class->dispose = bamf_matcher_dispose;
+   object_class->finalize = bamf_matcher_finalize;
+ 
+diff -dNur a/src/bamf-tab.c b/src/bamf-tab.c
+--- a/src/bamf-tab.c	2018-11-07 23:39:11.387316739 +0100
+++ b/src/bamf-tab.c	2020-05-01 14:46:45.750228789 +0200
+@@ -26,13 +26,7 @@
+ 
+ #include "bamf-tab.h"
+ 
+-#define BAMF_TAB_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_TAB, BamfTabPrivate))
+-
+ static void bamf_tab_dbus_iface_init (BamfDBusItemTabIface *iface);
+-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (BamfTab, bamf_tab, BAMF_TYPE_VIEW,
+-                                  G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_TAB,
+-                                                         bamf_tab_dbus_iface_init));
+ 
+ enum
+ {
+@@ -48,6 +42,11 @@
+   BamfDBusItemTab *dbus_iface;
+ };
+ 
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (BamfTab, bamf_tab, BAMF_TYPE_VIEW,
+                                  G_ADD_PRIVATE(BamfTab)
+                                  G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_TAB,
+                                                         bamf_tab_dbus_iface_init));
+
+ static const gchar *
+ bamf_tab_get_view_type (BamfView *view)
+ {
+@@ -170,7 +169,7 @@
+ static void
+ bamf_tab_init (BamfTab *self)
+ {
+-  self->priv = BAMF_TAB_GET_PRIVATE (self);
+  self->priv = bamf_tab_get_instance_private (self);
+ 
+   self->priv->dbus_iface = _bamf_dbus_item_tab_skeleton_new ();
+ 
+@@ -207,8 +206,6 @@
+   g_object_class_override_property (object_class, PROP_DESKTOP_ID, "desktop-id");
+   g_object_class_override_property (object_class, PROP_XID, "xid");
+   g_object_class_override_property (object_class, PROP_IS_FOREGROUND_TAB, "is-foreground-tab");
+-
+-  g_type_class_add_private (klass, sizeof (BamfTabPrivate));
+ }
+ 
+ 
+diff -dNur a/src/bamf-view.c b/src/bamf-view.c
+--- a/src/bamf-view.c	2018-11-07 23:39:11.391316872 +0100
+++ b/src/bamf-view.c	2020-05-01 14:46:45.750228789 +0200
+@@ -20,14 +20,7 @@
+ 
+ #include "bamf-view.h"
+ 
+-#define BAMF_VIEW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-                                    BAMF_TYPE_VIEW, BamfViewPrivate))
+-
+ static void bamf_view_dbus_view_iface_init (BamfDBusItemViewIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfView, bamf_view, BAMF_DBUS_ITEM_TYPE_OBJECT_SKELETON,
+-                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_VIEW,
+-                                                bamf_view_dbus_view_iface_init));
+-
+ #define STARTING_MAX_WAIT 15
+ 
+ enum
+@@ -84,6 +77,11 @@
+   guint active_changed_idle;
+ };
+ 
+G_DEFINE_TYPE_WITH_CODE (BamfView, bamf_view, BAMF_DBUS_ITEM_TYPE_OBJECT_SKELETON,
+                         G_ADD_PRIVATE(BamfView)
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_VIEW,
+                                                bamf_view_dbus_view_iface_init));
+
+ static gboolean
+ on_active_changed_idle (gpointer data)
+ {
+@@ -964,7 +962,7 @@
+ static void
+ bamf_view_init (BamfView * self)
+ {
+-  self->priv = BAMF_VIEW_GET_PRIVATE (self);
+  self->priv = bamf_view_get_instance_private (self);
+ 
+   /* Initializing the dbus interface */
+   self->priv->dbus_iface = _bamf_dbus_item_view_skeleton_new ();
+@@ -1031,8 +1029,6 @@
+   object_class->get_property = bamf_view_get_property;
+   object_class->set_property = bamf_view_set_property;
+ 
+-  g_type_class_add_private (klass, sizeof (BamfViewPrivate));
+-
+   /* Overriding the properties defined in the interface, this is needed
+    * but we actually don't use these properties, as we act like a proxy       */
+   g_object_class_override_property (object_class, PROP_NAME, "name");
+diff -dNur a/src/bamf-window.c b/src/bamf-window.c
+--- a/src/bamf-window.c	2018-11-07 23:39:11.395317004 +0100
+++ b/src/bamf-window.c	2020-05-01 14:46:45.750228789 +0200
+@@ -33,14 +33,7 @@
+ #define _GTK_APPLICATION_ID "_GTK_APPLICATION_ID"
+ #define SNAP_SECURITY_LABEL_PREFIX "snap."
+ 
+-#define BAMF_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE(obj, \
+-BAMF_TYPE_WINDOW, BamfWindowPrivate))
+-
+ static void bamf_window_dbus_iface_init (BamfDBusItemWindowIface *iface);
+-G_DEFINE_TYPE_WITH_CODE (BamfWindow, bamf_window, BAMF_TYPE_VIEW,
+-                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_WINDOW,
+-                                                bamf_window_dbus_iface_init));
+-
+ static GList *bamf_windows = NULL;
+ 
+ enum
+@@ -64,6 +57,11 @@
+ #endif
+ };
+ 
+G_DEFINE_TYPE_WITH_CODE (BamfWindow, bamf_window, BAMF_TYPE_VIEW,
+                         G_ADD_PRIVATE(BamfWindow)
+                         G_IMPLEMENT_INTERFACE (BAMF_DBUS_ITEM_TYPE_WINDOW,
+                                                bamf_window_dbus_iface_init));
+
+ BamfLegacyWindow *
+ bamf_window_get_window (BamfWindow *self)
+ {
+@@ -658,7 +656,7 @@
+ static void
+ bamf_window_init (BamfWindow * self)
+ {
+-  self->priv = BAMF_WINDOW_GET_PRIVATE (self);
+  self->priv = bamf_window_get_instance_private (self);
+ 
+   /* Initializing the dbus interface */
+   self->priv->dbus_iface = _bamf_dbus_item_window_skeleton_new ();
+@@ -725,8 +723,6 @@
+                                BAMF_TYPE_LEGACY_WINDOW,
+                                G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+   g_object_class_install_property (object_class, PROP_WINDOW, pspec);
+-
+-  g_type_class_add_private (klass, sizeof (BamfWindowPrivate));
+ }
+ 
+ BamfWindow *
Author	SHA1	Message	Date
David Guglielmi	ae046860c6	metadata: update md5-cache	2020-05-01 15:44:22 +02:00
David Guglielmi	244f3c9fac	gnome-extra/sushi: drop from my ovelay	2020-05-01 15:44:07 +02:00
David Guglielmi	4e73c1e8b4	metadata: update md5-cache	2020-05-01 15:13:56 +02:00
David Guglielmi	5621775913	x11-libs/bamf: fix build issue with glib deprecated macro	2020-05-01 15:13:32 +02:00