summaryrefslogtreecommitdiff
path: root/gnome-extra
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:58:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:58:29 +0100
commit0cf2f20608308acdf3cb922c3736446bbd8f3388 (patch)
tree07815070629c7c11000a7f51ceb8ccbccb49a809 /gnome-extra
parent1798c4aeca70ac8d0a243684d6a798fbc65735f8 (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/Manifest.gzbin10486 -> 13433 bytes
-rw-r--r--gnome-extra/assogiate-0.2.1-r113
-rw-r--r--gnome-extra/assogiate/Manifest7
-rw-r--r--gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild50
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch19
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch17
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch57
-rw-r--r--gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch26
-rw-r--r--gnome-extra/assogiate/metadata.xml8
-rw-r--r--gnome-extra/chrome-gnome-shell-1014
-rw-r--r--gnome-extra/chrome-gnome-shell-8-r114
-rw-r--r--gnome-extra/chrome-gnome-shell-914
-rw-r--r--gnome-extra/chrome-gnome-shell/Manifest10
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild40
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild69
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild60
-rw-r--r--gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch32
-rw-r--r--gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch91
-rw-r--r--gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch28
-rw-r--r--gnome-extra/chrome-gnome-shell/metadata.xml16
-rw-r--r--gnome-extra/cinnamon-3.6.6-r214
-rw-r--r--gnome-extra/cinnamon-control-center-3.6.513
-rw-r--r--gnome-extra/cinnamon-control-center/Manifest3
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild89
-rw-r--r--gnome-extra/cinnamon-control-center/metadata.xml14
-rw-r--r--gnome-extra/cinnamon-desktop-3.6.214
-rw-r--r--gnome-extra/cinnamon-desktop/Manifest4
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild68
-rw-r--r--gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override5
-rw-r--r--gnome-extra/cinnamon-desktop/metadata.xml11
-rw-r--r--gnome-extra/cinnamon-menus-3.6.013
-rw-r--r--gnome-extra/cinnamon-menus/Manifest3
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild38
-rw-r--r--gnome-extra/cinnamon-menus/metadata.xml11
-rw-r--r--gnome-extra/cinnamon-screensaver-3.6.1-r114
-rw-r--r--gnome-extra/cinnamon-screensaver/Manifest3
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild90
-rw-r--r--gnome-extra/cinnamon-screensaver/metadata.xml11
-rw-r--r--gnome-extra/cinnamon-session-3.6.1-r413
-rw-r--r--gnome-extra/cinnamon-session/Manifest6
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild69
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch38
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch65
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch21
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml11
-rw-r--r--gnome-extra/cinnamon-settings-daemon-3.6.1-r114
-rw-r--r--gnome-extra/cinnamon-settings-daemon/Manifest4
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild85
-rw-r--r--gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch84
-rw-r--r--gnome-extra/cinnamon-settings-daemon/metadata.xml14
-rw-r--r--gnome-extra/cinnamon-translations-3.6.311
-rw-r--r--gnome-extra/cinnamon-translations-3.6.3-r113
-rw-r--r--gnome-extra/cinnamon-translations/Manifest4
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild34
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild34
-rw-r--r--gnome-extra/cinnamon-translations/metadata.xml11
-rw-r--r--gnome-extra/cinnamon/Manifest7
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild229
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch44
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch26
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch19
-rw-r--r--gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop9
-rw-r--r--gnome-extra/cinnamon/metadata.xml11
-rw-r--r--gnome-extra/cjs-3.6.114
-rw-r--r--gnome-extra/cjs/Manifest4
-rw-r--r--gnome-extra/cjs/cjs-3.6.1.ebuild83
-rw-r--r--gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch25
-rw-r--r--gnome-extra/cjs/metadata.xml11
-rw-r--r--gnome-extra/eiciel-0.9.1113
-rw-r--r--gnome-extra/eiciel-0.9.11-r113
-rw-r--r--gnome-extra/eiciel/Manifest4
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild35
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.11.ebuild34
-rw-r--r--gnome-extra/eiciel/metadata.xml8
-rw-r--r--gnome-extra/evolution-data-server-3.22.715
-rw-r--r--gnome-extra/evolution-data-server-3.24.715
-rw-r--r--gnome-extra/evolution-data-server/Manifest8
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild135
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild152
-rw-r--r--gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch31
-rw-r--r--gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch146
-rw-r--r--gnome-extra/evolution-data-server/files/calentry.schema108
-rw-r--r--gnome-extra/evolution-data-server/metadata.xml16
-rw-r--r--gnome-extra/evolution-ews-3.24.614
-rw-r--r--gnome-extra/evolution-ews/Manifest5
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild66
-rw-r--r--gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch33
-rw-r--r--gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch44
-rw-r--r--gnome-extra/evolution-ews/metadata.xml8
-rw-r--r--gnome-extra/gconf-editor-3.0.1-r112
-rw-r--r--gnome-extra/gconf-editor/Manifest5
-rw-r--r--gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch34
-rw-r--r--gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch66
-rw-r--r--gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild34
-rw-r--r--gnome-extra/gconf-editor/metadata.xml8
-rw-r--r--gnome-extra/gnome-boxes-3.24.1-r113
-rw-r--r--gnome-extra/gnome-boxes/Manifest3
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild106
-rw-r--r--gnome-extra/gnome-boxes/metadata.xml8
-rw-r--r--gnome-extra/gnome-calculator-3.24.012
-rw-r--r--gnome-extra/gnome-calculator/Manifest3
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild39
-rw-r--r--gnome-extra/gnome-calculator/metadata.xml8
-rw-r--r--gnome-extra/gnome-calendar-3.24.312
-rw-r--r--gnome-extra/gnome-calendar/Manifest5
-rw-r--r--gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch49
-rw-r--r--gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch112
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild42
-rw-r--r--gnome-extra/gnome-calendar/metadata.xml8
-rw-r--r--gnome-extra/gnome-characters-3.24.013
-rw-r--r--gnome-extra/gnome-characters/Manifest3
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild56
-rw-r--r--gnome-extra/gnome-characters/metadata.xml8
-rw-r--r--gnome-extra/gnome-clocks-3.24.012
-rw-r--r--gnome-extra/gnome-clocks/Manifest3
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild36
-rw-r--r--gnome-extra/gnome-clocks/metadata.xml8
-rw-r--r--gnome-extra/gnome-color-manager-3.24.013
-rw-r--r--gnome-extra/gnome-color-manager/Manifest3
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild64
-rw-r--r--gnome-extra/gnome-color-manager/metadata.xml12
-rw-r--r--gnome-extra/gnome-commander-1.6.314
-rw-r--r--gnome-extra/gnome-commander-1.6.414
-rw-r--r--gnome-extra/gnome-commander-1.8.014
-rw-r--r--gnome-extra/gnome-commander-1.8.113
-rw-r--r--gnome-extra/gnome-commander/Manifest9
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild70
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild70
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild69
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild58
-rw-r--r--gnome-extra/gnome-commander/metadata.xml30
-rw-r--r--gnome-extra/gnome-contacts-3.22.1-r113
-rw-r--r--gnome-extra/gnome-contacts/Manifest5
-rw-r--r--gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch29
-rw-r--r--gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch50
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild75
-rw-r--r--gnome-extra/gnome-contacts/metadata.xml8
-rw-r--r--gnome-extra/gnome-directory-thumbnailer-0.1.1012
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/Manifest3
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild24
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/metadata.xml8
-rw-r--r--gnome-extra/gnome-documents-3.24.312
-rw-r--r--gnome-extra/gnome-documents/Manifest3
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild45
-rw-r--r--gnome-extra/gnome-documents/metadata.xml8
-rw-r--r--gnome-extra/gnome-dvb-daemon-0.2.9013
-rw-r--r--gnome-extra/gnome-dvb-daemon/Manifest3
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild75
-rw-r--r--gnome-extra/gnome-dvb-daemon/metadata.xml16
-rw-r--r--gnome-extra/gnome-getting-started-docs-3.24.113
-rw-r--r--gnome-extra/gnome-getting-started-docs/Manifest3
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild19
-rw-r--r--gnome-extra/gnome-getting-started-docs/metadata.xml8
-rw-r--r--gnome-extra/gnome-integration-spotify-20140907-r114
-rw-r--r--gnome-extra/gnome-integration-spotify/Manifest3
-rw-r--r--gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild48
-rw-r--r--gnome-extra/gnome-integration-spotify/metadata.xml11
-rw-r--r--gnome-extra/gnome-logs-3.24.213
-rw-r--r--gnome-extra/gnome-logs/Manifest3
-rw-r--r--gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild52
-rw-r--r--gnome-extra/gnome-logs/metadata.xml8
-rw-r--r--gnome-extra/gnome-packagekit-3.22.113
-rw-r--r--gnome-extra/gnome-packagekit-3.24.013
-rw-r--r--gnome-extra/gnome-packagekit/Manifest5
-rw-r--r--gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild86
-rw-r--r--gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild84
-rw-r--r--gnome-extra/gnome-packagekit/metadata.xml8
-rw-r--r--gnome-extra/gnome-power-manager-3.24.013
-rw-r--r--gnome-extra/gnome-power-manager/Manifest3
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild54
-rw-r--r--gnome-extra/gnome-power-manager/metadata.xml12
-rw-r--r--gnome-extra/gnome-search-tool-3.6.012
-rw-r--r--gnome-extra/gnome-search-tool/Manifest3
-rw-r--r--gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild42
-rw-r--r--gnome-extra/gnome-search-tool/metadata.xml8
-rw-r--r--gnome-extra/gnome-shell-extensions-3.24.313
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons-plus-2112
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons-plus/Manifest3
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild44
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml11
-rw-r--r--gnome-extra/gnome-shell-extensions/Manifest3
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild76
-rw-r--r--gnome-extra/gnome-shell-extensions/metadata.xml8
-rw-r--r--gnome-extra/gnome-shell-frippery-3.24.010
-rw-r--r--gnome-extra/gnome-shell-frippery/Manifest3
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild38
-rw-r--r--gnome-extra/gnome-shell-frippery/metadata.xml8
-rw-r--r--gnome-extra/gnome-software-3.22.713
-rw-r--r--gnome-extra/gnome-software/Manifest3
-rw-r--r--gnome-extra/gnome-software/gnome-software-3.22.7.ebuild84
-rw-r--r--gnome-extra/gnome-software/metadata.xml8
-rw-r--r--gnome-extra/gnome-system-monitor-3.24.013
-rw-r--r--gnome-extra/gnome-system-monitor/Manifest3
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild39
-rw-r--r--gnome-extra/gnome-system-monitor/metadata.xml12
-rw-r--r--gnome-extra/gnome-tweak-tool-3.22.014
-rw-r--r--gnome-extra/gnome-tweak-tool-3.24.114
-rw-r--r--gnome-extra/gnome-tweak-tool/Manifest6
-rw-r--r--gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch26
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild71
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild70
-rw-r--r--gnome-extra/gnome-tweak-tool/metadata.xml8
-rw-r--r--gnome-extra/gnome-user-docs-3.24.213
-rw-r--r--gnome-extra/gnome-user-docs/Manifest3
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild40
-rw-r--r--gnome-extra/gnome-user-docs/metadata.xml8
-rw-r--r--gnome-extra/gnome-user-share-3.18.312
-rw-r--r--gnome-extra/gnome-user-share/Manifest4
-rw-r--r--gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch10
-rw-r--r--gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild49
-rw-r--r--gnome-extra/gnome-user-share/metadata.xml8
-rw-r--r--gnome-extra/gnome-utils-3.8.09
-rw-r--r--gnome-extra/gnome-utils/Manifest2
-rw-r--r--gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild22
-rw-r--r--gnome-extra/gnome-utils/metadata.xml8
-rw-r--r--gnome-extra/gnome-weather-3.24.013
-rw-r--r--gnome-extra/gnome-weather/Manifest3
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild49
-rw-r--r--gnome-extra/gnome-weather/metadata.xml8
-rw-r--r--gnome-extra/gtkhtml-4.10.012
-rw-r--r--gnome-extra/gtkhtml/Manifest3
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild43
-rw-r--r--gnome-extra/gtkhtml/metadata.xml8
-rw-r--r--gnome-extra/gucharmap-10.0.014
-rw-r--r--gnome-extra/gucharmap-10.0.314
-rw-r--r--gnome-extra/gucharmap-3.0.1-r20013
-rw-r--r--gnome-extra/gucharmap-9.0.214
-rw-r--r--gnome-extra/gucharmap-9.0.414
-rw-r--r--gnome-extra/gucharmap/Manifest12
-rw-r--r--gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch9
-rw-r--r--gnome-extra/gucharmap/gucharmap-10.0.0.ebuild63
-rw-r--r--gnome-extra/gucharmap/gucharmap-10.0.3.ebuild63
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild59
-rw-r--r--gnome-extra/gucharmap/gucharmap-9.0.2.ebuild63
-rw-r--r--gnome-extra/gucharmap/gucharmap-9.0.4.ebuild63
-rw-r--r--gnome-extra/gucharmap/metadata.xml8
-rw-r--r--gnome-extra/libgda-5.2.4-r215
-rw-r--r--gnome-extra/libgda/Manifest8
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch55
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch28
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-format-security.patch29
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-jre18.patch14
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch35
-rw-r--r--gnome-extra/libgda/libgda-5.2.4-r2.ebuild181
-rw-r--r--gnome-extra/libgda/metadata.xml16
-rw-r--r--gnome-extra/libgsf-1.14.41-r113
-rw-r--r--gnome-extra/libgsf-1.14.4313
-rw-r--r--gnome-extra/libgsf/Manifest5
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild39
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.43.ebuild39
-rw-r--r--gnome-extra/libgsf/metadata.xml11
-rw-r--r--gnome-extra/metadata.xml33
-rw-r--r--gnome-extra/mousetweaks-3.12.012
-rw-r--r--gnome-extra/mousetweaks/Manifest3
-rw-r--r--gnome-extra/mousetweaks/metadata.xml22
-rw-r--r--gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild30
-rw-r--r--gnome-extra/nautilus-actions-3.2.312
-rw-r--r--gnome-extra/nautilus-actions-3.2.412
-rw-r--r--gnome-extra/nautilus-actions/Manifest5
-rw-r--r--gnome-extra/nautilus-actions/metadata.xml8
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild58
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild58
-rw-r--r--gnome-extra/nautilus-dropbox-1.6.214
-rw-r--r--gnome-extra/nautilus-dropbox/Manifest4
-rw-r--r--gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch13
-rw-r--r--gnome-extra/nautilus-dropbox/metadata.xml5
-rw-r--r--gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild84
-rw-r--r--gnome-extra/nautilus-sendto-3.8.513
-rw-r--r--gnome-extra/nautilus-sendto/Manifest3
-rw-r--r--gnome-extra/nautilus-sendto/metadata.xml8
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild43
-rw-r--r--gnome-extra/nautilus-tracker-tags-1.12.412
-rw-r--r--gnome-extra/nautilus-tracker-tags/Manifest4
-rw-r--r--gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile15
-rw-r--r--gnome-extra/nautilus-tracker-tags/metadata.xml8
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild41
-rw-r--r--gnome-extra/nemo-3.6.414
-rw-r--r--gnome-extra/nemo/Manifest3
-rw-r--r--gnome-extra/nemo/metadata.xml15
-rw-r--r--gnome-extra/nemo/nemo-3.6.4.ebuild85
-rw-r--r--gnome-extra/nm-applet-1.4.6-r114
-rw-r--r--gnome-extra/nm-applet-1.8.1014
-rw-r--r--gnome-extra/nm-applet-1.8.10-r114
-rw-r--r--gnome-extra/nm-applet/Manifest12
-rw-r--r--gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch253
-rw-r--r--gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch38
-rw-r--r--gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch80
-rw-r--r--gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch39
-rw-r--r--gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch38
-rw-r--r--gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch137
-rw-r--r--gnome-extra/nm-applet/metadata.xml14
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild62
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild72
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.8.10.ebuild62
-rw-r--r--gnome-extra/office-runner-1.0.212
-rw-r--r--gnome-extra/office-runner/Manifest3
-rw-r--r--gnome-extra/office-runner/metadata.xml14
-rw-r--r--gnome-extra/office-runner/office-runner-1.0.2.ebuild42
-rw-r--r--gnome-extra/polkit-gnome-0.105-r112
-rw-r--r--gnome-extra/polkit-gnome/Manifest3
-rw-r--r--gnome-extra/polkit-gnome/metadata.xml8
-rw-r--r--gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild44
-rw-r--r--gnome-extra/seahorse-nautilus-3.11.9212
-rw-r--r--gnome-extra/seahorse-nautilus/Manifest3
-rw-r--r--gnome-extra/seahorse-nautilus/metadata.xml8
-rw-r--r--gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild55
-rw-r--r--gnome-extra/sushi-3.24.013
-rw-r--r--gnome-extra/sushi/Manifest3
-rw-r--r--gnome-extra/sushi/metadata.xml12
-rw-r--r--gnome-extra/sushi/sushi-3.24.0.ebuild49
-rw-r--r--gnome-extra/synapse-0.2.99.213
-rw-r--r--gnome-extra/synapse/Manifest3
-rw-r--r--gnome-extra/synapse/metadata.xml14
-rw-r--r--gnome-extra/synapse/synapse-0.2.99.2.ebuild55
-rw-r--r--gnome-extra/yelp-3.22.012
-rw-r--r--gnome-extra/yelp-xsl-3.20.112
-rw-r--r--gnome-extra/yelp-xsl/Manifest3
-rw-r--r--gnome-extra/yelp-xsl/metadata.xml8
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild25
-rw-r--r--gnome-extra/yelp/Manifest4
-rw-r--r--gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch117
-rw-r--r--gnome-extra/yelp/metadata.xml8
-rw-r--r--gnome-extra/yelp/yelp-3.22.0.ebuild57
-rw-r--r--gnome-extra/zenity-3.24.013
-rw-r--r--gnome-extra/zenity/Manifest3
-rw-r--r--gnome-extra/zenity/metadata.xml8
-rw-r--r--gnome-extra/zenity/zenity-3.24.0.ebuild45
327 files changed, 1029 insertions, 8043 deletions
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ba10073fdebd..0898dc8b4f76 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
Binary files differ
diff --git a/gnome-extra/assogiate-0.2.1-r1 b/gnome-extra/assogiate-0.2.1-r1
new file mode 100644
index 000000000000..ac0d46d03e8d
--- /dev/null
+++ b/gnome-extra/assogiate-0.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40:2.6 >=dev-cpp/gnome-vfsmm-2.26.0-r1 app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=assoGiate is an editor of the file types database for GNOME
+EAPI=5
+HOMEPAGE=http://www.kdau.com/projects/assogiate
+IUSE=debug
+KEYWORDS=amd64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40:2.6 >=dev-cpp/gnome-vfsmm-2.26.0-r1
+SLOT=0
+SRC_URI=http://www.kdau.com/files/assogiate-0.2.1.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ba36ed6de369d457206f19a80711fa8
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
deleted file mode 100644
index 1b215d5924af..000000000000
--- a/gnome-extra/assogiate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX assogiate-0.2.1-desktop.patch 678 BLAKE2B 6aa59f1d862b829abe52f1f3681f95b2b97e66c9f481575ef5a2b6669c51a64b8c5b519bb5af284c5e65339d22a5737ad83ad6904c9d57280408f301c463bb54 SHA512 db9c31c389e6b0b8f789891bab949a3b6cb0f0d2dbb15d61e4e2d4d66506f893dc788e66e6ceb484a3c41fa2f3e82d4f30a58f052c823398bde7ca2f8b8a5968
-AUX assogiate-0.2.1-gcc-4.7.patch 729 BLAKE2B 9425f2889437ab8543ebad8b9a4da1e47760979d090ebd5d0dae2cf5386891d92e3a409f6f228e0ec002e7b108d7c7cd0b17538933b5c34105e7e9ec44ba6754 SHA512 30b6c0b4223467c5dc05e6ef9fcc111a1b2e7a6ba9d520e6d7d5cae4994dfdef0a4b4bb087e508e32593f6c8da2ff5c97a1cffd87ccc91d9c6a8f88fba936eb0
-AUX assogiate-0.2.1-glib-2.32.patch 2108 BLAKE2B 44c629864ab3c1ca6272f547ab8f1ca101bd6864aa27a7e962f05c1d3263be3df4e63fff16a44a8df796c660ed16a825ec42f786fd2a02a215db7a4ffd9daf10 SHA512 0f31eb8fabc13d898fbcf760d76de772f546a521b5a5a56d0728ced1d73d5ef98fbea96bec2075d8a392e641eee8e8729e1813f6a2caa9d2db14601de6988d47
-AUX assogiate-0.2.1-typedialog.patch 1037 BLAKE2B 310051829863b8a2c9f473244240f6471428744699438508ed7caf29c03856be46ee6d690d0d8b471f8a29961ffcadbfcc449e5a63fbabcd39b89ee2606f48f2 SHA512 d242b3933e287eb3d3e7b64ef5abe31e776307a974b9e40069ffabb19c414450cef2022ce4cc78cd28022ad8bec2c1e5e86eda50e3d94c9a23cdb352b5f6c7a1
-DIST assogiate-0.2.1.tar.bz2 369446 BLAKE2B 5b2e656eb9b1f77b73e4b736c748c45aac0be6102cc497139e8f11df38caa7874a02fd04e064e057465c2309876e9ea3a6fa5bff7164c4f3c59933f5b9b6cbb0 SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac
-EBUILD assogiate-0.2.1-r1.ebuild 1078 BLAKE2B 15eff1369f00a24e878c4515eba0b24cd12b28f0b42f86ee04d1f3f59428e3711df8978d82fc999f2db7eed8dea72df357e574e2ceebf7f43d7e2f6e2c327d6a SHA512 2efb15d5150080f6f95c6ad72632d9b6262e11b84549a5a62f79191275a461a468c886101fa20f9e403d398f39cc970a2ce1fe13ce3a883d1e595024141b55f3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
deleted file mode 100644
index 4737a2b52173..000000000000
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils flag-o-matic gnome2
-
-DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
-HOMEPAGE="http://www.kdau.com/projects/assogiate"
-SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.8:2
- >=dev-cpp/glibmm-2.46:2
- >=dev-cpp/gtkmm-2.24.4-r3:2.4
- >=dev-cpp/libxmlpp-2.40:2.6
- >=dev-cpp/gnome-vfsmm-2.26.0-r1
-"
-DEPEND="${RDEPEND}
- app-text/gnome-doc-utils
- dev-util/intltool
- virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
- # Fix desktop file
- epatch "${FILESDIR}"/${P}-desktop.patch
-
- # Fix compilation, bug #374911
- epatch "${FILESDIR}"/${P}-typedialog.patch
-
- # Fix building with glib-2.32, bug #417765
- epatch "${FILESDIR}"/${P}-glib-2.32.patch
-
- # Fix building with gcc-4.7
- epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-
- eautoreconf
- gnome2_src_prepare
-
- append-cxxflags -std=c++11
-}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
deleted file mode 100644
index 3944938611de..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Update assogiate desktop file
-Author: Vincent Legout <vincent@legout.info>
-
-Index: assogiate/data/assogiate.desktop.in
-===================================================================
---- assogiate.orig/data/assogiate.desktop.in 2011-05-02 20:46:29.322670186 +0200
-+++ assogiate/data/assogiate.desktop.in 2011-05-02 20:46:47.835433235 +0200
-@@ -1,9 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=File Types Editor
- _Comment=Modify the detection and display of file types
- Exec=assogiate
- Icon=assogiate
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;System;FileTools;
-+Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
-+OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
deleted file mode 100644
index 33d13bd067d5..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix ftbfs with gcc-4.7
-Author: Vincent Legout <vlegout@debian.org>
-Last-Update: 2012-04-04
-Bug-Debian: http://bugs.debian.org/667104
-
-Index: assogiate/libassogiate/mime-package.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-package.cc 2012-03-25 10:47:26.524889975 +0200
-+++ assogiate/libassogiate/mime-package.cc 2012-04-04 18:54:11.675024484 +0200
-@@ -31,6 +31,7 @@
- #include <libxml/tree.h>
- #include <libxml++/parsers/domparser.h>
- #include <libgnomevfsmm/init.h>
-+#include <unistd.h>
-
- /******************************************************************************/
- /* Globals */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
deleted file mode 100644
index 0bcecc31e5ab..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Include glib.h instead of individual headers
-Author: Vincent Legout <vlegout@debian.org>
-Bug-Debian: http://bugs.debian.org/665507
-
-Index: assogiate/libassogiate/mime-database.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-database.cc 2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/mime-database.cc 2012-03-25 10:47:00.072890551 +0200
-@@ -23,7 +23,7 @@
- #include "private.hh"
- #include "mime-database.hh"
-
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/miscutils.h>
-
- /******************************************************************************/
-Index: assogiate/libassogiate/mime-type.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-type.cc 2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/mime-type.cc 2012-03-25 10:47:00.072890551 +0200
-@@ -23,7 +23,7 @@
- #include "private.hh"
- #include "mime-type.hh"
-
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <gtkmm/icontheme.h>
- #include <libxml++/nodes/element.h>
- #include <libxml++/nodes/textnode.h>
-Index: assogiate/libassogiate/misc/extras.cc
-===================================================================
---- assogiate.orig/libassogiate/misc/extras.cc 2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/misc/extras.cc 2012-03-25 10:47:00.092890549 +0200
-@@ -24,7 +24,7 @@
-
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
-
- /******************************************************************************/
-Index: assogiate/src/main.cc
-===================================================================
---- assogiate.orig/src/main.cc 2012-03-25 10:43:34.396895145 +0200
-+++ assogiate/src/main.cc 2012-03-25 10:47:07.628890386 +0200
-@@ -28,8 +28,7 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
deleted file mode 100644
index 188c69be7cad..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix ftbfs
-Author: Vincent Legout <vincent@legout.info>
-Bug-Debian: http://bugs.debian.org/624924
-
-Index: assogiate/src/type-dialog.cc
-===================================================================
---- assogiate.orig/src/type-dialog.cc 2011-05-09 16:51:09.951622099 +0200
-+++ assogiate/src/type-dialog.cc 2011-05-09 16:51:53.293459257 +0200
-@@ -144,7 +144,7 @@
- general_upper->pack_start(*Gtk::manage(general_info), true, true);
-
- if (renameable) {
-- Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
-+ Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
- cb->signal_changed().connect
- (sigc::mem_fun(*this, &TypeDialog::on_category_changed));
- m_category_widget = cb;
-@@ -622,7 +622,7 @@
- } else {
- AddItemDialog adder(this, _("Add File Contents Rule"));
-
-- Gtk::ComboBox type(MagicTypesStore::get());
-+ Gtk::ComboBox type(MagicTypesStore::get(), false);
- type.pack_start(MagicTypesColumns::get().name);
- adder.add_item(_("_Type:"), type, true);
-
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/assogiate/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/chrome-gnome-shell-10 b/gnome-extra/chrome-gnome-shell-10
new file mode 100644
index 000000000000..d675a5007cd2
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b746dd79307f2a5ae4d7a67c3dffbed9
diff --git a/gnome-extra/chrome-gnome-shell-8-r1 b/gnome-extra/chrome-gnome-shell-8-r1
new file mode 100644
index 000000000000..1400ca70aaf5
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/8/chrome-gnome-shell-8.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=53d1f29efdf28dc060d15c13cf640827
diff --git a/gnome-extra/chrome-gnome-shell-9 b/gnome-extra/chrome-gnome-shell-9
new file mode 100644
index 000000000000..7ac0a37f8682
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/9/chrome-gnome-shell-9.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fbee6ceb44e90a85ce6acd2daa258e7c
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
deleted file mode 100644
index d8d75d935716..000000000000
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX chrome-gnome-shell-8-enabled-extensions-array.patch 1231 BLAKE2B 78150fd5c0aa3591d14d8856e2946f41cf91bc61bbcf6fe2e1f8427c33a45daa9f01224ecd197ae9f98f4acb9050039bf86e3d062377abbd1cb7c9ab237af959 SHA512 1c7423fcea6b258ae55fdc83658dab547b199b2b69e4f0fa54dc6b922718a23ebe6cf506a279eeff6c7c3a42bcc662e218bf5d4be9825c3558150495dc8a3bcf
-AUX chrome-gnome-shell-8-get_dbus_connection.patch 2851 BLAKE2B 7ab0caf998f58f3b8d5c03634f35d6a771fd2bcb42af68d6a459662449e5743e71e2243e2dfa929be9c5bff0183716c518beba75b6d37ac12b9b892ecb521684 SHA512 555674bf8b4077f466657ae101da344c17fbc8062012ab341943b48d3260fa83b9a0a3d7c7fdd11dd93e856cbbce5aaf6f7561b9d6457081cec3398d79ecbfc8
-AUX chrome-gnome-shell-8-metadata-version.patch 1155 BLAKE2B be54db5312bff9f23a672068c71689ad2509ab67089a0dcc6558e37ea86b85ba31a67c7070b8e0b581fa884c1fe0adec50a63ab3776ab8bcec557a7626c59641 SHA512 2d38dfd0fe30829053a7f3bcbee8a2afa6cda2cfe1b52d664338b95081b49d9974a5a976a75ebad7401c5dbeb4e76d0920e260e20f722c7af0f9f83b9bd224e8
-DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
-DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
-EBUILD chrome-gnome-shell-10.ebuild 1029 BLAKE2B 95861f4deb9861f6bcf0fefa2ecb04f9b273de8bb9e1f40bd5e289cbd887f91de8b44eafd62f71fcadbba4a15f79101c6bd1a4ccdfbe204707d3c705a4c00885 SHA512 9d1aed107c5433bc942500163e0c8ba463429e5e474a24bc74afe52843c14e82d15a415d5ed4584c9f2d500b1c8e72156f275c4f009b092b1d26a6c194880327
-EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
-EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
-MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
deleted file mode 100644
index a932b4e301dc..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-misc/jq
- sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- gnome-base/gnome-shell
-"
-
-src_configure() {
- local mycmakeargs=( -DBUILD_EXTENSION=OFF )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- elog "Please note that this package provides native messaging connector only."
- elog "You can install browser extension using link provided at"
- elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
deleted file mode 100644
index 0ddf6116f70a..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-misc/jq
- sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- gnome-base/gnome-shell
-"
-
-PATCHES=(
- "${FILESDIR}/${P}"-enabled-extensions-array.patch
- "${FILESDIR}/${P}"-metadata-version.patch
- "${FILESDIR}/${P}"-get_dbus_connection.patch
-)
-
-src_configure() {
- local mycmakeargs=( -DBUILD_EXTENSION=OFF )
- cmake-utils_src_configure
-}
-
-src_install() {
- # Chrome policy files should be removed with package.
- # Otherwise it will not be possible to uninstall web extension
- # from browser.
- echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
- echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
- echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
- doenvd 50"${PN}"
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "If you are installing ${PN} for the first time then you should"
- elog "restart or reload dbus service before starting your browser."
- elog
- elog "Please note that this package provides native messaging connector only."
- elog
- elog "Managed policy was installed to force web extension installation"
- elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
- elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
- elog
- elog "For Mozilla Firefox you should manualy install web extension from"
- elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
- elog
- elog "For Opera you should manualy install web extension from"
- elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
deleted file mode 100644
index 599855c9cf5c..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- app-misc/jq
- sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- gnome-base/gnome-shell
-"
-
-src_configure() {
- local mycmakeargs=( -DBUILD_EXTENSION=OFF )
- cmake-utils_src_configure
-}
-
-src_install() {
- # Chrome policy files should be removed with package.
- # Otherwise it will not be possible to uninstall web extension
- # from browser.
- echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
- echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
- echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
- doenvd 50"${PN}"
-
- cmake-utils_src_install
-}
-
-pkg_postinst() {
- elog "Please note that this package provides native messaging connector only."
- elog
- elog "Managed policy was installed to force browser extension installation"
- elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
- elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
- elog
- elog "For Mozilla Firefox you should manualy install browser extension from"
- elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
- elog
- elog "For Opera you should manualy install browser extension from"
- elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
deleted file mode 100644
index 7a56ca0256be..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 19:43:30 +0400
-Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
- contains duplicates
-
-See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
----
- connector/chrome-gnome-shell.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 719a347..0b92d83 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
- continue
-
- if extension['enable']:
-- uuids.append(extension['uuid'])
-+ if not extension['uuid'] in uuids:
-+ uuids.append(extension['uuid'])
- elif extension['uuid'] in uuids:
-- uuids.remove(extension['uuid'])
-+ uuids = [value for value in uuids if value != extension['uuid']]
-
- settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
-
---
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
deleted file mode 100644
index be5f6c4e51d0..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Tue, 24 Jan 2017 19:42:19 +0400
-Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
- GApplication was released.
-
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
----
- connector/chrome-gnome-shell.py | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0f6e5f1..ac6740a 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
- self.hold()
-
- # Is there any way to hook this to shutdown?
-- def cleanup(self):
-- debug('Cleanup')
-+ def clean_release(self):
-+ debug('Release')
-
- if self.shellAppearedId:
- Gio.bus_unwatch_name(self.shellAppearedId)
-
- if self.shellSignalId:
-- self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
-+ dbus_connection = self.get_dbus_connection()
-+
-+ if dbus_connection is not None:
-+ dbus_connection.signal_unsubscribe(self.shellSignalId)
-+
-+ self.release()
-
- def default_exception_hook(self, exception_type, value, tb):
- log_error("Uncaught exception of type %s occured" % exception_type)
- traceback.print_tb(tb)
- log_error("Exception: %s" % value)
-
-- self.release()
-+ self.clean_release()
-
- def add_simple_action(self, name, callback, parameter_type):
- action = Gio.SimpleAction.new(
-@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
- # noinspection PyUnusedLocal
- def on_service_timeout(self, data):
- debug('On service timeout')
-- self.release()
-+ self.clean_release()
-
- return False
-
-@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
-
- if len(text_length_bytes) == 0:
- debug('Release condition: %s' % str(condition))
-- self.release()
-+ self.clean_release()
- return
-
- # Unpack message length as 4 byte integer.
-@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
- # noinspection PyUnusedLocal
- def on_hup(self, source, condition, data):
- debug('On hup: %s' % str(condition))
-- self.release()
-+ self.clean_release()
-
- return False
-
- # noinspection PyUnusedLocal
- def on_sigint(self, data):
- debug('On sigint')
-- self.release()
-+ self.clean_release()
-
- return False
-
-@@ -545,6 +550,5 @@ if __name__ == '__main__':
- app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
-
- app.run(sys.argv)
-- app.cleanup()
-
- debug('Quit')
---
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
deleted file mode 100644
index 238d1fcd1df6..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 22:29:12 +0400
-Subject: [PATCH 4/6] connector: assume version 1 for extensions without
- version in metadata
-
-Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
-See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
----
- connector/chrome-gnome-shell.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0b92d83..0f6e5f1 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
- http_request['installed'][uuid] = {
- 'version': int(extensions[uuid]['version'])
- }
-- except ValueError:
-+ except (ValueError, KeyError):
- http_request['installed'][uuid] = {
- 'version': 1
- }
---
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
deleted file mode 100644
index 3d84d898ca45..000000000000
--- a/gnome-extra/chrome-gnome-shell/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="person">
- <email>ykonotopov@gnome.org</email>
- <name>Yuri Konotopov</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <upstream>
- <bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
- <remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-3.6.6-r2 b/gnome-extra/cinnamon-3.6.6-r2
new file mode 100644
index 000000000000..0aed1d25316a
--- /dev/null
+++ b/gnome-extra/cinnamon-3.6.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/
+IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-3.6 >=gnome-extra/cinnamon-control-center-3.6 >=gnome-extra/cinnamon-screensaver-3.6 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0771af73f2cfb7fe624540a08e2430d
diff --git a/gnome-extra/cinnamon-control-center-3.6.5 b/gnome-extra/cinnamon-control-center-3.6.5
new file mode 100644
index 000000000000..d0bec0dc769f
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center-3.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord +cups debug input_devices_wacom systemd
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2b0365e8362fe12e0f7784b9c76a3c16
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
deleted file mode 100644
index 7e76de75aa63..000000000000
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
-EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52
-MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
deleted file mode 100644
index 12f5a93bba7e..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-# networkmanager is not optional
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
- dev-libs/libxml2:2
- >=gnome-base/libgnomekbd-2.91.91:0=
- >=gnome-extra/cinnamon-desktop-1.0:0=
- >=gnome-extra/cinnamon-menus-1.0:0=
- >=gnome-extra/cinnamon-settings-daemon-1.0:0=
- >=gnome-extra/nm-applet-0.9.8
- media-libs/fontconfig
- >=net-misc/modemmanager-0.7
- >=net-misc/networkmanager-0.9.8:=[modemmanager]
- >=sys-auth/polkit-0.103
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.4.1:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libxklavier
- colord? ( >=x11-misc/colord-0.1.14:0= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- >=x11-libs/gtk+-3.8:3
- >=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- systemd? ( >=sys-apps/systemd-31 )
- !systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
- app-text/iso-codes
- x11-base/xorg-proto
-
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
- sys-devel/autoconf-archive
-"
-src_prepare() {
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-systemd doesn't do anything in $PN-2.2.5
- gnome2_src_configure \
- --disable-static \
- --enable-documentation \
- --disable-onlineaccounts \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable systemd)
-}
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
deleted file mode 100644
index dbc06458f865..000000000000
--- a/gnome-extra/cinnamon-control-center/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 type="project">
- <email>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <use>
- <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
- </use>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop-3.6.2 b/gnome-extra/cinnamon-desktop-3.6.2
new file mode 100644
index 000000000000..d691c03f1351
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of libraries and utilites used by Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+introspection systemd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0/4
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1cdd5061af382a294934d72bb7ef39bb
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
deleted file mode 100644
index 06d55183e05f..000000000000
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f86be4d00b9c3504ba20348a0382a644b313f30ce4c32e833cbcd690a3dd3d1870851a1b17d3174c7ffe9c6f154e456720c4d6d01a0b71382 SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e
-DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
-EBUILD cinnamon-desktop-3.6.2.ebuild 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
-MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
deleted file mode 100644
index a509d28ded90..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 x86"
-IUSE="+introspection systemd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- >=dev-libs/glib-2.37.3:2[dbus]
- media-sound/pulseaudio[glib]
- >=x11-libs/gdk-pixbuf-2.22:2[introspection?]
- >=x11-libs/gtk+-3.3.16:3[introspection?]
- >=x11-libs/libXext-1.1
- >=x11-libs/libXrandr-1.3
- x11-libs/cairo:=[X]
- x11-libs/libX11
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- >=gnome-base/gsettings-desktop-schemas-3.5.91
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
- sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}
- dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.4
- >=dev-util/intltool-0.40.6
- gnome-base/gnome-common
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-pkg_setup() {
- python_setup
-}
-
-src_prepare() {
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable introspection)
-}
-
-src_install() {
- gnome2_src_install
-
- # set sane default gschema values for systemd users
- if use systemd; then
- insinto /usr/share/glib-2.0/schemas/
- newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
- fi
-}
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
deleted file mode 100644
index cf08f9ca2d2b..000000000000
--- a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
+++ /dev/null
@@ -1,5 +0,0 @@
-[org.cinnamon.desktop.session]
-
-screensaver-uses-logind=true
-session-manager-uses-logind=true
-settings-daemon-uses-logind=true
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
deleted file mode 100644
index 4664002df8ad..000000000000
--- a/gnome-extra/cinnamon-desktop/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-menus-3.6.0 b/gnome-extra/cinnamon-menus-3.6.0
new file mode 100644
index 000000000000..9374e76753aa
--- /dev/null
+++ b/gnome-extra/cinnamon-menus-3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug +introspection
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.0.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2cccdbedfcb49b194d2f35c2e8262a7f
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
deleted file mode 100644
index 3b879affb623..000000000000
--- a/gnome-extra/cinnamon-menus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
-EBUILD cinnamon-menus-3.6.0.ebuild 869 BLAKE2B 605b700314515d29704c6a4d834c4d3a8911fb8d603743215adaec321e33a90995c117ee98e8e547460717295a61996ecf8248b67534e172e356d961a1b4c93c SHA512 fc67e347dc2eb02a2c641fbf137000e49758e6e7ec546f373779b0b18419702addc12e66d0ca39d25bb206b1c5938bab4822a3d9fa79083f24777b5747b6b290
-MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
deleted file mode 100644
index 0a3cbee5e369..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.29.15:2
- introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
- dev-libs/gobject-introspection-common
- >=dev-util/intltool-0.40
- gnome-base/gnome-common
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- --disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
deleted file mode 100644
index 9f2cc8ae0d4c..000000000000
--- a/gnome-extra/cinnamon-menus/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-menus</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-screensaver-3.6.1-r1 b/gnome-extra/cinnamon-screensaver-3.6.1-r1
new file mode 100644
index 000000000000..30a942d63baf
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver-3.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug doc pam systemd xinerama python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b6b237bd4525c67d370a389f47014758
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
deleted file mode 100644
index 775b2869f252..000000000000
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2024 BLAKE2B 80141dcc65f1817703fc4339ed02599d40af68f62f729564ccd64dc41fe498781e3427c9ed7c73b6ad1af8b37661361f00bf01558b6c6a870bb53c310d79a224 SHA512 e5d43f38ab31e210746706197b69d176e522f567ef49df24e6ecc1b9ac74ebbf5fa4a07d5ed72000a2488aa2b25668eec1930e5e14f8c9b6d8185264c89e3abf
-MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
deleted file mode 100644
index 0c336581cdca..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.3:2[dbus]
- >=x11-libs/gtk+-3.1.4:3[introspection]
- >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
- >=gnome-base/gsettings-desktop-schemas-0.1.7
- >=gnome-base/libgnomekbd-3.6
- >=dev-libs/dbus-glib-0.78
-
- net-libs/webkit-gtk:4[introspection]
-
- sys-apps/dbus
- x11-libs/libxklavier
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- x11-libs/libXScrnSaver
- x11-libs/libXxf86misc
- x11-libs/libXxf86vm
- x11-themes/adwaita-icon-theme
-
- !systemd? ( sys-auth/elogind )
-
- ${PYTHON_DEPS}
-
- pam? ( virtual/pam )
- systemd? ( >=sys-apps/systemd-31:0= )
- xinerama? ( x11-libs/libXinerama )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
- !~gnome-extra/cinnamon-1.8.8.1
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- dev-python/setproctitle[${PYTHON_USEDEP}]
- dev-python/xapp[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35
- gnome-base/gnome-common
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? (
- app-text/xmlto
- app-text/docbook-xml-dtd:4.1.2
- app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
- python_setup
-}
-
-src_prepare() {
- python_fix_shebang screensavers
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(usex debug --enable-debug ' ') \
- $(use_enable xinerama)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version x11-misc/xscreensaver; then
- elog "${PN} can use screensavers from x11-misc/xscreensaver"
- fi
-
-}
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
deleted file mode 100644
index 00e290bb5707..000000000000
--- a/gnome-extra/cinnamon-screensaver/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-session-3.6.1-r4 b/gnome-extra/cinnamon-session-3.6.1-r4
new file mode 100644
index 000000000000..b97635e1f702
--- /dev/null
+++ b/gnome-extra/cinnamon-session-3.6.1-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon session manager
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=doc ipv6 systemd
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind[policykit] )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79293e1cc141c622e41b94109e2934ba
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
deleted file mode 100644
index d144ce9be781..000000000000
--- a/gnome-extra/cinnamon-session/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
-AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
-AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
-DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
-EBUILD cinnamon-session-3.6.1-r4.ebuild 1540 BLAKE2B de1d180a3c7ef0b85ff0f8e9766108d5e6f8ed58fab9c124b21d9acf5907665db3eb45723b48e31bdbc9772ecfe5358d0f46c9702c346253530de4bfc9f7dca0 SHA512 4e12e45b19c8c54cc8319ff554c1372942a72ad54f8e13e5b24e23f230ea09292403395fad216cb95bccaddf64d22d4b2a4adc281e8abe4b4b27271d1004123a
-MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
deleted file mode 100644
index 2be2b7170fa6..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 systemd"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.88
- >=dev-libs/glib-2.37.3:2
- media-libs/libcanberra
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3:3
- x11-libs/cairo
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcomposite
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
- virtual/opengl
- systemd? ( >=sys-apps/systemd-183
- sys-auth/polkit )
- !systemd? ( sys-power/upower
- sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
- >=gnome-extra/cinnamon-desktop-2.6[systemd=]
- !systemd? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- doc? ( app-text/xmlto )
-
- gnome-base/gnome-common
-"
-
-src_prepare() {
- # make upower and logind check non-automagic
- eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
- eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
- eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-gconf \
- --disable-static \
- --enable-logind \
- $(use_enable doc docbook-docs) \
- $(use_enable ipv6)
-}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
deleted file mode 100644
index 9ca31379a60e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.ac~ 2016-05-20 13:03:13.000000000 +0200
-+++ b/configure.ac 2016-06-25 17:36:55.389583194 +0200
-@@ -56,7 +56,15 @@
-
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+ AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+ [enable_old_upower=$enableval],
-+ [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+ PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
- AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
-@@ -96,9 +104,15 @@
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
deleted file mode 100644
index fdbda72ca22e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
-index 789d47d..d8093d4 100644
---- a/cinnamon-session/Makefile.am
-+++ b/cinnamon-session/Makefile.am
-@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS = \
- $(XEXT_CFLAGS) \
- $(GCONF_CFLAGS) \
- $(LOGIND_CFLAGS) \
-+ $(ELOGIND_CFLAGS) \
- -I$(top_srcdir)/egg \
- -DLOCALE_DIR=\""$(datadir)/locale"\" \
- -DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
-@@ -91,6 +92,7 @@ cinnamon_session_LDADD = \
- $(UPOWER_LIBS) \
- $(GCONF_LIBS) \
- $(LOGIND_LIBS) \
-+ $(ELOGIND_LIBS) \
- $(EXECINFO_LIBS)
-
- libcsmutil_la_SOURCES = \
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index cef991c..dc2aa2e 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -32,7 +32,11 @@
- #include <sys/types.h>
- #include <pwd.h>
-
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#else
- #include <systemd/sd-login.h>
-+#endif
-
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/configure.ac b/configure.ac
-index 38db5a3..8dafc6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
-
- have_logind=no
- if test x$enable_logind != xno ; then
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
- fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
-
-+have_elogind=no
-+PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-+if test x$have_elogind = xyes; then
-+ AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+fi
-+
- AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
-
- dnl ====================================================================
- dnl Option to disable DBus user session support.
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
deleted file mode 100644
index a58703bc1bf3..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c46b35f..5bde44a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
-
- have_logind=no
- if test x$enable_logind != xno ; then
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
-+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
- fi
-
- if test x$have_logind = xyes; then
-@@ -124,6 +124,7 @@ have_elogind=no
- PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
- if test x$have_elogind = xyes; then
- AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+ AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
-
- AC_SUBST(LOGIND_CFLAGS)
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
deleted file mode 100644
index ad3cba8d7130..000000000000
--- a/gnome-extra/cinnamon-session/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-session</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-settings-daemon-3.6.1-r1 b/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
new file mode 100644
index 000000000000..35189eabef5c
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cinnamon's settings daemon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord cups input_devices_wacom smartcard systemd test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08f75d86703479fe8a572e917b2f860e
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
deleted file mode 100644
index 305bc3622bfc..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
-DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
-MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
deleted file mode 100644
index 66ed58615ece..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT=test
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=gnome-base/libgnomekbd-3.6
- >=gnome-base/librsvg-2.36.2
- >=gnome-extra/cinnamon-desktop-2.8.0:0=
- media-libs/fontconfig
- >=media-libs/lcms-2.2:2
- media-libs/libcanberra:0=[gtk3]
- sys-apps/dbus
- >=sys-auth/polkit-0.97
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.9.10:3
- >=x11-libs/libnotify-0.7.3:0=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxklavier
- virtual/libgudev:=
- >=sys-power/upower-0.9.11
-
- colord? ( >=x11-misc/colord-0.1.27:= )
- cups? ( >=net-print/cups-1.4[dbus] )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.7
- x11-drivers/xf86-input-wacom
- x11-libs/libXtst )
- smartcard? ( >=dev-libs/nss-3.11.2 )
- systemd? ( sys-apps/systemd:0= )
- !systemd? ( sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
- dev-libs/libxml2:2
- >=dev-util/intltool-0.37.1
- x11-base/xorg-proto
- virtual/pkgconfig
-"
-
-src_prepare() {
- # make colord and wacom optional
- eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
- # Disable broken test
- sed -e '/g_test_add_func ("\/color\/edid/d' \
- -i plugins/color/gcm-self-test.c || die
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- # no point in disabling gudev since other plugins pull it in
- gnome2_src_configure \
- --disable-static \
- --enable-gudev \
- --enable-polkit \
- --enable-logind \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable smartcard smartcard-support) \
- $(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f967..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac 2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
-
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+ AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+ enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+ build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
-
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+ AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+ enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+ [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
-
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
-
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
-
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+ AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+ [enable_logind=$enableval],
-+ [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+ PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
-
- if test x$have_logind = xyes; then
- AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
- LCMS DICT support: ${have_new_lcms}
- Libnotify support: ${have_libnotify}
-
-+ Colord support: ${build_color}
- Wacom support: ${build_wacom}
-
- Smartcard support: ${have_smartcard_support}
---- a/plugins/Makefile.am~ 2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am 2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- automount \
- background \
- clipboard \
-- color \
- cursor \
- dummy \
- datetime \
-@@ -23,6 +22,12 @@
-
- disabled_plugins = $(NULL)
-
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
deleted file mode 100644
index aab7fdc66a7f..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/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 type="project">
- <email>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <use>
- <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
- </use>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-translations-3.6.3 b/gnome-extra/cinnamon-translations-3.6.3
new file mode 100644
index 000000000000..82714891859a
--- /dev/null
+++ b/gnome-extra/cinnamon-translations-3.6.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Translation data for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
+_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
+_md5_=697d5626c05c46ecca189ab89d9ede14
diff --git a/gnome-extra/cinnamon-translations-3.6.3-r1 b/gnome-extra/cinnamon-translations-3.6.3-r1
new file mode 100644
index 000000000000..2c6c63976857
--- /dev/null
+++ b/gnome-extra/cinnamon-translations-3.6.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
+DESCRIPTION=Translation data for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
+_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
+_md5_=ec415cb57dae1a2783b51af3fe99a3a8
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
deleted file mode 100644
index 8e52522469d0..000000000000
--- a/gnome-extra/cinnamon-translations/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
-EBUILD cinnamon-translations-3.6.3-r1.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
-EBUILD cinnamon-translations-3.6.3.ebuild 1309 BLAKE2B 7cff20355506a7a644f58bf10b0498fb9f08782177d78af6790c590703df83d7533239c033058adf903ad580572857959d9b26ee9daab59cb5cc8eed7a0924f6 SHA512 dd6b64f23edb69ff0a8672dee36ce4f34bb60a7883b265cb6b6c3caffcf3ad57419551dd4057f6b386df679ae6cbc28fb58abce676c844e80e50745fca5f8d83
-MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
deleted file mode 100644
index 8f055fc0aec4..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
-RDEPEND="${DEPEND}"
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
- # Cannot run before since locales are not in the expected place for this to work
- l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
- install_locale() {
- dodir /usr/share/locale
- insinto /usr/share/locale
- doins -r usr/share/locale/${1}
- }
- l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
deleted file mode 100644
index 39fbaa56032e..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
- # Cannot run before since locales are not in the expected place for this to work
- l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
- install_locale() {
- dodir /usr/share/locale
- insinto /usr/share/locale
- doins -r usr/share/locale/${1}
- }
- l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
deleted file mode 100644
index d5f1fb8d01fc..000000000000
--- a/gnome-extra/cinnamon-translations/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cinnamon-translations</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
deleted file mode 100644
index d9e248510d9a..000000000000
--- a/gnome-extra/cinnamon/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8d67f098a7ccde319589c330736a9624537ac2dcfbee75c8971cb6b88cb49ae36b380b0fe3024d55c54e127cc2cec0d21ade17f56b9ed9be6 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460
-AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
-AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
-AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
-DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
-EBUILD cinnamon-3.6.6-r2.ebuild 7646 BLAKE2B 15b814158431413272ec8a030141cf2874d64614a0a0a75ee6c09ec916b32397626fb5668527af039284eda72eeee68a4c21084a894aadaa1feeda1fe3f17b46 SHA512 f06a8fff3801480155d230dc962a6ab201cce072ae951f24f381e51087919961b3ac9f5ba5b0091410fe31aabae4d1715febe6bc354d6f14b1cdbd5a1f8dfe98
-MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
deleted file mode 100644
index 504464fac2ab..000000000000
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due to bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( $(python_gen_useflags 'python2*') )
- || ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- app-accessibility/at-spi2-atk:2
- app-misc/ca-certificates
- dev-libs/dbus-glib
- >=dev-libs/glib-2.35.0:2[dbus]
- >=dev-libs/gobject-introspection-0.10.1:=
- >=dev-libs/json-glib-0.13.2
- >=dev-libs/libcroco-0.6.2:0.6
- dev-libs/libxml2:2
- gnome-base/gconf:2[introspection]
- gnome-base/librsvg
- >=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
- >=gnome-extra/cinnamon-menus-3.6[introspection]
- >=gnome-extra/cjs-3.6.0
- >=media-libs/clutter-1.10:1.0[introspection]
- media-libs/cogl:1.0=[introspection]
- >=gnome-base/gsettings-desktop-schemas-2.91.91
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- net-libs/libsoup:2.4[introspection]
- >=sys-auth/polkit-0.100[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- >=x11-libs/gtk+-3.9.12:3[introspection]
- x11-libs/pango[introspection]
- >=x11-libs/startup-notification-0.11
- x11-libs/libX11
- >=x11-libs/libXfixes-5.0
- >=x11-wm/muffin-3.6.0[introspection]
- networkmanager? (
- gnome-base/libgnome-keyring
- >=net-misc/networkmanager-0.8.999:=[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-# user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/dconf-0.4.1
- >=gnome-base/libgnomekbd-2.91.4[introspection]
- || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
- >=gnome-extra/cinnamon-session-3.6
- >=gnome-extra/cinnamon-settings-daemon-3.6
-
- >=app-accessibility/caribou-0.3
-
- x11-misc/xdg-utils
- x11-libs/xapps[introspection]
-
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
- x11-themes/gnome-themes-standard
- x11-themes/adwaita-icon-theme
-
- >=gnome-extra/nemo-3.6
- >=gnome-extra/cinnamon-control-center-3.6
- >=gnome-extra/cinnamon-screensaver-3.6
-
- gnome-extra/polkit-gnome
-
- networkmanager? (
- gnome-extra/nm-applet
- net-misc/mobile-broadband-provider-info
- sys-libs/timezone-data )
- nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
- $(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
- dev-util/gtk-doc
- >=dev-util/intltool-0.4
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- gnome-base/gnome-common
- !!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
- python_setup
-}
-
-src_prepare() {
- # Fix backgrounds path as cinnamon doesn't provide them
- # https://github.com/linuxmint/Cinnamon/issues/3575
- eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
-
- # Fix automagic gnome-bluetooth dep, bug #398145
- eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
- # Use wheel group instead of sudo (from Fedora/Arch)
- # https://github.com/linuxmint/Cinnamon/issues/3576
- eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
- # Use pkexec instead of gksu (from Arch)
- # https://github.com/linuxmint/Cinnamon/issues/3565
- sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
- # Add polkit agent to required components (from Fedora/Arch), bug #523958
- # https://github.com/linuxmint/Cinnamon/issues/3579
- sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
- files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
- if ! use networkmanager; then
- rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
- fi
-
- # python 2-and-3 shebang fixing craziness
- local p
- python_setup 'python3*'
- for p in $(grep -rl '#!.*python3'); do
- python_fix_shebang "${p}"
- done
-
- python_setup 'python2*'
- for p in $(grep -rl '#!.*python[^3]'); do
- python_fix_shebang "${p}"
- done
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --disable-jhbuild-wrapper-script \
- $(use_enable networkmanager) \
- --with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
- BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
- --without-bluetooth
-}
-
-src_install() {
- gnome2_src_install
- python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
- # Required for gnome-shell on hardened/PaX, bug #398941
- pax-mark mr "${ED}usr/bin/cinnamon"
-
- # Doesn't exist on Gentoo, causing this to be a dead symlink
- rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
- # Ensure authentication-agent is started, bug #523958
- # https://github.com/linuxmint/Cinnamon/issues/3579
- insinto /etc/xdg/autostart/
- doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version 'media-libs/gst-plugins-good:1.0' || \
- ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
- ewarn "To make use of Cinnamon's built-in screen recording utility,"
- ewarn "you need to either install media-libs/gst-plugins-good:1.0"
- ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
- ewarn "org.cinnamon.recorder/pipeline to what you want to use."
- fi
-
- if ! has_version ">=x11-base/xorg-server-1.11"; then
- ewarn "If you use multiple screens, it is highly recommended that you"
- ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
- ewarn "pointer barriers which will make it easier to use hot corners."
- fi
-
- if has_version "<x11-drivers/ati-drivers-12"; then
- ewarn "Cinnamon has been reported to show graphical corruption under"
- ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
- ewarn "open-source drivers."
- fi
-}
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
deleted file mode 100644
index aa2e82bd13fa..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001
-From: root <admin@catmur.co.uk>
-Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway. I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index c0e43e1..bc764e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0)
-
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- [AC_DEFINE([HAVE_BLUETOOTH],[0])
- AC_SUBST([HAVE_BLUETOOTH],[0])
- AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+ AC_SUBST([HAVE_BLUETOOTH],[0])
-+ AC_MSG_RESULT([no])])
-
- MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
- MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
---
-1.9.2
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
deleted file mode 100644
index d9c14144cb52..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 11 Jan 2015 20:33:37 +0100
-Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
-
-https://github.com/linuxmint/Cinnamon/issues/3575
----
- files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index bf6dc39..83a8b04 100644
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-@@ -198,7 +198,7 @@ class Module:
- def get_system_backgrounds(self):
- picture_list = []
- folder_list = []
-- properties_dir = "/usr/share/cinnamon-background-properties"
-+ properties_dir = "/usr/share/gnome-background-properties"
- backgrounds = []
- if os.path.exists(properties_dir):
- for i in os.listdir(properties_dir):
---
-2.2.1
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
deleted file mode 100644
index 50512c3ab371..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-index 8028727..85497c8 100755
---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -839,11 +839,11 @@ class Module:
- pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
- description = "<b>%s</b>\n%s" % (fullname, username)
- piter = self.users.append(None, [new_user, pixbuf, description])
-- # Add the user to his/her own group and sudo if Administrator was selected
-+ # Add the user to his/her own group and wheel if Administrator was selected
- if dialog.account_type_combo.get_active() == 1:
-- subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
- else:
-- subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+ subprocess.call(["usermod", username, "-G", "%s" % username])
- self.load_groups()
- dialog.destroy()
-
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
deleted file mode 100644
index 24e14f267e23..000000000000
--- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=X-Cinnamon;
-X-GNOME-AutoRestart=true
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
deleted file mode 100644
index 216784b94f4d..000000000000
--- a/gnome-extra/cinnamon/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/Cinnamon</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cjs-3.6.1 b/gnome-extra/cjs-3.6.1
new file mode 100644
index 000000000000..c576851f62ac
--- /dev/null
+++ b/gnome-extra/cjs-3.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+cairo examples gtk test test
+KEYWORDS=amd64 x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) !<gnome-extra/cinnamon-2.4
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c3ba181385a02506d6b4a16bc2b9011
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
deleted file mode 100644
index 6f1d3b633360..000000000000
--- a/gnome-extra/cjs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
-DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
-EBUILD cjs-3.6.1.ebuild 2099 BLAKE2B 09dbb18fe6444150291372bdacac0a73ff6530e59f874cd2220df9a682f5af74beed4d632c6cd13c2abda6b571ef2cab4caef08111c8e3ba13e3d23e9ba37301 SHA512 9fc82a49feece084bb937045928ca3e1d33d2585bf9aaa822b4a9329e17179a3f71b3b7f83b263a5e36f3de3b1118aca81b20848dce04632ca9445d4987e7771
-MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
deleted file mode 100644
index 8aea23c9840d..000000000000
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- dev-lang/spidermonkey:38
- >=dev-libs/glib-2.37.3:2
- >=dev-libs/gobject-introspection-1.38:=
- sys-libs/readline:0
- virtual/libffi
- cairo? ( x11-libs/cairo[X,glib] )
- gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
- gnome-base/gnome-common
- sys-devel/gettext
- virtual/pkgconfig
- test? ( sys-apps/dbus )
- sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
- !<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch" )
-
-src_prepare() {
- eautoreconf
- gnome2_src_prepare
- sed -ie "s/gjs-console/cjs-console/g" \
- "${S}"/installed-tests/scripts/testCommandLine.sh \
- "${S}"/installed-tests/scripts/testWarnings.sh || die
-
- sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
- "${S}"/installed-tests/scripts/testCommandLine.sh || die
-
- sed -ie "s/'Gjs'/'Cjs'/g" \
- "${S}"/installed-tests/js/testExceptions.js \
- "${S}"/installed-tests/js/testSignals.js \
- "${S}"/installed-tests/js/testGDBus.js \
- "${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
- # FIXME: add systemtap/dtrace support, like in glib:2
- # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
- gnome2_src_configure \
- --disable-systemtap \
- --disable-dtrace \
- $(use_with cairo) \
- $(use_with gtk)
-}
-
-src_test() {
- virtx emake check
-}
-
-src_install() {
- # installation sometimes fails in parallel
- gnome2_src_install -j1
-
- if use examples; then
- insinto /usr/share/doc/"${PF}"/examples
- doins "${S}"/examples/*
- fi
-
- # Required for cjs-console to run correctly on PaX systems
- pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
deleted file mode 100644
index 40be11981ede..000000000000
--- a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 2 Apr 2018 19:27:35 +0200
-Subject: [PATCH] No reason for System.version to be this restrictive
-
----
- installed-tests/js/testSystem.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
-index 1211de4..d205595 100644
---- a/installed-tests/js/testSystem.js
-+++ b/installed-tests/js/testSystem.js
-@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
- describe('System.version', function () {
- it('gives a plausible number', function () {
- expect(System.version).not.toBeLessThan(14700);
-- expect(System.version).toBeLessThan(20000);
-+ expect(System.version).toBeLessThan(32000);
- });
- });
-
---
-2.16.1
-
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
deleted file mode 100644
index 9e988588122b..000000000000
--- a/gnome-extra/cjs/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">linuxmint/cjs</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/eiciel-0.9.11 b/gnome-extra/eiciel-0.9.11
new file mode 100644
index 000000000000..b70cc76a0791
--- /dev/null
+++ b/gnome-extra/eiciel-0.9.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3 virtual/pkgconfig >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=ACL editor for GNOME, with Nautilus extension
+EAPI=5
+HOMEPAGE=http://rofi.roger-ferrer.org/eiciel/
+IUSE=xattr
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
+SLOT=0
+SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4df30084d2401753b1332d4dd92e98a
diff --git a/gnome-extra/eiciel-0.9.11-r1 b/gnome-extra/eiciel-0.9.11-r1
new file mode 100644
index 000000000000..bcfa984256e5
--- /dev/null
+++ b/gnome-extra/eiciel-0.9.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3 virtual/pkgconfig >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=ACL editor for GNOME, with Nautilus extension
+EAPI=5
+HOMEPAGE=http://rofi.roger-ferrer.org/eiciel/
+IUSE=xattr
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
+SLOT=0
+SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c97f46f26758240a001be48b3d13642
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
deleted file mode 100644
index 771bdad443ab..000000000000
--- a/gnome-extra/eiciel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST eiciel-0.9.11.tar.bz2 680384 BLAKE2B 1d16aa383b25fb870f44bb942736287b063ff82c886119207dd222adad900f529075f58c0d5881e7f8d845f0c43d099dafd3f6e871bb11fe7171a7d1e099f8f7 SHA512 914b8b888e502a31f6c70bcc7d391ea8b79dde07e13b9a6ebb3b52a20b793fafd7a7a7f8ff7177c0150a223a74cae1b06fca0a274bc27545bb89223b4b8fd2aa
-EBUILD eiciel-0.9.11-r1.ebuild 730 BLAKE2B 28c013cedab0a52da378bc5d26d90ed39c44ed80b2e78c5149074acbb631b41594fcd5cf4719e8eca0c85486aa11485608434e8f211386259b5f32fbff3fe6ba SHA512 b5c6c15b6dff67cb53cb7a65c62055b01cc58d4311f4436c742ef8ccd5b76720e5c1fc8a38697b0ea4a990beb5c2ff50a7f0003e9a5173ff23af8fb322da08f9
-EBUILD eiciel-0.9.11.ebuild 689 BLAKE2B 6c80108f4550064cc32c25a9564fe3a994f27f0bd397432533aff5988e10a5df5532720f9860a05784b89473fe1e2b99ea2122f5d9224c72a9802f8560d1e162 SHA512 1d12e3d4ba528bf565b8c1595162144e9765f89277307fce4fbb677c82711bc90aff18cc153673b7f0afeef854112fa8eb59235801f7e5b11875d42ae70977c3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
deleted file mode 100644
index fa509d7fbe6f..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xattr"
-
-RDEPEND="
- >=sys-apps/acl-2.2.32
- >=dev-cpp/gtkmm-3:3.0
- >=gnome-base/nautilus-3
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/gettext-0.18.1
-"
-
-src_configure() {
- append-cxxflags -std=c++11
- gnome2_src_configure \
- --disable-static \
- --with-gnome-version=3 \
- $(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/eiciel-0.9.11.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
deleted file mode 100644
index b24a03ddc18c..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xattr"
-
-RDEPEND="
- >=sys-apps/acl-2.2.32
- >=dev-cpp/gtkmm-3:3.0
- >=gnome-base/nautilus-3
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/gettext-0.18.1
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-gnome-version=3 \
- $(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/metadata.xml b/gnome-extra/eiciel/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/eiciel/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/evolution-data-server-3.22.7 b/gnome-extra/evolution-data-server-3.22.7
new file mode 100644
index 000000000000..7997dfc745a0
--- /dev/null
+++ b/gnome-extra/evolution-data-server-3.22.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-2 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Evolution groupware backend
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0/59
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.7.tar.xz
+_eclasses_=db-use 582140d1a711279e50ce284fc7b609f5 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e95e3bdb921318a009b2b668f99f989d
diff --git a/gnome-extra/evolution-data-server-3.24.7 b/gnome-extra/evolution-data-server-3.24.7
new file mode 100644
index 000000000000..09bd900fedef
--- /dev/null
+++ b/gnome-extra/evolution-data-server-3.24.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Evolution groupware backend
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0/60
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.7.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 db-use 582140d1a711279e50ce284fc7b609f5 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ac7e93764e6527b314093706a0c0c4a
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
deleted file mode 100644
index b32dd7c69df4..000000000000
--- a/gnome-extra/evolution-data-server/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa722b0a0f4ba58e3313fa3e66f90c159d5766ac03ee81c2fa3cb33ff2dedfcd4ffb59fb32ac88b17f04447d38c4a7605e SHA512 311e0163ef783430f4eea638e2ece92ab6d1c52d79f399190607eead5359f28eec647c626bb1c435eba427f7844456b4fd2dd60e75ca40331f1d249d1549eb0c
-AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5
-AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
-DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
-EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
-EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35
-MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
deleted file mode 100644
index 5d597fe7d157..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/59" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
- >=app-crypt/gcr-3.4
- >=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.7.17:=
- >=dev-libs/glib-2.46:2
- >=dev-libs/libical-0.43:=
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=net-libs/libsoup-2.42:2.4
-
- dev-libs/icu:=
- sys-libs/zlib:=
- virtual/libiconv
-
- berkdb? ( >=sys-libs/db-4:= )
- gtk? (
- >=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.10:3
- )
- google? (
- >=dev-libs/json-glib-1.0.4
- >=net-libs/webkit-gtk-2.11.91:4
- ${gdata_depend}
- )
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.8:=
- ${gdata_depend} )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- kerberos? ( virtual/krb5:= )
- ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/gperf
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-2
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- use berkdb && append-cppflags "-I$(db_includedir)"
- local gdata_flag
- if use google || use gnome-online-accounts; then
- gdata_flag="--enable-google"
- else
- gdata_flag="--disable-google"
- fi
-
- # phonenumber does not exist in tree
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable google google-auth) \
- ${gdata_flag} \
- $(use_enable introspection) \
- $(use_enable ipv6) \
- $(use_with kerberos krb5 "${EPREFIX}"/usr) \
- $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_with ldap openldap) \
- $(use_enable vala vala-bindings) \
- $(use_enable weather) \
- --enable-largefile \
- --enable-smime \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use ldap; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema
- dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
deleted file mode 100644
index cfc4ff4b4e9f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/60" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
- >=app-crypt/gcr-3.4
- >=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.7.17:=
- >=dev-libs/glib-2.46:2
- >=dev-libs/libical-0.43:=
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=net-libs/libsoup-2.42:2.4
-
- dev-libs/icu:=
- sys-libs/zlib:=
- virtual/libiconv
-
- berkdb? ( >=sys-libs/db-4:= )
- gtk? (
- >=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.10:3
- )
- google? (
- >=dev-libs/json-glib-1.0.4
- >=net-libs/webkit-gtk-2.11.91:4
- ${gdata_depend}
- )
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.8:=
- ${gdata_depend} )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- kerberos? ( virtual/krb5:= )
- ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/gperf
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.5
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-DESTDIR-honoring.patch
- "${FILESDIR}"/${PV}-libical3-compat.patch
-)
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-
- # Make CMakeLists versioned vala enabled
- sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
- -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
- -i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- use berkdb && append-cppflags "-I$(db_includedir)"
-
- local google_auth_enable
- if use google || use gnome-online-accounts; then
- google_auth_enable="ON"
- else
- google_auth_enable="OFF"
- fi
-
- # phonenumber does not exist in tree
- local mycmakeargs=(
- -DENABLE_GTK_DOC=$(usex api-doc-extras)
- -DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
- -DENABLE_SCHEMAS_COMPILE=OFF
- -DENABLE_INTROSPECTION=$(usex introspection)
- -DWITH_KRB5=$(usex kerberos)
- -DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
- -DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
- -DWITH_OPENLDAP=$(usex ldap)
- -DWITH_PHONENUMBER=OFF
- -DENABLE_SMIME=ON
- -DENABLE_GTK=$(usex gtk)
- -DENABLE_GOOGLE_AUTH=${google_auth_enable}
- -DENABLE_EXAMPLES=OFF
- -DENABLE_GOA=$(usex gnome-online-accounts)
- -DENABLE_UOA=OFF
- -DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
- # ENABLE_BACKTRACES requires libdwarf ?
- -DENABLE_IPV6=$(usex ipv6)
- -DENABLE_WEATHER=$(usex weather)
- -DENABLE_GOOGLE=$(usex google)
- -DENABLE_LARGEFILE=ON
- -DENABLE_VALA_BINDINGS=$(usex vala)
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_test() {
- virtx cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use ldap; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema
- dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
deleted file mode 100644
index a3a3d470b984..000000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5406fcda088be73f462e7d02d4a2ae56cc7329cc Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Oct 2017 19:20:36 +0200
-Subject: Bug 781645 - Skip GSettings schema compile when DESTDIR is set
-
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb82..f0be558 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- if(_install_code)
- # Compile gsettings schemas and ensure that all of them are in the place.
- install(CODE
-- "execute_process(${_install_code}
-- COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-- )")
-+ "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+ execute_process(${_install_code}
-+ COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+ )
-+ endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- endif(_install_code)
- endmacro(add_gsettings_schemas)
-
---
-cgit v0.12
-
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
deleted file mode 100644
index 8f574b0f8d9c..000000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From dc5fc0e163421f5a01c3cdaab23ca2ea1eb3fae2 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 4 Oct 2017 11:48:48 +0200
-Subject: [PATCH 1/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical in the next release
-and the function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(cherry picked from commit f607f8628a28440374579531bc78848dfe0c782e)
----
- src/calendar/backends/contacts/e-cal-backend-contacts.c | 1 -
- src/calendar/libecal/e-cal-component.c | 8 ++++----
- src/calendar/libecal/e-cal-recur.c | 8 ++++----
- src/calendar/libecal/e-cal-time-util.c | 3 +--
- 4 files changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-index d2b570885..cf2c62062 100644
---- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
-+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -699,7 +699,6 @@ cdate_to_icaltime (EContactDate *cdate)
- ret.month = cdate->month;
- ret.day = cdate->day;
- ret.is_date = TRUE;
-- ret.is_utc = FALSE;
- ret.zone = NULL;
- ret.is_daylight = FALSE;
-
-diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
-index 65b530d1e..6d8a9814d 100644
---- a/src/calendar/libecal/e-cal-component.c
-+++ b/src/calendar/libecal/e-cal-component.c
-@@ -2522,7 +2522,7 @@ get_datetime (struct datetime *datetime,
- * This makes the timezone code simpler. */
- if (datetime->tzid_param)
- dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
-- else if (dt->value && dt->value->is_utc)
-+ else if (dt->value && icaltime_is_utc (*dt->value))
- dt->tzid = g_strdup ("UTC");
- else
- dt->tzid = NULL;
-@@ -2559,9 +2559,9 @@ set_datetime (ECalComponent *comp,
-
- /* If the TZID is set to "UTC", we set the is_utc flag. */
- if (dt->tzid && !strcmp (dt->tzid, "UTC"))
-- dt->value->is_utc = 1;
-- else
-- dt->value->is_utc = 0;
-+ dt->value->zone = icaltimezone_get_utc_timezone ();
-+ else if (dt->value->zone == icaltimezone_get_utc_timezone ())
-+ dt->value->zone = NULL;
-
- if (datetime->prop) {
- /* make sure no VALUE property is left if not needed */
-diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
-index 535d56c14..cad588c4d 100644
---- a/src/calendar/libecal/e-cal-recur.c
-+++ b/src/calendar/libecal/e-cal-recur.c
-@@ -195,7 +195,7 @@ ensure_timezone (icalcomponent *comp,
- a different icalcomponent and cause use-after-free. */
- tt->zone = NULL;
-
-- if (tt->is_utc)
-+ if (icaltime_is_utc (*tt))
- return TRUE;
-
- tt->zone = default_timezone;
-@@ -435,7 +435,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- rrule.until.minute = 0;
- rrule.until.second = 0;
-
-- if (!rrule.until.zone && !rrule.until.is_utc)
-+ if (!rrule.until.zone && !icaltime_is_utc (rrule.until))
- rrule.until.zone = dtstart.zone;
- }
-
-@@ -542,7 +542,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- exrule.until.minute = 0;
- exrule.until.second = 0;
-
-- if (!exrule.until.zone && !exrule.until.is_utc)
-+ if (!exrule.until.zone && !icaltime_is_utc (exrule.until))
- exrule.until.zone = dtstart.zone;
- }
-
-@@ -586,7 +586,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- if (!success)
- break;
-
-- if (!exdate.zone && !exdate.is_utc)
-+ if (!exdate.zone && !icaltime_is_utc (exdate))
- exdate.zone = dtstart.zone;
-
- if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, &interval_start, &interval_end)) {
-diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
-index 7bcbc8ba1..914761cb0 100644
---- a/src/calendar/libecal/e-cal-time-util.c
-+++ b/src/calendar/libecal/e-cal-time-util.c
-@@ -763,9 +763,8 @@ tm_to_icaltimetype (struct tm *tm,
-
- itt.day = tm->tm_mday;
- itt.month = tm->tm_mon + 1;
-- itt.year = tm->tm_year+ 1900;
-+ itt.year = tm->tm_year + 1900;
-
-- itt.is_utc = 0;
- itt.is_date = is_date;
-
- return itt;
---
-2.15.1
-
-
-From fccd77cf4620ca76c4fd2bf7721e3fb7eaf55ec6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 5 Oct 2017 13:50:08 +0200
-Subject: [PATCH 2/2] e-cal-recur.c:ensure_timezone(): Unset icaltimetype::zone
- only if not UTC
-
-With a removal of icaltimetype::is_utc the icaltimetype::zone is used
-to determine whether it's UTC or not. That means that the icaltimetype::zone
-can be unset only if it's not the built-in UTC time zone.
-
-(cherry picked from commit 1f39ade8db00091d6fa4c752ccb70361ef0e8abc)
----
- src/calendar/libecal/e-cal-recur.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
-index cad588c4d..fc14fb15c 100644
---- a/src/calendar/libecal/e-cal-recur.c
-+++ b/src/calendar/libecal/e-cal-recur.c
-@@ -193,7 +193,8 @@ ensure_timezone (icalcomponent *comp,
-
- /* Do not trust the 'zone' set on the structure, as it can come from
- a different icalcomponent and cause use-after-free. */
-- tt->zone = NULL;
-+ if (tt->zone != icaltimezone_get_utc_timezone ())
-+ tt->zone = NULL;
-
- if (icaltime_is_utc (*tt))
- return TRUE;
---
-2.15.1
-
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
deleted file mode 100644
index bc79da273cc2..000000000000
--- a/gnome-extra/evolution-data-server/files/calentry.schema
+++ /dev/null
@@ -1,108 +0,0 @@
-# RFC2739 calEntry schema for OpenLDAP 2.x
-
-#
-# From https://bugs.gentoo.org/show_bug.cgi?id=83988
-# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
-#
-
-# Version of RFC 2739 schema translated by Terrelle Shaw
-# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
-# <peter.marschall@adpm.de> # Nov. 9, 2002
-
-# Notes:
-# * RFC2739 seems to be a bit sloppy about attribute type and
-# objectclass definitions syntax and also about attribute syntax
-# and matching rules.
-# (It even counts the attributes in the calEntry objectclass wrong ;-)
-# * The following changes have been applied to correct the schema
-# - added description to each attributetype definition
-# - changed SYNTAX from 'IA5String' to corresponding OID
-# to make matching rules and syntax consistent
-# - replaced illegal keyword SUBSTRING by SUBSTR
-# - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
-# - removed illegal keyword MULTI-VALUE
-# - added keyword SINGLE-VALUE where appropriate
-# - removed USAGE since cwuserApplications is the default
-# - added description to the objectclass defintion
-# - corrected typo in objectclass definition
-# - added the attributetypes defined but not used to the objectclass
-
-
-# 2.4.4.1 calCalURI
-attributetype ( 1.2.840.113556.1.4.478
- NAME 'calCalURI'
- DESC 'URI to a snapshot of the users entire default calendar'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- SINGLE-VALUE )
-
-# 2.4.4.2 calFBURL
-attributetype ( 1.2.840.113556.1.4.479
- NAME 'calFBURL'
- DESC 'URI to the users default free/busy time data'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- SINGLE-VALUE )
-
-# 2.4.4.3 calCAPURI
-attributetype ( 1.2.840.113556.1.4.480
- NAME 'calCAPURI'
- DESC 'URI used to communicate with the users calendar'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- SINGLE-VALUE )
-
-# 2.4.4.4 calCalAdrURI
-attributetype ( 1.2.840.113556.1.4.481
- NAME 'calCalAdrURI'
- DESC 'URI to which event requests should be sent for the user'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
- SINGLE-VALUE )
-
-# 2.4.4.5 calOtherCalURIs
-attributetype ( 1.2.840.113556.1.4.482
- NAME 'calOtherCalURIs'
- DESC 'URIs to snapshots of non-default calendars belonging to the user'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.6 calOtherFBURLs
-attributetype ( 1.2.840.113556.1.4.483
- NAME 'calOtherFBURLs'
- DESC 'URIs to non-default free/busy data belonging to the user'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.7 calOtherCAPURIs
-attributetype ( 1.2.840.113556.1.4.484
- NAME 'calOtherCAPURIs'
- DESC 'URIs to non-default calendars belonging to the user'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.8 calOtherCalAdrURIs
-attributetype ( 1.2.840.113556.1.4.485
- NAME 'calOtherCalAdrURIs'
- DESC 'URIs of destinations for event requests to non-default calendars'
- EQUALITY caseIgnoreIA5Match
- SUBSTR caseIgnoreIA5SubstringsMatch
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.3.1 calEntry
-objectclass ( 1.2.840.113556.1.5.87
- NAME 'calEntry'
- DESC 'Calendering and free/busy information'
- SUP top AUXILIARY
- MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
- calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $
- calOtherCalAdrURIs ) )
-
-# EOF
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
deleted file mode 100644
index 5c891ea46d4d..000000000000
--- a/gnome-extra/evolution-data-server/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="api-doc-extras">Build documentation for private APIs</flag>
- <flag name="berkdb"><pkg>sys-libs/db</pkg> support needed to migrate old (pre-3.12 evolution versions) addressbook data</flag>
- <flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</flag>
- <flag name="google">Enable internal Google authentication support. If gnome-online-accounts is enabled and used, this is not necessary,
- but both can be supported at the same time with different setup at runtime</flag>
- <flag name="weather">Enable optional weather calendar support</flag>
- </use>
-</pkgmetadata>
diff --git a/gnome-extra/evolution-ews-3.24.6 b/gnome-extra/evolution-ews-3.24.6
new file mode 100644
index 000000000000..2e4505ce09ed
--- /dev/null
+++ b/gnome-extra/evolution-ews-3.24.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.7:0= >=mail-client/evolution-3.24.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( net-libs/uhttpmock ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.7:0= >=mail-client/evolution-3.24.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.24/evolution-ews-3.24.6.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d1a60c799bfb9e5ac53c49a14e1aa65
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
deleted file mode 100644
index cb0d6aac1b26..000000000000
--- a/gnome-extra/evolution-ews/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07
-AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb
-DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
-EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
deleted file mode 100644
index dd21ac33a3b7..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- dev-db/sqlite:3=
- >=dev-libs/glib-2.46:2
- dev-libs/libical:0=
- >=dev-libs/libmspack-0.4
- >=dev-libs/libxml2-2
- >=gnome-extra/evolution-data-server-3.24.7:0=
- >=mail-client/evolution-${PV}:2.0
- >=net-libs/libsoup-2.42:2.4
- >=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.35.5
- >=sys-devel/gettext-0.18.3
- virtual/pkgconfig
- test? ( net-libs/uhttpmock )
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-DESTDIR-honoring.patch
- "${FILESDIR}"/${PV}-libical3-compat.patch
-)
-
-src_prepare() {
- gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_MSPACK=ON
- -DENABLE_TESTS=$(usex test)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
-}
-
-src_test() {
- cmake-utils_src_test
-}
-
-src_install() {
- cmake-utils_src_install
-}
diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
deleted file mode 100644
index c74df6bce523..000000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Oct 2017 19:24:57 +0200
-Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is
- set
-
-(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f)
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb82..f0be558 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- if(_install_code)
- # Compile gsettings schemas and ensure that all of them are in the place.
- install(CODE
-- "execute_process(${_install_code}
-- COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-- )")
-+ "if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+ execute_process(${_install_code}
-+ COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+ )
-+ endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- endif(_install_code)
- endmacro(add_gsettings_schemas)
-
---
-2.15.1
-
diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
deleted file mode 100644
index 001e35630e91..000000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 8 Jan 2018 14:23:49 +0200
-Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical3 and the
-function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595)
----
- src/calendar/e-cal-backend-ews-utils.c | 2 +-
- src/calendar/e-cal-backend-ews.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
-index 41d77b4..a46b1e3 100644
---- a/src/calendar/e-cal-backend-ews-utils.c
-+++ b/src/calendar/e-cal-backend-ews-utils.c
-@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg,
- gchar *tz_ident = NULL;
-
- if (with_timezone) {
-- if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
-+ if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
- tz_ident = g_strdup ("Z");
- } else {
- gint offset, is_daylight, hrs, mins;
-diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
-index 50dd5ae..29e488f 100644
---- a/src/calendar/e-cal-backend-ews.c
-+++ b/src/calendar/e-cal-backend-ews.c
-@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend,
- struct icaltimetype dtstart;
-
- dtstart = icalproperty_get_dtstart (prop);
-- if (dtstart.is_utc)
-+ if (icaltime_is_utc (dtstart))
- tzid = "UTC";
- }
- }
---
-2.15.1
-
diff --git a/gnome-extra/evolution-ews/metadata.xml b/gnome-extra/evolution-ews/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/evolution-ews/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gconf-editor-3.0.1-r1 b/gnome-extra/gconf-editor-3.0.1-r1
new file mode 100644
index 000000000000..998c1fe06fd4
--- /dev/null
+++ b/gnome-extra/gconf-editor-3.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2 sys-devel/gettext app-text/gnome-doc-utils >=dev-util/intltool-0.35 virtual/pkgconfig ~app-text/docbook-xml-dtd-4.1.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An editor to the GNOME config system
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gconf-editor
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2
+SLOT=0
+SRC_URI=mirror://gnome/sources/gconf-editor/3.0/gconf-editor-3.0.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f25437a898f499248f9163fedcbfe52
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
deleted file mode 100644
index fc80055ad9f4..000000000000
--- a/gnome-extra/gconf-editor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gconf-editor-3.0.1-assertion-crash.patch 1194 BLAKE2B 6ce0c5d96e329a32b0632829a812cdd6fae4418f6039cddcffe17fec91c58af8cb5d749eaa2a096496580d0e8ac3daa62ce427ebb6510c626a6e7908bf9dad3d SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc
-AUX gconf-editor-3.0.1-drop-accel.patch 1383 BLAKE2B 16e3e1816c8bb7da13827dfd6579e0cbbbdf73a2b368038e347f444569abec184cc9bc48caf8e6a16925c855b3ba8c5b370c7ab6f3f0cd9840061366b3e9a91d SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff
-DIST gconf-editor-3.0.1.tar.xz 1452468 BLAKE2B 775072c69f3350b009c07553d178e83885379292159ea9025831bab0f6b91f2e95e341d4f654a0fd8896c560ba99e635b68f3ff825e337ec5b7d558a366fce52 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49
-EBUILD gconf-editor-3.0.1-r1.ebuild 801 BLAKE2B b2e16dd5a4c5be9e614471c1875fc65d60d95ea6cc593ac2229f2e07d45c120129ee043f26d7a2a624b41840a5fe7b0b2007e302fbcaac442e52649214d614a5 SHA512 97ebb68c595795556438669de55ab6807d0004658bdca72448075c434d0ef6984c0259fc756da84edd13e96ea75a591c182c3684081d8b4c2c858d17f21d4616
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
deleted file mode 100644
index b7df8f51007d..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Wed, 11 Apr 2012 07:27:16 +0000
-Subject: Fix assertion failed crash
-
-Fix "assertion failed: (last_slash != NULL)" crash while navigating the
-left tree view, fixed by having the model for the right list view emit
-all the row deleted signals before deleting any of its data.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
----
-diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
-index 27e1af6..4fc60f8 100644
---- a/src/gconf-list-model.c
-+++ b/src/gconf-list-model.c
-@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
-
- if (model->root_path != NULL) {
- for (list = model->values; list; list = list->next) {
-+ model->stamp++;
-+ gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
-+ }
-+
-+ for (list = model->values; list; list = list->next) {
- GConfEntry *entry = list->data;
-
- g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
-- model->stamp++;
-- gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
-
- gconf_entry_unref (entry);
- }
---
-cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
deleted file mode 100644
index 0d79ec56c396..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Thu, 03 May 2012 18:10:53 +0000
-Subject: Drop use GTK accel maps
-
-They are confusing, weird, and stored in an obsolete location.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675392
----
-diff --git a/src/main.c b/src/main.c
-index 8da5ccc..9bce4b8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -26,34 +26,6 @@
- #include "gconf-stock-icons.h"
- #include "gconf-editor-window.h"
-
--static char *
--build_accel_filename (void)
--{
-- return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL);
--}
--
--static void
--load_accel_map (void)
--{
-- char *map;
--
-- map = build_accel_filename ();
-- gtk_accel_map_load (map);
--
-- g_free (map);
--}
--
--static void
--save_accel_map (void)
--{
-- char *map;
--
-- map = build_accel_filename ();
-- gtk_accel_map_save (map);
--
-- g_free (map);
--}
--
- gint
- main (gint argc, gchar **argv)
- {
-@@ -92,7 +64,6 @@ main (gint argc, gchar **argv)
- /* Register our stock icons */
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR);
- gconf_stock_icons_register ();
-- load_accel_map ();
-
- gtk_window_set_default_icon_name ("gconf-editor");
-
-@@ -107,7 +78,6 @@ main (gint argc, gchar **argv)
-
- gtk_main ();
-
-- save_accel_map ();
- g_strfreev (remaining_args);
-
- return 0;
---
-cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
deleted file mode 100644
index 46fca22ad7ea..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME config system"
-HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- >=x11-libs/gtk+-3.0.0:3
- >=gnome-base/gconf-2.12:2
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- app-text/gnome-doc-utils
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- ~app-text/docbook-xml-dtd-4.1.2
-"
-# gnome-common for eautoreconf
-
-PATCHES=(
- # Fix assertion failed crash (from 'master')
- "${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
-
- # Drop use GTK accel maps (from 'master')
- "${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
-)
diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gconf-editor/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-boxes-3.24.1-r1 b/gnome-extra/gnome-boxes-3.24.1-r1
new file mode 100644
index 000000000000..a27473b4ab6c
--- /dev/null
+++ b/gnome-extra/gnome-boxes-3.24.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:= || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/yelp-tools >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IUSE=kernel_linux
+KEYWORDS=amd64
+LICENSE=LGPL-2
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf050d8c1883dcb0c4a41eb53346d877
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
deleted file mode 100644
index 162f8ca1fd27..000000000000
--- a/gnome-extra/gnome-boxes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393
-EBUILD gnome-boxes-3.24.1-r1.ebuild 2625 BLAKE2B cbe862162ca7e0655345a16d6abdd819b731ca6fdfdd7e8eb869ede04bef9918a7f48f499965e0cbf749902cffabba8549dbe833d75751ea9541bcd2a379b9ee SHA512 b247c4bfd29b6debb3f9b7680e658653db2e0aae204b9cc5f39419fdc6eadbf9b1ba9bacc998d63ef39dbde27d16b58730add58be273ec8d781fb2933f80a73c
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
deleted file mode 100644
index 8c6e1e10e020..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64"
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-# to use its pre-generated files so do not copy all the
-# vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-# directly with USE=spice
-RDEPEND="
- >=app-arch/libarchive-3:=
- >=dev-libs/glib-2.38:2
- >=dev-libs/gobject-introspection-0.9.6:=
- >=dev-libs/libxml2-2.7.8:2
- >=sys-libs/libosinfo-0.2.12
- >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
- >=app-emulation/libvirt-0.9.3[libvirtd,qemu]
- >=app-emulation/libvirt-glib-0.2.3
- >=x11-libs/gtk+-3.19.8:3
- >=net-libs/gtk-vnc-0.4.4[gtk3(+)]
- app-crypt/libsecret
- app-emulation/spice[smartcard]
- >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
- virtual/libusb:1
-
- >=app-misc/tracker-0.16:0=[iso]
-
- >=sys-apps/util-linux-2.20
- >=net-libs/libsoup-2.38:2.4
-
- sys-fs/mtools
- >=virtual/libgudev-165:=
-"
-# !bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
- $(vala_depend)
- app-text/yelp-tools
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
- linux-info_get_any_version
-
- if linux_config_exists; then
- if ! { linux_chkconfig_present KVM_AMD || \
- linux_chkconfig_present KVM_INTEL; }; then
- ewarn "You need KVM support in your kernel to use GNOME Boxes!"
- fi
- fi
-}
-
-src_prepare() {
- # Do not change CFLAGS, wondering about VALA ones but appears to be
- # needed as noted in configure comments below
- sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # debug needed for splitdebug proper behavior (cardoe), bug #????
- gnome2_src_configure \
- --enable-debug \
- --disable-strict-cc \
- --disable-ovirt
-}
-
-src_install() {
- gnome2_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-boxes/metadata.xml b/gnome-extra/gnome-boxes/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-boxes/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-calculator-3.24.0 b/gnome-extra/gnome-calculator-3.24.0
new file mode 100644
index 000000000000..f18d8fb4c9d8
--- /dev/null
+++ b/gnome-extra/gnome-calculator-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0= dev-libs/mpc:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A calculator application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0= dev-libs/mpc:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1bfce13993582cd76ec6a3b640fea6d6
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
deleted file mode 100644
index 5ab9174102ae..000000000000
--- a/gnome-extra/gnome-calculator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
-EBUILD gnome-calculator-3.24.0.ebuild 834 BLAKE2B 8ac1c3a59b54f95aaa319c587bc7267943052de6418cb2628315a90fede5b7ce50460e25edc4d91b59f280476c40b2af57c7634e0206715d34899400282359d5 SHA512 1d4108b7525b94ddcc4783b8b68b1a5bdaa1d04194cc97f6e4e56cbf1fbbb96144d3d25804556c8a8030b63293332fc463726cd34afffab2b9f17e577a863c9e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
deleted file mode 100644
index bbbad3bed35b..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.40:2
- dev-libs/libxml2:2
- dev-libs/mpfr:0=
- dev-libs/mpc:=
- >=net-libs/libsoup-2.42:2.4
- >=x11-libs/gtk+-3.19.3:3
- >=x11-libs/gtksourceview-3.15.1:3.0
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gnome-utils-2.3
- !gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- >=dev-util/intltool-0.50
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calculator/metadata.xml b/gnome-extra/gnome-calculator/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-calculator/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-calendar-3.24.3 b/gnome-extra/gnome-calendar-3.24.3
new file mode 100644
index 000000000000..28cf667e3658
--- /dev/null
+++ b/gnome-extra/gnome-calendar-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2 dev-libs/appstream-glib dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66f4dafc91efdf53947940d6ef21a618
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
deleted file mode 100644
index b1e53c111199..000000000000
--- a/gnome-extra/gnome-calendar/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
-AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
-DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B 7a1af8ac832510b41fd73df583ac12f1b695e1f6058102d33cce26d22db69330a3f3c7f54998644f0033958ba46047f07914841068efb8a1a4c0e43eb1109863 SHA512 6febd724b2740904b0821cfec5631f5218dd5e0732fd99bab55b9b7d546f2422f273dccbeb083eda2685115b73be28c5d860b2e9e3f68e8cf222babe27194e73
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
deleted file mode 100644
index 5d0160e9773e..000000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
-From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
-Date: Wed, 15 Nov 2017 13:09:54 -0800
-Subject: [PATCH] utils: simplify gcal_dup_icaltime
-
-Instead of copying member by member, copy the entire struct contents.
-It works as before, but doesn't depend on the member names.
-
-This fixes compiling gnome-calendar with libical 3.0.0, since the
-struct icaltimetype had one of the members removed (is_utc).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790072
----
- src/gcal-utils.c | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/src/gcal-utils.c b/src/gcal-utils.c
-index c80ba53a..4558f540 100644
---- a/src/gcal-utils.c
-+++ b/src/gcal-utils.c
-@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
- icaltimetype*
- gcal_dup_icaltime (const icaltimetype *date)
- {
-- icaltimetype *new_date;
--
-- if (date == NULL)
-- return NULL;
--
-- new_date= g_new (icaltimetype, 1);
-- new_date->year = date->year;
-- new_date->month = date->month;
-- new_date->day = date->day;
-- new_date->hour = date->hour;
-- new_date->minute = date->minute;
-- new_date->second = date->second;
-- new_date->is_utc = date->is_utc;
-- new_date->is_date = date->is_date;
-- new_date->is_daylight = date->is_daylight;
-- new_date->zone = date->zone;
--
-- return new_date;
-+ return g_memdup (date, sizeof (icaltimetype));
- }
-
- /**
---
-2.15.1
-
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
deleted file mode 100644
index e382029ceeb1..000000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
-From: Abdullahi Usman
-Date: Mon, 10 Jul 2017 11:43:36 +0100
-Subject: week-grid : seperate week's events overlaps.
-
-The week view can display mutilple events that can partly or fully span
-same time ranges.
-
-But week view fails to make correct assumption about the width of events when
-two or more events span some time ranges in which these events also span some
-time ranges with other events, and whereby the number of these other events
-that they span time ranges with does not coincide with the number of the events
-that the other event also span. Week view ended up calculating cells that
-appears horizontally jointed up. Also int16_compare() does not dereference the
-pointer from g_ptr_array_sort() correctly and that makes it sort events
-incorrectly and hence making events appears vertically jointed up.
-
-If an event have other events in which they span some time, we calcuate its width
-by taking into consideration of all the events that the other event may span
-time with. The event that has the higher number of time spans is considered.
-We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
-respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777416
----
- src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
- 1 file changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
-index 20ddb48..ab125b0 100644
---- a/src/views/gcal-week-grid.c
-+++ b/src/views/gcal-week-grid.c
-@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
- }
-
- static inline gint
--int16_compare (gconstpointer a,
-- gconstpointer b)
-+uint16_compare (gconstpointer a,
-+ gconstpointer b)
- {
-- return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
-+ return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
- }
-
- static inline guint
-@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
- if (!array)
- return 0;
-
-- g_ptr_array_sort (array, int16_compare);
-+ g_ptr_array_sort (array, uint16_compare);
-
- for (i = 0; array && i < array->len; i++)
- {
-@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
-
- n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
-
-+ if (n_events == 0)
-+ break;
-+
-+ counter = MAX (counter, n_events);
-+ }
-+
-+ return counter;
-+}
-+
-+static guint
-+count_overlaps_of_event (GcalRangeTree *self,
-+ guint16 day_start,
-+ guint16 day_end,
-+ guint16 event_start,
-+ guint16 event_end)
-+{
-+ guint64 i, counter;
-+
-+ counter = count_overlaps_at_range (self, event_start, day_end);
-+
-+ for (i = event_start; i > day_start; i--)
-+ {
-+ guint n_events;
-+
-+ n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
-+
-+ if (n_events == 0)
-+ break;
-+
- counter = MAX (counter, n_events);
- }
-
-@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
- context = gtk_widget_get_style_context (event_widget);
-
- /* The total number of events available in this range */
-- events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
-+ events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
-
- /* The real horizontal position of this event */
- widget_index = get_event_index (overlaps, data->start, data->end);
-@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget,
- gcal_range_tree_add_range (overlaps,
- data->start,
- data->end,
-- GINT_TO_POINTER (widget_index));
-+ GUINT_TO_POINTER (widget_index));
- }
-
- g_clear_pointer (&widgets_data, g_ptr_array_unref);
---
-cgit v0.12
-
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
deleted file mode 100644
index ffbe2073b8fe..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-RDEPEND="
- >=dev-libs/glib-2.43.4:2
- >=x11-libs/gtk+-3.21.6:3
- >=gnome-extra/evolution-data-server-3.17.1:=
- >=dev-libs/libical-1.0.1:0=
- net-libs/libsoup:2.4
- >=net-libs/gnome-online-accounts-3.2.0:=
- >=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.40.6
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
- "${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
-)
-
-src_configure() {
- # Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
- gnome2_src_configure \
- --enable-debug=minimum
-}
diff --git a/gnome-extra/gnome-calendar/metadata.xml b/gnome-extra/gnome-calendar/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-calendar/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-characters-3.24.0 b/gnome-extra/gnome-characters-3.24.0
new file mode 100644
index 000000000000..d2eefd0d9a17
--- /dev/null
+++ b/gnome-extra/gnome-characters-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection] dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-util/dogtail[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/dogtail[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-util/dogtail[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 BSD
+RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dfd469aef7f58b04600477ccbf27d5c
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
deleted file mode 100644
index 2ea63ff59958..000000000000
--- a/gnome-extra/gnome-characters/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
-EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
deleted file mode 100644
index ef88e3fd8906..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/gjs-1.43.3
- >=dev-libs/glib-2.32:2
- >=dev-libs/gobject-introspection-1.35.9:=
- >=dev-libs/libunistring-0.9.5
- >=x11-libs/gtk+-3.20:3[introspection]
- >=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
- use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- sed 's/print \(.*\)/print(\1)/' -i "${S}"/tests/smoke_test.py || die
-
- gnome2_src_prepare
- vala_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/gnome-characters/metadata.xml b/gnome-extra/gnome-characters/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-characters/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-clocks-3.24.0 b/gnome-extra/gnome-clocks-3.24.0
new file mode 100644
index 000000000000..f684dec507a6
--- /dev/null
+++ b/gnome-extra/gnome-clocks-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clocks application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b6d04001437818a9cf538bdc827b13a1
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
deleted file mode 100644
index 1b011df00fda..000000000000
--- a/gnome-extra/gnome-clocks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
-EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
deleted file mode 100644
index 7740ca668b48..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/glib-2.44:2
- >=dev-libs/libgweather-3.13.91:2=
- >=gnome-base/gnome-desktop-3.7.90:3=
- >=media-libs/gsound-0.98
- >=sci-geosciences/geocode-glib-0.99.4
- >=x11-libs/gtk+-3.19.8:3
-"
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/itstool
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_prepare() {
- vala_src_prepare
- gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-clocks/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager-3.24.0 b/gnome-extra/gnome-color-manager-3.24.0
new file mode 100644
index 000000000000..b78ff9eb394c
--- /dev/null
+++ b/gnome-extra/gnome-color-manager-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= ) app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib dev-libs/libxslt dev-util/itstool >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Color profile manager for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
+IUSE=packagekit raw test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-color-manager/3.24/gnome-color-manager-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=025abfdb46d00dd378869a7c49b29593
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
deleted file mode 100644
index 97ee856ff8b5..000000000000
--- a/gnome-extra/gnome-color-manager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
-EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
-MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
deleted file mode 100644
index 441b966300cd..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.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=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-RDEPEND="
- >=dev-libs/glib-2.31.10:2
- >=media-libs/lcms-2.2:2
- >=media-libs/libcanberra-0.10[gtk3]
- media-libs/libexif
- media-libs/tiff:0=
-
- >=x11-libs/gtk+-3.3.8:3
- >=x11-libs/vte-0.25.1:2.91
- >=x11-misc/colord-1.3.1:0=
- >=x11-libs/colord-gtk-0.1.20
-
- packagekit? ( app-admin/packagekit-base )
- raw? ( media-gfx/exiv2:0= )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-sgml-utils
- dev-libs/appstream-glib
- dev-libs/libxslt
- dev-util/itstool
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
-"
-
-src_configure() {
- # Always enable tests since they are check_PROGRAMS anyway
- # appstream does not want to be relax by default !
- gnome2_src_configure \
- --disable-static \
- --enable-tests \
- $(use_enable packagekit) \
- $(use_enable raw exiv)
-# APPSTREAM_UTIL=$(type -P true)
-}
-
-src_test() {
- virtx emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! has_version media-gfx/argyllcms ; then
- elog "If you want to do display or scanner calibration, you will need to"
- elog "install media-gfx/argyllcms"
- fi
-}
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
deleted file mode 100644
index 6968539644cc..000000000000
--- a/gnome-extra/gnome-color-manager/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="packagekit">Enable support for the distro-neutral package
- manager GUI <pkg>app-admin/packagekit</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-commander-1.6.3 b/gnome-extra/gnome-commander-1.6.3
new file mode 100644
index 000000000000..d88386d57707
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-util/cppunit-1.13.2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e63c0d5642b0b917ff49c17e54754329
diff --git a/gnome-extra/gnome-commander-1.6.4 b/gnome-extra/gnome-commander-1.6.4
new file mode 100644
index 000000000000..e606090a25b5
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.4.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1de77fd2e5a620cfd20510c72551ab4f
diff --git a/gnome-extra/gnome-commander-1.8.0 b/gnome-extra/gnome-commander-1.8.0
new file mode 100644
index 000000000000..b8eb2db2fc07
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c81937df4252f8ebb3c5e8f90715fa8e
diff --git a/gnome-extra/gnome-commander-1.8.1 b/gnome-extra/gnome-commander-1.8.1
new file mode 100644
index 000000000000..70654e795c16
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf taglib samba test +unique
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4962f1883eba6c2019ce6875e18050d0
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
deleted file mode 100644
index 87c4fc1433ad..000000000000
--- a/gnome-extra/gnome-commander/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST gnome-commander-1.6.3.tar.xz 6653164 BLAKE2B 04d39ad7e19939b1791de838a03a9406abb11599e8c43d86cf491aef087e9c78574d28bc076ceefab81a18f09fb1ac49b7cb893b0381a7890744a77438c53453 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3
-DIST gnome-commander-1.6.4.tar.xz 6678752 BLAKE2B 987aa7ff2b34df163a82a9e1964d21860a90ba2ff6fb71190ebfec245090a9ffea1aa8a45c037cd848135dec7a56b7cd26e31d70be8c5ce3f24ad132cff3b19a SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0
-DIST gnome-commander-1.8.0.tar.xz 7433656 BLAKE2B 686581eb6775e336928f18f3c817d4d34b19da2c5c91660e453223833b24f6bd1400d8ecf2ca3698fc18f2d926343006058b00fefda889204f251b223d6a2d34 SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d
-DIST gnome-commander-1.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32
-EBUILD gnome-commander-1.6.3.ebuild 1690 BLAKE2B 75d8fe6a6c140dc66cd44dd7a280763367e431ddec9acb8ff6a8ed8f48b3c9ded16a0a6a38ae0dd4b6349f0e421323f8da4b3639cbf040379e6a9414342c3ff2 SHA512 dc55901ec53ee864e99280e97f6d1af621c9f567c46bfe120328d4268e7108561aa8f30a960e2c642c141c8ebec4f5a3a5225c4170c37f9c73fac5e2a9c736a0
-EBUILD gnome-commander-1.6.4.ebuild 1690 BLAKE2B 8e7cd9242ec65947a4cd2b0ec68fe7c1d5956afb9016b1c86e687f2892095384aef0267173044c0f587918390529548b42bb34a51d97bee1396e5000f8d99763 SHA512 f8071c83815e1c58fcc11027695b7ee92d46cb80958ed0d11add1bbd0a04ca0b46a002dfd65573d786a589d4c3d0d58b9573d188c83d876b5cf24092a7510aa8
-EBUILD gnome-commander-1.8.0.ebuild 1662 BLAKE2B 19fdd9b09b7d8082d3b9bdc6305bd85ba31b3ed1f5138c249e9a77aa3683fab08e130ab7c717d2415eb71809ef8e2b8dec059406c5f5fa068af07908faa6a40b SHA512 9c016b72422439dbedf6c93901e7bc5413de12cd8924a87b07cb84fc9c86cbb5c45b1a031ef2a96c43c9dd3065e85415a9279b4a9e145e1cc70741a447429217
-EBUILD gnome-commander-1.8.1.ebuild 1392 BLAKE2B d1c67d019e1a24dc28f3122012cd10aa208b9785f3e902124177c0c847ed12142b531b1c4ee7e53181837f3d33dc359a5b69e100c5819d79692a607edc2d29d4 SHA512 adc3f88d893737c1b9d2a4cb8f56260f40733d2e39a7e6a53bc813d8225b57b4321c88751935e916cb7329925ca016cf45de226dd0ba4dabb3646354431d5b1e
-MISC metadata.xml 1272 BLAKE2B 808953256b9af04ad4d4d8021e40f8d90b04333d03f67a15f2d50461706059269e02ed0316160245d636482ee6a741c4591c474e24028b5493383c99ab0bb1bb SHA512 4b2df4f1f6935f0efa0c1b1b8d975ea1927e049824c6bb35101ce93069477c39bb68e584648c1e88cf4e60083ecfe5a101ea11381b525d3245e3ff128914f4b2
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
deleted file mode 100644
index 8855b6edb1ce..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-text/gnome-doc-utils
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.8.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- pdf? ( >=app-text/poppler-0.18 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/gnome-vfs-python-2.0.0
- )
- taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
- ${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- sys-devel/gettext
- virtual/pkgconfig
- test? ( >=dev-util/cppunit-1.13.2 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable python) \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(use_with unique)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
deleted file mode 100644
index 83995841e950..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-text/gnome-doc-utils
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.8.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- pdf? ( >=app-text/poppler-0.18 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/gnome-vfs-python-2.0.0
- )
- taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
- ${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0
- sys-devel/gettext
- virtual/pkgconfig
- test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable python) \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(use_with unique)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
deleted file mode 100644
index 9ce12ae4eeeb..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- app-text/yelp-tools
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.18.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- pdf? ( >=app-text/poppler-0.18 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/gnome-vfs-python-2.0.0
- )
- taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
- ${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
- test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_enable python) \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(use_with unique)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
deleted file mode 100644
index 7fd4b9933cc6..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf taglib samba test +unique"
-
-RDEPEND="
- app-text/yelp-tools
- >=dev-libs/glib-2.44.0:2
- unique? ( >=dev-libs/libunique-0.9.3:1 )
- gnome-base/gnome-keyring
- >=gnome-base/gnome-vfs-2.0.0
- >=gnome-base/libgnome-2.0.0
- >=gnome-base/libgnomeui-2.4.0
- >=x11-libs/gtk+-2.18.0:2
- chm? ( dev-libs/chmlib )
- exif? ( >=media-gfx/exiv2-0.14 )
- gsf? ( >=gnome-extra/libgsf-1.12.0 )
- samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
- pdf? ( >=app-text/poppler-0.18 )
- taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
- ${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/gettext
- virtual/pkgconfig
- test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with chm libchm) \
- $(use_with exif exiv2) \
- $(use_with gsf libgsf) \
- $(use_with pdf poppler) \
- $(use_with samba) \
- $(use_with taglib) \
- $(use_with unique)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
- has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
deleted file mode 100644
index 59b66f283536..000000000000
--- a/gnome-extra/gnome-commander/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>u.scholz83@gmx.de</email>
- <name>Uwe Scholz</name>
- </maintainer>
-<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
-<upstream>
- <maintainer status="active">
- <email>u.scholz83@gmx.de</email>
- <name>Uwe Scholz</name>
- </maintainer>
- <changelog>https://git.gnome.org/browse/gnome-commander/tree/NEWS?h=gcmd-1-4</changelog>
- <bugs-to>https://bugzilla.gnome.org/browse.cgi?product=gnome-commander</bugs-to>
- <remote-id type="freecode">gnome-commander</remote-id>
-</upstream>
-<use>
- <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
- <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
- <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
- <flag name="pdf">Add metadata support for PDF</flag>
- <flag name="python">Add support for python plugins</flag>
- <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>
- <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-contacts-3.22.1-r1 b/gnome-extra/gnome-contacts-3.22.1-r1
new file mode 100644
index 000000000000..c1db7f5611e8
--- /dev/null
+++ b/gnome-extra/gnome-contacts-3.22.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/folks-0.11.4:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-0.9.6:= dev-libs/folks[vala(+)] gnome-base/gnome-desktop:3=[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME contact management application
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IUSE=v4l
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/folks-0.11.4:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=983366c80a5c9a9e9a7f099e3151b742
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
deleted file mode 100644
index f33285beaf7f..000000000000
--- a/gnome-extra/gnome-contacts/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.22.1-fix-vala-0.35-part1.patch 884 BLAKE2B 2994fc2b28bbe8f3b547542b100324fce5d95b385ea8edc1013c86c1e0df1dabafb4306b8153953c67a36e1d96e1c658c599afea5f1c3e3a7d617d01c05d3224 SHA512 73754d230efe89d3e3273e1d24a69e58e45a8d6e74fce1a41f7a7889aa58189fcc2f5edf36ce2418c43871716634301308f0c211f0f18282cb409d009669bdf2
-AUX 3.22.1-fix-vala-0.35-part2.patch 1501 BLAKE2B ca7149152cae32912977bb8a2ca420d1711fcff5e2b18e040d9969e246a0398f66ad09cee72f22b282d6eec834d10721a99d270ba873d782f09bc6e30b7c80d6 SHA512 700772e2c87bfad32e408f20653a20976c0a3b243fd4bc8b6ed61cb9fe34f1b1f572b877aa05e9b9c3854cc444d5d7fc1c26dcd9ac28bf76694eb02c2e31bb4c
-DIST gnome-contacts-3.22.1.tar.xz 788820 BLAKE2B 8f620334dd380e8cb690f7b71d3a99a921f5814ab230690a60be6022150db7a6a0f74e426e72d8d027eb5280e1b6bfd04fa7b0b030519bb19e4718ca0c9f2120 SHA512 d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107
-EBUILD gnome-contacts-3.22.1-r1.ebuild 1840 BLAKE2B 3678c0ff5796cb2bfed0d35954e0553bdb6b94c79fd9e4d120fac3a307351c948c4cf2d733878002907af6416548ef6c18063fce60a48b022e3f0faa9130e6d2 SHA512 81cfe1119ad2b63bb3041eecae2b4a5b0dc0e1b8e4901f6ad74cb1c52004abcd820dd131f3b2bac0e0d7b067c69c2a53a84187ab7f9019d991f81de79def191d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
deleted file mode 100644
index b9634e6fc041..000000000000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2ba6e380dd8a3575bd8f4d4e5d8d3883003e9f54 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 1 Oct 2016 14:27:55 +0200
-Subject: [PATCH] Don't restrict RowData.details to the generic type "string"
-
-This allows AbstractFieldDetails<G> based values to be assigned,
-like PostalAddressFieldDetails.
-
-Fixes a build-failure with vala 0.35+ due to stricter type-checking.
----
- src/contacts-contact-editor.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
-index 3372f87..3978887 100644
---- a/src/contacts-contact-editor.vala
-+++ b/src/contacts-contact-editor.vala
-@@ -77,7 +77,7 @@ public class Contacts.ContactEditor : Grid {
- }
-
- struct RowData {
-- AbstractFieldDetails<string> details;
-+ AbstractFieldDetails details;
- }
-
- struct Field {
---
-2.14.1
-
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
deleted file mode 100644
index 4cfe861fa509..000000000000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b96b0fc07c49724f252a5cd35f2d028f91529068 Mon Sep 17 00:00:00 2001
-From: Jeena <hello@jeena.net>
-Date: Tue, 15 Aug 2017 16:53:05 +0200
-Subject: [PATCH] Drop unnecessary format-string.
-
-Code got refactored in 3.25/master but it boils down to dropping this
-extra parameter.
----
- src/contacts-contact-pane.vala | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
-index 8e100f2..fce832b 100644
---- a/src/contacts-contact-pane.vala
-+++ b/src/contacts-contact-pane.vala
-@@ -451,7 +451,6 @@ public class Contacts.ContactPane : Notebook {
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("You need to enter some data"));
- dialog.show ();
- dialog.response.connect ( () => {
-@@ -463,7 +462,6 @@ public class Contacts.ContactPane : Notebook {
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("No primary addressbook configured"));
- dialog.show ();
- dialog.response.connect ( () => {
-@@ -482,7 +480,6 @@ public class Contacts.ContactPane : Notebook {
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("Unable to create new contacts: %s"), e.message);
- }
-
-@@ -493,7 +490,6 @@ public class Contacts.ContactPane : Notebook {
- DialogFlags.MODAL,
- MessageType.ERROR,
- ButtonsType.OK,
-- "%s",
- _("Unable to find newly created contact"));
- }
-
---
-2.14.1
-
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
deleted file mode 100644
index 95083e15f4ef..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
- $(vala_depend)
- >=dev-libs/gobject-introspection-0.9.6:=
- dev-libs/folks[vala(+)]
- gnome-base/gnome-desktop:3=[introspection]
- gnome-extra/evolution-data-server[vala]
- net-libs/telepathy-glib[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-# folks-0.11.4 to avoid build issues with vala-0.36, upstream 7a9001b056b4fb1d00375e7b2adeda9b7cf93c90
-RDEPEND="
- >=dev-libs/folks-0.11.4:=[eds,telepathy]
- >=dev-libs/glib-2.37.6:2
- >=dev-libs/libgee-0.10:0.8
- >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
- >=gnome-base/gnome-desktop-3.0:3=
- media-libs/clutter:1.0
- media-libs/clutter-gtk:1.0
- media-libs/libchamplain:0.12
- net-libs/gnome-online-accounts:=
- >=net-libs/telepathy-glib-0.17.5
- >=sci-geosciences/geocode-glib-3.15.3
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.20.0:3
- x11-libs/pango
- v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
- ${VALA_DEPEND}
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PV}-fix-vala-0.35-part1.patch
- "${FILESDIR}"/${PV}-fix-vala-0.35-part2.patch
-)
-
-src_prepare() {
- # Regenerate the pre-generated C sources, bug #471628
- if ! use v4l; then
- touch src/*.vala
- fi
-
- vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-man-pages \
- $(use_with v4l cheese)
-}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-contacts/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-directory-thumbnailer-0.1.10 b/gnome-extra/gnome-directory-thumbnailer-0.1.10
new file mode 100644
index 000000000000..4bc084944942
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer-0.1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3 >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thumbnail generator for directories
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.10.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4e8f55d9ff29ab010e3596cd1eecfb9
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
deleted file mode 100644
index 6fc2274401e2..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-directory-thumbnailer-0.1.10.tar.xz 277524 BLAKE2B 3ecff07a7984b1edebf07d5e0199110bfb7e841a5da03d0d8aa55c0029c6e1fa6b6409bbb3294f02187d14ff55580159863f36cff5ce6157f23f1949a0e10661 SHA512 0e6a2874f633bfa32f0028f99c8535b3da0b44b3c89cf1e20a8dd23c8cf2e0e7bf7204af04587c4cf3a9614d9111814a8c6474bb43229178447cb3143672f0fc
-EBUILD gnome-directory-thumbnailer-0.1.10.ebuild 496 BLAKE2B 183cac210a7897aafda4772c734dfd99d2a31b766b506264931f44e8aaccd85f80b49e54d06a0288e3d3bd2443d4c95fe50d0f4364729f53a9744c96f89d0acb SHA512 4501b8e8d2ac36bb2651104c502ba957c50a7626d6bdc80c842a8ab9d392ecbb8776f3451b8270ccc73d81dc725818b3ed8fa1d47301d6eafa62e67005e1501e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
deleted file mode 100644
index 3c9bd5ca9e13..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Thumbnail generator for directories"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >=dev-libs/glib-2.35:2
- >=x11-libs/gdk-pixbuf-2.36.5:2
- >=gnome-base/gnome-desktop-2.2:3=
- x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-"
diff --git a/gnome-extra/gnome-directory-thumbnailer/metadata.xml b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-documents-3.24.3 b/gnome-extra/gnome-documents-3.24.3
new file mode 100644
index 000000000000..c3d02f840858
--- /dev/null
+++ b/gnome-extra/gnome-documents-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A document manager application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Documents
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a7dcd0b93853c59b4988b0b319cf970e
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
deleted file mode 100644
index c0d0556f6c32..000000000000
--- a/gnome-extra/gnome-documents/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
-EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
deleted file mode 100644
index 0d0f874803cf..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
- >=app-text/evince-3.13.3[introspection]
- >=net-libs/webkit-gtk-2.6:4[introspection]
- dev-libs/gjs
- >=dev-libs/glib-2.39.3:2
- >=dev-libs/gobject-introspection-1.31.6:=
- >=x11-libs/gtk+-3.22.10:3[introspection]
- >=net-libs/libsoup-2.41.3:2.4
- gnome-base/gnome-desktop:3=[introspection]
- >=app-misc/tracker-1:=[miner-fs]
- >=x11-libs/cairo-1.14
- >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- >=net-libs/gnome-online-accounts-3.2.0[introspection]
- x11-libs/pango[introspection]
- >=net-libs/libzapojit-0.0.2[introspection]
- >=app-text/libgepub-0.4[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
- net-misc/gnome-online-miners
- sys-apps/dbus
- x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.50.1
- dev-util/itstool
- virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-documents/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon-0.2.90 b/gnome-extra/gnome-dvb-daemon-0.2.90
new file mode 100644
index 000000000000..d8c3ed5c1de1
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon-0.2.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) totem? ( media-video/totem ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) >=dev-lang/perl-5.8.1:0 >=dev-util/intltool-0.40.0:0 >=dev-libs/libltdl-2.2.6:0 virtual/pkgconfig:0 nls? ( >=sys-devel/gettext-0.18.1:0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/action/show/Projects/DVBDaemon
+IUSE=nls totem vala
+KEYWORDS=amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) totem? ( media-video/totem )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4886600dc206a9778fa7e8cdf13f9c59
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
deleted file mode 100644
index dc597fcc8e9e..000000000000
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 BLAKE2B ff08784a7b7e995a0bddda724cd000a2f98da22d7e27897a837e345523c02c2bf016f96861341181b0d4f1ee9afc5104675f1ab2c77ab14815f08f34324693d5 SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40
-EBUILD gnome-dvb-daemon-0.2.90.ebuild 1694 BLAKE2B 99e5817e82f936dc5fbe67f7b62fd79a23ee6a02b1f9702b060ad57826744a500db3fe3a87b0d231531a9add195f14f989c89aaf5fbebf85bee375c218a0b2c4 SHA512 3b7ef1acba1b596f9629803e4a6eb45b9660aed68ed73a61864a5711584df676f34eaa010e7078b6352d3d596c576ba7ac7b97d00107eaab31a10d2fb01a92e3
-MISC metadata.xml 587 BLAKE2B bd4ef7c759254cf493e4b55166deab4f94eea2226fbaa5630708b4217f2fda2f2b6537620b5a0fb94cf3cad8db87f29c7da05c42c85060475667df71cc8a88e8 SHA512 e3f3fcf4fefb21c6d5cdd394c3c663ba1f178e7f2f7432e3e03a0c2a546baaf328d25fed7dff1145833d8df17f955acd0e2d49db404385c4eb6155c961380243
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
deleted file mode 100644
index c8b8ebee7ef5..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-VALA_MIN_API_VERSION="0.26"
-
-inherit eutils gnome2 multilib python-any-r1 vala
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="nls totem vala"
-
-RDEPEND=">=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.4.0:1.0
- >=media-libs/gst-plugins-good-1.4.0:1.0
- >=media-libs/gst-plugins-bad-1.4.0:1.0
- >=dev-libs/libgee-0.8:0.8
- >=dev-db/sqlite-3.4:3
- >=media-libs/gst-rtsp-server-1.4.5:1.0
- media-plugins/gst-plugins-dvb:1.0
- dev-python/gst-python:1.0
- >=dev-python/pygobject-3.2.1:3
- >=dev-libs/gobject-introspection-1.44.0:0
- x11-libs/gtk+:3[introspection]
- virtual/libgudev:0
- vala? ( $(vala_depend) )
- totem? ( media-video/totem )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.8.1:0
- >=dev-util/intltool-0.40.0:0
- >=dev-libs/libltdl-2.2.6:0
- virtual/pkgconfig:0
- nls? ( >=sys-devel/gettext-0.18.1:0 )"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- python_fix_shebang .
- gnome2_src_prepare
- if use vala ; then
- vala_src_prepare
- fi
-}
-
-src_configure() {
- # Prevent sandbox violations, bug #569992
- addpredict /dev
- gnome2_src_configure \
- $(use_enable nls) \
- $(use_enable totem totem-plugin) \
- $(usex totem '--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins' '')
-}
-
-pkg_postinst() {
- if use totem ; then
- python_optimize
- fi
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- if use totem ; then
- python_optimize
- fi
- gnome2_pkg_postrm
-}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
deleted file mode 100644
index 001aba64a9ee..000000000000
--- a/gnome-extra/gnome-dvb-daemon/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
- GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your
- DVB devices, record and watch TV shows and browse EPG. It can be controlled
- by any application via its D-Bus interface.
-</longdescription>
-<use>
- <flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs-3.24.1 b/gnome-extra/gnome-getting-started-docs-3.24.1
new file mode 100644
index 000000000000..f89cf758eebe
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help a new user get started in GNOME
+EAPI=6
+HOMEPAGE=https://help.gnome.org/
+KEYWORDS=amd64 ~arm x86
+LICENSE=CC-BY-SA-3.0
+RDEPEND=gnome-extra/gnome-user-docs
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca482646e1c7ab1ca299cf5c76fdb6a9
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
deleted file mode 100644
index f729bad898d3..000000000000
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
-EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
deleted file mode 100644
index 6e1a40b324b1..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="app-text/yelp-tools"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/metadata.xml b/gnome-extra/gnome-getting-started-docs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-getting-started-docs/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify-20140907-r1 b/gnome-extra/gnome-integration-spotify-20140907-r1
new file mode 100644
index 000000000000..92ac08854131
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify-20140907-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst preinst prerm
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=GNOME integration for Spotify
+EAPI=6
+HOMEPAGE=https://github.com/mrpdaemon/gnome-integration-spotify
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick x11-misc/wmctrl x11-misc/xautomation x11-misc/xdotool x11-apps/xwininfo
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mrpdaemon/gnome-integration-spotify/archive/20140907.tar.gz -> gnome-integration-spotify-20140907.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=727207dbac141501ed08dab4401011d9
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
deleted file mode 100644
index 59ccedf3760f..000000000000
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r1.ebuild 1088 BLAKE2B eee6fc450013734e5afd2ccde4d31d2f2aff6d9337c1b7d078dc5792ff8681ac1851d21314ce79f1e98b418225822f34695532bae9928f19bcd883d80bf9e6ab SHA512 d5426537c55a588054638d30403e6a705da7ed399f78e55c3c00f9ce134c58e33daf438b9a4d95f6b90e24c5a777ebe8736c1d20fb41eb08db68990215d644da
-MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
deleted file mode 100644
index 6b304d8fd213..000000000000
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2-utils python-r1
-
-DESCRIPTION="GNOME integration for Spotify"
-HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
-#SRC_URI="https://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
-SRC_URI="https://github.com/mrpdaemon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/mrpdaemon-${PN}-df9124d"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- media-gfx/imagemagick
- x11-misc/wmctrl
- x11-misc/xautomation
- x11-misc/xdotool
- x11-apps/xwininfo"
-
-src_install() {
- dobin spotify-dbus.py
- python_replicate_script "${ED}"/usr/bin/spotify-dbus.py
- mkdir -p "${D}/etc/gconf/schemas"
- cp spotify.schemas "${D}/etc/gconf/schemas"
-}
-
-pkg_preinst() {
- gnome2_gconf_savelist
-}
-
-pkg_postinst() {
- gnome2_gconf_install
-}
-
-pkg_prerm() {
- gnome2_gconf_uninstall
-}
diff --git a/gnome-extra/gnome-integration-spotify/metadata.xml b/gnome-extra/gnome-integration-spotify/metadata.xml
deleted file mode 100644
index 890dee3a0870..000000000000
--- a/gnome-extra/gnome-integration-spotify/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>prometheanfire@gentoo.org</email>
- <name>Matthew Thode</name>
- </maintainer>
- <upstream>
- <remote-id type="github">mrpdaemon/gnome-integration-spotify</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-logs-3.24.2 b/gnome-extra/gnome-logs-3.24.2
new file mode 100644
index 000000000000..cf597d5aeb05
--- /dev/null
+++ b/gnome-extra/gnome-logs-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3 ~app-text/docbook-xml-dtd-4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.50 gnome-base/gnome-common virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Log messages and event viewer
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Logs
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b93a4b78b2ecb49a889020b8e7669215
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
deleted file mode 100644
index 98520620014f..000000000000
--- a/gnome-extra/gnome-logs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
-EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
deleted file mode 100644
index b5ed60f132c6..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-libs/glib-2.43.90:2
- gnome-base/gsettings-desktop-schemas
- sys-apps/systemd:=
- >=x11-libs/gtk+-3.19.3:3
-"
-DEPEND="${RDEPEND}
- ~app-text/docbook-xml-dtd-4.3
- app-text/yelp-tools
- dev-libs/appstream-glib
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- gnome-base/gnome-common
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
- use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-man \
- $(use_enable test tests)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/gnome-logs/metadata.xml b/gnome-extra/gnome-logs/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-logs/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-packagekit-3.22.1 b/gnome-extra/gnome-packagekit-3.22.1
new file mode 100644
index 000000000000..47849d7e56da
--- /dev/null
+++ b/gnome-extra/gnome-packagekit-3.22.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PackageKit client for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=systemd udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5a5847523a4b66e5d445045b627da8
diff --git a/gnome-extra/gnome-packagekit-3.24.0 b/gnome-extra/gnome-packagekit-3.24.0
new file mode 100644
index 000000000000..3093351c379f
--- /dev/null
+++ b/gnome-extra/gnome-packagekit-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 dev-libs/libxslt >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PackageKit client for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=systemd udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d8c774840859c0b71b22c3cf3365317
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
deleted file mode 100644
index 09d38e1c5eb7..000000000000
--- a/gnome-extra/gnome-packagekit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-packagekit-3.22.1.tar.xz 1684420 BLAKE2B 30ce96fdec5fb1211d06fcc751ed0ac01e386364af6025051766b25ee6eadb4a926c3ff5ed74d27c67fc5774497fac20cde0248a6bd9ee24a77ae9cad7e0080d SHA512 f8f5046f53c095f199cf75452a5f0c2cc62a54cd5337b696a3885358573b44d94bcf44b168a4ea8cbd00b746d0274437a5fc9cb10f0a55e9eb9f2dbd2a8e4f18
-DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
-EBUILD gnome-packagekit-3.22.1.ebuild 2277 BLAKE2B 14854b16c43bc1ebdc62fc58bcc7fa8add0ad63e975d874ce8e438ec264fc8384b298fd8fac17b399903fca14e6fa09e06136453cb75777e051bd1843496260b SHA512 850a7e248b6b93aa1714003fd2e7a9614b5982ed227331dd6ca4a74ad0e4d069393b7852b09baa5731c6754c67c6f6d106e7b7a1b2a2716fcc947c819a588609
-EBUILD gnome-packagekit-3.24.0.ebuild 2241 BLAKE2B 24984de13082b7b6adb336bab3400b297baabe1256d15a213b30c6147f8bbd84d4ef5b53038b4edb2d8a2decc9da7b3adeb6a0e715f8bbc030e0022aa3de7634 SHA512 5a701a9aec0294d81c126fb157f1bc89fd1dab84e94e33c1a9391669a8fdd02b6d05961a2bb03ce0b3fba907832353e31452cbf2ecbf4053031890545871ec83
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
deleted file mode 100644
index 0fc509b13a24..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
- >=dev-libs/glib-2.32:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.15.3:3
- >=x11-libs/libnotify-0.7.0:=
- x11-libs/pango
-
- >=app-admin/packagekit-base-0.9.1
- >=media-libs/libcanberra-0.10[gtk3]
- >=sys-apps/dbus-1.1.2
-
- media-libs/fontconfig
- x11-libs/libX11
-
- systemd? ( >=sys-apps/systemd-42 )
- !systemd? ( sys-auth/consolekit )
- udev? ( virtual/libgudev:= )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-utils
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- dev-libs/libxslt
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
- # * disable tests with graphical dialogs and that require packagekitd
- # to be run with the dummy backend and installed .ui files
- # * disable tests that fails every time packagekit developers make a
- # tiny change to headers
- # * gpk_test_markdown_func: no definition for that one
- sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
- -e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
- -e '/g_test_add_func.*gpk_test_error_func/d' \
- -e '/g_test_add_func.*gpk_test_modal_dialog/d' \
- -e '/g_test_add_func.*gpk_test_task_func/d' \
- -e '/g_test_add_func.*gpk_test_markdown_func/d' \
- -i src/gpk-self-test.c || die
-
- # XXX: g_autoptr requires explicit type support
- sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
- -i src/gpk-self-test.c || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --localstatedir=/var \
- --enable-iso-c \
- --disable-tests \
- $(use_enable systemd) \
- $(use_enable udev gudev)
- # $(use_enable test tests)
-}
-
-src_test() {
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
deleted file mode 100644
index 3b3299265a41..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
- >=dev-libs/glib-2.32:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.15.3:3
- >=x11-libs/libnotify-0.7.0:=
- x11-libs/pango
-
- >=app-admin/packagekit-base-0.9.1
- >=media-libs/libcanberra-0.10[gtk3]
- >=sys-apps/dbus-1.1.2
-
- media-libs/fontconfig
- x11-libs/libX11
-
- systemd? ( >=sys-apps/systemd-42 )
- !systemd? ( sys-auth/consolekit )
- udev? ( virtual/libgudev:= )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-sgml-utils
- dev-libs/appstream-glib
- >=dev-util/gtk-doc-am-1.9
- dev-libs/libxslt
- >=sys-devel/gettext-0.19.7
- virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
- # * disable tests with graphical dialogs and that require packagekitd
- # to be run with the dummy backend and installed .ui files
- # * disable tests that fails every time packagekit developers make a
- # tiny change to headers
- # * gpk_test_markdown_func: no definition for that one
- sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
- -e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
- -e '/g_test_add_func.*gpk_test_error_func/d' \
- -e '/g_test_add_func.*gpk_test_modal_dialog/d' \
- -e '/g_test_add_func.*gpk_test_task_func/d' \
- -e '/g_test_add_func.*gpk_test_markdown_func/d' \
- -i src/gpk-self-test.c || die
-
- # XXX: g_autoptr requires explicit type support
- sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
- -i src/gpk-self-test.c || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --localstatedir=/var \
- --disable-tests \
- $(use_enable systemd) \
- $(use_enable udev gudev)
- # $(use_enable test tests)
-}
-
-src_test() {
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
- GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-packagekit/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager-3.24.0 b/gnome-extra/gnome-power-manager-3.24.0
new file mode 100644
index 000000000000..c58346b261a7
--- /dev/null
+++ b/gnome-extra/gnome-power-manager-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib >=sys-devel/gettext-0.19.7 x11-base/xorg-proto virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME power management service
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
+IUSE=test test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-power-manager/3.24/gnome-power-manager-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be1dc1e3f882b406b0bddf543a4569b3
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
deleted file mode 100644
index 1fb25f58426a..000000000000
--- a/gnome-extra/gnome-power-manager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
-EBUILD gnome-power-manager-3.24.0.ebuild 1307 BLAKE2B e095a196b85063bbb4d24370c2f682c87527c29c1e768cfd214de4afbc608bc0494e95cd381da5e25ca2e361f09a6c488a3372f2a390954a2c4802f35b123df2 SHA512 e41221b0c3fbe36bc4944fd3f159d378d399cb073ddc29250186ab6922e5d9d1d70d6282f61893d6352bb4a51ca339cea2e443f4743687b46e68becdcdcd3a7f
-MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
deleted file mode 100644
index 5e67d409645f..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.45.8:2
- >=x11-libs/gtk+-3.3.8:3
- >=x11-libs/cairo-1
- >=sys-power/upower-0.99:=
-"
-RDEPEND="${COMMON_DEPEND}
- x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-sgml-dtd:4.1
- app-text/docbook-sgml-utils
- dev-libs/appstream-glib
- >=sys-devel/gettext-0.19.7
- x11-base/xorg-proto
- virtual/pkgconfig
- test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
- # Drop debugger CFLAGS from configure
- # Touch configure.ac only if running eautoreconf, otherwise
- # maintainer mode gets triggered -- even if the order is correct
- sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
- -i configure || die "debugger sed failed"
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable test tests)
-}
-
-src_test() {
- virtx emake check
-}
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
deleted file mode 100644
index 8b88d4204ab7..000000000000
--- a/gnome-extra/gnome-power-manager/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">
- Power Manager daemon for the GNOME desktop environment that makes it
- easy to manage your laptop or desktop system.
- </longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-search-tool-3.6.0 b/gnome-extra/gnome-search-tool-3.6.0
new file mode 100644
index 000000000000..f5dac6b9b86c
--- /dev/null
+++ b/gnome-extra/gnome-search-tool-3.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Search tool for GNOME 3
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 FDL-1.1
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM sys-apps/findutils || ( sys-apps/mlocate sys-freebsd/freebsd-ubin ) !<gnome-extra/gnome-utils-3.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-search-tool/3.6/gnome-search-tool-3.6.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ca1910c7da134ad3c77b46debfa89af
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
deleted file mode 100644
index 65b3fad00f4d..000000000000
--- a/gnome-extra/gnome-search-tool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-search-tool-3.6.0.tar.xz 685172 BLAKE2B dab076a7f03d8d2cf7ebc884f65b737d627e27c67665b44147113aa898667aa84dda4fd5bb1196264e2cc3221c3bb166fc01bad36c5363f0400744d779330387 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5
-EBUILD gnome-search-tool-3.6.0.ebuild 911 BLAKE2B 9c829e2f7c35843415180f48e975e6cef286a7ee9472987131868d31c8b1bc9fcf92a99b18536014f71bd03b9adc50c802d0f6cf0c41d95487b147f0d3eadd8d SHA512 c1dcebb9826df3165a6f486728822180d1fa851fb29aeda4a47521a44105b4c99cd689ed3e08662e1dad2f2cf0c76b5b3624c6cf326a4175050574d200aeba5f
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
deleted file mode 100644
index 1ffca1a609d9..000000000000
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Search tool for GNOME 3"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
- dev-libs/atk
- >=dev-libs/glib-2.30:2
- sys-apps/grep
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-3:3[X]
- x11-libs/libICE
- x11-libs/libSM
-"
-RDEPEND="${COMMON_DEPEND}
- sys-apps/findutils
- || ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
- !<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-src_configure() {
- G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
- gnome2_src_configure
-}
diff --git a/gnome-extra/gnome-search-tool/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-search-tool/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions-3.24.3 b/gnome-extra/gnome-shell-extensions-3.24.3
new file mode 100644
index 000000000000..a3ed95cac4de
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-3.24.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+IUSE=examples
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d3c4858f5da64a73aa5a99ebbe50017
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus-21 b/gnome-extra/gnome-shell-extensions-topicons-plus-21
new file mode 100644
index 000000000000..c615feb4a5db
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus-21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Moves legacy tray icons to top panel
+EAPI=6
+HOMEPAGE=https://extensions.gnome.org/extension/1031/topicons/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.16
+SLOT=0
+SRC_URI=https://github.com/phocean/TopIcons-plus/archive/v21.tar.gz -> gnome-shell-extensions-topicons-plus-21.tar.gz
+_eclasses_=vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
+_md5_=b6e9cca81ec5de0e51e3cb4c786fd3d9
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
deleted file mode 100644
index 3e4f267208f7..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df
-EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e
-MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
deleted file mode 100644
index 852ec51263a1..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.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
-inherit vcs-snapshot
-
-DESCRIPTION="Moves legacy tray icons to top panel"
-HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
-SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
- dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
- app-eselect/eselect-gnome-shell-extensions
- >=gnome-base/gnome-shell-3.16
-"
-DEPEND="${COMMON_DEPEND}"
-
-#src_compile() {
- # It redoes this with "make install" later due to a dumb Makefile, so don't bother
- #make build
-#}
-
-src_install() {
- # TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
- make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
- rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
- # Assuming it needs only compiled gettext catalogs at runtime
- rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
- dodoc README.md
-}
-
-pkg_postinst() {
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
deleted file mode 100644
index 725b4746cbef..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <upstream>
- <remote-id type="github">phocean/TopIcons-plus</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
deleted file mode 100644
index ca6b5f2340b1..000000000000
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
-EBUILD gnome-shell-extensions-3.24.3.ebuild 2052 BLAKE2B a1be0802d71c34de0baf77b088badb0ef0f492c30ce738e85fcc52f921f2156f11715dfa2f3a7309cb1e3fe804ef80bd3d3c37a95b8dc49aecb7ea801fcceec7 SHA512 2aa74c3f079d1fe228e12fed8f984f80be3f0bdbc904499555e80d2a0931bc9003f652ba5aacb49563eef5bc86495c6f8552c2b1136fe0179b078a1004e45cba
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
deleted file mode 100644
index b083460498d0..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.26:2
- >=gnome-base/libgtop-2.28.3[introspection]
- >=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-libs/gjs-1.29
- dev-libs/gobject-introspection:=
- dev-libs/atk[introspection]
- gnome-base/gnome-menus:3[introspection]
- >=gnome-base/gnome-shell-3.14.2
- media-libs/clutter:1.0[introspection]
- net-libs/telepathy-glib[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- x11-libs/gtk+:3[introspection]
- x11-libs/pango[introspection]
- x11-themes/adwaita-icon-theme
- x11-wm/mutter[introspection]
-"
-DEPEND="${COMMON_DEPEND}
- >=sys-devel/gettext-0.19.6
- virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
- gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
- gnome2_src_install
-
- local example="example@gnome-shell-extensions.gcampax.github.com"
- if use examples; then
- mv "${ED}usr/share/gnome-shell/extensions/${example}" \
- "${ED}usr/share/doc/${PF}/" || die
- else
- rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-
- readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/metadata.xml b/gnome-extra/gnome-shell-extensions/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-shell-extensions/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-frippery-3.24.0 b/gnome-extra/gnome-shell-frippery-3.24.0
new file mode 100644
index 000000000000..c6da972d8973
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery-3.24.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
+EAPI=6
+HOMEPAGE=http://frippery.org/extensions/index.html
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.20 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.24.0.tgz
+_md5_=4a3bc6af78986fb17898f6f0e669a8d5
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
deleted file mode 100644
index 404334d21b8e..000000000000
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-frippery-3.24.0.tgz 79322 BLAKE2B d5e6db3d165708836e0cec4c1c2f6ffd3227876a566759ac9db9c7ce1d71841002a991df0bd2bf2279e79dfb9a87af1e8b10abe850f972ff2c9f49397106b8b5 SHA512 7f12f3be7ec4d55cf9f96c81c5af649cbb410fe79e880b3b5469e1554ae8419e40d5a77ab9d3889758a2729dd31e59b08e507803b84886305b75fe27df5eebd5
-EBUILD gnome-shell-frippery-3.24.0.ebuild 914 BLAKE2B 116a6673c879e0a10db2af34f5e3c13c386f92bb73abd51a86ae884436a27af5b02c80fe9816c5f9e6fce89b2a95c550163c288f0fdbd5284af6871bb192a041 SHA512 b87203ae36ddd9a66427ecc57f57ccc4973f0e7ae97b008625f3456688b2005afbdbcf97ecd0d0a6b742f7851acbcc6132dc42fd0ab625b44ce8ff06258181b7
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
deleted file mode 100644
index 982b541a3d90..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- app-eselect/eselect-gnome-shell-extensions
- >=dev-libs/gjs-1.29
- dev-libs/gobject-introspection:=
- gnome-base/gnome-menus:3[introspection]
- >=gnome-base/gnome-shell-3.20
- media-libs/clutter:1.0[introspection]
- x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
- insinto /usr/share/gnome-shell/extensions
- doins -r extensions/*@*
- dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
- ebegin "Updating list of installed extensions"
- eselect gnome-shell-extensions update
- eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/metadata.xml b/gnome-extra/gnome-shell-frippery/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-shell-frippery/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-software-3.22.7 b/gnome-extra/gnome-software-3.22.7
new file mode 100644
index 000000000000..56d7150fdf72
--- /dev/null
+++ b/gnome-extra/gnome-software-3.22.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-admin/packagekit-base-1.1.0 app-crypt/libsecret dev-db/sqlite:3 >=dev-libs/appstream-glib-0.6.7:0 >=dev-libs/glib-2.46:2 >=dev-libs/json-glib-1.1.1 >=gnome-base/gsettings-desktop-schemas-3.11.5 >=net-libs/libsoup-2.51.92:2.4 sys-auth/polkit >=x11-libs/gdk-pixbuf-2.31.5 >=x11-libs/gtk+-3.20:3 gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= ) spell? ( app-text/gtkspell:3 ) udev? ( virtual/libgudev ) app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=dev-util/intltool-0.35 virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gnome install & update software
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Software
+IUSE=gnome spell test udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-admin/packagekit-base-1.1.0 app-crypt/libsecret dev-db/sqlite:3 >=dev-libs/appstream-glib-0.6.7:0 >=dev-libs/glib-2.46:2 >=dev-libs/json-glib-1.1.1 >=gnome-base/gsettings-desktop-schemas-3.11.5 >=net-libs/libsoup-2.51.92:2.4 sys-auth/polkit >=x11-libs/gdk-pixbuf-2.31.5 >=x11-libs/gtk+-3.20:3 gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= ) spell? ( app-text/gtkspell:3 ) udev? ( virtual/libgudev )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.7.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=657923b56ff318529a27d565daf16dc7
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
deleted file mode 100644
index 97a0df4093d6..000000000000
--- a/gnome-extra/gnome-software/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-software-3.22.7.tar.xz 3865764 BLAKE2B c23e3b9e34a9b233a584a920fcd5969b3ebb5fa4227da147870e71c1531da6c3efda913149a903667ae1725c505c1c842aac0a76b439a2730bf6c837f39757fc SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825
-EBUILD gnome-software-3.22.7.ebuild 1905 BLAKE2B 37a604c6a5f8d29c2cfc3f8e8a0ab83d10e97a8232dcbe8bc62068998cc251686f53122e27c04db4d309f51b466431dc8e29723b5c197c9b3da76f3c0238ca58 SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild b/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
deleted file mode 100644
index f43cb6123697..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
+++ /dev/null
@@ -1,84 +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 gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome spell test udev"
-
-RDEPEND="
- >=app-admin/packagekit-base-1.1.0
- app-crypt/libsecret
- dev-db/sqlite:3
- >=dev-libs/appstream-glib-0.6.7:0
- >=dev-libs/glib-2.46:2
- >=dev-libs/json-glib-1.1.1
- >=gnome-base/gsettings-desktop-schemas-3.11.5
- >=net-libs/libsoup-2.51.92:2.4
- sys-auth/polkit
- >=x11-libs/gdk-pixbuf-2.31.5
- >=x11-libs/gtk+-3.20:3
- gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= )
- spell? ( app-text/gtkspell:3 )
- udev? ( virtual/libgudev )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.2
- dev-libs/libxslt
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-# test? ( dev-util/valgrind )
-
-python_check_deps() {
- use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # valgrind fails with SIGTRAP
- sed -e 's/TESTS = .*/TESTS =/' \
- -i "${S}"/src/Makefile.{am,in} || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # FIXME: investigate limba and firmware update support
- gnome2_src_configure \
- --enable-man \
- --enable-packagekit \
- --enable-polkit \
- --disable-firmware \
- --disable-limba \
- --disable-ostree \
- --disable-rpm \
- --disable-steam \
- --disable-flatpak \
- --enable-webapps \
- --disable-snap \
- $(use_enable spell gtkspell) \
- $(use_enable test dogtail) \
- $(use_enable test tests) \
- $(use_enable gnome gnome-desktop) \
- $(use_enable gnome shell-extensions) \
- $(use_enable udev gudev)
-}
-
-src_test() {
- virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
deleted file mode 100644
index 4cbddcaa19ad..000000000000
--- a/gnome-extra/gnome-software/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor-3.24.0 b/gnome-extra/gnome-system-monitor-3.24.0
new file mode 100644
index 000000000000..83c57231b40c
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) app-text/yelp-tools >=dev-util/intltool-0.41.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Gnome System Monitor
+EAPI=6
+HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
+IUSE=systemd X
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac96f6cfccec1b3c36cd27181b27716f
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
deleted file mode 100644
index 0a0dc8c611e4..000000000000
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
-MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
deleted file mode 100644
index a091aeed701c..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
- >=dev-libs/glib-2.37.3:2
- >=gnome-base/libgtop-2.28.2:2=
- >=x11-libs/gtk+-3.22:3[X(+)]
- >=dev-cpp/gtkmm-3.3.18:3.0
- >=dev-cpp/glibmm-2.46:2
- >=dev-libs/libxml2-2.0:2
- >=gnome-base/librsvg-2.35:2
- systemd? ( >=sys-apps/systemd-44:0= )
- X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- >=dev-util/intltool-0.41.0
- virtual/pkgconfig
-"
-
-src_configure() {
- # XXX: appdata is deprecated by appstream-glib, upstream must upgrade
- gnome2_src_configure \
- $(use_enable systemd) \
- $(use_enable X broken-wnck) \
- APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
deleted file mode 100644
index f4a330c0bbf8..000000000000
--- a/gnome-extra/gnome-system-monitor/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
- unit names, for running processes</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-tweak-tool-3.22.0 b/gnome-extra/gnome-tweak-tool-3.22.0
new file mode 100644
index 000000000000..2b1575a659ba
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.21.2 >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to customize GNOME 3 options
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f2756f0e30b94f4fd01596b4a0cc56d
diff --git a/gnome-extra/gnome-tweak-tool-3.24.1 b/gnome-extra/gnome-tweak-tool-3.24.1
new file mode 100644
index 000000000000..188ed60ac905
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool-3.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.23.3 >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to customize GNOME 3 options
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~ia64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 >=gnome-base/gnome-shell-3.24 >=gnome-base/nautilus-3
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec3b035f9071e8dc5974c85aa60b5169
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
deleted file mode 100644
index 57cb4ed46ff3..000000000000
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch 1029 BLAKE2B 8b97e43a73f9ebb05d9f771db16e3b96e21f377047847e2aed69015a99ad1126bab659c979979d91ec5af006040d1bfa44f85fd781333352d34008d9d48c2b84 SHA512 55bfacefeef6581dd42e1e3f8474196cd29d4eea8ad83c7b33bac5757854e0f946927ccf25cd09e0f93b971361c6ff3896772e0aa18f4dfec9c77c11a73cf147
-DIST gnome-tweak-tool-3.22.0.tar.xz 260132 BLAKE2B fe3e8810fa3fc209707ca5b2fa16d75114038243ff3930065b44ea34c1030a435a2aec70b108134ae238d8ed4d3ec70cc51c0c1f69c1d41bea162211765fb690 SHA512 c63c2c61787c78e2e25077cc83b28ae49bffd9e7c39aa78ebd93587ba9640275083f46273cb55986bcc46842449a31f38b77f0e9be69cea551218fd160f6d769
-DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
-EBUILD gnome-tweak-tool-3.22.0.ebuild 1649 BLAKE2B d4f0202d18e68d2f8427970155aadb5f69d4c19b1065e0598427b387a0532a59637f522f3a22c2919c4e23232a86236a7482834728673e86fa9893404eb1ffcb SHA512 50154ce71b3504ea9aff6797031cf9dec2209def242a701d8a05215a1dc80cf5fc8508456641776ab409da984a8af0e931d7ef2f0319d53ee51bca63d6126a8a
-EBUILD gnome-tweak-tool-3.24.1.ebuild 1582 BLAKE2B 9949f10799534331b7bacb75159ee55f5f555d96f55a9abc440c9363b4bb1b227c18660b601b14180c66f35c889e7a7f69580a2bbd17a531a6a726c442c7a996 SHA512 3ce39b7ebc3bfdcac542c28b0b64834936a0701874dd3b4fb93973667142caa31197e2ec4e4a1bc063709d4acfdc2eb0d8d3e0741857f908b6984228facc9bed
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
deleted file mode 100644
index b65a713277b0..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c848d45b0697a6ac3661dbf3fbd356864e8b4e24 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 15 Jan 2013 17:23:12 +0330
-Subject: [PATCH] gentoo-cursor-themes
-
----
- gtweak/tweaks/tweak_interface.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index b20a41c..2125d59 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -69,7 +69,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
- **options)
-
- def _get_valid_cursor_themes(self):
-- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+ dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+ os.path.join(gtweak.DATA_DIR, "icons"),
- os.path.join(GLib.get_user_data_dir(), "icons"),
- os.path.join(os.path.expanduser("~"), ".icons"))
- valid = walk_directories(dirs, lambda d:
---
-1.8.1
-
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
deleted file mode 100644
index 91fd458f0e89..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Newer pygobject needed due upstream bug #723951
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- dev-libs/glib:2[dbus]
- >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
- >=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
- >=x11-libs/gtk+-3.12:3[introspection]
-
- net-libs/libsoup:2.4[introspection]
- x11-libs/libnotify[introspection]
-
- >=gnome-base/gnome-settings-daemon-3
- gnome-base/gnome-shell
- >=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Add contents of Gentoo's cursor theme directory to cursor theme list
- eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
- gnome2_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- install_python() {
- gnome2_src_install
- python_doscript gnome-tweak-tool || die
- }
- python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
deleted file mode 100644
index e53ec44d1f8f..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~ia64 x86"
-
-COMMON_DEPEND="
- ${PYTHON_DEPS}
- dev-libs/glib:2[dbus]
- >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
- >=gnome-base/gsettings-desktop-schemas-3.23.3
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
- >=x11-libs/gtk+-3.12:3[introspection]
-
- net-libs/libsoup:2.4[introspection]
- x11-libs/libnotify[introspection]
-
- >=gnome-base/gnome-settings-daemon-3
- >=gnome-base/gnome-shell-3.24
- >=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Add contents of Gentoo's cursor theme directory to cursor theme list
- eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
- gnome2_src_prepare
- python_copy_sources
-}
-
-src_configure() {
- python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
- python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
- python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
- install_python() {
- gnome2_src_install
- python_doscript gnome-tweak-tool || die
- }
- python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-tweak-tool/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs-3.24.2 b/gnome-extra/gnome-user-docs-3.24.2
new file mode 100644
index 000000000000..038a073dda53
--- /dev/null
+++ b/gnome-extra/gnome-user-docs-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME end user documentation
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=CC-BY-3.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a2f14e98c12e128c027731f550a6068
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
deleted file mode 100644
index 0c79626008fe..000000000000
--- a/gnome-extra/gnome-user-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
-EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
deleted file mode 100644
index e4ff024c6df4..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
- test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-# app-text/yelp-tools
-# rebuilding translations requires:
-# app-text/yelp-tools
-# dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
- # itstool is only needed for rebuilding translations
- # xmllint is only needed for tests
- gnome2_src_configure \
- $(usex test "" XMLLINT=$(type -P true)) \
- ITSTOOL=$(type -P true)
-}
-
-src_compile() {
- # Do not compile; "make all" with unset LINGUAS rebuilds all translations,
- # which can take > 2 hours on a Core i7.
- return
-}
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-user-docs/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-user-share-3.18.3 b/gnome-extra/gnome-user-share-3.18.3
new file mode 100644
index 000000000000..f0a13f5298c4
--- /dev/null
+++ b/gnome-extra/gnome-user-share-3.18.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:= !<gnome-base/gnome-control-center-3.9 app-text/yelp-tools app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Personal file sharing for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bed9a7c1c40ac907d2eaf73a37667cc8
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
deleted file mode 100644
index 3feb10173ee3..000000000000
--- a/gnome-extra/gnome-user-share/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
-DIST gnome-user-share-3.18.3.tar.xz 347528 BLAKE2B 32c3a5aa84438e8bc276c6cf21fb35325b2b2c31f73bd301f73bdfbb91d90bcedf66c02b249dc047fb23eae2b7740097465c3a4164113d05e6811fec6f719d6c SHA512 3f8da3cc6f73aa612883252982fac0c53e35184ac0d31f210b525fd04dd8dbffb3f7be4c331309ea9df6a712000eb2d29f75224505c822cffc11b3d435e17991
-EBUILD gnome-user-share-3.18.3.ebuild 1338 BLAKE2B 41b790537dd9ee808d10f03cb98e95feadff2bb0c9d004e92d8445a760a0d5f41c4bba6dfe6a32dcbecc0ebcf4083b5ec9bd7750c806343dd45b4869718ca4e8 SHA512 0fc7927a387ad1a2f6f8d3ea0fed37d9ece10d76832905659bf6addf9047100f688bf38ee0cc409482fb4f73b3e3e28f53f91038834ef4af0cd07d742b5927a0
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
deleted file mode 100644
index 156721d286cf..000000000000
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600
-+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf 2015-06-03 20:21:33.588774303 -0600
-@@ -9,7 +9,6 @@
- LimitXMLRequestBody 100000
-
- LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so
--LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so
- LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so
- LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so
- LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so \ No newline at end of file
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
deleted file mode 100644
index c102ec8b6bba..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib systemd
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-RDEPEND="
- >=dev-libs/glib-2.28:2
- >=x11-libs/gtk+-3:3
- >=gnome-base/nautilus-2.91.7
- media-libs/libcanberra[gtk3]
- >=www-apache/mod_dnssd-0.6
- >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
- >=x11-libs/libnotify-0.7:=
-"
-DEPEND="${RDEPEND}
- !<gnome-base/gnome-control-center-3.9
- app-text/yelp-tools
- app-text/docbook-xml-dtd:4.1.2
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Upstream forces to use prefork because of Fedora defaults, but
- # that is problematic for us (bug #551012)
- # https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
- "${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
-)
-
-src_configure() {
- gnome2_src_configure \
- --with-httpd=apache2 \
- --with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
- --with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-user-share/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-utils-3.8.0 b/gnome-extra/gnome-utils-3.8.0
new file mode 100644
index 000000000000..49cb181adefc
--- /dev/null
+++ b/gnome-extra/gnome-utils-3.8.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for utilities for the GNOME desktop
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=app-admin/gnome-system-log-3.8.0 >=app-dicts/gnome-dictionary-3.8.0 >=gnome-extra/gnome-search-tool-3.6.0 >=media-gfx/gnome-font-viewer-3.8.0 >=media-gfx/gnome-screenshot-3.8.0 >=sys-apps/baobab-3.8.0
+SLOT=0
+_md5_=583ea1e638c00340f9125dc85cb42377
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
deleted file mode 100644
index 3e44faaaec6a..000000000000
--- a/gnome-extra/gnome-utils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gnome-utils-3.8.0.ebuild 605 BLAKE2B 9e5593e04f0d270c76a19fef914876ef95678bc8b06198330702bf23704c9098aa4826c4cd8a55b468e7c9b12e2fdd0f4c8234d76f03584667556e0ac03fd432 SHA512 aff6dccc6bdbbed252313f9904aebdadb77be9a19772250a2f7bed50b46b6a8485ca3efcc957c5f3f866fba93ad3988385cf5e237d22d2158c7e1ada262b70f4
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
deleted file mode 100644
index a7a82db68fee..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Meta package for utilities for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="
- >=app-admin/gnome-system-log-${PV}
- >=app-dicts/gnome-dictionary-${PV}
- >=gnome-extra/gnome-search-tool-3.6.0
- >=media-gfx/gnome-font-viewer-${PV}
- >=media-gfx/gnome-screenshot-${PV}
- >=sys-apps/baobab-${PV}
-"
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-utils/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-weather-3.24.0 b/gnome-extra/gnome-weather-3.24.0
new file mode 100644
index 000000000000..5cc6b965c964
--- /dev/null
+++ b/gnome-extra/gnome-weather-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3 dev-libs/appstream-glib >=dev-util/intltool-0.26 virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-util/dogtail[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/dogtail[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-util/dogtail[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A weather application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=63d15337c9c679216c83fdb7492bf278
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
deleted file mode 100644
index c319c4b148bb..000000000000
--- a/gnome-extra/gnome-weather/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
-EBUILD gnome-weather-3.24.0.ebuild 1085 BLAKE2B 23e877012247c7bacf65e616bb5ba59ce5eaf1b460b79950f684ca083f0b6af164a39fdba803d3a22bdae898d455cc3618f0ba930e377dfd07633123cd5e6b58 SHA512 1c3bd5d93d8809c2f6322577ff950a4387806880fcc733b927c37deb174a1a45a9b2fb7ab0f68d568df222f077e61e46d0432b404b41c2da57804b1597868d30
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
deleted file mode 100644
index 544418eed9c9..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=app-misc/geoclue-2.3.1:2.0
- >=dev-libs/gjs-1.43.3
- >=dev-libs/glib-2.32:2
- >=dev-libs/gobject-introspection-1.35.9:=
- >=dev-libs/libgweather-3.17.2:=
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
- dev-libs/appstream-glib
- >=dev-util/intltool-0.26
- virtual/pkgconfig
- test? (
- ${PYTHON_DEPS}
- $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
- use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
- virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/gnome-weather/metadata.xml b/gnome-extra/gnome-weather/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-weather/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gtkhtml-4.10.0 b/gnome-extra/gtkhtml-4.10.0
new file mode 100644
index 000000000000..30158baf4bd3
--- /dev/null
+++ b/gnome-extra/gtkhtml-4.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight HTML rendering/printing/editing engine
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/gtkhtml
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
+SLOT=4.0
+SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a18c8d41898ecc93ea026baedefa52e8
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
deleted file mode 100644
index 965e855bc860..000000000000
--- a/gnome-extra/gtkhtml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0.ebuild 970 BLAKE2B 5c8c81303f3d8d0ea64325fd7ae78cb876970983da7c84ed923118019c6526debe71700573eedb074ac2fab017f1902b43fb0c21c057c138dd716e3569953fef SHA512 c1f401b7ab55a2e61c3de3be8c22325a5f75858c207647926b92a0671b76361f59479add8d1b0109e5974ee38eda166936d9a59911f10428b1d61a8a265c5e94
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
deleted file mode 100644
index b596e147e0ec..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
- >=x11-libs/gtk+-3.2:3
- >=x11-libs/cairo-1.10:=
- x11-libs/pango
- >=app-text/enchant-1.1.7:=
- gnome-base/gsettings-desktop-schemas
- >=app-text/iso-codes-0.49
- >=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- sys-devel/gettext
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
-
-src_install() {
- gnome2_src_install
-
- # Don't collide with 3.14 slot
- mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gtkhtml/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gucharmap-10.0.0 b/gnome-extra/gucharmap-10.0.0
new file mode 100644
index 000000000000..09c14513d31c
--- /dev/null
+++ b/gnome-extra/gucharmap-10.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ff69a6edac6a879f16b1dda36ab0bf2
diff --git a/gnome-extra/gucharmap-10.0.3 b/gnome-extra/gucharmap-10.0.3
new file mode 100644
index 000000000000..c10404ef10b6
--- /dev/null
+++ b/gnome-extra/gucharmap-10.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a3d1ff8883c964dbcf6d2f820f4e04a
diff --git a/gnome-extra/gucharmap-3.0.1-r200 b/gnome-extra/gucharmap-3.0.1-r200
new file mode 100644
index 000000000000..b6a0900dd70a
--- /dev/null
+++ b/gnome-extra/gucharmap-3.0.1-r200
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=cjk debug doc +introspection
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gucharmap/3.0/gucharmap-3.0.1.tar.bz2
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d958aecc3287fbe4a0da2cda2bff82a
diff --git a/gnome-extra/gucharmap-9.0.2 b/gnome-extra/gucharmap-9.0.2
new file mode 100644
index 000000000000..21f611a64311
--- /dev/null
+++ b/gnome-extra/gucharmap-9.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/gnome-extra/gucharmap-9.0.4 b/gnome-extra/gucharmap-9.0.4
new file mode 100644
index 000000000000..4da874f8275f
--- /dev/null
+++ b/gnome-extra/gucharmap-9.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.4.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
deleted file mode 100644
index b3d6dded6b6d..000000000000
--- a/gnome-extra/gucharmap/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-10.0.0.tar.xz 1034780 BLAKE2B 9ebcff1f182de52aa12c40de93c80d2942316fb718330872932034cd9bee66e41a667bd70e6d632e17accda66413b18bdf9addf6a892510d5798ad21fa8908de SHA512 e097e54cfd4e6a8fd47992d163128bc8e87c0c6aa81718f900d7367fa6d88a528815c7bb87bfcaddd145aaa8b1c8068fdf6da6fe2a1c90381ff555b43712f33a
-DIST gucharmap-10.0.3.tar.xz 1713960 BLAKE2B 0a0412c7a4d46c25112d9bb33d64e82b448e981a2ecb9a5ed5ce5e96657e5264e14262b15c4e5af6b3d023c20193a7471071c5d346f0d48e22583b07e92d51f7 SHA512 0815ca39311db4dc3ff5202f1303cad72bc204f4eef4d2ec83465123ff856eeb552a583666419ad4a3bf9d3ddcf294883fc8e24e32c30814916b41bc14a108fe
-DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
-DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
-EBUILD gucharmap-10.0.0.ebuild 1664 BLAKE2B 81d087632398b74ad6fb3eba9cfc1e8b663b054db3cfdf9611d2ceb34215e1ba80af4686def075b93b8e1b1d1255d57e586474475e83cd37778e05654b8140bb SHA512 0352bcd7dcbac69699c57c45080875821a4dfe07e6dcc8ae6ef24aa82042756c5409fd7e342d8e6244ca818a2abec8f2d80e7dffa1fbe24e4f24aac67180f417
-EBUILD gucharmap-10.0.3.ebuild 1656 BLAKE2B e7585a19b559cb2e01d10b6906e0420ca58839c11c09251f2da39cd6e7ff7abc68d7f0b1f327b410cfde93aa3c8ef95c28795d1ec01094ffaf6cdd2dfc66e218 SHA512 c2cdc8664586879a80e0003bfaf92bbfe28aef6f4c64aa4d9cd9ad32f11e07481528f6e4cd39bdff0f4f54c271014de0aca5d55de8e882faa7c0422275f8aa4e
-EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
-EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
-EBUILD gucharmap-9.0.4.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
deleted file mode 100644
index 52696b5128a8..000000000000
--- a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/docs/reference/gucharmap-docs.sgml
-+++ b/docs/reference/gucharmap-docs.sgml
-@@ -21,6 +21,5 @@
- <xi:include href="xml/gucharmap-script-codepoint-list.xml"/>
- <xi:include href="xml/gucharmap-chapters-view.xml"/>
- <xi:include href="xml/gucharmap-unicode-info.xml"/>
-- <xi:include href="xml/gucharmap.xml"/>
- </chapter>
- </book>
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
deleted file mode 100644
index 2fb7f3ac86c3..000000000000
--- a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
- =app-i18n/unicode-data-${UNICODE_VERSION}*
- >=dev-libs/glib-2.32:2
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-3.16:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-util/desktop-file-utils
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.1.2 )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # prevent file collisions with slot 0
- sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
- -i configure.ac configure || die "sed configure.ac configure failed"
-
- # avoid autoreconf
- sed -e 's/-Wall //g' -i configure || die "sed failed"
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # unihan is not really conditional
- # https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
- gnome2_src_configure \
- --disable-static \
- --with-unicode-data=/usr/share/unicode-data \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
deleted file mode 100644
index 80975bdc6b3d..000000000000
--- a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
- =app-i18n/unicode-data-${UNICODE_VERSION}*
- >=dev-libs/glib-2.32:2
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-3.16:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-util/desktop-file-utils
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.1.2 )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # prevent file collisions with slot 0
- sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
- -i configure.ac configure || die "sed configure.ac configure failed"
-
- # avoid autoreconf
- sed -e 's/-Wall //g' -i configure || die "sed failed"
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # unihan is not really conditional
- # https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
- gnome2_src_configure \
- --disable-static \
- --with-unicode-data=/usr/share/unicode-data \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
deleted file mode 100644
index 14bb204f238c..000000000000
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk debug doc +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.16.3:2
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-2.14.0:2[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # .desktop and schema files are only needed for the gucharmap program
- sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
- -e 's:schema_DATA\s*=.*:schema_DATA = :' \
- -i Makefile.* || die "sed Makefile.* failed"
-
- eapply "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --with-gtk=2.0 \
- --disable-charmap \
- --disable-gconf \
- $(use_enable cjk unihan) \
- $(use_enable debug) \
- $(use_enable introspection)
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if ! has_version "gnome-extra/gucharmap:2.90" ; then
- ewarn "Note: ${PF} includes only the gucharmap-2 library."
- ewarn "If you need the gucharmap program, emerge gucharmap:2.90"
- fi
-}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
- =app-i18n/unicode-data-${UNICODE_VERSION}*
- >=dev-libs/glib-2.32:2
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-3.16:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-util/desktop-file-utils
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.1.2 )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # prevent file collisions with slot 0
- sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
- -i configure.ac configure || die "sed configure.ac configure failed"
-
- # avoid autoreconf
- sed -e 's/-Wall //g' -i configure || die "sed failed"
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # unihan is not really conditional
- # https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
- gnome2_src_configure \
- --disable-static \
- --with-unicode-data=/usr/share/unicode-data \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
- =app-i18n/unicode-data-${UNICODE_VERSION}*
- >=dev-libs/glib-2.32:2
- >=x11-libs/pango-1.2.1[introspection?]
- >=x11-libs/gtk+-3.16:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
- !<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- dev-util/desktop-file-utils
- >=dev-util/gtk-doc-am-1
- >=dev-util/intltool-0.40
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.1.2 )
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- # prevent file collisions with slot 0
- sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
- -i configure.ac configure || die "sed configure.ac configure failed"
-
- # avoid autoreconf
- sed -e 's/-Wall //g' -i configure || die "sed failed"
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # unihan is not really conditional
- # https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
- gnome2_src_configure \
- --disable-static \
- --with-unicode-data=/usr/share/unicode-data \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable introspection) \
- $(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gucharmap/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/libgda-5.2.4-r2 b/gnome-extra/libgda-5.2.4-r2
new file mode 100644
index 000000000000..7e306638b966
--- /dev/null
+++ b/gnome-extra/libgda-5.2.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) >=app-text/gnome-doc-utils-0.9 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=GNOME database access library
+EAPI=6
+HOMEPAGE=http://www.gnome-db.org/
+IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
+RESTRICT=test firebird? ( bindist )
+SLOT=5/4
+SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 db-use 582140d1a711279e50ce284fc7b609f5 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc2a122ee3357e9b493dfaa647285964
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
deleted file mode 100644
index 8b1aefa0a000..000000000000
--- a/gnome-extra/libgda/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5
-AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353
-AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f
-AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94
-AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc8952409bd5b5b695f77fbc99b7a6b4980154bafccaece3a8eec8008f07a973c937918864c60ecc215bf2db2a6a1c5fda8419 SHA512 dba082bdae037d4b9e021085166c4b5e8791c461cfbd9b0668731651b07f931bae8405b8b7d3c7f0cf51ddbfa23b03a265abd8ab3603e90933e0c99a299b53a0
-DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
-EBUILD libgda-5.2.4-r2.ebuild 4925 BLAKE2B 6d78da6d22688f9c8d3b71425b5828e83d91f36c33e5f9215d3953a4746b4f46f1577396bbac18d1e881ab0184634622bbb9bbc76ab5d65aecced3795be02251 SHA512 c03a97df0b0aeeeba44410c367e5bff172ac3b66c7baf1ca030d96243fcf7ef3a538c16c9cb60a20b136bb81e2a9d907b539fb72778833e83af6d4811fd23487
-MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
deleted file mode 100644
index fe814a730490..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:45:35 -0400
-Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
-
----
- control-center/data/Makefile.am | 12 ++++++------
- ... hicolor_apps_16x16_gda-control-center-5.0.png} | Bin 833 -> 833 bytes
- ... hicolor_apps_22x22_gda-control-center-5.0.png} | Bin 1157 -> 1157 bytes
- ... hicolor_apps_24x24_gda-control-center-5.0.png} | Bin 1144 -> 1144 bytes
- ...icolor_apps_256x256_gda-control-center-5.0.png} | Bin 33543 -> 33543 bytes
- ... hicolor_apps_32x32_gda-control-center-5.0.png} | Bin 1867 -> 1867 bytes
- ... hicolor_apps_48x48_gda-control-center-5.0.png} | Bin 3144 -> 3144 bytes
- control-center/gda-control-center-5.0.desktop.in | 2 +-
- 8 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
-index 03fa362..862ec88 100644
---- a/control-center/data/Makefile.am
-+++ b/control-center/data/Makefile.am
-@@ -5,12 +5,12 @@ public_icons_themes = \
- $(NULL)
-
- public_icons = \
-- hicolor_apps_16x16_gda-control-center.png \
-- hicolor_apps_22x22_gda-control-center.png \
-- hicolor_apps_24x24_gda-control-center.png \
-- hicolor_apps_256x256_gda-control-center.png \
-- hicolor_apps_32x32_gda-control-center.png \
-- hicolor_apps_48x48_gda-control-center.png \
-+ hicolor_apps_16x16_gda-control-center-5.0.png \
-+ hicolor_apps_22x22_gda-control-center-5.0.png \
-+ hicolor_apps_24x24_gda-control-center-5.0.png \
-+ hicolor_apps_256x256_gda-control-center-5.0.png \
-+ hicolor_apps_32x32_gda-control-center-5.0.png \
-+ hicolor_apps_48x48_gda-control-center-5.0.png \
- $(NULL)
-
- private_icons = \
-diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
-index 6fd5b58..429787d 100644
---- a/control-center/gda-control-center-5.0.desktop.in
-+++ b/control-center/gda-control-center-5.0.desktop.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Database access control center
- _Comment=Configure your database access environment
--Icon=gda-control-center
-+Icon=gda-control-center-5.0
- Exec=gda-control-center-5.0
- Terminal=false
- Type=Application
---
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
deleted file mode 100644
index 2fd31ab7d1de..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:59:46 -0400
-Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
-
----
- tools/browser/doc/Makefile.am | 2 +-
- ...browser-docs.sgml => gda-browser-5.0-docs.sgml} | 0
- ...r-sections.txt => gda-browser-5.0-sections.txt} | 0
- .../{gda-browser.types => gda-browser-5.0.types} | 0
- 4 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
-index 971fa79..cf6637a 100644
---- a/tools/browser/doc/Makefile.am
-+++ b/tools/browser/doc/Makefile.am
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.6
-
- # The name of the module.
--DOC_MODULE=gda-browser
-+DOC_MODULE=gda-browser-5.0
-
- # The top-level SGML file.
- DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
---
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
deleted file mode 100644
index 81c7804c512c..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Wed, 16 Apr 2014 14:59:50 +0200
-Subject: [PATCH] Markup message correction
-
----
- libgda-ui/demos/ddl_queries.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
-index a47630f..4b29377 100644
---- a/libgda-ui/demos/ddl_queries.c
-+++ b/libgda-ui/demos/ddl_queries.c
-@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
- else
- msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
-
-- dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
-- GTK_DIALOG_MODAL,
-- msg_type, GTK_BUTTONS_CLOSE, msg);
-+ dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
-+ GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
-+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
- g_free (sql);
- g_free (msg);
-
---
-1.9.0
-
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
deleted file mode 100644
index f66fa8f95846..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgda-5.2.2/configure.orig 2014-05-17 14:58:33.206028742 +0200
-+++ libgda-5.2.2/configure 2014-05-17 14:58:45.937790443 +0200
-@@ -23200,6 +23259,11 @@
- JTYPE="Sun JRE 1.7"
- JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- ;;
-+ JRE1.8.*)
-+ try_java=true
-+ JTYPE="Sun JRE 1.8"
-+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+ ;;
- JREgcj-4*)
- try_java=true
- JTYPE="GCJ"
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
deleted file mode 100644
index c586d49356d0..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Sun, 7 Feb 2016 20:49:07 +0100
-Subject: Re-correction for bug #761424
-
-Automatic detection of API version
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 152f676..9898a32 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -571,13 +571,13 @@ fi
- vala_api="No Vala bindings will be generated"
- if test "x$enable_vala" = "xyes"
- then
-- AM_PROG_VALAC([0.26.0])
-+ AM_PROG_VALAC()
- if test "x$VALA_API_VERSION" = "x"
- then
-- VAPIGEN_CHECK([0.26.0],[0.26],,no)
-- vala_api="0.26 (Default)"
-+ VAPIGEN_CHECK(,,,no)
-+ vala_api="`pkg-config --modversion vapigen` (Default)"
- else
-- VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
-+ VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
- vala_api=$VALA_API_VERSION
- fi
- else
---
-cgit v0.12
-
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
deleted file mode 100644
index 478c37175488..000000000000
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
- reports? ( ${PYTHON_REQUIRED_USE} )
- canvas? ( gtk )
- graphviz? ( gtk )
- sourceview? ( gtk )
- vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
- app-text/iso-codes
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2
- dev-libs/libxslt
- sys-libs/readline:0=
- sys-libs/ncurses:0=
- berkdb? ( sys-libs/db:* )
- firebird? ( dev-db/firebird )
- gnome-keyring? ( app-crypt/libsecret )
- gtk? (
- >=x11-libs/gtk+-3.0.0:3
- canvas? ( x11-libs/goocanvas:2.0= )
- sourceview? ( x11-libs/gtksourceview:3.0 )
- graphviz? ( media-gfx/graphviz )
- )
- http? ( >=net-libs/libsoup-2.24:2.4 )
- introspection? ( >=dev-libs/gobject-introspection-1.30:= )
- json? ( dev-libs/json-glib )
- ldap? ( net-nds/openldap:= )
- mdb? ( >app-office/mdbtools-0.5:= )
- mysql? ( virtual/mysql:= )
- postgres? ( dev-db/postgresql:= )
- reports? (
- ${PYTHON_DEPS}
- dev-java/fop
- dev-python/reportlab )
- ssl? ( dev-libs/openssl:= )
- >=dev-db/sqlite-3.6.22:3=
- vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.9
- app-text/yelp-tools
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.6
- virtual/pkgconfig
- java? ( >=virtual/jdk-1.6 )
- vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
- test
- firebird? ( bindist )
-"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Fix compilation with -Werror=format-security (from 'master')
- eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
- # Support JRE 1.8 (from Fedora)
- eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
- # Fix vala test,
- # https://bugzilla.gnome.org/show_bug.cgi?id=761424
- eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
-
- use berkdb && append-cppflags "-I$(db_includedir)"
-
- use reports ||
- sed -e '/SUBDIRS =/ s/trml2html//' \
- -e '/SUBDIRS =/ s/trml2pdf//' \
- -i libgda-report/RML/Makefile.{am,in} || die
-
- # Prevent file collisions with libgda:4
- eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
- eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
- # Move files with mv (since epatch can't handle rename diffs) and
- # update pre-generated gtk-doc files (for non-git versions of libgda)
- local f
- for f in tools/browser/doc/gda-browser* ; do
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in tools/browser/doc/html/gda-browser.devhelp* ; do
- sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
- -i ${f} || die "sed ${f} failed"
- mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
- done
- for f in control-center/data/*_gda-control-center.png ; do
- mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
- die "mv ${f} failed"
- done
-
- eautoreconf
- gnome2_src_prepare
- java-pkg-opt-2_src_prepare
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myconf=( )
- if use introspection ; then
- myconf+=( $(use_enable gtk gdaui-gi) )
- else
- myconf+=( --disable-gdaui-gi )
- fi
- if use vala ; then
- myconf+=( $(use_enable gtk gdaui-vala) )
- else
- myconf+=( --disable-gdaui-vala )
- fi
-
- gnome2_src_configure \
- --with-help \
- --disable-default-binary \
- --disable-static \
- --enable-system-sqlite \
- $(use_with berkdb bdb /usr) \
- $(use_with canvas goocanvas) \
- $(use_enable debug) \
- $(use_with firebird firebird /usr) \
- $(use_with gnome-keyring libsecret) \
- $(use_with graphviz) \
- $(use_with gtk ui) \
- $(use_with http libsoup) \
- $(use_enable introspection) \
- $(use_enable introspection gda-gi) \
- "$(use_with java java $JAVA_HOME)" \
- $(use_enable json) \
- $(use_with ldap) \
- $(use_with mdb mdb /usr) \
- $(use_with mysql mysql /usr) \
- $(use_with oci8 oracle) \
- $(use_with postgres postgres /usr) \
- $(use_enable ssl crypto) \
- $(use_with sourceview gtksourceview) \
- $(use_enable vala) \
- $(use_enable vala vala-extensions) \
- ${myconf[@]}
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
- java-pkg-opt-2_pkg_preinst
-}
-
-src_install() {
- gnome2_src_install
- if use reports; then
- for t in trml2{html,pdf}; do
- python_scriptinto /usr/share/libgda-5.0/gda_${t}
- python_doscript libgda-report/RML/${t}/${t}.py
- done
- fi
-}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
deleted file mode 100644
index c72a40986ea2..000000000000
--- a/gnome-extra/libgda/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
- <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
- <flag name="json">Enable support for JSON format</flag>
- <flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag>
- <flag name="reports">Install tools for generating graphical reports</flag>
- <flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/gnome-extra/libgsf-1.14.41-r1 b/gnome-extra/libgsf-1.14.41-r1
new file mode 100644
index 000000000000..23a366e29199
--- /dev/null
+++ b/gnome-extra/libgsf-1.14.41-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Structured File Library
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/gsf/
+IUSE=bzip2 gtk +introspection
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+SLOT=0/114
+SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.41.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c61fe0b623c8d40a82087bf359f29171
diff --git a/gnome-extra/libgsf-1.14.43 b/gnome-extra/libgsf-1.14.43
new file mode 100644
index 000000000000..26352d7a861f
--- /dev/null
+++ b/gnome-extra/libgsf-1.14.43
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Structured File Library
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/gsf/
+IUSE=bzip2 gtk +introspection
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+SLOT=0/114
+SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.43.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb6a80a7a1949eaa46107bceb757b6a3
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
deleted file mode 100644
index 8e868b0c59a0..000000000000
--- a/gnome-extra/libgsf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libgsf-1.14.41.tar.xz 616944 BLAKE2B 300da197dcbd5568758da21ea25b25636fcd7b16483a5b526e1c9e0242145208580f6edd41ac1028b7b51fe159eab506a32947ef81beb47883cf133bf2ea9cb7 SHA512 e3892500288e5d1d9e46cdd3940d872ae2504fe54babe2dc085218c3e1a5aff5a7220c88bde730239af4a56c340a22f47337280b8892f0ab31e1e751adea9bc3
-DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
-EBUILD libgsf-1.14.41-r1.ebuild 1004 BLAKE2B be7fb620de1def1bcb5a3431c5d8d8416db4ee10ab67d033201ab9c83b11340e96c58f640c61877407d22b81f5abf020597f07d07219ba08c618be44e7b70e90 SHA512 852c7872d67ac45243fb75986064db62e2022bacd714cecbb9613d5f7fc0fd961ffef89c13ad4f57de89791d9df12db1f76e030d9536262edaaae2b8fb13db0c
-EBUILD libgsf-1.14.43.ebuild 1005 BLAKE2B 9eaf6b7b19bc908bd901be7cb0c12edfad4b2efad49ae40fb6d9295ab1fd81221df6bc54958044f57311c2c08ed4166f0d6e13929cec7bbe4907f9adf86c1031 SHA512 799f7bcc275d74c5ba739e31b60cca301649b06ba3ffe0a86c0fba5138a2a883db2fea3a3b81122cced6b5c3d862f7bd42da8c7e6bb3ccc0c18e5bdcc6a91486
-MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
deleted file mode 100644
index 24145aa1ebba..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.41-r1.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 gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.26:2
- >=dev-libs/libxml2-2.4.16:2
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- gtk? (
- x11-libs/gdk-pixbuf:2
- virtual/imagemagick-tools
- )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- >=dev-util/intltool-0.35.0
- dev-libs/gobject-introspection-common
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with bzip2 bz2) \
- $(use_enable introspection) \
- $(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
deleted file mode 100644
index b0aa05ab0d02..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
- >=dev-libs/glib-2.26:2
- >=dev-libs/libxml2-2.4.16:2
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- gtk? (
- x11-libs/gdk-pixbuf:2
- virtual/imagemagick-tools
- )
- introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
- >=dev-util/intltool-0.35.0
- dev-libs/gobject-introspection-common
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- $(use_with bzip2 bz2) \
- $(use_enable introspection) \
- $(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
deleted file mode 100644
index 88797e4b6d00..000000000000
--- a/gnome-extra/libgsf/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
- <flag name="gtk">Enable use of gdk in thumbnailer</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/metadata.xml b/gnome-extra/metadata.xml
deleted file mode 100644
index a7fd28d99930..000000000000
--- a/gnome-extra/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
- <longdescription lang="en">
- The gnome-extra category contains additional non-core GNOME packages.
- </longdescription>
- <longdescription lang="de">
- Die Kategorie gnome-extra enthält zusätzliche GNOME-Pakete die nicht
- Teil des Basissystems sind.
- </longdescription>
- <longdescription lang="es">
- La categoría gnome-extra contiene paquetes adicionales de GNOME.
- </longdescription>
- <longdescription lang="ja">
- gnome-extraカテゴリーにはGNOMEのコアなし拡張パッケージが含まれています。
- </longdescription>
- <longdescription lang="nl">
- De gnome-extra categorie bevat optionele extra's voor de GNOME desktopomgeving.
- </longdescription>
- <longdescription lang="vi">
- Nhóm gnome-extra chứa các gói GNOME bổ sung, không thuộc về các gói cốt lõi.
- </longdescription>
- <longdescription lang="it">
- La categoria gnome-extra contiene pacchetti vari per GNOME.
- </longdescription>
- <longdescription lang="pt">
- A categoria gnome-extra contém pacotes adicionais de GNOME.
- </longdescription>
- <longdescription lang="pl">
- Kategoria gnome-extra zawiera dodatkowe pakiety dla środowiska GNOME.
- </longdescription>
-</catmetadata>
-
diff --git a/gnome-extra/mousetweaks-3.12.0 b/gnome-extra/mousetweaks-3.12.0
new file mode 100644
index 000000000000..abc8a3e1dce1
--- /dev/null
+++ b/gnome-extra/mousetweaks-3.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Mouse accessibility enhancements for the GNOME desktop
+EAPI=5
+HOMEPAGE=https://live.gnome.org/Mousetweaks/Home
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor
+SLOT=0
+SRC_URI=mirror://gnome/sources/mousetweaks/3.12/mousetweaks-3.12.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa1c513ab9fb7f27b9c56e393da63c58
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
deleted file mode 100644
index 5cb9ddf22bcf..000000000000
--- a/gnome-extra/mousetweaks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mousetweaks-3.12.0.tar.xz 287236 BLAKE2B e0036131b3f6066b0fdb8dfb92531d1e1c1c1366c14f6016a8c41333892d85b6c7f11a754d82d0f3227b57b80d7bb72f3e0f0264c422fcda5451205ee3fc75a8 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0
-EBUILD mousetweaks-3.12.0.ebuild 613 BLAKE2B 76029c315fd57279884b55c9314bbaf63919a18026d6090d0b05ad548ef28b00d9d083dab77723f76d40b526db0dab25a29f8859262cef7dbe799c133c5b91e9 SHA512 eecf107a61829cec3dce73c205b6c143137f86226b139f1b8db85285a7b147ff576a69b800ba5b31038cbd4cd77e466a981f81b38334ce05fe395a789ec04ffd
-MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
deleted file mode 100644
index 9c5233005cb2..000000000000
--- a/gnome-extra/mousetweaks/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">
- Mousetweaks is an Accessibility Software whose developement started as a GSoC
- 2007 project under Ubuntu. It brings additional fonctionalities to the pointer
- that allow a user to:
-
- * open the contextual menu by clicking and holding the left button; it is
- * for example useful for users that can manipulate only one button
- * perform the 4 click types (left click, double click, drag click and
- * right click) by software; it is for example useful for users that are
- * not able to manipulate any button
- * to lock the pointer temporarily into an area on the screen; it is
- * for example useful for people that have to use their pointing
- * hardware not only for the computer
- </longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
deleted file mode 100644
index 72ef40bdea12..000000000000
--- a/gnome-extra/mousetweaks/mousetweaks-3.12.0.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"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="https://live.gnome.org/Mousetweaks/Home"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.25.9:2
- >=x11-libs/gtk+-3:3[X]
- >=gnome-base/gsettings-desktop-schemas-0.1
-
- x11-libs/libX11
- x11-libs/libXtst
- x11-libs/libXfixes
- x11-libs/libXcursor
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-"
diff --git a/gnome-extra/nautilus-actions-3.2.3 b/gnome-extra/nautilus-actions-3.2.3
new file mode 100644
index 000000000000..8ddb2836ebe9
--- /dev/null
+++ b/gnome-extra/nautilus-actions-3.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Configures programs to be launched when files are selected in Nautilus
+EAPI=5
+HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 FDL-1.3
+RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
+SLOT=3
+SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.3.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38d6672623cba7bff0004028c5b3586f
diff --git a/gnome-extra/nautilus-actions-3.2.4 b/gnome-extra/nautilus-actions-3.2.4
new file mode 100644
index 000000000000..0e34c8d7ba97
--- /dev/null
+++ b/gnome-extra/nautilus-actions-3.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Configures programs to be launched when files are selected in Nautilus
+EAPI=5
+HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 FDL-1.3
+RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
+SLOT=3
+SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.4.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38d6672623cba7bff0004028c5b3586f
diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest
deleted file mode 100644
index a700a8a5ad5f..000000000000
--- a/gnome-extra/nautilus-actions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST nautilus-actions-3.2.3.tar.xz 8238308 BLAKE2B b0a385e2d05794d9e50eebb88ab279a49228493302358f3cfc66a8b70f4defbe7b368190e11c52087097dbc2660a6e251a3930e3415e7e8d6657487484c03f3b SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45
-DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
-EBUILD nautilus-actions-3.2.3.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
-EBUILD nautilus-actions-3.2.4.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/nautilus-actions/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.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
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.30:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libunique:3
- >=gnome-base/libgtop-2.23.1:2
- >=gnome-base/nautilus-3
- sys-apps/util-linux
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libICE
- >=x11-libs/libSM-1
-
- !gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.35.5
- virtual/pkgconfig
-"
-
-src_prepare() {
- # install docs in /usr/share/doc/${PF}, not ${P}
- sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
- Makefile.{am,in} \
- docs/Makefile.{am,in} \
- docs/nact/Makefile.{am,in} || die
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-deprecated \
- --disable-gconf \
- --with-gtk=3
-}
-
-src_install() {
- gnome2_src_install
- # Do not install COPYING
- rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.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
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.30:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libunique:3
- >=gnome-base/libgtop-2.23.1:2
- >=gnome-base/nautilus-3
- sys-apps/util-linux
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3
- x11-libs/libICE
- >=x11-libs/libSM-1
-
- !gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
- dev-util/gdbus-codegen
- >=dev-util/intltool-0.35.5
- virtual/pkgconfig
-"
-
-src_prepare() {
- # install docs in /usr/share/doc/${PF}, not ${P}
- sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
- Makefile.{am,in} \
- docs/Makefile.{am,in} \
- docs/nact/Makefile.{am,in} || die
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-deprecated \
- --disable-gconf \
- --with-gtk=3
-}
-
-src_install() {
- gnome2_src_install
- # Do not install COPYING
- rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nautilus-dropbox-1.6.2 b/gnome-extra/nautilus-dropbox-1.6.2
new file mode 100644
index 000000000000..d736802c8d71
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Store, Sync and Share Files Online
+EAPI=5
+HOMEPAGE=https://www.dropbox.com
+IUSE=debug python_targets_python2_7 kernel_linux debug
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.6.2.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info 8e77ea4def23d38cdf0e8ffa69187d34 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4e4a93108927fc3745425ce25075a45a
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
deleted file mode 100644
index fec599d546fa..000000000000
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
-DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2151 BLAKE2B d46812b55e47b3f7a3b94816cb44782ca7fc8c97dd577aaffe1044717a4aa025c6d0e0a8ef8965ff8fbae8836f37db0709c24b0bfc59323efd91641fbd7c9dae SHA512 d173c45b3b1e6a69f4c908da25aa217cc65f381621b4c1cd039e719131ecdf0e34955453dde9d50d062a78c44022d1d80ba2db33b8217464b33f3c4baee9a7f7
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
deleted file mode 100644
index ea0053b4bbb6..000000000000
--- a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.in
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.in
-+++ nautilus-dropbox-0.7.0/configure.in
-@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
-
- AC_PATH_PROG([PYTHON], [python])
-
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
- AC_SUBST(RST2MAN)
-
- # define module checking macro
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/gnome-extra/nautilus-dropbox/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/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
deleted file mode 100644
index 1419c0468b89..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user
-
-DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="https://www.dropbox.com"
-SRC_URI="https://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- gnome-base/nautilus
- dev-libs/glib:2
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- net-misc/dropbox
- x11-libs/gtk+:2
- x11-libs/libnotify
- x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dev-python/docutils[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
- check_extra_config
- enewgroup dropbox
-
- DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus
- plugin to the group 'dropbox'. You need to setup a drobox account
- before using this plugin. Visit ${HOMEPAGE} for more information."
-
- python_export_best
-}
-
-src_prepare() {
- G2CONF="${G2CONF} $(use_enable debug) --disable-static"
-
- gnome2_src_prepare
-
- # use sysem dropbox
- sed \
- -e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
- -e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
- -i dropbox.in || die
- # us system rst2man
- epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
- sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
- AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_install () {
- gnome2_src_install
-
- local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
- [ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
- # Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
- extensiondir="${extensiondir#${EPREFIX}}"
-
- use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
- fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
-
- readme.gentoo_create_doc
-
- python_replicate_script "${ED}"/usr/bin/dropbox
-}
-
-pkg_postinst () {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/gnome-extra/nautilus-sendto-3.8.5 b/gnome-extra/nautilus-sendto-3.8.5
new file mode 100644
index 000000000000..b1c749d92d2d
--- /dev/null
+++ b/gnome-extra/nautilus-sendto-3.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-2.90.3:3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A nautilus extension for sending files to locations
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
+IUSE=debug
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-2.90.3:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.5.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac63667a62db2fda039be843b541cf3e
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
deleted file mode 100644
index 8cda69248766..000000000000
--- a/gnome-extra/nautilus-sendto/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nautilus-sendto-3.8.5.tar.xz 382440 BLAKE2B 30c842c04838c52eb41b1d808828ea7a00a9811a634f96e7bdfb559eb01569db6bedf0f4f6b504df8a5a13c1400ad9ca548298faceee9abc97377d034ab41dc1 SHA512 d9b504d5615e761f19b7b4610d394ac9b928023163b3e416aca114f168330d3b35617ee8e80338cce2248151096a6e2094576e7978b80076d5eedb9bb847bfa3
-EBUILD nautilus-sendto-3.8.5.ebuild 997 BLAKE2B 571fc12497f3238790e580b907793fac2a09f3b54f0c0b4ad900c76f2df54e6b8cc3e7388db9b105099c9aa64363f154ea767a7cb3afae8cf630651cecb71dbd SHA512 a1cec99ec57bbfa246e6baf6e513dc69ed2b15e27749f522474dbb5ff486d2fba7132c5ed12b78d51e6315cd043a31cf22038e2aae91d48e093d807a8df32b7e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/nautilus-sendto/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
deleted file mode 100644
index 99ff5a458ea4..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND="
- >=x11-libs/gtk+-2.90.3:3
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.9
- >=dev-util/intltool-0.35
- sys-devel/gettext
- virtual/pkgconfig
-"
-# Needed for eautoreconf
-# >=gnome-base/gnome-common-0.12
-
-src_prepare() {
- gnome2_src_prepare
-
- # Does not require introspection at all, bug #561008
- sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
-}
-
-src_configure() {
- gnome2_src_configure \
- $(usex debug --enable-debug=yes ' ')
-}
-
-pkg_postinst() {
- if ! has_version "gnome-base/nautilus[sendto]"; then
- einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
- fi
-}
diff --git a/gnome-extra/nautilus-tracker-tags-1.12.4 b/gnome-extra/nautilus-tracker-tags-1.12.4
new file mode 100644
index 000000000000..f7ecf8426df4
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare setup
+DEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
+DESCRIPTION=Nautilus extension to tag files for Tracker
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d32de93d65790b02545a2da6caac7f1b
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
deleted file mode 100644
index 58f53b0ed98b..000000000000
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.12.5-Makefile 759 BLAKE2B c7c184be791db0f74dc0ade23d30297ae06de599ad0317c6973c262e2df2ed93468a8737c454b63f089886c07a4d9c45e8e1117d057b0feb5e27c3e4e5be3f5f SHA512 57731bd3626b33c34f10f84cbe21654eedb2bbee7a374f78ae2015e9bfaf273f7cf797d5a5a7e31ab7ebfb6a8e7241dc7735126634ce455dc57f057158b21b8d
-DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-EBUILD nautilus-tracker-tags-1.12.4.ebuild 969 BLAKE2B dc8b84e61d4b1fa24665275fdd025839d657845ed80ee9c0798cf79d536372755dbcfae8b95edc34dc2f60ae9b55a2d6749bb74a965b773f488e4516df702191 SHA512 20de68b14de7403987569922ad78ba8004b0a150a1bbb0be8bc19bb526ab237538af0700f7b3687b3ddb669ec3ea3f7e9999c6365cb0138afb6bbf938b76c5bb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
deleted file mode 100644
index c2aececf863d..000000000000
--- a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-EXTENSIONDIR := $(shell pkg-config --variable=extensiondir libnautilus-extension)
-CFLAGS := -fPIC $(CFLAGS) $(shell pkg-config --cflags glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
-LIBS := $(shell pkg-config --libs glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
-RPATH := $(shell pkg-config --variable=libdir tracker-sparql-$(TRACKER_API))/tracker-$(TRACKER_API)
-INSTALL = install
-
-object_files = tracker-tags-extension.o tracker-tags-utils.o tracker-tags-view.o
-
-libnautilus-tracker-tags.so: $(object_files)
- $(CC) -shared -Wl,-rpath=$(RPATH) -Wl,-soname=$@ $(LDFLAGS) $^ $(LIBS) -o $@
-
-install: libnautilus-tracker-tags.so
- $(INSTALL) -d $(DESTDIR)$(EXTENSIONDIR)/
- $(INSTALL) $^ $(DESTDIR)$(EXTENSIONDIR)/
-
diff --git a/gnome-extra/nautilus-tracker-tags/metadata.xml b/gnome-extra/nautilus-tracker-tags/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/nautilus-tracker-tags/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
deleted file mode 100644
index 0dedff4b8909..000000000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
- ~app-misc/tracker-${PV}
- >=dev-libs/glib-2.44:2
- >=gnome-base/nautilus-2.90
- x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
- !<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
- tc-export CC
- export TRACKER_API=1.0
-}
-
-src_prepare() {
- default
- cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
- # config.h is not used, but is included in every source file...
- sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nemo-3.6.4 b/gnome-extra/nemo-3.6.4
new file mode 100644
index 000000000000..c16bb6e27e3b
--- /dev/null
+++ b/gnome-extra/nemo-3.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/polib[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=exif +introspection +nls packagekit tracker xmp test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef682f1d7301babf2cd15faf95213dbb
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
deleted file mode 100644
index dbebfeb259be..000000000000
--- a/gnome-extra/nemo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
-MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
deleted file mode 100644
index b3526b807770..000000000000
--- a/gnome-extra/nemo/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>cinnamon@gentoo.org</email>
- <name>Cinnamon Project</name>
- </maintainer>
- <use>
- <flag name="packagekit">Use packagekit to search for programs to open unknown file types</flag>
- <flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
- </use>
- <upstream>
- <remote-id type="github">linuxmint/nemo</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
deleted file mode 100644
index d840df8f6897..000000000000
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.3:2[dbus]
- >=gnome-extra/cinnamon-desktop-2.6.1:0=
- >=x11-libs/pango-1.28.3
- >=x11-libs/gtk+-3.9.10:3[introspection?]
- >=dev-libs/libxml2-2.7.8:2
-
- gnome-base/dconf:0=
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/libnotify-0.7:=
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrender
- >=x11-libs/xapps-1.0.4
-
- exif? ( >=media-libs/libexif-0.6.20:= )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- tracker? ( >=app-misc/tracker-0.12:= )
- xmp? ( >=media-libs/exempi-2.2.0:= )
- sys-libs/libselinux
-"
-RDEPEND="${COMMON_DEPEND}
- x11-themes/adwaita-icon-theme
- nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/polib[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]
- ')
- >=dev-lang/perl-5
- >=dev-util/gdbus-codegen-2.31.0
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.1
- sys-devel/gettext
- virtual/pkgconfig
- x11-base/xorg-proto
-
- dev-util/gtk-doc
- gnome-base/gnome-common
-"
-# For eautoreconf
-# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable exif libexif) \
- $(use_enable introspection) \
- $(use_enable tracker) \
- $(use_enable xmp)
-}
-
-src_test() {
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
- cd src # we don't care about translation tests
- GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
-}
diff --git a/gnome-extra/nm-applet-1.4.6-r1 b/gnome-extra/nm-applet-1.4.6-r1
new file mode 100644
index 000000000000..26a40b47c8ba
--- /dev/null
+++ b/gnome-extra/nm-applet-1.4.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection +modemmanager teamd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.4/network-manager-applet-1.4.6.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f5fe521f5774e0cae6f38d216c617d1
diff --git a/gnome-extra/nm-applet-1.8.10 b/gnome-extra/nm-applet-1.8.10
new file mode 100644
index 000000000000..8ea0c14ec1cf
--- /dev/null
+++ b/gnome-extra/nm-applet-1.8.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection gcr +modemmanager selinux teamd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7815e5a601605fc3f633f48621f3372f
diff --git a/gnome-extra/nm-applet-1.8.10-r1 b/gnome-extra/nm-applet-1.8.10-r1
new file mode 100644
index 000000000000..dafd214ffe4c
--- /dev/null
+++ b/gnome-extra/nm-applet-1.8.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection +gcr +modemmanager selinux teamd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf44c99ac3cf4c11521c55086ebac502
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
deleted file mode 100644
index 66e429550de1..000000000000
--- a/gnome-extra/nm-applet/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 1.4.6-CVE-2017-6590.patch 8963 BLAKE2B d725254a4cee53f4d24aaa062f1782ecf4e5c5aad841d9d473660e94c021dc7576fb1ee57b3d61da3eb18ae508472cda1c0ea52c618f66649e688910991fb928 SHA512 7798b5f62b971c505e0d1569ea9daabe0683e6aadd2ecb6e653e7927e14f47fb0e672aee874f5125eff50aa56916f74bd0756f9433cfa0b040723bcc4a2b9532
-AUX 1.4.6-fix-nma-bindings.patch 1350 BLAKE2B e09dbb79718de55270405de02efd48c0df45448e3073762088523070346076c0fa0c42813beeb3de377108c55516908e9b37440f8089a308d9840be74d8d1a41 SHA512 a2237c8fd94260c1681e97aabe6a8c203acb5e743996c280e6e7f8890cf4ccf1525c7d61d768e3418915258ef2a9416614a41eee6d223e4db11f1f168c17cf4f
-AUX 1.4.6-fix-translations-in-g-c-c.patch 4530 BLAKE2B 34f76eb8ffc74d58be05e05dfe636ca594149b1a101c2611d4df896e2148519d18087ebd12a3cc5e17253be5e57bf6bf90ed87aa5895e5a100fbfc82f74e4fbf SHA512 3af403696d1e647bfdf5a2316c17064b7fd4eb07c4ccce6d23fb0b6ce59143a90ba5b37377ed559d3abbe7fbe06642958c8a59b39cb67c19541dd6dd81831f7d
-AUX 1.4.6-improved-certfile-error-msg.patch 1481 BLAKE2B ca880144ffe78153b4989399d883def5d318668e886449f2bb2fdf094742cf2a6d25e6fa36fd6faba505d9caa97771fd6c1969c721bf14352c8665b072f07fca SHA512 dce3cbd0e8184d2558ffc63b068b7d1d396473f428fdba60c566eb1c5aae8c2519ee427516efebd63e69518ca55cac86c21db18a3753dd2780f0db2743d80bad
-AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6
-AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa
-DIST network-manager-applet-1.4.6.tar.xz 1388916 BLAKE2B 697587e4451d37ab91e99e25e40a1d797724e26568d252c77361e25f32508722a58dba1b2b4d2c784150479493c0451173da0b42314ebb17f1b7215628675444 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f
-DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
-EBUILD nm-applet-1.4.6-r1.ebuild 1670 BLAKE2B 3119a19f109ee03c9a149167b4e11812b6303fda297485f61c5494c669dbdb99e9b40e0721d8c9180ab7ea95af1e1d20f83a96f85c3915fc53fb3f2f67e8ffaf SHA512 ba565628ef8430a0e93e85ee5495409cd36094801a5ec9cf6207df3cf829405a0c74848e8840c4e6d0cb9ceb642d8abe3f888fc793e57bf9272f66ebb6fe7cf5
-EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d
-EBUILD nm-applet-1.8.10.ebuild 1521 BLAKE2B 745e2371612905c6d42ff9bc57b1e29f4bfcf078a0ed32ee5bcd9bd6f106d7f44204e84fdeca46701fa64fee6cecad28d155a5b4a56d0fa08514c246b95930fa SHA512 4c498d9b8bba82485134556025b9be43640a259bbb01be404537c655102a1d08198c58c9f28e4bc0b720810a5d4842e92b67885303f6b0a6a3c279bc65224166
-MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
deleted file mode 100644
index 25270e1f4c83..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-This is a squashed to one diff of the following 3 upstream commits:
-
-From d1ebd01abfad506d9a8797a252d4549c2df2045a Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Fri, 3 Mar 2017 12:27:23 +0000
-Subject: [PATCH 1/3] applet: check permissions before showing 802.1x wifi
- dialog (CVE-2017-6590)
-
-In most places, we (or NM) check permissions before performing actions.
-One place we don't is when we need more information when connecting to
-and 802.1x network. In that case we pop up a dialog to ask for more
-information before initiaing the connection.
-
-The dialog contains a GTK+ filechooser. We don't want unprivileged users
-to have access to this as it allows opening files.
-
-Check for MODIFY_SYSTEM or MODIFY_OWN before showing the dialog for
-802.1x connections. If the user doesn't have or can't get it, don't show
-the dialog. They wouldn't have been able to create the connection
-anyway.
-
-This fixes CVE-2017-6590.
-
-https://mail.gnome.org/archives/networkmanager-list/2017-March/msg00032.html
-https://bugs.launchpad.net/bugs/1668321
-
-[bgalvani@redhat.com: changed commit subject line, added links]
-
-(cherry picked from commit 523d0439c9d5633daccc77474f793c82cbd731ee)
-
-From f1f61ade24296b93044b9719fb2de1b561955e83 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 Mar 2017 14:18:06 +0100
-Subject: [PATCH 2/3] applet-device-wifi: remove unused functions
-
-They are not needed since commit 9b002809514a ("applet: remove usage
-of dbus-glib and private session D-Bus API").
-
-(cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc)
-
-From 7a582c5e6536b9e9a542d4791ae38a9d2840936b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 Mar 2017 14:37:19 +0100
-Subject: [PATCH 3/3] applet-device-wifi: return FALSE on failure of
- new_auto_connection() method
-
-If the permission check fails, we never run the callback: return FALSE
-so that the caller can free resources.
-
-(cherry picked from commit 38303e04cefb56a0a2176c5e30b399b14f21fc05)
-
-diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
-index 7b8fa6e..cd44e05 100644
---- a/src/applet-device-wifi.c
-+++ b/src/applet-device-wifi.c
-@@ -40,12 +40,6 @@ static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer
-
- static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet);
-
--static void _do_new_auto_connection (NMApplet *applet,
-- NMDevice *device,
-- NMAccessPoint *ap,
-- AppletNewAutoConnectionCallback callback,
-- gpointer callback_data);
--
- /*****************************************************************************/
-
- typedef struct {
-@@ -292,74 +286,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
- gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
- }
-
--static void
--dbus_8021x_add_and_activate_cb (GObject *client,
-- GAsyncResult *result,
-- gpointer user_data)
--{
-- GError *error = NULL;
-- NMActiveConnection *active;
--
-- active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
-- if (error)
-- g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message);
--
-- g_clear_object (&active);
-- g_clear_error (&error);
--}
--
--typedef struct {
-- NMApplet *applet;
-- NMDevice *device;
-- NMAccessPoint *ap;
--} Dbus8021xInfo;
--
--static void
--dbus_connect_8021x_cb (NMConnection *connection,
-- gboolean auto_created,
-- gboolean canceled,
-- gpointer user_data)
--{
-- Dbus8021xInfo *info = user_data;
--
-- if (canceled == FALSE) {
-- g_return_if_fail (connection != NULL);
--
-- /* Ask NM to add the new connection and activate it; NM will fill in the
-- * missing details based on the specific object and the device.
-- */
-- nm_client_add_and_activate_connection_async (info->applet->nm_client,
-- connection,
-- info->device,
-- nm_object_get_path (NM_OBJECT (info->ap)),
-- NULL,
-- dbus_8021x_add_and_activate_cb,
-- info->applet);
-- }
--
-- g_object_unref (info->device);
-- g_object_unref (info->ap);
-- memset (info, 0, sizeof (*info));
-- g_free (info);
--}
--
--gboolean
--applet_wifi_connect_to_8021x_network (NMApplet *applet,
-- NMDevice *device,
-- NMAccessPoint *ap)
--{
-- Dbus8021xInfo *info;
--
-- info = g_malloc0 (sizeof (*info));
-- info->applet = applet;
-- info->device = g_object_ref (device);
-- info->ap = g_object_ref (ap);
--
-- _do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info);
-- return TRUE;
--}
--
--
- typedef struct {
- NMApplet *applet;
- NMDeviceWifi *device;
-@@ -514,17 +440,28 @@ done:
- gtk_widget_destroy (GTK_WIDGET (dialog));
- }
-
--static void
--_do_new_auto_connection (NMApplet *applet,
-- NMDevice *device,
-- NMAccessPoint *ap,
-- AppletNewAutoConnectionCallback callback,
-- gpointer callback_data)
-+static gboolean
-+can_get_permission (NMApplet *applet, NMClientPermission perm)
- {
-- NMConnection *connection = NULL;
-- NMSettingConnection *s_con = NULL;
-+ if ( applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_YES
-+ || applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_AUTH)
-+ return TRUE;
-+ return FALSE;
-+}
-+
-+static gboolean
-+wifi_new_auto_connection (NMDevice *device,
-+ gpointer dclass_data,
-+ AppletNewAutoConnectionCallback callback,
-+ gpointer callback_data)
-+{
-+ WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
-+ NMApplet *applet;
-+ NMAccessPoint *ap;
-+ NMConnection *connection;
-+ NMSettingConnection *s_con;
- NMSettingWireless *s_wifi = NULL;
-- NMSettingWirelessSecurity *s_wsec = NULL;
-+ NMSettingWirelessSecurity *s_wsec;
- NMSetting8021x *s_8021x = NULL;
- GBytes *ssid;
- NM80211ApSecurityFlags wpa_flags, rsn_flags;
-@@ -532,9 +469,13 @@ _do_new_auto_connection (NMApplet *applet,
- MoreInfo *more_info;
- char *uuid;
-
-- g_assert (applet);
-- g_assert (device);
-- g_assert (ap);
-+ g_return_val_if_fail (dclass_data, FALSE);
-+ g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
-+ g_return_val_if_fail (NM_IS_ACCESS_POINT (info->ap), FALSE);
-+ g_return_val_if_fail (NM_IS_APPLET (info->applet), FALSE);
-+
-+ applet = info->applet;
-+ ap = info->ap;
-
- connection = nm_simple_connection_new ();
-
-@@ -590,6 +531,15 @@ _do_new_auto_connection (NMApplet *applet,
- * Dialog Of Doom.
- */
- if (s_8021x) {
-+ if (!can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) &&
-+ !can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) {
-+ const char *text = _("Failed to add new connection");
-+ const char *err_text = _("Insufficient privileges.");
-+ g_warning ("%s: %s", text, err_text);
-+ utils_show_error_dialog (_("Connection failure"), text, err_text, FALSE, NULL);
-+ g_clear_object (&connection);
-+ return FALSE;
-+ }
- more_info = g_malloc0 (sizeof (*more_info));
- more_info->applet = applet;
- more_info->callback = callback;
-@@ -606,24 +556,10 @@ _do_new_auto_connection (NMApplet *applet,
- /* Everything else can just get activated right away */
- callback (connection, TRUE, FALSE, callback_data);
- }
--}
-
--static gboolean
--wifi_new_auto_connection (NMDevice *device,
-- gpointer dclass_data,
-- AppletNewAutoConnectionCallback callback,
-- gpointer callback_data)
--{
-- WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
--
-- g_return_val_if_fail (device != NULL, FALSE);
-- g_return_val_if_fail (info->ap != NULL, FALSE);
--
-- _do_new_auto_connection (info->applet, device, info->ap, callback, callback_data);
- return TRUE;
- }
-
--
- static void
- wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data)
- {
-diff --git a/src/applet.h b/src/applet.h
-index 41e95a1..b28dfa2 100644
---- a/src/applet.h
-+++ b/src/applet.h
-@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name,
- NMApplet *applet);
-
- gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
--gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet,
-- NMDevice *device,
-- NMAccessPoint *ap);
- gboolean applet_wifi_create_wifi_network (NMApplet *applet);
- gboolean applet_wifi_can_create_wifi_network (NMApplet *applet);
-
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
deleted file mode 100644
index 2a04a5327394..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 58e47dc92d38974141e1053b25cae02d7c8414b0 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 7 Mar 2017 09:43:03 +0100
-Subject: [PATCH] libnma/pygobject: libnma/NMA must use libnm/NM instead of
- legacy libraries
-
-libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings
-must load "NM" and not "NMClient"/"NetworkManager".
-
-As it was, the generated bindings for libnma were unusable and loading
-them would fail with
-
- libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
-
-https://bugzilla.gnome.org/show_bug.cgi?id=779153
-
-Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7
-(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182)
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index a57e15f..e76c9ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc
-
- if HAVE_INTROSPECTION
- src/libnma/NMA-1.0.gir: src/libnma/libnma.la
--src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
-+src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
- src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
- src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
- src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
---
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
deleted file mode 100644
index 8a1fe825e38e..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 718b24286559169ba29f89536c3f6c81dcfe6e30 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 13 Mar 2017 21:57:28 +0100
-Subject: [PATCH] libnma,libnm-gtk: use package-aware gettext() macro
-
-gettext("str") expands to dcgettext(NULL, "str") which gets
-translations from the last used domain, while _("str") is equivalent
-to g_dgettext(GETTEXT_PACKAGE, "str") which uses the library's
-translations.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772362
-(cherry picked from commit 9df10e2e758a7b78aa5a69a15900030f45e48fff)
----
- src/libnm-gtk/nm-ui-utils.c | 10 +++++-----
- src/libnma/nma-ui-utils.c | 10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
-index e92ff80..eec9a5f 100644
---- a/src/libnm-gtk/nm-ui-utils.c
-+++ b/src/libnm-gtk/nm-ui-utils.c
-@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
- icon_name_table[item]);
- gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
- GTK_ENTRY_ICON_SECONDARY,
-- gettext (icon_desc_table[item]));
-+ _(icon_desc_table[item]));
-
- /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
- * Unfortunately, making GtkEntry insensitive will also make the icon
-@@ -843,12 +843,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
- g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
- g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
- group = NULL;
-- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
-+ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
- group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
-- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
-- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
-+ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
-+ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
- if (with_not_required)
-- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
-+ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
-
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
-diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
-index 99e2e97..418ef5f 100644
---- a/src/libnma/nma-ui-utils.c
-+++ b/src/libnma/nma-ui-utils.c
-@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
- icon_name_table[item]);
- gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
- GTK_ENTRY_ICON_SECONDARY,
-- gettext (icon_desc_table[item]));
-+ _(icon_desc_table[item]));
-
- /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
- * Unfortunately, making GtkEntry insensitive will also make the icon
-@@ -277,12 +277,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
- g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
- g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
- group = NULL;
-- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
-+ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
- group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
-- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
-- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
-+ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
-+ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
- if (with_not_required)
-- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
-+ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
-
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
---
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
deleted file mode 100644
index e83d4c34ca0e..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3609f9687728f2f7f8cdb33723c1d44660b81004 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 23 Mar 2017 12:28:12 +0100
-Subject: [PATCH] c-e: improve error message for non-existing certificate file
-
-When the connection references a certifiate file that does not exist,
-the GUI's file picker button shows an "(None)", however the "Save"
-button is disable with message:
-
- "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: unspecified error validating eap-method file"
-
-Slightly improve that by showing instead
-
- "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: file "..." does not exist"
-
-The solution is not optimal because the GUI shows file "(None)",
-with is some hidden information that makes the connection invalid.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780423
-(cherry picked from commit b603844fc50679fc8683227bfa0f3b6c8e77c2c7)
----
- src/wireless-security/eap-method.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
-index cb733e8..b5c6609 100644
---- a/src/wireless-security/eap-method.c
-+++ b/src/wireless-security/eap-method.c
-@@ -237,6 +237,7 @@ eap_method_validate_filepicker (GtkBuilder *builder,
-
- if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
- success = FALSE;
-+ g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("file \"%s\" does not exist"), filename);
- goto out;
- }
-
---
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
deleted file mode 100644
index 9aad2396953e..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001
-From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
-Date: Sun, 14 Jan 2018 23:28:15 +0100
-Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules
-
-Cause: Apparently it's perfectly okay if the list of modules is empty
-(e.g., NULL). However, the code assume that this indicates an error,
-tries to print the NULL error, and crashes.
-
-[lkundrak@v3.sk: cosmetic changes]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785674
-(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674)
----
- src/libnma/nma-cert-chooser-button.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
-index c7089390..00651765 100644
---- a/src/libnma/nma-cert-chooser-button.c
-+++ b/src/libnma/nma-cert-chooser-button.c
-@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
- gchar *label;
-
- modules = gck_modules_initialize_registered_finish (res, &error);
-- if (!modules) {
-+ if (error) {
- /* The Front Fell Off. */
-- g_critical ("Error getting registered modules: %s", error->message);
-- g_error_free (error);
-+ g_warning ("Error getting registered modules: %s", error->message);
-+ g_clear_error (&error);
- }
-
- model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
---
-2.14.3
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
deleted file mode 100644
index 8f217af2dac6..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 20 Dec 2017 13:23:12 +0100
-Subject: [PATCH 1/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys
-
-The compat implementations return a (transfer none) strv instead of a
-(transfer container) one. This has caused double frees in nm-applet:
-https://bugs.archlinux.org/task/56772
-
-Don't copy the keys and don't free the container later.
-
-[thaller@redhat.com: patch adjusted to avoid compiler warning]
-
-Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82)
----
- shared/nm-utils/nm-compat.c | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 22ab675d..47035e62 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- GPtrArray *a = user_data;
-
-- g_ptr_array_add (a, g_strdup (key));
-+ g_ptr_array_add (a, (gpointer) key);
- }
-
- static const char **
-@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
- g_ptr_array_sort (a, nm_strcmp_p);
- g_ptr_array_add (a, NULL);
- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--
-- /* we need to cache the keys *somewhere*. */
-- g_object_set_qdata_full (G_OBJECT (setting),
-- is_secrets
-- ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-- : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-- keys,
-- (GDestroyNotify) g_strfreev);
- }
-
- NM_SET_OUT (out_length, len);
---
-2.14.3
-
-
-From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 21 Dec 2017 20:36:48 +0100
-Subject: [PATCH 2/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys()
-
-The previous fix was bad because the keys do not come from NMSettingVpn's hash
-table but are copies that are freed by nm_setting_vpn_foreach_* before
-it returns.
-
-[thaller@redhat.com: import shared code from NetworkManager, merging
-three patches together.]
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
-
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
-(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951)
----
- shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 47035e62..90328c06 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- GPtrArray *a = user_data;
-
-- g_ptr_array_add (a, (gpointer) key);
-+ g_ptr_array_add (a, g_strdup (key));
- }
-
- static const char **
-@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
- {
- guint len;
- const char **keys = NULL;
-- gs_unref_ptrarray GPtrArray *a = NULL;
-+ GPtrArray *a;
-
- nm_assert (NM_IS_SETTING_VPN (setting));
-
-- a = g_ptr_array_new ();
-+ if (is_secrets)
-+ len = nm_setting_vpn_get_num_secrets (setting);
-+ else
-+ len = nm_setting_vpn_get_num_data_items (setting);
-+
-+ a = g_ptr_array_sized_new (len + 1);
-+
- if (is_secrets)
- nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
- else
- nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
-- len = a->len;
-
-- if (a->len) {
-+ len = a->len;
-+ if (len) {
- g_ptr_array_sort (a, nm_strcmp_p);
- g_ptr_array_add (a, NULL);
-- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
-- }
-+ keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
-+
-+ /* we need to cache the keys *somewhere*. */
-+ g_object_set_qdata_full (G_OBJECT (setting),
-+ is_secrets
-+ ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-+ : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-+ g_ptr_array_free (a, FALSE),
-+ (GDestroyNotify) g_strfreev);
-+ } else
-+ g_ptr_array_free (a, TRUE);
-
- NM_SET_OUT (out_length, len);
- return keys;
---
-2.14.3
-
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
deleted file mode 100644
index 7cb30b744ca5..000000000000
--- a/gnome-extra/nm-applet/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 type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
- <flag name="modemmanager">Enable support for mobile broadband devices
- using <pkg>net-misc/modemmanager</pkg></flag>
- <flag name="teamd">Enable teamd configuration editor</flag>
- </use>
-</pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
deleted file mode 100644
index 6a00ca01df6b..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +modemmanager teamd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- app-crypt/libsecret
- >=dev-libs/glib-2.32:2[dbus]
- >=dev-libs/dbus-glib-0.88
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.4:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- virtual/libgudev:=
- modemmanager? ( net-misc/modemmanager )
- teamd? ( >=dev-libs/jansson-2.3 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=dev-util/intltool-0.50.1
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
- "${FILESDIR}"/${PV}-fix-nma-bindings.patch # NMA bindings fix to be usable in python etc
- "${FILESDIR}"/${PV}-fix-translations-in-g-c-c.patch # g-c-c == gnome-control-center
- "${FILESDIR}"/${PV}-CVE-2017-6590.patch # bug 613768
- "${FILESDIR}"/${PV}-improved-certfile-error-msg.patch # bug 613646
-)
-
-src_configure() {
- gnome2_src_configure \
- --without-appindicator \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- $(use_enable introspection) \
- $(use_with modemmanager wwan) \
- $(use_with teamd team)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
deleted file mode 100644
index 7ce48b41917b..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- >=app-crypt/libsecret-0.18
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/dbus-glib-0.88
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.10:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- virtual/libgudev:=
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=dev-util/intltool-0.50.1
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
- # shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
- # (from 'master')
- "${FILESDIR}"/${P}-vpn-crash.patch
-
- # libnma/cert-chooser: handle case of no avalable modules (from
- # 'master')
- "${FILESDIR}"/${P}-cert-chooser.patch
-)
-
-src_configure() {
- local myconf=(
- --without-appindicator
- --disable-lto
- --disable-ld-gc
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- $(use_enable introspection)
- $(use_with gcr)
- $(use_with modemmanager wwan)
- $(use_with selinux)
- $(use_with teamd team)
- )
- gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
deleted file mode 100644
index 52554e8a0baa..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-RDEPEND="
- >=app-crypt/libsecret-0.18
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/dbus-glib-0.88
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.10:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- virtual/libgudev:=
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=dev-util/intltool-0.50.1
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
- local myconf=(
- --without-appindicator
- --disable-lto
- --disable-ld-gc
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- $(use_enable introspection)
- $(use_with gcr)
- $(use_with modemmanager wwan)
- $(use_with selinux)
- $(use_with teamd team)
- )
- gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/office-runner-1.0.2 b/gnome-extra/office-runner-1.0.2
new file mode 100644
index 000000000000..e22a75bd36c2
--- /dev/null
+++ b/gnome-extra/office-runner-1.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=dev-util/intltool-0.40.0 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lighthearted tool to temporarily inhibit GNOME's suspend on lid close behavior
+EAPI=5
+HOMEPAGE=http://www.hadess.net/search/label/office-runner
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=sys-apps/systemd-190
+SLOT=0
+SRC_URI=mirror://gnome/sources/office-runner/1.0/office-runner-1.0.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8d61b09c5b977e55878bb05f10513d01
diff --git a/gnome-extra/office-runner/Manifest b/gnome-extra/office-runner/Manifest
deleted file mode 100644
index ba300ee69756..000000000000
--- a/gnome-extra/office-runner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST office-runner-1.0.2.tar.xz 562660 BLAKE2B ad69a4340025b58d45f954524c9807831c98a4d81901276bfa3e8f76adb3a5bd1fcf0b50908e00c19888d82b6c48602228a42b84b008f2b7b95210868c8a90ed SHA512 a840af75f014147d30e950a4bc8628c97a79c8161eab3d0f658f5e4f5200df5baaa761d4ea27dc1bc70c6a467fc2536ac0aa473c338ffcbfc48689ba1ec13177
-EBUILD office-runner-1.0.2.ebuild 878 BLAKE2B dd7e6c8471381566e6cb3edbc3b4457e8e79dd8a1b78ecc008d567f2b0e94b79de164f537469a2f9f6279e0b20b8582535c7b15c6e6142a3648d77b36933a849 SHA512 920d5eae8032228f0cb2c8661d2f2f14e9e5b087272a4e3508f714062a183eb7a2157f0110c07597ef04253ddb1c4e24ef3d40946a5da7195cf7b2e9a7a27572
-MISC metadata.xml 520 BLAKE2B 7a1706f5380983f935e4feb3f00224194024beeea99aed500f2550780049354bab448ce6b507e9cfad63b0d16d08d1d5bc7880aff36be791a5888a8c813a2181 SHA512 54abe575b83b5b14c227e8e4b87f7bb00503afd69cce7d5a05124b4d67a0385ff21fcf4618f41668c3fedbd27c918753b4bdc0dcef296a63fcd774c608fbcc80
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
deleted file mode 100644
index 77410621ce8c..000000000000
--- a/gnome-extra/office-runner/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 type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <longdescription lang="en">
- A tool in the form of a lighthearted game that
- temporarily inhibits GNOME's default suspend on lid close behavior,
- allowing the user to move his laptop with the lid closed without dropping
- network connections.
- </longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/office-runner/office-runner-1.0.2.ebuild b/gnome-extra/office-runner/office-runner-1.0.2.ebuild
deleted file mode 100644
index d9bcef381725..000000000000
--- a/gnome-extra/office-runner/office-runner-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="Lighthearted tool to temporarily inhibit GNOME's suspend on lid close behavior"
-HOMEPAGE="http://www.hadess.net/search/label/office-runner"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- dev-libs/glib:2
- >=gnome-base/gnome-settings-daemon-3.0
- >=x11-libs/gtk+-3.8:3
-"
-# requires systemd's org.freedesktop.login1 dbus service
-RDEPEND="${COMMON_DEPEND}
- >=sys-apps/systemd-190
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- sys-devel/gettext
-"
-
-DOC_CONTENTS="${PN} inhibits suspend on lid close only for 10 minutes"
-
-src_install() {
- gnome2_src_install
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/gnome-extra/polkit-gnome-0.105-r1 b/gnome-extra/polkit-gnome-0.105-r1
new file mode 100644
index 000000000000..ac216f21ce7b
--- /dev/null
+++ b/gnome-extra/polkit-gnome-0.105-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils
+DESCRIPTION=A dbus session bus service that is used to bring up authentication dialogs
+EAPI=4
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2b63a1ed5634305b94684bf86779045d
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
deleted file mode 100644
index c5bcf77974d6..000000000000
--- a/gnome-extra/polkit-gnome/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r1.ebuild 1089 BLAKE2B 562f3c61d73fec764135a8830e157fbf146d99aa5b0106a88539c33f2f8ba4db59795fe02431248ebb8609c255148d03a1e7e316a10c28adf35e4f98ab2517fb SHA512 db286471057eb3db927037c4a09a6271f992e7eb78fa5a5a41487f03111fff1fecc7e33f086ce33056c76f1b85e77d605451c25aea5b7f29fc85250eb20dd309
-MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/metadata.xml b/gnome-extra/polkit-gnome/metadata.xml
deleted file mode 100644
index d80c2d3fce7b..000000000000
--- a/gnome-extra/polkit-gnome/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>freedesktop-bugs@gentoo.org</email>
- <name>Gentoo Freedesktop Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
deleted file mode 100644
index 5013ca8e3219..000000000000
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome.org
-
-DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30
- >=sys-auth/polkit-0.102
- x11-libs/gtk+:3
- !lxde-base/lxpolkit"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-DOCS=( AUTHORS HACKING NEWS README TODO )
-
-src_install() {
- default
-
- cat <<-EOF > "${T}"/polkit-gnome-authentication-agent-1.desktop
- [Desktop Entry]
- Name=PolicyKit Authentication Agent
- Comment=PolicyKit Authentication Agent
- Exec=/usr/libexec/polkit-gnome-authentication-agent-1
- Terminal=false
- Type=Application
- Categories=
- NoDisplay=true
- NotShowIn=MATE;KDE;
- AutostartCondition=GNOME3 if-session gnome-fallback
- EOF
-
- insinto /etc/xdg/autostart
- doins "${T}"/polkit-gnome-authentication-agent-1.desktop
-}
diff --git a/gnome-extra/seahorse-nautilus-3.11.92 b/gnome-extra/seahorse-nautilus-3.11.92
new file mode 100644
index 000000000000..e40bd33ed0a6
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus-3.11.92
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Nautilus extension for encrypting and decrypting files with GnuPG
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Seahorse
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 !app-crypt/seahorse-plugins[nautilus]
+SLOT=0
+SRC_URI=mirror://gnome/sources/seahorse-nautilus/3.11/seahorse-nautilus-3.11.92.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=705d0850dafb2a9219d6e340a1f3396b
diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
deleted file mode 100644
index ed11b8d48af8..000000000000
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-EBUILD seahorse-nautilus-3.11.92.ebuild 1252 BLAKE2B 240b6de0be8c3e7b70a74383235b68d5929986b3766cc891d47341710c18d391544c406e05975fabdb6af2ccd4f191b4967fea1bed73c3e39344fc0122f9cf07 SHA512 a76cea1dcfbfd7131017883a2b93353619b5cfcc6d74e42a6ce65d12bdb31fae876f99285072e20f9dfb0657d671bd0d44af3b6952c0d04a1ca11b6365463fc3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/seahorse-nautilus/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
deleted file mode 100644
index 5c84f7204542..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Seahorse"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=app-crypt/gpgme-1.0.0
- >=app-crypt/gcr-3.4[gtk]
- >=dev-libs/dbus-glib-0.35
- >=dev-libs/glib-2.28:2
- gnome-base/gnome-keyring
- >=gnome-base/nautilus-3
- x11-libs/gtk+:3
- >=x11-libs/libcryptui-3.9.90
- >=x11-libs/libnotify-0.3:=
- >=app-crypt/gnupg-1.4
-"
-# seahorse-nautilus was formerly part of seahorse-plugins
-RDEPEND="${COMMON_DEPEND}
- !app-crypt/seahorse-plugins[nautilus]
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Do not let configure mangle CFLAGS
- sed -e '/^[ \t]*CFLAGS="$CFLAGS \(-g\|-O0\)/d' -i configure.ac configure ||
- die "sed failed"
-
- # Fix icon location, upstream bug #719763
- sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
- tool/seahorse-notification.c || die
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-gpg-check \
- --enable-libnotify
-}
diff --git a/gnome-extra/sushi-3.24.0 b/gnome-extra/sushi-3.24.0
new file mode 100644
index 000000000000..e691dfda7d03
--- /dev/null
+++ b/gnome-extra/sushi-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/sushi
+IUSE=office
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gdk-pixbuf-2.23[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 >=dev-libs/gobject-introspection-0.9.6:= >=media-libs/clutter-1.11.4:1.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[X,introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=media-libs/harfbuzz-0.9.9:= media-libs/clutter-gst:3.0[introspection] media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] x11-libs/gtksourceview:3.0[introspection] office? ( app-office/unoconv ) >=gnome-base/nautilus-3.1.90
+SLOT=0
+SRC_URI=mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f04fd2fe4787f4366d57b0805165cc0d
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
deleted file mode 100644
index b29000c674b6..000000000000
--- a/gnome-extra/sushi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sushi-3.24.0.tar.xz 297332 BLAKE2B a01947627e9ca711f9f1d634f2791ee79e414bab38058ca4a8bfd822a2d277522fe99d66b3364f46662ee0fc1fa8a148f48ce8c434fd0d7bbb7ef1c159f2ea12 SHA512 b49e9c1ef1dc4c74ae06f6da9a2f428ed4ee3ec1ca3ba04c483ddb1bd976e6981466456d27a641048756a1ea0bf2fe033883059895e889950d0d0f340535b29b
-EBUILD sushi-3.24.0.ebuild 1397 BLAKE2B e70854e83c0ad23bc2c289eeef570624ad279636a05c2e19d62b0c0f103a439d7a183f8dd2148c78bd13d2631ddd25e804bf8aa8d782440d0528f8ae4c726bd7 SHA512 0dc8e816b550fc5ab58beeec4f379442adb23e9fbdb164551a4ab5551e604e3171abb4c0c5ee49f54ebf4ac3d7397d085fbc12006aa4693fe620e196351be130
-MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
deleted file mode 100644
index 367fae8e3eae..000000000000
--- a/gnome-extra/sushi/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>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <use>
- <flag name="office">Support viewing file formats such as generated by
- <pkg>app-office/libreoffice</pkg></flag>
- </use>
-</pkgmetadata>
diff --git a/gnome-extra/sushi/sushi-3.24.0.ebuild b/gnome-extra/sushi/sushi-3.24.0.ebuild
deleted file mode 100644
index 3a0f5d975093..000000000000
--- a/gnome-extra/sushi/sushi-3.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
-COMMON_DEPEND="
- >=x11-libs/gdk-pixbuf-2.23[introspection]
- >=dev-libs/gjs-1.40
- >=dev-libs/glib-2.29.14:2
- >=dev-libs/gobject-introspection-0.9.6:=
- >=media-libs/clutter-1.11.4:1.0[introspection]
- >=media-libs/clutter-gtk-1.0.1:1.0[introspection]
- >=x11-libs/gtk+-3.13.2:3[X,introspection]
-
- >=app-text/evince-3.0[introspection]
- media-libs/freetype:2
- media-libs/gstreamer:1.0[introspection]
- media-libs/gst-plugins-base:1.0[introspection]
- >=media-libs/harfbuzz-0.9.9:=
- media-libs/clutter-gst:3.0[introspection]
- media-libs/musicbrainz:5=
- net-libs/webkit-gtk:4[introspection]
- x11-libs/gtksourceview:3.0[introspection]
-
- office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- >=gnome-base/nautilus-3.1.90
-"
-
-src_configure() {
- gnome2_src_configure --disable-static
-}
diff --git a/gnome-extra/synapse-0.2.99.2 b/gnome-extra/synapse-0.2.99.2
new file mode 100644
index 000000000000..c77404f675b9
--- /dev/null
+++ b/gnome-extra/synapse-0.2.99.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A program launcher in the style of GNOME Do
+EAPI=5
+HOMEPAGE=https://launchpad.net/synapse-project/
+IUSE=plugins
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 )
+SLOT=0
+SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.2/+download/synapse-0.2.99.2.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vala 103e6885c83965507391cdc5b6fa0e67 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29b7c15a3cd872cdb1941fbb3bb8b71e
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
deleted file mode 100644
index 1504997b46de..000000000000
--- a/gnome-extra/synapse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST synapse-0.2.99.2.tar.xz 444156 BLAKE2B b1fccaecf6ea0d8623e305852e3ae21bb0f95b38a086152643bfb15f82c59a27fc499487ad9a3dba56378f260eea26a43a76bef11220b9e24b2027b1a1a8f8ca SHA512 e4b6e0399a83fc7880d786e8cff6360850d5ce1ac2eabccb5ce6d3989e4356c42adf1155905b39bb6b10887c02844dad01cdf8d556bc4bd6c7cd11956f8116c7
-EBUILD synapse-0.2.99.2.ebuild 1263 BLAKE2B 8d18247cd27da294cd8feb76b4024073f7fd59f95ee197027cd6d495817644760a3de4ef0dc7256f9d1908628b068f5c0fcbe737841cf0ea3e7be16ac2bee67d SHA512 e25fd7c9374b4055352a125ffc312cbb91728653baffb86dbf3961b7ed08242935bc1cc76f0bc11506666a720b0c7d0eac672c7da82defa98a21e46add407f9a
-MISC metadata.xml 458 BLAKE2B 2202bb6ee7223434586fd946bc1f1b2dc3425e3df8bc4b187eb84318138701306bb572c0ebf4cae2ce2e519c78078f312f874a974d77a4e11a123c387324832b SHA512 e27cf8f714a9c730e6d37ac4e92dd66e080eca58ea2497552233d54e79c55eb0ae4622031b29659bb53d8011ea77b58cab60ce579d89144adf44d4aeac9c8c97
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
deleted file mode 100644
index 52843da2e503..000000000000
--- a/gnome-extra/synapse/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 type="project">
- <email>desktop-misc@gentoo.org</email>
- <name>Gentoo Desktop Miscellaneous Project</name>
- </maintainer>
- <use>
- <flag name="plugins">Build support for plugins using librest</flag>
- </use>
- <upstream>
- <remote-id type="launchpad">synapse-project</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
deleted file mode 100644
index d2e698782f49..000000000000
--- a/gnome-extra/synapse/synapse-0.2.99.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no" # gnome2_src_configure is not being used
-AUTOTOOLS_AUTORECONF=true
-
-inherit gnome2 autotools-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins"
-
-RDEPEND="
- dev-libs/libgee:0.8
- >=dev-libs/glib-2.28.0:2
- dev-libs/json-glib
- dev-libs/keybinder:3
- dev-libs/libunique:1
- sys-apps/dbus
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtkhotkey
- >=x11-libs/gtk+-3.0.0:3
- x11-libs/libnotify
- x11-libs/pango
- x11-themes/adwaita-icon-theme
- plugins? ( >=net-libs/rest-0.7 )"
-
- #ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
- $(vala_depend)
- dev-util/intltool
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
- vala_src_prepare
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --enable-indicator=no
- $(use_enable plugins librest yes)
- )
- autotools-utils_src_configure
-}
diff --git a/gnome-extra/yelp-3.22.0 b/gnome-extra/yelp-3.22.0
new file mode 100644
index 000000000000..92e3f02d11d6
--- /dev/null
+++ b/gnome-extra/yelp-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91c510f804d0630cae83d8cea4d1d27a
diff --git a/gnome-extra/yelp-xsl-3.20.1 b/gnome-extra/yelp-xsl-3.20.1
new file mode 100644
index 000000000000..f43e0b2ab315
--- /dev/null
+++ b/gnome-extra/yelp-xsl-3.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/intltool-0.40 >=dev-util/itstool-1.2.0 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=XSL stylesheets for yelp
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b25112b7a7cd245a080b5e05be731ae5
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
deleted file mode 100644
index b8b029b770c3..000000000000
--- a/gnome-extra/yelp-xsl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yelp-xsl-3.20.1.tar.xz 568400 BLAKE2B f61151777eee346d08ecee2903fcf34759581b782662658a6af68f6623e62f9773ef842fa430655871033f39f10aa50481543c4d88f94c6484709fcd3d3776a7 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac
-EBUILD yelp-xsl-3.20.1.ebuild 602 BLAKE2B 8a481c2e04086d1b03ad33c64648b9352ba6f0701a45b0353af08c5c9dc14b35804af5fa9f43e9fca87d29be4c4fee2dbce48b69c06ed484e064fb14e9586701 SHA512 9401b7d7a1aca25d8512f84765e18041705918bf2c5cede2a3a4d47b1624cac02c0e49437f3a485ac597dfab1e92f11b2421b14b2e189c54e448046a75e20c64
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/metadata.xml b/gnome-extra/yelp-xsl/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/yelp-xsl/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
deleted file mode 100644
index 16852873e662..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
- >=dev-libs/libxml2-2.6.12:=
- >=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=dev-util/itstool-1.2.0
- sys-devel/gettext
- virtual/awk
- virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
deleted file mode 100644
index 22fc52ff438b..000000000000
--- a/gnome-extra/yelp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-3.22.0.tar.xz 1383500 BLAKE2B f3422c0e8370f42ce73a27d0336d6def61e8d43d9736946e65e579548cbcf9b52afacbdcaf0e8b8733dfe1dc0d0efd53ff6d73377c4e5bbaf2106b8cc42b10a7 SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32
-EBUILD yelp-3.22.0.ebuild 1192 BLAKE2B 84234d94a25ce188f6377cc5dec1c130fbb2bb9f2cfa3878f4ae058341554892c586505b45e21ebfc57ab6f69bf0dc601f5c0b63865f0e7adafbb2535c67c6e2 SHA512 4e05de732fd5beaab9c997caddd7abfe68af62b74a2bfade825bc28e39f7c67b35bbac4e169ce38a3d771bcd87fc8c5d91c609b80da3318da9bc600da906a47f
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
deleted file mode 100644
index b756b67462bc..000000000000
--- a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From b7f00d9fc5f4c948b3b412fa22488517e71a2987 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 27 Mar 2016 17:11:59 +0200
-Subject: [PATCH] Enable compatibility with traditional man (#648854)
-
-As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs
-"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format
-of the man page. However, the only implementation of man that accepts
-these options is man-db (used by Debian, Fedora, SUSE & Ubuntu).
-The traditional Linux man used by other distros and man implementations
-on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options
-for outputting groff intermediate format.
-Therefore, on systems that do not use man-db, we need to manually
-uncompress the nroff source file and feed it to groff. This is best done
-using a small shell script (/usr/libexec/yelp-groff), both for for
-clarity and for ease of modification on systems with weird man setups.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
-Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
----
- Makefile.am | 2 ++
- libyelp/yelp-groff | 49 +++++++++++++++++++++++++++++++++++++++++++++++
- libyelp/yelp-man-parser.c | 2 +-
- 3 files changed, 52 insertions(+), 1 deletion(-)
- create mode 100755 libyelp/yelp-groff
-
-diff --git a/Makefile.am b/Makefile.am
-index 30eba2c..b87f2b2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,6 +6,7 @@ BUILT_SOURCES = \
- $(nodist_libyelp_libyelp_la_SOURCES)
-
- lib_LTLIBRARIES = libyelp/libyelp.la
-+libexec_SCRIPTS = libyelp/yelp-groff
-
- libyelp_libyelp_la_SOURCES = \
- libyelp/yelp-bookmarks.c \
-@@ -58,6 +59,7 @@ libyelp_libyelp_la_CFLAGS = \
-
- libyelp_libyelp_la_CPPFLAGS = \
- -DDATADIR=\""$(datadir)"\" \
-+ -DLIBEXECDIR=\"$(libexecdir)\" \
- -DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" \
- -DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\" \
- -I$(top_builddir)/libyelp
-diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff
-new file mode 100755
-index 0000000..5348024
---- /dev/null
-+++ b/libyelp/yelp-groff
-@@ -0,0 +1,49 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public
-+# License along with this program; if not, write to the
-+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+#
-+###
-+#
-+# Process the requested compressed source nroff file and output groff
-+# intermediate format.
-+#
-+
-+filename=$1
-+
-+if [ -z ${filename} ] ; then
-+ echo "Usage: yelp-groff [FILE]" >&2
-+ echo "Process a man FILE and output groff intermediate format."
-+ exit 1
-+fi
-+
-+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
-+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
-+
-+# Otherwise, manually uncompress the file ...
-+cat="cat"
-+case ${filename} in
-+ *.bz2) cat="bzip2 -c -d" ;;
-+ *.gz) cat="gunzip -c" ;;
-+ *.lzma) cat="unlzma -c -d" ;;
-+ *.xz) cat="unxz -c" ;;
-+ *.Z) cat="zcat" ;;
-+esac
-+
-+# ... and run groff to get the intermediate format; preprocess with tbl
-+# unless MANROFFSEQ is defined.
-+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
-diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
-index 46073a2..792e695 100644
---- a/libyelp/yelp-man-parser.c
-+++ b/libyelp/yelp-man-parser.c
-@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
- {
- gint ystdout;
- GError *err = NULL;
-- const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
-+ const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
- gchar **my_argv;
-
- /* g_strdupv() should accept a "const gchar **". */
---
-2.7.4
-
diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/yelp/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/yelp/yelp-3.22.0.ebuild b/gnome-extra/yelp/yelp-3.22.0.ebuild
deleted file mode 100644
index 1a32c72c41fa..000000000000
--- a/gnome-extra/yelp/yelp-3.22.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
- app-arch/bzip2:=
- >=app-arch/xz-utils-4.9:=
- dev-db/sqlite:3=
- >=dev-libs/glib-2.38:2
- >=dev-libs/libxml2-2.6.5:2
- >=dev-libs/libxslt-1.1.4
- >=gnome-extra/yelp-xsl-3.12
- >=net-libs/webkit-gtk-2.7.2:4
- >=x11-libs/gtk+-3.13.3:3
- x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.13
- >=dev-util/intltool-0.41.0
- dev-util/itstool
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Fix compatibility with Gentoo's sys-apps/man
- # https://bugzilla.gnome.org/show_bug.cgi?id=648854
- eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-bz2 \
- --enable-lzma
-}
-
-src_install() {
- gnome2_src_install
- exeinto /usr/libexec/
- doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/zenity-3.24.0 b/gnome-extra/zenity-3.24.0
new file mode 100644
index 000000000000..d347fa3b8323
--- /dev/null
+++ b/gnome-extra/zenity-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) app-text/yelp-tools gnome-base/gnome-common >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+IUSE=debug libnotify webkit
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b2953b9779d513c0c4e84b507b00d23
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
deleted file mode 100644
index 1fabd78322e8..000000000000
--- a/gnome-extra/zenity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
-EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/zenity/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@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-3.24.0.ebuild b/gnome-extra/zenity/zenity-3.24.0.ebuild
deleted file mode 100644
index 3373cce2a49f..000000000000
--- a/gnome-extra/zenity/zenity-3.24.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
- >=dev-libs/glib-2.8:2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3:3[X]
- x11-libs/libX11
- x11-libs/pango
- libnotify? ( >=x11-libs/libnotify-0.6.1:= )
- webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}
- app-text/yelp-tools
- gnome-base/gnome-common
- >=sys-devel/gettext-0.19.4
- virtual/pkgconfig
-"
-
-src_configure() {
- gnome2_src_configure \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable libnotify) \
- $(use_enable webkit webkitgtk) \
- PERL=$(type -P false)
-}
-
-src_install() {
- gnome2_src_install
-
- # Not really needed and prevent us from needing perl
- rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}