[gentoo-commits] repo/gentoo:master commit in: media-sound/quark/files/, sys-block/targetcli/, net-misc/yangcli-pro/, ...

[Pacho Ramos]

commit:     ec7079c0c95dd1dac40e7b67fba9383a5498dcb8
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 18:13:13 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 18:13:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec7079c0

Remove masked for removal package

 app-backup/holland-backup-mysql-lvm/Manifest       |   1 -
 .../holland-backup-mysql-lvm-1.0.10.ebuild         |  51 --
 app-backup/holland-backup-mysql-lvm/metadata.xml   |   5 -
 .../holland-backup-mysql-meta-1.0.10.ebuild        |  26 -
 app-backup/holland-backup-mysql-meta/metadata.xml  |  10 -
 app-backup/holland-backup-mysqldump/Manifest       |   1 -
 .../holland-backup-mysqldump-1.0.10.ebuild         |  52 --
 app-backup/holland-backup-mysqldump/metadata.xml   |   5 -
 app-backup/holland-backup-mysqlhotcopy/Manifest    |   1 -
 .../holland-backup-mysqlhotcopy-1.0.10.ebuild      |  46 --
 .../holland-backup-mysqlhotcopy/metadata.xml       |   5 -
 app-backup/holland-lib-mysql/Manifest              |   1 -
 .../holland-lib-mysql-1.0.10.ebuild                |  38 --
 app-backup/holland-lib-mysql/metadata.xml          |   5 -
 app-editors/cooledit/Manifest                      |   2 -
 app-editors/cooledit/cooledit-3.17.17-r1.ebuild    |  47 --
 .../cooledit/files/cooledit-3.17.17-asneeded.patch |  11 -
 .../cooledit/files/cooledit-3.17.17-copy.patch     |  20 -
 .../cooledit/files/cooledit-3.17.17-gcc4.patch     |  10 -
 .../cooledit-3.17.17-implicit_declarations.patch   |  34 --
 .../cooledit/files/cooledit-3.17.17-interix.patch  |  31 --
 .../cooledit/files/cooledit-3.17.17-interix5.patch |  13 -
 app-editors/cooledit/metadata.xml                  |   8 -
 app-forensics/rdd/Manifest                         |   1 -
 .../rdd/files/rdd-3.0.4-sandbox-fix.patch          |  25 -
 app-forensics/rdd/metadata.xml                     |  15 -
 app-forensics/rdd/rdd-3.0.4-r1.ebuild              |  50 --
 app-i18n/man-pages-ro/Manifest                     |   1 -
 app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild      |  22 -
 app-i18n/man-pages-ro/metadata.xml                 |   5 -
 app-laptop/powerprefs/Manifest                     |   1 -
 app-laptop/powerprefs/metadata.xml                 |  11 -
 app-laptop/powerprefs/powerprefs-0.8.0.ebuild      |  21 -
 app-misc/cwiid/Manifest                            |   1 -
 app-misc/cwiid/cwiid-20110107-r2.ebuild            |  76 ---
 app-misc/cwiid/files/60-cwiid.rules                |   2 -
 .../cwiid/files/cwiid-20110107-underlinking.patch  |  31 --
 app-misc/cwiid/metadata.xml                        |   5 -
 app-mobilephone/gnome-phone-manager/Manifest       |   1 -
 ...dapt-to-Evolution-Data-Server-API-changes.patch | 541 ---------------------
 ...ome-phone-manager-0.69-adwaita-icon-theme.patch |  12 -
 .../gnome-phone-manager-0.69-r1.ebuild             |  56 ---
 app-mobilephone/gnome-phone-manager/metadata.xml   |  20 -
 app-mobilephone/ringtonetools/Manifest             |   1 -
 .../files/ringtonetools-2.26-no-strip.patch        |  11 -
 app-mobilephone/ringtonetools/metadata.xml         |   6 -
 .../ringtonetools/ringtonetools-2.26.ebuild        |  30 --
 app-office/gtimelog/Manifest                       |   1 -
 app-office/gtimelog/gtimelog-0.8.1.ebuild          |  68 ---
 app-office/gtimelog/metadata.xml                   |   7 -
 app-shells/scsh-install-lib/Manifest               |   1 -
 app-shells/scsh-install-lib/metadata.xml           |  11 -
 .../scsh-install-lib-1.3.0-r1.ebuild               |  24 -
 .../scsh-install-lib/scsh-install-lib-1.3.0.ebuild |  23 -
 app-text/zemberek-server/Manifest                  |   1 -
 app-text/zemberek-server/files/pre                 |   1 -
 app-text/zemberek-server/files/zemberek-server     |  15 -
 app-text/zemberek-server/metadata.xml              |  12 -
 .../zemberek-server-0.7.1-r1.ebuild                |  54 --
 .../zemberek-server/zemberek-server-0.7.1.ebuild   |  53 --
 app-text/zpspell/Manifest                          |   1 -
 .../zpspell/files/add-gobject-linkage-11566.diff   |  11 -
 app-text/zpspell/metadata.xml                      |   5 -
 app-text/zpspell/zpspell-0.4.3-r1.ebuild           |  26 -
 dev-cpp/libgnomemm/Manifest                        |   1 -
 dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild     |  29 --
 dev-cpp/libgnomemm/metadata.xml                    |   8 -
 dev-db/mysql-udf-infusion/Manifest                 |   1 -
 dev-db/mysql-udf-infusion/metadata.xml             |   8 -
 .../mysql-udf-infusion-20110109.ebuild             |  67 ---
 dev-games/crystalspace/Manifest                    |   1 -
 dev-games/crystalspace/crystalspace-2.0-r1.ebuild  | 142 ------
 .../files/crystalspace-2.0-gcc47.patch             | 110 -----
 .../files/crystalspace-2.0-gcc52.patch             |  53 --
 .../crystalspace/files/crystalspace-2.0-gcc6.patch | 238 ---------
 .../files/crystalspace-2.0-wxgtk.patch             |  48 --
 dev-games/crystalspace/metadata.xml                |  33 --
 dev-java/jad-bin/Manifest                          |   1 -
 dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild          |  27 -
 dev-java/jad-bin/metadata.xml                      |   8 -
 dev-lang/rubinius/Manifest                         |   1 -
 dev-lang/rubinius/files/auto_gem.rb                |   7 -
 dev-lang/rubinius/metadata.xml                     |  13 -
 dev-lang/rubinius/rubinius-3.43.ebuild             |  88 ----
 dev-php/pecl-gearman/Manifest                      |   1 -
 dev-php/pecl-gearman/metadata.xml                  |   5 -
 dev-php/pecl-gearman/pecl-gearman-1.0.2-r2.ebuild  |  21 -
 dev-python/jenkins-autojobs/Manifest               |   3 -
 .../jenkins-autojobs/files/local_jenkins.patch     |  26 -
 .../jenkins-autojobs-0.14.3.ebuild                 |  67 ---
 dev-python/jenkins-autojobs/metadata.xml           |   8 -
 dev-python/rtslib/Manifest                         |   1 -
 dev-python/rtslib/metadata.xml                     |  11 -
 dev-python/rtslib/rtslib-3.0_pre4.ebuild           |  40 --
 dev-python/rtslib/rtslib-9999.ebuild               |  40 --
 dev-python/visual/Manifest                         |   1 -
 .../visual/files/visual-5.74-boost-1.50.patch      |  28 --
 dev-python/visual/metadata.xml                     |   8 -
 dev-python/visual/visual-5.74-r1.ebuild            |  71 ---
 dev-util/alleyoop/Manifest                         |   1 -
 dev-util/alleyoop/alleyoop-0.9.8.ebuild            |  29 --
 dev-util/alleyoop/metadata.xml                     |   8 -
 dev-util/bluej/Manifest                            |   4 -
 dev-util/bluej/bluej-3.1.1.ebuild                  |  58 ---
 dev-util/bluej/files/bluej.wrapper                 |   6 -
 dev-util/bluej/metadata.xml                        |   5 -
 dev-vcs/bzr-git/Manifest                           |   1 -
 dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild            |  40 --
 dev-vcs/bzr-git/metadata.xml                       |   5 -
 games-action/d2x-rebirth/Manifest                  |   4 -
 games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild |  93 ----
 .../files/d2x-rebirth-0.58.1-flags.patch           |  10 -
 games-action/d2x-rebirth/metadata.xml              |  21 -
 games-arcade/monkey-bubble/Manifest                |   1 -
 .../files/monkey-bubble-0.4.0-asneeded.patch       |  30 --
 .../monkey-bubble-0.4.0-glib-single-include.patch  |  45 --
 .../files/monkey-bubble-0.4.0-gnome-doc.patch      |  38 --
 .../files/monkey-bubble-0.4.0-noesound.patch       |  19 -
 games-arcade/monkey-bubble/metadata.xml            |   8 -
 .../monkey-bubble/monkey-bubble-0.4.0.ebuild       |  43 --
 games-arcade/monster-masher/Manifest               |   1 -
 .../files/monster-masher-1.8.1-desktop.patch       |  16 -
 .../files/monster-masher-1.8.1-libcanberra.patch   |  85 ----
 games-arcade/monster-masher/metadata.xml           |   8 -
 .../monster-masher/monster-masher-1.8.1-r2.ebuild  |  47 --
 games-board/gnome-mastermind/Manifest              |   1 -
 .../files/gnome-mastermind-0.3.1-gentoo.patch      |  11 -
 .../gnome-mastermind-0.3.1-r1.ebuild               |  45 --
 games-board/gnome-mastermind/metadata.xml          |   8 -
 games-fps/warsow-community-map-pack/Manifest       |   1 -
 games-fps/warsow-community-map-pack/metadata.xml   |   8 -
 .../warsow-community-map-pack-01.ebuild            |  30 --
 games-puzzle/ngstar/Manifest                       |   1 -
 games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch |  10 -
 games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch |  11 -
 .../ngstar/files/ngstar-2.1.8-gentoo-path.patch    |  14 -
 .../ngstar/files/ngstar-2.1.8-ldflags.patch        |  32 --
 games-puzzle/ngstar/metadata.xml                   |  17 -
 games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild         |  44 --
 games-puzzle/shaaft/Manifest                       |   1 -
 games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch |  18 -
 games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch |  11 -
 games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch |  23 -
 .../shaaft/files/shaaft-0.5.0-libpng15.patch       |  20 -
 games-puzzle/shaaft/metadata.xml                   |  11 -
 games-puzzle/shaaft/shaaft-0.5.0.ebuild            |  54 --
 games-server/cyphesis/Manifest                     |   1 -
 games-server/cyphesis/cyphesis-0.6.2-r1.ebuild     |  62 ---
 .../cyphesis/files/cyphesis-0.6.2-gentoo.patch     |  32 --
 .../cyphesis/files/cyphesis-0.6.2-makefile.patch   |  11 -
 games-server/cyphesis/metadata.xml                 |  19 -
 gnome-extra/gnome-color-chooser/Manifest           |   1 -
 .../gnome-color-chooser-0.2.5.ebuild               |  53 --
 gnome-extra/gnome-color-chooser/metadata.xml       |   8 -
 gnome-extra/gpointing-device-settings/Manifest     |   1 -
 .../gpointing-device-settings-1.5.1-crash.patch    |  30 --
 ...gpointing-device-settings-1.5.1-fix-build.patch |  26 -
 ...ointing-device-settings-1.5.1-gsd-3.2-fix.patch |  22 -
 ...gpointing-device-settings-1.5.1-gsd-crash.patch |  35 --
 .../gpointing-device-settings-1.5.1-gtk22.patch    | 201 --------
 .../gpointing-device-settings-1.5.1-plugin.patch   | 107 ----
 .../gpointing-device-settings-1.5.1-reboot.patch   | 266 ----------
 .../gpointing-device-settings-1.5.1-r3.ebuild      |  54 --
 gnome-extra/gpointing-device-settings/metadata.xml |   8 -
 mail-filter/p3scan/Manifest                        |   2 -
 mail-filter/p3scan/files/p3scan-ocreat.patch       |  11 -
 mail-filter/p3scan/files/p3scan.init               |  27 -
 mail-filter/p3scan/files/p3scan.init-r1            |  34 --
 mail-filter/p3scan/metadata.xml                    |  12 -
 mail-filter/p3scan/p3scan-2.3.1.ebuild             |  77 ---
 mail-filter/p3scan/p3scan-2.3.2-r1.ebuild          | 100 ----
 mail-filter/p3scan/p3scan-2.3.2-r2.ebuild          |  93 ----
 mail-filter/qmail-scanner/Manifest                 |   8 -
 .../files/qmail-scanner-2.05.logrotate             |   4 -
 .../files/qmail-scanner-2.06.logrotate             |   4 -
 .../qmail-scanner-2.08-disable-suid-check.patch    |  17 -
 .../files/qmail-scanner-2.08.logrotate             |   4 -
 .../qmail-scanner/files/qmailscanner.cronjob       |   2 -
 .../qmail-scanner/files/qmailscanner.logrotate     |   4 -
 mail-filter/qmail-scanner/metadata.xml             |  15 -
 .../qmail-scanner/qmail-scanner-1.25-r1.ebuild     | 163 -------
 .../qmail-scanner/qmail-scanner-2.05.ebuild        | 190 --------
 .../qmail-scanner/qmail-scanner-2.06.ebuild        | 193 --------
 .../qmail-scanner/qmail-scanner-2.08.ebuild        | 194 --------
 media-gfx/k3d/Manifest                             |   1 -
 .../k3d/files/k3d-0.8.0.5-multilib-strict.patch    |  25 -
 media-gfx/k3d/k3d-0.8.0.5.ebuild                   |  97 ----
 media-gfx/k3d/metadata.xml                         |  19 -
 media-gfx/pornview/Manifest                        |   1 -
 media-gfx/pornview/metadata.xml                    |   8 -
 media-gfx/pornview/pornview-0.2.2-r1.ebuild        |  51 --
 media-gfx/pornview/pornview-0.2.2.ebuild           |  52 --
 media-gfx/qingy-themes/Manifest                    |  18 -
 media-gfx/qingy-themes/metadata.xml                |   5 -
 .../qingy-themes/qingy-themes-20050816.ebuild      |  64 ---
 media-libs/libdvdplay/Manifest                     |   1 -
 media-libs/libdvdplay/libdvdplay-1.0.1.ebuild      |  34 --
 media-libs/libdvdplay/metadata.xml                 |   7 -
 media-plugins/vdr-graphtft/Manifest                |   1 -
 media-plugins/vdr-graphtft/files/confd             |  54 --
 media-plugins/vdr-graphtft/files/graphtft-fe       |  33 --
 media-plugins/vdr-graphtft/files/rc-addon.sh       |  13 -
 .../files/vdr-graphtft-0.3.7_gcc-4.4.x.diff        |  22 -
 .../files/vdr-graphtft-0.3.7_gentoo.diff           | 139 ------
 .../files/vdr-graphtft-0.3.7_makefile.diff         |  67 ---
 media-plugins/vdr-graphtft/metadata.xml            |  16 -
 .../vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild      | 107 ----
 .../vdr-graphtft/vdr-graphtft-0.3.7.ebuild         | 101 ----
 media-sound/aacgain/Manifest                       |   4 -
 media-sound/aacgain/aacgain-1.9-r2.ebuild          | 105 ----
 .../aacgain/files/aacgain-1.9-derefptr.patch       |  11 -
 .../aacgain/files/aacgain-1.9-patch-dotdot.patch   |  16 -
 media-sound/aacgain/metadata.xml                   |  17 -
 media-sound/denemo/Manifest                        |   2 -
 media-sound/denemo/denemo-1.0.0.ebuild             |  64 ---
 media-sound/denemo/denemo-1.0.2.ebuild             |  64 ---
 .../denemo/files/denemo-0.9.6-desktop.patch        |  11 -
 media-sound/denemo/metadata.xml                    |  12 -
 media-sound/neutrino/Manifest                      |   1 -
 .../files/neutrino-0.8.4-glib-single-include.patch | 148 ------
 media-sound/neutrino/metadata.xml                  |  15 -
 media-sound/neutrino/neutrino-0.8.4.ebuild         |  34 --
 media-sound/quark/Manifest                         |   1 -
 media-sound/quark/files/quark-3.24-build.patch     | 107 ----
 media-sound/quark/metadata.xml                     |  11 -
 media-sound/quark/quark-3.24.ebuild                |  65 ---
 media-video/camorama/Manifest                      |   1 -
 media-video/camorama/camorama-0.19-r2.ebuild       |  41 --
 .../camorama/files/camorama-0.19-fixes.patch       | 107 ----
 .../camorama/files/camorama-0.19-gconf.patch       |  40 --
 .../camorama/files/camorama-0.19-glib-232.patch    |  24 -
 .../camorama/files/camorama-0.19-libv4l.patch      | 198 --------
 .../files/camorama-0.19-no-more-videodev_h.patch   |  14 -
 media-video/camorama/metadata.xml                  |   7 -
 media-video/cpdvd/Manifest                         |   1 -
 media-video/cpdvd/cpdvd-1.10-r1.ebuild             |  26 -
 media-video/cpdvd/metadata.xml                     |   7 -
 media-video/mplayer-resume/Manifest                |   1 -
 media-video/mplayer-resume/metadata.xml            |   8 -
 .../mplayer-resume/mplayer-resume-2.0.ebuild       |  37 --
 media-video/vcdgear/Manifest                       |   1 -
 media-video/vcdgear/metadata.xml                   |   7 -
 media-video/vcdgear/vcdgear-1.76-r2.ebuild         |  31 --
 net-dns/hesiod/Manifest                            |   2 -
 net-dns/hesiod/hesiod-3.1.0.ebuild                 |  35 --
 net-dns/hesiod/metadata.xml                        |   5 -
 net-irc/savirc/Manifest                            |   1 -
 net-irc/savirc/metadata.xml                        |   5 -
 net-irc/savirc/savirc-1.99-r1.ebuild               |  18 -
 net-misc/pavuk/Manifest                            |   1 -
 ...9.36_pre20120215-fix-gtkmulticol-segfault.patch |  26 -
 ...pavuk-0.9.36_pre20120215-fix-underlinking.patch |  10 -
 .../files/pavuk-0.9.36_pre20120215-pcre-fix.patch  |  12 -
 ....9.36_pre20120215-tl_selectr-overflow-fix.patch |  13 -
 net-misc/pavuk/metadata.xml                        |  10 -
 net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild  | 110 -----
 net-misc/yangcli-pro/Manifest                      |   1 -
 net-misc/yangcli-pro/metadata.xml                  |   8 -
 net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild   |  39 --
 net-p2p/datacoin-hp/datacoin-hp-9999.ebuild        | 122 -----
 .../files/datacoin-hp-sys_leveldb.patch            | 179 -------
 net-p2p/datacoin-hp/files/datacoin.conf            |   5 -
 net-p2p/datacoin-hp/files/datacoin.confd           |   9 -
 net-p2p/datacoin-hp/files/datacoin.initd           |  28 --
 net-p2p/datacoin-hp/files/datacoin.service         |  30 --
 net-p2p/datacoin-hp/files/datacoind.logrotate      |   7 -
 net-p2p/datacoin-hp/metadata.xml                   |  18 -
 net-p2p/tribler/Manifest                           |   3 -
 .../tribler/files/tribler-6.2.0-fix-desktop.patch  |  12 -
 net-p2p/tribler/files/tribler-log2homedir.patch    |  12 -
 net-p2p/tribler/metadata.xml                       |  15 -
 net-p2p/tribler/tribler-6.3.3-r1.ebuild            |  67 ---
 net-proxy/httpush/Manifest                         |   1 -
 net-proxy/httpush/httpush-0.9_beta11-r1.ebuild     |  60 ---
 net-proxy/httpush/metadata.xml                     |   9 -
 profiles/package.mask                              | 302 ------------
 sys-block/targetcli/Manifest                       |   1 -
 sys-block/targetcli/metadata.xml                   |  11 -
 sys-block/targetcli/targetcli-3.0_pre4.ebuild      |  44 --
 sys-block/targetcli/targetcli-9999.ebuild          |  44 --
 sys-cluster/drbd-kernel/Manifest                   |   3 -
 sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild  |  52 --
 sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild   |  50 --
 sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild |  50 --
 .../drbd-8.0.16-kernel-2.6.30-compile-fix.patch    |  12 -
 ...nel-8.0.0-scripts.adjust_drbd_config_h.sh.patch |  23 -
 .../files/drbd-kernel-8.3.6-linux-2.6.32.patch     |  46 --
 sys-cluster/drbd-kernel/metadata.xml               |   8 -
 sys-cluster/drbd/Manifest                          |  11 -
 sys-cluster/drbd/drbd-8.0.16.ebuild                |  56 ---
 sys-cluster/drbd/drbd-8.3.10.ebuild                |  74 ---
 sys-cluster/drbd/drbd-8.3.11-r1.ebuild             |  75 ---
 sys-cluster/drbd/drbd-8.3.12.ebuild                |  78 ---
 sys-cluster/drbd/drbd-8.3.13.ebuild                |  78 ---
 sys-cluster/drbd/drbd-8.3.15.ebuild                |  78 ---
 sys-cluster/drbd/drbd-8.3.7.ebuild                 |  76 ---
 sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild            |  77 ---
 sys-cluster/drbd/drbd-8.3.8.1.ebuild               |  76 ---
 sys-cluster/drbd/drbd-8.4.0.ebuild                 |  78 ---
 sys-cluster/drbd/drbd-8.4.2.ebuild                 |  79 ---
 sys-cluster/drbd/drbd-8.4.3-r1.ebuild              |  80 ---
 sys-cluster/drbd/drbd-8.4.3-r2.ebuild              |  85 ----
 sys-cluster/drbd/drbd-8.4.3.ebuild                 |  80 ---
 sys-cluster/drbd/files/drbd-8.0.rc                 | 157 ------
 sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch   |  17 -
 .../drbd/files/drbd-8.3.8.1-implicits.patch        |  12 -
 sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch |  20 -
 sys-cluster/drbd/metadata.xml                      |  17 -
 sys-cluster/gearmand/Manifest                      |   1 -
 .../gearmand/files/gearmand-0.34-stdbool-h.patch   |  26 -
 sys-cluster/gearmand/files/gearmand.conf.d         |  39 --
 sys-cluster/gearmand/files/gearmand.init.d.2       |  78 ---
 sys-cluster/gearmand/gearmand-0.34-r1.ebuild       |  96 ----
 sys-cluster/gearmand/metadata.xml                  |  17 -
 sys-fabric/mstflint/Manifest                       |   1 -
 sys-fabric/mstflint/metadata.xml                   |  11 -
 sys-fabric/mstflint/mstflint-3.5.0.ebuild          |  19 -
 www-apps/b2evolution/Manifest                      |   1 -
 www-apps/b2evolution/b2evolution-4.1.7.ebuild      |  46 --
 www-apps/b2evolution/files/postinstall-en.txt      |  17 -
 www-apps/b2evolution/files/postupgrade-en.txt      |   6 -
 www-apps/b2evolution/metadata.xml                  |  11 -
 www-misc/gurlchecker/Manifest                      |   1 -
 .../files/gurlchecker-0.10.5-autoconf-tidy.patch   |  15 -
 .../files/gurlchecker-0.13.1-gnutls.patch          |  26 -
 .../files/gurlchecker-0.13.1-ldflags.patch         |  40 --
 www-misc/gurlchecker/gurlchecker-0.13.1-r2.ebuild  |  73 ---
 www-misc/gurlchecker/metadata.xml                  |  14 -
 x11-libs/libdesktop-agnostic/Manifest              |   1 -
 .../libdesktop-agnostic-0.3.92-r1.ebuild           |  51 --
 x11-libs/libdesktop-agnostic/metadata.xml          |  11 -
 x11-misc/dockmanager/Manifest                      |   1 -
 x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild   |  42 --
 x11-misc/dockmanager/metadata.xml                  |   7 -
 x11-themes/gnome-icon-theme/Manifest               |   2 -
 .../gnome-icon-theme-3.12.0-r1.ebuild              |  47 --
 x11-themes/gnome-icon-theme/metadata.xml           |   8 -
 x11-themes/icewm-themes/Manifest                   |  20 -
 .../icewm-themes/icewm-themes-0.0.1-r1.ebuild      |  53 --
 x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild  | 102 ----
 x11-themes/icewm-themes/metadata.xml               |  11 -
 x11-themes/vdrgraphtft-avp/Manifest                |   1 -
 x11-themes/vdrgraphtft-avp/metadata.xml            |   8 -
 .../vdrgraphtft-avp/vdrgraphtft-avp-0.3.1.ebuild   |  39 --
 x11-themes/vdrgraphtft-deepblue/Manifest           |   2 -
 x11-themes/vdrgraphtft-deepblue/metadata.xml       |   8 -
 .../vdrgraphtft-deepblue-0.3.1.ebuild              |  37 --
 x11-themes/vdrgraphtft-deeppurple/Manifest         |   1 -
 x11-themes/vdrgraphtft-deeppurple/metadata.xml     |   8 -
 .../vdrgraphtft-deeppurple-0.3.2.ebuild            |  36 --
 x11-themes/vdrgraphtft-poetter/Manifest            |   1 -
 x11-themes/vdrgraphtft-poetter/metadata.xml        |   8 -
 .../vdrgraphtft-poetter-0.3.2.ebuild               |  27 -
 353 files changed, 12053 deletions(-)

diff --git a/app-backup/holland-backup-mysql-lvm/Manifest b/app-backup/holland-backup-mysql-lvm/Manifest
deleted file mode 100644
index 38f16bd336c..00000000000
--- a/app-backup/holland-backup-mysql-lvm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f

diff --git a/app-backup/holland-backup-mysql-lvm/holland-backup-mysql-lvm-1.0.10.ebuild b/app-backup/holland-backup-mysql-lvm/holland-backup-mysql-lvm-1.0.10.ebuild
deleted file mode 100644
index dacd535ec06..00000000000
--- a/app-backup/holland-backup-mysql-lvm/holland-backup-mysql-lvm-1.0.10.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland MySQL with LVM Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~app-backup/holland-backup-mysqldump-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-lib-lvm-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-lib-mysql-${PV}[${PYTHON_USEDEP}]
-"
-PDEPEND="
-	~app-backup/holland-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-backup-mysql-meta-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-backup-mysql-meta-${PV}[mysqldump]
-"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-S="${S/.lvm/_lvm}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/mysql-lvm.conf
-	doins "${S}"/../../config/backupsets/examples/mysqldump-lvm.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/mysql-lvm.conf
-	doins "${S}"/../../config/providers/mysqldump-lvm.conf
-}

diff --git a/app-backup/holland-backup-mysql-lvm/metadata.xml b/app-backup/holland-backup-mysql-lvm/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/app-backup/holland-backup-mysql-lvm/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-backup/holland-backup-mysql-meta/holland-backup-mysql-meta-1.0.10.ebuild b/app-backup/holland-backup-mysql-meta/holland-backup-mysql-meta-1.0.10.ebuild
deleted file mode 100644
index cdb997d76f4..00000000000
--- a/app-backup/holland-backup-mysql-meta/holland-backup-mysql-meta-1.0.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Holland MySQL"
-HOMEPAGE="http://www.hollandbackup.org/"
-SRC_URI=""
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lvm +mysqldump mysqlhotcopy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${PYTHON_DEPS}
-	lvm? ( ~app-backup/holland-backup-mysql-lvm-${PV}[${PYTHON_USEDEP}] )
-	mysqldump? ( ~app-backup/holland-backup-mysqldump-${PV}[${PYTHON_USEDEP}] )
-	mysqlhotcopy? ( ~app-backup/holland-backup-mysqlhotcopy-${PV}[${PYTHON_USEDEP}] )
-"
-PDEPEND="=app-backup/holland-${PV}[${PYTHON_USEDEP}]"

diff --git a/app-backup/holland-backup-mysql-meta/metadata.xml b/app-backup/holland-backup-mysql-meta/metadata.xml
deleted file mode 100644
index ec0cac4dc87..00000000000
--- a/app-backup/holland-backup-mysql-meta/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="lvm">Install Holland LVM Plugin</flag>
-		<flag name="mysqldump">Install Holland mysqldump Plugin</flag>
-		<flag name="mysqlhotcopy">Install Holland mysqlhotcopy Plugin</flag>
-	</use>
-</pkgmetadata>

diff --git a/app-backup/holland-backup-mysqldump/Manifest b/app-backup/holland-backup-mysqldump/Manifest
deleted file mode 100644
index 38f16bd336c..00000000000
--- a/app-backup/holland-backup-mysqldump/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f

diff --git a/app-backup/holland-backup-mysqldump/holland-backup-mysqldump-1.0.10.ebuild b/app-backup/holland-backup-mysqldump/holland-backup-mysqldump-1.0.10.ebuild
deleted file mode 100644
index 049a2f772ee..00000000000
--- a/app-backup/holland-backup-mysqldump/holland-backup-mysqldump-1.0.10.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland mysqldump Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	app-arch/gzip
-	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-lib-mysql-${PV}[${PYTHON_USEDEP}]
-	dev-python/iniparse[${PYTHON_USEDEP}]
-"
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-}
-
-pkg_postinst() {
-	elog "Inline-compression is performed by default."
-	elog "compression packages:"
-	elog "  app-arch/gzip (default)"
-	elog "  app-arch/bzip2"
-	elog "  app-arch/xz-utils"
-}

diff --git a/app-backup/holland-backup-mysqldump/metadata.xml b/app-backup/holland-backup-mysqldump/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/app-backup/holland-backup-mysqldump/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-backup/holland-backup-mysqlhotcopy/Manifest b/app-backup/holland-backup-mysqlhotcopy/Manifest
deleted file mode 100644
index 38f16bd336c..00000000000
--- a/app-backup/holland-backup-mysqlhotcopy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f

diff --git a/app-backup/holland-backup-mysqlhotcopy/holland-backup-mysqlhotcopy-1.0.10.ebuild b/app-backup/holland-backup-mysqlhotcopy/holland-backup-mysqlhotcopy-1.0.10.ebuild
deleted file mode 100644
index 65e8a2f357e..00000000000
--- a/app-backup/holland-backup-mysqlhotcopy/holland-backup-mysqlhotcopy-1.0.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland MySQL (MyISAM) Hotcopy Plugin"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
-	~app-backup/holland-lib-mysql-${PV}[${PYTHON_USEDEP}]
-"
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_install_all() {
-	use doc && local DOCS=( README docs/man/holland-mysqlhotcopy.rst )
-
-	distutils-r1_python_install_all
-
-	keepdir /etc/holland
-	keepdir /etc/holland/backupsets
-	keepdir /etc/holland/providers
-
-	insinto /etc/holland/backupsets
-	doins "${S}"/../../config/backupsets/examples/${PN##*-}.conf
-
-	insinto /etc/holland/providers
-	doins "${S}"/../../config/providers/${PN##*-}.conf
-
-	doman docs/man/holland-mysqlhotcopy.5
-}

diff --git a/app-backup/holland-backup-mysqlhotcopy/metadata.xml b/app-backup/holland-backup-mysqlhotcopy/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/app-backup/holland-backup-mysqlhotcopy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-backup/holland-lib-mysql/Manifest b/app-backup/holland-lib-mysql/Manifest
deleted file mode 100644
index 38f16bd336c..00000000000
--- a/app-backup/holland-lib-mysql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST holland-1.0.10.tar.gz 449334 BLAKE2B 0b0290b916448be1865ff2b5c2f0e78de9c4640418fc049b999f5dd171d8fa54c63411b5b8972c843d98f77e6b9726dbc849cb73d3771244e871bb9fea67652a SHA512 5183ec73012edcaba50ef5cc9b892480d5f60301d01d17bd96c5490bd8e6ae42bd21abb6084e6665317b8025489981a02293cd583964f01e86459609b93e918f

diff --git a/app-backup/holland-lib-mysql/holland-lib-mysql-1.0.10.ebuild b/app-backup/holland-lib-mysql/holland-lib-mysql-1.0.10.ebuild
deleted file mode 100644
index 8a49c490911..00000000000
--- a/app-backup/holland-lib-mysql/holland-lib-mysql-1.0.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Holland MySQL Library"
-HOMEPAGE="http://www.hollandbackup.org/"
-
-MY_P="${P%%-*}-${P##*-}"
-
-SRC_URI="http://hollandbackup.org/releases/stable/${PV%.*}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	~app-backup/holland-lib-common-${PV}[${PYTHON_USEDEP}]
-	<dev-python/mysql-python-1.2.5[${PYTHON_USEDEP}]
-"
-PDEPEND="~app-backup/holland-${PV}[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}/plugins/${PN//-/.}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/build/html/. )
-
-	distutils-r1_python_install_all
-}

diff --git a/app-backup/holland-lib-mysql/metadata.xml b/app-backup/holland-lib-mysql/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/app-backup/holland-lib-mysql/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-editors/cooledit/Manifest b/app-editors/cooledit/Manifest
deleted file mode 100644
index bfa7f5e4341..00000000000
--- a/app-editors/cooledit/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cooledit-3.17.17-nopython.tar.gz 15835 BLAKE2B b9f5d12e196de426ec848962a7db3feff6987d1a7848a013a4f8d59a8a399768b7f296dde6afa3be1fa6d3f9e148a18dba66341899a0a2973e1cd1c14a65b9f8 SHA512 acf5c8b6a06a32b9433d4b68c1d9def5c0cc7f479a1dc35e8de1541d9e762c57f36ff48376d633ae7c8cd749d0042889a9febdb825195faa54e3d0a690a4e129
-DIST cooledit-3.17.17.tar.gz 1674273 BLAKE2B ed55bed92780d6c018ba5ed6a1f5aba40d5fccec828daa9a81b6a435a542663dbffe9355de88b81236a8d343fb1748cf711d66d6e9ac401fe0463dea3f4c047f SHA512 1d82ee1ab1e3bfe6477365aaa35084f7504a1503a0c97df997d937c90097c783d4cb90f023499a15f78d278df631310f59a3bd0f7a66620f147e23d7273294e9

diff --git a/app-editors/cooledit/cooledit-3.17.17-r1.ebuild b/app-editors/cooledit/cooledit-3.17.17-r1.ebuild
deleted file mode 100644
index 149ee82675d..00000000000
--- a/app-editors/cooledit/cooledit-3.17.17-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit autotools eutils
-
-DESCRIPTION="Cooledit is a full featured multiple window text editor"
-HOMEPAGE="http://freshmeat.net/projects/cooledit/"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/${P}.tar.gz
-	https://dev.gentoo.org/~hwoarang/distfiles/${P}-nopython.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXau"
-DEPEND="${RDEPEND}
-	x11-libs/libXpm"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-implicit_declarations.patch \
-		"${FILESDIR}"/${P}-interix.patch \
-		"${FILESDIR}"/${P}-interix5.patch \
-		"${FILESDIR}"/${P}-copy.patch \
-		"${WORKDIR}"/${P}-nopython.patch
-	sed -i -e "/Python.h/d" "${S}"/editor/_coolpython.c || die
-	eautoreconf
-}
-
-src_compile() {
-	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_wchar_h=no
-
-	# Fix for bug 40152 (04 Feb 2004 agriffis)
-	addwrite /dev/ptym/clone:/dev/ptmx
-	econf $(use_enable nls)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-}

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch b/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch
deleted file mode 100644
index 4cd6331fcd4..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur cooledit-3.17.17.orig/widget/Makefile.am cooledit-3.17.17/widget/Makefile.am
---- cooledit-3.17.17.orig/widget/Makefile.am	2005-04-04 23:47:45.000000000 +0300
-+++ cooledit-3.17.17/widget/Makefile.am	2008-12-07 14:47:18.000000000 +0200
-@@ -20,6 +20,7 @@
- 	look-cool.c look-gtk.c look-next.c
- 
- libCw_la_LDFLAGS = -version-info 1:0:0
-+libCw_la_LIBADD = @X_LIBS@ -lX11 @X_EXTRA_LIBS@ @LIBINTL@
- 
- DEFS = @X_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/share/cooledit\" @DEFS@ 
- 

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-copy.patch b/app-editors/cooledit/files/cooledit-3.17.17-copy.patch
deleted file mode 100644
index 862b4ec8374..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-copy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -crB cooledit-3.17.17/widget/editcmd.c cooledit-new/widget/editcmd.c
-*** cooledit-3.17.17/widget/editcmd.c	2005-04-04 16:47:45.000000000 -0400
---- cooledit-new/widget/editcmd.c	2009-04-25 21:56:14.000000000 -0400
-***************
-*** 214,220 ****
-      if (file < 0 && (flags & O_CREAT))	/* must it be created ? */
-  	return creat ((char *) pathname, mode);
-      close (file);
-!     return open ((char *) pathname, flags);
-  }
-  
-  /* "Oleg Yu. Repin" <repin@××××××××.ru> added backup filenames
---- 214,220 ----
-      if (file < 0 && (flags & O_CREAT))	/* must it be created ? */
-  	return creat ((char *) pathname, mode);
-      close (file);
-!     return open ((char *) pathname, flags, mode);
-  }
-  
-  /* "Oleg Yu. Repin" <repin@××××××××.ru> added backup filenames

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-gcc4.patch b/app-editors/cooledit/files/cooledit-3.17.17-gcc4.patch
deleted file mode 100644
index 9ce026146f6..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-gcc4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cooledit-3.17.17/widget/coollocal.h.agriffis	2005-04-04 16:47:45.000000000 -0400
-+++ cooledit-3.17.17/widget/coollocal.h	2006-03-12 15:38:40.000000000 -0500
-@@ -49,7 +49,6 @@
- int eh_picture (struct cool_widget *w, XEvent * xevent, CEvent * cwevent);
- void drawstring_xy (Window win, int x, int y, const char *text);
- void drawstring_xy_hotkey (Window win, int x, int y, const char *text, int hotkey);
--int run_callbacks (CWidget * w, XEvent * xevent, CEvent * cwevent);
- void process_external_focus (Window win, int type);
- void focus_window (Window win);
- void link_scrollbar_to_textbox (CWidget * w, CWidget * textbox, XEvent * xevent, CEvent * cwevent, int whichscrbutton);

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch b/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch
deleted file mode 100644
index 322c36fde93..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur cooledit-3.17.17.orig/editor/postscript.c cooledit-3.17.17/editor/postscript.c
---- cooledit-3.17.17.orig/editor/postscript.c	2005-04-04 23:47:45.000000000 +0300
-+++ cooledit-3.17.17/editor/postscript.c	2008-12-07 14:55:25.000000000 +0200
-@@ -1,5 +1,7 @@
- #include <config.h>
-+#include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-diff -ur cooledit-3.17.17.orig/widget/aafont.c cooledit-3.17.17/widget/aafont.c
---- cooledit-3.17.17.orig/widget/aafont.c	2005-04-04 23:47:45.000000000 +0300
-+++ cooledit-3.17.17/widget/aafont.c	2008-12-07 14:54:23.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <stdlib.h>
- #include <stdio.h>
-+#include <string.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include "aafont.h"
-diff -ur cooledit-3.17.17.orig/widget/mad.c cooledit-3.17.17/widget/mad.c
---- cooledit-3.17.17.orig/widget/mad.c	2005-04-04 23:47:45.000000000 +0300
-+++ cooledit-3.17.17/widget/mad.c	2008-12-07 14:54:30.000000000 +0200
-@@ -22,6 +22,8 @@
- /* Generation MAD. It is based on the debauch package.              */
- /********************************************************************/
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include "mad.h"
- 
- #undef malloc

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix.patch
deleted file mode 100644
index f6599ae8557..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-interix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/editor/_coolpython.c cooledit-3.17.17/editor/_coolpython.c
---- cooledit-3.17.17.orig/editor/_coolpython.c	2008-04-03 10:59:33 +0200
-+++ cooledit-3.17.17/editor/_coolpython.c	2008-04-03 11:02:45 +0200
-@@ -1,4 +1,15 @@
- 
-+// on interix, need this before config.h to avoid clashes
-+// with wchar.h, which cooledit believes is not there, and therefore
-+// defines mbstate_t. Python.h includes it, and thus wchar.h messes up.
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+#include "Python.h"
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #include <config.h>
- 
- #ifdef HAVE_PYTHON
-diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h
---- cooledit-3.17.17.orig/rxvt/_rxvtlib.h	2008-04-03 11:10:02 +0200
-+++ cooledit-3.17.17/rxvt/_rxvtlib.h	2008-04-03 09:00:13 +0200
-@@ -170,7 +170,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <net/if.h>
--#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
- #include <net/if_arp.h>
- #endif
- #include "X11/keysymdef.h"

diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch
deleted file mode 100644
index 46048c334c9..00000000000
--- a/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h
---- cooledit-3.17.17.orig/rxvt/_rxvtlib.h	2008-04-17 12:09:05 +0200
-+++ cooledit-3.17.17/rxvt/_rxvtlib.h	2008-04-17 12:09:31 +0200
-@@ -169,7 +169,9 @@
- #endif
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#ifndef __INTERIX
- #include <net/if.h>
-+#endif
- #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
- #include <net/if_arp.h>
- #endif

diff --git a/app-editors/cooledit/metadata.xml b/app-editors/cooledit/metadata.xml
deleted file mode 100644
index 504380650de..00000000000
--- a/app-editors/cooledit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">cooledit</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-forensics/rdd/Manifest b/app-forensics/rdd/Manifest
deleted file mode 100644
index df3a08c721c..00000000000
--- a/app-forensics/rdd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rdd-3.0.4.tar.gz 5896942 BLAKE2B fa857056b19b1902a77f203f786f55c51c5f14c70886542e0f94c4e7e23e8b4d361b8578184df60e7b41f4dee46dca82d8971c3f4fba8c8408694a0480003d94 SHA512 8f4536cfd8d1f4bb841a40d163b922698e27f02b8aa9f525c265e4c2ebf94bf5e61f8ea8452fca00d5a5ab7977bc24b64288b6442c8076692b045ed9936ba86f

diff --git a/app-forensics/rdd/files/rdd-3.0.4-sandbox-fix.patch b/app-forensics/rdd/files/rdd-3.0.4-sandbox-fix.patch
deleted file mode 100644
index b7188030fba..00000000000
--- a/app-forensics/rdd/files/rdd-3.0.4-sandbox-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur rdd-3.0.4-orig/src/Makefile.am rdd-3.0.4/src/Makefile.am
---- rdd-3.0.4-orig/src/Makefile.am	2013-07-26 11:27:50.288696066 -0400
-+++ rdd-3.0.4/src/Makefile.am	2013-07-26 12:14:51.601771619 -0400
-@@ -83,14 +83,15 @@
- 			rdd-verify.1
- 
- install-exec-local:
--			$(INSTALL) $(srcdir)/rddi.py $(bindir)/rddi
--			$(INSTALL) $(srcdir)/plot-entropy.py $(bindir)/plot-entropy
--			$(INSTALL) $(srcdir)/plot-md5.py $(bindir)/plot-md5
-+			$(INSTALL) -d $(DESTDIR)$(bindir)
-+			$(INSTALL) $(srcdir)/rddi.py $(DESTDIR)$(bindir)/rddi
-+			$(INSTALL) $(srcdir)/plot-entropy.py $(DESTDIR)$(bindir)/plot-entropy
-+			$(INSTALL) $(srcdir)/plot-md5.py $(DESTDIR)$(bindir)/plot-md5
- 
- uninstall-local:
--			rm -f $(bindir)/rddi
--			rm -f $(bindir)/plot-entropy
--			rm -f $(bindir)/plot-md5
-+			rm -f $(DESTDIR)$(bindir)/rddi
-+			rm -f $(DESTDIR)$(bindir)/plot-entropy
-+			rm -f $(DESTDIR)$(bindir)/plot-md5
- 
- DISTCLEANFILES=		Makefile.in
- 

diff --git a/app-forensics/rdd/metadata.xml b/app-forensics/rdd/metadata.xml
deleted file mode 100644
index 938e2392c2b..00000000000
--- a/app-forensics/rdd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@g.o</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>zerochaos@g.o</email>
-		<name>Rick Farina</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">rdd</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-forensics/rdd/rdd-3.0.4-r1.ebuild b/app-forensics/rdd/rdd-3.0.4-r1.ebuild
deleted file mode 100644
index 58ac352f6f7..00000000000
--- a/app-forensics/rdd/rdd-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils
-
-# no worky
-RESTRICT="test"
-
-DESCRIPTION="Rdd is a forensic copy program"
-HOMEPAGE="http://www.sf.net/projects/rdd"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="debug doc"
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND="app-forensics/libewf
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	epatch "${FILESDIR}/rdd-3.0.4-sandbox-fix.patch"
-	sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	#doxygen-html fails but the docs are prebuilt so we don't need to enable them
-	econf --disable-doxygen-html \
-		$(use_enable debug tracing) \
-		$(use_enable doc doxygen-doc)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dobin src/rddi.py
-	dosym rdd-copy /usr/bin/rdd
-	#this causes a warning about not being recursive, no clue why
-	dohtml -r doxygen-doc/html/*
-}

diff --git a/app-i18n/man-pages-ro/Manifest b/app-i18n/man-pages-ro/Manifest
deleted file mode 100644
index 18fcdd145af..00000000000
--- a/app-i18n/man-pages-ro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST man-pages-ro-0.2.tar.gz 42764 BLAKE2B 1bdc89f8a2d04322ec0d65eb48eb070d96d8dc9f692a80dfb60053fe3b96051101f4cce048e3f159a6394ff4e333dbf38f6b255399a0d02805ae5044755004cb SHA512 d45deab53dbc34ef9809c19c00cded7f67bf78979cd9a8dc4a5e418465a2d56327822a07736d38fdfc34d036909866b67fdd78d1c2dcbbdb7e60d5bfbfb2599a

diff --git a/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild b/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild
deleted file mode 100644
index 21b78f0722e..00000000000
--- a/app-i18n/man-pages-ro/man-pages-ro-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A somewhat comprehensive collection of Romanian Linux man pages"
-HOMEPAGE="http://www.rolix.org/man/arhiva/"
-SRC_URI="http://www.rolix.org/man/arhiva/${P}.tar.gz"
-
-LICENSE="LDP-1 GPL-2+ man-pages"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/man-ro
-
-src_install() {
-	insinto /usr/share/man/ro/man1
-	doins man1/*.1
-}

diff --git a/app-i18n/man-pages-ro/metadata.xml b/app-i18n/man-pages-ro/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/app-i18n/man-pages-ro/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-laptop/powerprefs/Manifest b/app-laptop/powerprefs/Manifest
deleted file mode 100644
index 43531e65e76..00000000000
--- a/app-laptop/powerprefs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST powerprefs-0.8.0.tar.gz 400749 BLAKE2B 53a0dab3348b56a770861ada1fc882d24bab36a77e6823a1724e602ddc424b1232cb9989e353b4eedc0d62261bd031402745d10720f635bf64e7b6f7cfdd07e2 SHA512 79f30fffd9cda707084e7acebd5dca0849dc9ba368ba03d4553c518e2d8d0265c8f5cc4849a8d8d5c8bd8c973320a00bd3d635f36fb94b3373391ceef802ca99

diff --git a/app-laptop/powerprefs/metadata.xml b/app-laptop/powerprefs/metadata.xml
deleted file mode 100644
index b2aae2fa3f9..00000000000
--- a/app-laptop/powerprefs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>ppc@g.o</email>
-		<name>Gentoo Linux PowerPC Development</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pbbuttons</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-laptop/powerprefs/powerprefs-0.8.0.ebuild b/app-laptop/powerprefs/powerprefs-0.8.0.ebuild
deleted file mode 100644
index 2aa4bb369d7..00000000000
--- a/app-laptop/powerprefs/powerprefs-0.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-DESCRIPTION="program to interface with pbbuttonsd (Powerbook/iBook) keys"
-HOMEPAGE="http://pbbuttons.sf.net"
-SRC_URI="mirror://sourceforge/pbbuttons/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.4:2
-	>=app-laptop/pbbuttonsd-0.8.0"
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README
-}

diff --git a/app-misc/cwiid/Manifest b/app-misc/cwiid/Manifest
deleted file mode 100644
index e377c505153..00000000000
--- a/app-misc/cwiid/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cwiid-20110107.tar.bz2 81184 BLAKE2B 272ca126f82a25fa1b491fbc5abe11ba76e1f99b9390de2243ed49fbe4d70da6a424e9e34c9f35021d1ff9321b878e0360ec0503874923de605a8e8c99e6d1a2 SHA512 b9cde716f7bc67697cf6fafd62f324cf343afc734845d8c3f608e0ad9abe245570e59dbda10a0d3a50b0439a8cc8db0bcf71d592c6d4b733c3955426a97cb46f

diff --git a/app-misc/cwiid/cwiid-20110107-r2.ebuild b/app-misc/cwiid/cwiid-20110107-r2.ebuild
deleted file mode 100644
index 453aeb73acb..00000000000
--- a/app-misc/cwiid/cwiid-20110107-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/abstrakraft/cwiid.git"
-	SRC_URI=""
-	KEYWORDS=""
-	inherit git
-else
-	# git archive --prefix=cwiid-$(date +%Y%m%d)/ \
-	#	--format=tar HEAD | bzip2 > cwiid-$(date +%Y%m%d).tar.bz2
-	SRC_URI="https://dev.gentoo.org/~lxnay/cwiid/cwiid-${PV}.tar.bz2"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils linux-mod autotools python-single-r1
-
-DESCRIPTION="Library, input driver, and utilities for the Nintendo Wiimote"
-HOMEPAGE="http://abstrakraft.org/cwiid"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="python"
-
-DEPEND="virtual/awk
-	sys-apps/sed
-	sys-devel/bison
-	>=sys-devel/flex-2.5.35
-	virtual/pkgconfig
-	python? ( ${PYTHON_DEPS} )"
-
-RDEPEND="net-wireless/bluez
-	x11-libs/gtk+:2
-	python? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	CONFIG_CHECK="~BT_L2CAP ~INPUT_UINPUT"
-	linux-mod_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Fix broken build system
-	sed -i "s:--disable-ldconfig:--without-ldconfig:g" "${S}"/configure.ac || die
-	sed -i "s:enable_ldconfig:with_ldconfig:g" "${S}"/configure.ac || die
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	eautoreconf
-}
-src_configure() {
-	econf $(use_with python) --without-ldconfig || die "configure failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}/60-${PN}.rules"
-}

diff --git a/app-misc/cwiid/files/60-cwiid.rules b/app-misc/cwiid/files/60-cwiid.rules
deleted file mode 100644
index 80689062a87..00000000000
--- a/app-misc/cwiid/files/60-cwiid.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-# make possible to use cwiid device as user
-KERNEL=="uinput", MODE="0660", GROUP="plugdev"

diff --git a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch b/app-misc/cwiid/files/cwiid-20110107-underlinking.patch
deleted file mode 100644
index b60f379fc9c..00000000000
--- a/app-misc/cwiid/files/cwiid-20110107-underlinking.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Ospald <hasufell@g.o>
-Date: Tue Aug 14 23:04:03 UTC 2012
-Subject: build system
-
-fix build for linkers that don't permit underlinking
-
---- configure.ac
-+++ configure.ac
-@@ -69,6 +69,8 @@
- 	AC_MSG_ERROR([linux/uinput.h]),
- 	[#include <linux/input.h>])
- 
-+PKG_CHECK_MODULES([BLUETOOTH], [bluez])
-+
- AC_ISC_POSIX
- 
- AC_ARG_WITH(cwiid-config-dir,AC_HELP_STRING([--with-cwiid-config-dir],
---- wmdemo/Makefile.in
-+++ wmdemo/Makefile.in
-@@ -6,9 +6,9 @@
- 
- SOURCES = wmdemo.c
- 
--CFLAGS += -I@top_builddir@/libcwiid
-+CFLAGS += -I@top_builddir@/libcwiid @BLUETOOTH_CFLAGS@
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += -lcwiid
-+LDLIBS += -lcwiid @BLUETOOTH_LIBS@
- INST_DIR = @bindir@
- 
- include $(COMMON)/include/app.mak

diff --git a/app-misc/cwiid/metadata.xml b/app-misc/cwiid/metadata.xml
deleted file mode 100644
index 7a38bb90096..00000000000
--- a/app-misc/cwiid/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-mobilephone/gnome-phone-manager/Manifest b/app-mobilephone/gnome-phone-manager/Manifest
deleted file mode 100644
index a390e521ab9..00000000000
--- a/app-mobilephone/gnome-phone-manager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-phone-manager-0.69.tar.xz 393916 BLAKE2B c1b77898de55d7c1c74a7cff40e04e0ee72550693060a7b22a1bea32f347efdb80b96df59f1c299488b5cd0b448a980d2f913a4d83f31867c8fcd7e4f8c34d66 SHA512 fa12ef3bc2d94fd91c6f680a5b47cba16a56c2fdf324da958503a7c4f7eb1fedc7aeaced567f2ed1ad8c25da4f994b709018e95bb7ec4a8a2248521a3453970d

diff --git a/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch b/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
deleted file mode 100644
index b375b8f0f40..00000000000
--- a/app-mobilephone/gnome-phone-manager/files/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
+++ /dev/null
@@ -1,541 +0,0 @@
-From 091f0e00bae058d384fbc9834a402192bbf192a6 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@××××××.com>
-Date: Sat, 29 Dec 2012 21:14:51 +0100
-Subject: [PATCH] Adapt to Evolution-Data-Server API changes
-
-    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=680927
----
- configure.in                                  |   2 +-
- cut-n-paste/e-contact-entry/e-contact-entry.c | 168 +++++++++++---------------
- cut-n-paste/e-contact-entry/e-contact-entry.h |   8 +-
- libgsm/phonemgr-utils.c                       |   2 +-
- src/e-phone-entry.c                           |  38 +++---
- 5 files changed, 96 insertions(+), 122 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index be5e729..73e7aec 100644
---- a/configure.in
-+++ b/configure.in
-@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $e
- 
- PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
- 	libcanberra-gtk3 gconf-2.0
--	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0
-+	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserver-1.2 >= 3.6
- 	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
- )
- 
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
-index dc8e2e3..bbd4e6a 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
-@@ -1,4 +1,4 @@
--/* 
-+/*
-  * Copyright (C) 2004 Ross Burton <ross@×××××××××.com
-  *
-  * e-contact-entry.c
-@@ -38,11 +38,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
--#include <libedataserver/e-source.h>
--#include <libebook/e-book.h>
--#include <libebook/e-book-view.h>
--#include <libebook/e-contact.h>
--
- #include "e-contact-entry.h"
- #include "econtactentry-marshal.h"
- 
-@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
- /* Properties */
- enum {
-   PROP_0, /* TODO: why? */
--  PROP_SOURCE_LIST,
-+  PROP_REGISTRY,
-   PROP_COMPLETE_LENGTH,
- };
- 
-@@ -70,7 +65,7 @@ enum {
- struct EContactEntryPriv {
-   GtkEntryCompletion *completion;
-   GtkListStore *store;
--  ESourceList *source_list;
-+  ESourceRegistry *registry;
-   /* A list of EntryLookup structs we are searching */
-   GList *lookup_entries;
-   /* Number of characters to start searching at */
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
-   emails = e_contact_get (contact, E_CONTACT_EMAIL);
-   for (l = emails; l != NULL; l = l->next) {
-     item = g_new0 (EContactEntyItem, 1);
--    item->identifier = item->identifier = g_strdup (l->data);
-+    item->identifier = g_strdup (l->data);
-     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
- 
-     items = g_list_prepend (items, item);
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-       return;
- 
-     photo = e_contact_get (contact, E_CONTACT_PHOTO);
--#ifndef HAVE_ECONTACTPHOTOTYPE
--    if (photo) {
--#else
-     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
--#endif
-       GdkPixbufLoader *loader;
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--#ifndef HAVE_ECONTACTPHOTOTYPE
--      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
--			      photo->length, NULL))
--#else
-       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
- 			      photo->data.inlined.length, NULL))
--#endif
-         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 
-       if (pixbuf) {
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-  * The query on the EBookView has completed.
-  */
- static void
--view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
-+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
- {
-   EntryLookup *lookup;
-   g_return_if_fail (user_data != NULL);
--  /* TODO: handle status != OK */
--  g_return_if_fail (status == E_BOOK_ERROR_OK);
-   g_return_if_fail (book_view != NULL);
- 
-   lookup = (EntryLookup*)user_data;
-   g_object_unref (lookup->bookview);
-+  lookup->bookview = NULL;
- }
- 
- /**
-@@ -361,9 +346,9 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
-   /* TODO: handle status != OK */
-   g_return_if_fail (status == E_BOOK_ERROR_OK);
-   g_return_if_fail (closure != NULL);
--  
-+
-   lookup = (EntryLookup*)closure;
--  
-+
-   g_object_ref (book_view);
-   /* This shouldn't happen of course */
-   if (lookup->bookview) {
-@@ -372,10 +357,10 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
-   }
-   lookup->bookview = book_view;
-   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
--  
--  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
--  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
--  
-+
-+  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
-+  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
-+
-   e_book_view_start (book_view);
- }
- 
-@@ -396,9 +381,10 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (lookup->bookview) {
-         e_book_view_stop (lookup->bookview);
-         g_object_unref (lookup->bookview);
-+        lookup->bookview = NULL;
-       }
-     }
--    
-+
-     gtk_list_store_clear (entry->priv->store);
- 
-     query = create_query (entry, gtk_editable_get_chars (editable, 0, -1));
-@@ -409,8 +395,8 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       /* If the book isn't open yet, skip this source */
-       if (!lookup->open)
-         continue;
--      
--      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
-+
-+      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
-         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
-       }
-     }
-@@ -441,7 +427,7 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
-         return;
-       }
-     }
--    
-+
-     g_signal_emit (lookup->entry, signals[STATE_CHANGE], 0, FALSE);
-     g_signal_emit (lookup->entry, signals[ERROR], 0, stringify_ebook_error (status));
-     return;
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
-  */
- 
- void
--e_contact_entry_set_source_list (EContactEntry *entry,
--    				  ESourceList *source_list)
-+e_contact_entry_set_registry (EContactEntry *entry,
-+                              ESourceRegistry *registry)
- {
-+  GList *list, *link;
-+  const gchar *extension_name;
-   GError *error = NULL;
--  GSList *list, *l;
- 
-   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
- 
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
-     g_list_free (entry->priv->lookup_entries);
-   }
--  if (entry->priv->source_list) {
--    g_object_unref (entry->priv->source_list);
-+  if (entry->priv->registry) {
-+    g_object_unref (entry->priv->registry);
-   }
- 
-   /* If we have no new sources, disable and return here */
--  if (source_list == NULL) {
-+  if (registry == NULL) {
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
--    entry->priv->source_list = NULL;
-+    entry->priv->registry = NULL;
-     entry->priv->lookup_entries = NULL;
-     return;
-   }
- 
--  entry->priv->source_list = source_list;
--  /* So that the list isn't going away underneath us */
--  g_object_ref (entry->priv->source_list);
-+  entry->priv->registry = registry;
-+  /* So that the registry isn't going away underneath us */
-+  g_object_ref (entry->priv->registry);
- 
--  /* That gets us a list of ESourceGroup */
--  list = e_source_list_peek_groups (source_list);
-   entry->priv->lookup_entries = NULL;
- 
--  for (l = list; l != NULL; l = l->next) {
--    ESourceGroup *group = l->data;
--    GSList *sources = NULL, *m;
--    /* That should give us a list of ESource */
--    sources = e_source_group_peek_sources (group);
--    for (m = sources; m != NULL; m = m->next) {
--      ESource *source = m->data;
--      ESource *s = e_source_copy (source);
--      EntryLookup *lookup;
--      char *uri;
-+  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
-+  list = e_source_registry_list_sources (registry, extension_name);
- 
--      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
--      e_source_set_absolute_uri (s, uri);
--      g_free (uri);
-+  for (link = list; link != NULL; link = g_list_next (link)) {
-+    ESource *source = E_SOURCE (link->data);
-+    EntryLookup *lookup;
- 
--      /* Now add those to the lookup entries list */
--      lookup = g_new0 (EntryLookup, 1);
--      lookup->entry = entry;
--      lookup->status = E_BOOK_ERROR_OK;
--      lookup->open = FALSE;
-+    /* Now add those to the lookup entries list */
-+    lookup = g_new0 (EntryLookup, 1);
-+    lookup->entry = entry;
-+    lookup->status = E_BOOK_ERROR_OK;
-+    lookup->open = FALSE;
- 
--      if ((lookup->book = e_book_new (s, &error)) == NULL) {
--        /* TODO handle this better, fire the error signal I guess */
-+    if ((lookup->book = e_book_new (source, &error)) == NULL) {
-+      /* TODO handle this better, fire the error signal I guess */
-+      if (error) {
-         g_warning ("%s", error->message);
--	g_error_free (error);
--	g_free (lookup);
--      } else {
--        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
--	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-+        g_error_free (error);
-+        error = NULL;
-       }
--
--      g_object_unref (s);
-+      g_free (lookup);
-+    } else {
-+      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
-+      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-     }
-   }
- 
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
- }
- 
--ESourceList *
--e_contact_entry_get_source_list (EContactEntry *entry)
-+ESourceRegistry *
-+e_contact_entry_get_registry (EContactEntry *entry)
- {
-   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
- 
--  return entry->priv->source_list;
-+  return entry->priv->registry;
- }
- 
- void
-@@ -552,7 +529,7 @@ int
- e_contact_entry_get_complete_length (EContactEntry *entry)
- {
-   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), 3); /* TODO: from paramspec? */
--  
-+
-   return entry->priv->lookup_length;
- }
- 
-@@ -564,7 +541,7 @@ e_contact_entry_set_display_func (EContactEntry *entry, EContactEntryDisplayFunc
-   if (entry->priv->display_destroy) {
-     entry->priv->display_destroy (entry->priv->display_func);
-   }
--  
-+
-   entry->priv->display_func = func;
-   entry->priv->display_data = func_data;
-   entry->priv->display_destroy = destroy;
-@@ -596,13 +573,13 @@ static void
- e_contact_entry_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
- {
-   EContactEntry *entry;
--  
-+
-   g_return_if_fail (E_IS_CONTACT_ENTRY (object));
-   entry = E_CONTACT_ENTRY (object);
--  
-+
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    e_contact_entry_set_source_list (entry, g_value_get_object (value));
-+  case PROP_REGISTRY:
-+    e_contact_entry_set_registry (entry, g_value_get_object (value));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
-@@ -618,10 +595,10 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
-   EContactEntry *entry;
-   g_return_if_fail (E_IS_CONTACT_ENTRY (object));
-   entry = E_CONTACT_ENTRY (object);
--  
-+
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    g_value_set_object (value, e_contact_entry_get_source_list (entry));
-+  case PROP_REGISTRY:
-+    g_value_set_object (value, e_contact_entry_get_registry (entry));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
-     g_list_free (entry->priv->lookup_entries);
-     g_object_unref (entry->priv->completion);
-     g_object_unref (entry->priv->store);
--    g_object_unref (entry->priv->source_list);
-+    g_object_unref (entry->priv->registry);
- 
-     if (entry->priv->display_destroy) {
-       entry->priv->display_destroy (entry->priv->display_func);
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
- static void
- reset_search_fields (EContactEntry *entry)
- {
--  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
-+  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
- 
-   g_free (entry->priv->search_fields);
-   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
-@@ -707,23 +684,23 @@ static void
- e_contact_entry_class_init (EContactEntryClass *klass)
- {
-   GObjectClass *object_class;
--  
-+
-   object_class = (GObjectClass *) klass;
--  
-+
-   /* GObject */
-   object_class->set_property = e_contact_entry_set_property;
-   object_class->get_property = e_contact_entry_get_property;
-   object_class->finalize = e_contact_entry_finalize;
- 
-   /* Properties */
--  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
--                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
--                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
--  
-+  g_object_class_install_property (object_class, PROP_REGISTRY,
-+                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
-+                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
-+
-   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
-                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
-                                                      2, 99, 3, G_PARAM_READWRITE));
--  
-+
-   /* Signals */
-   signals[CONTACT_SELECTED] = g_signal_new ("contact-selected",
-                                             G_TYPE_FROM_CLASS (object_class),
-@@ -732,7 +709,7 @@ e_contact_entry_class_init (EContactEntryClass *klass)
-                                             NULL, NULL,
-                                             econtactentry_marshal_VOID__OBJECT_STRING,
-                                             G_TYPE_NONE, 2, E_TYPE_CONTACT, G_TYPE_STRING);
--  
-+
-   signals[ERROR] = g_signal_new ("error",
-                                  G_TYPE_FROM_CLASS (object_class),
-                                  G_SIGNAL_RUN_LAST,
-@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
-   if (lookup->bookview) {
-     g_warning("EBookView still around");
-     g_object_unref (lookup->bookview);
-+    lookup->bookview = NULL;
-   }
-   if (lookup->book) {
-     g_object_unref (lookup->book);
-@@ -789,11 +767,11 @@ split_query_string (const gchar *str)
-   GArray *parts = g_array_sized_new (FALSE, FALSE, sizeof (char *), 2);
-   PangoLogAttr *attrs;
-   guint str_len = strlen (str), word_start = 0, i;
--  
--  attrs = g_new0 (PangoLogAttr, str_len + 1);  
-+
-+  attrs = g_new0 (PangoLogAttr, str_len + 1);
-   /* TODO: do we need to specify a particular language or is NULL ok? */
-   pango_get_log_attrs (str, -1, -1, NULL, attrs, str_len + 1);
--  
-+
-   for (i = 0; i < str_len + 1; i++) {
-     char *start_word, *end_word, *word;
-     if (attrs[i].is_word_end) {
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
-index bf6b39b..6fedef7 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
-@@ -23,10 +23,8 @@
- #ifndef CONTACT_ENTRY_H
- #define CONTACT_ENTRY_H
- 
--#include <libedataserver/e-source-group.h>
--#include <libedataserver/e-source-list.h>
--#include <libebook/e-contact.h>
- #include <gtk/gtk.h>
-+#include <libebook/libebook.h>
- 
- G_BEGIN_DECLS
- 
-@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
- 
- GtkWidget *e_contact_entry_new (void);
- 
--void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
--ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
-+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
-+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
- 
- void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
- int e_contact_entry_get_complete_length(EContactEntry *entry);
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
-index 4e62e10..baef34f 100644
---- a/libgsm/phonemgr-utils.c
-+++ b/libgsm/phonemgr-utils.c
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <glib-object.h>
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <gnokii.h>
- 
- #include <bluetooth/bluetooth.h>
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
-index 5d25622..5c10155 100644
---- a/src/e-phone-entry.c
-+++ b/src/e-phone-entry.c
-@@ -1,5 +1,5 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
--/* 
-+/*
-  * Copyright (C) 2005 Bastien Nocera <hadess@××××××.net>
-  *
-  * e-phone-entry.c
-@@ -31,8 +31,6 @@
- 
- #include <gtk/gtk.h>
- #include <string.h>
--#include <libedataserver/e-source-list.h>
--#include <libedataserverui/e-client-utils.h>
- #include "e-phone-entry.h"
- 
- #define CONTACT_FORMAT "%s (%s)"
-@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object)
- }
- 
- static void
--add_sources (EContactEntry *entry)
--{
--	ESourceList *source_list;
--
--	if (e_client_utils_get_sources (&source_list,
--					E_CLIENT_SOURCE_TYPE_CONTACTS,
--					NULL)) {
--		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
--						 source_list);
--		g_object_unref (source_list);
--	}
--}
--
--static void
- e_phone_entry_init (EPhoneEntry *entry)
- {
- 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
-+	ESourceRegistry *registry;
-+	GError *error = NULL;
-+
-+	/* XXX This call blocks while a D-Bus connection is made, possibly
-+	 *     requiring activation.  Might be better to create the registry
-+	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
-+	 *     take it as an argument.  Calling this from main() means if it
-+	 *     fails you can abort cleanly with a console error message. */
-+	registry = e_source_registry_new_sync (NULL, &error);
-+	if (registry == NULL) {
-+		g_error ("%s: %s", G_STRFUNC, error->message);
-+		g_assert_not_reached ();
-+	}
-+	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
-+	g_object_unref (registry);
- 
--	add_sources (E_CONTACT_ENTRY (entry));
- 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
- 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
- 	g_signal_connect (G_OBJECT (entry), "contact_selected",
-@@ -212,9 +210,9 @@ static void
- e_phone_entry_class_init (EPhoneEntryClass *klass)
- {
-   GObjectClass *object_class;
--  
-+
-   object_class = (GObjectClass *) klass;
--  
-+
-   /* GObject */
-   object_class->finalize = e_phone_entry_finalize;
- 
--- 
-1.8.0.2
-

diff --git a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.69-adwaita-icon-theme.patch b/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.69-adwaita-icon-theme.patch
deleted file mode 100644
index 238fec315e7..00000000000
--- a/app-mobilephone/gnome-phone-manager/files/gnome-phone-manager-0.69-adwaita-icon-theme.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./configure.in.orig ./configure.in
---- a/configure.in.orig	2014-05-04 09:40:07.973480490 +0300
-+++ b/configure.in	2014-05-04 09:40:26.264727691 +0300
-@@ -48,7 +48,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje
- PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0
- 	libcanberra-gtk3 gconf-2.0
- 	$GNOME_BLUETOOTH_REQS $evo_pc_file libedataserver-1.2 >= 3.6
--	gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1
-+	gmodule-2.0 dbus-glib-1 adwaita-icon-theme >= 2.19.1
- )
- 
- DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`"

diff --git a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild b/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
deleted file mode 100644
index ee9a85dfccb..00000000000
--- a/app-mobilephone/gnome-phone-manager/gnome-phone-manager-0.69-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Allows you to control aspects of your mobile phone from your GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/PhoneManager"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-# telepathy support is considered experimental
-
-RDEPEND="
-	>=dev-libs/glib-2.31.0:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/orbit-2
-	>=gnome-base/gconf-2:2
-	>=gnome-extra/evolution-data-server-3.6:=
-	media-libs/libcanberra[gtk3]
-	>=app-mobilephone/gnokii-0.6.28[bluetooth]
-	net-wireless/bluez
-	dev-libs/dbus-glib
-	dev-libs/openobex:0=
-	media-libs/libcanberra[gtk]
-	>=net-wireless/gnome-bluetooth-3.3:2=
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-	gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-
-src_prepare() {
-	# Fix eds-3.6 building, upstream bug #680927
-	eapply "${FILESDIR}"/0001-Adapt-to-Evolution-Data-Server-API-changes.patch
-	eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# bluetooth-plugin is no longer buildable, bug #512204
-	gnome2_src_configure \
-		--disable-bluetooth-plugin \
-		--disable-telepathy \
-		--disable-static \
-		$(use_enable debug)
-}

diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml b/app-mobilephone/gnome-phone-manager/metadata.xml
deleted file mode 100644
index 1227371472a..00000000000
--- a/app-mobilephone/gnome-phone-manager/metadata.xml
+++ /dev/null
@@ -1,20 +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@g.o</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-		Phone Manager is a program created to allow you to control aspects
-		of your mobile phone from your GNOME desktop.
-
-		The software is in its early stages right now. Current features include:
-		* Runs in the background; indicates status on the panel notification area.
-		* Display on-screen alert when text message (SMS) arrives
-		* Text message (SMS) sending facility
-
-		Phone Manager supports any mobile phone that can connect to your
-		computer as a serial port: via Bluetooth, IrDA or a serial cable.
-	</longdescription>
-</pkgmetadata>

diff --git a/app-mobilephone/ringtonetools/Manifest b/app-mobilephone/ringtonetools/Manifest
deleted file mode 100644
index f7653dfb70c..00000000000
--- a/app-mobilephone/ringtonetools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ringtonetools-2.26.tar.gz 40172 BLAKE2B a8dbe0ef02f5677f9f5fca02109d38e32b1d6ce61741bc2f3d278e6e008d674bd05b5038636f419795163c7bd25dd66654f269b44eae0596f21eb6fccfb0a4fc SHA512 aa352a8a9e6d84bb649d559e1026239fb7129636bfe6369d90b1e47ceedc530703144a549e0ec0aed1c89d39727c6d604aca31c2255bf3a5c0fb88502f8b31a4

diff --git a/app-mobilephone/ringtonetools/files/ringtonetools-2.26-no-strip.patch b/app-mobilephone/ringtonetools/files/ringtonetools-2.26-no-strip.patch
deleted file mode 100644
index 5438f444248..00000000000
--- a/app-mobilephone/ringtonetools/files/ringtonetools-2.26-no-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru ringtonetools-2.26.orig/Makefile ringtonetools-2.26/Makefile
---- ringtonetools-2.26.orig/Makefile	2005-08-01 20:42:00.000000000 +0300
-+++ ringtonetools-2.26/Makefile	2006-09-24 13:01:32.252022000 +0300
-@@ -3,7 +3,6 @@
- 	@cd src && make
- 	@if [ -e src/ringtonetools.exe ]; then mv src/ringtonetools.exe ringtonetools.exe; fi
- 	@if [ -e src/ringtonetools ]; then mv src/ringtonetools .; fi
--	@strip ringtonetools*
- 
- 
- clean:

diff --git a/app-mobilephone/ringtonetools/metadata.xml b/app-mobilephone/ringtonetools/metadata.xml
deleted file mode 100644
index 69a65829a9e..00000000000
--- a/app-mobilephone/ringtonetools/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Ringtone Tools is a program for creating custom ringtones and graphical logos for mobile phones.</longdescription>
-</pkgmetadata>

diff --git a/app-mobilephone/ringtonetools/ringtonetools-2.26.ebuild b/app-mobilephone/ringtonetools/ringtonetools-2.26.ebuild
deleted file mode 100644
index dd0e2453a5e..00000000000
--- a/app-mobilephone/ringtonetools/ringtonetools-2.26.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="program for creating ringtones and logos for mobile phones"
-HOMEPAGE="http://ringtonetools.mikekohn.net/"
-SRC_URI="http://downloads.mikekohn.net/ringtonetools/${P}.tar.gz"
-
-LICENSE="ringtonetools"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-no-strip.patch"
-}
-
-src_compile() {
-	emake -j1 FLAGS="${CFLAGS}" LIBS="${LDFLAGS}" CC="$(tc-getCC)" || die "make failed"
-}
-
-src_install() {
-	dobin ringtonetools || die "program not found"
-	dodoc docs/*
-	docinto samples
-	dodoc samples/*
-}

diff --git a/app-office/gtimelog/Manifest b/app-office/gtimelog/Manifest
deleted file mode 100644
index 58cbb2f358e..00000000000
--- a/app-office/gtimelog/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gtimelog-0.8.1.tar.gz 188353 BLAKE2B 00f7b82e325991b3e8619d21c97a3a8ca90e98fba8d9c9c2feb55db94648dc52cc015331366cebf6d23dc9c603a42cd8f103b10016a13dcb70ae13be4efcdc6a SHA512 bec4e3182d08be1a75da79f30b58b76e77e1b678477b33edeba529fdf15d8f61d9913c0f43d7ed46cf39b571ab481a8620c5f20b60fb251e16f530aa6465ce98

diff --git a/app-office/gtimelog/gtimelog-0.8.1.ebuild b/app-office/gtimelog/gtimelog-0.8.1.ebuild
deleted file mode 100644
index 7f8038eefe8..00000000000
--- a/app-office/gtimelog/gtimelog-0.8.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=true
-DISTUTILS_SINGLE_IMPL=true
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="A small Gtk+ application for keeping track of your time"
-HOMEPAGE="http://mg.pov.lt/gtimelog/"
-LICENSE="GPL-2"
-SLOT="0"
-
-SRC_URI="https://launchpad.net/gtimelog/devel/${PV}/+download/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-
-IUSE="ayatana test"
-
-# gnome-base/gnome-desktop provides gnome-week.png
-RDEPEND="
-	dev-libs/gobject-introspection
-	dev-python/dbus-python
-	dev-python/pygobject:3
-	gnome-base/gnome-desktop:2
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	ayatana? ( dev-libs/libappindicator:3[introspection] )
-"
-DEPEND="test? (
-	${RDEPEND}
-	ayatana? ( dev-libs/libappindicator:3[introspection] ) )
-"
-
-DOCS="HACKING.txt NEWS.txt NOTES.txt README.txt"
-
-src_prepare() {
-	# Support prefixed installation
-	sed -e "s:\"/usr:\"${EPREFIX}/usr:g" \
-		-i src/gtimelog/main.py || die "sed failed"
-
-	sed -i -e 's/python2.3/python/' scripts/export-my-calendar.py || die
-
-	sed -i -e 's/Application;//' gtimelog.desktop || die #462958
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	VIRTUALX_COMMAND=distutils-r1_src_test virtualmake
-}
-
-src_install() {
-	domenu gtimelog.desktop
-	doicon src/gtimelog/gtimelog-*.png
-	insinto /usr/share/gtimelog
-	doins src/gtimelog/*.ui src/gtimelog/gtimelog.png
-	exeinto /usr/share/gtimelog/scripts
-	doexe scripts/*.py
-
-	distutils-r1_src_install
-	python_fix_shebang "${ED}"
-
-	# Don't install icons in /usr/lib/python*
-	find "${ED}/$(python_get_sitedir)" -regex '.*\(png\|ui\)$' -exec rm -f {} + || die
-}

diff --git a/app-office/gtimelog/metadata.xml b/app-office/gtimelog/metadata.xml
deleted file mode 100644
index 38e0c10c87f..00000000000
--- a/app-office/gtimelog/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<remote-id type="launchpad">gtimelog</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-shells/scsh-install-lib/Manifest b/app-shells/scsh-install-lib/Manifest
deleted file mode 100644
index 68c6caf7617..00000000000
--- a/app-shells/scsh-install-lib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scsh-install-lib-1.3.0.tar.gz 142852 BLAKE2B 9c01264ea9d32ece575425666b396c6a2f9cc7bd82a04ff4c8d214a9cc84ddac65ad45f67e92e52909aa8cd0f43a65c79f4731d238e666e94be5c3d7055127a0 SHA512 ec9069e7ceb6fe316c8b0d1baf1903f2ce1fa2f3f79dc1bf8356b8064c0596e92c8bbc889c7d27b6456a2a0c49dde984536a05987baccc05f4724992cf90ca98

diff --git a/app-shells/scsh-install-lib/metadata.xml b/app-shells/scsh-install-lib/metadata.xml
deleted file mode 100644
index 927b82bf630..00000000000
--- a/app-shells/scsh-install-lib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>scheme@g.o</email>
-  <name>Gentoo Scheme Project</name>
-</maintainer>
-<use>
-  <flag name="scsh">Use a non-FHS directory layout</flag>
-</use>
-</pkgmetadata>

diff --git a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild
deleted file mode 100644
index 9425632d4ca..00000000000
--- a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit scsh
-
-DESCRIPTION="Installation tool for the Scheme Untergrund Library"
-HOMEPAGE="http://lamp.epfl.ch/~schinz/scsh_packages/"
-SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=app-shells/scsh-0.6.6"
-
-src_install() {
-	dodir "${SCSH_MODULES_PATH}"
-	./install.scm ${SCSH_LAYOUT_CONF} \
-	  --bindir /usr/bin \
-	  --force \
-	  || die "./install.scm failed"
-}

diff --git a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0.ebuild b/app-shells/scsh-install-lib/scsh-install-lib-1.3.0.ebuild
deleted file mode 100644
index c3192ab1ff5..00000000000
--- a/app-shells/scsh-install-lib/scsh-install-lib-1.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit scsh
-
-DESCRIPTION="Installation tool for the Scheme Untergrund Library"
-HOMEPAGE="http://lamp.epfl.ch/~schinz/scsh_packages/"
-SRC_URI="http://lamp.epfl.ch/~schinz/scsh_packages/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=app-shells/scsh-0.6.6"
-
-src_install() {
-	dodir $SCSH_MODULES_PATH
-	./install.scm ${SCSH_LAYOUT_CONF} \
-	  --bindir /usr/bin \
-	  --force \
-	  || die "./install.scm failed"
-}

diff --git a/app-text/zemberek-server/Manifest b/app-text/zemberek-server/Manifest
deleted file mode 100644
index ead48ae6a29..00000000000
--- a/app-text/zemberek-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zemberek-server-nolibs-0.7.1.tar.gz 17877 BLAKE2B 3d214c50f1306d1a245bdbf32d0e2fe513b1836b2a4f3a7100c83fa8db5153fb1dbabffa092e3f672675bfbc54fb85bf98e79a8428b8981a72529865d7c85f59 SHA512 5a4c880976c69e4a4f24f778326008ac0a6ea14ed621f8953643298ab2b723799ec4974b55fac5d6b68e5c9134d0e4e06829535cbb2119aefe765cffe0fc9f1d

diff --git a/app-text/zemberek-server/files/pre b/app-text/zemberek-server/files/pre
deleted file mode 100644
index 17b146c4b52..00000000000
--- a/app-text/zemberek-server/files/pre
+++ /dev/null
@@ -1 +0,0 @@
-export LC_ALL="tr_TR.UTF-8"

diff --git a/app-text/zemberek-server/files/zemberek-server b/app-text/zemberek-server/files/zemberek-server
deleted file mode 100644
index 7df7a0bfa9c..00000000000
--- a/app-text/zemberek-server/files/zemberek-server
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-start() {
-        ebegin "Starting zemberek-server"
-        /sbin/start-stop-daemon -b --start --quiet --pidfile /var/run/zemberek-server.pid --make-pidfile --exec /usr/bin/zemberek-server
-        eend $?
-}
-
-stop()  {
-        ebegin "Stopping zemberek-server"
-        start-stop-daemon --stop --pidfile /var/run/zemberek-server.pid --quiet
-        eend $?
-}

diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
deleted file mode 100644
index 027f814bed7..00000000000
--- a/app-text/zemberek-server/metadata.xml
+++ /dev/null
@@ -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>java@g.o</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">zemberek</remote-id>
-		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
deleted file mode 100644
index 18f785fa253..00000000000
--- a/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
-HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
-SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-S="${WORKDIR}"
-IUSE=""
-
-CDEPEND="dev-java/zemberek[l10n_tr]
-	 dev-java/dbus-java
-	 dev-java/mina-core"
-
-RDEPEND="${CDEPEND}
-	dev-java/slf4j-nop
-	>=virtual/jre-1.6"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="dist"
-
-src_unpack() {
-	unpack ${A}
-	mkdir lib || die
-	cd lib || die
-	java-pkg_jarfrom zemberek zemberek2-cekirdek.jar
-	java-pkg_jarfrom zemberek zemberek2-tr.jar
-	java-pkg_jarfrom dbus-java dbus.jar
-	java-pkg_jarfrom mina-core
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher zemberek-server \
-		--java_args \
-		"-Xverify:none -Xms12m -Xmx14m -DConfigFile=/etc/zemberek-server.ini" \
-		--pre "${FILESDIR}"/pre \
-		--main net.zemberekserver.server.ZemberekServer
-	java-pkg_register-dependency slf4j-nop
-
-	doinitd "${FILESDIR}"/zemberek-server
-	insinto /etc/dbus-1/system.d
-	doins dist/config/zemberek-server.conf
-	insinto /etc
-	newins config/conf.ini zemberek-server.ini
-}

diff --git a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
deleted file mode 100644
index 2134b015099..00000000000
--- a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
-HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
-SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
-
-LICENSE="MPL-1.1 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-S="${WORKDIR}"
-IUSE=""
-
-CDEPEND="dev-java/zemberek[l10n_tr]
-	 dev-java/dbus-java
-	 dev-java/mina-core"
-
-RDEPEND="${CDEPEND}
-	dev-java/slf4j-nop
-	>=virtual/jre-1.5"
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.5"
-
-EANT_BUILD_TARGET="dist"
-
-src_unpack() {
-	unpack ${A}
-	mkdir lib || die
-	cd lib || die
-	java-pkg_jarfrom zemberek zemberek2-cekirdek.jar
-	java-pkg_jarfrom zemberek zemberek2-tr.jar
-	java-pkg_jarfrom dbus-java dbus.jar
-	java-pkg_jarfrom mina-core
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher zemberek-server \
-		--java_args \
-		"-Xverify:none -Xms12m -Xmx14m -DConfigFile=/etc/zemberek-server.ini" \
-		--pre "${FILESDIR}"/pre \
-		--main net.zemberekserver.server.ZemberekServer
-	java-pkg_register-dependency slf4j-nop
-	doinitd "${FILESDIR}"/zemberek-server
-	insinto /etc/dbus-1/system.d
-	doins dist/config/zemberek-server.conf
-	insinto /etc
-	newins config/conf.ini zemberek-server.ini
-}

diff --git a/app-text/zpspell/Manifest b/app-text/zpspell/Manifest
deleted file mode 100644
index 6ffac3cf1a3..00000000000
--- a/app-text/zpspell/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zpspell-0.4.3.tar.bz2 10510 BLAKE2B 6b0ef401090037d56caade137f5ca8c8b3f3fafd7c61aa4781e80e2896856031a6b0cb9853dd71cd8ddf17dc486b2cc23bcbf337758b644bf1a3254868134d81 SHA512 b87409735e7c6f8306992e98d006130c9a39cb0903a5938023d6f1379c37e9b12b381f917f71f09e08a557a7cc7cfc1d93536b4fea49d007f20b0da8f7fd3c98

diff --git a/app-text/zpspell/files/add-gobject-linkage-11566.diff b/app-text/zpspell/files/add-gobject-linkage-11566.diff
deleted file mode 100644
index 250fb90ebca..00000000000
--- a/app-text/zpspell/files/add-gobject-linkage-11566.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: zpspell-0.4.3/CMakeLists.txt
-===================================================================
---- zpspell-0.4.3.orig/CMakeLists.txt
-+++ zpspell-0.4.3/CMakeLists.txt
-@@ -101,5 +101,5 @@ include_directories(${DBUS_INCLUDE_DIR})
- include_directories(${GLIB2_INCLUDE_DIR})
- include_directories(${GLIB_CONFIG_DIR})
- 
--target_link_libraries(zpspell glib-2.0 dbus-glib-1)
-+target_link_libraries(zpspell glib-2.0 dbus-glib-1 gobject-2.0)
- 

diff --git a/app-text/zpspell/metadata.xml b/app-text/zpspell/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/app-text/zpspell/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/app-text/zpspell/zpspell-0.4.3-r1.ebuild b/app-text/zpspell/zpspell-0.4.3-r1.ebuild
deleted file mode 100644
index 5d1b3d72239..00000000000
--- a/app-text/zpspell/zpspell-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cmake-utils
-
-DESCRIPTION="Zemberek-Pardus spell checker interface"
-HOMEPAGE="http://www.pardus.org.tr/projeler/masaustu/zemberek-pardus"
-SRC_URI="http://cekirdek.uludag.org.tr/~baris/zpspell/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="dev-libs/dbus-glib"
-RDEPEND="${DEPEND}
-	app-text/zemberek-server"
-
-PATCHES=( "${FILESDIR}/add-gobject-linkage-11566.diff" )
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "Please visit ${HOMEPAGE} for"
-	elog "documentation on how to configure and run Zemberek spellchecker for KDE."
-}

diff --git a/dev-cpp/libgnomemm/Manifest b/dev-cpp/libgnomemm/Manifest
deleted file mode 100644
index 64115f66f5b..00000000000
--- a/dev-cpp/libgnomemm/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libgnomemm-2.30.0.tar.bz2 364011 BLAKE2B 2405e4c872dd600ec5b0b2b8b02794adb99aee4af046fbbdfda2ef0a85c2aa0c72468956ebcce641bf390dca59ca4bb15f38b8351620bca2bbc36d482e4f98d7 SHA512 9d4cf332ad511600504e95a64decb3dcecc14943ebb7d928c2b1fff82b2d99727754fd0252802c700092e8efad0e14ab9aacaf9af63c6bb1f9e25334f667317f

diff --git a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
deleted file mode 100644
index da9ded9d53f..00000000000
--- a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for libgnome"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=dev-cpp/gtkmm-2.8:2.4
-	>=gnome-base/libgnome-2.6
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	append-cxxflags -std=c++11
-	gnome2_src_prepare
-}

diff --git a/dev-cpp/libgnomemm/metadata.xml b/dev-cpp/libgnomemm/metadata.xml
deleted file mode 100644
index 39980802b1d..00000000000
--- a/dev-cpp/libgnomemm/metadata.xml
+++ /dev/null
@@ -1,8 +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@g.o</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>

diff --git a/dev-db/mysql-udf-infusion/Manifest b/dev-db/mysql-udf-infusion/Manifest
deleted file mode 100644
index 8bf11126722..00000000000
--- a/dev-db/mysql-udf-infusion/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST infusion-udf_infusion-8599a9c.tar.gz 5470 BLAKE2B ecb12ea34a690433379a8237fca0a76f6d2e609d63012faec465b0a0ab4509973a7c6179ff5cbba8a60fbccdda844f01d02cfa9bdd88bd051aa4f81c358c577f SHA512 4a9cee8b45b0cd8e7e00210de79f8a42cc3154185c1b31e441f27d51300c113a46639ecce98d0c748aada0538e9bbfc55ef71f017c19c403a84c2e5d478c09fe

diff --git a/dev-db/mysql-udf-infusion/metadata.xml b/dev-db/mysql-udf-infusion/metadata.xml
deleted file mode 100644
index 0355f8ad4e3..00000000000
--- a/dev-db/mysql-udf-infusion/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">infusion/udf_infusion</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/dev-db/mysql-udf-infusion/mysql-udf-infusion-20110109.ebuild b/dev-db/mysql-udf-infusion/mysql-udf-infusion-20110109.ebuild
deleted file mode 100644
index 5a9aa63ff70..00000000000
--- a/dev-db/mysql-udf-infusion/mysql-udf-infusion-20110109.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_REV="8599a9c"   # checkout revision
-MY_USR="infusion"  # user name
-
-MY_PN="udf_infusion"
-MY_P="${MY_USR}-${MY_PN}-${MY_REV}"
-
-DESCRIPTION="New functions for MySQL implemented as UDF"
-HOMEPAGE="http://www.xarg.org/2010/11/mysql-my-new-playground/"
-SRC_URI="https://github.com/${MY_USR}/${MY_PN}/tarball/${MY_REV} -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/mysql-5.1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# compile helper
-_compile() {
-	local CC="$(tc-getCC)"
-	echo "${CC} ${@}" && "${CC}" "${@}"
-}
-
-pkg_setup() {
-	MYSQL_PLUGINDIR="$(mysql_config --plugindir)"
-	MYSQL_INCLUDE="$(mysql_config --include)"
-}
-
-src_prepare() {
-	# fix soname
-	sed -i -e "s|${MY_PN}\.so|${PN//-/_}.so|g" *.sql
-
-	# add LF
-	echo >> create.sql
-	echo >> delete.sql
-}
-
-src_compile() {
-	_compile ${CFLAGS} -Wall -fPIC ${MYSQL_INCLUDE} \
-		-shared ${LDFLAGS} -o ${PN//-/_}.so ${MY_PN}.c
-}
-
-src_install() {
-	exeinto "${MYSQL_PLUGINDIR}"
-	doexe *.so
-	dodoc *.sql
-}
-
-pkg_postinst() {
-	elog
-	elog "Please have a look at the documentation, how to"
-	elog "enable/disable the UDF functions of ${PN}."
-	elog
-	elog "The documentation is located here:"
-	elog "/usr/share/doc/${PF}"
-	elog
-}

diff --git a/dev-games/crystalspace/Manifest b/dev-games/crystalspace/Manifest
deleted file mode 100644
index e84f033f863..00000000000
--- a/dev-games/crystalspace/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST crystalspace-src-2.0.tar.bz2 185925180 BLAKE2B 570f91fa3f22a071a4cd8f47ed887c5e668bad0f5bd57e99c53a2729caa37452bf065b37e5f2801a5ce90886554b38b298956322df26bed2506198ead8cc3071 SHA512 f09d40669268e26542a2854560ac5033e7f89d0bd5def870e5062e08611c36a0875666abe0c705bb5f9f37dafa619f33f900e358d5fe255746a86127a3899f97

diff --git a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild b/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
deleted file mode 100644
index aa286aa0752..00000000000
--- a/dev-games/crystalspace/crystalspace-2.0-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit flag-o-matic java-pkg-opt-2 autotools wxwidgets versionator multiprocessing
-
-MY_P=${PN}-src-${PV}
-PATH_P=${PN}-$(get_version_component_range 1-2)
-
-DESCRIPTION="Portable 3D Game Development Kit written in C++"
-HOMEPAGE="http://crystal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/crystal/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="3ds alsa bullet cal3d cegui cg doc java jpeg mng ode png speex truetype vorbis wxwidgets"
-
-COMMON_DEP="
-	virtual/opengl
-	media-libs/openal
-	x11-libs/libXt
-	x11-libs/libXxf86vm
-	sys-libs/zlib
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	ode? ( <dev-games/ode-0.12 )
-	cal3d? ( >=media-libs/cal3d-0.11 )
-	jpeg? ( virtual/jpeg:0 )
-	bullet? ( sci-physics/bullet )
-	vorbis? ( media-libs/libvorbis )
-	speex? ( media-libs/libogg
-		media-libs/speex )
-	truetype? ( >=media-libs/freetype-2.1 )
-	alsa? ( media-libs/alsa-lib )
-	mng? ( media-libs/libmng )
-	png? ( media-libs/libpng:0= )
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	cegui? ( >=dev-games/cegui-0.5.0 )
-	3ds? ( media-libs/lib3ds )
-"
-RDEPEND="${COMMON_DEP}
-	java? ( >=virtual/jre-1.5 )
-"
-DEPEND="${COMMON_DEP}
-	java? ( >=virtual/jdk-1.5
-		dev-java/ant-core )
-	dev-util/ftjam
-	<dev-lang/swig-3
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-gcc52.patch
-	"${FILESDIR}"/${P}-wxgtk.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	# Installing doc conflict with dodoc on src_install
-	# Removing conflicting target
-	sed -i \
-		-e "/^InstallDoc/d" \
-		Jamfile.in \
-		docs/Jamfile || die
-
-	use wxwidgets && append-libs -lGL
-
-	AT_M4DIR=mk/autoconf \
-		eautoreconf
-}
-
-src_configure() {
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	econf \
-		--disable-as-needed \
-		--enable-cpu-specific-optimizations=no \
-		--disable-separate-debug-info \
-		--without-lcms \
-		--without-jackasyn \
-		--without-perl \
-		$(use_with java) \
-		--disable-make-emulation \
-		$(use_with bullet) \
-		--without-python \
-		$(use_with png) \
-		$(use_with jpeg) \
-		$(use_with mng) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with 3ds) \
-		$(use_with ode) \
-		$(use_with truetype freetype2) \
-		$(use_with cal3d) \
-		$(use_with wxwidgets wx) \
-		$(use_with cegui CEGUI) \
-		$(use_with cg Cg) \
-		$(use_with alsa asound)
-	#remove unwanted CFLAGS added by ./configure
-	sed -i -e '/COMPILER\.CFLAGS\.optimize/d' \
-		Jamconfig || die
-}
-
-src_compile() {
-	jam -q -dx -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	for installTarget in bin plugin lib include data config bindings
-	do
-		jam -q -s DESTDIR="${D}" install_${installTarget} || die
-	done
-	if use doc; then
-		jam -q -s DESTDIR="${D}" install_doc || die
-	fi
-	dodoc README docs/history*
-
-	echo "CRYSTAL_PLUGIN=/usr/$(get_libdir)/${PATH_P}" > 90crystalspace
-	echo "CRYSTAL_CONFIG=/etc/${PATH_P}" >> 90crystalspace
-	doenvd 90crystalspace
-}
-
-pkg_postinst() {
-	elog "Examples coming with this package, need correct light calculation"
-	elog "Do the following commands, with the root account, to fix that:"
-	# Fill cache directory for the examples
-	local dir
-	for dir in castle flarge isomap parallaxtest partsys r3dtest stenciltest \
-		terrain terrainf;
-	do
-		elog "cslight -video=null /usr/share/${PATH_P}/data/maps/${dir}"
-	done
-}

diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
deleted file mode 100644
index 5b76b2e9470..00000000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-gcc47.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://bugs.gentoo.org/426870
-https://bugs.gentoo.org/459440
-
- include/csplugincommon/rendermanager/render.h | 6 +++---
- include/csutil/blockallocator.h               | 6 +++---
- include/csutil/parray.h                       | 2 +-
- include/csutil/redblacktree.h                 | 4 ++--
- include/csutil/refarr.h                       | 2 +-
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
---- a/include/csplugincommon/rendermanager/render.h
-+++ b/include/csplugincommon/rendermanager/render.h
-@@ -194,7 +194,7 @@ namespace RenderManager
-             || (mesh.preCopyNum != 0))
-         {
-           // Render the latest batch of meshes
--          RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
-+          this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, m);
-           lastRenderedMesh = m;
- 
-           lastShader = shader;
-@@ -208,7 +208,7 @@ namespace RenderManager
-         }
-       }
- 
--      RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
-+      this->RenderMeshes (context, node->meshes, lastShader, lastTicket, lastRenderedMesh, node->meshes.GetSize ());
-     }
-   };
- 
-@@ -242,7 +242,7 @@ namespace RenderManager
- 	  iShader* shader = context.shaderArray[mesh.contextLocalId+layerOffset];
-         
- 	  size_t ticket = context.ticketArray[mesh.contextLocalId+layerOffset];
--          RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
-+          this->RenderMeshes (context, node->meshes, shader, ticket, m, m+1);
- 	}
-       }
-     }
---- a/include/csutil/blockallocator.h
-+++ b/include/csutil/blockallocator.h
-@@ -193,7 +193,7 @@ public:
-   ~csBlockAllocator()
-   {
-     ObjectDispose dispose (*this, false);
--    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
-@@ -204,7 +204,7 @@ public:
-   void Empty ()
-   {
-     ObjectDispose dispose (*this, true);
--    FreeAll (dispose);
-+    this->FreeAll (dispose);
-   }
- 
-   /**
-@@ -215,7 +215,7 @@ public:
-   void DeleteAll ()
-   {
-     ObjectDispose dispose (*this, true);
--    DisposeAll (dispose);
-+    this->DisposeAll (dispose);
-   }
- 
-   /**
---- a/include/csutil/parray.h
-+++ b/include/csutil/parray.h
-@@ -112,7 +112,7 @@ public:
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     T* ret = GetAndClear (this->GetSize () - 1); // see *1*
--    Truncate (this->GetSize () - 1);
-+    this->Truncate (this->GetSize () - 1);
-     return ret;
-   }
- 
---- a/include/csutil/redblacktree.h
-+++ b/include/csutil/redblacktree.h
-@@ -1155,7 +1155,7 @@ public:
-   T* Put (const K& key, const T &value)
-   {
-     csRedBlackTreePayload<K, T>* payload = (csRedBlackTreePayload<K, T>*)
--      Insert (csRedBlackTreePayload<K, T>(key, value));
-+      this->Insert (csRedBlackTreePayload<K, T>(key, value));
-     return (payload != 0) ? &payload->GetValue() :  0;
-   }
-   /**
-@@ -1194,7 +1194,7 @@ public:
-    */
-   const T& Get (const K& key, const T& fallback) const
-   {
--    const csRedBlackTreePayload<K, T>* payload = Find (key);
-+    const csRedBlackTreePayload<K, T>* payload = this->Find (key);
-     if (payload == 0) return fallback;
-     return payload->GetValue();
-   }
---- a/include/csutil/refarr.h
-+++ b/include/csutil/refarr.h
-@@ -111,7 +111,7 @@ public:
-   {
-     CS_ASSERT (this->GetSize () > 0);
-     csRef<T> ret = this->Get (this->GetSize () - 1); // see *1*
--    SetSize (this->GetSize () - 1);
-+    this->SetSize (this->GetSize () - 1);
-     return ret;
-   }
- };

diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
deleted file mode 100644
index 96b6aa71234..00000000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-gcc52.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/include/csgfx/imagememory.h.old	2016-04-17 09:09:31.497152401 +0200
-+++ b/include/csgfx/imagememory.h	2016-04-17 09:12:13.838355158 +0200
-@@ -179,8 +179,8 @@
-   /// Get a pointer to the alpha data that can be changed.
-   uint8* GetAlphaPtr ();
- 
--  virtual const void* GetImageData () { return GetImagePtr (); }
--  virtual int GetWidth () const { return Width; }
-+  virtual const void* GetImageData ();
-+  virtual int GetWidth () const;
-   virtual int GetHeight () const { return Height; }
-   virtual int GetDepth () const { return Depth; }
- 
---- a/libs/csgfx/imagememory.cpp.old	2016-04-17 09:07:19.555451540 +0200
-+++ b/libs/csgfx/imagememory.cpp	2016-04-17 09:13:09.339398463 +0200
-@@ -208,6 +208,23 @@
-   EnsureImage();
-   return (void*)databuf->GetData ();
- }
-+
-+const void* csImageMemory::GetImageData ()
-+{
-+  return GetImagePtr ();
-+}
-+
-+int csImageMemory::GetWidth () const
-+{
-+  return Width;
-+}
-+
-+void csImageBase::SetName (const char* iName)
-+{
-+  cs_free (fName);
-+  fName = CS::StrDup (iName);
-+}
-+
- csRGBpixel* csImageMemory::GetPalettePtr ()
- {
-   EnsureImage();
---- a/include/csgfx/imagebase.h.old	2016-04-17 09:59:09.211101864 +0200
-+++ b/include/csgfx/imagebase.h	2016-04-17 09:59:20.041919599 +0200
-@@ -61,10 +61,7 @@
-   // Most images are 2D, so provide a sensible default
-   virtual int GetDepth () const { return 1; }
- 
--  virtual void SetName (const char* iName)
--  {
--    cs_free (fName); fName = CS::StrDup (iName);
--  }
-+  virtual void SetName (const char* iName);
-   virtual const char* GetName () const { return fName; }
- 
-   /* Commented out: should be implemented by all descendants.

diff --git a/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch b/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch
deleted file mode 100644
index f0b099a3e3d..00000000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-gcc6.patch
+++ /dev/null
@@ -1,238 +0,0 @@
---- crystalspace-src-2.0/include/csutil/redblacktree.h.old	2016-09-20 22:06:36.732698058 -0400
-+++ crystalspace-src-2.0/include/csutil/redblacktree.h	2016-09-20 22:09:08.437064011 -0400
-@@ -37,7 +37,7 @@
-  * @{ */
- 
- template <typename K, typename Allocator,
--  template<typename K, typename K2> class Ordering>
-+  template<typename K1, typename K2> class Ordering>
- class csRedBlackTree;
- 
- template <typename K, typename T>
-@@ -237,7 +237,7 @@
- template <typename K,
-           typename Allocator =
- 	    CS::Container::DefaultRedBlackTreeAllocator<K>,
--	  template<typename K, typename K2> class Ordering =
-+	  template<typename K1, typename K2> class Ordering =
- 	    CS::Container::RedBlackTreeOrderingTotal>
- class csRedBlackTree
- {
---- crystalspace-src-2.0/plugins/terraformer/pagingformer/pagingformer.cpp.old	2016-09-20 22:10:54.287917849 -0400
-+++ crystalspace-src-2.0/plugins/terraformer/pagingformer/pagingformer.cpp	2016-09-20 22:12:31.684739007 -0400
-@@ -1159,7 +1159,7 @@
-   else
-   {
-     // Something we can't return was requested
--    return false;
-+    return NULL;
-   }
- }
- 
---- crystalspace-src-2.0/plugins/documentsystem/xmlread/characters.cpp.old	2016-09-20 22:13:28.794863758 -0400
-+++ crystalspace-src-2.0/plugins/documentsystem/xmlread/characters.cpp	2016-09-20 22:22:26.124668024 -0400
-@@ -46,20 +46,20 @@
-   //       0 1 2 3 4 5 6 7 8 9 A B C D E F
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 00-0f
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 10-1f
--  CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,S,S,0), // 20-2f
--  CHAR_ROW(S,S,S,S,S,S,S,S,S,S,F,0,0,0,0,0), // 30-3f
--  CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 40-4f
--  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,F), // 50-5f
--  CHAR_ROW(0,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // 60-6f
--  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,0,0,0,0,0), // 70-7f
-+  CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,(uint32)S,(uint32)S,0), // 20-2f
-+  CHAR_ROW((uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)S,(uint32)F,0,0,0,0,0), // 30-3f
-+  CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 40-4f
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,(uint32)F), // 50-5f
-+  CHAR_ROW(0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // 60-6f
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,0,0,0,0), // 70-7f
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 80-8f
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // 90-9f
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // a0-af
-   CHAR_ROW(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), // b0-bf
--  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // c0-cf
--  CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // d0-df
--  CHAR_ROW(F,F,F,F,F,F,F,F,F,F,F,F,F,F,F,F), // e0-ef
--  CHAR_ROW(F,F,F,F,F,F,F,0,F,F,F,F,F,F,F,F), // f0-ff
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // c0-cf
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // d0-df
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // e0-ef
-+  CHAR_ROW((uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,0,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F,(uint32)F), // f0-ff
- };
- 
- #undef CHAR_ROW
---- crystalspace-src-2.0/plugins/mesh/protomesh/object/protomesh.cpp.old	2016-09-20 22:13:51.298710883 -0400
-+++ crystalspace-src-2.0/plugins/mesh/protomesh/object/protomesh.cpp	2016-09-20 22:24:27.087156627 -0400
-@@ -141,7 +141,7 @@
- {
-   n = 0;
- 
--  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;
-+  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
- 
-   SetupObject ();
- 
---- crystalspace-src-2.0/plugins/terraformer/simpleformer/simpleformer.cpp.old	2016-09-20 22:14:11.555573385 -0400
-+++ crystalspace-src-2.0/plugins/terraformer/simpleformer/simpleformer.cpp	2016-09-20 22:25:57.007048574 -0400
-@@ -1012,7 +1012,7 @@
-   else
-   {
-     // Something we can't return was requested
--    return false;
-+    return NULL;
-   }
- }
- 
---- crystalspace-src-2.0/plugins/mesh/skeleton/persist/standard/skelldr.cpp.old	2016-09-20 22:14:28.534458231 -0400
-+++ crystalspace-src-2.0/plugins/mesh/skeleton/persist/standard/skelldr.cpp	2016-09-20 22:28:15.857616492 -0400
-@@ -157,7 +157,7 @@
-           {
-             csVector3 v;
-             if (!SyntaxService->ParseVector (vector_node, v))
--              return false;
-+              return NULL;
-             bone->GetTransform ().SetOrigin (v);
-           }
- 
-@@ -166,7 +166,7 @@
-           {
-             csMatrix3 m;
-             if (!SyntaxService->ParseMatrix (matrix_node, m))
--              return false;
-+              return NULL;
-             bone->GetTransform ().SetO2T (m);
-           }
-         }
-@@ -201,7 +201,7 @@
-             {
-               csVector3 v;
-               if (!SyntaxService->ParseVector (vector_node, v))
--              return false;
-+              return NULL;
-               socket_transform.SetOrigin (v);
-             }
-     
-@@ -210,7 +210,7 @@
-             {
-               csMatrix3 m;
-               if (!SyntaxService->ParseMatrix (matrix_node, m))
--              return false;
-+              return NULL;
-               socket_transform.SetO2T (m);
-             }
-             socket->SetTransform(socket_transform);
-@@ -550,7 +550,7 @@
-           {
-           csVector3 v;
-           if (!SyntaxService->ParseVector (vector_node, v))
--            return false;
-+            return NULL;
-           key_transform.SetOrigin (v);
-           }
- 
-@@ -559,7 +559,7 @@
-           {
-           csMatrix3 m;
-           if (!SyntaxService->ParseMatrix (matrix_node, m))
--            return false;
-+            return NULL;
-           key_transform.SetO2T (m);
-           }
-         }
---- crystalspace-src-2.0/plugins/mesh/animesh/persist/skeleton2/skeleton2ldr.cpp.old	2016-09-20 22:14:53.609288299 -0400
-+++ crystalspace-src-2.0/plugins/mesh/animesh/persist/skeleton2/skeleton2ldr.cpp	2016-09-20 22:29:41.797284147 -0400
-@@ -516,7 +516,7 @@
-     if (!name)
-     {
-       synldr->ReportError (msgid, node, "No name set for animation");
--      return false;
-+      return NULL;
-     }
- 
-     CS::Animation::iSkeletonAnimation* fact = packet->CreateAnimation (name);
-@@ -524,7 +524,7 @@
-     {
-       synldr->ReportError (msgid, node, 
-         "Could not create animation, another animation with same name already exist");
--      return false;
-+      return NULL;
-     }
- 
-     if (node->GetAttributeValueAsBool ("bindspace", false))
---- crystalspace-src-2.0/plugins/mesh/watermesh/object/watermesh.cpp.old	2016-09-20 22:15:10.911171145 -0400
-+++ crystalspace-src-2.0/plugins/mesh/watermesh/object/watermesh.cpp	2016-09-20 22:30:58.603396904 -0400
-@@ -363,7 +363,7 @@
- {
-   n = 0;
- 
--  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return false;
-+  if (vis_cb) if (!vis_cb->BeforeDrawing (this, rview)) return NULL;
- 
-   iCamera* camera = rview->GetCamera ();
- 
---- crystalspace-src-2.0/plugins/csparser/csparser.cpp.old	2016-09-20 22:15:32.086027857 -0400
-+++ crystalspace-src-2.0/plugins/csparser/csparser.cpp	2016-09-20 22:36:18.576856714 -0400
-@@ -571,7 +571,7 @@
-         break;
-       case XMLTOKEN_KEY:
-         if (!ParseKey (child, &Keys))
--          return false;
-+          return NULL;
-         break;
-       case XMLTOKEN_HALO:
-         {
-@@ -779,7 +779,7 @@
-           {
-             csMatrix3 m;
-             if (!SyntaxService->ParseMatrix (matrix_node, m))
--              return false;
-+              return NULL;
-             light_transf.SetO2T (m);
-           }
-           csRef<iDocumentNode> vector_node = child->GetNode ("v");
-@@ -787,7 +787,7 @@
-           {
-             csVector3 v;
-             if (!SyntaxService->ParseVector (vector_node, v))
--              return false;
-+              return NULL;
-             use_light_transf_vector = true;
-             light_transf.SetO2TTranslation (v);
-           }
-@@ -830,7 +830,7 @@
-         {
-           bool flag;
-           if (!SyntaxService->ParseBool (child, flag, true))
--            return false;
-+            return NULL;
-           lightFlags.SetBool (CS_LIGHT_NOSHADOWS, flag);
-         }
-         break;
-@@ -1193,7 +1193,7 @@
-         {
-           csColor c;
-           if (!SyntaxService->ParseColor (child, c))
--            return false;
-+            return NULL;
-           sector->SetDynamicAmbientLight (c);
-         }
-         break;
-@@ -1387,7 +1387,7 @@
-           iRenderLoop* loop = ParseRenderLoop (child, set);
-           if (!loop)
-           {
--            return false;
-+            return NULL;
-           }
-           if (set)
-           {
-@@ -1569,7 +1569,7 @@
-         return 0;
-       case XMLTOKEN_KEY:
-         if (!ParseKey (child, pNode->QueryObject()))
--          return false;
-+          return NULL;
-         break;
-       case XMLTOKEN_POSITION:
-         if (!SyntaxService->ParseVector (child, pos))

diff --git a/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch b/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
deleted file mode 100644
index 740f22eaa24..00000000000
--- a/dev-games/crystalspace/files/crystalspace-2.0-wxgtk.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix to build with wxwidgets3.0
-Author: Olly Betts <olly@××××××.com>
-Last-Update: 2014-06-14
-
---- crystalspace-2.0+dfsg.orig/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
-+++ crystalspace-2.0+dfsg/plugins/video/canvas/wxgl/GLWXDriver2D.cpp
-@@ -292,7 +292,7 @@ bool csGraphics2DWX::Open()
-   {
-     Display* dpy = (Display*) wxGetDisplay ();
-     GLXContext active_GLContext = glXGetCurrentContext();
--    XVisualInfo *xvis = (XVisualInfo*)theCanvas->m_vi;
-+    XVisualInfo *xvis = theCanvas->GetXVisualInfo();
- 
-     Report (CS_REPORTER_SEVERITY_NOTIFY, "Video driver GL/X version %s",
-       glXIsDirect (dpy, active_GLContext) ? "(direct renderer)" :
-@@ -705,8 +705,8 @@ static bool wxCodeToCSCode(int wxkey, ut
-     MAP (MENU,            CONTEXT,      CONTEXT)
-     MAP (PAUSE,           PAUSE,        PAUSE)
-     MAP (CAPITAL,         CAPSLOCK,     CAPSLOCK)
--    MAP (PRIOR,           PGUP,         PGUP)
--    MAP (NEXT,            PGDN,         PGDN)
-+    MAP (PAGEUP,          PGUP,         PGUP)
-+    MAP (PAGEDOWN,        PGDN,         PGDN)
-     MAP (END,             END,          END)
-     MAP (HOME,            HOME,         HOME)
-     MAP (LEFT,            LEFT,         LEFT)
-@@ -722,10 +722,7 @@ static bool wxCodeToCSCode(int wxkey, ut
-     MAPC (NUMPAD2,        PAD2,         '2')
-     MAP (NUMPAD_DOWN,     PAD2,         DOWN)
-     MAPC (NUMPAD3,        PAD3,         '3')
--    MAP (NUMPAD_NEXT,     PAD3,         PGDN)
--#if wxVERSION_NUMBER < 2700
-     MAP (NUMPAD_PAGEDOWN, PAD3,         PGDN)
--#endif
-     MAPC (NUMPAD4,        PAD4,         '4')
-     MAP (NUMPAD_LEFT,     PAD4,         LEFT)
-     MAPC (NUMPAD5,        PAD5,         '5')
-@@ -736,10 +733,7 @@ static bool wxCodeToCSCode(int wxkey, ut
-     MAPC (NUMPAD8,        PAD8,         '8')
-     MAP (NUMPAD_UP,       PAD8,         UP)
-     MAPC (NUMPAD9,        PAD9,         '9')
--    MAP (NUMPAD_PRIOR,    PAD9,         PGUP)
--#if wxVERSION_NUMBER < 2700
-     MAP (NUMPAD_PAGEUP,   PAD9,         PGUP)
--#endif
-     MAPC (MULTIPLY,       PADMULT,      '*')
-     MAPC (NUMPAD_MULTIPLY,PADMULT,      '*')
-     MAPC (ADD,            PADPLUS,      '+')

diff --git a/dev-games/crystalspace/metadata.xml b/dev-games/crystalspace/metadata.xml
deleted file mode 100644
index d51e9062a2e..00000000000
--- a/dev-games/crystalspace/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@g.o</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-Crystal Space is a free (LGPL) and portable 3D Game 
-Development Kit written in C++. It supports: true six degrees 
-of freedom, colored lighting, lightmapped and stencil based 
-lighting, shader support, mipmapping, portals, mirrors, alpha 
-transparency, reflective surfaces, 3D sprites (frame based or 
-with skeletal animation, also using cal3d animation library), 
-procedural textures, particle systems, halos, volumetric fog, 
-scripting (using Python, Perl, Java, or potentially other 
-languages), 16-bit and 32-bit display support, OpenGL, and 
-software renderer, font support, hierarchical 
-transformations, physics plugin based on ODE, ... See the 
-extensive list of features for more details.
-</longdescription>
-	<use>
-		<flag name="3ds">Enables support for .3DS files in CrystalSpace</flag>
-		<flag name="bullet">include support for Bullet library</flag>
-		<flag name="cal3d">include support for skeleton animation</flag>
-		<flag name="cegui">include support for Crazy Eddie GUI</flag>
-		<flag name="cg">NVIDIA toolkit plugin</flag>
-		<flag name="ode">include support for Open Dynamics Engine</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">crystal</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-java/jad-bin/Manifest b/dev-java/jad-bin/Manifest
deleted file mode 100644
index 0544dd93127..00000000000
--- a/dev-java/jad-bin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jadls158.zip 389972 BLAKE2B 1bb59583fee60a805b47ea7fa0cb14090912719ea827453447777873c7c17dadb39b17938207dd56ef6f2ccf0fbaed7bbf953b68b9bd66c3f8694cf771bd423e SHA512 5f16c51f676990ea6cf76cbee4c9fbf93273fb6a4474a136c032457fcb29c9507508b543d3f65a212cd4e21d14671f0b4368ce5a42dc7c542e75883a911a5ebf

diff --git a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild b/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
deleted file mode 100644
index 9ea62a8c3be..00000000000
--- a/dev-java/jad-bin/jad-bin-1.5.8e-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Jad - The fast JAva Decompiler"
-HOMEPAGE="http://www.kpdus.com/jad.html"
-SRC_URI="http://www.kpdus.com/jad/linux/jadls158.zip"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="freedist"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-RESTRICT="strip"
-QA_PREBUILT="*"
-
-src_install() {
-	into /opt
-	dobin jad || die "dobin failed"
-	dodoc Readme.txt || die "dodoc failed"
-}

diff --git a/dev-java/jad-bin/metadata.xml b/dev-java/jad-bin/metadata.xml
deleted file mode 100644
index 2444066aa02..00000000000
--- a/dev-java/jad-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@g.o</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>

diff --git a/dev-lang/rubinius/Manifest b/dev-lang/rubinius/Manifest
deleted file mode 100644
index d63ef3bd4c2..00000000000
--- a/dev-lang/rubinius/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rubinius-3.43.tar.bz2 13013106 BLAKE2B 42298e046bb652f16187a70fb377c650319260b78c674faf6791c0865abb8798a7e1511ddc3eb809585825e452b72bc9b783691760c5400b36815e9cabf1a65a SHA512 80ca70f1aeea2f48e9f4bbd9dc646e0fdabf266cde879fd6acb46bcc38140a2738fddf7d63fa72c386f0411046f457af02deb1162b249c7942bdc0e4a8138023

diff --git a/dev-lang/rubinius/files/auto_gem.rb b/dev-lang/rubinius/files/auto_gem.rb
deleted file mode 100644
index 5c4f540a92d..00000000000
--- a/dev-lang/rubinius/files/auto_gem.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is installed by Gentoo's rubygems package.
-# It's intended to help automate the loading of rubygems
-
-begin
-require 'rubygems'
-rescue LoadError
-end

diff --git a/dev-lang/rubinius/metadata.xml b/dev-lang/rubinius/metadata.xml
deleted file mode 100644
index 3d967b6d9f4..00000000000
--- a/dev-lang/rubinius/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@g.o</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <use>
-    <flag name="llvm">
-      Build with llvm. Currently the package only builds against old versions of llvm.
-    </flag>
-  </use>
-</pkgmetadata>

diff --git a/dev-lang/rubinius/rubinius-3.43.ebuild b/dev-lang/rubinius/rubinius-3.43.ebuild
deleted file mode 100644
index 216369dfed8..00000000000
--- a/dev-lang/rubinius/rubinius-3.43.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic multilib versionator
-
-DESCRIPTION="A re-implementation of the Ruby VM designed for speed"
-HOMEPAGE="http://rubini.us"
-SRC_URI="https://rubinius-releases-rubinius-com.s3.amazonaws.com/${P}.tar.bz2"
-
-LICENSE="BSD"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="+llvm"
-
-RDEPEND="
-	llvm? ( >=sys-devel/llvm-3.6 )
-	dev-libs/openssl:0
-	sys-libs/ncurses
-	sys-libs/readline:0
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-"
-
-DEPEND="${RDEPEND}
-	=dev-ruby/rake-10*
-	dev-ruby/bundler
-"
-
-pkg_setup() {
-	unset RUBYOPT
-}
-
-src_prepare() {
-	# src_test will wait until all processes are reaped, so tune down
-	# the long sleep process a bit.
-	sed -i -e 's/sleep 1000/sleep 300/' spec/ruby/core/io/popen_spec.rb || die
-
-	# Avoid specs that cannot work in the portage context
-	rm -f spec/ruby/core/argf/read_nonblock_spec.rb || die
-
-	# Drop error CFLAGS per Gentoo policy.
-	sed -i -e '/Werror/ s:^:#:' rakelib/blueprint.rb || die
-
-	bundle --local || die
-}
-
-src_configure() {
-	conf=""
-	if ! use llvm ; then
-		conf+="--disable-llvm "
-	fi
-
-	#Rubinius uses a non-autoconf ./configure script which balks at econf
-	INSTALL="${EPREFIX}/usr/bin/install -c" ./configure \
-		--prefix /usr/$(get_libdir) \
-		--mandir /usr/share/man \
-		--without-rpath \
-		--with-vendor-zlib \
-		${conf} \
-		|| die "Configure failed"
-}
-
-src_compile() {
-	RBXOPT="-Xsystem.log=syslog" rake build || die "Compilation failed"
-}
-
-src_test() {
-	rake spec || die "Tests failed"
-	einfo "Waiting for forked processes to die"
-}
-
-src_install() {
-	# The install phase tries to determine if there are relevant
-	addpredict /usr/local/lib64/ruby
-
-	local minor_version=$(get_version_component_range 1-2)
-	local librbx="usr/$(get_libdir)/rubinius"
-
-	RBXOPT="-Xsystem.log=syslog" DESTDIR="${D}" rake install || die "Installation failed"
-
-	dosym /${librbx}/bin/rbx /usr/bin/rbx || die "Couldn't make rbx symlink"
-
-	insinto /${librbx}/${minor_version}/site
-	doins "${FILESDIR}/auto_gem.rb" || die "Couldn't install rbx auto_gem.rb"
-	RBXOPT="-Xsystem.log=syslog" RBX_RUNTIME="${S}/runtime" RBX_LIB="${S}/lib" bin/rbx compile "${D}/${librbx}/${minor_version}/site/auto_gem.rb" || die "Couldn't bytecompile auto_gem.rb"
-}

diff --git a/dev-php/pecl-gearman/Manifest b/dev-php/pecl-gearman/Manifest
deleted file mode 100644
index 21674fe3190..00000000000
--- a/dev-php/pecl-gearman/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gearman-1.0.2.tgz 30405 BLAKE2B cb2402068507b6f2b87e42ec5ffbfdc6cc3d6faea1d4cfa31aef9ef6d9801b39415656ea679c26782fbf2d3bd2eb0f0fd343851c1e7343b0d7abef5edc3901ea SHA512 503d16912bc7de6a3b348fef76eada4e0125636d4c75cc3361b39811efa6df020147c48116eceb7478fa76234491c70eab2974e45a7b2c5900810de272bec702

diff --git a/dev-php/pecl-gearman/metadata.xml b/dev-php/pecl-gearman/metadata.xml
deleted file mode 100644
index 5866eae7711..00000000000
--- a/dev-php/pecl-gearman/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed --> 
-</pkgmetadata>

diff --git a/dev-php/pecl-gearman/pecl-gearman-1.0.2-r2.ebuild b/dev-php/pecl-gearman/pecl-gearman-1.0.2-r2.ebuild
deleted file mode 100644
index 6c27bc1c993..00000000000
--- a/dev-php/pecl-gearman/pecl-gearman-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PHP_EXT_NAME="gearman"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension for using gearmand"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=sys-cluster/gearmand-0.21"
-RDEPEND="${DEPEND}"

diff --git a/dev-python/jenkins-autojobs/Manifest b/dev-python/jenkins-autojobs/Manifest
deleted file mode 100644
index 9c423999843..00000000000
--- a/dev-python/jenkins-autojobs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jenkins-autojobs-0.14.3.tar.gz 151992 BLAKE2B 98d951545d7101bdab42bc1a33e30ee8aa315c58ca51c697ea8e8826ad46bbe5629d89a5c360a8f641c907ea34e07c15df8a1cba0e16d3e196ffda3b827b14be SHA512 1db2d02bf6f1c2d52d0197ffc21e80e5ccd48f6e2020bbe4618ab06792ea3988a42089c1fe1e6d277e30ea6ecf58078d8138da0c463862a063583c119e67e805
-DIST jenkins-autojobs-0.14.3_git_1.1.21.hpi 2108607 BLAKE2B c5b17fa082b287c24e1d559d7935e38397c66d4c4924cbb1eea719082cf85cf52925aec703fd36ef765dcfbc6acab15c5bcf041d0df338d95a6847c20dcd1f45 SHA512 6fa6386f0292cfc61f44dca11860146b7c35df46adefdfec547789b75145fbff61e620195e5f756ae8902211117b4cd2cd7d616dfe51204e563ad38154a67d88
-DIST jenkins-autojobs-0.14.3_mercurial_1.41.hpi 107202 BLAKE2B 3553fb3f0fd1e0f4afd5fcec6380f0d41d37def0b58b2d54161c601d6fb1b619ac868fea3ce431fd81f7efd537eb4d4b7d39cd6385e13fce163548e6280ea7ad SHA512 76d24c9964d7d4590f128bf1577f54a0a4b799d275a0e7874aee95aa20c3ed0313b96bb6fb4e7f9603a4433db68e4d0caeb4ca22394cdc24a436fcc3b32b8d67

diff --git a/dev-python/jenkins-autojobs/files/local_jenkins.patch b/dev-python/jenkins-autojobs/files/local_jenkins.patch
deleted file mode 100644
index 96bab635ffe..00000000000
--- a/dev-python/jenkins-autojobs/files/local_jenkins.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- tests/bin/start-jenkins.sh.orig	2015-01-02 23:10:17.000000000 +0100
-+++ tests/bin/start-jenkins.sh	2015-01-30 16:35:27.058035074 +0100
-@@ -19,6 +19,8 @@
-     echo 0 | nc $jenkins_addr $jenkins_cport
- }
- 
-+cp -v /opt/jenkins/jenkins.war $jenkins_war 
-+
- if [[ ! -e $jenkins_war ]]; then
-     echo "Downloading jenkins.war ..."
-     curl -L $jenkins_war_url > $jenkins_war
-@@ -31,7 +33,6 @@
- 
- if [[ $(unzip -l $jenkins_war | egrep "plugins/(mercurial)|(git).hpi" | wc -l) -ne 2 ]]; then
-     echo "Adding git and hg plugins to jenkins.war ..."
--    wget -c $hg_hpi_url $git_hpi_url -P "${here}/../tmp/WEB-INF/plugins"
-     (cd ${here}/../tmp && zip jenkins.war ./WEB-INF/plugins/*.hpi)
- fi
- 
-@@ -57,4 +58,4 @@
- 
- [[ $jenkins_running -ne 0 ]] && exit 1
- 
--wait $java_pid
-+#wait $java_pid
-

diff --git a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild b/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
deleted file mode 100644
index ff00a92b13a..00000000000
--- a/dev-python/jenkins-autojobs/jenkins-autojobs-0.14.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-MERCURIAL_PV="1.41"
-GIT_PV="1.1.21"
-
-DESCRIPTION="Scripts for automatically creating Jenkins jobs from scm branches"
-HOMEPAGE="https://github.com/gvalkov/jenkins-autojobs"
-SRC_URI="https://github.com/gvalkov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		http://updates.jenkins-ci.org/download/plugins/mercurial/${MERCURIAL_PV}/mercurial.hpi -> ${P}_mercurial_${MERCURIAL_PV}.hpi
-		http://updates.jenkins-ci.org/download/plugins/git/${GIT_PV}/git.hpi -> ${P}_git_${GIT_PV}.hpi"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-RDEPEND=">dev-python/jenkins-webapi-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.3[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-			dev-util/jenkins-bin
-			net-analyzer/netcat
-			dev-python/pytest[${PYTHON_USEDEP}] )
-	doc? ( 	>=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
-			>=dev-python/alabaster-0.6.1[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}/local_jenkins.patch" )
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use test; then
-	  mkdir -p ${P}/tests/tmp/WEB-INF/plugins/
-
-	  cp -v "${DISTDIR}"/${P}_mercurial_${MERCURIAL_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/mercurial.hpi
-	  cp -v "${DISTDIR}"/${P}_git_${GIT_PV}.hpi ${P}/tests/tmp/WEB-INF/plugins/git.hpi
-	fi
-}
-
-python_test() {
-	# Test phase works with the limitation that it need be run as root in portage
-	# starts jenkins
-	./tests/bin/start-jenkins.sh
-
-	py.test || die "Failed with ${EPYTHON}"
-
-	# kills jenkins
-	echo 0 | nc 127.0.0.1 60887
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}

diff --git a/dev-python/jenkins-autojobs/metadata.xml b/dev-python/jenkins-autojobs/metadata.xml
deleted file mode 100644
index 69a9c16c4b6..00000000000
--- a/dev-python/jenkins-autojobs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">gvalkov/jenkins-autojobs</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/dev-python/rtslib/Manifest b/dev-python/rtslib/Manifest
deleted file mode 100644
index 46b01d0dd25..00000000000
--- a/dev-python/rtslib/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST rtslib-3.0_pre4.tar.gz 63988 BLAKE2B 0a08116b4c3964787144f828185c54bb041bd3adcb23555fd199ecf8a1aa8597f3b96acfc6c6b33f6da1b83292e03ee420c2ab9db8d4c71a642ed4be2c2cecf5 SHA512 5b4ff3dbaa379f177e08d0ffb54b575e7637c9ebf9ad98cdb2db2b93cde623d0c3a29c3ec9eb0a5542964438d8d5342691f483e2fdb81b7f1f64f37c701e0063

diff --git a/dev-python/rtslib/metadata.xml b/dev-python/rtslib/metadata.xml
deleted file mode 100644
index 0dbe3c5da04..00000000000
--- a/dev-python/rtslib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@g.o</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Datera/rtslib</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/dev-python/rtslib/rtslib-3.0_pre4.ebuild b/dev-python/rtslib/rtslib-3.0_pre4.ebuild
deleted file mode 100644
index 6d946acafaf..00000000000
--- a/dev-python/rtslib/rtslib-3.0_pre4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	!dev-python/rtslib-fb"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/target/fabric
-	insinto /var/target/fabric
-	doins specs/*.spec
-}

diff --git a/dev-python/rtslib/rtslib-9999.ebuild b/dev-python/rtslib/rtslib-9999.ebuild
deleted file mode 100644
index 6d946acafaf..00000000000
--- a/dev-python/rtslib/rtslib-9999.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="RTSLib Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	!dev-python/rtslib-fb"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-	keepdir /var/target/fabric
-	insinto /var/target/fabric
-	doins specs/*.spec
-}

diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
deleted file mode 100644
index c30ffcc7ab8..00000000000
--- a/dev-python/visual/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST visual-5.74_release.tar.bz2 5736404 BLAKE2B 8d91938a17eb4b29da576130b599490f37b81d5fe018801fd8811b41c3301edebc022646176fb7bb798216b15ab7dd42bee7657c18d686d80b52cad560210d31 SHA512 eff43bae66d4ca6a1b540e729b5f03e7310db8d4c49ba7a1ac271afa62688d9024f4f00b7678669433ca3f0f6e13e6c0c3de90a4a845ae5eeaa70b536a6e1193

diff --git a/dev-python/visual/files/visual-5.74-boost-1.50.patch b/dev-python/visual/files/visual-5.74-boost-1.50.patch
deleted file mode 100644
index a66ded25898..00000000000
--- a/dev-python/visual/files/visual-5.74-boost-1.50.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://github.com/vpython/visual/issues/3
-
---- dependencies/threadpool/include/threadpool/task_adaptors.hpp
-+++ dependencies/threadpool/include/threadpool/task_adaptors.hpp
-@@ -135,7 +135,11 @@
-         if(m_break_s > 0 || m_break_ns > 0)
-         { // Sleep some time before first execution
-           xtime xt;
-+#if BOOST_VERSION >= 105000
-+          xtime_get(&xt, TIME_UTC_);
-+#else
-           xtime_get(&xt, TIME_UTC);
-+#endif
-           xt.nsec += m_break_ns;
-           xt.sec += m_break_s;
-           thread::sleep(xt); 
-@@ -146,7 +150,11 @@
-           if(m_break_s > 0 || m_break_ns > 0)
-           {
-             xtime xt;
-+#if BOOST_VERSION >= 105000
-+            xtime_get(&xt, TIME_UTC_);
-+#else
-             xtime_get(&xt, TIME_UTC);
-+#endif
-             xt.nsec += m_break_ns;
-             xt.sec += m_break_s;
-             thread::sleep(xt); 

diff --git a/dev-python/visual/metadata.xml b/dev-python/visual/metadata.xml
deleted file mode 100644
index e24dd86faa2..00000000000
--- a/dev-python/visual/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@g.o</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/dev-python/visual/visual-5.74-r1.ebuild b/dev-python/visual/visual-5.74-r1.ebuild
deleted file mode 100644
index 3c771156efb..00000000000
--- a/dev-python/visual/visual-5.74-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 versionator
-
-MY_P="${PN}-$(delete_version_separator 2)_release"
-
-DESCRIPTION="Real-time 3D graphics library for Python"
-HOMEPAGE="http://www.vpython.org/"
-SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2"
-
-LICENSE="HPND Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc examples"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-cpp/gtkglextmm-1.2
-	dev-cpp/libglademm
-	>=dev-libs/boost-1.48:=[threads,python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/polygon:2[${PYTHON_USEDEP}]
-	dev-python/ttfquery[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Verbose build.
-	sed -i \
-		-e 's/2\?>>[[:space:]]*\$(LOGFILE).*//' \
-		src/Makefile.in || die
-
-	epatch "${FILESDIR}/${P}-boost-1.50.patch"
-
-	sed \
-		-e "s/-lboost_python/-lboost_python-${EPYTHON#python}/" \
-		-e "s/libboost_python/libboost_python-${EPYTHON#python}/" \
-		-i src/Makefile.in src/gtk2/makefile || die
-}
-
-src_configure() {
-	BOOST_PKG="$(best_version ">=dev-libs/boost-1.48")"
-	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
-	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-	BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
-	BOOST_LIB="${EPREFIX}/usr/$(get_libdir)/boost-${BOOST_VER}"
-
-	# Specify the include and lib directory for Boost.
-	append-cxxflags -I${BOOST_INC} -std=c++11
-	append-ldflags -L${BOOST_LIB}
-
-	econf \
-		--with-example-dir="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		$(use_enable doc docs) \
-		$(use_enable examples)
-}
-
-src_install() {
-	default
-
-	dodoc authors.txt HACKING.txt NEWS.txt
-}

diff --git a/dev-util/alleyoop/Manifest b/dev-util/alleyoop/Manifest
deleted file mode 100644
index 586a07fd298..00000000000
--- a/dev-util/alleyoop/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alleyoop-0.9.8.tar.xz 252292 BLAKE2B ab1a3b5b80d6eddd947368ae60b01820823c2095c006414ee32961efdee0434e19a4e498deb56947d621769937dab567013787ccf96d07dd9c05dfae46dfbbf9 SHA512 b056b41692da1824e233160c1053075cabcd11394c8c571dd654167be3ef29680357f69371b36f672b4e8b8a769ba3d0a33ad48c1409a8141bcbfa0ba8187bfb

diff --git a/dev-util/alleyoop/alleyoop-0.9.8.ebuild b/dev-util/alleyoop/alleyoop-0.9.8.ebuild
deleted file mode 100644
index bb2bdbe4eac..00000000000
--- a/dev-util/alleyoop/alleyoop-0.9.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A Gtk+ front-end to the Valgrind memory checker"
-HOMEPAGE="http://alleyoop.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-alpha amd64 ~ppc -sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=x11-libs/gtk+-2.2:2
-	>=gnome-base/gconf-2.2:2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2.2
-	gnome-base/libgnome-keyring
-	sys-devel/binutils
-	>=dev-util/valgrind-2.4
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"

diff --git a/dev-util/alleyoop/metadata.xml b/dev-util/alleyoop/metadata.xml
deleted file mode 100644
index dc8392005a8..00000000000
--- a/dev-util/alleyoop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">alleyoop</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/dev-util/bluej/Manifest b/dev-util/bluej/Manifest
deleted file mode 100644
index 300b1c9d7c8..00000000000
--- a/dev-util/bluej/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST BlueJ-source-311.zip 15564184 BLAKE2B 7e34ad2663ec07bc370c851288c71e021b50cb868e26665132dc6c3b2e734ef1b8e75e2a60c5d39f36393d298c195e3acb31eebd17e283d7028ba7644462441d SHA512 60515f8564f0edf96ffba69ff43c199c024da12ac5601cba5f163c5682c9466717e2048593582ad2fe5d61988380e3fb9205825ec8967e99983c8a2a02f5144a
-DIST bluej-ref-manual.pdf 768751 BLAKE2B 22f037706e3bd8e24a79ac3983c368ad6e6c50c1769ed64c00ae5be11dc7838116a56dd0502c014b3e21d2ba385822b85c7a3f8e4440bc3bb8059696f0eada4e SHA512 7f7e8cc2eab6402722eb8f94c878b506f595eee280cdfa85497d926cb06aa229defb0c8fbe5353dbbf6587e36a99ad5dae0a50fca21c1c80c88a92647d9b5319
-DIST bluej-testing-tutorial.pdf 269284 BLAKE2B c91f3c13d2837e3ee1a7628ec06998b38fd023f55ab3bbe271d63a790224b622d7ad05783f9f1bd13f176e656e450dea0ba8268ea9eff10e3c03eb9a0ad36c3f SHA512 015da66cbf4940ca4bcab535023608a8497e7c6df1e06988393f8f0c7300a4521025474bf828e7889ff717e988968a2e973330758bf6dd570c057a837c78a9b5
-DIST bluej-tutorial-2.0.1.pdf 1205655 BLAKE2B 79bd98b146ab89f1b974e4ad4d10ff17cf418e896806a34c2f900e25845b08b7bb42ba5785c653e21ac7a863b6dc4392f57db4dd2e01817a80c1a7b694a8018e SHA512 410acbb75091d14b5ee7f5d56c01441a9611ed1f8b583c0301e1badf3d01bd2bb284da77d422c38ace283e7fe066b7975c772859697d25d6e9b334053d2f4833

diff --git a/dev-util/bluej/bluej-3.1.1.ebuild b/dev-util/bluej/bluej-3.1.1.ebuild
deleted file mode 100644
index b38d355a826..00000000000
--- a/dev-util/bluej/bluej-3.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-EANT_BUILD_TARGET="ready-to-run"
-EANT_DOC_TARGET="doc-core"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DOC_PV="2.0.1"
-
-DESCRIPTION="An integrated Java environment for introductory teaching"
-HOMEPAGE="http://bluej.org/"
-SRC_URI="http://www.bluej.org/download/files/source/BlueJ-source-${PV//./}.zip
-doc? ( http://bluej.org/download/files/${PN}-ref-manual.pdf
-		http://bluej.org/tutorial/tutorial-${DOC_PV//.}.pdf -> ${PN}-tutorial-${DOC_PV}.pdf
-		http://bluej.org/tutorial/testing-tutorial.pdf -> ${PN}-testing-tutorial.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jdk-1.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-java_prepare() {
-	sed -i \
-		-e "s:^build_java_home=.*$:build_java_home=$(java-config -O):" \
-		-e "/^bluej_home/d" \
-		build.properties || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r lib icons
-
-	# fix config location and set symlink
-	dodir /etc
-	mv "${D}"/{usr/share/${PN}/lib,etc}/${PN}.defs
-	dosym /{etc,usr/share/${PN}/lib}/${PN}.defs
-
-	use source && java-pkg_dosrc src/${PN}/*
-
-	insinto /usr/share/doc/${PF}
-	use examples && { doins -r examples
-		docompress -x /usr/share/doc/${P}/examples ; }
-	use doc && { doins "${DISTDIR}"/${PN}-*.pdf
-		dohtml -r doc/all/* ; }
-
-	newbin "${FILESDIR}"/${PN}.wrapper ${PN}
-
-	make_desktop_entry ${PN} Blue-J
-}

diff --git a/dev-util/bluej/files/bluej.wrapper b/dev-util/bluej/files/bluej.wrapper
deleted file mode 100644
index 8d5fe527809..00000000000
--- a/dev-util/bluej/files/bluej.wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-APPBASE="/usr/share/bluej"
-JAVAPATH="$(java-config -O)"
-CP="$APPBASE/lib/bluej.jar:$JAVAPATH/lib/tools.jar"
-"$JAVAPATH/bin/java" -cp "$CP" bluej.Boot  "$@"
-

diff --git a/dev-util/bluej/metadata.xml b/dev-util/bluej/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/dev-util/bluej/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/dev-vcs/bzr-git/Manifest b/dev-vcs/bzr-git/Manifest
deleted file mode 100644
index 9feeaf7a175..00000000000
--- a/dev-vcs/bzr-git/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bzr-git-0.6.8.tar.gz 117453 BLAKE2B c668a9a01f3d4c6d2fbeb82f85b546f79ee349d468cc4e06a3958cfeec58ddf20c93a00695e9cc8ba6402f8390679ee0520cab399793a3f1179e5fe354082212 SHA512 23bd236bdd8bed53a691be03ae0e22bef804e164d4d0ec3760e2ee49d2b83d9cdff64207f33b6e7f088b7d94f7b14249948befb653f3391096210056ebe613cf

diff --git a/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild b/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild
deleted file mode 100644
index f95f7e7aa5b..00000000000
--- a/dev-vcs/bzr-git/bzr-git-0.6.8-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Support for Git branches in Bazaar"
-HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Git"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
-	inherit bzr
-	EBZR_REPO_URI="lp:bzr-git"
-	KEYWORDS="amd64 x86"
-else
-	SRC_URI="https://www.samba.org/~jelmer/bzr/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-IUSE=""
-# Test are broken, they want API functions from Dulwich which are not
-# installed in Gentoo
-RESTRICT="test"
-
-# Check info.py for dulwich and bzr version dependency info.
-# The file should be fairly straightforward to understand.
-DEPEND=""
-RDEPEND=">=dev-python/dulwich-0.8.2[${PYTHON_USEDEP}]
-	>=dev-vcs/bzr-2.5.0[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}

diff --git a/dev-vcs/bzr-git/metadata.xml b/dev-vcs/bzr-git/metadata.xml
deleted file mode 100644
index 1b2becffa26..00000000000
--- a/dev-vcs/bzr-git/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/games-action/d2x-rebirth/Manifest b/games-action/d2x-rebirth/Manifest
deleted file mode 100644
index c062122b4ae..00000000000
--- a/games-action/d2x-rebirth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST d2x-rebirth-0.58.1.tar.gz 1361470 BLAKE2B efb071401b0092c81fe63e32fd0fd33e99c10a455ac8f50d5a268ae0fdb09feb401d839f1797711e1cfc8ee0d1fe2220603b301742c4ae7b4bd699e24c6e9e72 SHA512 82188421d5ed83006f1a81151aa80ff0efb1685a356b885985ef1ae69107082dad1f1a0a0e6e07e16234d91abc8013272f05e1273f647f4481add01f3e756df4
-DIST d2xr-briefings-ger.zip 11717 BLAKE2B 27af93656ac91bf5490195d2aebc9c9f252cb730094cccb53298b07f2e2031935033b8db765b40fdad93fb55b157a2be07906ea45185b754e5ec7c205803cc92 SHA512 479aa577dc65271c705e80404ec46e6c59ee3a5122d6e9705dbdd16b71b16c0d3447426e3e74937aa20eb7026f67a3896c5e814fbfcede9164bd557b6eb8423c
-DIST d2xr-opl3-music.zip 22710919 BLAKE2B 82bdf29b6afe88305d4c7b69bb8b094efcf33ad23becec223311775cd50600ed399c207ee3a05da3800bcc5e123d00f9f8fa7d2d4f4d4be57bbf71e1c2482a9c SHA512 876321a9a16403f6e9d12e10bb73c9cdc57e1a106fa64833a1be8cc17b74f6f13e57e40f051a1b40e7bc88b95bfe86cff181c93c8619383dfdeb74f36f5cce86
-DIST d2xr-sc55-music.zip 19579531 BLAKE2B 16091e24477a49319f2685884a7538a3597a9132707ac1d59405fa08ce7492158075df4ee680a5c7ba44aa0bd0b16170057f6a8956eab4b56913d00ee2f1f339 SHA512 290713b05627bf65bdc55fc6631a0c86e50f484a167f3fd20b3fe2bc5b772437939b5bf32eea852874dd983fbd47f160cae2412a2d6c5319f0d1583a33d28da6

diff --git a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild b/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
deleted file mode 100644
index 94181da69e2..00000000000
--- a/games-action/d2x-rebirth/d2x-rebirth-0.58.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils scons-utils games
-
-DV=2
-MY_P=dxx-rebirth-${PV}-d2x
-DESCRIPTION="Descent Rebirth - enhanced Descent ${DV} engine"
-HOMEPAGE="https://www.dxx-rebirth.com/"
-SRC_URI="https://github.com/dxx-rebirth/dxx-rebirth/archive/0.58.1-d2x.tar.gz -> ${P}.tar.gz
-	opl3-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-opl3-music.zip )
-	sc55-musicpack? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-sc55-music.zip )
-	l10n_de? ( https://www.dxx-rebirth.com/download/dxx/res/d${DV}xr-briefings-ger.zip )"
-
-LICENSE="D1X GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug demo ipv6 l10n_de +music opengl opl3-musicpack sc55-musicpack"
-REQUIRED_USE="?? ( opl3-musicpack sc55-musicpack )
-	opl3-musicpack? ( music )
-	sc55-musicpack? ( music )"
-
-RDEPEND="dev-games/physfs[hog,mvl,zip]
-	media-libs/libsdl[X,sound,joystick,opengl?,video]
-	music? (
-		media-libs/sdl-mixer[timidity,vorbis]
-	)
-	opengl? (
-		virtual/opengl
-		virtual/glu
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-PDEPEND="cdinstall? ( games-action/descent2-data )
-	demo? ( games-action/descent2-demodata )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-
-	DOCS=( {CHANGELOG,INSTALL,README,RELEASE-NOTES}.txt )
-	edos2unix ${DOCS[@]}
-}
-
-src_compile() {
-	escons \
-		verbosebuild=1 \
-		sharepath="${GAMES_DATADIR}/d${DV}x" \
-		$(use_scons ipv6) \
-		$(use_scons music sdlmixer) \
-		$(use_scons debug) \
-		$(use_scons opengl) \
-		|| die
-}
-
-src_install() {
-	dodoc ${DOCS[@]}
-
-	insinto "${GAMES_DATADIR}/d${DV}x"
-
-	# None of the following zip files need to be extracted.
-	use l10n_de && newins "${DISTDIR}"/d${DV}xr-briefings-ger.zip d${DV}xr-briefings-ger.dxa
-	use opl3-musicpack && newins "${DISTDIR}"/d${DV}xr-opl3-music.zip d${DV}xr-opl3-music.dxa
-	use sc55-musicpack && newins "${DISTDIR}"/d${DV}xr-sc55-music.zip d${DV}xr-sc55-music.dxa
-
-	doicon ${PN}.xpm
-
-	dogamesbin ${PN}
-	make_desktop_entry ${PN} "Descent ${DV} Rebirth"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use cdinstall ; then
-		echo
-		elog "To play the full game enable USE=\"cdinstall\" or manually "
-		elog "copy the files to ${GAMES_DATADIR}/d${DV}x."
-		elog "See /usr/share/doc/${PF}/INSTALL.txt for details."
-		echo
-	fi
-	elog 'AddOns now use filename extension ".dxa".'
-	elog 'Your old AddOns will not work anymore.'
-	elog 'You can either re-download them or simply'
-	elog 'rename them from *.zip to *.dxa.'
-}

diff --git a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch b/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
deleted file mode 100644
index 6da154555b3..00000000000
--- a/games-action/d2x-rebirth/files/d2x-rebirth-0.58.1-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- SConstruct.orig	2014-07-02 01:37:25.546536553 -0400
-+++ SConstruct	2014-07-02 01:39:26.564324558 -0400
-@@ -220,7 +220,6 @@
- 			env.Append(CPPFLAGS = ['-g'])
- 		else:
- 			env.Append(CPPDEFINES = ['NDEBUG', 'RELEASE'])
--			env.Append(CPPFLAGS = ['-O2'])
- 
- 		# profiler?
- 		if (self.user_settings.profiler == 1):

diff --git a/games-action/d2x-rebirth/metadata.xml b/games-action/d2x-rebirth/metadata.xml
deleted file mode 100644
index d6686bb3797..00000000000
--- a/games-action/d2x-rebirth/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@g.o</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="demo">Install <pkg>games-action/descent2-demodata</pkg> as well</flag>
-    <flag name="music">Support for ingame music</flag>
-    <flag name="l10n_de">Provides German translations for the game's
-      briefings, robot descriptions, and outro of the original campaign</flag>
-    <flag name="opl3-musicpack">Include alternate version of the game's music, recorded
-      with the Yamaha YMF262 OPL3 soundchip</flag>
-    <flag name="sc55-musicpack">Include alternate version of the game's music, recorded
-      with the Roland Sound Canvas SC-55 MIDI module</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">dxx-rebirth/dxx-rebirth</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/games-arcade/monkey-bubble/Manifest b/games-arcade/monkey-bubble/Manifest
deleted file mode 100644
index 26d777021cf..00000000000
--- a/games-arcade/monkey-bubble/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monkey-bubble-0.4.0.tar.gz 5360713 BLAKE2B 1cad6a886066076cc83d238a93015cd698e8abc9b188db4a774f4d35edbed30856ed53e0fc6c388a82d767bbb8e03f0a92ebf29ffb9434840a25d79f1ca6565a SHA512 def3603972462e19d99d0d1dd86d522386d64cbb4190b1361d0d94bc175f476738619ba34fb78451669456a9365f157a96feb4d996870b37acc9d9e68024ae34

diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch
deleted file mode 100644
index 1e8822d0f87..00000000000
--- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-asneeded.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- monkey-bubble-0.3.2/src/net/Makefile.am.orig
-+++ monkey-bubble-0.3.2/src/net/Makefile.am
-@@ -28,10 +28,10 @@
- monkey_srv_LDFLAGS =
- 
- monkey_srv_LDADD = \
--	$(MONKEY_SRV_LIBS) \
- 	libmonkeynet.a \
- 	../monkey/libmonkey.a \
--	../util/libmonkeyutil.a 
-+	../util/libmonkeyutil.a \
-+	$(MONKEY_SRV_LIBS) -lm
- 
- $(libmonkeynet_a_OBJECTS): $(marshal_sources)
- 
---- monkey-bubble-0.3.2/src/ui/Makefile.am.orig
-+++ monkey-bubble-0.3.2/src/ui/Makefile.am
-@@ -50,10 +50,10 @@
- 
- 
- monkey_bubble_LDADD =  \
--	$(UI_LIBS) \
- 	../monkey/libmonkey.a \
- 	../view/libmonkeyview.a \
- 	../util/libmonkeyutil.a \
- 	../net/libmonkeynet.a \
- 	../audio/libmonkeyaudio.a \
--	../input/libmbinput.a
-+	../input/libmbinput.a \
-+	$(UI_LIBS) -lm

diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch
deleted file mode 100644
index 67109beff7f..00000000000
--- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-glib-single-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: monkey-bubble-0.4.0/src/net/message-handler.c
-===================================================================
---- monkey-bubble-0.4.0.orig/src/net/message-handler.c
-+++ monkey-bubble-0.4.0/src/net/message-handler.c
-@@ -28,7 +28,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <arpa/inet.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <sys/time.h>
- #include <time.h>
- 
-Index: monkey-bubble-0.4.0/src/net/simple-server.c
-===================================================================
---- monkey-bubble-0.4.0.orig/src/net/simple-server.c
-+++ monkey-bubble-0.4.0/src/net/simple-server.c
-@@ -31,13 +31,12 @@
- #include <unistd.h>
- #include <string.h>
- #include <arpa/inet.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <sys/time.h>
- #include <time.h>
- 
- 
- #include <glib-object.h>
--#include <glib.h>
- 
- #include "simple-server.h"
- #include "message-handler.h"
-Index: monkey-bubble-0.4.0/src/ui/main.c
-===================================================================
---- monkey-bubble-0.4.0.orig/src/ui/main.c
-+++ monkey-bubble-0.4.0/src/ui/main.c
-@@ -15,7 +15,7 @@
- #include <gtk/gtk.h>
- #include <gst/gst.h>
- #include <bonobo/bonobo-i18n.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <libgnomeui/gnome-ui-init.h>
- 
- #include <math.h>

diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch
deleted file mode 100644
index 801ae84d9ba..00000000000
--- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-gnome-doc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- help/C/monkey-bubble.xml
-+++ help/C/monkey-bubble.xml
-@@ -23,7 +23,7 @@
-       <publishername>GNOME Documentation Project</publishername> 
-     </publisher> 
-     <authorgroup> 
--      <author> 
-+      <author role="maintainer">
- 	<firstname>Thomas</firstname> 
- 	<surname>Cataldo</surname> 
- 	<affiliation> 
-@@ -55,6 +55,7 @@
- 	manual, follow the directions in the 
- 	<ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>. </para>
-     </legalnotice> 
-+	<abstract role="description"><para>Monkey Bubble manual</para></abstract>
-   </articleinfo> 
- 
-   <indexterm> 
---- help/fr/monkey-bubble.xml
-+++ help/fr/monkey-bubble.xml
-@@ -22,7 +22,7 @@
-       <publishername>Projet de documentation GNOME</publishername> 
-     </publisher> 
-     <authorgroup> 
--      <author> 
-+      <author role="maintainer">
- 	<firstname>Thomas</firstname> 
- 	<surname>Cataldo</surname> 
- 	<affiliation> 
-@@ -47,6 +47,7 @@
-       <title>Votre avis</title> 
-       <para>Pour signaler un probl&egrave;me ou faire une suggestion concernant l'application Monkey Bubble ou le pr&eacute;sent manuel, proc&eacute;dez comme indiqu&eacute;&agrave; la <ulink url="ghelp:gnome-feedback" type="help">GNOME Feedback Page</ulink>.</para>
-     </legalnotice> 
-+	<abstract role="description"><para>Monkey Bubble manual</para></abstract>
-   </articleinfo> 
- 
-   <indexterm> 

diff --git a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch b/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch
deleted file mode 100644
index be0a9a924a4..00000000000
--- a/games-arcade/monkey-bubble/files/monkey-bubble-0.4.0-noesound.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-monkey-bubble-0.4.0: don't require the esd header.
-
-2010-07-12 Sven Herzberg
-2012-01-07 Martin von Gagern
-
-References:
-https://github.com/mquinson/monkey-bubble/commit/299623f8e6b0b6090e98
-https://bugs.gentoo.org/397997
-
---- monkey-bubble-0.4.0.orig/src/ui/main.c
-+++ monkey-bubble-0.4.0/src/ui/main.c
-@@ -11,7 +11,6 @@
- #include "ui-main.h"
- #include "input-manager.h"
- 
--#include <esd.h>
- #include <gtk/gtk.h>
- #include <gst/gst.h>
- #include <bonobo/bonobo-i18n.h>

diff --git a/games-arcade/monkey-bubble/metadata.xml b/games-arcade/monkey-bubble/metadata.xml
deleted file mode 100644
index 8301b92ba30..00000000000
--- a/games-arcade/monkey-bubble/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>games@g.o</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild b/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
deleted file mode 100644
index 1810f05165f..00000000000
--- a/games-arcade/monkey-bubble/monkey-bubble-0.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils gnome2
-
-DESCRIPTION="A Puzzle Bobble clone"
-HOMEPAGE="http://www.monkey-bubble.org/"
-SRC_URI="http://home.gna.org/monkeybubble/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	>=dev-libs/glib-2.12:2
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/librsvg-2.0
-	>=gnome-base/gconf-2.0
-	media-libs/gstreamer:0.10
-	>=dev-libs/libxml2-2.6.7"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	app-text/gnome-doc-utils
-	dev-util/intltool"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-gnome-doc.patch \
-		"${FILESDIR}"/${P}-noesound.patch \
-		"${FILESDIR}"/${P}-glib-single-include.patch
-	# bug 260895
-	sed -i -e 's/ -Werror//' $(find . -name Makefile.am) || die
-	sed -i \
-		-e '/^Icon/s/.png//' \
-		-e '/^Categories/s/Application;//' \
-		monkey-bubble.desktop.in || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-	gnome2_src_prepare
-}

diff --git a/games-arcade/monster-masher/Manifest b/games-arcade/monster-masher/Manifest
deleted file mode 100644
index f8d12002a73..00000000000
--- a/games-arcade/monster-masher/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST monster-masher-1.8.1.tar.bz2 1042299 BLAKE2B 3c34c3f6f70c84fda8974909e15c16e028063dad90fe9de0be255788fba1e3919b51170e45053bc2d33d605e0fb74ba4475c11bdd1bc9aba8013790fafe19c6c SHA512 250414d6fb4abea12d2fd5328fc003449680b76784bfc6c15cc05d5dfb78e45eee2d2c6d36a3bf2f3c0e055c9ee58cbfaf623f56638fa8462f5006c84057c254

diff --git a/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch b/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch
deleted file mode 100644
index f9812802da7..00000000000
--- a/games-arcade/monster-masher/files/monster-masher-1.8.1-desktop.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- monster-masher.desktop.in.old	2014-11-23 21:20:33.967676333 +0100
-+++ monster-masher.desktop.in	2014-11-23 21:21:30.518718141 +0100
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=Monster Masher
- _Comment=Mash monsters and save the gnomes
- Exec=monster-masher
--Icon=monster-masher.png
-+Icon=monster-masher
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;ArcadeGame;
--StartupNotification=true
-+Categories=GNOME;Game;
-+StartupNotify=true

diff --git a/games-arcade/monster-masher/files/monster-masher-1.8.1-libcanberra.patch b/games-arcade/monster-masher/files/monster-masher-1.8.1-libcanberra.patch
deleted file mode 100644
index 4ee47fab39f..00000000000
--- a/games-arcade/monster-masher/files/monster-masher-1.8.1-libcanberra.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Drop dependency on esound support in libgnome and replace it by libcanberra.
-
-Gentoo bug: #348605
-
---- a/configure.ac	2008-11-09 20:52:01.000000000 +0000
-+++ b/configure.ac	2011-03-06 13:08:42.000000000 +0000
-@@ -18,7 +18,8 @@
-                         gconfmm-2.6 >= 2.6.0 \
-                         gtkmm-2.4 >= 2.6.0 \
-                         libgnomecanvasmm-2.6 >= 2.6.0 \
--			libglademm-2.4 >= 2.4.0)
-+			libglademm-2.4 >= 2.4.0 \
-+			libcanberra)
- AC_SUBST(DEPS_CFLAGS)
- AC_SUBST(DEPS_LIBS)
- 
---- a/src/sound.hpp	2007-01-06 16:16:30.000000000 +0000
-+++ b/src/sound.hpp	2011-03-06 13:12:47.000000000 +0000
-@@ -22,6 +22,7 @@
- #define SOUND_HPP
- 
- #include <string>
-+#include <canberra.h>
- 
- #include "helpers.hpp"
- 
-@@ -39,8 +40,7 @@
- private:
-   Sound();
-   
--  typedef std::map<std::string, int> cache_map;
--  cache_map cache;
-+  ca_context *ctx;
- };
- 
- #endif
---- a/src/sound.cpp	2007-01-06 16:16:30.000000000 +0000
-+++ b/src/sound.cpp	2011-03-07 21:55:47.000000000 +0000
-@@ -18,9 +18,6 @@
-  * USA.
-  */
- 
--#include <libgnome/gnome-sound.h>
--#include <esd.h>
--
- #include "sound.hpp"
- 
- 
-@@ -30,26 +27,23 @@
-   return s;
- }
- 
--Sound::Sound()
-+Sound::Sound() :
-+  ctx(0)
- {
-+  ca_context_create(&ctx);
- }
- 
- Sound::~Sound()
- {
-+  if (ctx)
-+    ca_context_destroy(ctx);
- }
- 
- void Sound::play(const std::string &name)
- {
--  int id;
--  
--  cache_map::iterator i = cache.find(name);
--  if (i != cache.end())
--    id = i->second;
--  else {
--    id = gnome_sound_sample_load(name.c_str(),
--			    (MONSTER_MASHER_SOUND_DIR + name).c_str());
--    cache.insert(make_pair(name, id));
--  }
--
--  esd_sample_play(gnome_sound_connection_get(), id);
-+  if (ctx)
-+    ca_context_play(ctx, 0,
-+      CA_PROP_MEDIA_FILENAME,         (MONSTER_MASHER_SOUND_DIR + name).c_str(),
-+      CA_PROP_CANBERRA_CACHE_CONTROL, "permanent",
-+      NULL);
- }

diff --git a/games-arcade/monster-masher/metadata.xml b/games-arcade/monster-masher/metadata.xml
deleted file mode 100644
index 78274e0fa55..00000000000
--- a/games-arcade/monster-masher/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@g.o</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild b/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
deleted file mode 100644
index 9ba28fc6378..00000000000
--- a/games-arcade/monster-masher/monster-masher-1.8.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit autotools eutils flag-o-matic gnome2
-
-DESCRIPTION="Squash the monsters with your levitation worker gnome"
-HOMEPAGE="https://people.iola.dk/olau/monster-masher/"
-SRC_URI="https://people.iola.dk/olau/monster-masher/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libSM
-	>=dev-cpp/gtkmm-2.6:2.4
-	>=dev-cpp/gconfmm-2.6
-	>=dev-cpp/libglademm-2.4:2.4
-	>=dev-cpp/libgnomecanvasmm-2.6:2.6
-	gnome-base/libgnome
-	media-libs/libcanberra
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	# Port to libcanberra, bug #348605
-	epatch "${FILESDIR}"/${P}-libcanberra.patch
-
-	# Fix .desktop file
-	epatch "${FILESDIR}"/${P}-desktop.patch
-
-	# build with newer glib - bug #424313
-	sed -i -e 's:glib/gtypes:glib:' src/pixbuf-drawing.hpp || die
-
-	append-cxxflags -std=c++11
-
-	eautoreconf
-	gnome2_src_prepare
-}

diff --git a/games-board/gnome-mastermind/Manifest b/games-board/gnome-mastermind/Manifest
deleted file mode 100644
index 51e806f7f5e..00000000000
--- a/games-board/gnome-mastermind/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-mastermind-0.3.1.tar.bz2 717787 BLAKE2B 5b57e9c5692a44276a6c8f97389bc294528c7e6fefa3f7f60ffb7eefe8f632838e4657214b5eac00fde0a3958f80d73f934536f42ece9fd5089d942bb8d69f7c SHA512 f8ec4caeb6e518e6d27136ca9dd9ff6c01ac8c0feceb29df0a4ac7158b99f8a917768bc6e3f2bd1aff32d46ef3131185f55664343de687d874881c196e8a8a17

diff --git a/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch b/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch
deleted file mode 100644
index ba14e592ae1..00000000000
--- a/games-board/gnome-mastermind/files/gnome-mastermind-0.3.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2007-08-25 01:12:01.000000000 +0200
-+++ Makefile.in	2007-08-25 01:14:29.000000000 +0200
-@@ -685,7 +685,7 @@
- 
- info-am:
- 
--install-data-am: install-pkgdataDATA
-+install-data-am:
- 
- install-exec-am:
- 

diff --git a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild b/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
deleted file mode 100644
index 039169b2f57..00000000000
--- a/games-board/gnome-mastermind/gnome-mastermind-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A little Mastermind game for GNOME"
-HOMEPAGE="http://www.autistici.org/gnome-mastermind/"
-SRC_URI="http://download.gna.org/gnome-mastermind/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	gnome-base/gconf:2
-	gnome-base/orbit
-	app-text/gnome-doc-utils
-	dev-libs/atk
-	dev-libs/glib:2
-	x11-libs/pango
-	x11-libs/cairo
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext
-	app-text/rarian
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# Fix .desktop file
-	sed -i -e 's/True/true/' desktop/gnome-mastermind.desktop.in || die
-
-	# Regenarate all intltool files to respect LINGUAS
-	eautoreconf
-
-	gnome2_src_prepare
-}

diff --git a/games-board/gnome-mastermind/metadata.xml b/games-board/gnome-mastermind/metadata.xml
deleted file mode 100644
index 78274e0fa55..00000000000
--- a/games-board/gnome-mastermind/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@g.o</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/games-fps/warsow-community-map-pack/Manifest b/games-fps/warsow-community-map-pack/Manifest
deleted file mode 100644
index 3fc9ad92f5f..00000000000
--- a/games-fps/warsow-community-map-pack/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST warsow_comunity_map_pack_01.zip 130057143 BLAKE2B 227d0736a634ba2a03ff6f04c95b7f8d251fd63a39d184719c6977796547814a9dcf7690a62f379a21123f072039b2badde0e1f4bf7b9fce478b34073369b807 SHA512 47ea38467f6b88f4a8ceb0e38e2c12b62df46cbb62d1aebf7b824e71d80de1d65b81874960834055995c50f95de5f75f91b33fbf6985ee3121d823c8a5ca8dd7

diff --git a/games-fps/warsow-community-map-pack/metadata.xml b/games-fps/warsow-community-map-pack/metadata.xml
deleted file mode 100644
index 7e3442868ea..00000000000
--- a/games-fps/warsow-community-map-pack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-  <email>games@g.o</email>
-  <name>Gentoo Games Project</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild b/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
deleted file mode 100644
index a283a3db5f7..00000000000
--- a/games-fps/warsow-community-map-pack/warsow-community-map-pack-01.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P=${P//-/_}
-# They have a typo in their filename:
-MY_P=${MY_P/community/comunity}
-
-DESCRIPTION="Community Map Pack for the Warsow multiplayer FPS"
-HOMEPAGE="http://www.warsow.net/"
-SRC_URI="http://update.warsow.net/mirror/${MY_P}.zip"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/warsow
-	doins -r "${WORKDIR}"/{basewsw,previews}
-	dodoc "${WORKDIR}"/Readme.rtf
-	prepgamesdirs
-}

diff --git a/games-puzzle/ngstar/Manifest b/games-puzzle/ngstar/Manifest
deleted file mode 100644
index b3fb96c3017..00000000000
--- a/games-puzzle/ngstar/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ngstar-2.1.8-src.tar.bz2 45851 BLAKE2B 542f023a4741a3d36d7042a7d0e69b1bb99cdcafeb69eab32a5221862b18cdf954ffd4f7c055ab785cdeb0fdafe5aaf26ce9ec12e9f34a4c4ff82c29d7988c2d SHA512 c96031148720b5dcc004a5de68137bbbdd5af9c6f0b33ff8bcee3180cbf4732a4d6a92737ef99754d512bb61454bc0a17487efba4cdb00339d23e38edfe3cb28

diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch
deleted file mode 100644
index 72c0f70007a..00000000000
--- a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libngstar2/Configuration.hh
-+++ libngstar2/Configuration.hh
-@@ -26,6 +26,7 @@
- #include <fstream>
- #include <iostream>
- #include <string>
-+#include <cstdlib>
- 
- #include <getopt.h>
- #include <sys/stat.h>

diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
deleted file mode 100644
index 2ddf0f53793..00000000000
--- a/games-puzzle/ngstar/files/ngstar-2.1.8-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Ncurses_UI.cc.old	2012-07-21 22:25:16.421521521 +0200
-+++ src/Ncurses_UI.cc	2012-07-21 22:26:01.008390914 +0200
-@@ -23,6 +23,8 @@
- /* includes */
- #include "Ncurses_UI.hh"
- 
-+#include <unistd.h>
-+
- using namespace ngstar2;
- 
- Ncurses_UI::Ncurses_UI( NGStar2 *engine, Configuration* config, Scores *scores )

diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch
deleted file mode 100644
index 84fa6de7e02..00000000000
--- a/games-puzzle/ngstar/files/ngstar-2.1.8-gentoo-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.old	2006-04-19 22:00:42.000000000 +0200
-+++ configure	2006-04-19 22:02:38.000000000 +0200
-@@ -193,8 +193,8 @@
- MINOR = $VMINOR
- REVISION = $VREVISION
- 
--LEVELSETS_DIR = \$(PREFIX)/share/\$(NAME)/levelsets
--THEMES_DIR = \$(PREFIX)/share/\$(NAME)/themes
--BIN_DIR = \$(PREFIX)/bin
-+LEVELSETS_DIR = \$(PREFIX)@GENTOO_DATA@/\$(NAME)/levelsets
-+THEMES_DIR = \$(PREFIX)@GENTOO_DATA@/\$(NAME)/themes
-+BIN_DIR = \$(PREFIX)@GENTOO_BIN@
- DOC_DIR = \$(PREFIX)/doc/\$(NAME)-\$(MAJOR).\$(MINOR).\$(REVISION)
- LIB_DIR = \$(PREFIX)/lib

diff --git a/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch b/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
deleted file mode 100644
index 17e0ed9f718..00000000000
--- a/games-puzzle/ngstar/files/ngstar-2.1.8-ldflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru ngstar-2.1.8.orig/src/Makefile ngstar-2.1.8/src/Makefile
---- ngstar-2.1.8.orig/src/Makefile	2005-11-09 08:11:22.000000000 -0500
-+++ ngstar-2.1.8/src/Makefile	2014-11-18 23:58:45.565366080 -0500
-@@ -33,8 +33,8 @@
- endif
- endif
- ifdef USE_NCURSES
--	CC_LIBS += -lncurses -lgpm
--	CC_LIBS_STATIC += -lncurses -lgpm
-+	CC_LIBS += $(shell pkg-config ncurses --libs) -lgpm
-+	CC_LIBS_STATIC += $(shell pkg-config ncurses --libs) -lgpm
- 
- 	NCURSES_UI_OBJ = Ncurses_UI.o
- 
-@@ -56,8 +56,7 @@
- 
- $(BIN) : $(SOURCE) $(BIN_DEPS)
- 	echo "Compiling $(BIN)"
--	$(CXX) $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
--	strip -s $@
-+	$(CXX) ${LDFLAGS} $< $(BIN_DEPS) -o $@ $(CC_LIBS) $(CC_INCLUDES) $(CPPFLAGS)
- ifdef USE_FLTK2
- 	-ln -s `basename $(BIN)` $(BIN_FLTK2)
- endif
-@@ -68,7 +67,6 @@
- $(BIN_STATIC) : $(SOURCE) $(BIN_DEPS)
- 	echo "Compiling $(BIN)"
- 	$(CXX) -static $< $(BIN_DEPS) -o $@ $(CC_LIBS_STATIC) $(CC_INCLUDES) $(CPPFLAGS)
--	strip -s $@
- ifdef USE_FLTK2
- 	-ln -s `basename $(BIN_STATIC)` $(BIN_STATIC_FLTK2)
- endif

diff --git a/games-puzzle/ngstar/metadata.xml b/games-puzzle/ngstar/metadata.xml
deleted file mode 100644
index 1111e81af0c..00000000000
--- a/games-puzzle/ngstar/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@g.o</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-NGStar is a clone of a HP48 game called dstar.
-The goal is to catch all gifts in the level to get access to the next one.
-Use the ball to catch them, use the cube to stop the ball. The ball only move
-to the next obstacle (wall or cube).
-</longdescription>
-	<upstream>
-		<remote-id type="freshmeat">ngstar</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild b/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
deleted file mode 100644
index c22226a39d5..00000000000
--- a/games-puzzle/ngstar/ngstar-2.1.8-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="NGStar is a clone of a HP48 game called dstar"
-HOMEPAGE="http://freshmeat.net/projects/ngstar"
-SRC_URI="mirror://gentoo//${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0
-	sys-libs/gpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo-path.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:@GENTOO_DATA@:${GAMES_DATADIR}:" \
-		-e "s:@GENTOO_BIN@:${GAMES_BINDIR}:" \
-		-e "/^CPPFLAGS/s:+=:+= ${CXXFLAGS}:" \
-		-e "/SILENT/d" \
-		configure || die
-}
-
-src_configure() {
-	./configure \
-		--prefix "" \
-		--without-fltk2 || die
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}

diff --git a/games-puzzle/shaaft/Manifest b/games-puzzle/shaaft/Manifest
deleted file mode 100644
index 5f0ae70d71a..00000000000
--- a/games-puzzle/shaaft/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Shaaft-0.5.0.tar.bz2 512996 BLAKE2B 0c7cb5d86bc1e13877eb0fd58327326c3697e48e33e6600ea9138aeff3e06fd4fb4262e8b958321927bd2bbd53e6edd93f5d8ce439bad1222d19273c63744d93 SHA512 8fce8f1b8e2cfd78832a5f328d95c186bbd1c96a66685e87f993879e96564d8c9051576c3c822d7dbdb59141d71726ced08a07390b298c3d26969f2b59dceedf

diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch
deleted file mode 100644
index de3d59c9077..00000000000
--- a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Shaaft-0.5.0.orig/utils/HashString.hpp
-+++ Shaaft-0.5.0/utils/HashString.hpp
-@@ -21,6 +21,7 @@ using namespace std;
- 
- namespace HASH_NAMESPACE
- {
-+    template <>
-     struct hash<const string>
-     {
- 	//a simple hash function for string
-@@ -32,6 +33,7 @@ namespace HASH_NAMESPACE
- 	}
-     };
- 
-+    template <>
-     struct hash<string>
-     {
- 	//a simple hash function for string

diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
deleted file mode 100644
index 87b07f109d2..00000000000
--- a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utils/hashMap.hpp.old
-+++ utils/hashMap.hpp
-@@ -14,7 +14,7 @@
- //
- #if defined( __GNUC__ )
- 
--#  if (__GNUC__ == 3)
-+#  if (__GNUC__ >= 3)
- #    include <ext/hash_map>
- 
- #    if (__GNUC_MINOR__ == 0)

diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch
deleted file mode 100644
index 2ddb37c7551..00000000000
--- a/games-puzzle/shaaft/files/shaaft-0.5.0-gcc43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- utils/ResourceManager.cpp
-+++ utils/ResourceManager.cpp
-@@ -17,6 +17,7 @@
- #include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <cstring>
- 
- #include <Trace.hpp>
- #include <ResourceManager.hpp>
---- utils/Value.hpp
-+++ utils/Value.hpp
-@@ -15,8 +15,9 @@
- #ifndef _Value_hpp_
- #define _Value_hpp_
- 
--#include <stdio.h>
-+#include <cstdio>
- #include <string>
-+#include <cstdlib>
- 
- #include <Trace.hpp>
- 

diff --git a/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch b/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch
deleted file mode 100644
index 6773242ea6d..00000000000
--- a/games-puzzle/shaaft/files/shaaft-0.5.0-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- utilssdl/PNG.cpp
-+++ utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_uint_32 check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);

diff --git a/games-puzzle/shaaft/metadata.xml b/games-puzzle/shaaft/metadata.xml
deleted file mode 100644
index 26c1c9ca5f2..00000000000
--- a/games-puzzle/shaaft/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@g.o</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">criticalmass</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/games-puzzle/shaaft/shaaft-0.5.0.ebuild b/games-puzzle/shaaft/shaaft-0.5.0.ebuild
deleted file mode 100644
index 04d75ab8444..00000000000
--- a/games-puzzle/shaaft/shaaft-0.5.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="A falling block game similar to Blockout"
-HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/shaaft"
-SRC_URI="mirror://sourceforge/criticalmass/${P/s/S}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	media-libs/libpng:0
-	media-libs/libsdl[sound,opengl,video]
-	media-libs/sdl-mixer[mod]
-	media-libs/sdl-image[png]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P/s/S}
-
-src_prepare() {
-	sed -i \
-		-e 's:DATA_DIR:"'${GAMES_DATADIR}'\/'${PN/s/S}\/'":g' \
-		game/main.cpp || die
-
-	sed -i \
-		-e 's:png12:png:g' \
-		-e '/^CFLAGS=""/d' \
-		-e '/^CXXFLAGS=""/d' \
-		configure.in || die
-
-	epatch \
-		"${FILESDIR}"/${P}-gcc34.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf --disable-optimize
-}
-
-src_install() {
-	DOCS="TODO.txt" default
-	rm -f "${D}/${GAMES_BINDIR}"/Packer
-	prepgamesdirs
-}

diff --git a/games-server/cyphesis/Manifest b/games-server/cyphesis/Manifest
deleted file mode 100644
index 09c067d9b71..00000000000
--- a/games-server/cyphesis/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cyphesis-0.6.2.tar.bz2 932099 BLAKE2B 8f7034feb33874cccdc2cd8117fc92e64218b1f7f0dd0621e1b549577e009f4aad80e6434a320c9701e4e7617a7a78e8a8ebb88f50eb246504cdb2dc11bb7189 SHA512 07783a99a47f105cd492b033fb1ded1c5fef089d01fa50d90103dc62c6e94dc58394f082674d9261db5fe9779d4694579119769de50177bfc2ead055c5740b2f

diff --git a/games-server/cyphesis/cyphesis-0.6.2-r1.ebuild b/games-server/cyphesis/cyphesis-0.6.2-r1.ebuild
deleted file mode 100644
index 89985a0bdf7..00000000000
--- a/games-server/cyphesis/cyphesis-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs autotools python-single-r1 eutils
-
-DESCRIPTION="WorldForge server running small games"
-HOMEPAGE="http://worldforge.org/index.php/components/cyphesis/"
-SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-db/postgresql:=
-	>=dev-games/mercator-0.3.3
-	>=dev-games/wfmath-1.0.1
-	dev-libs/libgcrypt:0
-	dev-libs/libsigc++:2
-	sys-libs/ncurses:0
-	sys-libs/readline:0
-	>=media-libs/atlas-c++-0.6.3
-	>=media-libs/skstream-0.3.9
-	>=media-libs/varconf-0.6.4
-	"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.40
-	dev-libs/libxml2
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-gentoo.patch
-		"${FILESDIR}"/${P}-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --localstatedir=/var
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" confbackupdir="/usr/share/doc/${PF}/conf" install
-	dodoc AUTHORS ChangeLog FIXME NEWS README THANKS TODO
-}

diff --git a/games-server/cyphesis/files/cyphesis-0.6.2-gentoo.patch b/games-server/cyphesis/files/cyphesis-0.6.2-gentoo.patch
deleted file mode 100644
index 69aac409ba8..00000000000
--- a/games-server/cyphesis/files/cyphesis-0.6.2-gentoo.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru cyphesis-0.6.0.orig/Makefile.am cyphesis-0.6.0/Makefile.am
---- cyphesis-0.6.0.orig/Makefile.am	2012-10-02 06:23:10.000000000 -0400
-+++ cyphesis-0.6.0/Makefile.am	2012-11-12 16:54:19.306892135 -0500
-@@ -3,7 +3,6 @@
-           tools tests man dox
- 
- docdir = $(datadir)/doc/cyphesis-$(VERSION)
--dist_doc_DATA = README COPYING AUTHORS THANKS NEWS FIXME
- 
- rulesetdir = $(datadir)/cyphesis/rulesets
- 
-diff -ru cyphesis-0.6.0.orig/configure.ac cyphesis-0.6.0/configure.ac
---- cyphesis-0.6.0.orig/configure.ac	2012-11-09 16:39:13.000000000 -0500
-+++ cyphesis-0.6.0/configure.ac	2012-11-12 16:53:51.622839335 -0500
-@@ -381,17 +381,6 @@
- libraries required and where to obtain them.])
-     ])
- 
--PKG_CHECK_MODULES(AVAHI, avahi-client,
--    [
--        CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS"
--        MDNS_LIBS="$MDNS_LIBS $AVAHI_LIBS"
--        AC_DEFINE(HAVE_AVAHI, 1, [Define to 1 if you have avahi libs.])
--    ],
--    [
--        AC_MSG_RESULT([no])
--        AC_MSG_NOTICE([Ommiting DNS-SD functionality.])
--    ])
--
- AM_PATH_PSQL(7.1.0,
-     [
-         if test "$PG_CFLAGS" != "-I/usr/include"; then

diff --git a/games-server/cyphesis/files/cyphesis-0.6.2-makefile.patch b/games-server/cyphesis/files/cyphesis-0.6.2-makefile.patch
deleted file mode 100644
index 7fde1eb1213..00000000000
--- a/games-server/cyphesis/files/cyphesis-0.6.2-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am	2013-09-25 14:26:30.518751250 +0200
-+++ b/Makefile.am	2013-09-25 14:27:21.846257911 +0200
-@@ -13,8 +13,6 @@
- 
- # FIXME Remove the mkdir hack if it gets fixed in a future automake
- install-data-hook:
--	mkdir -p $(DESTDIR)$(socketdir)
--	chmod 1777 $(DESTDIR)$(socketdir)
- 	@echo 
- 	@echo "Cyphesis is not yet ready to run."
- 	@echo "Unless you have configured the server to run without a database, Cyphesis"

diff --git a/games-server/cyphesis/metadata.xml b/games-server/cyphesis/metadata.xml
deleted file mode 100644
index cd73040ff77..00000000000
--- a/games-server/cyphesis/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@g.o</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Cyphesis is an NPC engine using AI/A-Life techniques. It is the Artificial
-Intelligence and Artificial Life server used by STAGE and also is filling in as
-its first fully functional game server, featured in Acorn. Cyphesis is a
-prototype server designed to explore the possibilities of complex NPC
-interaction and scripting. Efficiency and support for large numbers of players
-are foregone in the quest for a more realistic and dynamic world framework.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worldforge</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/gnome-extra/gnome-color-chooser/Manifest b/gnome-extra/gnome-color-chooser/Manifest
deleted file mode 100644
index a06b015e45b..00000000000
--- a/gnome-extra/gnome-color-chooser/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-color-chooser-0.2.5.tar.bz2 228808 BLAKE2B 554e2d296d6e2f9bc73dce64f72954fa30642306c48d5df26d4450a947ea8f1b87a177c441d792e91bd7fc9b0a28a8ef9f71dde8c7624874b0fe5e2388015020 SHA512 bd29e005456142ffa459f38aedce13302e60dbb6e649883d099810df1f6b3765c28b8c69ef3f19c8252c2fec895df90ae660a43c5790d204e8690c74b35f3cc4

diff --git a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
deleted file mode 100644
index 9a9cbb6a5a0..00000000000
--- a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="GTK+/GNOME color customization tool"
-HOMEPAGE="http://gnomecc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnomecc/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-cpp/atkmm
-	>=dev-cpp/libglademm-2.6.0:2.4
-	dev-cpp/glibmm:2
-	>=dev-cpp/gtkmm-2.8.0:2.4
-	dev-libs/glib:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6.0
-	>=gnome-base/libgnome-2.16.0
-	>=gnome-base/libgnomeui-2.14.0
-	x11-libs/gtk+:2
-	x11-libs/pango
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Don't pass --enable/disable-assert since it has broken
-	# AC_ARG_ENABLE call. Pass -DNDEBUG to cppflags instead.
-	use debug || append-cppflags -DNDEBUG
-
-	append-cxxflags -std=c++11
-
-	gnome2_src_configure \
-		--disable-link-as-needed
-}
-
-pkg_postinst() {
-	elog "To use gnome-color-chooser themes you may need to add:"
-	elog "      include \".gtkrc-2.0-gnome-color-chooser\""
-	elog "to ~/.gtkrc-2.0 for each user, otherwise themes may not be applied."
-
-	gnome2_pkg_postinst
-}

diff --git a/gnome-extra/gnome-color-chooser/metadata.xml b/gnome-extra/gnome-color-chooser/metadata.xml
deleted file mode 100644
index 740db1c713e..00000000000
--- a/gnome-extra/gnome-color-chooser/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gnomecc</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
deleted file mode 100644
index b88a4db5958..00000000000
--- a/gnome-extra/gpointing-device-settings/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gpointing-device-settings-1.5.1.tar.gz 458352 BLAKE2B 7cd48d267c331f7fa27dc5ef12b17c43fcb293baf9e24ea9766422cc5b4f09c27eb97024c52ec4ab204a25a15bb94311ce716dd7a3d8314b8db6cc30502fe314 SHA512 37bcecdde4da1714de1c0562d0ba8c875aa197a0b2fad55a868d659ad0ed6a37156b408e9ae07f95091391d972ceaa268636ee579f4a3f176203898b227e3b76

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
deleted file mode 100644
index 789925c0bc9..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 70add06dec8413965f3e98b6ba9a3c82168ea72c
-Author: Hiroyuki Ikezoe <poincare@××××××.net>
-Date:   Tue Mar 16 19:56:17 2010 +0900
-
-    Fix crash.
-    
-    We need to get xinput property if there is no gconf value for tapping time.
-    
-    Fix for #613022.
-
-diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c
-index 3bbcda6..a1cd31b 100644
---- a/modules/gpds-touchpad-ui.c
-+++ b/modules/gpds-touchpad-ui.c
-@@ -1067,8 +1067,14 @@ set_tapping_time_from_preference (GpdsUI *ui, GtkBuilder *builder)
-         }
-     }
- 
--    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value))
-+    if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value) && !values) {
-+        if (!gpds_xinput_ui_get_xinput_int_property(GPDS_XINPUT_UI(ui),
-+                                                    GPDS_TOUCHPAD_TAP_TIME,
-+                                                    &values, &n_values)) {
-+            return;
-+        }
-         value = values[0];
-+    }
- 
-     double_value = value;
-     object = gpds_ui_get_ui_object_by_name(GPDS_UI(ui), "tapping_time_scale");

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
deleted file mode 100644
index 341d96fc9b5..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac
---- gpointing-device-settings-1.5.1.orig/configure.ac	2010-02-05 00:38:20.000000000 +0100
-+++ gpointing-device-settings-1.5.1/configure.ac	2013-12-17 15:00:08.394574115 +0100
-@@ -3,10 +3,9 @@
- 
- AC_INIT(gpointing-device-settings, 1.5.1,
-         [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings])
--AM_INIT_AUTOMAKE([1.9 tar-pax])
--AM_INIT_AUTOMAKE([foreign])
-+AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
- m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_MACRO_DIR([m4])
- 
- AM_PROG_LIBTOOL
-@@ -146,9 +145,6 @@
- 
- GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS"
- GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS"
--GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED"
--GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED"
--GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED"
- GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
- GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
- GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
deleted file mode 100644
index c92f0bd54c9..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fixes build failnure on gnome-base/gnome-settings-daemon-3.2.2
-
- gsd-pointing-device-plugin.c:59:1: warning: 'gsd_pointing_device_plugin_class_finalize' used but never defined [enabled by default]
-  CCLD   libpointing-device.la
-  ld: .libs/libpointing_device_la-gsd-pointing-device-plugin.o: relocation R_X86_64_PC32 against undefined symbol `gsd_pointing_device_plugin_class_finalize'
-
-Gentoo-bug: http://bugs.gentoo.org/384001
-Patch-by: battle.jerboa@×××××.com
---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:20.000000000 +0400
-+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2012-02-02 13:32:04.000000000 +0400
-@@ -214,6 +214,11 @@
-     plugin_class->activate = activate;
-     plugin_class->deactivate = deactivate;
- }
-+
-+static void
-+gsd_pointing_device_plugin_class_finalize (GsdPointingDevicePluginClass *klass)
-+{
-+}
- /*
- vi:ts=4:nowrap:ai:expandtab:sw=4
- */

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
deleted file mode 100644
index f694556b74e..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
---- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 01:29:09.204274003 -0500
-+++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c	2010-12-20 02:15:21.652274002 -0500
-@@ -96,19 +96,21 @@
-         XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
- 
-         device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
--        if (notify_event->devchange == DeviceEnabled) {
--            GsdPointingDeviceManager *manager;
-+        if (device_info) {
-+            if (notify_event->devchange == DeviceEnabled) {
-+                GsdPointingDeviceManager *manager;
- 
--            if (has_manager(plugin, device_info->name))
--                return GDK_FILTER_CONTINUE;
-+                if (has_manager(plugin, device_info->name))
-+                    return GDK_FILTER_CONTINUE;
- 
--            manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
--                                                      device_info->name);
--            if (manager) {
--                gsd_pointing_device_manager_start(manager, NULL);
--                plugin->managers = g_list_prepend(plugin->managers, manager);
-+                manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
-+                                                          device_info->name);
-+                if (manager) {
-+                    gsd_pointing_device_manager_start(manager, NULL);
-+                    plugin->managers = g_list_prepend(plugin->managers, manager);
-+                }
-+            } else if (notify_event->devchange == DeviceRemoved) {
-             }
--        } else if (notify_event->devchange == DeviceRemoved) {
-         }
-     }
- 

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
deleted file mode 100644
index 154c5472854..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-index 8a2d98f..ac0bcf1 100644
---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-@@ -124,7 +124,9 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
- 
-     gint op_code, event, error;
- 
--    if (!XQueryExtension(GDK_DISPLAY(),
-+    display = gdk_x11_get_default_xdisplay();
-+
-+    if (!XQueryExtension(display,
-                          "XInputExtension",
-                          &op_code,
-                          &event,
-@@ -132,8 +134,6 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
-         return;
-     }
- 
--    display = gdk_x11_get_default_xdisplay();
--
-     gdk_error_trap_push();
-     DevicePresence(display, xi_presence, class_presence);
-     XSelectExtensionEvent(display,
-diff --git a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
-index 2038d53..f47e0a4 100644
---- a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
-+++ b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
-@@ -348,7 +348,9 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
- 
-     gint op_code, event, error;
- 
--    if (!XQueryExtension(GDK_DISPLAY(),
-+    display = gdk_x11_get_default_xdisplay();
-+
-+    if (!XQueryExtension(display,
-                          "XInputExtension",
-                          &op_code,
-                          &event,
-@@ -356,8 +358,6 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
-         return;
-     }
- 
--    display = gdk_x11_get_default_xdisplay();
--
-     gdk_error_trap_push();
-     DevicePresence(display, xi_presence, class_presence);
-     XSelectExtensionEvent(display,
-diff --git a/src/gpds-xinput-pointer-info.c b/src/gpds-xinput-pointer-info.c
-index d38afad..ce9a952 100644
---- a/src/gpds-xinput-pointer-info.c
-+++ b/src/gpds-xinput-pointer-info.c
-@@ -55,7 +55,8 @@ gpds_xinput_utils_collect_pointer_infos (void)
-     XDeviceInfo *device_infos;
-     gint i, n_device_infos;
- 
--    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
-+    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
-+                                     &n_device_infos);
- 
-     for (i = 0; i < n_device_infos; i++) {
-         GpdsXInputPointerInfo *info;
-diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
-index 0f7ceea..5a3e3a2 100644
---- a/src/gpds-xinput-utils.c
-+++ b/src/gpds-xinput-utils.c
-@@ -41,7 +41,8 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
-     XDeviceInfo *device_infos;
-     gint i, n_device_infos;
- 
--    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
-+    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
-+                                     &n_device_infos);
- 
-     for (i = 0; i < n_device_infos; i++) {
-         if (device_infos[i].use != IsXExtensionPointer)
-@@ -68,7 +69,7 @@ gpds_xinput_utils_get_device_info_from_id  (XID id, GError **error)
-     XDeviceInfo *device_infos;
-     gint i, n_device_infos;
- 
--    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
-+    device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
- 
-     for (i = 0; i < n_device_infos; i++) {
-         if (device_infos[i].use != IsXExtensionPointer)
-@@ -125,7 +126,7 @@ gpds_xinput_utils_open_device (const gchar *device_name, GError **error)
-         return NULL;
- 
-     gdk_error_trap_push();
--    device = XOpenDevice(GDK_DISPLAY(), device_info->id);
-+    device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id);
-     gdk_error_trap_pop();
-     if (!device) {
-         g_set_error(error,
-diff --git a/src/gpds-xinput.c b/src/gpds-xinput.c
-index d8bd1a2..66634b3 100644
---- a/src/gpds-xinput.c
-+++ b/src/gpds-xinput.c
-@@ -100,7 +100,7 @@ dispose (GObject *object)
-     g_free(priv->device_name);
- 
-     if (priv->device) {
--        XCloseDevice(GDK_DISPLAY(), priv->device);
-+        XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device);
-         priv->device = NULL;
-     }
- 
-@@ -199,7 +199,8 @@ get_x_error_text (int x_error_code)
- {
-     gchar buf[64];
- 
--    XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1);
-+    XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code,
-+                  buf, sizeof(buf) - 1);
- 
-     return g_strdup(buf);
- }
-@@ -273,7 +274,7 @@ gpds_xinput_set_int_properties_by_name_with_format_type
-     }
- 
-     gdk_error_trap_push();
--    XChangeDeviceProperty(GDK_DISPLAY(),
-+    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
-                           device, property_atom,
-                           XA_INTEGER, format_type, PropModeReplace,
-                           (unsigned char*)property_data, n_properties);
-@@ -383,7 +384,8 @@ get_atom (GpdsXInput *xinput, const gchar *property_name, GError **error)
-     if (!device)
-         return -1;
- 
--    properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties);
-+    properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(),
-+                                       device, &n_properties);
-     for (i = 0; i < n_properties; i++) {
-         const gchar *name;
- 
-@@ -427,9 +429,9 @@ gpds_xinput_get_int_properties_by_name (GpdsXInput *xinput,
-         return FALSE;
- 
-     gdk_error_trap_push();
--    status =  XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False,
--                                 XA_INTEGER, &actual_type, &actual_format,
--                                 n_values, &bytes_after, &data);
-+    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom,
-+                                 0, 1000, False, XA_INTEGER, &actual_type,
-+                                 &actual_format, n_values, &bytes_after, &data);
-     gdk_flush();
-     x_error_code = gdk_error_trap_pop();
-     if (status != Success || x_error_code != 0) {
-@@ -523,7 +525,7 @@ gpds_xinput_set_float_properties_by_name (GpdsXInput *xinput,
-         *(property_data + i) = (gfloat)properties[i];
- 
-     gdk_error_trap_push();
--    XChangeDeviceProperty(GDK_DISPLAY(),
-+    XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
-                           device, property_atom,
-                           float_atom, 32, PropModeReplace,
-                           (unsigned char*)property_data, n_properties);
-@@ -594,7 +596,8 @@ gpds_xinput_get_float_properties_by_name (GpdsXInput *xinput,
-         return FALSE;
- 
-     gdk_error_trap_push();
--    status =  XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False,
-+    status =  XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device,
-+                                 property_atom, 0, 1000, False,
-                                  float_atom, &actual_type, &actual_format,
-                                  n_properties, &bytes_after, &data);
-     gdk_flush();
-@@ -676,7 +679,8 @@ gpds_xinput_get_button_map (GpdsXInput *xinput,
-     *map = g_new0(guchar, *n_buttons);
- 
-     gdk_error_trap_push();
--    status =  XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons);
-+    status =  XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
-+                                      device, *map, *n_buttons);
-     gdk_flush();
- 
-     x_error_code = gdk_error_trap_pop();
-@@ -705,7 +709,8 @@ gpds_xinput_set_button_map (GpdsXInput *xinput,
-         return FALSE;
- 
-     gdk_error_trap_push();
--    status =  XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons);
-+    status =  XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
-+                                      device, map, n_buttons);
-     gdk_flush();
- 
-     x_error_code = gdk_error_trap_pop();
-diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
-index a06dcbc..f97f9d4 100644
---- a/test/test-xinput-utils.c
-+++ b/test/test-xinput-utils.c
-@@ -29,7 +29,7 @@ void
- teardown (void)
- {
-     if (device)
--        XCloseDevice(GDK_DISPLAY(), device);
-+        XCloseDevice(gdk_x11_get_default_xdisplay(), device);
-     g_clear_error(&error);
-     g_clear_error(&expected_error);
- }

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
deleted file mode 100644
index 3e8612d96a5..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-commit 255334e6749ec4d4358e627dc6693b4159aaf912
-Author: Hiroyuki Ikezoe <poincare@××××××.net>
-Date:   Fri Mar 12 19:13:54 2010 +0900
-
-    mouse extension -> pointing device.
-    
-    Why did I use this weird name?
-
-diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-index db4dd8e..31dd336 100644
---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-@@ -29,34 +29,34 @@
- #include "gpds-gconf.h"
- #include "gpds-xinput-pointer-info.h"
- 
--#define GSD_TYPE_MOUSE_EXTENSION_PLUGIN            (gsd_mouse_extension_plugin_get_type ())
--#define GSD_MOUSE_EXTENSION_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdMouseExtensionPlugin))
--#define GSD_MOUSE_EXTENSION_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
--#define GSD_IS_MOUSE_EXTENSION_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
--#define GSD_IS_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
--#define GSD_MOUSE_EXTENSION_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
-+#define GSD_TYPE_POINTING_DEVICE_PLUGIN            (gsd_pointing_device_plugin_get_type ())
-+#define GSD_POINTING_DEVICE_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
-+#define GSD_POINTING_DEVICE_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
-+#define GSD_IS_POINTING_DEVICE_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN))
-+#define GSD_IS_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN))
-+#define GSD_POINTING_DEVICE_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
- 
--typedef struct _GsdMouseExtensionPlugin GsdMouseExtensionPlugin;
--typedef struct _GsdMouseExtensionPluginClass GsdMouseExtensionPluginClass;
-+typedef struct _GsdPointingDevicePlugin GsdPointingDevicePlugin;
-+typedef struct _GsdPointingDevicePluginClass GsdPointingDevicePluginClass;
- 
--struct _GsdMouseExtensionPlugin
-+struct _GsdPointingDevicePlugin
- {
-     GnomeSettingsPlugin parent;
-     GList *managers;
- };
- 
--struct _GsdMouseExtensionPluginClass
-+struct _GsdPointingDevicePluginClass
- {
-     GnomeSettingsPluginClass parent_class;
- }; 
- 
--GType gsd_mouse_extension_plugin_get_type (void) G_GNUC_CONST;
-+GType gsd_pointing_device_plugin_get_type (void) G_GNUC_CONST;
- G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
- 
--GNOME_SETTINGS_PLUGIN_REGISTER(GsdMouseExtensionPlugin, gsd_mouse_extension_plugin)
-+GNOME_SETTINGS_PLUGIN_REGISTER(GsdPointingDevicePlugin, gsd_pointing_device_plugin)
- 
- static void
--gsd_mouse_extension_plugin_init (GsdMouseExtensionPlugin *plugin)
-+gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
- {
-     plugin->managers = NULL;
- }
-@@ -104,10 +104,10 @@ collect_pointer_device_infos_from_gconf (void)
- static void
- activate (GnomeSettingsPlugin *plugin)
- {
--    GsdMouseExtensionPlugin *mouse_extension_plugin;
-+    GsdPointingDevicePlugin *pointing_device_plugin;
-     GList *pointer_device_infos, *node;
- 
--    mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin); 
-+    pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); 
- 
-     pointer_device_infos = collect_pointer_device_infos_from_gconf();
-     for (node = pointer_device_infos; node; node = g_list_next(node)) {
-@@ -120,8 +120,8 @@ activate (GnomeSettingsPlugin *plugin)
-             continue;
- 
-         gsd_pointing_device_manager_start(manager, NULL);
--        mouse_extension_plugin->managers =
--            g_list_prepend(mouse_extension_plugin->managers, manager);
-+        pointing_device_plugin->managers =
-+            g_list_prepend(pointing_device_plugin->managers, manager);
-     }
-     g_list_foreach(pointer_device_infos,
-                    (GFunc)gpds_xinput_pointer_info_free, NULL);
-@@ -129,7 +129,7 @@ activate (GnomeSettingsPlugin *plugin)
- }
- 
- static void
--stop_all_managers (GsdMouseExtensionPlugin *plugin)
-+stop_all_managers (GsdPointingDevicePlugin *plugin)
- {
-     GList *node;
- 
-@@ -147,11 +147,11 @@ stop_all_managers (GsdMouseExtensionPlugin *plugin)
- static void
- deactivate (GnomeSettingsPlugin *plugin)
- {
--    stop_all_managers(GSD_MOUSE_EXTENSION_PLUGIN(plugin));
-+    stop_all_managers(GSD_POINTING_DEVICE_PLUGIN(plugin));
- }
- 
- static void
--gsd_mouse_extension_plugin_class_init (GsdMouseExtensionPluginClass *klass)
-+gsd_pointing_device_plugin_class_init (GsdPointingDevicePluginClass *klass)
- {
-     GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS(klass);
- 

diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
deleted file mode 100644
index 1793bdfaa0a..00000000000
--- a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
+++ /dev/null
@@ -1,266 +0,0 @@
-commit ff25a24d387887bc3bbacfb5bcaf2756695df096
-Author: Hiroyuki Ikezoe <hiikezoe@×××××.org>
-Date:   Sat Jun 26 19:55:40 2010 +0900
-
-    Watch DevicePresenceNotify event.
-    
-    Some devices are not reported by xserver at the time of startiung up
-    of gnome-settings-daemon, so we need to watch DevicePresenceNotify
-    event at that time.
-    
-    Fix for bug #609050.
-
-diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-index 31dd336..8a2d98f 100644
---- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
-@@ -24,10 +24,13 @@
- #include <gnome-settings-daemon/gnome-settings-plugin.h>
- #include <glib/gi18n.h>
- #include <gconf/gconf-client.h>
-+#include <gdk/gdkx.h>
-+#include <X11/extensions/XInput.h>
- 
- #include "gsd-pointing-device-manager.h"
- #include "gpds-gconf.h"
- #include "gpds-xinput-pointer-info.h"
-+#include "gpds-xinput-utils.h"
- 
- #define GSD_TYPE_POINTING_DEVICE_PLUGIN            (gsd_pointing_device_plugin_get_type ())
- #define GSD_POINTING_DEVICE_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
-@@ -61,44 +64,90 @@ gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
-     plugin->managers = NULL;
- }
- 
--static GList *
--collect_pointer_device_infos_from_gconf (void)
-+static gboolean
-+has_manager (GsdPointingDevicePlugin *plugin, const gchar *device_name)
- {
--    GConfClient *gconf;
--    GSList *dirs, *node;
--    GList *infos = NULL;
--
--    gconf = gconf_client_get_default();
--    dirs = gconf_client_all_dirs(gconf, GPDS_GCONF_DIR, NULL);
--
--    for (node = dirs; node; node = g_slist_next(node)) {
--        const gchar *dir = node->data;
--        gchar *device_type;
--        gchar *device_type_key;
--
--        device_type_key = gconf_concat_dir_and_key(dir, GPDS_GCONF_DEVICE_TYPE_KEY);
--        device_type = gconf_client_get_string(gconf, device_type_key, NULL);
--        if (device_type) {
--            GpdsXInputPointerInfo *info;
--            gchar *device_name, *unescaped_device_name;
--
--            device_name = g_path_get_basename(dir);
--            unescaped_device_name = gconf_unescape_key(device_name, -1);
--            info = gpds_xinput_pointer_info_new(unescaped_device_name, device_type);
--            infos = g_list_prepend(infos, info);
--            g_free(unescaped_device_name);
--            g_free(device_name);
-+    GList *node;
-+
-+    for (node = plugin->managers; node; node = g_list_next(node)) {
-+        GsdPointingDeviceManager *manager = node->data;
-+
-+        if (g_str_equal(gsd_pointing_device_manager_get_device_name(manager), device_name))
-+            return TRUE;
-+    }
-+
-+    return FALSE;
-+}
-+
-+static GdkFilterReturn
-+device_presence_filter (GdkXEvent *xevent,
-+                        GdkEvent  *event,
-+                        gpointer   data)
-+{
-+    XEvent *xev = (XEvent *)xevent;
-+    XEventClass class_presence;
-+    int xi_presence;
-+    GsdPointingDevicePlugin *plugin = GSD_POINTING_DEVICE_PLUGIN(data);
-+
-+    DevicePresence(gdk_x11_get_default_xdisplay(), xi_presence, class_presence);
-+
-+    if (xev->type == xi_presence) {
-+        XDeviceInfo *device_info = NULL;
-+        XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
-+
-+        device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
-+        if (notify_event->devchange == DeviceEnabled) {
-+            GsdPointingDeviceManager *manager;
-+
-+            if (has_manager(plugin, device_info->name))
-+                return GDK_FILTER_CONTINUE;
-+
-+            manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
-+                                                      device_info->name);
-+            if (manager) {
-+                gsd_pointing_device_manager_start(manager, NULL);
-+                plugin->managers = g_list_prepend(plugin->managers, manager);
-+            }
-+        } else if (notify_event->devchange == DeviceRemoved) {
-         }
-+    }
- 
--        g_free(device_type_key);
--        g_free(device_type);
-+    return GDK_FILTER_CONTINUE;
-+}
-+
-+static void
-+add_device_presence_filter (GsdPointingDevicePlugin *plugin)
-+{
-+    Display *display;
-+    XEventClass class_presence;
-+    gint xi_presence;
-+
-+    gint op_code, event, error;
-+
-+    if (!XQueryExtension(GDK_DISPLAY(),
-+                         "XInputExtension",
-+                         &op_code,
-+                         &event,
-+                         &error)) {
-+        return;
-     }
- 
--    g_slist_foreach(dirs, (GFunc)g_free, NULL);
--    g_slist_free(dirs);
--    g_object_unref(gconf);
-+    display = gdk_x11_get_default_xdisplay();
- 
--    return infos;
-+    gdk_error_trap_push();
-+    DevicePresence(display, xi_presence, class_presence);
-+    XSelectExtensionEvent(display,
-+                          RootWindow(display, DefaultScreen(display)),
-+                          &class_presence, 1);
-+    gdk_flush();
-+    if (!gdk_error_trap_pop())
-+        gdk_window_add_filter(NULL, device_presence_filter, plugin);
-+}
-+
-+static void
-+remove_device_presence_filter (GsdPointingDevicePlugin *plugin)
-+{
-+    gdk_window_remove_filter(NULL, device_presence_filter, plugin);
- }
- 
- static void
-@@ -109,7 +158,10 @@ activate (GnomeSettingsPlugin *plugin)
- 
-     pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin); 
- 
--    pointer_device_infos = collect_pointer_device_infos_from_gconf();
-+    add_device_presence_filter(pointing_device_plugin);
-+
-+    pointer_device_infos = gpds_xinput_utils_collect_pointer_infos();
-+
-     for (node = pointer_device_infos; node; node = g_list_next(node)) {
-         GsdPointingDeviceManager *manager;
-         GpdsXInputPointerInfo *info = node->data;
-@@ -133,6 +185,8 @@ stop_all_managers (GsdPointingDevicePlugin *plugin)
- {
-     GList *node;
- 
-+    remove_device_presence_filter(plugin);
-+
-     for (node = plugin->managers; node; node = g_list_next(node)) {
-         GsdPointingDeviceManager *manager = node->data;
- 
-diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
-index 48dc2a5..0f7ceea 100644
---- a/src/gpds-xinput-utils.c
-+++ b/src/gpds-xinput-utils.c
-@@ -62,6 +62,33 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
-     return NULL;
- }
- 
-+XDeviceInfo *
-+gpds_xinput_utils_get_device_info_from_id  (XID id, GError **error)
-+{
-+    XDeviceInfo *device_infos;
-+    gint i, n_device_infos;
-+
-+    device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
-+
-+    for (i = 0; i < n_device_infos; i++) {
-+        if (device_infos[i].use != IsXExtensionPointer)
-+            continue;
-+        if (device_infos[i].id == id) {
-+            XFreeDeviceList(device_infos);
-+            return &device_infos[i];
-+        }
-+    }
-+
-+    XFreeDeviceList(device_infos);
-+
-+    g_set_error(error,
-+                GPDS_XINPUT_UTILS_ERROR,
-+                GPDS_XINPUT_UTILS_ERROR_NO_DEVICE,
-+                _("No device found for %d."), (int)id);
-+
-+    return NULL;
-+}
-+
- gshort
- gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error)
- {
-diff --git a/src/gpds-xinput-utils.h b/src/gpds-xinput-utils.h
-index 9cc4564..74e491a 100644
---- a/src/gpds-xinput-utils.h
-+++ b/src/gpds-xinput-utils.h
-@@ -38,6 +38,8 @@ typedef enum
- GQuark       gpds_xinput_utils_error_quark              (void);
- XDeviceInfo *gpds_xinput_utils_get_device_info          (const gchar *device_name,
-                                                          GError **error);
-+XDeviceInfo *gpds_xinput_utils_get_device_info_from_id  (XID id,
-+                                                         GError **error);
- XDevice     *gpds_xinput_utils_open_device              (const gchar *device_name, GError **error);
- Atom         gpds_xinput_utils_get_float_atom           (GError **error);
- gshort       gpds_xinput_utils_get_device_num_buttons   (const gchar *device_name, GError **error);
-diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
-index 29b3f4e..a06dcbc 100644
---- a/test/test-xinput-utils.c
-+++ b/test/test-xinput-utils.c
-@@ -6,6 +6,7 @@
- void test_exist_device (void);
- void test_get_float_atom (void);
- void test_get_device_info (void);
-+void test_get_device_info_from_id (void);
- void test_open_device (void);
- void test_open_no_device (void);
- void test_get_device_num_buttons (void);
-@@ -49,7 +50,7 @@ test_get_float_atom (void)
- void
- test_get_device_info (void)
- {
--    XDeviceInfo *device_info = NULL; 
-+    XDeviceInfo *device_info = NULL;
-     device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
-     cut_assert(device_info);
- 
-@@ -57,6 +58,19 @@ test_get_device_info (void)
- }
- 
- void
-+test_get_device_info_from_id (void)
-+{
-+    XDeviceInfo *device_info = NULL;
-+    device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
-+    cut_assert(device_info);
-+
-+    gcut_assert_error(error);
-+
-+    device_info = gpds_xinput_utils_get_device_info_from_id(device_info->id, &error);
-+    cut_assert_equal_string(DEVICE_NAME, device_info->name);
-+}
-+
-+void
- test_open_device (void)
- {
-     device = gpds_xinput_utils_open_device(DEVICE_NAME, &error);

diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
deleted file mode 100644
index 5fe0cde0a66..00000000000
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
-HOMEPAGE="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
-SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# recent enough x11-base/xorg-server required
-RDEPEND="
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.14.0:2
-	>=gnome-base/gconf-2.24:2
-	>=gnome-base/gnome-settings-daemon-2.28
-	>=x11-libs/libXi-1.2
-	>=x11-libs/libX11-1.2.0
-	!<=x11-base/xorg-server-1.6.0
-	!gnome-extra/gsynaptics
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.5
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/${P}-crash.patch" \
-		"${FILESDIR}/${P}-plugin.patch" \
-		"${FILESDIR}/${P}-reboot.patch" \
-		"${FILESDIR}/${P}-gtk22.patch" \
-		"${FILESDIR}/${P}-gsd-crash.patch" \
-		"${FILESDIR}/${P}-gsd-3.2-fix.patch" \
-		"${FILESDIR}/${P}-fix-build.patch"
-
-	# Disable gsd plugin as it's incompatible since 3.8, bug #514672
-	sed -i -e 's/ gnome-settings-daemon-plugins//' modules/Makefile.am || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}

diff --git a/gnome-extra/gpointing-device-settings/metadata.xml b/gnome-extra/gpointing-device-settings/metadata.xml
deleted file mode 100644
index 39015a1f00d..00000000000
--- a/gnome-extra/gpointing-device-settings/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge-jp">gsynaptics</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/mail-filter/p3scan/Manifest b/mail-filter/p3scan/Manifest
deleted file mode 100644
index 48cec5c8b5d..00000000000
--- a/mail-filter/p3scan/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST p3scan-2.3.1.tar.gz 315677 BLAKE2B f3002aff329d8a9d1ea574047b9ce531d693f85848c0d819e1d7b2036cdfc9cb34ac70ca6daada590bbcc89928d8d40d8db50808ce2ef47568380c5d326931a4 SHA512 562ae70bdb18bc43f00da3106a5c575fa8b12182d0bad72f5fab1bdeeea536bef2e6b2eae9088c561adc293e520e25a27d3b85d687fa29fd895bb3144360caad
-DIST p3scan-2.3.2.tar.gz 321684 BLAKE2B 59b67459dae7b9fbd2bbe432c9fbb5a6c915166671f9d7c8937e540b563c4365eefc68e94a58cd31604dd8a438d874a401e10ee8f03646a4698a06cac4611b11 SHA512 7504e988ca21760ea73f3ae41d9ec79c560da29e88ac849b671e4452e426cb8ca5065fe8de5b839299bd5da81e16f51951748a134a1737502f924c89867b75b7

diff --git a/mail-filter/p3scan/files/p3scan-ocreat.patch b/mail-filter/p3scan/files/p3scan-ocreat.patch
deleted file mode 100644
index c99bc88a0a5..00000000000
--- a/mail-filter/p3scan/files/p3scan-ocreat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- p3scan.c	2005-12-12 15:00:00.000000000 +0000
-+++ p3scan.c	2009-03-06 02:34:13.000000000 +0000
-@@ -366,7 +366,7 @@
-       XXXXXX[4] = letters[v % 62];
-       v /= 62;
-       XXXXXX[5] = letters[v % 62];
--      fd=open(template, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR | O_SYNC, 0600);
-+      fd=open(template, O_RDWR | O_CREAT | O_EXCL | O_SYNC, 0600);
-       if (fd >= 0){
-          errno = save_errno;
-          return fd;

diff --git a/mail-filter/p3scan/files/p3scan.init b/mail-filter/p3scan/files/p3scan.init
deleted file mode 100644
index 8900cd0b44f..00000000000
--- a/mail-filter/p3scan/files/p3scan.init
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting p3scan"
-	start-stop-daemon --start --quiet --pidfile /var/run/p3scan/p3scan.pid --exec /usr/sbin/p3scan
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping p3scan"
-	start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/p3scan/p3scan.pid
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting p3scan"
-	svc_stop
-	sleep 1
-	svc_start
-	eend $?
-}

diff --git a/mail-filter/p3scan/files/p3scan.init-r1 b/mail-filter/p3scan/files/p3scan.init-r1
deleted file mode 100644
index 174ea5c52fb..00000000000
--- a/mail-filter/p3scan/files/p3scan.init-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-checkconfig() {
-	if [[ ! -d /var/run/p3scan ]] ; then
-		checkpath -q -d -m 0700 -o mail:mail /var/run/p3scan || return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting p3scan"
-	start-stop-daemon --start --quiet --pidfile /var/run/p3scan/p3scan.pid --exec /usr/sbin/p3scan
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping p3scan"
-	start-stop-daemon --stop --quiet --pidfile /var/run/p3scan/p3scan.pid
-	eend $?
-}
-
-restart() {
-	ebegin "Restarting p3scan"
-	svc_stop
-	sleep 1
-	svc_start
-	eend $?
-}

diff --git a/mail-filter/p3scan/metadata.xml b/mail-filter/p3scan/metadata.xml
deleted file mode 100644
index 0d107426017..00000000000
--- a/mail-filter/p3scan/metadata.xml
+++ /dev/null
@@ -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>net-mail@g.o</email>
-		<name>Net-Mail</name>
-	</maintainer>
-	<longdescription>P3Scan is a fully transparent scanning proxy-server for POP3-Clients. It provides scanning of incoming email messages for Virus''s, Worms, Trojans, Spam, and harmfull attachments. It can also parse HTML messages.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">p3scan</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/mail-filter/p3scan/p3scan-2.3.1.ebuild b/mail-filter/p3scan/p3scan-2.3.1.ebuild
deleted file mode 100644
index 58e3bc30b59..00000000000
--- a/mail-filter/p3scan/p3scan-2.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils user
-
-DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://p3scan.sf.net/"
-
-DEPEND="net-mail/ripmime
-	dev-libs/libpcre"
-RDEPEND="net-firewall/iptables"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~ppc x86"
-IUSE=""
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	newinitd ${FILESDIR}/${PN}.init ${PN}
-
-	dosbin ${PN} || die
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins ${PN}.conf ${PN}-*.mail
-	doins ${PN}-*.mail
-
-	keepdir /var/run/${PN}
-
-	keepdir /var/spool/${PN}
-	keepdir /var/spool/${PN}/children
-	keepdir /var/spool/${PN}/notify
-
-	fowners mail:mail /var/run/${PN}
-	fperms 700 /var/run/${PN}
-
-	fowners mail:mail /var/spool/${PN}
-	fperms 700 /var/spool/${PN}
-
-	fowners mail:mail /var/spool/${PN}/children
-	fperms 700 /var/spool/${PN}/children
-
-	fowners mail:mail /var/spool/${PN}/notify
-	fperms 700 /var/spool/${PN}/notify
-
-	doman p3scan.8.gz p3scan_readme.8.gz
-
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS LICENSE NEWS README \
-		README-rpm spamfaq.* TODO.list
-}
-
-pkg_postinst() {
-	enewuser mail 8 /bin/true /var/spool/mail mail
-
-	if [ ! -L /etc/${PN}/${PN}.mail ]; then
-		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail
-	fi
-
-	echo
-	elog "Default infected notification template language is set to english, change the"
-	elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
-	elog
-	elog "To start ${PN}, you can use /etc/init.d/${PN} start"
-	elog
-	elog "You need port-redirecting, a rule like:"
-	elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
-	elog "to forward pop3 connections incoming from eth0 interface."
-	elog
-	elog "You will also need to configure at least following in /etc/${PN}/${PN}.conf:"
-	elog "scannertype, scanner, virusregexp"
-	echo
-}

diff --git a/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild b/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild
deleted file mode 100644
index 14ecb27ea34..00000000000
--- a/mail-filter/p3scan/p3scan-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://p3scan.sf.net/"
-
-# Older ripmime did not install a library
-DEPEND="dev-libs/libpcre
-	>=net-mail/ripmime-1.4.0.9
-	"
-RDEPEND="net-firewall/iptables"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/p3scan-ocreat.patch"
-
-	# respect CC (bug #244144), and CFLAGS (bug #240786)
-	sed -i \
-		-e "s/gcc/$(tc-getCC)/" \
-		-e "s:^CFLAGS=-Wall -O2 :CFLAGS=${CFLAGS} :" \
-		-e '/^LDFLAGS=/d' \
-		-e '/^ripmime\/libripmime/,+7d' \
-		-e '/^\.c\.o:/,+3d' \
-		-e '$ap3scan: LDLIBS:=-lripmime -lpcre -lssl -lcrypto\np3scan: $(OBJECTS)' \
-		Makefile || die
-	# Be sure the system copy is used
-	rm -rf ripmime/
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	dosbin ${PN} || die
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins ${PN}.conf ${PN}-*.mail
-	doins ${PN}-*.mail
-
-	keepdir /var/run/${PN}
-
-	keepdir /var/spool/${PN}
-	keepdir /var/spool/${PN}/children
-	keepdir /var/spool/${PN}/notify
-
-	fowners mail:mail /var/run/${PN}
-	fperms 700 /var/run/${PN}
-
-	fowners mail:mail /var/spool/${PN}
-	fperms 700 /var/spool/${PN}
-
-	fowners mail:mail /var/spool/${PN}/children
-	fperms 700 /var/spool/${PN}/children
-
-	fowners mail:mail /var/spool/${PN}/notify
-	fperms 700 /var/spool/${PN}/notify
-
-	doman p3scan.8.gz p3scan_readme.8.gz
-
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS NEWS README \
-		README-rpm TODO.list p3scan.sh spamfaq.*
-}
-
-pkg_postinst() {
-	enewuser mail 8 /bin/true /var/spool/mail mail
-
-	if [ ! -L /etc/${PN}/${PN}.mail ]; then
-		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail
-	fi
-
-	echo
-	elog "Default infected notification template language is set to english, change the"
-	elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
-	elog
-	elog "To start ${PN}, you can use /etc/init.d/${PN} start"
-	elog
-	elog "You need port-redirecting, a rule like:"
-	elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
-	elog "to forward pop3 connections incoming from eth0 interface."
-	elog
-	elog "You will need to configure at least following in /etc/${PN}/${PN}.conf:"
-	elog "scannertype, scanner, virusregexp"
-	elog
-	elog "An example scanner script has been installed to:"
-	elog "/usr/share/doc/${PF}/"
-	echo
-}

diff --git a/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild b/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild
deleted file mode 100644
index 2023906b5cc..00000000000
--- a/mail-filter/p3scan/p3scan-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="This is a full-transparent proxy-server for POP3-Clients"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://p3scan.sf.net/"
-
-# Older ripmime did not install a library
-DEPEND="dev-libs/libpcre
-	>=net-mail/ripmime-1.4.0.9
-	>=net-mail/mailbase-1
-	"
-RDEPEND="net-firewall/iptables
-	sys-apps/openrc"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}/p3scan-ocreat.patch"
-
-	# respect CC (bug #244144), and CFLAGS (bug #240786)
-	sed -i \
-		-e "s/gcc/$(tc-getCC)/" \
-		-e "s:^CFLAGS=-Wall -O2 :CFLAGS=${CFLAGS} :" \
-		-e '/^LDFLAGS=/d' \
-		-e '/^ripmime\/libripmime/,+7d' \
-		-e '/^\.c\.o:/,+3d' \
-		-e '$ap3scan: LDLIBS:=-lripmime -lpcre -lssl -lcrypto\np3scan: $(OBJECTS)' \
-		Makefile || die
-	# Be sure the system copy is used
-	rm -rf ripmime/
-}
-
-src_install () {
-	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-
-	dosbin ${PN}
-
-	dodir /etc/${PN}
-	insinto /etc/${PN}
-	doins ${PN}.conf ${PN}-*.mail
-	doins ${PN}-*.mail
-
-	keepdir /var/spool/${PN}
-	keepdir /var/spool/${PN}/children
-	keepdir /var/spool/${PN}/notify
-
-	fowners mail:mail /var/spool/${PN}
-	fperms 700 /var/spool/${PN}
-
-	fowners mail:mail /var/spool/${PN}/children
-	fperms 700 /var/spool/${PN}/children
-
-	fowners mail:mail /var/spool/${PN}/notify
-	fperms 700 /var/spool/${PN}/notify
-
-	doman p3scan.8.gz p3scan_readme.8.gz
-
-	dodoc AUTHORS CHANGELOG CONTRIBUTERS NEWS README \
-		README-rpm TODO.list p3scan.sh spamfaq.*
-}
-
-pkg_postinst() {
-	if [ ! -L /etc/${PN}/${PN}.mail ]; then
-		ln -sf /etc/${PN}/${PN}-en.mail /etc/${PN}/${PN}.mail || die
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		echo
-		elog "Default infected notification template language is set to english, change the"
-		elog "symbolic link /etc/${PN}/${PN}.mail if you want it in another language."
-		elog
-		elog "To start ${PN}, you can use /etc/init.d/${PN} start"
-		elog
-		elog "You need port-redirecting, a rule like:"
-		elog "  iptables -t nat -A PREROUTING -p tcp -i eth0 --dport pop3 -j REDIRECT --to 8110"
-		elog "to forward pop3 connections incoming from eth0 interface."
-		elog
-		elog "You will need to configure at least following in /etc/${PN}/${PN}.conf:"
-		elog "scannertype, scanner, virusregexp"
-		elog
-		elog "An example scanner script has been installed to:"
-		elog "/usr/share/doc/${PF}/"
-		echo
-	fi
-}

diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
deleted file mode 100644
index fcc52874626..00000000000
--- a/mail-filter/qmail-scanner/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST q-s-1.25st-20050406.patch.gz 124325 BLAKE2B 50e0937ee560cdebf39eb2781096ac609549dd07b5c90ad47896a11d489a2dba3f0da808cdd8a37ff7a971e66ce5881a38e92bce48a0d65919c0a296c55556ea SHA512 a4048ee61fe14164c2d6d71d81db27d05a65c1354734be8fb0d5d0f8d0251bae6a2e197ee4680a7c95bc3f690c82dbda52437139ccbdb3502b66d5994b5c2de3
-DIST q-s-2.05st-20080728.patch.gz 102235 BLAKE2B 6ee751307f2783cb25100ec25a0e1a58c170794f5a62a26a040e1c08392b4601ba0299a5f89033d1493719c98f79bea5600c4de316d0f193f50371b75376e5de SHA512 cceaaed8757b53cc358db11b5070a69b8a131f67e43476f3fd4f122c767eb696efe939fb73733a96f0b7d92b096b0cfe39ccec2cc228a94f049c753caefa0029
-DIST q-s-2.06st-20090419.patch.gz 103486 BLAKE2B 373147922c5a8432f3ec67cc26fb64febdad729c01b876259d281b127ff926df77f7340eeddd3d1202106ee9bda4349e1c8941416ba2d858c4be8dfdd7bba236 SHA512 b10c66873dd5c91c1e9d1c9e1dd3ab9948bebb81654f891b411ff83c6395408c6cbe6c2fc6d5d1c34903f383049d0b8955a975ddf963270eff7d478e297f00a2
-DIST q-s-2.08st-20091012.patch.gz 103757 BLAKE2B a9cd86d427a95795a5e481975bf703be6445942131f539fc0b86c02a568eb8f639caf83f83214d1f5d9dd89ccc2b0e37e8f151ee039351a5db4d7ff77944cc32 SHA512 6f9e7567e16dcc1c16f34aa9a64e60776b35bd2a1a38d0f490cbbc56ece1f7894645bd8dd20eb08e054fac1bf17244e8666d085a48a5ba300b0c36cc4bb79fbe
-DIST qmail-scanner-1.25.tgz 221156 BLAKE2B b43969edd1d4eebd7808e52b0ae1c548ac3d69007aba76b0d1be83053c17124f10b0791fccf816d3ddd6c72eac4034fc25bb9aa10d3edb18e9a3e8aad1c4729e SHA512 b3271edd4483cd429d1a1bda7bac56e949804a1cf4232ab446038468339afc1e4b30901f0284d811ceb9a6b9e746bf02c424787004b940a0277e38e8705758b8
-DIST qmail-scanner-2.05.tgz 237577 BLAKE2B 107c38c9c505aca09bc62e094dbcaf658e455933f2ce09d1683c04f368393260801ca4481892093379cf8aeb981abdac8e96d841b72e0f545176ca6c48ee2783 SHA512 bde261dd542cb1d01e22eee1decfbb93cab9f353dc14fb4c2b530ff9384c2cd9c0139151b76e7c71b0abedc8002f8264819b32f0c559f994a29686a709b8863b
-DIST qmail-scanner-2.06.tgz 238926 BLAKE2B ab78a78f3777feeb94174747830bc9c4bf7c334a5428c65cc1c04c765191bcd41f25bb02ea7578203369cf00c98016ae5ef692362e71f497fc008a01c9ca0d9a SHA512 1052985637bea7b24aee3806b1501ed1082a1233a9704cbf5b72af3ef39e44636c921fea4da4abf8ed03acb0b73d9c3c91f7456ccf4547afa643b7b5163212bc
-DIST qmail-scanner-2.08.tgz 239667 BLAKE2B 752886fbe8e83b747bc8a0cf375bfc729c20ffa37749b316517e973ed83043fc3b401ff6f9bc6ecefcbaf169d26fa4742ef96be37090a971c28d5dcebabfe568 SHA512 52f09cc70fdf4f53f358d80d6dfd52851f3cb81e10dae1f7132c6c5c01fd8fc1395f709e24f0f7031073c29c951bdd4b09863f65f53954198b2c3ec15d78fdd9

diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate b/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate
deleted file mode 100644
index a0f3cbd880e..00000000000
--- a/mail-filter/qmail-scanner/files/qmail-scanner-2.05.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/spool/qscan/qmail-queue.log /var/spool/qscan/quarantine.log /var/spool/qscan/mailstats.csv {
-	weekly
-	create 0600 qscand qscand
-}

diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.06.logrotate b/mail-filter/qmail-scanner/files/qmail-scanner-2.06.logrotate
deleted file mode 100644
index a0f3cbd880e..00000000000
--- a/mail-filter/qmail-scanner/files/qmail-scanner-2.06.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/spool/qscan/qmail-queue.log /var/spool/qscan/quarantine.log /var/spool/qscan/mailstats.csv {
-	weekly
-	create 0600 qscand qscand
-}

diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch b/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch
deleted file mode 100644
index c323dbae4c8..00000000000
--- a/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-this is a useless check for package builders
-
-https://bugs.gentoo.org/364123
-
---- a/configure
-+++ b/configure
-@@ -440,9 +440,7 @@ fi
- #QMAILQUEUE_BIN="${QMAILQUEUE_BIN:-$BINDIR/qmail-queue}"
- 
- #Sanity check that suid is allowed on the Qmail "/bin" partition
--QMNT=`df $BINDIR|head -2|tail -1|awk '{print $1}'`
--SUIDSTATUS=`mount|egrep "^$QMNT "|grep nosuid`
--if [ "$SUIDSTATUS" != "" ]; then
-+if false; then
- 	cat<<EOF
- 	
-             *** FATAL ERROR ***

diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.08.logrotate b/mail-filter/qmail-scanner/files/qmail-scanner-2.08.logrotate
deleted file mode 100644
index a0f3cbd880e..00000000000
--- a/mail-filter/qmail-scanner/files/qmail-scanner-2.08.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/spool/qscan/qmail-queue.log /var/spool/qscan/quarantine.log /var/spool/qscan/mailstats.csv {
-	weekly
-	create 0600 qscand qscand
-}

diff --git a/mail-filter/qmail-scanner/files/qmailscanner.cronjob b/mail-filter/qmail-scanner/files/qmailscanner.cronjob
deleted file mode 100644
index ca4527432e3..00000000000
--- a/mail-filter/qmail-scanner/files/qmailscanner.cronjob
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/var/qmail/bin/qmail-scanner-queue -z

diff --git a/mail-filter/qmail-scanner/files/qmailscanner.logrotate b/mail-filter/qmail-scanner/files/qmailscanner.logrotate
deleted file mode 100644
index 864cfe7f6fe..00000000000
--- a/mail-filter/qmail-scanner/files/qmailscanner.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/spool/qmailscan/qmail-queue.log /var/spool/qmailscan/quarantine.log /var/spool/qmailscan/mailstats.csv {
-	weekly
-	create 0600 qscand qscand
-}

diff --git a/mail-filter/qmail-scanner/metadata.xml b/mail-filter/qmail-scanner/metadata.xml
deleted file mode 100644
index db8403c2edd..00000000000
--- a/mail-filter/qmail-scanner/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>net-mail@g.o</email>
-		<name>Net-Mail</name>
-	</maintainer>
-	<use>
-		<flag name="spamassassin">Build faster <pkg>mail-filter/spamassassin</pkg>
-		checks into qmail-scanner</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">qmail-scanner</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
deleted file mode 100644
index 66d78bc75ee..00000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails toolchain-funcs eutils user
-
-Q_S_DATE=20050406
-DESCRIPTION="E-Mail virus scanner for qmail"
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="userpriv"
-
-RDEPEND=">=dev-lang/perl-5.6.1-r1
-	>=virtual/perl-Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=virtual/perl-DB_File-1.803-r2
-	>=net-mail/ripmime-1.3.0.4
-	virtual/qmail
-	>=app-arch/unzip-5.42-r1
-	app-antivirus/clamav
-	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qmailscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	ht_fix_file autoupdaters/* configure
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	diropts -m 750 -o qscand -g qscand
-	for i in quarantine working archive; do
-		for j in tmp new cur; do
-			dodir /var/spool/qmailscan/${i}/${j}
-			keepdir /var/spool/qmailscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qmailscan/tmp
-	keepdir /var/spool/qmailscan/tmp
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-attachments.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qmailscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/qmailscanner.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml
-	dodoc test-trophie.pl
-	dodoc logrotate.qmailscanner
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-	dodoc sub-sender-cache.pl
-	dodoc rbl_scanner.txt
-	dodoc test-clamd.pl
-	dodoc qs2mrtg.pl
-	dodoc mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qmailscan/tmp /var/spool/qmailscan/working /var/spool/qmailscan/quarantine* /var/spool/qmailscan/archive /var/spool/qmailscan/qmail*
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-}

diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
deleted file mode 100644
index 9a26f439890..00000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit fixheadtails toolchain-funcs eutils user
-
-Q_S_DATE=20080728
-DESCRIPTION="E-Mail virus scanner for qmail"
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="clamav spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="userpriv"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Time-HiRes
-	net-mail/tnef
-	virtual/perl-DB_File
-	mail-filter/maildrop
-	virtual/qmail
-	app-arch/unzip
-	virtual/daemontools
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qscan qscand
-	use clamav && usermod -a -G qscand,nofiles clamav
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123
-	ht_fix_file autoupdaters/* configure
-	sed -i \
-		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
-		README-st-patch.html \
-		README-st-patch.txt || die "Fixing doc with sed failed"
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qscan
-	keepdir /var/spool/qscan
-	diropts -m 750 -o qscand -g qscand
-	dodir /var/spool/qscan/quarantine
-	for i in quarantine/{viruses,policy,spam} working archives; do
-		for j in tmp new cur; do
-			dodir /var/spool/qscan/${i}/${j}
-			keepdir /var/spool/qscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qscan/tmp
-	keepdir /var/spool/qscan/tmp
-
-	# Install standard quarantine events file
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-events.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/${P}.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml \
-		test-trophie.pl \
-		logrotate.qmail-scanner \
-		sub-avpdaemon.pl \
-		logging_first_80_chars.eml \
-		spamc-nasty.eml \
-		avpdeamon.init \
-		test_installation.sh \
-		test-sophie.pl \
-		reformime-test.eml \
-		sub-sender-cache.pl \
-		rbl_scanner.txt \
-		test-clamd.pl \
-		qs2mrtg.pl \
-		mrtg-qmail-scanner.cfg \
-		check_AV_daemons \
-		patch_for_nod32_single_user.eml \
-		qmail-delay \
-		qs-scanner-report.sh \
-		qs_config.sh \
-		qscan-spam-to-users.pl \
-		test-avgd.pl \
-		test_password.zip \
-		vpopmail-issues.eml
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qscan
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-
-	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
-	ewarn "user is changed. Please update it manually to /var/spool/qscan"
-	ewarn "or remove the user and emerge again this package"
-
-	if use clamav; then
-		ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
-		ewarn "AllowSupplementaryGroups putting yes."
-		ewarn "After that, restart clamd with"
-		ewarn "/etc/init.d/clamd restart"
-	fi
-}

diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild
deleted file mode 100644
index 1ae8a61bed1..00000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit fixheadtails toolchain-funcs eutils user
-
-Q_S_DATE=20090419
-DESCRIPTION="E-Mail virus scanner for qmail"
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="clamav spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="userpriv"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Time-HiRes
-	net-mail/tnef
-	virtual/perl-DB_File
-	mail-filter/maildrop
-	virtual/qmail
-	app-arch/unzip
-	virtual/daemontools
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qscan qscand
-	use clamav && usermod -a -G qscand,nofiles clamav
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_prepare() {
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123
-	ht_fix_file autoupdaters/* configure
-	sed -i \
-		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
-		README-st-patch.html \
-		README-st-patch.txt || die "Fixing doc with sed failed"
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -i \
-		-e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g" \
-		-e '/DD/s/1\\.0/ 1\\.0/' \
-		configure
-}
-
-src_configure() {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qscan
-	keepdir /var/spool/qscan
-	diropts -m 750 -o qscand -g qscand
-	dodir /var/spool/qscan/quarantine
-	for i in quarantine/{viruses,policy,spam} working archives; do
-		for j in tmp new cur; do
-			dodir /var/spool/qscan/${i}/${j}
-			keepdir /var/spool/qscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qscan/tmp
-	keepdir /var/spool/qscan/tmp
-
-	# Install standard quarantine events file
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-events.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/${P}.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml \
-		test-trophie.pl \
-		logrotate.qmail-scanner \
-		sub-avpdaemon.pl \
-		logging_first_80_chars.eml \
-		spamc-nasty.eml \
-		avpdeamon.init \
-		test_installation.sh \
-		test-sophie.pl \
-		reformime-test.eml \
-		sub-sender-cache.pl \
-		rbl_scanner.txt \
-		test-clamd.pl \
-		qs2mrtg.pl \
-		mrtg-qmail-scanner.cfg \
-		check_AV_daemons \
-		patch_for_nod32_single_user.eml \
-		qmail-delay \
-		qs-scanner-report.sh \
-		qs_config.sh \
-		qscan-spam-to-users.pl \
-		test-avgd.pl \
-		test_password.zip \
-		vpopmail-issues.eml
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qscan
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-
-	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
-	ewarn "user is changed. Please update it manually to /var/spool/qscan"
-	ewarn "or remove the user and emerge again this package"
-
-	if use clamav; then
-		ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
-		ewarn "AllowSupplementaryGroups putting yes."
-		ewarn "After that, restart clamd with"
-		ewarn "/etc/init.d/clamd restart"
-	fi
-}

diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild
deleted file mode 100644
index 433b63d7414..00000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit fixheadtails toolchain-funcs eutils user
-
-Q_S_DATE=20091012
-DESCRIPTION="E-Mail virus scanner for qmail"
-HOMEPAGE="http://qmail-scanner.sourceforge.net/
-	http://toribio.apollinare.org/qmail-scanner/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tgz
-	http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="clamav spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="userpriv"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Time-HiRes
-	net-mail/tnef
-	virtual/perl-DB_File
-	mail-filter/maildrop
-	virtual/qmail
-	app-arch/unzip
-	virtual/daemontools
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( mail-filter/spamassassin )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qscan qscand
-	use clamav && usermod -a -G qscand,nofiles clamav
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_prepare() {
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123
-	ht_fix_file autoupdaters/* configure
-	sed -i \
-		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
-		README-st-patch.html \
-		README-st-patch.txt || die "Fixing doc with sed failed"
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -i \
-		-e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g" \
-		-e '/DD/s/1\\.0/ 1\\.0/' \
-		configure
-}
-
-src_configure() {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qscan
-	keepdir /var/spool/qscan
-	diropts -m 750 -o qscand -g qscand
-	dodir /var/spool/qscan/quarantine
-	for i in quarantine/{viruses,policy,spam} working archives; do
-		for j in tmp new cur; do
-			dodir /var/spool/qscan/${i}/${j}
-			keepdir /var/spool/qscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qscan/tmp
-	keepdir /var/spool/qscan/tmp
-
-	# Install standard quarantine events file
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-events.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/${P}.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml \
-		test-trophie.pl \
-		logrotate.qmail-scanner \
-		sub-avpdaemon.pl \
-		logging_first_80_chars.eml \
-		spamc-nasty.eml \
-		avpdeamon.init \
-		test_installation.sh \
-		test-sophie.pl \
-		reformime-test.eml \
-		sub-sender-cache.pl \
-		rbl_scanner.txt \
-		test-clamd.pl \
-		qs2mrtg.pl \
-		mrtg-qmail-scanner.cfg \
-		check_AV_daemons \
-		patch_for_nod32_single_user.eml \
-		qmail-delay \
-		qs-scanner-report.sh \
-		qs_config.sh \
-		qscan-spam-to-users.pl \
-		test-avgd.pl \
-		test_password.zip \
-		vpopmail-issues.eml
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qscan
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-
-	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
-	ewarn "user is changed. Please update it manually to /var/spool/qscan"
-	ewarn "or remove the user and emerge again this package"
-
-	if use clamav; then
-		ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
-		ewarn "AllowSupplementaryGroups putting yes."
-		ewarn "After that, restart clamd with"
-		ewarn "/etc/init.d/clamd restart"
-	fi
-}

diff --git a/media-gfx/k3d/Manifest b/media-gfx/k3d/Manifest
deleted file mode 100644
index 9bfce75f744..00000000000
--- a/media-gfx/k3d/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST k3d-0.8.0.5.tar.gz 9992671 BLAKE2B dc26e3fe71139023b2d7466d2f7b213d784e9b7e4ac57013bc9b76c45d56ccbeb6dab145b2b00ce85ac6edcb2764dce6d4200335a19a09b3ef122bb74bfaed34 SHA512 229ceb195a07fcf3c07957f5f66b01bbdc03c54d5aa0b2c24be7511864013fb0b58b1e45c4db995c77aa5cc2318b61aed3412c71b16c2c042799863da8912065

diff --git a/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch b/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
deleted file mode 100644
index 24f84d62187..00000000000
--- a/media-gfx/k3d/files/k3d-0.8.0.5-multilib-strict.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5d20d8daf3fb753785c78d43d86813348d456868 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@×××××××××××××.org>
-Date: Tue, 27 Jan 2015 10:54:55 +0100
-Subject: [PATCH 1/4] k3d-0.8.0.2-cmake.diff
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ae8a60d..9f22dae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -362,7 +362,7 @@ ENDIF()
- # Setup output directories ...
- SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${k3d_BINARY_DIR}/bin)
- 
--SET(K3D_LIBDIR lib) # Allows us to handle 64-bit libs if/when it becomes necessary.
-+SET(K3D_LIBDIR lib${LIB_SUFFIX}) # Allows us to handle 64-bit libs if/when it becomes necessary.
- 
- IF(APPLE AND K3D_ENABLE_OSX_BUNDLE)
- 	SET(K3D_BUNDLE_DIRECTORY ${k3d_BINARY_DIR}/K-3D.app/Contents)
--- 
-2.5.0
-

diff --git a/media-gfx/k3d/k3d-0.8.0.5.ebuild b/media-gfx/k3d/k3d-0.8.0.5.ebuild
deleted file mode 100644
index 0382e5044e1..00000000000
--- a/media-gfx/k3d/k3d-0.8.0.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils flag-o-matic
-
-DESCRIPTION="A free 3D modeling, animation, and rendering system"
-HOMEPAGE="http://www.k-3d.org/"
-SRC_URI="https://github.com/K-3D/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="3ds cuda gnome gts imagemagick jpeg nls openexr png python tiff truetype" #TODO cgal tbb
-
-RDEPEND="
-	dev-libs/boost[python]
-	>=dev-cpp/glibmm-2.6:2
-	>=dev-cpp/gtkmm-2.6:2.4
-	dev-libs/expat
-	>=dev-libs/libsigc++-2.2:2
-	media-libs/mesa
-	virtual/glu
-	virtual/opengl
-	>=x11-libs/gtkglext-1.0.6-r3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	3ds? ( media-libs/lib3ds )
-	cuda? ( dev-util/nvidia-cuda-toolkit )
-	gnome? ( gnome-base/gnome-vfs:2 )
-	gts? ( sci-libs/gts )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( virtual/jpeg:0 )
-	openexr? ( media-libs/openexr )
-	png? ( >=media-libs/libpng-1.2.43-r2:= )
-	python? ( >=dev-lang/python-2.3 dev-python/cgkit )
-	tiff? ( media-libs/tiff:0 )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${PN}-${PV}"
-
-# k3d_use_enable()
-#
-# $1: use flag. ON|OFF is determined by this.
-# $2: part of cmake variable name which appended to the base variable name
-#     that is -DK3D_BUILD_$2
-#
-# e.g.) k3d_use_enable gnome GNOME_MODULE #=> -DK3D_BUILD_GNOME_MODULE=ON
-#
-k3d_use_enable() {
-	echo "-DK3D_BUILD_$2=$(use $1 && echo ON || echo OFF)"
-}
-
-k3d_use_module() {
-	echo "-DK3D_BUILD_$2_MODULE=$(use $1 && echo ON || echo OFF)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.0.5-multilib-strict.patch
-	[[ -f CMakeCache.txt ]] && rm CMakeCache.txt
-}
-
-src_configure() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		append-cxxflags -fno-stack-protector
-	fi
-
-	mycmakeargs="
-		-DK3D_BUILD_SVG_IO_MODULE=ON
-		-DK3D_BUILD_CGAL_MODULE=OFF
-		-DK3D_BUILD_GOOGLE_PERFTOOLS_MODULE=OFF
-		$(k3d_use_module 3ds 3DS_IO)
-		$(k3d_use_module cuda CUDA)
-		$(k3d_use_module gnome GNOME)
-		$(k3d_use_module gts GTS)
-		$(k3d_use_module gts GTS_IO)
-		$(k3d_use_module imagemagick IMAGEMAGICK_IO)
-		$(k3d_use_module jpeg JPEG_IO)
-		$(k3d_use_enable nls NLS)
-		$(k3d_use_module openexr OPENEXR_IO)
-		$(k3d_use_module png PNG_IO)
-		-DK3D_ENABLE_PYTHON=$(use python && echo ON || echo OFF)
-		$(k3d_use_module python PYTHON)
-		$(k3d_use_module python PYUI)
-		$(k3d_use_module python NGUI_PYTHON_SHELL)
-		$(k3d_use_module python NGUI_PYTHON_SHELL_MODULE)
-		$(k3d_use_enable python GUIDE)
-		$(k3d_use_module tiff TIFF_IO)
-		$(k3d_use_module truetype FREETYPE2)
-	"
-	cmake-utils_src_configure
-}

diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
deleted file mode 100644
index 482c887906b..00000000000
--- a/media-gfx/k3d/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>graphics@g.o</email>
-		<name>Gentoo Graphics Project</name>
-	</maintainer>
-	<use>
-		<flag name="3ds">Enable support for 3D Studio models</flag>
-		<flag name="cuda">Use nvidia cuda toolkit for speeding up
-	computations</flag>
-		<flag name="gts">Add Support for the GNU Triangulated Surface Library
-	<pkg>sci-libs/gts</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">k3d</remote-id>
-		<remote-id type="github">K-3D/k3d</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/media-gfx/pornview/Manifest b/media-gfx/pornview/Manifest
deleted file mode 100644
index e8b0c4db846..00000000000
--- a/media-gfx/pornview/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pornview-0.2.2.tar.xz 489416 BLAKE2B 2d142ff1b530db04fc3fe8b6d4fde85cc81059f5697bce9b1efd891fcff20f6f467e99e94dd1737af8c28cdf6de0b7b3fdf82d74e5aad3c65aeb686ee65a9cc5 SHA512 f7413398b7d6a3807d9a8b59b0cd651fc2728ea12b4eec084a2654ab864b6ac79e75c6c7d80ad0a26b0e1d4a3f3cf757cfa86115ede4bd3ff9dfa199801a870f

diff --git a/media-gfx/pornview/metadata.xml b/media-gfx/pornview/metadata.xml
deleted file mode 100644
index bf356604c7a..00000000000
--- a/media-gfx/pornview/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pornview</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/media-gfx/pornview/pornview-0.2.2-r1.ebuild b/media-gfx/pornview/pornview-0.2.2-r1.ebuild
deleted file mode 100644
index 1f9077302ce..00000000000
--- a/media-gfx/pornview/pornview-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
-HOMEPAGE="http://pornview.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	mirror://github/gentoo/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 -hppa ~ppc ~x86"
-IUSE="exif nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0
-	virtual/jpeg:*
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	exif? ( media-gfx/exiv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable exif) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	emake DESTDIR="${D}" desktopdir="/usr/share/applications" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/media-gfx/pornview/pornview-0.2.2.ebuild b/media-gfx/pornview/pornview-0.2.2.ebuild
deleted file mode 100644
index 554d2147923..00000000000
--- a/media-gfx/pornview/pornview-0.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="Image viewer/manager with optional support for MPEG movies"
-HOMEPAGE="http://pornview.sourceforge.net"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	mirror://github/gentoo/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -hppa ppc x86"
-IUSE="exif nls"
-
-RDEPEND="
-	dev-libs/glib:2
-	media-libs/libpng:0
-	virtual/jpeg
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXinerama
-	exif? ( media-gfx/exiv2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf \
-		$(use_enable exif) \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" desktopdir="/usr/share/applications" \
-		install || die "emake install failed."
-	dodoc AUTHORS NEWS README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/media-gfx/qingy-themes/Manifest b/media-gfx/qingy-themes/Manifest
deleted file mode 100644
index 295a8016a62..00000000000
--- a/media-gfx/qingy-themes/Manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-DIST _aquaish_-default.tar.gz 370262 BLAKE2B 94f84542ff69e0d95f1ec435eed033753d5715cd6210c80175064a8a34123fc1ea6187b500ac57fdf30820be810b7386275d033049f59f48768595e433781ec7 SHA512 d6c887e607029220759e5219fc820404ed16cf72b5ba4e9152c61d78963f19de8ecb93bf0df238cd451b280b3e51c9381115bf319d40882e7e1a709f6e043844
-DIST _biohazard_-default-1.0.tar.gz 273773 BLAKE2B 7d912e3a2e4384d53db910a6ff3c74c3cb3d6a5907edabd849a61123064c72ccc8a3f50e68ae16e76b11a55b487c25e0477c6e8fed5b9638430f45a7e570d557 SHA512 ef17307ce9b86ca0250a6b7dcf564f13898cc059b221a5d5aec51e3042e8be574a540dee3aaf6f8934262dee91535f2e1b1573f1b21a8223dc75a29492e2e4e7
-DIST _casablanca_-default-1.0.tar.gz 129819 BLAKE2B cf8f8a97d4da5d3a58cfad7b5603a6b77614a877c95fefb76f9b0979f2a392f69464583c76f28de1f147e674308880b2e3e9101397498bb0b93cfc3721a2e821 SHA512 a5acdf04c67d810acf486f999e1a6b08882d290ec9b08935070622e744e9b482b84a8b3aa03eb1383b79b83e88200e75966b358ead8221b59deebfad01ae49f4
-DIST _dragonfly_-default.tar.gz 907660 BLAKE2B 36842f79af34cb244f1f111d4922d877fc22e950b58681fc04e9121286da28c4cc663f92ceb0b34297fa5ee52bda4f52869a7f327a49d83644adccd73bda711c SHA512 874831d8e92d9d4ab681090f5756ab9d9c05e1caf03d512ea20c62861c7e77c3aba389db41e06b68a3c72844cf9bf530105be21893218377bca7b6e26f37ed51
-DIST _matrix_-default-2.tar.gz 371502 BLAKE2B 6e736e8a3a07b8e22869346cf4ab4c062d4ff6c5da6180fdc3c5c10b217cd025383af63c148149ff3ea4f3b67958427fb002a3731ac0ce71e743481d28ef82dc SHA512 c992a4dd191e00b0f3f26adac9c584ab1dfa0f2fbd70ab3f8e956d3f14078bb19bb8eac69f48332b562a64394f58659943ede19e3428acafb535d7204fc9963e
-DIST _vendetta_-default.tar.gz 874809 BLAKE2B afe881fbbb4063c6dc89447d81c4acd861e05c710221335c97d007fcd256dad936484b3284e94dc289bfa07c436c0e3c587941f3270cd6787bb5623620dd913f SHA512 1e53d74f6fa87dd2520d06d96b27dccc46640d4f8ec1ff7c35f7c7dc91cd2fc202dc233b9fbc507c448d34a28a5a8da1b45dc45c4e672aabbd1f706366043365
-DIST adc-default.tar.gz 361240 BLAKE2B b045d9fbea306922ae1eda65116f0b58d0d4bd464c302c2f1aaf561190730985ba901667814d8d6a172933cee236a22711673759291a113811ff19cc335a67a4 SHA512 7cef6c54d08d2fe686f36d8f2c6a27ab45e8dca7fcad41034de03a9e5b49532be9f4e16a051b440020f6c596d1d6cd6a161818a1f70ad292c1e555a845e16a8d
-DIST blnkftre-default.tar.gz 49770 BLAKE2B 3cc4e6bf126de14f72501a8e7c7d69e9949056ab4025ae1c75c3d75864660b0bce92d44c1ed5b50351ac47fc776729eb1fecdf1e57a7c92a150e8bc9f4fc6c44 SHA512 e46b29db4dfe4de0d65396cecf3680138bf30b424abe3d9def08f06bbcf27f006bfb24a42b4ea9dbc882a1dd05ab23d7da790c55f086f70ea53c8e60c485436f
-DIST chaosr-default.tar.gz 402463 BLAKE2B 1d1829c1cd4af5f8309a1e5b3ffdbd763c7e508b9c41b725e5eb242f23145a9b71b08be9817c6e53bcbf74d13b50b76fc3a9ee5303d8ad7c07d6fbe0301a2c0e SHA512 6d0be14db77b46f0406bb6b83375eacc6b538705aa4fcbc322b3e9801d1e29318959a86ba45afd10cfdd88fb42eccb20b89edd6972176a70dd0d925ab4c234cd
-DIST computerroom-default.tar.gz 985602 BLAKE2B fecc4db1f4f52db65f99597f391d8e202961879bdda9d015f2dea3db231381e1e18912fa389d4c01b5ba0f78eb922955ec2c74247658e57ee54a22d846b7f73d SHA512 037a77f4282c08e98f46621ce046d029f54588c52d2f5ea5eae630dc8c25280b27b45e584ac71726e9fc2f633e6e3afe47550fca480592bc699570c0dd86a5ec
-DIST fgdm-default.tar.gz 206988 BLAKE2B 0f6204e2a488f0684fa84c6e20b6761993d08cf99f4c4195264adffed5fdb8e6c39b811869ffd81e6b8217ce597947648b09348eef0821cbecee92b286c1ecd8 SHA512 fa997586624393f8013a6859e76a956bb0a4eecf15f066508614cb71089b23054e269589697981fefb2bd5a2749cf2be4818a88fa51de78a787bcd27087c5d7e
-DIST fireplace-default.tar.gz 1392742 BLAKE2B 48cda1530a770c15e30905411fed06c22e78a1baf31c3dd75a94a22d837aef8dd65c9896d1abd025adbfae62908350b76a47ff66b5a1280f1fd674bd8389f237 SHA512 cc94143f64f1ca20b1441c5abc58860c9bcc9472c0558c52cbacb3805c56e3fea40aa500c59dc1a01a3beca85eee70eb9b7acde9f9a137452e8b22dbf2388a42
-DIST fkdm-default.tar.gz 226868 BLAKE2B 696b2e3b17b7453a32d5c995db45a84c1fc93de3ec714702b7adb54ab788708c41a6b88f0f1663c48c389e7ba65266d4538e2c18bdcbff3baa32b90359f2e3dc SHA512 8354afd34b289dd4cd52d65209ceacbe0eb8675442e7e4e643591f014c8d4011a01e69773144b86822fc4667fdf6ca29cbe969071f895a58c16d0d46d8d92b1b
-DIST kitten-default-1.0.tar.gz 103467 BLAKE2B a1994270ee5a2f82359eb74c32a21a3c83d2d8654aea17ee165e210f0214a9072f573dec5fd02be2c3edf65603908007dbffa13c6660e040c547489aac3e90f8 SHA512 4f2907bc212cb22f7ca707f291c396b025d408db34b901a9ccc6a55b6148b32c1fe717be960e152e35920ae38d73195001eb6277adf3f06388787839b705002a
-DIST lambretta-default.tar.gz 214789 BLAKE2B 9bd39fe9610bc45c82bf13de2766108d4ecc467cab16393d47ecc8de1205d65e7400a96b20095fdfc575d56ca6c068b44341a8f351f8ed5d615f54260dbb4053 SHA512 9dc1c00676935cb6dc566f07153785894e2cef5f2b9e28abbaa56d3660ffafe4c5b93738ff51711f2093b2941ed584491e6352d771dee06d6ed5966d6f61e921
-DIST macmen-default.tar.gz 313117 BLAKE2B fe671c0d4a5aed4e6090523ff168626e415ee80305c21d33289f45ce411e0b4507a7ae20ad7f88c5c720f3ebfe1e60b63068a53ae0c3d4bf63854c3db396d8da SHA512 52e26231d9105dbc5d10e2f171518ee66d91f8db463f9f55a776bffd95a141280e4853c9a7b9f06ea294473d6cd2bcd45c46d92504515b6bd716ea6f3314ddd4
-DIST qingy_lila.tar.bz2 433944 BLAKE2B 3beb9f3f38e365e029c167848a15dceec0c41d51b54a7585a48f4dbc49c7fbb3bafec1aca6e1eb5513f31d033967356167c1c232ef37bc5dbb7268aa618c0dac SHA512 9255d1a5ad5d0832302f30a116d34bc1360a3acb417da6bae3febbf0a1d0afabc72583d85fcb63d93930e2f81d1329353aecc94e07431ae3675be83357a4b9c9
-DIST rouge-default.tar.gz 233178 BLAKE2B 02a0a5d0d8ceef64da9169a4a7c9e0ff71383602c4e7d1a337aa78663a4fc5b915636fb3ffd20a492c17e2b9b6add16fafb19f09ac392f55fe560ca82240659f SHA512 18f1dc0d55829b6822bf10b659dbb140c43cbc9e7fc230beaefbfd8566348cf531c8f3b98ef70c154ea41c6d13d27cbfd68b78c40d7b29f245601fe82eeeda24

diff --git a/media-gfx/qingy-themes/metadata.xml b/media-gfx/qingy-themes/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/media-gfx/qingy-themes/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild b/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
deleted file mode 100644
index 2ebb33ab95a..00000000000
--- a/media-gfx/qingy-themes/qingy-themes-20050816.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Collection of qingy themes"
-
-HOMEPAGE="http://themes.freshmeat.net/projects/qingy-lila/
-	http://themes.freshmeat.net/projects/kitten/
-	http://themes.freshmeat.net/projects/blnkftre/
-	http://themes.freshmeat.net/projects/fireplace/
-	http://themes.freshmeat.net/projects/_dragonfly_/
-	http://themes.freshmeat.net/projects/computerroom/
-	http://themes.freshmeat.net/projects/_biohazard_/
-	http://themes.freshmeat.net/projects/_casablanca_/
-	http://themes.freshmeat.net/projects/_matrix_/
-	http://themes.freshmeat.net/projects/adc/
-	http://themes.freshmeat.net/projects/rouge/
-	http://themes.freshmeat.net/projects/_aquaish_/
-	http://themes.freshmeat.net/projects/macmen/
-	http://themes.freshmeat.net/projects/lambretta/
-	http://themes.freshmeat.net/projects/_vendetta_/
-	http://themes.freshmeat.net/projects/chaosr/
-	http://themes.freshmeat.net/projects/fgdm/
-	http://themes.freshmeat.net/projects/fkdm/"
-
-THEME_URI="http://download.freshmeat.net/themes"
-
-SRC_URI="http://jefklak.suidzer0.org/downloads/qingy/qingy_lila.tar.bz2
-	${THEME_URI}/kitten/kitten-default-1.0.tar.gz
-	${THEME_URI}/blnkftre/blnkftre-default.tar.gz
-	${THEME_URI}/fireplace/fireplace-default.tar.gz
-	${THEME_URI}/_dragonfly_/_dragonfly_-default.tar.gz
-	${THEME_URI}/computerroom/computerroom-default.tar.gz
-	${THEME_URI}/_biohazard_/_biohazard_-default-1.0.tar.gz
-	${THEME_URI}/_casablanca_/_casablanca_-default-1.0.tar.gz
-	${THEME_URI}/_matrix_/_matrix_-default-2.tar.gz
-	${THEME_URI}/adc/adc-default.tar.gz
-	${THEME_URI}/rouge/rouge-default.tar.gz
-	${THEME_URI}/_aquaish_/_aquaish_-default.tar.gz
-	${THEME_URI}/macmen/macmen-default.tar.gz
-	${THEME_URI}/lambretta/lambretta-default.tar.gz
-	${THEME_URI}/_vendetta_/_vendetta_-default.tar.gz
-	${THEME_URI}/blnkftre/blnkftre-default.tar.gz
-	${THEME_URI}/chaosr/chaosr-default.tar.gz
-	${THEME_URI}/fgdm/fgdm-default.tar.gz
-	${THEME_URI}/fkdm/fkdm-default.tar.gz"
-
-# lila -> freedist
-# all the others -> GPL
-LICENSE="GPL-2 freedist"
-KEYWORDS="amd64 ppc x86"
-
-SLOT="0"
-IUSE=""
-RDEPEND="sys-apps/qingy"
-
-S=${WORKDIR}
-
-src_install()
-{
-	local QINGY_THEMES=/usr/share/qingy/themes
-	dodir ${QINGY_THEMES}
-	cp -dpR * ${D}/${QINGY_THEMES}
-	chown -R root:0 ${D}/${QINGY_THEMES}
-}

diff --git a/media-libs/libdvdplay/Manifest b/media-libs/libdvdplay/Manifest
deleted file mode 100644
index 9878ef2ae48..00000000000
--- a/media-libs/libdvdplay/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdvdplay-1.0.1.tar.bz2 173229 BLAKE2B ba91618f8ffe78480a87ad82900f372c674c2a8237eadf6851307bc59772b0c5ad8ee9ca9e65faa3b1d83dbbb6411a2aa70dd36ae620d5de89673c5353624a4d SHA512 f52555eabae2f598a23b7528042c37edbb7c22aed01a384ff6ce242e2c786b1406ac9fa9d6b24153ea12ff7d19062555699908a61c7d6b0dcaa6031c30031d73

diff --git a/media-libs/libdvdplay/libdvdplay-1.0.1.ebuild b/media-libs/libdvdplay/libdvdplay-1.0.1.ebuild
deleted file mode 100644
index 1ced688a994..00000000000
--- a/media-libs/libdvdplay/libdvdplay-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit libtool
-
-IUSE=""
-
-DESCRIPTION="A simple library designed for DVD-menu navigation"
-SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-HOMEPAGE="https://developers.videolan.org/libdvdplay/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-DEPEND=">=media-libs/libdvdread-0.9.3"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Needed to get a sane .so versionning on fbsd, please don't drop it.
-	elibtoolize
-}
-
-src_compile() {
-	econf --enable-shared || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}

diff --git a/media-libs/libdvdplay/metadata.xml b/media-libs/libdvdplay/metadata.xml
deleted file mode 100644
index 0427ec20bfd..00000000000
--- a/media-libs/libdvdplay/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>media-video@g.o</email>
-</maintainer>
-</pkgmetadata>

diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
deleted file mode 100644
index 003c800477d..00000000000
--- a/media-plugins/vdr-graphtft/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vdr-graphtft-0.3.7.tar.bz2 147486 BLAKE2B 22766d498cbb4f5bb950e1d74c73a42350c2adb96148dba5622785cdff4a1528451afdd6c839aa3c2de7ea373269620f8ebfc672ded1596032988f1a6685eaff SHA512 9f5d8ea490c95bde42071d5010bf4dd339ee99271f9596d2d14575882f8f4101f0877c52373268a9d04d52be328018b2a7be1685c088742b252de44b9c3a387d

diff --git a/media-plugins/vdr-graphtft/files/confd b/media-plugins/vdr-graphtft/files/confd
deleted file mode 100644
index 56d4b4627f1..00000000000
--- a/media-plugins/vdr-graphtft/files/confd
+++ /dev/null
@@ -1,54 +0,0 @@
-# /etc/conf.d/vdr.graphtft
-
-####### Global config for Graphtft ####################
-
-#
-# set the DIR of the Framebuffer Device
-#   allowed values: device_names directFB none
-#   default: /dev/fb0
-#GRAPHTFT_DEVICE=/dev/fb0 
-
-
-###### Configuration for graphtft-fe ##################
-#
-# set GRAPHTFT_DEVICE="" to none 
-
-# set your tft display 
-#	no default values
-#	default: not set, exemple
-#GRAPHTFT_DISPLAY=":0.1" 
-
-# switch to user 
-#	default user root ; depand on your x configuration
-#
-#GRAPHTFT_USER="root"
-
-# set the width of your display
-#	allowed values: 
-#	default: 800
-#GRAPHTFT_SCREEN_WIDTH="800"
-
-# set the height of your display
-#	allowed values:
-#	default: 480
-#GRAPHTFT_SCREEN_HEIGHT="480"
-
-# run output without windowsframe
-#	allowed values: yes no
-#	default: yes
-#GRAPHTFT_NO_FRAME="yes"
-
-# set the IP to your X Display
-#	allowed values: ip address
-#	default: localhost IP
-#GRAPHTFT_HOST="127.0.0.1"
-
-# set the port to your X Display
-#	allowed values: portnumber
-#	default: 2039
-#GRAPHTFT_PORT="2039"
-
-# set the logevel for graphtft-fe
-#	allowed values: 0 1 2 3
-# 	default: 0
-#GRAPHTFT_LOG_LEVEL="0"

diff --git a/media-plugins/vdr-graphtft/files/graphtft-fe b/media-plugins/vdr-graphtft/files/graphtft-fe
deleted file mode 100644
index 5803b5728ed..00000000000
--- a/media-plugins/vdr-graphtft/files/graphtft-fe
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-. /etc/conf.d/vdr.graphtft
-
-export DISPLAY=${GRAPHTFT_DISPLAY}
-
-:   ${GRAPHTFT_USER:=root}
-
-OPTIONS="-h ${GRAPHTFT_HOST:=127.0.0.1}"
-OPTIONS="${OPTIONS} -p ${GRAPHTFT_PORT:=2039}"
-OPTIONS="${OPTIONS} -e ${GRAPHTFT_LOG_LEVEL:=0}"
-OPTIONS="${OPTIONS} -W ${GRAPHTFT_SCREEN_WIDTH:=800}"
-OPTIONS="${OPTIONS} -H ${GRAPHTFT_SCREEN_HEIGHT:=480}"
-[ "${GRAPHTFT_NO_FRAME}" = "yes" ] && OPTIONS="${OPTIONS} -n"
-[ "${GRAPHTFT_RESIZE_IMAGE}" = "yes" ] && OPTIONS="${OPTIONS} -r"
-
-# -d <file>       dump each image to file (default off)
-
-start() {
-		ebegin "starting graphtft-fe ..."
-		start-stop-daemon --make-pidfile --background --pidfile /var/run/graphtft-fe.pid \
-        --chuid ${GRAPHTFT_USER} --start --exec /usr/bin/graphtft-fe  -- ${OPTIONS}
-		eend $?
-}
-
-stop() {
-		ebegin "stopping graphtft ..."
-		start-stop-daemon --stop --pidfile /var/run/graphtft-fe.pid
-		eend $?
-}
-

diff --git a/media-plugins/vdr-graphtft/files/rc-addon.sh b/media-plugins/vdr-graphtft/files/rc-addon.sh
deleted file mode 100644
index 03fa4efc55b..00000000000
--- a/media-plugins/vdr-graphtft/files/rc-addon.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# rc-addon-script for plugin graphtft & graphtft-fe
-#
-# Joerg Bornkessel <hd_brummy@g.o>
-
-. /etc/conf.d/vdr.graphtft
-
-plugin_pre_vdr_start() {
-
-		: ${GRAPHTFT_DEVICE:=/dev/fb0}
-
-		add_plugin_param "-d ${GRAPHTFT_DEVICE}"
-}

diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff
deleted file mode 100644
index 4e32c187ac1..00000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gcc-4.4.x.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur graphtft-30.orig/graphtft-fe/common.cc graphtft-30/graphtft-fe/common.cc
---- graphtft-30.orig/graphtft-fe/common.cc	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/common.cc	2012-03-12 02:30:16.000000000 +0100
-@@ -11,6 +11,7 @@
- #include <time.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #include <graphtft.hpp>
- 
-diff -Naur graphtft-30.orig/graphtft-fe/graphtft.hpp graphtft-30/graphtft-fe/graphtft.hpp
---- graphtft-30.orig/graphtft-fe/graphtft.hpp	2012-03-12 02:10:38.000000000 +0100
-+++ graphtft-30/graphtft-fe/graphtft.hpp	2012-03-12 02:30:57.000000000 +0100
-@@ -16,6 +16,7 @@
- #include <X11/Xlib.h>
- #include <Imlib2.h>
- #include <string.h>
-+#include <stdint.h>
- 
- #define __FRONTEND
- #include <../common.h>

diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff
deleted file mode 100644
index ea0e7ad3d74..00000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_gentoo.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -Naur graphtft-30.orig/dfbrenderer/dfbrenderer.c graphtft-30/dfbrenderer/dfbrenderer.c
---- graphtft-30.orig/dfbrenderer/dfbrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dfbrenderer/dfbrenderer.c	2012-03-12 03:29:35.000000000 +0100
-@@ -257,7 +257,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -281,7 +281,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    fontPaths[count] = path;
-    free(path);
-@@ -483,7 +483,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-@@ -561,7 +561,7 @@
-    else
-    {
-       const char* tmp = themePath.c_str();
--      asprintf(&fpath, "%s/graphTFT/themes/%s/%s", confPath.c_str(), tmp, fname);
-+      asprintf(&fpath, "%s/themes/%s/%s", confPath.c_str(), tmp, fname);
-    }
- 
-    tell(4,"creating imageprovider for %s", fpath);
-diff -Naur graphtft-30.orig/dspitems.c graphtft-30/dspitems.c
---- graphtft-30.orig/dspitems.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/dspitems.c	2012-03-12 03:30:16.000000000 +0100
-@@ -107,7 +107,7 @@
-       if (p[0] != '/')
-       {
-          p = string(GraphTFTSetup.PluginConfPath) 
--            + "/graphTFT/themes/" 
-+            + "/themes/" 
-             + string(Thms::theTheme->getDir()) 
-             + "/" + p;
-       }
-diff -Naur graphtft-30.orig/graphtft.c graphtft-30/graphtft.c
---- graphtft-30.orig/graphtft.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/graphtft.c	2012-03-12 03:32:48.000000000 +0100
-@@ -22,6 +22,8 @@
- #include <graphtft.h>
- #include <span.h>
- 
-+#define DATA_DIR "/usr/share/vdr/graphTFT"
-+
- //***************************************************************************
- // cGraphTFTMenu
- //***************************************************************************
-@@ -300,13 +302,13 @@
- 
-    // try to get the config dir
- 
--   if (!ConfigDirectory())
--      return false;
-+//   if (!ConfigDirectory())
-+//      return false;
- 
-    // init 
- 
-    GraphTFTSetup.setClient(this);
--   GraphTFTSetup.PluginConfPath = strdup(ConfigDirectory());
-+   GraphTFTSetup.PluginConfPath = strdup(DATA_DIR);
- 
- #if APIVERSNUM < 10507
-    RegisterI18n(Phrases);
-@@ -322,7 +324,7 @@
-    if (loadThemes() != 0)
-       return false;
- 
--   if (display->Init(_dev, ConfigDirectory(), port) != success)
-+   if (display->Init(_dev, DATA_DIR, port) != success)
-    {
-       tell(0, "Error: Initializing graphTFT device faild, aborting!");
- 
-@@ -355,8 +357,8 @@
- 
-    // look for the themes in the config directory
- 
--   asprintf(&buffer, "find %s/graphTFT/themes -follow -type f -name '*.theme' | sort", 
--            ConfigDirectory());
-+   asprintf(&buffer, "find %s/themes -follow -type f -name '*.theme' | sort", 
-+            DATA_DIR);
- 
-    p = popen(buffer, "r");
- 
-diff -Naur graphtft-30.orig/imlibrenderer/imlibrenderer.c graphtft-30/imlibrenderer/imlibrenderer.c
---- graphtft-30.orig/imlibrenderer/imlibrenderer.c	2012-03-12 03:27:38.000000000 +0100
-+++ graphtft-30/imlibrenderer/imlibrenderer.c	2012-03-12 03:33:54.000000000 +0100
-@@ -123,7 +123,7 @@
-       {
-          // make path relative to the themes directory
- 
--         asprintf(&path, "%s/graphTFT/themes/%s/%s", 
-+         asprintf(&path, "%s/themes/%s/%s", 
-                   confPath.c_str(), themePath.c_str(), p.c_str());
-       }
-       else
-@@ -146,7 +146,7 @@
-    
-    // at least add the default path
- 
--   asprintf(&path, "%s/graphTFT/fonts/", confPath.c_str());
-+   asprintf(&path, "%s/fonts/", confPath.c_str());
-    tell(0, "Info: Adding font path '%s'", path);
-    imlib_add_path_to_font_path(path);
-    free(path);
-@@ -217,7 +217,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 
-@@ -291,7 +291,7 @@
-    if (fname[0] == '/')
-       path << fname;
-    else
--      path << confPath << "/graphTFT/themes/" << themePath << "/" << fname; 
-+      path << confPath << "/themes/" << themePath << "/" << fname; 
- 
-    if (!fileExists(path.str().c_str()))
-    { 

diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff
deleted file mode 100644
index f638be63006..00000000000
--- a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.3.7_makefile.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-Joerg Bornkessel <hd_brummy@g.o> 22 Okt 2009
-Matthias Schwarzott <zzam@g.o> 23 Okt 2009
-diff -Naur graphtft-24.orig/Makefile graphtft-24/Makefile
---- graphtft-24.orig/Makefile	2009-10-21 21:53:56.000000000 +0200
-+++ graphtft-24/Makefile	2009-10-21 21:57:24.000000000 +0200
-@@ -158,10 +158,10 @@
- DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
- 
- ifdef HAVE_IMLIB
--  LIBS += `imlib2-config --libs`
-+  LIBS += $(shell imlib2-config --libs)
- 
-   ifdef HAVE_IMAGE_MAGICK
--    LIBS += `Magick++-config --libs`
-+    LIBS += $(shell Magick++-config --libs)
-     DEFINES += -DHAVE_IMAGE_MAGICK
-   endif
- 
-@@ -170,8 +170,8 @@
- endif
- 
- ifdef HAVE_GTOP
--  GTOP_INC = `pkg-config libgtop-2.0 --cflags`
--  GTOP_LIB = `pkg-config libgtop-2.0 --libs`
-+  GTOP_INC = $(shell pkg-config libgtop-2.0 --cflags)
-+  GTOP_LIB = $(shell pkg-config libgtop-2.0 --libs)
- 
-   DEFINES += -DWITH_SYSINFO
-   LIBS += $(GTOP_LIB)
-@@ -186,8 +186,8 @@
- endif
- 
- ifdef HAVE_DFB
--  INCLUDES += `directfb-config --cflags`
--  LIBS += `directfb-config --libs`
-+  INCLUDES += $(shell directfb-config --cflags)
-+  LIBS += $(shell directfb-config --libs)
-   DEFINES += -DHAVE_DFB
- endif
- 
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-22 17:39:55.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-22 17:41:29.000000000 +0200
-@@ -1,9 +1,9 @@
- 
- CXX           = g++
- CXXFLAGS      = -pipe -ggdb -O2 -Wall -W -D_REENTRANT -fPIC
--INCPATH       = -I. `Magick++-config --cppflags`
-+INCPATH       = -I. $(shell Magick++-config --cppflags)
- LFLAGS        = -Wl,--no-undefined
--LIBS          = -lpthread `imlib2-config --libs` `Magick++-config --libs`
-+LIBS          = -lpthread $(shell imlib2-config --libs) $(shell Magick++-config --libs)
- AR            = ar
- 
- TARGET = graphtft-fe
-diff -Naur graphtft-24.orig/graphtft-fe/Makefile graphtft-24/graphtft-fe/Makefile
---- graphtft-24.orig/graphtft-fe/Makefile	2009-10-23 16:20:43.000000000 +0200
-+++ graphtft-24/graphtft-fe/Makefile	2009-10-23 16:21:20.000000000 +0200
-@@ -17,7 +17,7 @@
- 
- all: 
- 	echo Build graphTFT Frontend
--	@(make $(TARGET))
-+	@$(MAKE) $(TARGET)
- 
- 
- $(TARGET): $(OBJECTS)

diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
deleted file mode 100644
index 572dd1039e7..00000000000
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ /dev/null
@@ -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>vdr@g.o</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<use>
-		<flag name="graphtft-fe">Install external x11 remote frontend</flag>
-		<flag name="theme_avp">graphTFT Alien vs. Predato theme</flag>
-		<flag name="theme_deepblue">graphTFT default theme</flag>
-		<flag name="theme_deeppurple">graphTFT Deep Purple theme</flag>
-		<flag name="theme_poetter">graphTFT Poetter theme</flag>
-		<flag name="touchscreen">Enable Touchscreen support</flag>
-	</use>
-</pkgmetadata>

diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
deleted file mode 100644
index 7a006e12d58..00000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2 flag-o-matic
-
-RESTRICT="test"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.7.27[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${P}_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff")
-
-src_prepare() {
-
-	# remove untranslated Language
-	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile  \
-		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	# libav9 support
-	sed -i \
-		-e 's:avcodec.h>:avcodec.h>\n#include <libavutil/mem.h>:' \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	# libav10 support, wrt bug 519448
-	sed -i \
-		-e "s:CODEC_ID_MPEG1VIDEO:AV_CODEC_ID_MPEG1VIDEO:" \
-		-e "s:avcodec_alloc_frame:av_frame_alloc:" \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	vdr-plugin-2_src_prepare
-
-	vdr_remove_i18n_include graphtft.h setup.h
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -i dspitems.c \
-			-e "s:int timerMatch = 0:eTimerMatch timerMatch = tmNone:"
-	fi
-}
-
-src_compile() {
-	vdr-plugin-2_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}

diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild
deleted file mode 100644
index 654ec763257..00000000000
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit vdr-plugin-2 flag-o-matic
-
-RESTRICT="test"
-
-DESCRIPTION="VDR plugin: GraphTFT"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-
-IUSE_THEMES="+theme_deepblue theme_avp theme_deeppurple theme_poetter"
-IUSE="${IUSE_THEMES} directfb graphtft-fe imagemagick touchscreen"
-
-DEPEND=">=media-video/vdr-1.7.27[graphtft]
-		media-libs/imlib2[png,jpeg]
-		gnome-base/libgtop
-		>=virtual/ffmpeg-0.4.8_p20090201
-		imagemagick? ( media-gfx/imagemagick[png,jpeg,cxx] )
-		directfb? ( dev-libs/DirectFB )
-		graphtft-fe? ( media-libs/imlib2[png,jpeg,X] )"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="theme_deepblue? ( =x11-themes/vdrgraphtft-deepblue-0.3.1 )
-		theme_avp? ( =x11-themes/vdrgraphtft-avp-0.3.1 )
-		theme_deeppurple? ( =x11-themes/vdrgraphtft-deeppurple-0.3.2 )
-		theme_poetter? ( =x11-themes/vdrgraphtft-poetter-0.3.2 )"
-
-PATCHES=("${FILESDIR}/${P}_gentoo.diff"
-		"${FILESDIR}/${P}_makefile.diff"
-		"${FILESDIR}/${P}_gcc-4.4.x.diff")
-
-src_prepare() {
-
-	# remove untranslated Language
-	rm "${S}"/po/{ca_ES,cs_CZ,da_DK,el_GR,es_ES,et_EE,fr_FR,hr_HR,hu_HU,nl_NL,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	sed -i Makefile -e "s:  WITH_X_COMM = 1:#WITH_X_COMM = 1:"
-
-	! use touchscreen && sed -i Makefile  \
-		-e "s:WITH_TOUCH = 1:#WITH_TOUCH = 1:"
-
-	use graphtft-fe && sed -i Makefile \
-		-e "s:#WITH_X_COMM:WITH_X_COMM:"
-
-	# libav9 support
-	sed -i \
-		-e 's:avcodec.h>:avcodec.h>\n#include <libavutil/mem.h>:' \
-		imlibrenderer/dvbrenderer/mpeg2encoder.c || die
-
-	vdr-plugin-2_src_prepare
-
-	vdr_remove_i18n_include graphtft.h setup.h
-
-	# UINT64_C is needed by ffmpeg headers
-	append-cxxflags -D__STDC_CONSTANT_MACROS
-
-	if has_version ">=media-video/vdr-1.7.33"; then
-		sed -i dspitems.c \
-			-e "s:int timerMatch = 0:eTimerMatch timerMatch = tmNone:"
-	fi
-}
-
-src_compile() {
-	vdr-plugin-2_src_compile
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe
-		emake
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dodoc "${S}"/documents/{README,HISTORY,HOWTO.Themes,INSTALL}
-
-	if use graphtft-fe; then
-		cd "${S}"/graphtft-fe && dobin graphtft-fe
-		doinit graphtft-fe
-	fi
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	if use graphtft-fe; then
-		echo
-		elog "Graphtft-fe user:"
-		elog "Edit /etc/conf.d/vdr.graphtft"
-		elog "/etc/init.d/graphtft-fe start"
-		echo
-	fi
-}

diff --git a/media-sound/aacgain/Manifest b/media-sound/aacgain/Manifest
deleted file mode 100644
index 81830e1d4e7..00000000000
--- a/media-sound/aacgain/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST aacgain-1.9.tar.xz 52824 BLAKE2B ad3b3ffedf2a6831bb7a8563f6038fbfa140ba5e7eecbfd41e9e46ea814f222cb829ab6a6ae58ef658f293ba6e89989846f0fbef7cacccb328724801c18d8f13 SHA512 937c1c66feb13dfa869b8868415168c06b20e552577328957230a09b11f5e44ac53643da8e6fe91e476b54fe24c265a589c4a25dbde400f2fd43eebc5916f523
-DIST faad2-2.7.tar.gz 1137407 BLAKE2B 15f82689e671d8cc4ff21bf6f048aadb407abdaeff9ce59982e17b3b97e56c9e848664624e751fd8f4cc7876ab1a8e4c373e7b4a20d9970f5c085d8a0a9006e2 SHA512 8135370497dfcfee09094a03a4a9545ebc58b9e532b89c5d6e5037042549e12ddb75f8903aa05866afac9fa28df96320f1ed2eebffc0660578e54392a51c1161
-DIST mp3gain-1_5_2-src.zip 129435 BLAKE2B 39ad12a09e58375c23602939097622fda0cb6b7487e95947d5443fce55f4d2163c15df619f96b1839acf99bba9ed8ad1990bab287e1392c30813d185d823d734 SHA512 1a7ac51bf0108c1f6fbd610c513bf7fd2c64d340a2ba23dc9fa5c3b896b279474f31f2d60318f409576e39f7643dd585d3e159e2a4db4553f7c9cc3761b7f388
-DIST mp4v2-1.9.1.tar.bz2 432943 BLAKE2B 529ecc3ebd9192ab61febd0512704b5867abf29dc9755c5e61100522ebecc25189000886b152115c12fedbfbe5cc38bb36adb9281e6e60bbf43e86605432aae0 SHA512 28b6f96c1d44a1601980113767c38f5b5b058e1a1fae25c18632163e948c18fc884af9d146bb68e771303ab3c5c8ef9437f4fffa7d770d29157f2d455ee4b1c8

diff --git a/media-sound/aacgain/aacgain-1.9-r2.ebuild b/media-sound/aacgain/aacgain-1.9-r2.ebuild
deleted file mode 100644
index a08a2bfff46..00000000000
--- a/media-sound/aacgain/aacgain-1.9-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools
-
-FAAD2_PV="2.7"
-MP4V2_PV="1.9.1"
-MP3GAIN_PV="1.5.2"
-
-DESCRIPTION="AACGain normalizes the volume of music files using the Replay Gain algorithm"
-HOMEPAGE="http://aacgain.altosdesign.com/"
-SRC_URI="http://sbriesen.de/gentoo/distfiles/${P}.tar.xz
-	https://mp4v2.googlecode.com/files/mp4v2-${MP4V2_PV}.tar.bz2
-	mirror://sourceforge/mp3gain/mp3gain-${MP3GAIN_PV//./_}-src.zip
-	mirror://sourceforge/faac/faad2-${FAAD2_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-DOCS="${PN}/README"
-
-src_unpack() {
-	mkdir -p "${S}"
-	for X in ${A}; do
-		case "${X}" in
-			mp3gain*)
-				mkdir -p "${S}/${X%%-*}"
-				cd "${S}/${X%%-*}"
-				unpack "${X}"
-				;;
-			*)
-				cd "${S}"
-				unpack "${X}"
-				[ -d "${X%%-*}" ] || mv -f "${X%%-*}"-* "${X%%-*}"
-				;;
-		esac
-	done
-}
-
-PATCHES=(
-	${PN}/mp4v2.patch
-	"${FILESDIR}"/${P}-patch-dotdot.patch
-	"${FILESDIR}"/${P}-derefptr.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' faad2/libfaad/Makefile.am || die
-	sed -i -e 's:../\(mp4v2/\):\1:g' ${PN}/mp4v2.patch || die
-	sed -i -e 's:\(libmp4v2\|libfaad/libfaad\)\.la:README:g' \
-		-e 's:^\(autoreconf\|pushd\|popd\):# \1:g' aacgain/linux/prepare.sh || die
-
-	cd "${S}/${PN}/linux"
-	sh prepare.sh || die "prepare failed!"
-
-	cd "${S}"
-	eautoreconf
-
-	cd "${S}/faad2"
-	eautoreconf
-
-	cd "${S}/mp4v2"
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="--disable-dependency-tracking"
-	local myconf2="${myconf} --disable-shared --enable-static"
-
-	cd "${S}/faad2"
-	econf ${myconf2} --without-xmms --without-mpeg4ip
-
-	cd "${S}/mp4v2"
-	econf ${myconf2} --disable-gch
-
-	cd "${S}"
-	econf ${myconf}
-}
-
-src_compile() {
-	cd "${S}/faad2/libfaad"
-	emake
-
-	cd "${S}/mp4v2"
-	emake
-
-	cd "${S}"
-	emake
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "BACK UP YOUR MUSIC FILES BEFORE USING AACGAIN!"
-	ewarn "THIS IS EXPERIMENTAL SOFTWARE. THERE HAVE BEEN"
-	ewarn "BUGS IN PAST RELEASES THAT CORRUPTED MUSIC FILES."
-	ewarn
-}

diff --git a/media-sound/aacgain/files/aacgain-1.9-derefptr.patch b/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
deleted file mode 100644
index 6973f36bf1b..00000000000
--- a/media-sound/aacgain/files/aacgain-1.9-derefptr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:54:58.230117921 +0200
-+++ aacgain-1.9/mp4v2/src/rtphint.cpp	2017-07-14 17:58:57.441883719 +0200
-@@ -345,7 +345,7 @@
-                 pSlash = strchr(pSlash, '/');
-                 if (pSlash != NULL) {
-                     pSlash++;
--                    if (pSlash != '\0') {
-+                    if (*pSlash != '\0') {
-                         length = strlen(pRtpMap) - (pSlash - pRtpMap);
-                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
-                         strncpy(*ppEncodingParams, pSlash, length);

diff --git a/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch b/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
deleted file mode 100644
index 5beda664d83..00000000000
--- a/media-sound/aacgain/files/aacgain-1.9-patch-dotdot.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru aacgain-1.9-orig/aacgain/linux/prepare.sh aacgain-1.9/aacgain/linux/prepare.sh
---- aacgain-1.9-orig/aacgain/linux/prepare.sh	2013-02-19 07:00:54.313006065 +0100
-+++ aacgain-1.9/aacgain/linux/prepare.sh	2013-02-19 07:01:42.849006331 +0100
-@@ -51,7 +51,11 @@
- #remove obsolete config.h; a correct one will be created by automake's configure
- rm -f ../../mp3gain/mpglibDBL/config.h
- #correct header include paths
--patch -p0 -N <mp3gain.patch
-+sed -i 's:../../::' mp3gain.patch
-+old="$(pwd)"
-+cd ../..
-+patch -p0 -N <"${old}/mp3gain.patch"
-+cd "$old"
- 
- echo Creating the configure script
- cp -p configure.ac ../..

diff --git a/media-sound/aacgain/metadata.xml b/media-sound/aacgain/metadata.xml
deleted file mode 100644
index d724065eb22..00000000000
--- a/media-sound/aacgain/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">AACGain is a modification to Glen Sawyer's excellent mp3gain program.
-		It supports AAC (mp4/m4a/QuickTime) audio files in addtion to mp3 files.
-		If you are not familiar with mp3gain, stop reading this, and go to
-		http://mp3gain.sourceforge.net.	AACGain normalizes the volume of digital
-		music files using the ReplayGain algorithm. It works by modifying the
-		global_gain fields in the mp4 samples. Free-form metadata tags are added
-		to the file to save undo information, making the normalization process
-		reversable. AACGain uses the same command-line user interface as mp3gain.</longdescription>
-	<upstream>
-		<remote-id type="google-code">mp4v2</remote-id>
-		<remote-id type="sourceforge">faac</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
deleted file mode 100644
index 18966764d1b..00000000000
--- a/media-sound/denemo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST denemo-1.0.0.tar.gz 13810392 BLAKE2B 9d402b93ea5001b4a43ba15070e778831747d8e23060aec79c28239a3f754beea83fcc78f3884d06d8d612168fd2e7efcf62d0b7fa25bb03b9f007a66e3a26e2 SHA512 38a1b8d8a08495e0103b88802843465148a1ec6aaf49c5b2d71e58c662579f5ab25e06eba1e6855e3eb21f6f4a11efeb97196a6759a587ec5b3f3fac698eef30
-DIST denemo-1.0.2.tar.gz 13923398 BLAKE2B 488dd3e29d190cd2f1e5f7ad401118fc67ef5211357ce64081c9b601bd1ecf67b282a283d95968e9ae30c64deaca85e33c0fe0825defffe8f3c2175db58e4352 SHA512 f6f642af1385a8020f8d64a7c9da31d8f61e1dc01f221709b31c081640f99b367d2bbb5b6dffb6be6cef21fc2b423618ddef8965398850d60a5f0113f98d1f55

diff --git a/media-sound/denemo/denemo-1.0.0.ebuild b/media-sound/denemo/denemo-1.0.0.ebuild
deleted file mode 100644
index c502a2cb901..00000000000
--- a/media-sound/denemo/denemo-1.0.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils xdg-utils
-
-DESCRIPTION="A music notation editor"
-HOMEPAGE="http://www.denemo.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
-
-COMMON_DEPEND="
-	>=app-text/evince-3
-	dev-libs/libxml2:2
-	>=dev-scheme/guile-1.8
-	gnome-base/librsvg:2
-	media-libs/fontconfig:1.0
-	>=media-libs/libsmf-1.3
-	media-libs/libsndfile
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
-	fluidsynth? ( media-sound/fluidsynth )
-	portaudio? (
-		media-libs/portaudio
-		media-libs/aubio
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-	)
-	portmidi? ( media-libs/portmidi )"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/lilypond"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.6-desktop.patch
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-gtk3 \
-		$(use_enable alsa) \
-		$(use_enable fluidsynth) \
-		$(use_enable jack) \
-		$(use_enable nls) \
-		$(use_enable portaudio) \
-		$(use_enable portmidi) \
-		--enable-x11
-}
-
-pkg_postinst() { xdg_desktop_database_update; }
-pkg_postrm() { xdg_desktop_database_update; }

diff --git a/media-sound/denemo/denemo-1.0.2.ebuild b/media-sound/denemo/denemo-1.0.2.ebuild
deleted file mode 100644
index c502a2cb901..00000000000
--- a/media-sound/denemo/denemo-1.0.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils xdg-utils
-
-DESCRIPTION="A music notation editor"
-HOMEPAGE="http://www.denemo.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
-
-COMMON_DEPEND="
-	>=app-text/evince-3
-	dev-libs/libxml2:2
-	>=dev-scheme/guile-1.8
-	gnome-base/librsvg:2
-	media-libs/fontconfig:1.0
-	>=media-libs/libsmf-1.3
-	media-libs/libsndfile
-	x11-libs/gtk+:3
-	x11-libs/gtksourceview:3.0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
-	fluidsynth? ( media-sound/fluidsynth )
-	portaudio? (
-		media-libs/portaudio
-		media-libs/aubio
-		sci-libs/fftw:3.0
-		media-libs/libsamplerate
-	)
-	portmidi? ( media-libs/portmidi )"
-RDEPEND="${COMMON_DEPEND}
-	media-sound/lilypond"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.9.6-desktop.patch
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--enable-gtk3 \
-		$(use_enable alsa) \
-		$(use_enable fluidsynth) \
-		$(use_enable jack) \
-		$(use_enable nls) \
-		$(use_enable portaudio) \
-		$(use_enable portmidi) \
-		--enable-x11
-}
-
-pkg_postinst() { xdg_desktop_database_update; }
-pkg_postrm() { xdg_desktop_database_update; }

diff --git a/media-sound/denemo/files/denemo-0.9.6-desktop.patch b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
deleted file mode 100644
index ade8c4595ed..00000000000
--- a/media-sound/denemo/files/denemo-0.9.6-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- denemo-0.9.6/pixmaps/denemo.desktop
-+++ denemo-0.9.6/pixmaps/denemo.desktop
-@@ -4,7 +4,7 @@
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;Audio;AudioVideo;Music;Education
-+Categories=GNOME;GTK;Audio;AudioVideo;Music;Education;
- 
- Name=GNU Denemo
- Name[de]=GNU Denemo

diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
deleted file mode 100644
index 056cd93b5bd..00000000000
--- a/media-sound/denemo/metadata.xml
+++ /dev/null
@@ -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>sound@g.o</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<use>
-	<flag name="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
-	<flag name="portmidi">Enable support for the portmidi backend</flag>
-</use>
-</pkgmetadata>

diff --git a/media-sound/neutrino/Manifest b/media-sound/neutrino/Manifest
deleted file mode 100644
index 1acda5cb9d4..00000000000
--- a/media-sound/neutrino/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST neutrino-0.8.4.tar.gz 497660 BLAKE2B 1d8553945b149347107421f4d033b7154dba2704268f93c684ad383bf2133b916dafb0371cb5449f09f60f10209bbf0d41fde6e515dd407c84030171105a0c77 SHA512 f36cc682e59565f0d3e64068a20d51396d824db8f65654d3ff0727d7e107f71a0f9590f78b220716caa8e67edb91aa234894f4b656a3dce60aab5cd950cff0c8

diff --git a/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch b/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
deleted file mode 100644
index 1d2558dc931..00000000000
--- a/media-sound/neutrino/files/neutrino-0.8.4-glib-single-include.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-Index: neutrino-0.8.4/id3/nomad-id3-util.c
-===================================================================
---- neutrino-0.8.4.orig/id3/nomad-id3-util.c
-+++ neutrino-0.8.4/id3/nomad-id3-util.c
-@@ -26,15 +26,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#include <glib/gconvert.h>
--#include <glib/gunicode.h>
--#include <glib/gstrfuncs.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- 
- #ifndef HAVE_GNOME_VFS
- 
--#include <glib/gfileutils.h>
--#include <glib/gdir.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-Index: neutrino-0.8.4/id3/nomad-id3.c
-===================================================================
---- neutrino-0.8.4.orig/id3/nomad-id3.c
-+++ neutrino-0.8.4/id3/nomad-id3.c
-@@ -30,10 +30,8 @@
- #include <libgnomevfs/gnome-vfs-file-info.h>
- #endif
- 
--#include <glib/gconvert.h>
--#include <glib/gunicode.h>
-+#include <glib.h>
- 
--#include <glib/gtypes.h>
- 
- #include <stdio.h>
- #include <stdlib.h>
-Index: neutrino-0.8.4/libnomad/nomad-jukebox.c
-===================================================================
---- neutrino-0.8.4.orig/libnomad/nomad-jukebox.c
-+++ neutrino-0.8.4/libnomad/nomad-jukebox.c
-@@ -27,8 +27,7 @@
- 
- #include <string.h>
- 
--#include <glib/gqueue.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- #include <semaphore.h>
- 
-Index: neutrino-0.8.4/libnomad/nomad-util.c
-===================================================================
---- neutrino-0.8.4.orig/libnomad/nomad-util.c
-+++ neutrino-0.8.4/libnomad/nomad-util.c
-@@ -31,15 +31,10 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- 
--#include <glib/gconvert.h>
--#include <glib/gunicode.h>
--#include <glib/gstrfuncs.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- 
- #ifndef HAVE_GNOME_VFS
- 
--#include <glib/gfileutils.h>
--#include <glib/gdir.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-Index: neutrino-0.8.4/src/neutrino-file-browser.c
-===================================================================
---- neutrino-0.8.4.orig/src/neutrino-file-browser.c
-+++ neutrino-0.8.4/src/neutrino-file-browser.c
-@@ -25,9 +25,7 @@
- 
- #include <config.h>
- 
--#include <glib/gutils.h>
--#include <glib/ghash.h>
--#include <glib/gthread.h>
-+#include <glib.h>
- 
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
- #include <libgnomevfs/gnome-vfs-mime-utils.h>
-Index: neutrino-0.8.4/src/neutrino-jukebox-view.c
-===================================================================
---- neutrino-0.8.4.orig/src/neutrino-jukebox-view.c
-+++ neutrino-0.8.4/src/neutrino-jukebox-view.c
-@@ -27,7 +27,7 @@
- 
- #include <gdk/gdk.h>
- 
--#include <glib/gmarkup.h>
-+#include <glib.h>
- 
- #include <string.h>
- 
-Index: neutrino-0.8.4/src/neutrino-util.c
-===================================================================
---- neutrino-0.8.4.orig/src/neutrino-util.c
-+++ neutrino-0.8.4/src/neutrino-util.c
-@@ -26,16 +26,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
--#include <glib/gconvert.h>
--#include <glib/gunicode.h>
--#include <glib/gstrfuncs.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <gtk/gtkwidget.h>
- 
- #ifndef HAVE_GNOME_VFS
- 
--#include <glib/gfileutils.h>
--#include <glib/gdir.h>
- 
- #include <sys/stat.h>
- #include <sys/types.h>
-Index: neutrino-0.8.4/src/neutrino-wav.c
-===================================================================
---- neutrino-0.8.4.orig/src/neutrino-wav.c
-+++ neutrino-0.8.4/src/neutrino-wav.c
-@@ -28,7 +28,7 @@
- #include <libgnomevfs/gnome-vfs-ops.h>
- #endif
- 
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- 
- #include <libnjb.h>
- 
-Index: neutrino-0.8.4/src/neutrino-window.c
-===================================================================
---- neutrino-0.8.4.orig/src/neutrino-window.c
-+++ neutrino-0.8.4/src/neutrino-window.c
-@@ -34,7 +34,7 @@
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
- #include <libgnomevfs/gnome-vfs-utils.h>
- 
--#include <glib/grand.h>
-+#include <glib.h>
- 
- #include <gtk/gtk.h>
- 

diff --git a/media-sound/neutrino/metadata.xml b/media-sound/neutrino/metadata.xml
deleted file mode 100644
index 11cae739a4e..00000000000
--- a/media-sound/neutrino/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@g.o</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sound@g.o</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">neutrino</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/media-sound/neutrino/neutrino-0.8.4.ebuild b/media-sound/neutrino/neutrino-0.8.4.ebuild
deleted file mode 100644
index 47c47a24bc5..00000000000
--- a/media-sound/neutrino/neutrino-0.8.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A GNOME application to manage Creative music players using the PDE protocol"
-HOMEPAGE="http://neutrino.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	dev-libs/libxml2
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-2
-	>=media-libs/libnjb-2.2
-	>=media-libs/id3lib-3.8.3-r6
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	virtual/pkgconfig
-	dev-util/intltool
-"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.4-glib-single-include.patch" )

diff --git a/media-sound/quark/Manifest b/media-sound/quark/Manifest
deleted file mode 100644
index 9d8ed4fc615..00000000000
--- a/media-sound/quark/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quark-3.24.tar.gz 215417 BLAKE2B 496f9055a1f92861f61aee020b6f6a3a09cc0f6f32ba83357c13ffc3d9096bc0b73df0704e08e3204c8baf4d74d1c0d3702e358be05fc5b6b4fa230b7ec3f38b SHA512 a34a3160ab4cfe976cbabd6b2d94cc21ca263c069c53ad6244ed23674e17bf713dc759af998d4ae74720c91ba5e452e3996408d6ae11305bf581eb9a71876a01

diff --git a/media-sound/quark/files/quark-3.24-build.patch b/media-sound/quark/files/quark-3.24-build.patch
deleted file mode 100644
index 479af4b11fa..00000000000
--- a/media-sound/quark/files/quark-3.24-build.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: Julian Ospald <hasufell@g.o>
-Date: Thu May 31 13:46:18 UTC 2012
-Subject: build system
-
-fix underlinking ( https://bugs.gentoo.org/show_bug.cgi?id=367859 )
-remove DEPRECATED flags ( https://bugs.gentoo.org/show_bug.cgi?id=387823 )
-fix permissions on schema files
-make icondir modifiable
-
---- configure.ac
-+++ configure.ac
-@@ -41,6 +41,10 @@
- AC_SUBST(GTHREAD_CFLAGS)
- AC_SUBST(GTHREAD_LIBS)
- 
-+PKG_CHECK_MODULES(X11, [x11])
-+AC_SUBST(X11_CFLAGS)
-+AC_SUBST(X11_LIBS)
-+
- AC_ARG_ENABLE(gconf,
-   [  --disable-gconf         disable use of gconf (for embedded targets)],
-   [], [enable_gconf="yes"])
-@@ -64,6 +68,13 @@
- fi
- AM_CONDITIONAL(USE_GCONF, test "$enable_gconf" = "yes")
- 
-+AC_ARG_WITH([icondir],
-+	    [AC_HELP_STRING([--with-icondir=DIR],
-+			    [where icon gets installed to (default: datadir/pixmaps)])],
-+	    [icondir="$withval"],
-+	    [icondir="$datadir/pixmaps"])
-+AC_SUBST(icondir)
-+
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES([
-   Makefile
---- quark/Makefile.am
-+++ quark/Makefile.am
-@@ -1,7 +1,6 @@
- localedir=$(datadir)/locale
- 
- AM_CPPFLAGS=$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(GNOMEVFS_CFLAGS) $(GCONF_CFLAGS) $(XINE_CFLAGS) \
--  -DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED \
-   -DLOCALEDIR=\"$(localedir)\"
- 
- bin_PROGRAMS = quark
-@@ -30,7 +29,7 @@
- 	gconftool-2 --makefile-install-rule $<
- endif
- 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
--	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
-+	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
- 
- uninstall-local:
- 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/quark.schemas
---- strange-quark/Makefile.am
-+++ strange-quark/Makefile.am
-@@ -6,14 +6,13 @@
-   $(GTK_CFLAGS) \
-   $(GCONF_CFLAGS) \
-   $(GDK_PIXBUF_CFLAGS) \
--  -DG_DISABLE_DEPRECATED \
-   -DG_LOG_DOMAIN=\"strange-quark\" \
--  -DPIXMAPDIR=\"$(pixmapdir)\" \
-+  -DPIXMAPDIR=\"$(icondir)\" \
-   -DLOCALEDIR=\"$(localedir)\"
- 
- bin_PROGRAMS = strange-quark
- 
--strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS)
-+strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) $(X11_LIBS)
- strange_quark_SOURCES = \
-   gettext.h \
-   main.c \
-@@ -43,7 +42,7 @@
- 	gconftool-2 --makefile-install-rule $<
- endif
- 	$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
--	$(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
-+	$(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
- 
- uninstall-local:
- 	$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/strange-quark.schemas
---- pixmaps/Makefile.am
-+++ pixmaps/Makefile.am
-@@ -1,8 +1,5 @@
--pixmapdir = $(datadir)/pixmaps
--
--pixmap_DATA = \
--  quark.png \
--  quark48.png
-+icon_DATA = \
-+  quark.png
- 
- EXTRA_DIST = \
-   quark.png \
---- strange-quark/quark.desktop
-+++ strange-quark/quark.desktop
-@@ -3,7 +3,7 @@
- Name=Quark Music Player
- Comment=Play music from the system tray
- Exec=strange-quark
--Icon=quark48.png
-+Icon=quark.png
- Terminal=false
- Type=Application
- Categories=Application;AudioVideo;

diff --git a/media-sound/quark/metadata.xml b/media-sound/quark/metadata.xml
deleted file mode 100644
index 5d2ab12ccce..00000000000
--- a/media-sound/quark/metadata.xml
+++ /dev/null
@@ -1,11 +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@g.o</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="gnome">Provides tray-icon and enables gconf support</flag>
-	</use>
-</pkgmetadata>

diff --git a/media-sound/quark/quark-3.24.ebuild b/media-sound/quark/quark-3.24.ebuild
deleted file mode 100644
index a64bf664908..00000000000
--- a/media-sound/quark/quark-3.24.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-# I don't want gnome2 eclass
-inherit autotools eutils gnome2-utils xdg-utils
-
-DESCRIPTION="Quark is the Anti-GUI Music Player with a cool Docklet!"
-HOMEPAGE="https://hsgg.github.com/quark/"
-SRC_URI="https://hsgg.github.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gnome"
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/gnome-vfs:2
-	media-libs/xine-lib
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	gnome? ( gnome-base/gconf:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS README"
-
-src_prepare() {
-	# sandbox violations
-	gnome2_environment_reset
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-
-	# fix underlinking wrt #367859
-	# remove DEPRECATED flags wrt #387823
-	epatch "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	# debug switch only provides cflags
-	econf \
-		--disable-debug \
-		--with-icondir=/usr/share/icons/hicolor/48x48/apps \
-		$(use_enable gnome gconf)
-}
-
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use gnome ; then
-		gnome2_gconf_install
-		gnome2_schemas_update
-	fi
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gnome && gnome2_schemas_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}

diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
deleted file mode 100644
index 9b1f1354303..00000000000
--- a/media-video/camorama/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST camorama-0.19.tar.bz2 277169 BLAKE2B 735cfbd4c6cceeb59f1626ef58c5f40f53ef2fa5b37ab5123004fe26547adf9b502dc90fd6f91ca1023f0371b344ee73dbd558379a7ddc09cf552e7ca51910e3 SHA512 efdbe3cdf90a4f4a39b02f141395431c24ac2a7a56ef7faa75b38ae145cdc33f3748daca6bf33a4fa21549b7fef0e7e26d135fd265906e0531e2638739492689

diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild
deleted file mode 100644
index a89953f9322..00000000000
--- a/media-video/camorama/camorama-0.19-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2
-
-DESCRIPTION="A webcam application featuring various image filters"
-HOMEPAGE="https://git.gnome.org/browse/camorama/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnome-2
-	gnome-base/libgnome-keyring
-	>=gnome-base/libgnomeui-2
-	media-libs/libv4l
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gconf.patch \
-		"${FILESDIR}"/${P}-fixes.patch \
-		"${FILESDIR}"/${P}-libv4l.patch \
-		"${FILESDIR}"/${P}-no-more-videodev_h.patch \
-		"${FILESDIR}"/${P}-glib-232.patch
-
-	gnome2_src_prepare
-}

diff --git a/media-video/camorama/files/camorama-0.19-fixes.patch b/media-video/camorama/files/camorama-0.19-fixes.patch
deleted file mode 100644
index 949c19d6674..00000000000
--- a/media-video/camorama/files/camorama-0.19-fixes.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
-
---- camorama-0.19/src/callbacks.c	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/callbacks.c	2008-06-29 22:22:44.000000000 +0200
-@@ -387,9 +387,6 @@
-         }
-     }
- 
--    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
--    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
--                                 cam->x, cam->y);
- 
-     /*
-      * if(cam->read == FALSE) {
-@@ -441,6 +438,11 @@
-      * * } 
-      */
-     get_win_info (cam);
-+
-+    cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth);
-+    gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"),
-+                                 cam->x, cam->y);
-+
-     frame = 0;
-     gtk_window_resize (GTK_WINDOW
-                        (glade_xml_get_widget (cam->xml, "main_window")), 320,
-@@ -520,8 +522,14 @@
-     gtk_widget_show (about);
- }
- 
-+void
-+camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth);
-+
- static void
- apply_filters(cam* cam) {
-+	/* v4l has reverse rgb order from what camora expect so call the color
-+	   filter to fix things up before running the user selected filters */
-+	camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth);
- 	camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth);
- #warning "FIXME: enable the threshold channel filter"
- //	if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL)  != 0) 
---- camorama-0.19/src/filter.c	2007-09-16 14:48:50.000000000 +0200
-+++ camorama-0.19.new/src/filter.c	2008-06-29 22:11:42.000000000 +0200
-@@ -151,12 +151,12 @@
- static void
- camorama_filter_color_init(CamoramaFilterColor* self) {}
- 
--static void
-+void
- camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) {
- 	int i;
- 	char tmp;
- 	i = x * y;
--	while (--i) {
-+	while (i--) {
- 		tmp = image[0];
- 		image[0] = image[2];
- 		image[2] = tmp;
---- camorama-0.19/src/main.c	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19.new/src/main.c	2008-06-29 22:20:04.000000000 +0200
-@@ -224,8 +224,7 @@
- 
-     /* get picture attributes */
-     get_pic_info (cam);
--//	set_pic_info(cam);
--    /* set_pic_info(cam); */
-+    set_pic_info (cam);
-     cam->contrast = cam->vid_pic.contrast;
-     cam->brightness = cam->vid_pic.brightness;
-     cam->colour = cam->vid_pic.colour;
---- camorama-0.19/src/v4l.c	2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/v4l.c	2008-06-29 22:20:23.000000000 +0200
-@@ -158,8 +158,8 @@
- 	if(cam->debug) {
- 		g_message("SET PIC");
- 	}
--	//cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
--	//cam->vid_pic.depth = 24;
-+	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
-+	cam->vid_pic.depth = 24;
- 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
- 	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
- 		if(cam->debug) {
-@@ -232,6 +232,8 @@
-       exit(0);
-    }
- 
-+   cam->x = cam->vid_win.width;
-+   cam->y = cam->vid_win.height;
- }
- 
- void set_buffer(cam * cam)
---- camorama-0.19/src/camorama-window.c~	2007-09-16 15:36:55.000000000 +0200
-+++ camorama-0.19/src/camorama-window.c	2009-06-23 20:19:16.000000000 +0200
-@@ -209,11 +209,7 @@ load_interface(cam* cam) {
- 
-     logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
-     gtk_window_set_default_icon(logo);
--    logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png");
--    if (logo == NULL) {
--        printf ("\n\nLOGO NO GO\n\n");
--    }
--
-+    logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL);
-     if (cam->show_adjustments == FALSE) {
-         gtk_widget_hide (glade_xml_get_widget
-                          (cam->xml, "adjustments_table"));

diff --git a/media-video/camorama/files/camorama-0.19-gconf.patch b/media-video/camorama/files/camorama-0.19-gconf.patch
deleted file mode 100644
index 5a1a19e9b57..00000000000
--- a/media-video/camorama/files/camorama-0.19-gconf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Make camorama respect --disable-schemas-install configure switch
-# https://bugs.gentoo.org/show_bug.cgi?id=243274
-#
-# Makefile.am |    4 ++++
-# Makefile.in |    7 ++++---
-#  2 files changed, 8 insertions(+), 3 deletions(-)
-#
-#
---- a/data/Makefile.am	2008-11-30 12:39:56.000000000 +0100
-+++ b/data/Makefile.am	2008-11-30 12:41:33.000000000 +0100
-@@ -24,9 +24,13 @@
- 	cp $(app_DATA) ~/.gnome/application-registry
- 	cp $(keys_DATA) ~/.gnome/mime-info/
- 
-+if GCONF_SCHEMAS_INSTALL
- install-data-local:
- 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
- 	$(GCONFTOOL) --shutdown
-+else
-+install-data-local:
-+endif
- 
- EXTRA_DIST = $(glade_DATA) $(schema_in_files) $(stuff_DATA)
- 
---- a/data/Makefile.in	2008-11-30 12:41:10.000000000 +0100
-+++ b/data/Makefile.in	2008-11-30 12:42:24.000000000 +0100
-@@ -448,9 +437,10 @@
- 	cp $(app_DATA) ~/.gnome/application-registry
- 	cp $(keys_DATA) ~/.gnome/mime-info/
- 
--install-data-local:
--	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
--	$(GCONFTOOL) --shutdown
-+@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-+@GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA) 
-+@GCONF_SCHEMAS_INSTALL_TRUE@	$(GCONFTOOL) --shutdown
-+@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

diff --git a/media-video/camorama/files/camorama-0.19-glib-232.patch b/media-video/camorama/files/camorama-0.19-glib-232.patch
deleted file mode 100644
index d6a76b8e45c..00000000000
--- a/media-video/camorama/files/camorama-0.19-glib-232.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nu a/src/camorama-stock-items.h b/src/camorama-stock-items.h
---- a/src/camorama-stock-items.h	2007-06-14 16:05:33.000000000 +0200
-+++ b/src/camorama-stock-items.h	2012-05-02 22:40:21.000000000 +0200
-@@ -1,7 +1,7 @@
- #ifndef CAMORAMA_STOCK_ITEMS_H
- #define CAMORAMA_STOCK_ITEMS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
-diff -Nu a/src/glib-helpers.h b/src/glib-helpers.h
---- a/src/glib-helpers.h	2007-06-14 16:05:33.000000000 +0200
-+++ b/src/glib-helpers.h	2012-05-02 22:46:06.000000000 +0200
-@@ -24,7 +24,7 @@
- #ifndef GLIB_HELPERS_H
- #define GLIB_HELPERS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 

diff --git a/media-video/camorama/files/camorama-0.19-libv4l.patch b/media-video/camorama/files/camorama-0.19-libv4l.patch
deleted file mode 100644
index ada58fe7dd2..00000000000
--- a/media-video/camorama/files/camorama-0.19-libv4l.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-http://cvs.fedoraproject.org/viewvc/rpms/camorama/devel/
-
---- camorama-0.19/src/Makefile.am	2007-09-16 14:48:05.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.am	2009-06-24 15:01:37.000000000 +0200
-@@ -36,7 +36,7 @@
- 	filter.h	\
- 	$(BUILT_SOURCES)\
- 	$(NULL)
--camorama_LDADD = $(PACKAGE_LIBS)
-+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
- 
- DISTCLEANFILES=$(BUILT_SOURCES)
- 
---- camorama-0.19/src/Makefile.in	2007-10-06 21:06:28.000000000 +0200
-+++ camorama-0.19.new/src/Makefile.in	2009-06-24 15:01:50.000000000 +0200
-@@ -248,7 +248,7 @@
- 	$(BUILT_SOURCES)\
- 	$(NULL)
- 
--camorama_LDADD = $(PACKAGE_LIBS)
-+camorama_LDADD = $(PACKAGE_LIBS) -lv4l1
- DISTCLEANFILES = $(BUILT_SOURCES)
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
---- camorama-0.19/src/callbacks.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/callbacks.c	2009-06-24 14:55:42.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <libgnomeui/gnome-propertybox.h>
- #include <libgnomeui/gnome-window-icon.h>
- #include <pthread.h>
-+#include <libv4l1.h>
- 
- extern GtkWidget *main_window, *prefswindow;
- //extern state func_state;
-@@ -390,7 +391,7 @@
- 
-     /*
-      * if(cam->read == FALSE) {
--     *  cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
-+     *  cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0);
-      *  
-      *  if((unsigned char *) -1 == (unsigned char *) cam->pic) {
-      *   if(cam->debug == TRUE) {
-@@ -401,7 +402,7 @@
-      *  }
-      *  }else{
-      *   cam->pic_buf = malloc(cam->x * cam->y * cam->depth);
--     *   read(cam->dev,cam->pic,(cam->x * cam->y * 3));
-+     *   v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3));
-      *  } 
-      */
- 
-@@ -427,7 +428,7 @@
-      * if(cam->read == FALSE) {
-      * * for(frame = 0; frame < cam->vid_buf.frames; frame++) {
-      * * cam->vid_map.frame = frame;
--     * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+     * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-      * * if(cam->debug == TRUE) {
-      * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n");
-      * * }
-@@ -547,7 +548,7 @@
-     int i, count = 0;
-     GdkGC *gc;
- 
--    read (cam->dev, cam->pic, (cam->x * cam->y * 3));
-+    v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3));
-     frames2++;
-     /*
-      * update_rec.x = 0;
-@@ -588,7 +589,7 @@
- 
-     i = -1;
-     while (i < 0) {
--        i = ioctl (cam->dev, VIDIOCSYNC, &frame);
-+        i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame);
- 
-         if (i < 0 && errno == EINTR) {
-             if (cam->debug == TRUE) {
-@@ -630,7 +631,7 @@
-                                 0, cam->x, cam->y);
- 
-     cam->vid_map.frame = frame;
--    if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+    if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-         if (cam->debug == TRUE) {
-             fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n");
-         }
-@@ -677,7 +678,7 @@
- void init_cam (GtkWidget * capture, cam * cam)
- {
-     cam->pic =
--        mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
-+        v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE,
-               MAP_SHARED, cam->dev, 0);
- 
-     if ((unsigned char *) -1 == (unsigned char *) cam->pic) {
-@@ -692,7 +693,7 @@
-     cam->vid_map.format = cam->vid_pic.palette;
-     for (frame = 0; frame < cam->vid_buf.frames; frame++) {
-         cam->vid_map.frame = frame;
--        if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-+        if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) {
-             if (cam->debug == TRUE) {
-                 fprintf (stderr,
-                          "Unable to capture image (VIDIOCMCAPTURE).\n");
---- camorama-0.19/src/main.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/main.c	2009-06-24 14:59:35.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
- #include <gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h>
- #include <locale.h>
-+#include <libv4l1.h>
- 
- #include "camorama-display.h"
- #include "camorama-stock-items.h"
-@@ -206,7 +207,7 @@
-     gdk_pixbuf_xlib_init (display, 0);
-     cam->desk_depth = xlib_rgb_get_depth ();
- 
--    cam->dev = open (cam->video_dev, O_RDWR);
-+    cam->dev = v4l1_open (cam->video_dev, O_RDWR);
- 
-     camera_cap (cam);
-     get_win_info (cam);
-@@ -284,5 +285,8 @@
- 
-     gtk_timeout_add (2000, (GSourceFunc) fps, cam->status);
-     gtk_main ();
-+    v4l1_munmap(cam->pic, cam->vid_buf.size);
-+    v4l1_close(cam->dev);
-+    
-     return 0;
- }
---- camorama-0.19/src/v4l.c	2009-06-24 15:01:55.000000000 +0200
-+++ camorama-0.19.new/src/v4l.c	2009-06-24 14:54:09.000000000 +0200
-@@ -2,6 +2,7 @@
- #include<time.h>
- #include<errno.h>
- #include<gnome.h>
-+#include <libv4l1.h>
- #include "support.h"
- 
- extern int frame_number;
-@@ -87,7 +88,7 @@
- void camera_cap(cam * cam)
- {
-    char *msg;
--   if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) {
-       if(cam->debug == TRUE) {
-          fprintf(stderr, "VIDIOCGCAP  --  could not get camera capabilities, exiting.....\n");
-       }
-@@ -161,7 +162,7 @@
- 	cam->vid_pic.palette = VIDEO_PALETTE_RGB24;
- 	cam->vid_pic.depth = 24;
- 	//cam->vid_pic.palette = VIDEO_PALETTE_YUV420P;
--	if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
-+	if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) {
- 		if(cam->debug) {
- 			g_message("VIDIOCSPICT  --  could not set picture info, exiting....");
- 		}
-@@ -176,7 +177,7 @@
- //set_pic_info(cam);
-    char *msg;
- 	
--   if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -201,7 +202,7 @@
- void get_win_info(cam * cam)
- {
-    gchar *msg;
--   if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -222,7 +223,7 @@
- void set_win_info(cam * cam)
- {
-    gchar *msg;
--   if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {
-@@ -239,7 +240,7 @@
- void set_buffer(cam * cam)
- {
-    char *msg;
--   if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
-+   if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) {
-       msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev);
-       error_dialog(msg);
-       if(cam->debug == TRUE) {

diff --git a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
deleted file mode 100644
index 84c8f68ba72..00000000000
--- a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=camorama.git;a=blob_plain;f=camorama-0.19-no-more-videodev_h.patch;hb=HEAD
-
---- src/v4l.h
-+++ src/v4l.h
-@@ -12,8 +12,7 @@
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <gtk/gtk.h>
--#include <linux/types.h>
--#include <linux/videodev.h>
-+#include <libv4l1.h>
- #include <signal.h>
- #include <png.h>
- #include <glade/glade.h>

diff --git a/media-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
deleted file mode 100644
index 80088c21d0a..00000000000
--- a/media-video/camorama/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@g.o</email>
-</maintainer>
-</pkgmetadata>

diff --git a/media-video/cpdvd/Manifest b/media-video/cpdvd/Manifest
deleted file mode 100644
index 5661b189c30..00000000000
--- a/media-video/cpdvd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST cpdvd-1.10.gz 3512 BLAKE2B daf7cab3b89cc1e5d054cc033d09b965381195ab93a3c3805632bbf48390b28aadb45037886dffe257bedce5a6b1cd72ad95cc3ad811332e81f8fa4a4c54d1b0 SHA512 795f3f5a43a4ae9ada4a60b2bb6fcdb501d5218c8886d34548b4c8da0af51db7701fc81ae336f34d1b997f377040a5af52773e40939394942de3c2edca1e2d5b

diff --git a/media-video/cpdvd/cpdvd-1.10-r1.ebuild b/media-video/cpdvd/cpdvd-1.10-r1.ebuild
deleted file mode 100644
index 70b501e5325..00000000000
--- a/media-video/cpdvd/cpdvd-1.10-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-IUSE=""
-
-S="${WORKDIR}"
-
-DESCRIPTION="transfer a DVD title to your harddisk with ease on Linux"
-HOMEPAGE="http://www.lallafa.de/bp/cpdvd.html"
-SRC_URI="http://www.lallafa.de/bp/files/${P}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND=""
-
-RDEPEND=">=media-video/transcode-0.6.2[dvd]
-	>=dev-lang/perl-5.8.0-r12
-	>=media-video/cpvts-1.2"
-
-src_install () {
-	newbin ${P} ${PN} || die
-}

diff --git a/media-video/cpdvd/metadata.xml b/media-video/cpdvd/metadata.xml
deleted file mode 100644
index 106575f01e5..00000000000
--- a/media-video/cpdvd/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@g.o</email>
-  </maintainer>
-</pkgmetadata>

diff --git a/media-video/mplayer-resume/Manifest b/media-video/mplayer-resume/Manifest
deleted file mode 100644
index ecf5bf2d211..00000000000
--- a/media-video/mplayer-resume/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mplayer-resume-2.0.tar.gz 5251 BLAKE2B ff82339c0fc85ea0111896d247ca70c30aa7f98f3f711128be3aff5f040e4b8f9cdaeebcf03108e26ff974f36f81eb925b9766a6715f6275eae475f3d07d9740 SHA512 38ba85b347fd0904e9bad7586e4dfcfd57c85fc2ff8cb9dc58c3961e15fd6500d1a6e0d7f51cb3b8c826aea290b9511be30406ef6bf5b26489788eaaa02deb69

diff --git a/media-video/mplayer-resume/metadata.xml b/media-video/mplayer-resume/metadata.xml
deleted file mode 100644
index 2a705e39ce7..00000000000
--- a/media-video/mplayer-resume/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@g.o</email>
-	<name>Gentoo Video project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/media-video/mplayer-resume/mplayer-resume-2.0.ebuild b/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
deleted file mode 100644
index 10d0f99dbff..00000000000
--- a/media-video/mplayer-resume/mplayer-resume-2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-DESCRIPTION="MPlayer wrapper script to save/resume playback position"
-HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
-SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lirc"
-DEPEND=""
-RDEPEND="lirc? ( app-misc/lirc
-		media-video/mplayer[lirc] )
-		 dev-lang/php[cli]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-	media-video/mplayer"
-
-src_compile() {
-	return;
-}
-
-src_install() {
-	dobin mplayer-resume
-	dodoc ChangeLog README
-}
-
-pkg_postinst() {
-	elog "To get mplayer-resume to save playback position with LIRC,"
-	elog "you will need to setup an entry in ~/.lircrc to run "
-	elog "'get_time_pos' and then 'quit'.  More instructions are"
-	elog "detailed in the README, but the position will not be saved"
-	elog "until you set it up."
-	elog ""
-	elog "Playback position files are saved in ~/.mplayer/playback"
-}

diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
deleted file mode 100644
index 210419538a9..00000000000
--- a/media-video/vcdgear/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vcdgear176-040415_linux.tar.gz 442937 BLAKE2B 5dac584db2b0293e1923842451bda6cfa0876a54bb07c1e1b36c85278f0a1324a4c9ebce0edbfa9f697b76a0cc36a1e00f712effdda09f6eb5cad9962e793247 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19

diff --git a/media-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
deleted file mode 100644
index 68b9a06fccf..00000000000
--- a/media-video/vcdgear/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>media-video@g.o</email>
-</maintainer>
-</pkgmetadata>

diff --git a/media-video/vcdgear/vcdgear-1.76-r2.ebuild b/media-video/vcdgear/vcdgear-1.76-r2.ebuild
deleted file mode 100644
index 7fdc8cdde9d..00000000000
--- a/media-video/vcdgear/vcdgear-1.76-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-QA_PRESTRIPPED=/opt/vcdgear/vcdgear
-QA_FLAGS_IGNORED=/opt/vcdgear/vcdgear
-
-STAMP=040415
-DESCRIPTION="extract MPEG streams from CD images, convert VCD files to MPEG, correct MPEG errors, and more"
-HOMEPAGE="http://www.vcdgear.com/"
-SRC_URI="http://www.vcdgear.com/files/vcdgear${PV//.}-${STAMP}_linux.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="virtual/libstdc++:3.3"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /opt/vcdgear
-	doins -r * || die "doins"
-	fperms a+rx /opt/vcdgear/vcdgear
-	dodir /opt/bin
-	dosym /opt/vcdgear/vcdgear /opt/bin/vcdgear
-}

diff --git a/net-dns/hesiod/Manifest b/net-dns/hesiod/Manifest
deleted file mode 100644
index fd816bffb9d..00000000000
--- a/net-dns/hesiod/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST hesiod-3.1.0-patches.tgz 2389 BLAKE2B 61e99b3139044d5e83edfa6811886fd62de14bf4cb7414715c4fa38bf227a81646ea36d5704bf7364ad3461cc139c072a600d3c8c9d90d23441b2e9e889eff3a SHA512 e2cc00aa38069f52fe9e38d34c42c8edae8e8e0a25702d3cd4b4a5a4fa96e098c7f62f13be69b8f91b92e1c5d18fc8eaedcd19d1946ce3319554d34e94f7b84c
-DIST hesiod-3.1.0.tar.gz 224294 BLAKE2B 969f6771340327356637a77420b99a043f808c7021fa93e34fad04ea6d528c14863e9805ea770acb6d2dadf7f04af4cc7a125f1c0952a7bfecda309bdaec63ac SHA512 a224702378e950216633b0a54e6299bb04b473a65455eb302a3b8435e9d718ad21aa2de03d2865ca2ef96a1d6aa240b2b5c957f065755a0d1c2ad627385f3f9b

diff --git a/net-dns/hesiod/hesiod-3.1.0.ebuild b/net-dns/hesiod/hesiod-3.1.0.ebuild
deleted file mode 100644
index f56fd27b949..00000000000
--- a/net-dns/hesiod/hesiod-3.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit flag-o-matic eutils autotools
-
-DESCRIPTION="DNS functionality to access to DB of information that changes infrequently"
-HOMEPAGE="ftp://athena-dist.mit.edu/pub/ATHENA/hesiod"
-SRC_URI="ftp://athena-dist.mit.edu/pub/ATHENA/${PN}/${P}.tar.gz
-	mirror://gentoo/${P}-patches.tgz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-src_prepare() {
-	# Bug #26332
-	filter-flags -fstack-protector
-
-	# Patches stolen from Fedora hesiod-3.1.0-19.fc14.src.rpm
-	rm -f aclocal.m4 || die "rm failed"
-	EPATCH_SOURCE="${WORKDIR}/files/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc NEWS README || die
-}
-
-pkg_postinst() {
-	elog "hesinfo tools are no longer part of hesiod. Use net-dns/hesinfo
-	instead"
-}

diff --git a/net-dns/hesiod/metadata.xml b/net-dns/hesiod/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/net-dns/hesiod/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/net-irc/savirc/Manifest b/net-irc/savirc/Manifest
deleted file mode 100644
index 6a2d6674a38..00000000000
--- a/net-irc/savirc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST savirc-1.99.tar.bz2 260625 BLAKE2B dda8b90cd64d35a791b187f2596069ec7c17528d1741dd5ab2154bb741e1f86ac8b8afbd6209586eaf7ed7e8c5f809c21b11f12a774e1fc7763e522bd84c8304 SHA512 c74d8232a3b0de35ce74b5c540a2835b2c18f18347ddd61c31a24e01472cdda79816a7893f68db203e5b0305e516ba18cfd80372f35f5ee3e97097d1d1a68790

diff --git a/net-irc/savirc/metadata.xml b/net-irc/savirc/metadata.xml
deleted file mode 100644
index 6f49eba8f49..00000000000
--- a/net-irc/savirc/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>

diff --git a/net-irc/savirc/savirc-1.99-r1.ebuild b/net-irc/savirc/savirc-1.99-r1.ebuild
deleted file mode 100644
index fc234225009..00000000000
--- a/net-irc/savirc/savirc-1.99-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="User friendly IRC client with unicode support and tcl/tk scripting"
-SRC_URI="http://www.savirc.com/Downloads/savirc-Lin/${P}.tar.bz2"
-HOMEPAGE="http://www.savirc.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/tcl-8.3.0:0=
-	>=dev-lang/tk-8.3.0:0="
-DEPEND=""

diff --git a/net-misc/pavuk/Manifest b/net-misc/pavuk/Manifest
deleted file mode 100644
index 50cd3be3d88..00000000000
--- a/net-misc/pavuk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pavuk-0.9.36_pre20120215.tar.xz 810516 BLAKE2B 742f1afd299f6b1ab9c77a32da7fba937557a95d644b29d914b9e0851bf9ed700cdf42b614371f30f30e2e56c68e2550d64cff3f8035604bac7a44ec96d2ee88 SHA512 d7393abb72e328d3c3e8c005282a8b0ec793eee94e5de00c4518aa1a27403da535372679cf3b803a574e6d0dea8c53ccdbb3aa68d9f0c85da5128dba86b65a4f

diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
deleted file mode 100644
index 6ce18c1ed3e..00000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-gtkmulticol-segfault.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/gtkmulticol.c	2009-01-21 16:37:39.000000000 +0800
-+++ src/gtkmulticol.c	2012-02-21 09:47:21.680512626 +0800
-@@ -45,9 +45,9 @@
- static void gtk_multicol_size_request(GtkWidget *widget, GtkRequisition *requisition);
- static void gtk_multicol_size_allocate(GtkWidget *widget, GtkAllocation *allocation);
- 
--guint gtk_multicol_get_type(void)
-+GType gtk_multicol_get_type(void)
- {
--    static guint multicol_type = 0;
-+    static GType multicol_type = 0;
- 
-     if (!multicol_type)
-     {
-
---- src/gtkmulticol.h	2009-01-21 16:37:40.000000000 +0800
-+++ src/gtkmulticol.h	2012-02-21 09:47:42.880514545 +0800
-@@ -41,7 +41,7 @@
-     GtkBoxClass parent_class;
- };
- 
--guint gtk_multicol_get_type(void);
-+GType gtk_multicol_get_type(void);
- GtkWidget *gtk_multicol_new(gint nrows);
- void gtk_multicol_set_number_of_rows(GtkMultiCol *multicol, gint nrows);
- void gtk_multicol_set_spacing(GtkMultiCol *multicol, gint hspacing, gint vspacing);

diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
deleted file mode 100644
index 25338460bd4..00000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-fix-underlinking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.in~	2011-03-02 10:44:45.000000000 +0800
-+++ configure.in	2012-02-23 09:55:28.073709216 +0800
-@@ -1749,6 +1749,7 @@
- 
-     if test -n "$GTK_LIBS" ; then
-       if test -n "$GTK_LIBS"; then
-+        AX_ADD_OPTION([LIBS], [$X_LIBS])
-         AX_ADD_OPTION([LIBS], [$GTK_LIBS])
-         AX_ADD_OPTION([CPPFLAGS], [$GTK_CFLAGS])
-         AC_DEFINE_UNQUOTED(GTK_FACE, [$GTK_VERSION], [with GTK+ GUI])

diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
deleted file mode 100644
index 3d92fdd4b8b..00000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-pcre-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/re.c~	2009-01-21 16:37:40.000000000 +0800
-+++ src/re.c	2012-02-18 13:46:30.986959223 +0800
-@@ -193,8 +193,7 @@ int re_subexpr_info(re_entry *ree, int *
-     {
-         if (nr)
-         {
--            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, &pmatch_nr);
--            *nr = pmatch_nr;
-+            pcre_fullinfo(ree->preg, ree->preg_extra, PCRE_INFO_CAPTURECOUNT, nr);
-         }
-     }
- #endif

diff --git a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch b/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
deleted file mode 100644
index ec3655f1468..00000000000
--- a/net-misc/pavuk/files/pavuk-0.9.36_pre20120215-tl_selectr-overflow-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/absio.orig.c b/src/absio.c
-index 7be9255..e19d7cd 100644
---- a/src/absio.orig.c
-+++ b/src/absio.c
-@@ -181,7 +181,7 @@ int tl_selectr(int sock, long int timeout)
-             {
-                 if ((rv == 0) && !cfg.stop && !cfg.rbreak && !FD_ISSET(sock, &readfds))
-                 {
--                    char buf[32];
-+                    char buf[64];
-                     int r;
-                     char buf2[64];
- 

diff --git a/net-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
deleted file mode 100644
index 5dd8ba44d77..00000000000
--- a/net-misc/pavuk/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="hammer">Turn on chunky/hammer mode (DoS) in pavuk: when
-	specified, pavuk will include features to stress test web sites using an
-	ultrahigh performancereplay mechanism</flag>
-</use>
-</pkgmetadata>

diff --git a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild b/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
deleted file mode 100644
index 8f3d5cb6b58..00000000000
--- a/net-misc/pavuk/pavuk-0.9.36_pre20120215-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-S="${WORKDIR}/${PN}"
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit eutils autotools-utils
-
-DESCRIPTION="Web spider and website mirroring tool"
-HOMEPAGE="http://www.pavuk.org/"
-SRC_URI="https://dev.gentoo.org/~pacho/maintainer-needed/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug gtk hammer ipv6 nls pcre profile ssl"
-
-RDEPEND="virtual/libintl:=
-	gtk? ( x11-libs/gtk+:2 )
-	pcre? ( dev-libs/libpcre:= )
-	ssl? ( dev-libs/openssl:= )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	sys-devel/gettext"
-
-PATCHES=(
-	# Fixes a bug in re.c for PCRE support
-	"${FILESDIR}/${P}-pcre-fix.patch"
-
-	# Fixes underlinking, bug #405337
-	"${FILESDIR}/${P}-fix-underlinking.patch"
-
-	# Fixes a segfault in the GTK+2 interface on amd64, bug #262504#c40
-	"${FILESDIR}/${P}-fix-gtkmulticol-segfault.patch"
-
-	# Fixed overflow, bug #450990
-	"${FILESDIR}/${P}-tl_selectr-overflow-fix.patch"
-)
-
-DOCS=( README CREDITS NEWS AUTHORS BUGS TODO MAILINGLIST wget-pavuk.HOWTO
-		ChangeLog wget-pavuk.HOWTO pavuk_authinfo.sample pavukrc.sample	)
-
-src_prepare() {
-	# Fixes a bug in Makefile.am that causes aclocal to fail
-	sed -i 's/^\(ACLOCAL_AMFLAGS[[:space:]]*=[[:space:]]*-I[[:space:]]*\)\$(top_srcdir)\//\1/' "${S}/Makefile.am" || die
-
-	# Fixes a bug in configure.in that breaks non-debug builds
-	sed -i 's/\([[:space:]]C\(PP\)*FLAGS=`\)/true; # \1/' "${S}/configure.in" || die
-
-	# Fix for building with ~dev-lang/spidermonkey-1.8.5
-	# sed -i 's/mozjs/mozjs185/g' "${S}/configure.in" || die
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local regex="auto"
-	use pcre && regex="pcre"
-
-	local myeconfargs=(
-			--enable-threads
-			--enable-socks
-			--enable-utf-8
-			--disable-js
-			"--with-regex=${regex}"
-			$(use_enable gtk)
-			$(use_enable gtk gtk2)
-			$(use_enable gtk gnome)
-			$(use_with gtk x)
-			$(use_enable debug debugging)
-			$(use_enable debug debug-build)
-			# $(use_enable debug debug-features)
-			$(use_enable ssl)
-			$(use_enable nls)
-			$(use_enable ipv6)
-			# $(use_enable javascript js)
-			$(use_enable profile profiling)
-	)
-
-	# JavaScript bindings: Broken!
-	# ============================
-	# Currently could pass configure phase with ~dev-lang/spidermonkey-1.8.5
-	# yet apparently incompatible with recent versions of spidermonkey
-
-	# if use javascript; then
-	# 	local jspkg='mozjs185'
-	# 	local jsinclude=$(pkg-config --cflags "$jspkg")
-	# 	local jslibs='/dev/null '$(pkg-config --libs-only-l "$jspkg")
-	# 	myeconfargs+=(
-	# 			"--with-js-include=${jsinclude}"
-	# 			"--with-js-libraries=${jslibs}"
-	# 			)
-	# fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	if use gtk; then
-		newicon src/pavuk_logo.xpm pavuk.xpm
-		domenu pavuk.desktop
-	fi
-
-	doman "${S}/doc/pavuk.1"
-
-	autotools-utils_src_install
-}

diff --git a/net-misc/yangcli-pro/Manifest b/net-misc/yangcli-pro/Manifest
deleted file mode 100644
index 6583a0cf981..00000000000
--- a/net-misc/yangcli-pro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yangcli-pro-16.10-8.deb8.amd64.deb 1406108 SHA256 4c69d5fd9c99272a8bb1074cdf3bc9de616866bb078546c214df86eefaa8bc10 SHA512 23db68a22d83a95638f1c155126118290fba38fd1bca524d29c75f227a14b15f20982c47b598c235b4e78e905090c17b242a27d59350cbcd9b4179da070d74c6 WHIRLPOOL a941936193e07f450a866692c5c153f9d67e309728fdf4a47bb27f2ce0a67d5069facb286e2af99700ff5920861aa3275a2b8ccbbf9b812b3e424ea41317b037

diff --git a/net-misc/yangcli-pro/metadata.xml b/net-misc/yangcli-pro/metadata.xml
deleted file mode 100644
index 5087760546f..00000000000
--- a/net-misc/yangcli-pro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@g.o</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-</pkgmetadata>

diff --git a/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild b/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
deleted file mode 100644
index e4181608fce..00000000000
--- a/net-misc/yangcli-pro/yangcli-pro-16.10_p8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit unpacker
-
-RESTRICT="bindist mirror strip"
-MY_PV=${PV/_p/-}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}
-
-DESCRIPTION="Network manager client that lets you test and manage NETCONF servers"
-HOMEPAGE="https://www.yumaworks.com/yangcli-pro/"
-SRC_URI="amd64? ( https://www.yumaworks.com/pub/${PN}/${MY_PV}/deb8/${MY_P}.deb8.amd64.deb )"
-
-LICENSE="yangcli-pro"
-SLOT="0"
-KEYWORDS="~amd64 -*"
-IUSE=""
-
-RDEPEND="net-libs/libssh2
-	 sys-libs/ncurses:5/5[tinfo]"
-
-src_install() {
-	dodoc usr/share/doc/yangcli-pro/changelog.gz
-	dodoc usr/share/doc/yumapro/*.pdf
-	dodoc usr/share/doc/yumapro/README
-	dobin usr/bin/yangcli-pro
-	dolib usr/lib/libyumapro_{ncx,mgr,ycli}.so{,.16.10}
-	doman usr/share/man/man1/yangcli-pro.1.gz
-	local my_module
-	for my_module in ietf/{RFC,DRAFT} netconfcentral yumaworks ; do
-		insinto /usr/share/yumapro/modules/${my_module}
-		doins usr/share/yumapro/modules/${my_module}/*.yang
-	done
-	insinto /etc/yumapro
-	doins etc/yumapro/yangcli-pro-sample.conf
-}

diff --git a/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild b/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild
deleted file mode 100644
index 5b793386850..00000000000
--- a/net-p2p/datacoin-hp/datacoin-hp-9999.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DB_VER="4.8"
-
-inherit bash-completion-r1 git-2 eutils db-use systemd user
-
-MyPV="${PV/_/-}"
-MyPN="${PN/-hp/d}"
-MyP="primecoin-${MyPV}"
-
-DESCRIPTION="High-performance version of datacoin (primecoin-hp fork)"
-HOMEPAGE="https://github.com/foo1inge/datacoin-hp"
-EGIT_REPO_URI="https://github.com/foo1inge/${PN}.git"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples upnp ipv6 examples logrotate hardened"
-
-RDEPEND="
-	dev-libs/boost[threads(+)]
-	dev-libs/openssl:0[-bindist]
-	upnp? (
-		net-libs/miniupnpc
-	)
-	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	<=dev-libs/leveldb-1.12.0[-snappy]
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
-	net-p2p/bitcoind
-"
-
-S="${WORKDIR}/${MyP}-linux/src"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-sys_leveldb.patch
-	rm -r src/leveldd
-
-	if has_version '>=dev-libs/boost-1.52'; then
-		sed -i 's/\(-l db_cxx\)/-l boost_chrono$(BOOST_LIB_SUFFIX) \1/' src/makefile.unix
-	fi
-}
-
-pkg_setup() {
-	local UG="${PN}"
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/datacoin "${UG}"
-}
-
-src_configure() {
-	OPTS=()
-
-	OPTS+=("DEBUGFLAGS=")
-	OPTS+=("CXXFLAGS=${CXXFLAGS}")
-	OPTS+=("LDFLAGS=${LDFLAGS}")
-
-	if use upnp; then
-		OPTS+=("USE_UPNP=1")
-	else
-		OPTS+=("USE_UPNP=")
-	fi
-
-	use ipv6 || OPTS+=("USE_IPV6=0")
-
-	use hardened || OPTS+=("PIE=1")
-
-	OPTS+=("USE_SYSTEM_LEVELDB=1")
-	OPTS+=("BDB_INCLUDE_PATH=$(db_includedir "${DB_VER}")")
-	OPTS+=("BDB_LIB_SUFFIX=-${DB_VER}")
-
-	cd src || die
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" ${MyPN}
-}
-
-#Tests are broken with and without our primecoin-sys_leveldb.patch.
-#When tests work, make sure to inherit toolchain-funcs
-#src_test() {
-#   cd src || die
-#   emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" -f makefile.unix "${OPTS[@]}" test_primecoin
-#   ./test_primecoin || die 'Tests failed'
-#}
-
-src_install() {
-	dobin src/${MyPN}
-
-	insinto /etc/datacoin
-	doins "${FILESDIR}/datacoin.conf"
-	fowners ${PN}:${PN} /etc/datacoin/datacoin.conf
-	fperms 600 /etc/datacoin/datacoin.conf
-
-	newconfd "${FILESDIR}/datacoin.confd" ${PN}
-	newinitd "${FILESDIR}/datacoin.initd" ${PN}
-	systemd_dounit "${FILESDIR}/datacoin.service"
-
-	keepdir /var/lib/datacoin/.datacoin
-	fperms 700 /var/lib/datacoin
-	fowners ${PN}:${PN} /var/lib/datacoin/
-	fowners ${PN}:${PN} /var/lib/datacoin/.datacoin
-	dosym /etc/datacoin/datacoin.conf /var/lib/datacoin/.datacoin/datacoin.conf
-
-	dodoc doc/README.md doc/release-notes.md
-	newman contrib/debian/manpages/bitcoind.1 ${MyPN}.1
-	newman contrib/debian/manpages/bitcoin.conf.5 datacoin.conf.5
-
-	sed -i -e 's/bitcoin/datacoin-hp/g' contrib/bitcoind.bash-completion
-	newbashcomp contrib/bitcoind.bash-completion ${PN}.bash-completion
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,spendfrom,tidy_datadir.sh,wallettools}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/datacoind.logrotate" ${MyPN}
-	fi
-}

diff --git a/net-p2p/datacoin-hp/files/datacoin-hp-sys_leveldb.patch b/net-p2p/datacoin-hp/files/datacoin-hp-sys_leveldb.patch
deleted file mode 100644
index 2f85d6a1199..00000000000
--- a/net-p2p/datacoin-hp/files/datacoin-hp-sys_leveldb.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff --git a/datacoin-qt.pro b/datacoin-qt.pro
-index f531607..df0ecc4 100644
---- a/datacoin-qt.pro
-+++ b/datacoin-qt.pro
-@@ -4,7 +4,7 @@ macx:TARGET = "Datacoin-Qt"
- VERSION = 0.8.3
- INCLUDEPATH += src src/json src/qt
- QT += network
--DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
-+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV
- CONFIG += no_include_pwd
- CONFIG += thread
- 
-@@ -104,25 +104,29 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) {
-     QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
- }
- 
-+contains(USE_SYSTEM_LEVELDB, 1) {
-+    LIBS += -lleveldb
-+} else {
- INCLUDEPATH += src/leveldb/include src/leveldb/helpers
--LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
-+LIBS += $$PWD/src/leveldb/libleveldb.a
- !win32 {
-     # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
--    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
-+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a
- } else {
-     # make an educated guess about what the ranlib command is called
-     isEmpty(QMAKE_RANLIB) {
-         QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
-     }
-     LIBS += -lshlwapi
--    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
-+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a
- }
- genleveldb.target = $$PWD/src/leveldb/libleveldb.a
- genleveldb.depends = FORCE
- PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
- QMAKE_EXTRA_TARGETS += genleveldb
-+}
- # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
--QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
-+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true
- 
- # regenerate src/build.h
- !win32|contains(USE_BUILD_INFO, 1) {
-diff --git a/src/leveldb.cpp b/src/leveldb.cpp
-index e66f851..2856d70 100644
---- a/src/leveldb.cpp
-+++ b/src/leveldb.cpp
-@@ -8,7 +8,9 @@
- #include <leveldb/env.h>
- #include <leveldb/cache.h>
- #include <leveldb/filter_policy.h>
--#include <memenv/memenv.h>
-+#ifndef LEVELDB_WITHOUT_MEMENV
-+#include <memenv.h>
-+#endif
- 
- #include <boost/filesystem.hpp>
- 
-@@ -43,8 +45,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool
-     options = GetOptions(nCacheSize);
-     options.create_if_missing = true;
-     if (fMemory) {
-+#ifndef LEVELDB_WITHOUT_MEMENV
-         penv = leveldb::NewMemEnv(leveldb::Env::Default());
-         options.env = penv;
-+#else
-+	throw std::runtime_error("CLevelDB(): compiled without memenv support");
-+#endif
-     } else {
-         if (fWipe) {
-             printf("Wiping LevelDB in %s\n", path.string().c_str());
-diff --git a/src/makefile.unix b/src/makefile.unix
-index 359ac3d..ec1e075 100644
---- a/src/makefile.unix
-+++ b/src/makefile.unix
-@@ -120,8 +120,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para
- # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work.
- xLDFLAGS=$(LDHARDENING) $(LDFLAGS)
- 
--OBJS= \
--    leveldb/libleveldb.a \
-+BASEOBJS := \
-     obj/alert.o \
-     obj/version.o \
-     obj/checkpoints.o \
-@@ -130,7 +129,6 @@ OBJS= \
-     obj/crypter.o \
-     obj/key.o \
-     obj/db.o \
--    obj/init.o \
-     obj/keystore.o \
-     obj/main.o \
-     obj/net.o \
-@@ -150,25 +148,44 @@ OBJS= \
-     obj/hash.o \
-     obj/bloom.o \
-     obj/noui.o \
--    obj/leveldb.o \
-     obj/txdb.o \
-     obj/prime.o \
-     obj/checkpointsync.o
- 
-+OBJS := \
-+    obj/leveldb.o \
-+    obj/init.o \
-+    $(BASEOBJS)
-+
-+TESTOBJS := \
-+    obj-test/leveldb.o \
-+    $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \
-+    $(BASEOBJS)
-+
- all: datacoind
- 
- test check: test_primecoin FORCE
- 	./test_primecoin
- 
-+ifdef USE_SYSTEM_LEVELDB
-+    LIBS += -lleveldb
-+    TESTLIBS += -lmemenv
-+else
- #
- # LevelDB support
- #
- MAKEOVERRIDES =
--LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a
-+LIBS += $(CURDIR)/leveldb/libleveldb.a
-+TESTLIBS += $(CURDIR)/leveldb/libmemenv.a
- DEFS += $(addprefix -I,$(CURDIR)/leveldb/include)
- DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers)
- leveldb/libleveldb.a:
--	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd ..
-+	@echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd ..
-+leveldb/libmemenv.a:
-+	@echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd ..
-+OBJS += leveldb/libleveldb.a
-+TESTOBJS += leveldb/libmemenv.a
-+endif
- 
- # auto-generated dependencies:
- -include obj/*.P
-@@ -179,24 +196,22 @@ obj/build.h: FORCE
- version.cpp: obj/build.h
- DEFS += -DHAVE_BUILD_INFO
- 
--obj/%.o: %.cpp
--	$(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
-+P_TO_D = \
- 	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
--	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-+	    sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- 	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
- 	  rm -f $(@:%.o=%.d)
- 
--datacoind: $(OBJS:obj/%=obj/%)
--	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
-+obj/%.o: %.cpp
-+	$(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
-+	$(P_TO_D)
- 
--TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
-+datacoind: $(OBJS)
-+	$(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
- 
- obj-test/%.o: test/%.cpp
--	$(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
--	@cp $(@:%.o=%.d) $(@:%.o=%.P); \
--	  sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
--	      -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
--	  rm -f $(@:%.o=%.d)
-+	$(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $<
-+	$(P_TO_D)
- 
- test_primecoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
- 	$(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS)

diff --git a/net-p2p/datacoin-hp/files/datacoin.conf b/net-p2p/datacoin-hp/files/datacoin.conf
deleted file mode 100644
index 65c9767ea57..00000000000
--- a/net-p2p/datacoin-hp/files/datacoin.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# see https://en.bitcoin.it/wiki/Running_Bitcoin#Bitcoin.conf_Configuration_File
-#
-
-#rpcuser=
-#rpcpassword=

diff --git a/net-p2p/datacoin-hp/files/datacoin.confd b/net-p2p/datacoin-hp/files/datacoin.confd
deleted file mode 100644
index 95939b8b19a..00000000000
--- a/net-p2p/datacoin-hp/files/datacoin.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/datacoind
-
-# owner of datacoind process (don't change, must be existing)
-DATACOIN_USER="datacoin-hp"
-
-DATACOIN_OPTS="${DATACOIN_OPTS}"
-
-# nice level
-NICELEVEL="19"

diff --git a/net-p2p/datacoin-hp/files/datacoin.initd b/net-p2p/datacoin-hp/files/datacoin.initd
deleted file mode 100644
index 1c380b7d12e..00000000000
--- a/net-p2p/datacoin-hp/files/datacoin.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-vardir="/var/lib/datacoin"
-conffile="${vardir}/.datacoin/datacoin.conf"
-datacoind_user="${DATACOIN_USER:-nobody:nobody}"
-
-description="Bitcoin crypto-currency wallet for automated services"
-pidfile="/run/${SVCNAME}.pid"
-command="/usr/bin/datacoind"
-command_args="${DATACOIN_OPTS}"
-command_background="true"
-start_stop_daemon_args="-u ${datacoind_user} -e HOME=${vardir} -N ${NICELEVEL:-0} -w 2000"
-
-depend() {
-	need net
-}
-
-start_pre() {
-	checkpath -f -o ${datacoind_user} -m 0400 ${conffile} || return 1
-
-	if ! grep -q '^rpcpassword=' "${conffile}"; then
-		eerror "Please edit `readlink -f ${conffile}`"
-		eerror "There must be at least a line assigning rpcpassword=something-secure"
-		return 1
-	fi
-}

diff --git a/net-p2p/datacoin-hp/files/datacoin.service b/net-p2p/datacoin-hp/files/datacoin.service
deleted file mode 100644
index e0cb83190a1..00000000000
--- a/net-p2p/datacoin-hp/files/datacoin.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades. If you want to customize, the
-# best way is to create file
-# "/etc/systemd/system/datacoind.service.d/*.conf"
-# containing your changes
-
-# For example, if you want to change some daemon and/or unit options,
-# create a file named
-# "/etc/systemd/system/datacoind.service.d/myopts.conf"
-# containing:
-#       [Service]
-#       Environment="DATACOIN_OPTS=-debug -logtimestamps"
-#       Nice=10
-# This will override the setting appearing below.
-
-# Note that almost all daemon options could be specified in
-# /etc/primecoin/datacoin.conf
-
-[Unit]
-Description=Datacoin Daemon
-After=network.target
-
-[Service]
-User=datacoin
-Environment=DATACOIN_OPTS=
-ExecStart=/usr/bin/datacoind -daemon=0 $DATACOIN_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target

diff --git a/net-p2p/datacoin-hp/files/datacoind.logrotate b/net-p2p/datacoin-hp/files/datacoind.logrotate
deleted file mode 100644
index 910bafe7de1..00000000000
--- a/net-p2p/datacoin-hp/files/datacoind.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/lib/datacoin/.datacoin/debug.log {
-	weekly
-	sharedscripts
-	postrotate
-		killall -HUP datacoind
-	endscript
-}

diff --git a/net-p2p/datacoin-hp/metadata.xml b/net-p2p/datacoin-hp/metadata.xml
deleted file mode 100644
index e7b68251ecf..00000000000
--- a/net-p2p/datacoin-hp/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>email@×××××××××××××××××.com</email>
-		<name>Fernando V.</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@g.o</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">foo1inge/datacoin-hp</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
deleted file mode 100644
index aa1e8d780cf..00000000000
--- a/net-p2p/tribler/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tribler-swift_6.3.3_amd64.deb 3056230 BLAKE2B 30e568dc4ce7862a90720e1e9f6c37d6e5cc0f693db8dd777a8016311093104ea9bcba2e75d4dbe5465fd7bdb5027cbb358303f5d6b630991bbea9870ee31b74 SHA512 590542a94981bcaf289955019b2c51d9e71bf915176a11f0dd8e8f68548137f8c503f9a08a0edee31116373e654cf4cc06b2a2d10d32ce4d12a24980ca6692aa
-DIST tribler-swift_6.3.3_i386.deb 3073730 BLAKE2B 4935636bab10a6447a195ceb18db495123d8a272a7f70ef8dbb735e3668c9387cdbf5534fe64372da77e80987e2162d34007201a2a7f64d438a39306735275b3 SHA512 980481e694d1977b81ec5cd5e15f4adb971b87ea20b206c101fd80e045d9a48798d647d3a41d2ae23045805da55934ee77dfcb6f50f42ac1981a4c8ee39d20cb
-DIST tribler_6.3.3_all.deb 1997346 BLAKE2B 1b4a4189f10bbfbc0cf79c607c5fe7a501eab64b6d6b3e3252d1f552d119888f67ff413f7f0bbbd017c7a4759d55c3354f6e1956a479896431466b60be549c74 SHA512 afea5ef80c8dbc8da003997c8070116adf34334aceab91e258dfdddcfd7375238fc933866c655475ebdf347ac8ef4635716ec4ba1ad6bff6f638e804a4bbbf12

diff --git a/net-p2p/tribler/files/tribler-6.2.0-fix-desktop.patch b/net-p2p/tribler/files/tribler-6.2.0-fix-desktop.patch
deleted file mode 100644
index 23689bf2fb4..00000000000
--- a/net-p2p/tribler/files/tribler-6.2.0-fix-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur usr.orig/share/applications/tribler.desktop usr/share/applications/tribler.desktop
---- usr.orig/share/applications/tribler.desktop	2013-05-09 20:47:46.000000000 -0400
-+++ usr/share/applications/tribler.desktop	2013-05-09 20:49:03.000000000 -0400
-@@ -5,5 +5,5 @@
- Icon=tribler
- Terminal=false
- Type=Application
--Categories=Application;Network;P2P
--MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet
-\ No newline at end of file
-+Categories=Network;P2P;
-+MimeType=x-scheme-handler/ppsp;x-scheme-handler/tswift;x-scheme-handler/magnet;

diff --git a/net-p2p/tribler/files/tribler-log2homedir.patch b/net-p2p/tribler/files/tribler-log2homedir.patch
deleted file mode 100644
index 2f86c95ccf1..00000000000
--- a/net-p2p/tribler/files/tribler-log2homedir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur usr.orig/bin/tribler usr/bin/tribler
---- usr.orig/bin/tribler	2012-02-07 10:33:48.000000000 -0500
-+++ usr/bin/tribler	2012-02-11 12:19:05.000000000 -0500
-@@ -6,5 +6,7 @@
- export PYTHONPATH="$PYTHONPATH":$_TRIBLERPATH
- 
- echo "Starting Tribler..."
-+STATEDIR="$HOME/.Tribler"
-+[ ! -d $STATEDIR ] && mkdir -p $STATEDIR
- cd $_TRIBLERPATH
--exec python -O Tribler/Main/tribler.py "$@" > /tmp/$USER-tribler.log 2>&1
-+exec python2 -O Tribler/Main/tribler.py "$@" > $STATEDIR/tribler.log 2>&1

diff --git a/net-p2p/tribler/metadata.xml b/net-p2p/tribler/metadata.xml
deleted file mode 100644
index cb12e1147ab..00000000000
--- a/net-p2p/tribler/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		Python based bittorrent client that does not require an external
-		website or indexing service to discover content.
-	</longdescription>
-	<use>
-		<flag name="vlc">Enable vlc support.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Tribler/tribler</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/net-p2p/tribler/tribler-6.3.3-r1.ebuild b/net-p2p/tribler/tribler-6.3.3-r1.ebuild
deleted file mode 100644
index 930e4c6da40..00000000000
--- a/net-p2p/tribler/tribler-6.3.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils unpacker
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="
-	https://github.com/Tribler/tribler/releases/download/v${PV}/tribler_${PV}_all.deb
-	x86?   ( https://github.com/Tribler/tribler/releases/download/v${PV}/tribler-swift_${PV}_i386.deb )
-	amd64? ( https://github.com/Tribler/tribler/releases/download/v${PV}/tribler-swift_${PV}_amd64.deb )"
-
-LICENSE="GPL-2 LGPL-2.1+ PSF-2.4 openssl wxWinLL-3.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vlc"
-
-RDEPEND="
-	dev-lang/python:2.7[sqlite]
-	dev-python/apsw
-	dev-python/feedparser
-	dev-python/gmpy
-	dev-python/m2crypto
-	dev-python/netifaces
-	dev-python/pyasn1
-	dev-python/pycrypto
-	dev-python/twisted-core
-	dev-python/wxpython
-	dev-libs/openssl:0[-bindist]
-	net-libs/libtorrent-rasterbar[python]
-	vlc? (
-			media-video/vlc
-			media-video/ffmpeg:0
-		)"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/lib/tribler/swift"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-log2homedir.patch"
-	epatch "${FILESDIR}/${PN}-6.2.0-fix-desktop.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
-	#Remove the licenses scattered throughout
-	rm usr/share/doc/${PN}-swift/copyright	# LGPL-2.1+
-	rm usr/share/doc/${PN}/copyright	# LGPL-2.1+
-	rm usr/share/${PN}/Tribler/binary-LICENSE-postfix.txt # GPL-2 LGPL-2.1+ PSF-2.4 openssl wxWinLL-3.1
-
-	#Rename the doc dir properly
-	mv usr/share/doc/${PN}-swift usr/share/doc/${PN}
-	mv usr/share/doc/${PN} usr/share/doc/${P}
-
-	#Move the readme to the doc dir
-	mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
-	#Copy the rest over
-	cp -pPR usr/ "${ED}"/
-}

diff --git a/net-proxy/httpush/Manifest b/net-proxy/httpush/Manifest
deleted file mode 100644
index bf91362daef..00000000000
--- a/net-proxy/httpush/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST httpush-0.9b11.tar.gz 39342 BLAKE2B 668f7578e7b58af9c39c68ae94f372035363e6d22cf0a70463f2a382cb79ed679b6b5a79fd504db3ec0351c18db227c5ac5e0535e758735795e12622dbad79a2 SHA512 28f5843de8aaab2f1b1b89afb79cc15b134184781db7926dab3096359bb03db7dc8252a4eb0e89c61412692b8d2a5d6bf683e005862bc553fec754b0d48ac372

diff --git a/net-proxy/httpush/httpush-0.9_beta11-r1.ebuild b/net-proxy/httpush/httpush-0.9_beta11-r1.ebuild
deleted file mode 100644
index 6e9deaa142f..00000000000
--- a/net-proxy/httpush/httpush-0.9_beta11-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-MY_P="${P/_beta/b}"
-
-DESCRIPTION="Intercepting proxy, allowing user to modify HTTP requests on-the-fly"
-HOMEPAGE="http://httpush.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="xml"
-
-RDEPEND="dev-perl/URI
-	virtual/perl-MIME-Base64
-	dev-perl/libwww-perl
-	dev-perl/Net-SSLeay
-	dev-perl/Crypt-SSLeay
-	dev-perl/HTML-Parser
-	xml? ( dev-perl/XML-Twig )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use xml ; then
-		echo
-		einfo "If you'd like to use httpush's learning mode, please CTRL-C now"
-		einfo "and enable the xml USE flag."
-		epause 3
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's:^\(require httpush;\)$:push @INC, "/usr/lib/httpush";\n\1:' \
-		httpush.pl || die "sed INC failed"
-	sed -i 's:^\(.*DATADIR="\)data\(.*\)$:\1/var/lib/httpush\2:' *.pl \
-		lib/plugin/broker.pm || die "sed DATADIR= failed"
-}
-
-src_install() {
-	keepdir /var/lib/httpush
-
-	insinto /usr/lib/httpush
-	doins -r httpush.{dtd,lck,pem,pm} lib
-
-	insinto /usr/share/httpush/plugins
-	doins plugins/*
-
-	newbin httpush.pl httpush
-	newbin reindex.pl httpush-reindex
-	ewarn "reindex script has been renamed httpush-reindex"
-
-	dodoc README ChangeLog doc/*
-}

diff --git a/net-proxy/httpush/metadata.xml b/net-proxy/httpush/metadata.xml
deleted file mode 100644
index 3b217639af0..00000000000
--- a/net-proxy/httpush/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>HTTPush aims at providing an easy way to audit HTTP and HTTPS application/server security. It supports on-the-fly request modification, automated decision making and vulnerability detection through the use of plugins.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">httpush</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 625096ab773..dd73b9b0dc1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -298,307 +298,17 @@ media-plugins/gst-plugins-mad:1.0
 # Removal in 30 days (21 Apr 2018). Bug 634028.
 <dev-db/postgresql-9.3
 
-# Kent Fredric <kentnl@g.o> (21 Mar 2018)
-# Not usable with versions of Bugzilla shipped by Gentoo since 2013,
-# Dead upstream. Use dev-perl/BZ-Client instead.
-# Removal in 30 days. Bug 651056
-dev-perl/WWW-Bugzilla
-
 # Michał Górny <mgorny@g.o> (20 Mar 2018)
 # Poorly tested version bump followed by a series of quick hacks
 # that do not make it any more working. Bug #651030.
 >=sys-devel/distcc-3.3
 
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Unresolved security issues (#606652), tests fail (#628622, #337249).
-# Removal in a month.
-net-dns/hesiod
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Depends on gstreamer:0.10 and many more dead libs (#629174), upstream dead
-# for ages (#634490). Removal in a month.
-games-arcade/monkey-bubble
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Fails to build (#629622, #614576, #627408). Removal in a month.
-app-shells/scsh-install-lib
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Upstream dead, not compatible with MariaDB (#629902). Removal in a month.
-dev-db/mysql-udf-infusion
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Doesn't build (#630252). Removal in a month.
-dev-python/visual
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Security vulnerable (#630954, #635548). Removal in a month. 
-media-sound/aacgain
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Security vulnerable (#631602). Removal in a month.
-net-proxy/httpush
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Security vulnerable (#631720), dead since 2008, uses doman with compressed
-# man pages (#619952). Removal in a month.
-mail-filter/p3scan
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Doesn't build (#634116), use games-action/dxx-rebirth instead. Removal in
-# a month.
-games-action/d2x-rebirth
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Fails at runtime (#634258). Removal in a month.
-net-irc/savirc
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Multiple vulnerabilities (#635598). Removal in a month.
-www-apps/b2evolution
- 
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Superseeded by adwaita-icon-theme for years, also having both installed at
-# the same time causes some apps to use old icons over new ones (#638142).
-# Removal in a month.
-x11-themes/gnome-icon-theme
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Completely dead and unmaintained for years, multiple alternatives in the
-# tree (#638812). Removal in a month.
-media-gfx/pornview
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Not installable (#639130), version bump long time pending (#489156),
-# restricts userpriv (#516578). Removal in a month.
-mail-filter/qmail-scanner
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Fail to fetch (#640544, #640596, #640602). Removal in a month.
-media-video/vcdgear
-net-misc/yangcli-pro
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Outdated and useless (#642158). Removal in a month.
-app-i18n/man-pages-ro
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Forces the usage of obsolete dev-python/mysql-python (#643502). Dead since
-# 2013. Removal in a month.
-app-backup/holland-lib-mysql
-app-backup/holland-backup-mysqldump
-app-backup/holland-backup-mysql-meta
-app-backup/holland-backup-mysql-lvm
-app-backup/holland-backup-mysqlhotcopy
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Requires old psycopg (#643614). Removal in a month.
-dev-python/adodb-py
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Requires old whoosh (#643690). Removal in a month.
-dev-python/flask-whooshalchemy
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Requires old leveldb, live ebuild, dead since 2013 (#644310). Removal in a
-# month.
-net-p2p/datacoin-hp
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Dead since 2011, relies on dead libraries (#644322, #644326, #644330, #644332
-# #644340, #647600, #647608, #647698, #647700, #648998). Removal in a month.
-dev-util/alleyoop
-gnome-extra/gnome-color-chooser
-media-sound/neutrino
-media-video/camorama
-www-misc/gurlchecker
-games-board/gnome-mastermind
-media-sound/quark
-app-office/gtimelog
-x11-libs/libdesktop-agnostic
-x11-misc/dockmanager
-games-arcade/monster-masher
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Tests fail, package has no reverse deps and is not really needed at
-# present time (#645166). Removal in a month.
-dev-python/jenkins-autojobs
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Dead since 2004, doesn't run (#645512). Removal in a month.
-media-video/cpdvd
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Relies on dead libs, upstream dead for ages, buggy (#647486). Removal in a
-# month.
-gnome-extra/gpointing-device-settings
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Relies on dead libraries, not really useful at present time, upstream is
-# dead for ages (#647598). Removal in a month.
-app-mobilephone/gnome-phone-manager
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Doesn't honor LINGUAS (#402681), no reverse deps, unmaintained, dead for a
-# long time (#647840). Removal in a month.
-app-editors/cooledit
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Dead for years, not really useful at present time (#647842). Removal in a
-# month.
-app-mobilephone/ringtonetools
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Not useful anymore without warsow (#648676). Removal in a month.
-games-fps/warsow-community-map-pack
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Library dead for years, finally nothing in the tree requires it anymore
-# (#648996). Removal in a month.
-dev-cpp/libgnomemm
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Dead for years (#650390), buggy (#504728). Removal in a month.
-www-apps/collectd-web
-
-# Pacho Ramos <pacho@g.o> (18 Mar 2018)
-# Dead for ages, ebuild needs to be cleaned and updated if you still need
-# this old themes (#650744). Removal in a month.
-media-gfx/qingy-themes
-
-# Lars Wendler <polynomial-c@g.o> (17 Mar 2018)
-# Dead upstream. Authors not reachable. Unclear license situation.
-# Masked for removal in 30 days. See bug #650746
-x11-themes/icewm-themes
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Not needed for a long time since fbsd kernel 10 (#586344). Removal in a
-# month.
-sys-freebsd/virtio-kmod
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Doesn't build (#591918, #587392). Removal in a month.
-games-fps/alephone
-games-fps/alephone-infinity
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Broken for a long time (#587806). Removal in a month.
-app-text/zemberek-server
-app-text/zpspell
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Hans de Graaff <graaff@g.o> (1 Jun 2014)
-# Mask new rubinius version for testing. This needs more work
-# to fully integrate it in our Gentoo ruby handling. Volunteers
-# welcome.
-# Removal in a month (#588102)
-dev-lang/rubinius
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Obsoleted by sys-cluster/drbd-utils many time ago (#590872). Removal in a
-# month.
-sys-cluster/drbd
-sys-cluster/drbd-kernel
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Not buildable for a long time (#592066), wrong license (#638454). Removal
-# in a month.
-media-plugins/vdr-graphtft
-x11-themes/vdrgraphtft-avp
-x11-themes/vdrgraphtft-deepblue
-x11-themes/vdrgraphtft-deeppurple
-x11-themes/vdrgraphtft-poetter
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Branch unmaintained for a long time (#593878). Migrate to dev-python/rtslib-fb
-# and sys-block/targetcli-fb. Removal in a month.
-dev-python/rtslib
-sys-block/targetcli
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Fails to build (#594190, #649224). Removal in a month.
-games-puzzle/ngstar
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Multiple build failures (#514348, #594908). Removal in a month.
-sys-fabric/mstflint
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Cannot reach upstream, fails at runtime (#594986). Removal in a month.
-dev-vcs/bzr-git
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Unable to bump, fails to build (#601208). Removal in a month.
-games-board/freedoko
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Version in the tree really old, multiple build failures (#604556, #604580,
-# #604586). Removal in a month.
-net-misc/pavuk
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Doesn't use pludev group properly (#396571), buggy (#503214), upstream
-# dead, fails to build (#608780). Removal in a month.
-app-misc/cwiid
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# ebuild needs fixing (#612998), our version is completely outdated
-# (#592836). Removal in a month.
-dev-util/bluej
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Many build issues (#576612, #605318, #605320, #608772, #613824), doesn't
-# use python eclasses (#615946). Removal in a month.
-media-gfx/k3d
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Not buildable (#616674). Removal in a month.
-app-laptop/powerprefs
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Security vulnerable (#619770). Removal in a month.
-dev-java/jad-bin
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Fails to build (#620276, #636000). Removal in a month.
-games-puzzle/shaaft
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Not buildable (#625668, #649378). Removal in a month.
-games-server/cyphesis
-
-# Pacho Ramos <pacho@g.o> (17 Mar 2018)
-# Not buildable (#627102, #630850). Removal in a month.
-dev-games/crystalspace
-
 # Georgy Yakovlev <ya@×××××××.net> (13 Mar 2018)
 # 1.x version is no longer maintained by upstream
 # 2.x is in the tree and is better in almost every way
 # Removal in 90 days. Bug #650464
 =net-dns/dnscrypt-proxy-1.9.5-r1
 
-# Pacho Ramos <pacho@g.o> (13 Mar 2018)
-# Major version bump pending (#540322), current version in the tree is
-# completely broken in several ways (#471428, #598260, #621784, #638364).
-# Removal in a month.
-sys-cluster/gearmand
-dev-php/pecl-gearman
-
-# Pacho Ramos <pacho@g.o> (13 Mar 2018)
-# Not buildable and ends up needing old guile-1.8 (#547186, #617802), major
-# version bump pending (#515888). Removal in a month.
-media-sound/denemo
-
-# Pacho Ramos <pacho@g.o> (13 Mar 2018)
-# Hard to bump (#547418), build issues (#600308). Removal in a month.
-app-forensics/rdd
-
-# Pacho Ramos <pacho@g.o> (13 Mar 2018)
-# Many pending version bumps (#574874), doesn't run (#587112), doesn't use
-# python eclasses (#613892), needs obsolete libs (#640888). Removal in a
-# month.
-net-p2p/tribler
-
 # Sebastian Pipping <sping@g.o> (11 Mar 2018)
 # Breaks XFCE, 1.19.6 was fine (in that regard). Bug #650228
 >=x11-base/xorg-server-1.19.7
@@ -621,18 +331,6 @@ sys-libs/uclibc
 net-libs/webkit-gtk:2
 net-libs/webkit-gtk:3
 
-# Steve Dibb <beandog@g.o> (22 Feb 2018)
-# Very old project of mine, hasn't worked in years, no plans to
-# support, and mpv can provide resume playback by default.
-# Masked for removal in 30 days. Bug #648568
-media-video/mplayer-resume
-
-# Steve Dibb <beandog@g.o> (22 Feb 2018)
-# Dead upstream, never really used, libdvdread and libdvdnav provide
-# DVD access.
-# Masked for removal in 30 days. Bug #648566
-media-libs/libdvdplay
-
 # Steve Dibb <beandog@g.o> (22 Feb 2018)
 # Dead upstream, long since replaced by libaacs for functionality.
 # Masked for removal in 30 days. Bug #648560

diff --git a/sys-block/targetcli/Manifest b/sys-block/targetcli/Manifest
deleted file mode 100644
index 28833e24af3..00000000000
--- a/sys-block/targetcli/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST targetcli-3.0_pre4.tar.gz 37299 BLAKE2B 9522e041e948203ae1cbce9959ee34b7f63180c6e678480f28a0291ea672b85dee8d72f95ed296a700b315a2b7a6f3d38b4a115d4967c61b5b2975c4dceb259a SHA512 42e74fe8f7d26ad5693d6cd527d44d77b23f793b33071466819bf29032b71a6ad22924350fc53c78ed93c15ef30abb46b42209c5f16fbf8ade0819d6e26b70f7

diff --git a/sys-block/targetcli/metadata.xml b/sys-block/targetcli/metadata.xml
deleted file mode 100644
index 71579dd6478..00000000000
--- a/sys-block/targetcli/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@g.o</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Datera/targetcli</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/sys-block/targetcli/targetcli-3.0_pre4.ebuild b/sys-block/targetcli/targetcli-3.0_pre4.ebuild
deleted file mode 100644
index f87c8e34daa..00000000000
--- a/sys-block/targetcli/targetcli-3.0_pre4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CLI and shell for the Linux SCSI target"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/configshell[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/urwid[${PYTHON_USEDEP}]"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		linux-info_get_any_version
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for SCSI target support"
-		else
-			CONFIG_CHECK="~TARGET_CORE"
-			check_extra_config
-		fi
-	fi
-}

diff --git a/sys-block/targetcli/targetcli-9999.ebuild b/sys-block/targetcli/targetcli-9999.ebuild
deleted file mode 100644
index f87c8e34daa..00000000000
--- a/sys-block/targetcli/targetcli-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 linux-info
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="CLI and shell for the Linux SCSI target"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/configshell[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/rtslib[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/urwid[${PYTHON_USEDEP}]"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		linux-info_get_any_version
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel for SCSI target support"
-		else
-			CONFIG_CHECK="~TARGET_CORE"
-			check_extra_config
-		fi
-	fi
-}

diff --git a/sys-cluster/drbd-kernel/Manifest b/sys-cluster/drbd-kernel/Manifest
deleted file mode 100644
index ae61f641bd0..00000000000
--- a/sys-cluster/drbd-kernel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST drbd-8.0.16.tar.gz 322758 BLAKE2B 472207843ac2f437a4fe1baeab84265e8bf871e12fba56f9957145a4d93d5a376e0637175d1810c3cf0c64eaf53161f5c33b24fc40d5a83f3147476aaedd19fe SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17
-DIST drbd-8.3.6.tar.gz 457469 BLAKE2B 4ddafea7e0523f85f3aa02d01a981e6b5056fd84204b6afff82f1eaaba5c9273cdb5639be423c555b3896e226454eb71dc098ac29c34a9dab0b6a9532133cfcb SHA512 0e817d514b60891c70532511b99d7cddf24e3fa261b605bc920ad7ab2d4530682f84b78eb0a2ed9c25a8458a43496e8de61addade63b8f6e252a36b6b1d50cef
-DIST drbd-8.3.8.1.tar.gz 482582 BLAKE2B 5967de376fed1085ffda4dadd8a6ddd8407cae07d54e9963d459cd7c387eaae4757c790fd33c887e03fc5f2e5cabc52490ec989fd2bb58eac32609135edfe1a4 SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f

diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
deleted file mode 100644
index c7940d8f75a..00000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PN="${PN/-kernel/}"
-MY_P="${MY_PN}-${PV}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-8.0.x needs kernel 2.6.x ."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KERNEL_DIR} O=${KBUILD_OUTPUT}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-8.0.0-scripts.adjust_drbd_config_h.sh.patch || die
-	epatch "${FILESDIR}"/${MY_P}-kernel-2.6.30-compile-fix.patch || die
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	einfo ""
-}

diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
deleted file mode 100644
index a204c0f4fc5..00000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-
-MY_PN="${PN/-kernel/}"
-MY_P="${MY_PN}-${PV}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-2.6.32.patch
-}
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd when you upgrade your kernel!"
-	einfo ""
-}

diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
deleted file mode 100644
index 8c2a7bc6cdb..00000000000
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator linux-mod
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PN=${PN/-kernel/}
-MY_P=${MY_PN}-${PV}
-MY_MAJ_PV=$(get_version_component_range 1-2 ${PV})
-
-HOMEPAGE="http://www.drbd.org"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-DEPEND="virtual/linux-sources"
-RDEPEND=""
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if ! kernel_is -ge 2 6; then
-		die "Unsupported kernel, drbd-${PV} needs kernel 2.6.x ."
-	elif [ ${KV_PATCH} -ge 33 ]; then
-		ewarn "Your kernel (${KV_FULL}) is too new to use this package."
-		ewarn "The DRBD module has been merged into kernel >= 2.6.33."
-		ewarn "Please compile the DRBD module from your current kernel."
-		die "${PN} is obsolete with kernel >= 2.6.33."
-	fi
-
-	MODULE_NAMES="drbd(block:${S}/drbd)"
-	BUILD_TARGETS="default"
-	CONFIG_CHECK="CONNECTOR"
-	CONNECTOR_ERROR="You must enable \"CONNECTOR - unified userspace <-> kernelspace linker\" in your kernel configuration, because drbd needs it."
-	linux-mod_pkg_setup
-	BUILD_PARAMS="-j1 KDIR=${KV_DIR} O=${KV_OUT_DIR}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	einfo ""
-	einfo "Please remember to re-emerge drbd-kernel when you upgrade your kernel!"
-	einfo ""
-}

diff --git a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch b/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
deleted file mode 100644
index c7b4f814077..00000000000
--- a/sys-cluster/drbd-kernel/files/drbd-8.0.16-kernel-2.6.30-compile-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- drbd-8.0.16/drbd/drbd_main.c.orig	2009-08-04 17:55:52.000000000 +0300
-+++ drbd-8.0.16/drbd/drbd_main.c	2009-08-04 17:56:35.000000000 +0300
-@@ -2770,7 +2770,9 @@
- 	}
- 
- 	drbd_proc->proc_fops = &drbd_proc_fops;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
- 	drbd_proc->owner = THIS_MODULE;
-+#endif
- #else
- # error "Currently drbd depends on the proc file system (CONFIG_PROC_FS)"
- #endif

diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch
deleted file mode 100644
index beb07fbdaeb..00000000000
--- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.0.0-scripts.adjust_drbd_config_h.sh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- drbd-8.0.0/scripts/adjust_drbd_config_h.sh.orig	2007-02-05 01:20:58.000000000 +0100
-+++ drbd-8.0.0/scripts/adjust_drbd_config_h.sh	2007-02-05 01:21:28.000000000 +0100
-@@ -26,19 +26,7 @@
- pushd $KDIR
- 
- KDIR=${KDIR%/}
--if test -z "$O"; then
--	## just in case...
--	## detect if $KDIR points to something which is actually $O ...
--	X=$( make help | sed -ne '/ -C .* O=.* help$/p' | tr -s ' ' )
--	if [[ -n $X ]]; then
--		KDIR=${X##* -C }; KDIR=${KDIR%% *}; KDIR=$(cd $KDIR && pwd)
--		O=${X##* O=}; O=${O%% *}; O=$(cd $KDIR && cd $O && pwd)
--	else
--		O=$KDIR;
--	fi
--else
--	O=${O%/}
--fi
-+O=$KDIR;
- 
- # some paranoia: check that all files are where we expect them
- ls > /dev/null \

diff --git a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch b/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
deleted file mode 100644
index 893f9c2e21f..00000000000
--- a/sys-cluster/drbd-kernel/files/drbd-kernel-8.3.6-linux-2.6.32.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- drbd-8.3.6/drbd/drbd_req.c
-+++ drbd-8.3.6/drbd/drbd_req.c
-@@ -55,13 +55,21 @@
- 	__disk_stat_inc(mdev->vdisk, ios[rw]);
- 	__disk_stat_add(mdev->vdisk, sectors[rw], bio_sectors(bio));
- 	disk_round_stats(mdev->vdisk);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->in_flight[rw]++;
-+#else
-	mdev->vdisk->in_flight++;
-+#endif
- #else
- 	cpu = part_stat_lock();
- 	part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
- 	part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
- 	part_stat_unlock();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->part0.in_flight[rw]++;
-+#else
-	mdev->vdisk->part0.in_flight++;
-+#endif
- #endif
- }
- 
-@@ -77,13 +85,21 @@
- #ifdef __disk_stat_add
- 	__disk_stat_add(mdev->vdisk, ticks[rw], duration);
- 	disk_round_stats(mdev->vdisk);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->in_flight[rw]--;
-+#else
- 	mdev->vdisk->in_flight--;
-+#endif
- #else
- 	cpu = part_stat_lock();
- 	part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
- 	part_round_stats(cpu, &mdev->vdisk->part0);
- 	part_stat_unlock();
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
-+	mdev->vdisk->part0.in_flight[rw]--;
-+#else
- 	mdev->vdisk->part0.in_flight--;
-+#endif
- #endif
- }
- 

diff --git a/sys-cluster/drbd-kernel/metadata.xml b/sys-cluster/drbd-kernel/metadata.xml
deleted file mode 100644
index 4a09d7ba8d6..00000000000
--- a/sys-cluster/drbd-kernel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@g.o</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/sys-cluster/drbd/Manifest b/sys-cluster/drbd/Manifest
deleted file mode 100644
index fcc58cf25df..00000000000
--- a/sys-cluster/drbd/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-DIST drbd-8.0.16.tar.gz 322758 BLAKE2B 472207843ac2f437a4fe1baeab84265e8bf871e12fba56f9957145a4d93d5a376e0637175d1810c3cf0c64eaf53161f5c33b24fc40d5a83f3147476aaedd19fe SHA512 1b325e3789032656a1f7286b51ac9e90f709c53f8ff35c10ca9bb2e27b1cf822813485e0a49d55c62e7966bc975040b42a6d0ac8fa066a16afa2605e9df87a17
-DIST drbd-8.3.10.tar.gz 521798 BLAKE2B 2d8228e9b24489f36077369f4a964ffdad0f84be0c7c69b4c2726542efd00e65b5e595a2c3aff1f174ade6f4e90221ff50a6922f0313726fe952201657c1b474 SHA512 8d904ada9c80732b47cbf149cf4172658d350856d8688f1dce92c16ce1c4e946a0b3b3a14bb3c9361684fc08b257207c58beaa2fdb534f2abf47ac45aa659389
-DIST drbd-8.3.11.tar.gz 526056 BLAKE2B 2f86dadfce93455648e947036a8c8ec0e5bff8e1d055dd62c1d9a113e2f92696588ac28056edfab967be6890dcb36d829b10669b79fc392e3c0b180bd84a7230 SHA512 2bbf16d69e897adcb247d451f1d844993bdb3ad201027a588f9a45b4fe43fa2f6e98ed6063e8dccc92b9a231ccebf0af85a8671e5672fa710aa986e555ae896d
-DIST drbd-8.3.12.tar.gz 530923 BLAKE2B 81287f6cde7ae1173beec721589b764f698693df215cca462178943404723522fef1492dc49aa66fb3576c6be800e48618f6c19caaa08732590d26459b0ffb6d SHA512 512e68adb9cda1f246c6c35b35e449d514deeb32adb998cbe0249c9245772d1979cbdc906c479500ba4e63a2a7ae675f527407262f235b897c4142bdcfa65b7e
-DIST drbd-8.3.13.tar.gz 541477 BLAKE2B 580aa323de82278f3b1bdaa140796f33565cda52c34b6463b1538d5c921548aec7c044c596171718cc4997f6aefeed0a2faeb90c15feba716d2c5bc9832e31c9 SHA512 fff72545ae569dad37d202bd7dcb075e443964e4d2e95ae124bbcac098762bee78f91e4863b56abfca2bdce2baa42bb3fdbdf9bb489f498d84aa679fa43ae702
-DIST drbd-8.3.15.tar.gz 550130 BLAKE2B d72959920c3fc29cbcccf0d8ddb1b3baf4b2612633cee9e419080716f9a0c3381e88088046423a6ab46005f7a8f9890a8bef04aeda3ead5c346e8a0b7b231d53 SHA512 ca78cddbbb614e90d63cdb3b5ec64ecc6b9c0730aced4348d1464edb5fe9b0f2c0e75fccc2c7cbe18daea454482cf46c847b55fb23e00f364b4f32ae0a3d8dca
-DIST drbd-8.3.7.tar.gz 462659 BLAKE2B 8f513726c8328ad8da4ad601646e791beef3a083c81ec7dd36d583851d234f8da7bae3eab44a93df25143843a0f13cfd32d94037e8f225ab5f6e3d7f7ed64183 SHA512 9ea576ed6a75d80009ade0f9540535b2a65ecee6d38b1a85fa3146a97aac8cb3add31154e2921630aa75121c7115d66bdcf45adb8e0fa481bdb27c011b1c9b15
-DIST drbd-8.3.8.1.tar.gz 482582 BLAKE2B 5967de376fed1085ffda4dadd8a6ddd8407cae07d54e9963d459cd7c387eaae4757c790fd33c887e03fc5f2e5cabc52490ec989fd2bb58eac32609135edfe1a4 SHA512 c43c6d065328058db66f708d47ce082603b766deb1530c57aa736a42b4908f780ede41f76395ca45c2691ef1dfd142147a4c98a7bcdb26ba7de73b149d8f9f5f
-DIST drbd-8.4.0.tar.gz 650733 BLAKE2B 4f8387f0c52fb490df8cae6cc7c2351a6aedf78438522828bc7db71d9387132181b141adb28a5c80cde3916107cc9ee8dbe62c8e79d7306a28a7f6011e9f810b SHA512 4e89f0941aa136f69dcf76efb47df14ac5a210f37159eb7abaea8cea5af801632d204de8a4e3374ee5522d3227f3163bc5c6931122a4bf6827463536b532d7a2
-DIST drbd-8.4.2.tar.gz 675803 BLAKE2B 2d6bf1432b393e20c772418d493f8679f6e9ea2869e3082c3a35b3f4b33645fc2393d10720677c7f3171f8457e0d7789e67c863d802a6864713c44b21baa640e SHA512 c32371e1fb89b479bf5136ee1c00d8e07dd15769654977dfcde71fcc24264c1dae2feda82e8f61b4caf57b9ac88e2861ee7270aa8c867f6245b52d65c45ada46
-DIST drbd-8.4.3.tar.gz 688328 BLAKE2B 1b524fc1e9c37da9d70acd617f48a8ff68fe652db78572955dc41932ddbb9b47a285597c14ef4f218b17e052802f61aaccafd5ffce32d3f6aef4657546ded0cc SHA512 cdc90bdd9491fe6d29e3b779d69ba2aac1aacdb336586f1ef414d0a0195d922dbefa8b2d9c4868a2476998a713c893403344a2934c7768ff6f4ba9f13bb7277a

diff --git a/sys-cluster/drbd/drbd-8.0.16.ebuild b/sys-cluster/drbd/drbd-8.0.16.ebuild
deleted file mode 100644
index bb60780de59..00000000000
--- a/sys-cluster/drbd/drbd-8.0.16.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-MY_PV="${PV/_/}"
-MY_MAJ_PV="$(get_version_component_range 1-2 ${PV})"
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/${MY_MAJ_PV}/${PN}-${MY_PV}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-PDEPEND="~sys-cluster/drbd-kernel-${PV}"
-
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
-	emake -j1 tools || die "compile problem"
-}
-
-src_install() {
-	emake PREFIX="${D}" install-tools || die "install problem"
-
-	# gentoo-ish init-script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# docs
-	dodoc README ChangeLog ROADMAP
-
-	# we put drbd.conf into docs
-	# it doesnt make sense to install a default conf in /etc
-	# put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "Please copy and gunzip the configuration file"
-	einfo "drbd.conf from /usr/share/doc/${PF} to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo ""
-}

diff --git a/sys-cluster/drbd/drbd-8.3.10.ebuild b/sys-cluster/drbd/drbd-8.3.10.ebuild
deleted file mode 100644
index 08e388dcc8d..00000000000
--- a/sys-cluster/drbd/drbd-8.3.10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	dodoc scripts/drbd.conf.example || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
deleted file mode 100644
index 1b8377d9d57..00000000000
--- a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
deleted file mode 100644
index 7a1ba7159d6..00000000000
--- a/sys-cluster/drbd/drbd-8.3.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.13.ebuild b/sys-cluster/drbd/drbd-8.3.13.ebuild
deleted file mode 100644
index 368253c78c5..00000000000
--- a/sys-cluster/drbd/drbd-8.3.13.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		-e "s:\$(sysconfdir)/udev:$(get_udevdir):g" \
-		-i scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.15.ebuild b/sys-cluster/drbd/drbd-8.3.15.ebuild
deleted file mode 100644
index cf347bf1695..00000000000
--- a/sys-cluster/drbd/drbd-8.3.15.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.7.ebuild b/sys-cluster/drbd/drbd-8.3.7.ebuild
deleted file mode 100644
index b04226b05a8..00000000000
--- a/sys-cluster/drbd/drbd-8.3.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# it doesnt make sense to install a default conf in /etc,
-	# so we put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
deleted file mode 100644
index 2839e4ed603..00000000000
--- a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	epatch "${FILESDIR}"/${P}-implicits.patch
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	dodoc scripts/drbd.conf.example || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}

diff --git a/sys-cluster/drbd/drbd-8.3.8.1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1.ebuild
deleted file mode 100644
index 2006395ddef..00000000000
--- a/sys-cluster/drbd/drbd-8.3.8.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools || die
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools || die
-	dodoc README ChangeLog || die
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN} || die
-
-	# it doesnt make sense to install a default conf in /etc,
-	# so we put it to the docs
-	rm -f "${D}"/etc/drbd.conf
-	dodoc scripts/drbd.conf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file"
-	einfo "from /usr/share/doc/${PF}/drbd.conf.bz2 to /etc"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-	elog "Or alternatively emerge sys-cluster/drbd-kernel package."
-}

diff --git a/sys-cluster/drbd/drbd-8.4.0.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild
deleted file mode 100644
index 35f33e36c67..00000000000
--- a/sys-cluster/drbd/drbd-8.4.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.4.2.ebuild b/sys-cluster/drbd/drbd-8.4.2.ebuild
deleted file mode 100644
index ffe8ffe7c70..00000000000
--- a/sys-cluster/drbd/drbd-8.4.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="amd64 x86"
-IUSE="bash-completion heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	#epatch "${FILESDIR}/drbd-8.3.11-kernel3.patch"
-	# respect LDFLAGS
-	sed -i -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" user/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:/usr/share/bash-completion:" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		$(use_with bash-completion bashcompletion) \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
deleted file mode 100644
index b192e831b58..00000000000
--- a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1 eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild b/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
deleted file mode 100644
index 591e689314c..00000000000
--- a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 versionator udev
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=518774
-	"${FILESDIR}"/${P}-block-drbd.patch
-)
-
-src_prepare() {
-	default
-
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	einstalldocs
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	einfo "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/drbd-8.4.3.ebuild b/sys-cluster/drbd/drbd-8.4.3.ebuild
deleted file mode 100644
index b192e831b58..00000000000
--- a/sys-cluster/drbd/drbd-8.4.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1 eutils multilib versionator udev
-
-LICENSE="GPL-2"
-
-DESCRIPTION="mirror/replicate block-devices across a network-connection"
-SRC_URI="http://oss.linbit.com/drbd/$(get_version_component_range 1-2 ${PV})/${P}.tar.gz"
-HOMEPAGE="http://www.drbd.org"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="heartbeat pacemaker +udev xen"
-SLOT="0"
-
-src_prepare() {
-	# respect LDFLAGS, #453442
-	sed -e "s/\$(CC) -o/\$(CC) \$(LDFLAGS) -o/" \
-		-e "/\$(DESTDIR)\$(localstatedir)\/lock/d" \
-		-i user{,/legacy}/Makefile.in || die
-	# respect multilib
-	sed -i -e "s:/lib/:/$(get_libdir)/:g" \
-		Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die
-	sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \
-		-e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \
-		-i user/{,legacy/}Makefile.in || die
-	# correct install paths (really correct this time)
-	sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \
-		scripts/Makefile.in || die
-	# don't participate in user survey bug 360483
-	sed -i -e '/usage-count/ s/yes/no/' scripts/drbd.conf.example || die
-	sed -i -e "s:\$(sysconfdir)/udev:$(get_udevdir):" scripts/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		--with-utils \
-		--without-km \
-		--without-rgmanager \
-		$(use_with udev) \
-		$(use_with xen) \
-		$(use_with pacemaker) \
-		$(use_with heartbeat) \
-		--with-bashcompletion \
-		--with-distro=gentoo
-}
-
-src_compile() {
-	# only compile the tools
-	emake OPTFLAGS="${CFLAGS}" tools
-}
-
-src_install() {
-	# only install the tools
-	emake DESTDIR="${D}" install-tools
-	dodoc README ChangeLog
-
-	# install our own init script
-	newinitd "${FILESDIR}"/${PN}-8.0.rc ${PN}
-
-	dodoc scripts/drbd.conf.example
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Please copy and gunzip the configuration file:"
-	einfo "from /usr/share/doc/${PF}/${PN}.conf.example.bz2 to /etc/${PN}.conf"
-	einfo "and edit it to your needs. Helpful commands:"
-	einfo "man 5 drbd.conf"
-	einfo "man 8 drbdsetup"
-	einfo "man 8 drbdadm"
-	einfo "man 8 drbddisk"
-	einfo "man 8 drbdmeta"
-	einfo
-
-	elog "Remember to enable drbd support in kernel."
-}

diff --git a/sys-cluster/drbd/files/drbd-8.0.rc b/sys-cluster/drbd/files/drbd-8.0.rc
deleted file mode 100644
index 57f583bf94b..00000000000
--- a/sys-cluster/drbd/files/drbd-8.0.rc
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-depend() {
-	use logger
-	need net
-	before heartbeat
-	after sshd
-}
-
-DEFAULTFILE="/etc/conf.d/drbd"
-DRBDADM="/sbin/drbdadm"
-PROC_DRBD="/proc/drbd"
-MODPROBE="/sbin/modprobe"
-RMMOD="/sbin/rmmod"
-UDEV_TIMEOUT=10
-ADD_MOD_PARAM=""
-
-if [ -f $DEFAULTFILE ]; then
-  . $DEFAULTFILE
-fi
-
-# Just in case drbdadm want to display any errors in the configuration
-# file, or we need to ask the user about registering this installation
-# at http://usage.drbd.org, we call drbdadm here without any IO
-# redirection.
-$DRBDADM sh-nop
-
-assure_module_is_loaded() {
-	[ -e "$PROC_DRBD" ] && return
-	ebegin "Loading drbd module"
-	ret=0
-
-	$MODPROBE -s drbd `$DRBDADM sh-mod-parms` $ADD_MOD_PARAM || ret=20
-	eend $ret
-	return $ret
-}
-
-adjust_with_progress() {
-	IFS_O=$IFS
-	NEWLINE='
-'
-	IFS=$NEWLINE
-	local D=0
-	local S=0
-	local N=0
-
-	einfon "Setting drbd parameters "
-	COMMANDS=`$DRBDADM -d adjust all` || { 
-		eend 20 "Error executing drbdadm"
-		return 20 
-	}
-	echo -n "[ "
-	
-	for CMD in $COMMANDS; do
-		if echo $CMD | grep -q disk; then echo -n "d$D "; D=$(( D+1 ));
-		elif echo $CMD | grep -q syncer; then echo -n "s$S "; S=$(( S+1 ));
-		elif echo $CMD | grep -q net; then echo -n "n$N "; N=$(( N+1 ));
-		else echo echo -n ".. ";
-		fi
-		IFS=$IFS_O
-		eval $CMD || {
-			echo 
-			eend 20 "cmd $CMD failed!"
-			return 20
-		}
-		IFS=$NEWLINE
-	done
-	echo "]"
-	eend 0
-	
-	IFS=$IFS_O
-}
-
-start() {
-	einfo "Starting DRBD resources:"
-	eindent
-	assure_module_is_loaded || return $?
-	adjust_with_progress || return $?
-
-	# make sure udev has time to create the device files
-	ebegin "Waiting for udev device creation ..."
-	for RESOURCE in `$DRBDADM sh-resources`; do
-		for DEVICE in `$DRBDADM sh-dev $RESOURCE`; do
-			UDEV_TIMEOUT_LOCAL=$UDEV_TIMEOUT
-			while [ ! -e $DEVICE ] && [ $UDEV_TIMEOUT_LOCAL -gt 0 ] ; do
-				sleep 1
-				UDEV_TIMEOUT_LOCAL=$(( $UDEV_TIMEOUT_LOCAL-1 ))
-			done
-		done
-	done
-	eend 0
-
-	einfon "Waiting for connection "
-	$DRBDADM wait-con-int
-	ret=$?
-	echo
-
-	sleep 5
-	
-	einfon "Become primary if configured "
-	$DRBDADM sh-b-pri all
-	echo
-
-	eend $ret
-	return $ret
-}
-
-stop() {
-	ebegin "Stopping all DRBD resources"
-	
-	# Check for mounted drbd devices
-	if ! grep -q '^/dev/drbd' /proc/mounts &>/dev/null; then
-		if [ -e ${PROC_DRBD} ]; then
-			${DRBDADM} down all
-			ret=$?
-			sleep 3
-			if [ -e /proc/modules ] && grep -q '^drbd' /proc/modules ; then
-		 	      ${RMMOD} drbd
-         	fi
-		fi
-		eend $ret
-		return $ret
-	else
-		einfo "drbd devices mounted, please umount them before trying to stop drbd!"
-		eend 1
-		return 1
-	fi
-}
-
-status() {
-	# NEEDS to be heartbeat friendly...
-	# so: put some "OK" in the output.
-	
-	if [ -e $PROC_DRBD ]; then
-		ret=0
-		ebegin "drbd driver loaded OK; device status:"
-		eend $ret
-		cat $PROC_DRBD
-	else
-		ebegin "drbd not loaded"
-		ret=3
-		eend $ret
-	fi
-	return $ret
-}
-
-reload() {
-	ebegin "Reloading DRBD"
-	${DRBDADM} adjust all
-	ret=$?
-	eend $ret
-	return $ret
-}

diff --git a/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch b/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
deleted file mode 100644
index 1eeca1b1b0f..00000000000
--- a/sys-cluster/drbd/files/drbd-8.3.11-kernel3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/drbd/Makefile	2011-07-07 12:55:39.000000000 +0200
-+++ b/drbd/Makefile	2011-11-03 12:56:42.280603057 +0100
-@@ -77,9 +77,12 @@
-     endif
-   endif
- 
-+  KDIR_Makefile_VERSION = $(shell test -e $(KDIR)/Makefile && grep "^VERSION = " $(KDIR)/Makefile | cut -d " " -f 3)
-   KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
--  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
--    $(error "won't compile with this kernel version")
-+  ifneq ($(KDIR_Makefile_VERSION),3)
-+    ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
-+      $(error "ici won't compile with this kernel version")
-+    endif
-   endif
- 
-   .PHONY: drbd.o default all greeting clean kbuild install dep tags

diff --git a/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch b/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
deleted file mode 100644
index 0fbbb92a2c3..00000000000
--- a/sys-cluster/drbd/files/drbd-8.3.8.1-implicits.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-drbdadm_main.c:2525:2: warning: implicit declaration of function ‘stat’
-
---- a/user/drbdadm_main.c
-+++ b/user/drbdadm_main.c
-@@ -33,6 +33,7 @@
- #include <search.h>
- 
- #include <sys/types.h>
-+#include <sys/stat.h>
- #include <sys/wait.h>
- #include <sys/poll.h>
- #include <sys/socket.h>

diff --git a/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch b/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch
deleted file mode 100644
index 408b8136296..00000000000
--- a/sys-cluster/drbd/files/drbd-8.4.3-block-drbd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/scripts/block-drbd	2014-07-30 17:19:59.000000000 -0700
-+++ b/scripts/block-drbd	2014-07-31 09:54:56.000000000 -0700
-@@ -248,7 +248,7 @@
-     fi
- 
-     case $t in 
--      drbd)
-+      drbd|phy)
-         drbd_resource=$p
-         drbd_role="$(/sbin/drbdadm role $drbd_resource)"
-         drbd_lrole="${drbd_role%%/*}"
-@@ -276,7 +276,7 @@
- 
-   remove)
-     case $t in 
--      drbd)
-+      drbd|phy)
-         p=$(xenstore_read "$XENBUS_PATH/params")
-         drbd_resource=$p
-         drbd_role="$(/sbin/drbdadm role $drbd_resource)"

diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
deleted file mode 100644
index 82f50565f99..00000000000
--- a/sys-cluster/drbd/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@g.o</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<use>
-		<flag name="xen">Enable Xen integration</flag>
-		<flag name="pacemaker">Enable Pacemaker integration</flag>
-		<flag name="heartbeat">Enable Heartbeat integration</flag>
-	</use>
-	<longdescription>
-		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts
-		that glues the DRBD system to cluster management software and other system components.
-	</longdescription>
-</pkgmetadata>

diff --git a/sys-cluster/gearmand/Manifest b/sys-cluster/gearmand/Manifest
deleted file mode 100644
index 141c4c62fc2..00000000000
--- a/sys-cluster/gearmand/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gearmand-0.34.tar.gz 842579 BLAKE2B 439fcec297ae874cecbc355526b4681329fde2ac39ccc9f6e14413979e7cdbc6c88f2e8cc34e2af1f166f873415a1d5b353716a227894c36bbde66f30b900e56 SHA512 8263cd19337f56cb692209efb4867b54954081a907c109b4828c1a7dfd8e1dec803f9c06e0f09e1ec6cc4271299bf77bcd5069b765647b31559480b4e7e756ba

diff --git a/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch b/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch
deleted file mode 100644
index 37d2db62741..00000000000
--- a/sys-cluster/gearmand/files/gearmand-0.34-stdbool-h.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Ignore configure checks and include stdbool.h
-unconditionally, we're in 2016.
-
---- gearmand-0.34/libhostile/called.c
-+++ gearmand-0.34/libhostile/called.c
-@@ -41,6 +41,7 @@
- #include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <stdbool.h>
- 
- __thread bool is_called_= false;
- static __thread char** unique_ptr= NULL;
---- gearmand-0.34/libhostile/called.h
-+++ gearmand-0.34/libhostile/called.h
-@@ -36,9 +36,7 @@
- 
- #pragma once
- 
--#ifdef HAVE_STDBOOL_H
--# include <stdbool.h>
--#endif
-+#include <stdbool.h>
- 
- bool is_called(void);
- void set_called();

diff --git a/sys-cluster/gearmand/files/gearmand.conf.d b/sys-cluster/gearmand/files/gearmand.conf.d
deleted file mode 100644
index aeb49d5c6b9..00000000000
--- a/sys-cluster/gearmand/files/gearmand.conf.d
+++ /dev/null
@@ -1,39 +0,0 @@
-# /etc/conf.d/gearmand: config file for /etc/init.d/gearmand
-
-# Persistent queue store
-# The following queue stores are available:
-# drizzle|memcache|mysql|postgre|sqlite|tokyocabinet|none
-# If you do not wish to use persistent queues, leave this option commented out.
-# Note that persistent queue mechanisms are mutally exclusive.
-#PERSISTENT=""
-
-# Persistent queue settings for drizzle, mysql and postgre
-#PERSISTENT_SOCKET=""
-#PERSISTENT_HOST=""
-#PERSISTENT_PORT=""
-#PERSISTENT_USER=""
-#PERSISTENT_PASS=""
-#PERSISTENT_DB=""
-#PERSISTENT_TABLE=""
-
-# Persistent queue settings for sqlite
-#PERSISTENT_FILE=""
-
-# Persistent queue settings for memcache
-#PERSISTENT_SERVERLIST=""
-
-# General settings
-#
-# -j, --job-retries=RETRIES   Number of attempts to run the job before the job
-#                             server removes it. Thisis helpful to ensure a bad
-#                             job does not crash all available workers. Default
-#                             is no limit.
-# -L, --listen=ADDRESS        Address the server should listen on. Default is
-#                             INADDR_ANY.
-# -p, --port=PORT             Port the server should listen on. Default=4730.
-# -r, --protocol=PROTOCOL     Load protocol module.
-# -t, --threads=THREADS       Number of I/O threads to use. Default=0.
-# -v, --verbose               Increase verbosity level by one.
-# -w, --worker-wakeup=WORKERS Number of workers to wakeup for each job received.
-#                             The default is to wakeup all available workers.
-GEARMAND_PARAMS=""

diff --git a/sys-cluster/gearmand/files/gearmand.init.d.2 b/sys-cluster/gearmand/files/gearmand.init.d.2
deleted file mode 100644
index 48d19bd1dc8..00000000000
--- a/sys-cluster/gearmand/files/gearmand.init.d.2
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2009-2012 Pavel Stratil, senbonzakura.eu
-# Distributed under the terms of the MIT license
-
-pidfile=/var/run/gearmand/gearmand.pid
-command=/usr/sbin/gearmand
-
-depend() {
-	use localmount
-
-	case $PERSISTENT in
-	  drizzle)
-	    use drizzle
-	    ;;
-	  memcache)
-	    use memcache
-	    ;;
-	  mysql)
-	    use mysql
-	    ;;
-	  postgre)
-	    use postgresql
-	    ;;
-	  *)
-	    ;;
-	esac
-}
-
-start() {
-	case ${PERSISTENT:-none} in
-	  drizzle|mysql)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libdrizzle"
-            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-host=${PERSISTENT_HOST}"
-            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-user=${PERSISTENT_USER}"
-            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-password=${PERSISTENT_PASS}"
-            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-db=${PERSISTENT_DB}"
-            [ ${PERSISTENT_TABLE}  ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-table=${PERSISTENT_TABLE}"
-            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-port=${PERSISTENT_PORT}"
-            [ ${PERSISTENT_SOCKET} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-uds=${PERSISTENT_SOCKET}"
-            [ ${PERSISTENT} == "mysql" ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libdrizzle-mysql"
-	    ;;
-	  memcache)
-	    [ ${PERSISTENT_SERVERLIST} ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libmemcached --libmemcached-servers=${PERSISTENT_SERVERLIST}"
-	    ;;
-	  postgre)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libpq"
-            [ ${PERSISTENT_HOST}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-host=${PERSISTENT_HOST}"
-            [ ${PERSISTENT_USER}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-user=${PERSISTENT_USER}"
-            [ ${PERSISTENT_PASS}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-password=${PERSISTENT_PASS}"
-            [ ${PERSISTENT_DB}     ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-dbname=${PERSISTENT_DB}"
-            [ ${PERSISTENT_PORT}   ] && GEARMAND_PARAMS="${GEARMAND_PARAMS} --libpq-port=${PERSISTENT_PORT}"
-            [ ${PERSISTENT_TABLE}  ] && ewarn "Libpq doesn't recognise 'table' parameter."
-            [ ${PERSISTENT_SOCKET} ] && ewarn "Libpq doesn't recognise 'socket' parameter. If no host is set, it automatically falls back to a socket."
-	    ;;
-	  tokyocabinet)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libtokyocabinet --libtokyocabinet-file=${PERSISTENT_FILE}"
-	    ;;
-	  sqlite)
-	    GEARMAND_PARAMS="${GEARMAND_PARAMS} -q libsqlite3 --libsqlite3-db=${PERSISTENT_FILE}"
-	    ;;
-          none)
-            ;;
-	  *)
-            eerror "Wrong persistent queue store setting in /etc/conf.d/gearmand."
-	    return 1
-	    ;;
-	esac
-
-
-	checkpath -d -m 0755 -o gearmand:nogroup /var/run/gearmand /var/log/gearmand
-
-	ebegin "Starting ${SVCNAME}"
-        start-stop-daemon --pidfile /var/run/gearmand/gearmand.pid --start \
-		--exec /usr/sbin/gearmand -- --pid-file=/var/run/gearmand/gearmand.pid \
-		--user=gearmand --daemon \
-		--log-file=/var/log/gearmand/gearmand.log ${GEARMAND_PARAMS}
-	eend $?
-}

diff --git a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
deleted file mode 100644
index 846d4726196..00000000000
--- a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic libtool user
-
-DESCRIPTION="Generic framework to farm out work to other machines"
-HOMEPAGE="http://www.gearman.org/"
-SRC_URI="https://launchpad.net/gearmand/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc +memcache sqlite tokyocabinet postgres"
-
-RDEPEND="dev-libs/libevent
-	>=dev-libs/boost-1.39:=[threads(+)]
-	|| ( >=sys-apps/util-linux-2.16 <sys-libs/e2fsprogs-libs-1.41.8 )
-	tcmalloc? ( dev-util/google-perftools )
-	memcache? ( >=dev-libs/libmemcached-0.47 )
-	sqlite? ( dev-db/sqlite:3 )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	postgres? ( >=dev-db/postgresql-9.0:* )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/boost-m4-0.4_p20160328"
-
-pkg_setup() {
-	enewuser gearmand -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	# fixes bug 574558, which is due to an outdated bundled boost.m4
-	rm m4/boost.m4 || die
-	sed -i -e 's/AM_INIT_AUTOMAKE.*//g' m4/pandora_canonical.m4 || die
-	epatch -p1 "${FILESDIR}/${P}-stdbool-h.patch"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable memcache libmemcached)
-		$(use_enable tcmalloc)
-		$(use_enable tokyocabinet libtokyocabinet)
-		$(use_with postgres postgresql)
-		$(use_with sqlite sqlite3)
-		--disable-mtmalloc
-		--disable-static
-	)
-
-	# Don't ever use --enable-assert since configure.ac is broken, and
-	# only does --disable-assert correctly.
-	if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-cppflags -DDEBUG
-	fi
-
-	# Explicitly enable c++11 mode
-	append-cxxflags -std=c++11
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	# Since libtool is stupid and doesn't discard /usr/lib64 from the
-	# load path, we'd end up testing against the installed copy of
-	# gearmand (bad).
-	#
-	# We thus cheat and "fix" the scripts by hand.
-	sed -i -e '/LD_LIBRARY_PATH=/s|/usr/lib64:||' "${BUILD_DIR}"/tests/*_test \
-		|| die "test fixing failed"
-
-	autotools-utils_src_test
-}
-
-DOCS=( README AUTHORS ChangeLog )
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/gearmand.init.d.2 gearmand
-	newconfd "${FILESDIR}"/gearmand.conf.d gearmand
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Unless you set the PERSISTENT_TABLE option in"
-	elog "/etc/conf.d/gearmand, Gearmand will use table 'queue'."
-	elog "If such table doesn't exist, Gearmand will create it for you"
-	elog ""
-}

diff --git a/sys-cluster/gearmand/metadata.xml b/sys-cluster/gearmand/metadata.xml
deleted file mode 100644
index d08fb72aef8..00000000000
--- a/sys-cluster/gearmand/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->  
-  <use>
-    <flag name="memcache">
-      Support memcache daemon (via <pkg>dev-libs/libmemcached</pkg>)
-      for the queue storage.
-    </flag>
-    <flag name="tokyocabinet">
-      Support <pkg>dev-db/tokyocabinet</pkg> for the queue storage.
-    </flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">gearmand</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
deleted file mode 100644
index b3649eecb82..00000000000
--- a/sys-fabric/mstflint/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944

diff --git a/sys-fabric/mstflint/metadata.xml b/sys-fabric/mstflint/metadata.xml
deleted file mode 100644
index f1a406d0b75..00000000000
--- a/sys-fabric/mstflint/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>cluster@g.o</email>
-	<name>Gentoo Cluster Project</name>
-</maintainer>
-<longdescription>
-OpenIB Userspace CM library
-</longdescription>
-</pkgmetadata>

diff --git a/sys-fabric/mstflint/mstflint-3.5.0.ebuild b/sys-fabric/mstflint/mstflint-3.5.0.ebuild
deleted file mode 100644
index 68e1543aee2..00000000000
--- a/sys-fabric/mstflint/mstflint-3.5.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-OFED_VER="3.12"
-OFED_RC="1"
-OFED_RC_VER="1"
-OFED_SUFFIX="1"
-
-inherit openib
-
-DESCRIPTION="Mellanox firmware burning application"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-block_other_ofed_versions

diff --git a/www-apps/b2evolution/Manifest b/www-apps/b2evolution/Manifest
deleted file mode 100644
index fb700be7434..00000000000
--- a/www-apps/b2evolution/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST b2evolution-4.1.7-stable-2013-04-27.zip 6112599 BLAKE2B 93d827b0fbfb252b67b68adc5d3097f3b6058505fc6fae30b4de0ca267ad625a992d989af45d3579dd8e27cd225aeb3e235941511128fbaeda56ed99069defdb SHA512 cf5f20c6dd8ddd714bc6cc3365fc815b4f9444feddea278da08ab247bf8dbaf97c70fe923d4438888e8a94e31567c6f5085850ba4566bae3ec54f45c7dde8c20

diff --git a/www-apps/b2evolution/b2evolution-4.1.7.ebuild b/www-apps/b2evolution/b2evolution-4.1.7.ebuild
deleted file mode 100644
index b164f4a4cee..00000000000
--- a/www-apps/b2evolution/b2evolution-4.1.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp eutils
-
-MY_EXT="stable-2013-04-27"
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multilingual multiuser multi-blog engine"
-HOMEPAGE="http://www.b2evolution.net"
-SRC_URI="mirror://sourceforge/evocms/${PN}-${MY_PV}-${MY_EXT}.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="virtual/httpd-php
-	dev-lang/php[ctype,curl,mysql,tokenizer,xml]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r blogs/*
-
-	rm doc/*.*-*.html doc/*.src.html
-	dohtml doc/*.html
-
-	webapp_serverowned "${MY_HTDOCSDIR}"/conf/_basic_config.template.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/{cache,media}/
-	webapp_configfile
-	"${MY_HTDOCSDIR}"/conf/_{basic_config.template,advanced,locales,formatting,admin,stats,application,config,icons,upgrade}.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
-	webapp_src_install
-}

diff --git a/www-apps/b2evolution/files/postinstall-en.txt b/www-apps/b2evolution/files/postinstall-en.txt
deleted file mode 100644
index 9361877c260..00000000000
--- a/www-apps/b2evolution/files/postinstall-en.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-You will need to provide a database for your b2evolution installation.
-
-This assumes you have some knowledge of MySQL, and already have it
-installed and configured. If not, please refer to the Gentoo MySQL
-guide at the following URL:
-
-http://www.gentoo.org/doc/en/mysql-howto.xml
-
-Once you have a database ready all you need to do is to go to this 
-location
-
-http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install
-
-and provide the credentials required for the database access.
-
-Note the administrator password b2evolution will provide and after
-logging in with these credentials you can start to use the application.

diff --git a/www-apps/b2evolution/files/postupgrade-en.txt b/www-apps/b2evolution/files/postupgrade-en.txt
deleted file mode 100644
index 9e01eaba38c..00000000000
--- a/www-apps/b2evolution/files/postupgrade-en.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Please go to this location
-
-http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install/index.php
-
-and select "Upgrade from a previous version of b2evolution" after 
-providing the credentials required for the database acces.

diff --git a/www-apps/b2evolution/metadata.xml b/www-apps/b2evolution/metadata.xml
deleted file mode 100644
index 2bd751aefd8..00000000000
--- a/www-apps/b2evolution/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@g.o</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">evocms</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/www-misc/gurlchecker/Manifest b/www-misc/gurlchecker/Manifest
deleted file mode 100644
index 3d4e845d5b6..00000000000
--- a/www-misc/gurlchecker/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gurlchecker-0.13.1.tar.gz 709336 BLAKE2B 41601ba46b7bee4dc361a364fcfaf752d4b54efcca142560aacd641be61ccf719d1d6242a504674d646b09cf85df1a8b673610dd57885691544d1cfd991d5ce8 SHA512 25f76f4b0b84467a5751156fbd8497f25e057202a36fe33b24c91e42906f67dd7dbd21531682b050c534862fa4e62ceb0908d19f44926ac335d628cc9919a746

diff --git a/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch b/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch
deleted file mode 100644
index a3aa4a15c50..00000000000
--- a/www-misc/gurlchecker/files/gurlchecker-0.10.5-autoconf-tidy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.in	2008-06-23 06:53:17.000000000 +0200
-+++ b/configure.in	2008-06-23 20:08:59.000000000 +0200
-@@ -174,10 +174,10 @@
- 	  [tidyCreate],
- 	  [
- 	   AC_CHECK_HEADERS(
--	     [tidy.h tidy/tidy.h],
-+	     [tidy.h],
- 	     [
- 	      want_tidy=yes
--	      TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
-+	      TIDY_FLAGS="$TIDY_FLAGS -DENABLE_TIDY"
-         TIDY_LIBS="-ltidy"
-         #LDFLAGS="$LDFLAGS $want_tidy_path"
- 	     ],

diff --git a/www-misc/gurlchecker/files/gurlchecker-0.13.1-gnutls.patch b/www-misc/gurlchecker/files/gurlchecker-0.13.1-gnutls.patch
deleted file mode 100644
index 341dc430b5a..00000000000
--- a/www-misc/gurlchecker/files/gurlchecker-0.13.1-gnutls.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: src/connection.c
-===================================================================
---- src/connection.c	(revision 827)
-+++ src/connection.c	(revision 828)
-@@ -230,20 +230,12 @@
- #ifdef ENABLE_GNUTLS
-   if (strcmp (proto, UC_PROTOCOL_HTTPS) == 0)
-   {
--    const gint cert_type_priority[3] =
--    {
--      GNUTLS_CRT_X509,
--      GNUTLS_CRT_OPENPGP,
--      0
--    };
--
-     conn->use_gnutls = TRUE;
-     conn->port = atoi (UC_URL_DEFAULT_SSL_PORT);
- 
-     gnutls_init (&conn->session_gnutls, GNUTLS_CLIENT);
-     gnutls_set_default_priority (conn->session_gnutls);
--    gnutls_certificate_type_set_priority (conn->session_gnutls,
--                                          cert_type_priority);
-+    gnutls_set_default_priority (conn->session_gnutls);
-     gnutls_credentials_set (conn->session_gnutls, GNUTLS_CRD_CERTIFICATE,
-                             xcred_gnutls);
-   }

diff --git a/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch b/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch
deleted file mode 100644
index 904eab719f2..00000000000
--- a/www-misc/gurlchecker/files/gurlchecker-0.13.1-ldflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# Autofoo of this package is just insane, need to rewrite it someday.
-# Don't touch LDFLAGS, there is no need to
---- a/configure.in	2008-06-15 21:27:45.000000000 +0200
-+++ b/configure.in	2008-06-15 21:34:45.000000000 +0200
-@@ -120,7 +120,7 @@
-     [
-      want_croco=yes
-      CROCO_FLAGS="-DENABLE_CROCO $CROCO_CFLAGS"
--     LDFLAGS="$LDFLAGS $want_croco_path"
-+     #LDFLAGS="$LDFLAGS $want_croco_path"
-     ],
-     [
-      want_croco=no
-@@ -178,7 +179,7 @@
- 	      have_tidy=yes
- 	      TIDY_FLAGS="$TIDY_FLAGS -DHAVE_TIDY_H_IN_SUBDIR -DENABLE_TIDY"
-         TIDY_LIBS="-ltidy"
--        LDFLAGS="$LDFLAGS $want_tidy_path"
-+        #LDFLAGS="$LDFLAGS $want_tidy_path"
- 	     ],
-        [have_tidy=no]
- 	   )
-@@ -238,7 +240,7 @@
- 	      have_clamav=yes
- 	      CLAMAV_FLAGS="$CLAMAV_FLAGS -DENABLE_CLAMAV"
-         CLAMAV_LIBS="-lclamav"
--        LDFLAGS="$LDFLAGS $want_clamav_path"
-+        #LDFLAGS="$LDFLAGS $want_clamav_path"
- 	     ],
-        [have_clamav=no]
- 	   )
-@@ -298,7 +300,7 @@
- 	      have_clamav=yes
- 	      GNUTLS_FLAGS="$GNUTLS_FLAGS -DENABLE_GNUTLS"
-         GNUTLS_LIBS="-lgnutls"
--        LDFLAGS="$LDFLAGS $want_gnutls_path"
-+        #LDFLAGS="$LDFLAGS $want_gnutls_path"
- 	     ],
- 	     [
- 	      have_clamav=yes

diff --git a/www-misc/gurlchecker/gurlchecker-0.13.1-r2.ebuild b/www-misc/gurlchecker/gurlchecker-0.13.1-r2.ebuild
deleted file mode 100644
index 678043e21c4..00000000000
--- a/www-misc/gurlchecker/gurlchecker-0.13.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome tool that checks links on web pages/sites"
-HOMEPAGE="http://gurlchecker.labs.libre-entreprise.org/"
-SRC_URI="http://labs.libre-entreprise.org/frs/download.php/857/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-IUSE="clamav json sqlite ssl tidy"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.6:2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2:2.0
-	>=dev-libs/libxml2-2.6:2
-	>=net-libs/gnet-2
-	>=dev-libs/libcroco-0.6
-	clamav? ( app-antivirus/clamav )
-	json? ( >=dev-libs/json-glib-0.8 )
-	sqlite? ( >=dev-db/sqlite-3.6:3 )
-	ssl? ( >=net-libs/gnutls-1 )
-	tidy? ( app-text/htmltidy )
-"
-# docbook-sgml-utils used to build the man page
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.30
-	app-text/docbook-sgml-utils
-	>=dev-util/gtk-doc-am-1.1
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.13.1-gnutls.patch"
-
-	# Stop manipulating LDFLAGS for no reason
-	epatch "${FILESDIR}/${PN}-0.13.1-ldflags.patch"
-
-	# Fix tidy.h include dir for Gentoo:
-	epatch "${FILESDIR}/${PN}-0.10.5-autoconf-tidy.patch"
-
-	# Fix .desktop validation
-	sed -e 's/Application;//' \
-		-i gurlchecker.desktop.in || die
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS CONTRIBUTORS ChangeLog FAQ NEWS README THANKS TODO"
-
-	gnome2_src_configure \
-		--with-croco \
-		$(use_with clamav) \
-		$(use_with json) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl gnutls) \
-		$(use_with tidy)
-}
-
-src_install() {
-	gnome2_src_install
-
-	rm -r "${D}"/usr/share/doc/${PN} || die
-}

diff --git a/www-misc/gurlchecker/metadata.xml b/www-misc/gurlchecker/metadata.xml
deleted file mode 100644
index 1948827bbc9..00000000000
--- a/www-misc/gurlchecker/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
-		<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>
-	</use>
-	<longdescription>
-		gURLChecker is a graphical web links checker for GNU/Linux and
-		other POSIX OS. It can work on a whole site, a single local page
-		or a browser bookmarks file.
-	</longdescription>
-</pkgmetadata>

diff --git a/x11-libs/libdesktop-agnostic/Manifest b/x11-libs/libdesktop-agnostic/Manifest
deleted file mode 100644
index db24ab37a9f..00000000000
--- a/x11-libs/libdesktop-agnostic/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libdesktop-agnostic-0.3.92.tar.gz 442653 BLAKE2B 9b56013974077f080608dde565f8850d2b8c52a12d32353dafb184b43d138cee7ca361cebe814104df7e75c44f578da360cf393bbad672166e3624512112964e SHA512 c383a45edb6a1fed1b1a13ed583627eceda444519276a5d62a8442bcdc1be5e7d37a0449b678e2ccfcf7441648ca6bff6c40e5930dbec9221182657201671e90

diff --git a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
deleted file mode 100644
index c587c4404e1..00000000000
--- a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-VALA_USE_DEPEND="vapigen"
-
-inherit python-single-r1 waf-utils vala
-
-DESCRIPTION="A desktop-agnostic library for GLib-based projects"
-HOMEPAGE="https://launchpad.net/libdesktop-agnostic"
-SRC_URI="https://launchpad.net/${PN}/0.4/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +gconf glade gnome +introspection"
-
-RDEPEND=">=dev-libs/glib-2
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	gconf? ( gnome-base/gconf:2 )
-	glade? ( gnome-base/libglade:2.0 )
-	gnome? ( gnome-base/gnome-desktop:2 )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/gobject-introspection
-	introspection? ( x11-libs/gtk+:2[introspection] )"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_configure() {
-	local cfg="keyfile" fdo="glib" myconf=""
-
-	use gconf && cfg="gconf,${cfg}"
-	use gnome && fdo="${fdo},gnome"
-	use debug && myconf="${myconf} --enable-debug"
-	use glade && myconf="${myconf} --with-glade"
-	use introspection || myconf="${myconf} --disable-gi"
-
-	waf-utils_src_configure \
-		--sysconfdir="${EPREFIX}"/etc \
-		--config-backends=${cfg} \
-		--desktop-entry-backends=${fdo} \
-		--vfs-backends=gio \
-		${myconf}
-}

diff --git a/x11-libs/libdesktop-agnostic/metadata.xml b/x11-libs/libdesktop-agnostic/metadata.xml
deleted file mode 100644
index 0bc19fc8307..00000000000
--- a/x11-libs/libdesktop-agnostic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <use>
-    <flag name="gconf">Enable GConf as configuration backend</flag>
-    <flag name="glade">Install the Glade catalog for the desktop-agnotstic GTK widgets.</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">libdesktop-agnostic</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/x11-misc/dockmanager/Manifest b/x11-misc/dockmanager/Manifest
deleted file mode 100644
index cb7d5e7f8af..00000000000
--- a/x11-misc/dockmanager/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dockmanager-0.1.0.tar.gz 532346 BLAKE2B 9258a101b337d05a93b45e0ea429a7e57a26cc99f5a0d006b3c780738c8320499a5bcb34014b3b9d7f862169c1dbae3e7cfe6a5acc3783454f01c7d4bc44cb0b SHA512 4379e21b5bb42d8a0e58edf02991a4a3f9c8eefc08321cbeb91db45718fdbfe155894e57b46356b07c43e4ce70266357ef84bc4c79280175cc724c9ddb550f4f

diff --git a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
deleted file mode 100644
index c8a900c7df0..00000000000
--- a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
-
-inherit gnome2 python-single-r1 vala
-
-DESCRIPTION="dock-independent helper scripts"
-HOMEPAGE="https://launchpad.net/dockmanager"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/dbus-glib
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libdesktop-agnostic
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	rm -f {scripts,metadata}/pidgin_control.* || die
-	sed -i -e "/pidgin_control/d" {scripts,metadata}/Makefile.* || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_enable !debug release)
-}

diff --git a/x11-misc/dockmanager/metadata.xml b/x11-misc/dockmanager/metadata.xml
deleted file mode 100644
index 4fab8457cfd..00000000000
--- a/x11-misc/dockmanager/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <upstream>
-    <remote-id type="launchpad">dockmanager</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/x11-themes/gnome-icon-theme/Manifest b/x11-themes/gnome-icon-theme/Manifest
deleted file mode 100644
index dbfb8add31f..00000000000
--- a/x11-themes/gnome-icon-theme/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gnome-icon-theme-3.12.0.tar.xz 17742624 BLAKE2B df25489c2bc8f51833a4b6c8ef5b05ba83e31e36431d9a11b3e172f71a11194c3adc38bebf98c0e6253e1d55e751422128345033ea2bebf6ae9a0f78252539b8 SHA512 9dab14a5d30b1fa6655fbd44f15357158dc49ef01d27be678eaed35cb4a9f21546dee2a5d7fb50dac5e3595e161b0be7e7bc79daf47b772f0bb37109b0078bea
-DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045

diff --git a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.12.0-r1.ebuild b/x11-themes/gnome-icon-theme/gnome-icon-theme-3.12.0-r1.ebuild
deleted file mode 100644
index 0d32115ed06..00000000000
--- a/x11-themes/gnome-icon-theme/gnome-icon-theme-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GNOME default icon theme"
-HOMEPAGE="https://www.gnome.org/ https://people.freedesktop.org/~jimmac/icons/#git"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@×××××××××××××××××.org/msg00043/tango-gentoo-v1.1.tar.gz )"
-
-LICENSE="|| ( LGPL-3 CC-BY-SA-3.0 )
-	branding? ( CC-BY-SA-4.0 )"
-SLOT="0"
-IUSE="branding"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-DEPEND="${RDEPEND}
-	>=x11-misc/icon-naming-utils-0.8.7
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
-	if use branding; then
-		for i in 16 22 24 32 48; do
-			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
-			"${S}"/gnome//${i}x${i}/places/start-here.png \
-			|| die "Copying gentoo logos failed"
-		done
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-icon-mapping \
-		GTK_UPDATE_ICON_CACHE=$(type -P true)
-}

diff --git a/x11-themes/gnome-icon-theme/metadata.xml b/x11-themes/gnome-icon-theme/metadata.xml
deleted file mode 100644
index 39980802b1d..00000000000
--- a/x11-themes/gnome-icon-theme/metadata.xml
+++ /dev/null
@@ -1,8 +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@g.o</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>

diff --git a/x11-themes/icewm-themes/Manifest b/x11-themes/icewm-themes/Manifest
deleted file mode 100644
index 44b547b2b6d..00000000000
--- a/x11-themes/icewm-themes/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-DIST 1in1-xp-default-1.1.tar 337920 BLAKE2B 9d0b10904a8015b54ffe9e6a4efb4da935c30b36eb04913c588a9c7fdb5890428d04a887e2249968915847e8749ede7d56829c83dde10f0b4e8e58aa187be107 SHA512 45adb66d63595203e09e9d1c09ba16ac6eaa7586dfabc325661bd40017d0fcdb725924a5d7cf2110ddf8958f2f50dbf445914a9a02f08d0420cc1dfc93d4b16a
-DIST 1in1-xp-default.tar.gz 165614 BLAKE2B 1e3f2eb78b13decf7ea33730dc8ec4e578e5c7f43816e9e7eaf54feb15754fa8f060114e4b4fd622c0cb60abb305370e45ca7b4865d87297391a78e0b5ff0341 SHA512 88763a671c2b819e08d88b7b15dec4aa24e6151fade1d66ace09066f12d79f0f6360e974e68858f4387c63b7846a4fa5e677b0d712fc4d56ed7a0d86317862ff
-DIST SilverXP-1.2.17-single-1.tar.bz2 322887 BLAKE2B 462bc5c8bbc400e69bfe10d0f2898cacd889cb1d6f992dd125f9b4e73cfdb0c2d8d1260133643ab8f7f9f58cbd4158a71f6a744076aa079e2fc34de46ec1d14d SHA512 007f60e0f234c603318cdc7eb0f15d3c87b798b3708e8d66f85fc0df8aa3f2b3df10b863c396dfbb720b6b0f95da45b91542f36f9cb5e6a7f8df4659431b142d
-DIST axxlite-default-1.0.tar 71680 BLAKE2B 5418d23663d8d5857a5dfc98d1ba27b919d232442c8ae0be6cfdcdbaea5daa4f0038b470628857157f0bdc70c00a787ba6636c6c1fb3d8a463f46dee71204826 SHA512 f535b65eae288e203ab79a121b935d56c64050cde01aebde25a9405654b21b6819253df25ce10ddd35e31cc9bc504a3a653130574ecd7f4dddf2adc2ecf8ed4d
-DIST bluecrux-default-1.1.tar.gz 84667 BLAKE2B 78fb3dd08f4eb24990994639695a121ebf69e9663fbaaf323bcc6c7bb1aad6ad119dbc0b513d5480ef8329656cc08a86e532430cb795e3ca0014d2e690de4325 SHA512 cb230cc9d52fd75a23c4fceeaaf020b578e085951c873c4fb69d4f4797328a6dc94a1b9efc06731901bc4b2ec2a2d2dc18260b67b0af637f89a6eb49dc09c754
-DIST cruxteal-default-1.0.3.tar.gz 636285 BLAKE2B 51a8f035fb3d8db689c8618ffcef93b16498c1dd6b970aaa30bb9be682d61c507402d1968508cdc725260e81e81a240da861be97e320cd180e223df75a78c4b6 SHA512 9673dbce7e6306c97ea62557927012c97ba69ca599821507d0b43ce678f8d1523140ec98820fbd1fb7a04449db2c6f5527e7fb31c4649fa3328d86a7d35f5c07
-DIST cyrusicewm-1.0.0.tar 532480 BLAKE2B dbb86f69cc71848fc4d6b43f097fb48e67696cf10447d7e1397aac6dd3d0af85a3529acd35ee0fcb85e59d077652c3347da10909c27c32d3929952edb3ac736a SHA512 90c884de30344d06d3e22858909a7e3d233cc3a165fca4d5753c0f07b69539320da7866a8119e71897922763dbef967c1f8358bf1e490b7fc0b69fa8efc32a62
-DIST elberg-icewm-default-1.1.tar.gz 253317 BLAKE2B 6afa30d32e3669d153f849ffd21e3db0c72cbfcd86fa6e7f521486070e4d8711aefb62b3f32f1e748940ab02c33768465e2c741dcf9b479c859a163a0e73c4de SHA512 692889f7c6cda0a47ad1b021c25a2d2b112cf10580934922dbdce3479db31a4a82833cdff2ca05bb5cda2e354b017c00c903710fb514db61713b6bd1c7ab4b47
-DIST gertplastik-default-20051225.tar 174080 BLAKE2B f1c9fc92c93a72de2bc881e883e82914c150d8dadb1ab3d399866151af030dbd1084ff206843748739c6ebd487183664e2c68c1e4850a233a281bc9f871e6f2c SHA512 ba83e617ca9d73af9cce646944e1a07f82ddd4a1eba30dba498a36ef132015780ecdf77c746201b56e1ec719c5c55f5569f3d9a2fc333bdb34203a5114483434
-DIST greyscaled-stable.tar.gz 13374 BLAKE2B 5b5676de36a47691b46e98bdf320d28cb170155eb20fc6465a2e5b1882a7c08a70530be9dadd56a130ac9d23fa381141845798a8312453e9048301ff3cb70e7e SHA512 a9b6f550ac62461d4de87f88018ebd016b126f3e55a6c58ac15c2096682e2e24fed45fe390be9732d8863d55761a6d0a0d0b1db033a9c0baa495faf4737ab534
-DIST icebox-red-default-1.2.13.tar.gz 13905 BLAKE2B 117802837a4ad1560f43598f0eafd208bc8af87e0411644be9f4ca3244b9713148f6c7466d6b893a80ee7b9f90bdc54ec129e14f5b70f369c3594df6dadeb5e3 SHA512 69464bed732718037b410b43d8dfa974b873a0a48d13e2666890b2448a4b29c1b1ad579b4f2bbd54aba10185067b48fa3b4060d7c114495141b487a4c7328999
-DIST icecrack-default-2.0.0.tar.gz 15478 BLAKE2B 69095d09d0b1c3809c48ef102e7a5db5480234a9e70a1f730b29d830e5026b2a2291d50a960a9a2ce31641ae45ce865965de70f2f8b9270f847a9e688b69bbcc SHA512 bb9c27547fddba2c66c25b36fad4eef3b324cec8d02d611aaf307df21f36ae221ba803119fd2286fda8b3d9524661d0b187b141ebbf217ccb30be84fc427ac71
-DIST icequa-default-1.0.2.tar 317440 BLAKE2B 752711b0ec3920755a185426e408be100c9340f94682c3931166b0ccb390083fdbacecec8cc1171b532f05896288b5c24c763a8ca0566c17473d0fa8fe256c98 SHA512 1d989573ad5be5a8c0bc4a7d5f7912357ffba0d6189cfaa8d1098257a7ed5eb1424cbd78b5778e217df82b49646ba2d8c87d95e387c481e5f2132b4b9df3e670
-DIST kliin-default-0.1.tar.gz 92914 BLAKE2B b2d1cb396f7c1747a2966fb1c0b2d004c0bbf42513e64f59775226534d5821cfec4ebdf4db8e699cffa68a3aca673932c48330f5f9026fad9cd4fcf86d19bb5b SHA512 d05f108c8ff8152cc94014bebc774ec1ba22d414aa5bdff33766f8e70ffe2d3c9ffa42ac41e074b0f77cdba15d43040a659b77524dceb42d01397d7fd5e73ac5
-DIST miggy4-default-0.2.tar 163840 BLAKE2B 59a8bd73cf59e96496b7d134e3aa01b1ed4f3bcd95bcf9d62755f4a3c8ddf8f5565f7ab7bc31d414e6874c9d383ed7e51702b4f2547522dc2785430cc626e61a SHA512 448adef02f3238c7265e793ba7996a3a3bbe4bdb4cb7a20082bcb251328849d2d463f9a72f8e97b081478a074bf4fbb730a484deeaf24049a60d909d2b074903
-DIST phaaba-1.0.7.tar 81920 BLAKE2B 0081435c587349985d372a499ec090388f98d074bc01c4f28074948649f570ffae0da76b5ff82ce1494605b3d974127aeb95c2b33a1fdd181d44492b1ef7e07e SHA512 3a68c77bd77b010ea250845171e18c71b330e673a4b1d2a9dbe8e3c707eb7a038fcfe4e41feeb247fe1a2d7f5971f043a66f62e28572fd8000ec607473bf5b07
-DIST qnx_icewm-default-1.0.tar 143360 BLAKE2B 00f1e388023037c6c23d9017f6692c159cce11ba72e1e9420ac276f4a924d7d9fa20d2ad2be761006266ae98f193ff7c2ab57f21226b3e7818615077a8ec5352 SHA512 9ab0096d4dab864ac87143fce80090ba95a7594d34059c3af8d442fab0b79a18bbebad6fba537de42a6830f604a6ada2a476d90190382d66a6684a8082896e93
-DIST theme-winclassic-1.1.tar.gz 23066 BLAKE2B 9cc0f80e3aadd9293a9a5ff7782f555c2f165da781c63a31afdf97ad2545d805b7f916b89e954543248517ddb815a0178a5709617631b5bf720e413c537cbc9a SHA512 41736113491389792786dea90b19b29602d6faff4ac00c4228a2855f96f02b3fef5a458334c9f7594ea1933a8866199c9fbe560d017c00dfd918bb6c33d3367c
-DIST truecurve-default-1.0.4.tar 296960 BLAKE2B cd0d9cd204fafa137ad90a8b0e0abafca665b7a8bfd5ddf16da50b321790a1e8221cd82c3ec2485214d63f1f7a1a7ff501f09655f06e66eeeb46b9642bbef1d4 SHA512 8fdc4dddefa19578c9781eefa829d7a9440b06f22b27b3719b87a2b7e9a409db735d8510473f8c8ea4cf2457a589c0cde833104f3e23eb54be38a7476883c082
-DIST ufosightings-1.0.0.tar.gz 179925 BLAKE2B 1d9e0890a257850e7597af97f9b3b2be370562bbd7bc3d771a2473cd1a187fcad96be000a60e83a55852c9e7eb3a8c47e81198562d174fe04f6cae17283e4df1 SHA512 6e79ad637ca767488c6cf2c9c6c77f9df333f1d72ff55442f1ad3dbc9d4b46897e71577e22fe1f5f61789a8e61d557c66733943b41c7a1ad56879a2e2425e08d

diff --git a/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild b/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
deleted file mode 100644
index 3bf17ebd9d9..00000000000
--- a/x11-themes/icewm-themes/icewm-themes-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Collection of IceWM themes"
-HOMEPAGE="http://www.icewm.org/
-	http://themes.freshmeat.net/projects/icecrack/
-	http://themes.freshmeat.net/projects/icebox/
-	http://themes.freshmeat.net/projects/cyrusicewm/
-	http://themes.freshmeat.net/projects/greyscaled/
-	http://themes.freshmeat.net/projects/ufosightings/
-	http://themes.freshmeat.net/projects/1in1-xp/"
-THEME_URI="http://download.freshmeat.net/themes"
-SRC_URI="${THEME_URI}/icecrack/icecrack-default-2.0.0.tar.gz
-	${THEME_URI}/icebox-red/icebox-red-default-1.2.13.tar.gz
-	${THEME_URI}/cyrusicewm/cyrusicewm-1.0.0.tar
-	${THEME_URI}/greyscaled/greyscaled-stable.tar.gz
-	${THEME_URI}/ufosightings/ufosightings-1.0.0.tar.gz
-	${THEME_URI}/1in1-xp/1in1-xp-default.tar.gz"
-
-# icecrack, icebox, cyrus-icewm, ufosightings -> GPL-2
-# greyscaled -> Public Domain
-# 1in1-xp -> freedist
-LICENSE="GPL-2 public-domain freedist"
-KEYWORDS="amd64 ppc sparc x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-wm/icewm"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find . -name \.xvpics | xargs rm -rf
-	find . -name \*~ | xargs rm -rf
-}
-
-src_install() {
-	local ICEWM_THEMES=/usr/share/icewm/themes
-	dodir ${ICEWM_THEMES} || die
-	cp -pR * "${D}"/${ICEWM_THEMES} || die
-	chown -R root:0 "${D}"/${ICEWM_THEMES} || die
-	#chmod -R o-w ${D}/${ICEWM_THEMES}
-	rm -f "${D}"/${ICEWM_THEMES}/Crus-IceWM/cpframes.sh || die
-	find "${D}"/${ICEWM_THEMES} -type d | xargs chmod 755 || die
-	find "${D}"/${ICEWM_THEMES} -type f | xargs chmod 644 || die
-}
-
-pkg_postinst() {
-	einfo "Themes created by: Sawsedge, david_bv, tal256, adisk, fagga and Josh Rush."
-}

diff --git a/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild b/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
deleted file mode 100644
index 6eeffcd3cfc..00000000000
--- a/x11-themes/icewm-themes/icewm-themes-0.0.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Collection of IceWM themes"
-HOMEPAGE="http://www.icewm.org/
-	http://themes.freshmeat.net/projects/icecrack/
-	http://themes.freshmeat.net/projects/icebox/
-	http://themes.freshmeat.net/projects/cyrusicewm/
-	http://themes.freshmeat.net/projects/greyscaled/
-	http://themes.freshmeat.net/projects/ufosightings/
-	http://themes.freshmeat.net/projects/1in1-xp/
-	http://themes.freshmeat.net/projects/winclassic/
-	http://themes.freshmeat.net/projects/elberg-icewm/
-	http://themes.freshmeat.net/projects/gertplastik/
-	http://themes.freshmeat.net/projects/qnx_icewm/
-	http://themes.freshmeat.net/projects/truecurve/
-	http://themes.freshmeat.net/projects/miggy4/
-	http://themes.freshmeat.net/projects/axxlite/
-	http://themes.freshmeat.net/projects/phaaba/
-	http://themes.freshmeat.net/projects/icequa/
-	http://themes.freshmeat.net/projects/bluecrux/
-	http://themes.freshmeat.net/projects/cruxteal/
-	http://themes.freshmeat.net/projects/kliin/
-	http://themes.freshmeat.net/projects/icewmsilverxp/"
-THEME_URI="http://download.freshmeat.net/themes"
-SRC_URI="${THEME_URI}/icecrack/icecrack-default-2.0.0.tar.gz
-	${THEME_URI}/icebox-red/icebox-red-default-1.2.13.tar.gz
-	${THEME_URI}/cyrusicewm/cyrusicewm-1.0.0.tar
-	${THEME_URI}/greyscaled/greyscaled-stable.tar.gz
-	${THEME_URI}/ufosightings/ufosightings-1.0.0.tar.gz
-	${THEME_URI}/1in1-xp/1in1-xp-default-1.1.tar
-	http://themes.freshmeat.net/redir/winclassic/59702/url_tgz/theme-winclassic-1.1.tar.gz
-	${THEME_URI}/elberg-icewm/elberg-icewm-default-1.1.tar.gz
-	${THEME_URI}/gertplastik/gertplastik-default-20051225.tar
-	${THEME_URI}/qnx_icewm/qnx_icewm-default-1.0.tar
-	${THEME_URI}/truecurve/truecurve-default-1.0.4.tar
-	${THEME_URI}/miggy4/miggy4-default-0.2.tar
-	${THEME_URI}/axxlite/axxlite-default-1.0.tar
-	${THEME_URI}/phaaba/phaaba-1.0.7.tar
-	${THEME_URI}/icequa/icequa-default-1.0.2.tar
-	http://themes.freshmeat.net/redir/bluecrux/30224/url_tgz/bluecrux-default-1.1.tar.gz
-	http://themes.freshmeat.net/redir/cruxteal/34933/url_tgz/cruxteal-default-1.0.3.tar.gz
-	http://themes.freshmeat.net/redir/kliin/32422/url_tgz/kliin-default-0.1.tar.gz
-	mirror://sourceforge/icewmsilverxp/SilverXP-1.2.17-single-1.tar.bz2"
-
-## GPL-2:
-# icecrack, icebox, cyrus-icewm, ufosightings, axxlite, phaaba,
-# winclassic, elberg, gertplastic, cruxteal, truecurve, bluecrux,
-# silverxp
-## Public Domain:
-# greyscaled
-## Freedist:
-# 1in1-xp
-## Free for non commercial use:
-# qnx_icewm, kliin, miigy4
-## BSD:
-# icequa
-LICENSE="GPL-2 public-domain freedist free-noncomm BSD"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="x11-wm/icewm"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find . -name \.xvpics | xargs rm -rf
-	find . -name \*~ | xargs rm -rf
-}
-
-src_install() {
-	local ICEWM_THEMES=/usr/share/icewm/themes
-	dodir ${ICEWM_THEMES} || die
-	cp -pR * "${D}"/${ICEWM_THEMES} || die
-	chown -R root:0 "${D}"/${ICEWM_THEMES} || die
-	rm -f "${D}"/${ICEWM_THEMES}/Cyrus-IceWM/cpframes.sh || die "Failed in Cyrus-IceWM theme fix"
-
-	# start elberg theme packaging fix
-	mv "${D}"/${ICEWM_THEMES}/themes/* "${D}"/${ICEWM_THEMES} || die "Error in elberg theme fix"
-	rmdir "${D}"/${ICEWM_THEMES}/themes || die "Error in elberg theme fix"
-	# end elberg theme packaging fix
-
-	# start silverxp theme packaging fix
-	mv "${D}"/${ICEWM_THEMES}/icewm/themes/* "${D}"/${ICEWM_THEMES} || die "Error in sivlerxp theme fix"
-	rm -rf "${D}"/${ICEWM_THEMES}/icewm || die "Error in silverxp theme fix"
-	# end silverxp theme packaging fix
-
-	# use -print0 and xargs --null to handle file names with spaces!
-	find "${D}"/${ICEWM_THEMES} -type d -print0 | xargs --null chmod 755 || die "Error changing permissions on theme dirs!"
-	find "${D}"/${ICEWM_THEMES} -type f -print0 | xargs --null chmod 644 || die "Error changing permissions on theme files!"
-}
-
-pkg_postinst() {
-	einfo "Themes created by: Sawsedge, david_bv, tal256, adisk, fagga, Josh
-	Rush, Gert Brinkmann, Kocil, speleo3, bazhen, Alethes, Guy CLO, shellbeach,
-	luciash d' being, Alexander Portnoy, drewbian, victord, ormaxx, and Michael
-	Szota."
-}

diff --git a/x11-themes/icewm-themes/metadata.xml b/x11-themes/icewm-themes/metadata.xml
deleted file mode 100644
index 56c190fd4f0..00000000000
--- a/x11-themes/icewm-themes/metadata.xml
+++ /dev/null
@@ -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>polynomial-c@g.o</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">icewmsilverxp</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/x11-themes/vdrgraphtft-avp/Manifest b/x11-themes/vdrgraphtft-avp/Manifest
deleted file mode 100644
index 1ff8247b513..00000000000
--- a/x11-themes/vdrgraphtft-avp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST alien-vs-predator-0.3.1.tar.bz2 5357940 BLAKE2B 11d2da067efd7c438c24eac9b3dfa18f53efa8057289b958abd12104aa4f263c1c838952518491ab5d86b5aa8aab5041a43c32247324f8751d81afadacdb0a00 SHA512 253b532f3f4ae147bc136985f9f4390da7de1191af0c12882142c6dfa01fe0a6e5b74eb3270e47827a7b7f027447ad20caace8d5d353095548e59c15bc8a9817

diff --git a/x11-themes/vdrgraphtft-avp/metadata.xml b/x11-themes/vdrgraphtft-avp/metadata.xml
deleted file mode 100644
index 27f419c289c..00000000000
--- a/x11-themes/vdrgraphtft-avp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@g.o</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/x11-themes/vdrgraphtft-avp/vdrgraphtft-avp-0.3.1.ebuild b/x11-themes/vdrgraphtft-avp/vdrgraphtft-avp-0.3.1.ebuild
deleted file mode 100644
index 97623ce0746..00000000000
--- a/x11-themes/vdrgraphtft-avp/vdrgraphtft-avp-0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="${PN/vdrgraphtft-avp/alien-vs-predator}"
-
-DESCRIPTION="GraphTFT theme: Alien vs Predator"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${MY_PN}-${PV}.tar.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		|| (
-			>=media-plugins/vdr-graphtft-0.3.1
-			media-plugins/vdr-graphtftng
-		)"
-
-S="${WORKDIR}/avp"
-
-src_prepare() {
-
-	# remove dead links
-	cd "${S}"/columnimages
-	rm {srew.png,pause.png,frew1.png,frew2.png,frew3.png,play.png,ffwd1.png,ffwd2.png,ffwd3.png,sfwd.png,recOn.png}
-}
-
-src_install() {
-
-	insinto /usr/share/vdr/graphTFT/themes/avp/
-	doins -r "${S}"/*
-}

diff --git a/x11-themes/vdrgraphtft-deepblue/Manifest b/x11-themes/vdrgraphtft-deepblue/Manifest
deleted file mode 100644
index a2dfbb1e240..00000000000
--- a/x11-themes/vdrgraphtft-deepblue/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST DeepBlue-horchi-0.3.1.tar.bz2 2048037 BLAKE2B 1ffaa29d02a529eedfd659291a747c646b2b6d9febd1a5180692fec94dda67505b5be547d762ba4d08908f6edb9a95fea8f5d8100abcb421709e972e096d27e5 SHA512 ca04b9f1792185751793773f78266bdb89cae5412c37b5b6e8f490536d3a6bb9b5ce9815b9c7fc150d561843356e34d9c8705e48a6c08e40db6057b89f6ac371
-DIST vdr-graphtftng-0.4.7_DeepBlue.theme.bz2 10804 BLAKE2B 2f879fab71ec1aa19c8f5c3b551be21b9cf6ecb42a8aa8f4e296bf0bee8a41f82a8c38983887eac7ea21c550485c4967f32fe8e4ac97e73afae0708510fc17be SHA512 5057a4b15cb7622d69c1197a6cc975bfeaff34a02c9038419544d3c14965c65530d37fcf6ddef74d7f71cb52d36ee443a575ea74d10316a72f0974600ade5d81

diff --git a/x11-themes/vdrgraphtft-deepblue/metadata.xml b/x11-themes/vdrgraphtft-deepblue/metadata.xml
deleted file mode 100644
index 27f419c289c..00000000000
--- a/x11-themes/vdrgraphtft-deepblue/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@g.o</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/x11-themes/vdrgraphtft-deepblue/vdrgraphtft-deepblue-0.3.1.ebuild b/x11-themes/vdrgraphtft-deepblue/vdrgraphtft-deepblue-0.3.1.ebuild
deleted file mode 100644
index 3b86dcc5d36..00000000000
--- a/x11-themes/vdrgraphtft-deepblue/vdrgraphtft-deepblue-0.3.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="${PN/vdrgraphtft-deepblue/DeepBlue-horchi}"
-
-DESCRIPTION="GraphTFT theme: Deep Blue"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://www.jwendel.de/vdr/${MY_PN}-${PV}.tar.bz2
-		http://vdr.websitec.de/download/${PN}/vdr-graphtftng-0.4.7_DeepBlue.theme.bz2"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		|| (
-			>=media-plugins/vdr-graphtft-0.3.1
-			media-plugins/vdr-graphtftng
-		)"
-
-S="${WORKDIR}/DeepBlue"
-
-src_install() {
-
-	insinto /usr/share/vdr/graphTFT/themes/DeepBlue/
-	doins -r "${S}"/*
-
-	if has_version ">=media-plugins/vdr-graphtftng-0.4.7"; then
-		newins "${WORKDIR}/vdr-graphtftng-0.4.7_DeepBlue.theme" DeepBlue.theme
-	fi
-}

diff --git a/x11-themes/vdrgraphtft-deeppurple/Manifest b/x11-themes/vdrgraphtft-deeppurple/Manifest
deleted file mode 100644
index ec6381a9ead..00000000000
--- a/x11-themes/vdrgraphtft-deeppurple/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST DeepPurple.0.3.2.tar.bz2 3395727 BLAKE2B e993804fc245b8171304f38b0240a2645e38454d9e8e5303a4960d5a0c75dd73772e9b1d8f469c05ee876971185dde8239df334f320f829e036fcd38cd79cd6e SHA512 ee6100cb754b980f26a179d811250ff258b94cf1bbfe947b2288e8d73a7ae0244f7302d1429b4d9b109491b713e5d007e3aeddc33d17a1302cd10fe5e27a3bc4

diff --git a/x11-themes/vdrgraphtft-deeppurple/metadata.xml b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
deleted file mode 100644
index 27f419c289c..00000000000
--- a/x11-themes/vdrgraphtft-deeppurple/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@g.o</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/x11-themes/vdrgraphtft-deeppurple/vdrgraphtft-deeppurple-0.3.2.ebuild b/x11-themes/vdrgraphtft-deeppurple/vdrgraphtft-deeppurple-0.3.2.ebuild
deleted file mode 100644
index 6f32adcaf1d..00000000000
--- a/x11-themes/vdrgraphtft-deeppurple/vdrgraphtft-deeppurple-0.3.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils
-
-MY_PN="${PN/vdrgraphtft-deeppurple/DeepPurple}"
-
-DESCRIPTION="GraphTFT theme: Alien vs Predator"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_PN}.0.3.2.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		>=media-plugins/vdr-graphtft-0.3.1"
-
-S="${WORKDIR}/DeepPurple"
-
-src_prepare() {
-
-	# remove dead links
-	cd "${S}"/columnimages
-	rm {srew.png,pause.png,frew1.png,frew2.png,frew3.png,play.png,ffwd1.png,ffwd2.png,ffwd3.png,sfwd.png,recOn.png}
-}
-
-src_install() {
-
-	insinto /usr/share/vdr/graphTFT/themes/DeepPurple/
-	doins -r "${S}"/*
-}

diff --git a/x11-themes/vdrgraphtft-poetter/Manifest b/x11-themes/vdrgraphtft-poetter/Manifest
deleted file mode 100644
index b753687fe22..00000000000
--- a/x11-themes/vdrgraphtft-poetter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST poetter.0.3.2.tar.bz2 3907728 BLAKE2B e822a041b3b2f05a8a0dc6bd0e223686da3f562e81ff4514ed597083581b47ff5dcd1288c20ffd9bd089e29ee96573d64eb03af574695551bd7955f7576be4e2 SHA512 c0c6a3203590bef70b9ae88436cb49fe79fa47366a3b0665e4865ce7cc6f69689573dfb8f5ac28db28e8a7c4f3c4f5a957357147d8d032344d91a2fa0eaff4df

diff --git a/x11-themes/vdrgraphtft-poetter/metadata.xml b/x11-themes/vdrgraphtft-poetter/metadata.xml
deleted file mode 100644
index 27f419c289c..00000000000
--- a/x11-themes/vdrgraphtft-poetter/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>vdr@g.o</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-</pkgmetadata>

diff --git a/x11-themes/vdrgraphtft-poetter/vdrgraphtft-poetter-0.3.2.ebuild b/x11-themes/vdrgraphtft-poetter/vdrgraphtft-poetter-0.3.2.ebuild
deleted file mode 100644
index 2f2de0d62e4..00000000000
--- a/x11-themes/vdrgraphtft-poetter/vdrgraphtft-poetter-0.3.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-MY_PN="${PN/vdrgraphtft-poetter/poetter}"
-
-DESCRIPTION="GraphTFT theme: Poetter"
-HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Graphtft-plugin"
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_PN}.0.3.2.tar.bz2"
-
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-		>=media-plugins/vdr-graphtft-0.3.1"
-
-S="${WORKDIR}/poetter"
-
-src_install() {
-
-	insinto /usr/share/vdr/graphTFT/themes/poetter/
-	doins -r "${S}"/*
-}