URI:
       Radical cleanup - overlay - drkhsh gentoo overlay
  HTML git clone git://git.drkhsh.at/overlay.git
   DIR Log
   DIR Files
   DIR Refs
   DIR README
       ---
   DIR commit b7de21cd770df9281cd1fbca62fcee939aece92f
   DIR parent 438fa01b6b49a632361ff5fd3fb6859b2e3ce8eb
  HTML Author: drkhsh <me@drkhsh.at>
       Date:   Sat, 29 Oct 2022 01:02:07 +0200
       
       Radical cleanup
       
       Diffstat:
         M README                              |       8 --------
         D app-misc/zzzy/metadata.xml          |      11 -----------
         D app-misc/zzzy/zzzy-9999.ebuild      |      37 -------------------------------
         M games-fps/assaultcube/files/assaul… |       0 
         D media-sound/beets/Manifest          |       1 -
         D media-sound/beets/beets-1.4.6.ebui… |      96 -------------------------------
         D media-sound/beets/metadata.xml      |      46 -------------------------------
         D media-sound/mixxx/Manifest          |       1 -
         D media-sound/mixxx/files/mixxx-2.1.… |      77 -------------------------------
         D media-sound/mixxx/metadata.xml      |      16 ----------------
         D media-sound/mixxx/mixxx-2.1.1.ebui… |     112 -------------------------------
         M overlay.xml                         |       6 +++---
         D x11-libs/gtk+/Manifest              |       4 ----
         D x11-libs/gtk+/files/gtk+-3.22.2-up… |     138 ------------------------------
         D x11-libs/gtk+/files/gtk+-atk-bridg… |      21 ---------------------
         D x11-libs/gtk+/files/gtk+-atk-bridg… |      16 ----------------
         D x11-libs/gtk+/files/gtk+-atk-bridg… |      25 -------------------------
         D x11-libs/gtk+/files/gtkrc           |      39 -------------------------------
         D x11-libs/gtk+/files/settings.ini    |       4 ----
         D x11-libs/gtk+/gtk+-3.22.16.ebuild   |     235 -------------------------------
         D x11-libs/gtk+/gtk+-3.22.19.ebuild   |     236 -------------------------------
         D x11-libs/gtk+/gtk+-3.22.29.ebuild   |     236 -------------------------------
         D x11-libs/gtk+/gtk+-3.22.30.ebuild   |     236 -------------------------------
         D x11-libs/gtk+/metadata.xml          |      23 -----------------------
       
       24 files changed, 3 insertions(+), 1621 deletions(-)
       ---
   DIR diff --git a/README b/README
       @@ -7,18 +7,10 @@ Everything should be reasonable commented and understandable.
        
        Included ebuilds
        ----------------
       -├── app-misc
       -│   └── zzzy
        ├── games-fps
        │   └── assaultcube
       -├── media-sound
       -│   └── mixxx
       -├── x11-libs
       -│   └── gtk+
        └─── x11-misc
            └── slstatus
        
        Patches/Changes
        ---------------
       -- media-sound/mixxx: 2.1 beta with removed D-Bus dependency
       -- x11-libs/gtk+: Removed D-Bus dependency by optionalizing ATK-Bridge
   DIR diff --git a/app-misc/zzzy/metadata.xml b/app-misc/zzzy/metadata.xml
       @@ -1,11 +0,0 @@
       -<?xml version="1.0" encoding="UTF-8"?>
       -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
       -<pkgmetadata>
       -        <maintainer type="person">
       -                <email>me@drkhsh.at</email>
       -                <name>Aaron Marcher</name>
       -        </maintainer>
       -        <longdescription>
       -                zzzy is a simple sleep cycle calculator.
       -        </longdescription>
       -</pkgmetadata>
   DIR diff --git a/app-misc/zzzy/zzzy-9999.ebuild b/app-misc/zzzy/zzzy-9999.ebuild
       @@ -1,37 +0,0 @@
       -# Copyright 1999-2018 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -inherit git-r3 savedconfig toolchain-funcs
       -
       -DESCRIPTION="simple sleep cycle calculator"
       -HOMEPAGE="https://git.drkhsh.at/zzzy"
       -EGIT_REPO_URI="git://git.drkhsh.at/zzzy"
       -
       -LICENSE="ISC"
       -SLOT="0"
       -KEYWORDS="amd64 ~x86"
       -IUSE=""
       -
       -RDEPEND=""
       -DEPEND="${RDEPEND}"
       -
       -src_prepare() {
       -        default
       -
       -        sed -i \
       -                -e "s/CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os/CFLAGS += -std=c99 -pedantic -Wall -Wextra/" \
       -                config.mk || die
       -
       -        restore_config config.h
       -}
       -
       -src_compile() {
       -        emake
       -}
       -
       -src_install() {
       -        emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
       -
       -        dodoc README
       -}
   DIR diff --git a/games-fps/assaultcube/files/assaultcube b/games-fps/assaultcube/files/assaultcube
   DIR diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
       @@ -1 +0,0 @@
       -DIST beets-1.4.6.tar.gz 1451376 BLAKE2B bcf21b25e109308fb226df80d52fddb34087950a9d100ca7de28ec1aca7c2aa32c6afefc323aceb338250ad03dd0ef9fa088dff46aff6d04efad5b6094d710a7 SHA512 26007fff252d26fdbabbfa60271bfb0454eeae0e510addf620dfa21cc9c4da2282ab5abfa3c6585eac810117aa331f966844d97b09624e51a438973bdeb8dcec
   DIR diff --git a/media-sound/beets/beets-1.4.6.ebuild b/media-sound/beets/beets-1.4.6.ebuild
       @@ -1,96 +0,0 @@
       -# Copyright 1999-2018 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=5
       -PYTHON_COMPAT=( python2_7 )
       -PYTHON_REQ_USE="sqlite"
       -inherit distutils-r1 eutils
       -
       -MY_PV=${PV/_beta/-beta.}
       -MY_P=${PN}-${MY_PV}
       -
       -DESCRIPTION="A media library management system for obsessive-compulsive music geeks"
       -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
       -HOMEPAGE="http://beets.io/ https://pypi.python.org/pypi/beets"
       -
       -KEYWORDS="~amd64 ~x86"
       -SLOT="0"
       -LICENSE="MIT"
       -IUSE="badfiles bpd chroma convert doc discogs flac gstreamer lastgenre lastimport mpdstats ogg opus replaygain test thumbnails web"
       -REQUIRED_USE="replaygain? ( gstreamer )"
       -
       -RDEPEND=">=dev-python/enum34-1.0.4[${PYTHON_USEDEP}]
       -        dev-python/jellyfish[${PYTHON_USEDEP}]
       -        dev-python/munkres[${PYTHON_USEDEP}]
       -        dev-python/requests[${PYTHON_USEDEP}]
       -        dev-python/requests-oauthlib[${PYTHON_USEDEP}]
       -        >=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
       -        dev-python/pyyaml[${PYTHON_USEDEP}]
       -        dev-python/unidecode[${PYTHON_USEDEP}]
       -        >=dev-python/six-1.9[${PYTHON_USEDEP}]
       -        >=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
       -        badfiles? ( media-sound/mp3val media-libs/flac )
       -        bpd? ( dev-python/bluelet[${PYTHON_USEDEP}] )
       -        chroma? ( dev-python/pyacoustid[${PYTHON_USEDEP}] )
       -        convert? ( media-video/ffmpeg:0[encode] )
       -        discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
       -        doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
       -        mpdstats? ( dev-python/python-mpd[${PYTHON_USEDEP}] )
       -        lastgenre? ( dev-python/pylast[${PYTHON_USEDEP}] )
       -        lastimport? ( dev-python/pylast[${PYTHON_USEDEP}] )
       -        replaygain? (
       -                gstreamer? ( media-libs/gstreamer:1.0[introspection]
       -                        media-libs/gst-plugins-good:1.0
       -                        dev-python/pygobject:3[${PYTHON_USEDEP}]
       -                        ogg? ( media-plugins/gst-plugins-ogg )
       -                        flac? ( media-plugins/gst-plugins-flac:1.0 )
       -                        opus? ( media-plugins/gst-plugins-opus:1.0 ) )
       -                )
       -        thumbnails? (
       -                dev-python/pyxdg[${PYTHON_USEDEP}]
       -                dev-python/pathlib[${PYTHON_USEDEP}]
       -                || ( dev-python/pillow[${PYTHON_USEDEP}] media-gfx/imagemagick )
       -                )
       -        web? ( dev-python/flask[${PYTHON_USEDEP}] dev-python/flask-cors[${PYTHON_USEDEP}] )"
       -DEPEND="${RDEPEND}
       -        dev-python/setuptools[${PYTHON_USEDEP}]"
       -
       -S=${WORKDIR}/${MY_P}
       -
       -src_prepare() {
       -        # remove plugins that do not have appropriate dependencies installed
       -        for flag in bpd chroma convert discogs lastgenre lastimport mpdstats replaygain thumbnails web; do
       -                if ! use ${flag}; then
       -                        rm -r beetsplug/${flag}.py || \
       -                        rm -r beetsplug/${flag}/ ||
       -                                die "Unable to remove ${flag} plugin"
       -                fi
       -        done
       -
       -        for flag in bpd lastgenre web; do
       -                if ! use ${flag}; then
       -                        sed -e "s:'beetsplug.${flag}',::" -i setup.py || \
       -                                die "Unable to disable ${flag} plugin "
       -                fi
       -        done
       -
       -        use bpd || rm -f test/test_player.py
       -
       -}
       -
       -python_compile_all() {
       -        use doc && emake -C docs html
       -}
       -
       -python_test() {
       -        cd test
       -        if ! use web; then
       -                rm test_web.py || die "Failed to remove test_web.py"
       -        fi
       -        "${PYTHON}" testall.py || die "Testsuite failed"
       -}
       -
       -python_install_all() {
       -        doman man/beet.1 man/beetsconfig.5
       -        use doc && dohtml -r docs/_build/html/
       -}
   DIR diff --git a/media-sound/beets/metadata.xml b/media-sound/beets/metadata.xml
       @@ -1,46 +0,0 @@
       -<?xml version="1.0" encoding="UTF-8"?>
       -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
       -<pkgmetadata>
       -        <maintainer type="project">
       -                <email>sound@gentoo.org</email>
       -        </maintainer>
       -        <longdescription lang="en">
       -                The purpose of beets is to get your music collection right once and for
       -                all. It catalogs your collection, automatically improving its metadata as
       -                it goes using the MusicBrainz database. (It also downloads cover art for
       -                albums it imports.) Then it provides a bouquet of tools for manipulating
       -                and accessing your music.
       -
       -                Because beets is designed as a library, it can do almost anything you can
       -                imagine for your music collection. Via plugins, beets becomes a panacea:
       -                * Embed and extract album art from files’ tags.
       -                * Listen to your library with a music player that speaks the MPD protocol
       -                and works with a staggering variety of interfaces.
       -                * Fetch lyrics for all your songs from databases on the Web.
       -                * Manage your MusicBrainz music collection.
       -                * Analyze music files’ metadata from the command line.
       -                * Clean up crufty tags left behind by other, less-awesome tools.
       -                * Browse your music library graphically through a Web browser and play it
       -                in any browser that supports HTML5 Audio.
       -
       -                If beets doesn’t do what you want yet, writing your own plugin is
       -                shockingly simple if you know a little Python.
       -        </longdescription>
       -        <use>
       -                <flag name="badfiles">Validate MP3 &amp; FLAC files</flag>
       -                <flag name="bpd">Enable support for <pkg>media-sound/mpd</pkg> server emulation</flag>
       -                <flag name="chroma">Enable support for acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
       -                <flag name="convert">Enable support for the convert plugin which makes it possible to transcode files</flag>
       -                <flag name="discogs">Enable support for the discogs API plugin</flag>
       -                <flag name="lastgenre">Enable support for importing music genres from last.fm tags</flag>
       -                <flag name="lastimport">Enable support for importing your last.fm playcounts</flag>
       -                <flag name="mpdstats">Enable support for collecting statistic about listening habits from <pkg>media-sound/mpd</pkg></flag>
       -                <flag name="opus">Enable opus support in gstreamer-based replaygain</flag>
       -                <flag name="replaygain">Enable support for Replay Gain metadata calculation during import</flag>
       -                <flag name="thumbnails">Generate thumbnails for albums</flag>
       -                <flag name="web">Enable embedded webserver support through <pkg>dev-python/flask</pkg></flag>
       -        </use>
       -        <upstream>
       -                <remote-id type="pypi">beets</remote-id>
       -        </upstream>
       -</pkgmetadata>
   DIR diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
       @@ -1 +0,0 @@
       -DIST release-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
   DIR diff --git a/media-sound/mixxx/files/mixxx-2.1.0-dbus.patch b/media-sound/mixxx/files/mixxx-2.1.0-dbus.patch
       @@ -1,77 +0,0 @@
       ---- mixxx-2.1.0/build/depends.py        2018-03-26 21:20:09.160438959 +0200
       -+++ mixxx-2.1.0/build/depends.py        2018-03-26 13:07:19.614659087 +0200
       -@@ -286,7 +286,6 @@
       -             elif not qt5 and not conf.CheckForPKG('QtCore', '4.6'):
       -                 raise Exception('QT >= 4.6 not found')
       - 
       --            qt_modules.extend(['QtDBus'])
       -             # This automatically converts QtXXX to Qt5XXX where appropriate.
       -             if qt5:
       -                 build.env.EnableQt5Modules(qt_modules, debug=False)
       ---- mixxx-2.1.0/src/util/screensaver.cpp        2018-03-26 21:16:39.680346842 +0200
       -+++ mixxx-2.1.0/src/util/screensaver.cpp        2018-03-26 21:17:36.967637297 +0200
       -@@ -24,7 +24,6 @@
       - #elif defined(Q_OS_WIN)
       - #  include <windows.h>
       - #elif defined(Q_OS_LINUX)
       --#  include <QtDBus>
       - #elif HAVE_XSCREENSAVER_SUSPEND
       - #  include <X11/extensions/scrnsaver.h>
       - #endif // Q_OS_WIN
       -@@ -224,54 +223,11 @@
       - 
       - void ScreenSaverHelper::inhibitInternal()
       - {
       --    if (!QDBusConnection::sessionBus().isConnected()) {
       --        qWarning("Cannot connect to the D-Bus session bus.\nTo start it, run:\n"
       --                "\teval `dbus-launch --auto-syntax`");
       --        return;
       --    }
       --    if (s_cookie > 0) {
       --        uninhibit();
       --    }
       --    s_cookie = 0;
       --    for (int i=0; SCREENSAVERS[i][0] != nullptr; i++ ) {
       --        QDBusInterface iface(SCREENSAVERS[i][0], SCREENSAVERS[i][1], SCREENSAVERS[i][2], 
       --            QDBusConnection::sessionBus());
       --        if (iface.isValid()) {
       --            QDBusReply<uint32_t> reply = iface.call(SCREENSAVERS[i][3], "org.mixxxdj","Mixxx active");
       --            if (reply.isValid()) {
       --                s_cookie = reply.value();
       --                s_saverindex = i;
       --                s_enabled = true;
       --                qDebug() << "DBus screensaver " << SCREENSAVERS[i][0] <<" inhibited";
       --                break;
       --            } else {
       --                qWarning() << "Call to inhibit for " << SCREENSAVERS[i][0] << " failed: " 
       --                    << reply.error().message();
       --            }
       --        } else {
       --            qDebug() << "DBus interface " << SCREENSAVERS[i][0] << " not valid";
       --        }
       --    }
       -+        return;
       - }
       - void ScreenSaverHelper::uninhibitInternal()
       - {
       --    if (s_cookie > 0) {
       --        s_enabled = false;
       --        QDBusInterface iface(SCREENSAVERS[s_saverindex][0], SCREENSAVERS[s_saverindex][1], 
       --            SCREENSAVERS[s_saverindex][2],  QDBusConnection::sessionBus());
       --        if (iface.isValid()) {
       --            QDBusReply<void> reply = iface.call("UnInhibit", s_cookie);
       --            if (reply.isValid()) {
       --                s_cookie = 0;
       --                qDebug() << "DBus screensaver " << SCREENSAVERS[s_saverindex][0] << " uninhibited";
       --            } else {
       --                qWarning() << "Call to uninhibit for " << SCREENSAVERS[s_saverindex][0] << " failed: " 
       --                    << reply.error().message();
       --            }
       --        } else {
       --            qDebug() << "DBus interface " << SCREENSAVERS[s_saverindex][0] << " not valid";
       --        }
       --    }
       -+        return;
       - }
       - 
       - #elif HAS_XWINDOW_SCREENSAVER
   DIR diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
       @@ -1,16 +0,0 @@
       -<?xml version='1.0' encoding='UTF-8'?>
       -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
       -<pkgmetadata>
       -        <maintainer type="project">
       -                <email>proaudio@gentoo.org</email>
       -                <name>Gentoo ProAudio Project</name>
       -        </maintainer>
       -        <use>
       -                <flag name="hid">Enable HID controller support</flag>
       -                <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
       -        </use>
       -        <upstream>
       -                <remote-id type="sourceforge">mixxx</remote-id>
       -                <remote-id type="github">mixxxdj/mixxx</remote-id>
       -        </upstream>
       -</pkgmetadata>
   DIR diff --git a/media-sound/mixxx/mixxx-2.1.1.ebuild b/media-sound/mixxx/mixxx-2.1.1.ebuild
       @@ -1,112 +0,0 @@
       -# Copyright 1999-2018 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -
       -inherit flag-o-matic scons-utils toolchain-funcs
       -
       -DESCRIPTION="Advanced Digital DJ tool based on Qt"
       -HOMEPAGE="https://www.mixxx.org/"
       -SRC_URI="https://github.com/mixxxdj/mixxx/archive/release-2.1.1.tar.gz"
       -S="${WORKDIR}"/mixxx-release-2.1.1
       -
       -LICENSE="GPL-2"
       -SLOT="0"
       -KEYWORDS="amd64 x86"
       -IUSE="aac debug doc ffmpeg hid mp3 opus shout usb wavpack"
       -
       -RDEPEND="
       -        dev-db/sqlite
       -        dev-libs/protobuf:0=
       -        dev-qt/qtcore:4
       -        dev-qt/qtgui:4
       -        dev-qt/qtopengl:4
       -        dev-qt/qtscript:4
       -        dev-qt/qtsql:4
       -        dev-qt/qtsvg:4
       -        media-libs/chromaprint
       -        media-libs/flac
       -        media-libs/libid3tag
       -        media-libs/libogg
       -        media-libs/libsndfile
       -        >=media-libs/libsoundtouch-1.5
       -        media-libs/libvorbis
       -        >=media-libs/portaudio-19_pre
       -        media-libs/portmidi
       -        media-libs/rubberband
       -        media-libs/taglib
       -        media-libs/vamp-plugin-sdk
       -        sci-libs/fftw:3.0=
       -        usb? ( virtual/libusb:1 )
       -        virtual/opengl
       -        x11-libs/libX11
       -        aac? (
       -                media-libs/faad2
       -                media-libs/libmp4v2:0
       -        )
       -        hid? ( dev-libs/hidapi )
       -        mp3? ( media-libs/libmad )
       -        shout? ( media-libs/libshout )
       -        wavpack? ( media-sound/wavpack )
       -        ffmpeg? ( media-video/ffmpeg:0= )
       -"
       -DEPEND="
       -        ${RDEPEND}
       -        virtual/pkgconfig
       -        dev-qt/qttest:4
       -        dev-qt/qtxmlpatterns:4
       -"
       -
       -PATCHES="
       -        "${FILESDIR}"/${PN}-2.1.0-dbus.patch
       -"
       -
       -src_prepare() {
       -        # use multilib compatible directory for plugins
       -        sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
       -
       -        default
       -}
       -
       -src_configure() {
       -        local myoptimize=0
       -
       -        # Try to get cpu type based on CFLAGS.
       -        # Bug #591968
       -        for i in $(get-flag mcpu) $(get-flag march) ; do
       -                if [[ ${i} = native ]] ; then
       -                        myoptimize="native"
       -                        break
       -                fi
       -        done
       -
       -        myesconsargs=(
       -                prefix="${EPREFIX}/usr"
       -                qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
       -                faad="$(usex aac 1 0)"
       -                ffmpeg="$(usex ffmpeg 1 0)"
       -                hid="$(usex hid 1 0)"
       -                bulk="$(usex usb 1 0)"
       -                mad="$(usex mp3 1 0)"
       -                opus="$(usex opus 1 0)"
       -                optimize="${myoptimize}"
       -                qdebug="$(usex debug 1 0)"
       -                shoutcast="$(usex shout 1 0)"
       -                vinylcontrol=1
       -                battery=0 # disable dbus
       -                wv="$(usex wavpack 1 0)"
       -        )
       -}
       -
       -src_compile() {
       -        CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
       -        LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
       -}
       -
       -src_install() {
       -        CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
       -        LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
       -                install_root="${ED}"/usr install
       -
       -        dodoc README Mixxx-Manual.pdf
       -}
   DIR diff --git a/overlay.xml b/overlay.xml
       @@ -7,13 +7,13 @@
                <homepage>https://drkhsh.at</homepage>
                <owner type="person">
                        <email>me@drkhsh.at</email>
       -                <name>Aaron Marcher</name>
       +                <name>drkhsh</name>
                </owner>
                <source type="git">git://git.drkhsh.at/overlay</source>
       -        <source type="git">git://git2zippk73b5w3m.onion/overlay</source>
       +        <source type="git">git://drkhsh4siy7k3cbbo5uik744bq73p7jl6psqfwr3evsi3qepixydokyd/overlay</source>
                <source type="git">https://github.com/drkhsh/overlay</source>
                <feed>https://git.drkhsh.at/overlay/atom.xml</feed>
       -        <feed>http://git2zippk73b5w3m.onion/overlay/atom.xml</feed>
       +        <feed>http://drkhsh4siy7k3cbbo5uik744bq73p7jl6psqfwr3evsi3qepixydokyd/overlay/atom.xml</feed>
                <feed>https://github.com/drkhsh/overlay/commits/master.atom</feed>
        </repo>
        </repositories>
   DIR diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
       @@ -1,4 +0,0 @@
       -DIST gtk+-3.22.16.tar.xz 18655144 BLAKE2B 947ef2768afbd7a242834e5eb1cef218f3978543193e18a4c216bb91be30482955f887b298a9a50786b0aa24613b924933994cc8472752587140bb796898afd0 SHA512 a981ba3c420db649645787916d603a22f1da9d839aba39f3786bab47f9a247867d94d342ce4c3aa47de4876072ed9cf3615304a73de7e613063cef08b8c0d612
       -DIST gtk+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
       -DIST gtk+-3.22.29.tar.xz 18964852 BLAKE2B a7551d604a1e27cba1d0580f2645bf4afff900908ce40d3d4d05cfb7348afc0620922e9b7939cf4ce2314ff489ffe38386aaf2634f3eff6591dfd0a225f19bc7 SHA512 046fa4458626e81ea7b1ddb753d53ecd91d0f2101af428cfdf77fe866bbe430cb3622203cc5e895b220a9364e35009245cdaf76e0cfa30d32d31095b5fcb42bc
       -DIST gtk+-3.22.30.tar.xz 18946084 BLAKE2B 020512f61ae9d265849bb684c55c6ad3f1e1726d73ce169cd482e781e614f22f37ac23bc721b1dc11df03f0d4e07333266cc8549633cb255ca99a85a499108d3 SHA512 31440a615cb2f406d0f904e59febb8f876106f27818ddd6951c76ab9bcb421ca480dae2bebfb1c4b1e03b833fc7c42e9feede053d9d71f19a02fe778e3197b38
   DIR diff --git a/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.22.2-update-icon-cache.patch
       @@ -1,138 +0,0 @@
       -From 101b43f4a38904ee21070a3e2eb5ba03dfe17647 Mon Sep 17 00:00:00 2001
       -From: Gilles Dartiguelongue <eva@gentoo.org>
       -Date: Tue, 1 Nov 2016 15:24:22 +0100
       -Subject: [PATCH] Always use external gtk-update-icon-cache
       -
       -Check for gtk-update-icon-cache to install demos, otherwise it is not
       -used when building.
       ----
       - configure.ac                     |  2 ++
       - demos/gtk-demo/Makefile.am       |  2 +-
       - demos/widget-factory/Makefile.am |  2 +-
       - docs/reference/gtk/Makefile.am   |  1 -
       - gtk/Makefile.am                  | 44 ----------------------------------------
       - 5 files changed, 4 insertions(+), 47 deletions(-)
       -
       -diff --git a/configure.ac b/configure.ac
       -index 4f9f183..ecf99dc 100644
       ---- a/configure.ac
       -+++ b/configure.ac
       -@@ -999,6 +999,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
       - 
       - AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
       - 
       -+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
       -+
       - ########################################
       - # Windowing system checks
       - ########################################
       -diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
       -index 8c15e16..5d774d2 100644
       ---- a/demos/gtk-demo/Makefile.am
       -+++ b/demos/gtk-demo/Makefile.am
       -@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
       - dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
       - dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
       - 
       --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
       -+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
       - 
       - install-data-hook: install-update-icon-cache
       - uninstall-hook: uninstall-update-icon-cache
       -diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
       -index a6bfbdc..28a3be2 100644
       ---- a/demos/widget-factory/Makefile.am
       -+++ b/demos/widget-factory/Makefile.am
       -@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
       - dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
       - dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
       - 
       --update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
       -+update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
       - 
       - install-data-hook: install-update-icon-cache
       - uninstall-hook: uninstall-update-icon-cache
       -diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
       -index 5a88a12..b51f3ac 100644
       ---- a/docs/reference/gtk/Makefile.am
       -+++ b/docs/reference/gtk/Makefile.am
       -@@ -504,7 +504,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
       - 
       - man_MANS =                                 \
       -         gtk-query-immodules-3.0.1        \
       --        gtk-update-icon-cache.1                \
       -         gtk-encode-symbolic-svg.1        \
       -         gtk-launch.1                        \
       -         gtk3-demo.1                        \
       -diff --git a/gtk/Makefile.am b/gtk/Makefile.am
       -index 3b76b82..d4c5681 100644
       ---- a/gtk/Makefile.am
       -+++ b/gtk/Makefile.am
       -@@ -1581,7 +1581,6 @@ endif
       - #
       - bin_PROGRAMS = \
       -         gtk-query-immodules-3.0        \
       --        gtk-update-icon-cache \
       -         gtk-encode-symbolic-svg \
       -         gtk-builder-tool \
       -         gtk-query-settings \
       -@@ -1594,9 +1593,6 @@ gtk_query_immodules_3_0_LDADD =                 \
       -         $(GMODULE_LIBS)                                \
       -         $(GTK_DEP_LIBS)
       - 
       --gtk_update_icon_cache_SOURCES = updateiconcache.c
       --gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
       --
       - gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
       - gtk_encode_symbolic_svg_LDADD =                        \
       -         $(GDK_PIXBUF_LIBS)                        \
       -@@ -1621,46 +1617,6 @@ gtk_launch_LDADD =                                \
       -         $(top_builddir)/gdk/libgdk-3.la                \
       -         $(GTK_DEP_LIBS)
       - 
       --if OS_WIN32
       --
       --# Workaround for UAC silliness: programs with "update" in their name
       --# are believed to be installers and require elevated privileges to be
       --# used... Embed a manifest file into executable to tell Windows that
       --# gtk-update-icon-cache.exe doesn't require any special privileges.
       --
       --GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
       --GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
       --GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
       --
       --$(GTK_UPDATE_ICON_CACHE_MANIFEST):
       --        (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
       --         echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
       --         echo '  <assemblyIdentity version="1.0.0.0"' ; \
       --         echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
       --         echo '     name="gtk-update-icon-cache.exe"' ; \
       --         echo '     type="win32"/>' ; \
       --         echo '  <!-- Identify the application security requirements. -->' ; \
       --         echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
       --         echo '    <security>' ; \
       --         echo '      <requestedPrivileges>' ; \
       --         echo '        <requestedExecutionLevel' ; \
       --         echo '          level="asInvoker"' ; \
       --         echo '          uiAccess="false"/>' ; \
       --         echo '        </requestedPrivileges>' ; \
       --         echo '       </security>' ; \
       --         echo '  </trustInfo>' ; \
       --         echo '</assembly>' ) >$@
       --
       --$(GTK_UPDATE_ICON_CACHE_RC):
       --        (echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
       --
       --$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
       --        $(WINDRES) --input $< --output $@ --output-format=coff
       --
       --gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
       --
       --endif
       --
       - .PHONY: files
       - 
       - files:
       --- 
       -2.10.1
       -
   DIR diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.ac.patch
       @@ -1,21 +0,0 @@
       -$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $
       -
       -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
       -
       ---- 1/configure.ac
       -+++ 2/configure.ac
       -@@ -1295,8 +1295,13 @@ AC_SUBST(GDK_DEP_CFLAGS)
       - # Check for Accessibility Toolkit flags
       - ########################################
       - 
       --if test x$enable_x11_backend = xyes; then
       -+AC_ARG_WITH(atk-bridge,
       -+           AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
       -+           :, with_atk_bridge=yes)
       -+
       -+if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then
       -    ATK_PACKAGES="atk atk-bridge-2.0"
       -+   AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
       - else
       -    ATK_PACKAGES="atk"
       - fi
   DIR diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-config.h.in.patch
       @@ -1,16 +0,0 @@
       -$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $
       -
       -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
       -
       ---- 1/config.h.in
       -+++ 1/config.h.in
       -@@ -21,6 +21,9 @@
       - /* Define the location where the catalogs will be installed */
       - #undef GTK_LOCALEDIR
       - 
       -+/* Define if we're using atk-bridge-2.0 */
       -+#undef HAVE_ATK_BRIDGE
       -+
       - /* Define to 1 if you have the `bind_textdomain_codeset' function. */
       - #undef HAVE_BIND_TEXTDOMAIN_CODESET
       - 
   DIR diff --git a/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch b/x11-libs/gtk+/files/gtk+-atk-bridge-gtkaccessibility.patch
       @@ -1,25 +0,0 @@
       -Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
       ---- 1/gtk/a11y/gtkaccessibility.c
       -+++ 1/gtk/a11y/gtkaccessibility.c
       -@@ -38,8 +38,10 @@
       - #include <gtk/gtkaccessible.h>
       - 
       - #ifdef GDK_WINDOWING_X11
       -+#ifdef HAVE_ATK_BRIDGE
       - #include <atk-bridge.h>
       - #endif
       -+#endif
       - 
       - static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
       -                                          guint                  n_param_values,
       -@@ -983,8 +985,10 @@ _gtk_accessibility_init (void)
       -   do_window_event_initialization ();
       - 
       - #ifdef GDK_WINDOWING_X11
       -+#ifdef HAVE_ATK_BRIDGE
       -   atk_bridge_adaptor_init (NULL, NULL);
       - #endif
       -+#endif
       - 
       -   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
       - }
   DIR diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
       @@ -1,39 +0,0 @@
       -style "default"
       -
       -{
       - font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
       -}
       -
       -style "button" = "default"
       -
       -{ 
       - bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
       -}
       -
       -style "treeitem"
       -{
       -bg[ACTIVE] = { 0.7, 0.7, 0.9 }
       -}
       -
       -style "scrollbar" = "button" 
       -{
       - bg[ACTIVE] = {0.6, 0.6, 0.6 }
       -}
       -
       -style "status" {
       - bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
       -}
       -
       -style "gtk-tooltips" {
       - bg[NORMAL] = "#ffff60"
       -}
       -
       -class "GtkWidget" style "default" 
       -class "GtkButton" style "button"
       -class "GtkItem" style "button"
       -class "GtkProgressBar" style "status"
       -class "GtkScrollbar" style "scrollbar"
       -class "GtkTreeItem" style "treeitem"
       -widget "gtk-tooltips" style "gtk-tooltips"
       -
       -
   DIR diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
       @@ -1,4 +0,0 @@
       -[Settings]
       -gtk-theme-name = Adwaita
       -gtk-icon-theme-name = gnome
       -gtk-cursor-theme-name = Adwaita
   DIR diff --git a/x11-libs/gtk+/gtk+-3.22.16.ebuild b/x11-libs/gtk+/gtk+-3.22.16.ebuild
       @@ -1,235 +0,0 @@
       -# Copyright 1999-2017 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -GNOME2_LA_PUNT="yes"
       -
       -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
       -
       -DESCRIPTION="Gimp ToolKit +"
       -HOMEPAGE="http://www.gtk.org/"
       -
       -LICENSE="LGPL-2+"
       -SLOT="3"
       -IUSE="aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
       -REQUIRED_USE="
       -        || ( aqua wayland X )
       -        xinerama? ( X )
       -"
       -
       -KEYWORDS="amd64 ~x86 ~alpha ~arm ~hppa ~la64 ~ppc ~ppc64 ~sparc"
       -
       -# Upstream wants us to do their job:
       -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
       -RESTRICT="test"
       -
       -# FIXME: introspection data is built against system installation of gtk+:3,
       -# bug #????
       -COMMON_DEPEND="
       -        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
       -        >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
       -        media-libs/fontconfig[${MULTILIB_USEDEP}]
       -        >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
       -        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
       -        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
       -        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
       -        x11-misc/shared-mime-info
       -
       -        cloudprint? (
       -                >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
       -                >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
       -        colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
       -        cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
       -        introspection? ( >=dev-libs/gobject-introspection-1.39:= )
       -        wayland? (
       -                >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
       -                >=dev-libs/wayland-protocols-1.7
       -                media-libs/mesa[wayland,${MULTILIB_USEDEP}]
       -                >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
       -        )
       -        X? (
       -                atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
       -                x11-libs/libX11[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
       -                x11-libs/libXext[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
       -                x11-libs/libXcursor[${MULTILIB_USEDEP}]
       -                x11-libs/libXfixes[${MULTILIB_USEDEP}]
       -                x11-libs/libXcomposite[${MULTILIB_USEDEP}]
       -                x11-libs/libXdamage[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
       -        )
       -"
       -DEPEND="${COMMON_DEPEND}
       -        app-text/docbook-xsl-stylesheets
       -        app-text/docbook-xml-dtd:4.1.2
       -        dev-libs/libxslt
       -        dev-libs/gobject-introspection-common
       -        >=dev-util/gdbus-codegen-2.48
       -        >=dev-util/gtk-doc-am-1.20
       -        >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
       -        virtual/pkgconfig[${MULTILIB_USEDEP}]
       -        X? (
       -                x11-proto/xextproto[${MULTILIB_USEDEP}]
       -                x11-proto/xproto[${MULTILIB_USEDEP}]
       -                x11-proto/inputproto[${MULTILIB_USEDEP}]
       -                x11-proto/damageproto[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
       -        )
       -        test? (
       -                media-fonts/font-misc-misc
       -                media-fonts/font-cursor-misc )
       -"
       -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
       -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
       -RDEPEND="${COMMON_DEPEND}
       -        >=dev-util/gtk-update-icon-cache-3
       -        !<gnome-base/gail-1000
       -        !<x11-libs/vte-0.31.0:2.90
       -        >=x11-themes/adwaita-icon-theme-3.14
       -"
       -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
       -PDEPEND="
       -        gnome-base/librsvg[${MULTILIB_USEDEP}]
       -        vim-syntax? ( app-vim/gtk-syntax )
       -"
       -
       -MULTILIB_CHOST_TOOLS=(
       -        /usr/bin/gtk-query-immodules-3.0$(get_exeext)
       -)
       -
       -strip_builddir() {
       -        local rule=$1
       -        shift
       -        local directory=$1
       -        shift
       -        sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
       -                || die "Could not strip director ${directory} from build."
       -}
       -
       -src_prepare() {
       -        if ! use test ; then
       -                # don't waste time building tests
       -                strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
       -
       -                # the tests dir needs to be build now because since commit
       -                # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
       -                # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
       -        fi
       -
       -        if ! use examples; then
       -                # don't waste time building demos
       -                strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
       -                strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
       -        fi
       -
       -        # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
       -        eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
       -
       -        # Use patches from BSD to make gtk3-atk-bridge a true option -
       -        # This was intentionally removed by upstream, see
       -        # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
       -        # This enables us to build gtk3 without the indirect dependency on dbus
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
       -
       -        eautoreconf
       -        gnome2_src_prepare
       -}
       -
       -multilib_src_configure() {
       -        # need libdir here to avoid a double slash in a path that libtool doesn't
       -        # grok so well during install (// between $EPREFIX and usr ...)
       -        ECONF_SOURCE=${S} \
       -        gnome2_src_configure \
       -                $(use_enable aqua quartz-backend) \
       -                $(use_enable broadway broadway-backend) \
       -                $(use_enable cloudprint) \
       -                $(use_enable colord) \
       -                $(use_enable cups cups auto) \
       -                $(multilib_native_use_enable introspection) \
       -                $(use_enable wayland wayland-backend) \
       -                $(use_enable X x11-backend) \
       -                $(use_enable X xcomposite) \
       -                $(use_enable X xdamage) \
       -                $(use_enable X xfixes) \
       -                $(use_enable X xkb) \
       -                $(use_enable X xrandr) \
       -                $(use_enable xinerama) \
       -                $(use_with atk-bridge) \
       -                --disable-papi \
       -                --disable-mir-backend \
       -                --enable-man \
       -                --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
       -                --libdir="${EPREFIX}"/usr/$(get_libdir) \
       -                CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
       -
       -        # work-around gtk-doc out-of-source brokedness
       -        if multilib_is_native_abi; then
       -                local d
       -                for d in gdk gtk libgail-util; do
       -                        ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
       -                done
       -        fi
       -}
       -
       -multilib_src_test() {
       -        "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
       -        GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
       -}
       -
       -multilib_src_install() {
       -        gnome2_src_install
       -}
       -
       -multilib_src_install_all() {
       -        insinto /etc/gtk-3.0
       -        doins "${FILESDIR}"/settings.ini
       -        # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
       -        DOCS=( AUTHORS NEWS README )
       -        einstalldocs
       -}
       -
       -pkg_preinst() {
       -        gnome2_pkg_preinst
       -
       -        multilib_pkg_preinst() {
       -                # Make immodules.cache belongs to gtk+ alone
       -                local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
       -
       -                if [[ -e ${EROOT}${cache} ]]; then
       -                        cp "${EROOT}"${cache} "${ED}"/${cache} || die
       -                else
       -                        touch "${ED}"/${cache} || die
       -                fi
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_preinst
       -}
       -
       -pkg_postinst() {
       -        gnome2_pkg_postinst
       -
       -        multilib_pkg_postinst() {
       -                gnome2_query_immodules_gtk3 \
       -                        || die "Update immodules cache failed (for ${ABI})"
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_postinst
       -
       -        if ! has_version "app-text/evince"; then
       -                elog "Please install app-text/evince for print preview functionality."
       -                elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
       -                elog "add it to your settings.ini file."
       -        fi
       -}
       -
       -pkg_postrm() {
       -        gnome2_pkg_postrm
       -
       -        if [[ -z ${REPLACED_BY_VERSION} ]]; then
       -                multilib_pkg_postrm() {
       -                        rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
       -                }
       -                multilib_foreach_abi multilib_pkg_postrm
       -        fi
       -}
   DIR diff --git a/x11-libs/gtk+/gtk+-3.22.19.ebuild b/x11-libs/gtk+/gtk+-3.22.19.ebuild
       @@ -1,236 +0,0 @@
       -# Copyright 1999-2017 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -GNOME2_LA_PUNT="yes"
       -
       -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
       -
       -DESCRIPTION="Gimp ToolKit +"
       -HOMEPAGE="https://www.gtk.org/"
       -
       -LICENSE="LGPL-2+"
       -SLOT="3"
       -IUSE="aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
       -REQUIRED_USE="
       -        || ( aqua wayland X )
       -        xinerama? ( X )
       -"
       -
       -KEYWORDS="amd64 ~x86 ~alpha ~arm ~hppa ~la64 ~ppc ~ppc64 ~sparc"
       -
       -# Upstream wants us to do their job:
       -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
       -RESTRICT="test"
       -
       -# FIXME: introspection data is built against system installation of gtk+:3,
       -# bug #????
       -COMMON_DEPEND="
       -        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
       -        >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
       -        media-libs/fontconfig[${MULTILIB_USEDEP}]
       -        >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
       -        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
       -        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
       -        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
       -        x11-misc/shared-mime-info
       -
       -        cloudprint? (
       -                >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
       -                >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
       -        colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
       -        cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
       -        introspection? ( >=dev-libs/gobject-introspection-1.39:= )
       -        wayland? (
       -                >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
       -                >=dev-libs/wayland-protocols-1.9
       -                media-libs/mesa[wayland,${MULTILIB_USEDEP}]
       -                >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
       -        )
       -        X? (
       -                atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
       -                x11-libs/libX11[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
       -                x11-libs/libXext[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
       -                x11-libs/libXcursor[${MULTILIB_USEDEP}]
       -                x11-libs/libXfixes[${MULTILIB_USEDEP}]
       -                x11-libs/libXcomposite[${MULTILIB_USEDEP}]
       -                x11-libs/libXdamage[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
       -        )
       -"
       -DEPEND="${COMMON_DEPEND}
       -        app-text/docbook-xsl-stylesheets
       -        app-text/docbook-xml-dtd:4.1.2
       -        dev-libs/libxslt
       -        dev-libs/gobject-introspection-common
       -        >=dev-util/gdbus-codegen-2.48
       -        >=dev-util/gtk-doc-am-1.20
       -        >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
       -        virtual/pkgconfig[${MULTILIB_USEDEP}]
       -        X? (
       -                x11-proto/xextproto[${MULTILIB_USEDEP}]
       -                x11-proto/xproto[${MULTILIB_USEDEP}]
       -                x11-proto/inputproto[${MULTILIB_USEDEP}]
       -                x11-proto/damageproto[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
       -        )
       -        test? (
       -                media-fonts/font-misc-misc
       -                media-fonts/font-cursor-misc )
       -"
       -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
       -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
       -RDEPEND="${COMMON_DEPEND}
       -        >=dev-util/gtk-update-icon-cache-3
       -        !<gnome-base/gail-1000
       -        !<x11-libs/vte-0.31.0:2.90
       -"
       -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
       -PDEPEND="
       -        gnome-base/librsvg[${MULTILIB_USEDEP}]
       -        >=x11-themes/adwaita-icon-theme-3.14
       -        vim-syntax? ( app-vim/gtk-syntax )
       -"
       -
       -MULTILIB_CHOST_TOOLS=(
       -        /usr/bin/gtk-query-immodules-3.0$(get_exeext)
       -)
       -
       -strip_builddir() {
       -        local rule=$1
       -        shift
       -        local directory=$1
       -        shift
       -        sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
       -                || die "Could not strip director ${directory} from build."
       -}
       -
       -src_prepare() {
       -        if ! use test ; then
       -                # don't waste time building tests
       -                strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
       -
       -                # the tests dir needs to be build now because since commit
       -                # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
       -                # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
       -        fi
       -
       -        if ! use examples; then
       -                # don't waste time building demos
       -                strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
       -                strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
       -        fi
       -
       -        # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
       -        eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
       -
       -
       -        # Use patches from BSD to make gtk3-atk-bridge a true option -
       -        # This was intentionally removed by upstream, see
       -        # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
       -        # This enables us to build gtk3 without the indirect dependency on dbus
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
       -
       -        eautoreconf
       -        gnome2_src_prepare
       -}
       -
       -multilib_src_configure() {
       -        # need libdir here to avoid a double slash in a path that libtool doesn't
       -        # grok so well during install (// between $EPREFIX and usr ...)
       -        ECONF_SOURCE=${S} \
       -        gnome2_src_configure \
       -                $(use_enable aqua quartz-backend) \
       -                $(use_enable broadway broadway-backend) \
       -                $(use_enable cloudprint) \
       -                $(use_enable colord) \
       -                $(use_enable cups cups auto) \
       -                $(multilib_native_use_enable introspection) \
       -                $(use_enable wayland wayland-backend) \
       -                $(use_enable X x11-backend) \
       -                $(use_enable X xcomposite) \
       -                $(use_enable X xdamage) \
       -                $(use_enable X xfixes) \
       -                $(use_enable X xkb) \
       -                $(use_enable X xrandr) \
       -                $(use_enable xinerama) \
       -                $(use_with atk-bridge) \
       -                --disable-papi \
       -                --disable-mir-backend \
       -                --enable-man \
       -                --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
       -                --libdir="${EPREFIX}"/usr/$(get_libdir) \
       -                CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
       -
       -        # work-around gtk-doc out-of-source brokedness
       -        if multilib_is_native_abi; then
       -                local d
       -                for d in gdk gtk libgail-util; do
       -                        ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
       -                done
       -        fi
       -}
       -
       -multilib_src_test() {
       -        "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
       -        GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
       -}
       -
       -multilib_src_install() {
       -        gnome2_src_install
       -}
       -
       -multilib_src_install_all() {
       -        insinto /etc/gtk-3.0
       -        doins "${FILESDIR}"/settings.ini
       -        # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
       -        DOCS=( AUTHORS NEWS README )
       -        einstalldocs
       -}
       -
       -pkg_preinst() {
       -        gnome2_pkg_preinst
       -
       -        multilib_pkg_preinst() {
       -                # Make immodules.cache belongs to gtk+ alone
       -                local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
       -
       -                if [[ -e ${EROOT}${cache} ]]; then
       -                        cp "${EROOT}"${cache} "${ED}"/${cache} || die
       -                else
       -                        touch "${ED}"/${cache} || die
       -                fi
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_preinst
       -}
       -
       -pkg_postinst() {
       -        gnome2_pkg_postinst
       -
       -        multilib_pkg_postinst() {
       -                gnome2_query_immodules_gtk3 \
       -                        || die "Update immodules cache failed (for ${ABI})"
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_postinst
       -
       -        if ! has_version "app-text/evince"; then
       -                elog "Please install app-text/evince for print preview functionality."
       -                elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
       -                elog "add it to your settings.ini file."
       -        fi
       -}
       -
       -pkg_postrm() {
       -        gnome2_pkg_postrm
       -
       -        if [[ -z ${REPLACED_BY_VERSION} ]]; then
       -                multilib_pkg_postrm() {
       -                        rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
       -                }
       -                multilib_foreach_abi multilib_pkg_postrm
       -        fi
       -}
   DIR diff --git a/x11-libs/gtk+/gtk+-3.22.29.ebuild b/x11-libs/gtk+/gtk+-3.22.29.ebuild
       @@ -1,236 +0,0 @@
       -# Copyright 1999-2017 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -GNOME2_LA_PUNT="yes"
       -
       -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
       -
       -DESCRIPTION="Gimp ToolKit +"
       -HOMEPAGE="https://www.gtk.org/"
       -
       -LICENSE="LGPL-2+"
       -SLOT="3"
       -IUSE="aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
       -REQUIRED_USE="
       -        || ( aqua wayland X )
       -        xinerama? ( X )
       -"
       -
       -KEYWORDS="amd64 ~x86 ~alpha ~arm ~hppa ~la64 ~ppc ~ppc64 ~sparc"
       -
       -# Upstream wants us to do their job:
       -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
       -RESTRICT="test"
       -
       -# FIXME: introspection data is built against system installation of gtk+:3,
       -# bug #????
       -COMMON_DEPEND="
       -        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
       -        >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
       -        media-libs/fontconfig[${MULTILIB_USEDEP}]
       -        >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
       -        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
       -        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
       -        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
       -        x11-misc/shared-mime-info
       -
       -        cloudprint? (
       -                >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
       -                >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
       -        colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
       -        cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
       -        introspection? ( >=dev-libs/gobject-introspection-1.39:= )
       -        wayland? (
       -                >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
       -                >=dev-libs/wayland-protocols-1.9
       -                media-libs/mesa[wayland,${MULTILIB_USEDEP}]
       -                >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
       -        )
       -        X? (
       -                atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
       -                x11-libs/libX11[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
       -                x11-libs/libXext[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
       -                x11-libs/libXcursor[${MULTILIB_USEDEP}]
       -                x11-libs/libXfixes[${MULTILIB_USEDEP}]
       -                x11-libs/libXcomposite[${MULTILIB_USEDEP}]
       -                x11-libs/libXdamage[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
       -        )
       -"
       -DEPEND="${COMMON_DEPEND}
       -        app-text/docbook-xsl-stylesheets
       -        app-text/docbook-xml-dtd:4.1.2
       -        dev-libs/libxslt
       -        dev-libs/gobject-introspection-common
       -        >=dev-util/gdbus-codegen-2.48
       -        >=dev-util/gtk-doc-am-1.20
       -        >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
       -        virtual/pkgconfig[${MULTILIB_USEDEP}]
       -        X? (
       -                x11-proto/xextproto[${MULTILIB_USEDEP}]
       -                x11-proto/xproto[${MULTILIB_USEDEP}]
       -                x11-proto/inputproto[${MULTILIB_USEDEP}]
       -                x11-proto/damageproto[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
       -        )
       -        test? (
       -                media-fonts/font-misc-misc
       -                media-fonts/font-cursor-misc )
       -"
       -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
       -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
       -RDEPEND="${COMMON_DEPEND}
       -        >=dev-util/gtk-update-icon-cache-3
       -        !<gnome-base/gail-1000
       -        !<x11-libs/vte-0.31.0:2.90
       -"
       -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
       -PDEPEND="
       -        gnome-base/librsvg[${MULTILIB_USEDEP}]
       -        >=x11-themes/adwaita-icon-theme-3.14
       -        vim-syntax? ( app-vim/gtk-syntax )
       -"
       -
       -MULTILIB_CHOST_TOOLS=(
       -        /usr/bin/gtk-query-immodules-3.0$(get_exeext)
       -)
       -
       -strip_builddir() {
       -        local rule=$1
       -        shift
       -        local directory=$1
       -        shift
       -        sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
       -                || die "Could not strip director ${directory} from build."
       -}
       -
       -src_prepare() {
       -        if ! use test ; then
       -                # don't waste time building tests
       -                strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
       -
       -                # the tests dir needs to be build now because since commit
       -                # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
       -                # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
       -        fi
       -
       -        if ! use examples; then
       -                # don't waste time building demos
       -                strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
       -                strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
       -        fi
       -
       -        # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
       -        eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
       -
       -
       -        # Use patches from BSD to make gtk3-atk-bridge a true option -
       -        # This was intentionally removed by upstream, see
       -        # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
       -        # This enables us to build gtk3 without the indirect dependency on dbus
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
       -
       -        eautoreconf
       -        gnome2_src_prepare
       -}
       -
       -multilib_src_configure() {
       -        # need libdir here to avoid a double slash in a path that libtool doesn't
       -        # grok so well during install (// between $EPREFIX and usr ...)
       -        ECONF_SOURCE=${S} \
       -        gnome2_src_configure \
       -                $(use_enable aqua quartz-backend) \
       -                $(use_enable broadway broadway-backend) \
       -                $(use_enable cloudprint) \
       -                $(use_enable colord) \
       -                $(use_enable cups cups auto) \
       -                $(multilib_native_use_enable introspection) \
       -                $(use_enable wayland wayland-backend) \
       -                $(use_enable X x11-backend) \
       -                $(use_enable X xcomposite) \
       -                $(use_enable X xdamage) \
       -                $(use_enable X xfixes) \
       -                $(use_enable X xkb) \
       -                $(use_enable X xrandr) \
       -                $(use_enable xinerama) \
       -                $(use_with atk-bridge) \
       -                --disable-papi \
       -                --disable-mir-backend \
       -                --enable-man \
       -                --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
       -                --libdir="${EPREFIX}"/usr/$(get_libdir) \
       -                CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
       -
       -        # work-around gtk-doc out-of-source brokedness
       -        if multilib_is_native_abi; then
       -                local d
       -                for d in gdk gtk libgail-util; do
       -                        ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
       -                done
       -        fi
       -}
       -
       -multilib_src_test() {
       -        "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
       -        GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
       -}
       -
       -multilib_src_install() {
       -        gnome2_src_install
       -}
       -
       -multilib_src_install_all() {
       -        insinto /etc/gtk-3.0
       -        doins "${FILESDIR}"/settings.ini
       -        # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
       -        DOCS=( AUTHORS NEWS README )
       -        einstalldocs
       -}
       -
       -pkg_preinst() {
       -        gnome2_pkg_preinst
       -
       -        multilib_pkg_preinst() {
       -                # Make immodules.cache belongs to gtk+ alone
       -                local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
       -
       -                if [[ -e ${EROOT}${cache} ]]; then
       -                        cp "${EROOT}"${cache} "${ED}"/${cache} || die
       -                else
       -                        touch "${ED}"/${cache} || die
       -                fi
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_preinst
       -}
       -
       -pkg_postinst() {
       -        gnome2_pkg_postinst
       -
       -        multilib_pkg_postinst() {
       -                gnome2_query_immodules_gtk3 \
       -                        || die "Update immodules cache failed (for ${ABI})"
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_postinst
       -
       -        if ! has_version "app-text/evince"; then
       -                elog "Please install app-text/evince for print preview functionality."
       -                elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
       -                elog "add it to your settings.ini file."
       -        fi
       -}
       -
       -pkg_postrm() {
       -        gnome2_pkg_postrm
       -
       -        if [[ -z ${REPLACED_BY_VERSION} ]]; then
       -                multilib_pkg_postrm() {
       -                        rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
       -                }
       -                multilib_foreach_abi multilib_pkg_postrm
       -        fi
       -}
   DIR diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
       @@ -1,236 +0,0 @@
       -# Copyright 1999-2017 Gentoo Foundation
       -# Distributed under the terms of the GNU General Public License v2
       -
       -EAPI=6
       -GNOME2_LA_PUNT="yes"
       -
       -inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
       -
       -DESCRIPTION="Gimp ToolKit +"
       -HOMEPAGE="https://www.gtk.org/"
       -
       -LICENSE="LGPL-2+"
       -SLOT="3"
       -IUSE="aqua atk-bridge broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
       -REQUIRED_USE="
       -        || ( aqua wayland X )
       -        xinerama? ( X )
       -"
       -
       -KEYWORDS="amd64 ~x86 ~alpha ~arm ~hppa ~la64 ~ppc ~ppc64 ~sparc"
       -
       -# Upstream wants us to do their job:
       -# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
       -RESTRICT="test"
       -
       -# FIXME: introspection data is built against system installation of gtk+:3,
       -# bug #????
       -COMMON_DEPEND="
       -        >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
       -        >=dev-libs/glib-2.49.4:2[${MULTILIB_USEDEP}]
       -        media-libs/fontconfig[${MULTILIB_USEDEP}]
       -        >=media-libs/libepoxy-1.0[X(+)?,${MULTILIB_USEDEP}]
       -        >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
       -        >=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
       -        >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
       -        x11-misc/shared-mime-info
       -
       -        cloudprint? (
       -                >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
       -                >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
       -        colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
       -        cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
       -        introspection? ( >=dev-libs/gobject-introspection-1.39:= )
       -        wayland? (
       -                >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
       -                >=dev-libs/wayland-protocols-1.9
       -                media-libs/mesa[wayland,${MULTILIB_USEDEP}]
       -                >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
       -        )
       -        X? (
       -                atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
       -                x11-libs/libX11[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
       -                x11-libs/libXext[${MULTILIB_USEDEP}]
       -                >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
       -                x11-libs/libXcursor[${MULTILIB_USEDEP}]
       -                x11-libs/libXfixes[${MULTILIB_USEDEP}]
       -                x11-libs/libXcomposite[${MULTILIB_USEDEP}]
       -                x11-libs/libXdamage[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
       -        )
       -"
       -DEPEND="${COMMON_DEPEND}
       -        app-text/docbook-xsl-stylesheets
       -        app-text/docbook-xml-dtd:4.1.2
       -        dev-libs/libxslt
       -        dev-libs/gobject-introspection-common
       -        >=dev-util/gdbus-codegen-2.48
       -        >=dev-util/gtk-doc-am-1.20
       -        >=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
       -        virtual/pkgconfig[${MULTILIB_USEDEP}]
       -        X? (
       -                x11-proto/xextproto[${MULTILIB_USEDEP}]
       -                x11-proto/xproto[${MULTILIB_USEDEP}]
       -                x11-proto/inputproto[${MULTILIB_USEDEP}]
       -                x11-proto/damageproto[${MULTILIB_USEDEP}]
       -                xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
       -        )
       -        test? (
       -                media-fonts/font-misc-misc
       -                media-fonts/font-cursor-misc )
       -"
       -# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
       -# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
       -RDEPEND="${COMMON_DEPEND}
       -        >=dev-util/gtk-update-icon-cache-3
       -        !<gnome-base/gail-1000
       -        !<x11-libs/vte-0.31.0:2.90
       -"
       -# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
       -PDEPEND="
       -        gnome-base/librsvg[${MULTILIB_USEDEP}]
       -        >=x11-themes/adwaita-icon-theme-3.14
       -        vim-syntax? ( app-vim/gtk-syntax )
       -"
       -
       -MULTILIB_CHOST_TOOLS=(
       -        /usr/bin/gtk-query-immodules-3.0$(get_exeext)
       -)
       -
       -strip_builddir() {
       -        local rule=$1
       -        shift
       -        local directory=$1
       -        shift
       -        sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
       -                || die "Could not strip director ${directory} from build."
       -}
       -
       -src_prepare() {
       -        if ! use test ; then
       -                # don't waste time building tests
       -                strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
       -
       -                # the tests dir needs to be build now because since commit
       -                # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
       -                # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
       -        fi
       -
       -        if ! use examples; then
       -                # don't waste time building demos
       -                strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
       -                strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
       -        fi
       -
       -        # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
       -        eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
       -
       -
       -        # Use patches from BSD to make gtk3-atk-bridge a true option -
       -        # This was intentionally removed by upstream, see
       -        # https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
       -        # This enables us to build gtk3 without the indirect dependency on dbus
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-config.h.in.patch
       -        eapply "${FILESDIR}"/${PN}-atk-bridge-gtkaccessibility.patch
       -
       -        eautoreconf
       -        gnome2_src_prepare
       -}
       -
       -multilib_src_configure() {
       -        # need libdir here to avoid a double slash in a path that libtool doesn't
       -        # grok so well during install (// between $EPREFIX and usr ...)
       -        ECONF_SOURCE=${S} \
       -        gnome2_src_configure \
       -                $(use_enable aqua quartz-backend) \
       -                $(use_enable broadway broadway-backend) \
       -                $(use_enable cloudprint) \
       -                $(use_enable colord) \
       -                $(use_enable cups cups auto) \
       -                $(multilib_native_use_enable introspection) \
       -                $(use_enable wayland wayland-backend) \
       -                $(use_enable X x11-backend) \
       -                $(use_enable X xcomposite) \
       -                $(use_enable X xdamage) \
       -                $(use_enable X xfixes) \
       -                $(use_enable X xkb) \
       -                $(use_enable X xrandr) \
       -                $(use_enable xinerama) \
       -                $(use_with atk-bridge) \
       -                --disable-papi \
       -                --disable-mir-backend \
       -                --enable-man \
       -                --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
       -                --libdir="${EPREFIX}"/usr/$(get_libdir) \
       -                CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
       -
       -        # work-around gtk-doc out-of-source brokedness
       -        if multilib_is_native_abi; then
       -                local d
       -                for d in gdk gtk libgail-util; do
       -                        ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
       -                done
       -        fi
       -}
       -
       -multilib_src_test() {
       -        "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
       -        GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
       -}
       -
       -multilib_src_install() {
       -        gnome2_src_install
       -}
       -
       -multilib_src_install_all() {
       -        insinto /etc/gtk-3.0
       -        doins "${FILESDIR}"/settings.ini
       -        # Skip README.{in,commits,win32} and useless ChangeLog that would get installed by default
       -        DOCS=( AUTHORS NEWS README )
       -        einstalldocs
       -}
       -
       -pkg_preinst() {
       -        gnome2_pkg_preinst
       -
       -        multilib_pkg_preinst() {
       -                # Make immodules.cache belongs to gtk+ alone
       -                local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
       -
       -                if [[ -e ${EROOT}${cache} ]]; then
       -                        cp "${EROOT}"${cache} "${ED}"/${cache} || die
       -                else
       -                        touch "${ED}"/${cache} || die
       -                fi
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_preinst
       -}
       -
       -pkg_postinst() {
       -        gnome2_pkg_postinst
       -
       -        multilib_pkg_postinst() {
       -                gnome2_query_immodules_gtk3 \
       -                        || die "Update immodules cache failed (for ${ABI})"
       -        }
       -        multilib_parallel_foreach_abi multilib_pkg_postinst
       -
       -        if ! has_version "app-text/evince"; then
       -                elog "Please install app-text/evince for print preview functionality."
       -                elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
       -                elog "add it to your settings.ini file."
       -        fi
       -}
       -
       -pkg_postrm() {
       -        gnome2_pkg_postrm
       -
       -        if [[ -z ${REPLACED_BY_VERSION} ]]; then
       -                multilib_pkg_postrm() {
       -                        rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
       -                }
       -                multilib_foreach_abi multilib_pkg_postrm
       -        fi
       -}
   DIR diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
       @@ -1,23 +0,0 @@
       -<?xml version="1.0" encoding="UTF-8"?>
       -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
       -<pkgmetadata>
       -        <maintainer type="person">
       -                <email>me@drkhsh.at</email>
       -                <name>aaron marcher</name>
       -        </maintainer>
       -        <longdescription>
       -                GTK+ is a multi-platform toolkit for creating graphical user
       -                interfaces. Offering a complete set of widgets, GTK+ is suitable
       -                for projects ranging from small one-off projects to complete
       -                application suites. This package allows building without ATK-Bridge and
       -                thus also dbus.
       -        </longdescription>
       -        <use>
       -                <flag name="atk-bridge">Enable the ATK-Bridge (depends on
       -                        <pkg>sys-apps/dbus</pkg>).</flag>
       -                <flag name="broadway">Enable the GDK Broadway backend.</flag>
       -                <flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
       -                <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
       -                        in printing</flag>
       -        </use>
       -</pkgmetadata>