summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-extra
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/activity-log-manager/Manifest1
-rw-r--r--gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild52
-rw-r--r--gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild51
-rw-r--r--gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch16
-rw-r--r--gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch139
-rw-r--r--gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch13
-rw-r--r--gnome-extra/activity-log-manager/files/config.vapi12
-rw-r--r--gnome-extra/activity-log-manager/metadata.xml17
-rw-r--r--gnome-extra/assogiate/Manifest1
-rw-r--r--gnome-extra/assogiate/assogiate-0.2.1.ebuild46
-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.xml5
-rw-r--r--gnome-extra/at-spi/at-spi-2.12.0.ebuild22
-rw-r--r--gnome-extra/at-spi/at-spi-2.14.0.ebuild22
-rw-r--r--gnome-extra/at-spi/metadata.xml5
-rw-r--r--gnome-extra/avant-window-navigator-extras/Manifest1
-rw-r--r--gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild106
-rw-r--r--gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch150
-rw-r--r--gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-libnotify-0.7.patch11
-rw-r--r--gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch22
-rw-r--r--gnome-extra/avant-window-navigator-extras/metadata.xml11
-rw-r--r--gnome-extra/avant-window-navigator/Manifest1
-rw-r--r--gnome-extra/avant-window-navigator/avant-window-navigator-0.4.2.ebuild77
-rw-r--r--gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch10
-rw-r--r--gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.2-Timeout.patch11
-rw-r--r--gnome-extra/avant-window-navigator/metadata.xml16
-rw-r--r--gnome-extra/cameramonitor/Manifest1
-rw-r--r--gnome-extra/cameramonitor/cameramonitor-0.3.2.ebuild51
-rw-r--r--gnome-extra/cameramonitor/metadata.xml17
-rw-r--r--gnome-extra/cinnamon-control-center/Manifest2
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild105
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild100
-rw-r--r--gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch93
-rw-r--r--gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch46
-rw-r--r--gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch99
-rw-r--r--gnome-extra/cinnamon-control-center/metadata.xml12
-rw-r--r--gnome-extra/cinnamon-desktop/Manifest3
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild62
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild81
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild81
-rw-r--r--gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override5
-rw-r--r--gnome-extra/cinnamon-desktop/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-menus/Manifest3
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild36
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild36
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild44
-rw-r--r--gnome-extra/cinnamon-menus/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-screensaver/Manifest3
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild79
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild107
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild106
-rw-r--r--gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch33
-rw-r--r--gnome-extra/cinnamon-screensaver/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-session/Manifest3
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild72
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild72
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild72
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch33
-rw-r--r--gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch50
-rw-r--r--gnome-extra/cinnamon-session/metadata.xml8
-rw-r--r--gnome-extra/cinnamon-settings-daemon/Manifest3
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild105
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild105
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild105
-rw-r--r--gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch82
-rw-r--r--gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch99
-rw-r--r--gnome-extra/cinnamon-settings-daemon/metadata.xml11
-rw-r--r--gnome-extra/cinnamon-translations/Manifest3
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild39
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild39
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild39
-rw-r--r--gnome-extra/cinnamon-translations/metadata.xml8
-rw-r--r--gnome-extra/cinnamon/Manifest3
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.4.7.ebuild252
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.6.8.ebuild256
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.6.9.ebuild258
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch44
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch26
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch43
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch89
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch70
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch88
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch73
-rw-r--r--gnome-extra/cinnamon/files/cinnamon-screensaver.desktop15
-rw-r--r--gnome-extra/cinnamon/files/cinnamon2d-screensaver.desktop15
-rw-r--r--gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop9
-rw-r--r--gnome-extra/cinnamon/metadata.xml8
-rw-r--r--gnome-extra/cjs/Manifest3
-rw-r--r--gnome-extra/cjs/cjs-2.4.2.ebuild75
-rw-r--r--gnome-extra/cjs/cjs-2.6.0.ebuild75
-rw-r--r--gnome-extra/cjs/cjs-2.6.1.ebuild75
-rw-r--r--gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch48
-rw-r--r--gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch40
-rw-r--r--gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch35
-rw-r--r--gnome-extra/cjs/metadata.xml8
-rw-r--r--gnome-extra/connman-gnome/Manifest1
-rw-r--r--gnome-extra/connman-gnome/connman-gnome-0.7.ebuild30
-rw-r--r--gnome-extra/connman-gnome/metadata.xml10
-rw-r--r--gnome-extra/docky/Manifest1
-rw-r--r--gnome-extra/docky/docky-2.2.0.ebuild44
-rw-r--r--gnome-extra/docky/metadata.xml12
-rw-r--r--gnome-extra/eiciel/Manifest2
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.8.2.ebuild35
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.9.ebuild35
-rw-r--r--gnome-extra/eiciel/metadata.xml5
-rw-r--r--gnome-extra/evolution-data-server/Manifest3
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild131
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild137
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild147
-rw-r--r--gnome-extra/evolution-data-server/files/calentry.schema108
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch108
-rw-r--r--gnome-extra/evolution-data-server/metadata.xml11
-rw-r--r--gnome-extra/evolution-ews/Manifest3
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.12.11.ebuild41
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild47
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild41
-rw-r--r--gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch25
-rw-r--r--gnome-extra/evolution-ews/metadata.xml5
-rw-r--r--gnome-extra/gconf-editor/Manifest1
-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.ebuild40
-rw-r--r--gnome-extra/gconf-editor/metadata.xml5
-rw-r--r--gnome-extra/gdesklets-core/Manifest1
-rwxr-xr-xgnome-extra/gdesklets-core/files/gdesklets-control-getid35
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch12
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch149
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch37
-rw-r--r--gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch14
-rw-r--r--gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild74
-rw-r--r--gnome-extra/gdesklets-core/metadata.xml11
-rw-r--r--gnome-extra/gnome-activity-journal/Manifest1
-rw-r--r--gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch15
-rw-r--r--gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild51
-rw-r--r--gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild51
-rw-r--r--gnome-extra/gnome-activity-journal/metadata.xml12
-rw-r--r--gnome-extra/gnome-boxes/Manifest2
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild107
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild108
-rw-r--r--gnome-extra/gnome-boxes/metadata.xml9
-rw-r--r--gnome-extra/gnome-builder/Manifest1
-rw-r--r--gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild59
-rw-r--r--gnome-extra/gnome-builder/metadata.xml5
-rw-r--r--gnome-extra/gnome-calculator/Manifest3
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild38
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild39
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild39
-rw-r--r--gnome-extra/gnome-calculator/metadata.xml5
-rw-r--r--gnome-extra/gnome-calendar/Manifest1
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild30
-rw-r--r--gnome-extra/gnome-calendar/metadata.xml5
-rw-r--r--gnome-extra/gnome-characters/Manifest1
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild42
-rw-r--r--gnome-extra/gnome-characters/metadata.xml5
-rw-r--r--gnome-extra/gnome-clocks/Manifest2
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.14.1.ebuild42
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild42
-rw-r--r--gnome-extra/gnome-clocks/metadata.xml5
-rw-r--r--gnome-extra/gnome-color-chooser/Manifest1
-rw-r--r--gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild50
-rw-r--r--gnome-extra/gnome-color-chooser/metadata.xml11
-rw-r--r--gnome-extra/gnome-color-manager/Manifest3
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild66
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild69
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild69
-rw-r--r--gnome-extra/gnome-color-manager/metadata.xml9
-rw-r--r--gnome-extra/gnome-commander/Manifest3
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.4.2.ebuild56
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.4.6.ebuild56
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.4.7.ebuild61
-rw-r--r--gnome-extra/gnome-commander/metadata.xml26
-rw-r--r--gnome-extra/gnome-contacts/Manifest2
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild65
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild70
-rw-r--r--gnome-extra/gnome-contacts/metadata.xml5
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/Manifest1
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.6.ebuild27
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/metadata.xml5
-rw-r--r--gnome-extra/gnome-do-plugins/Manifest1
-rw-r--r--gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild53
-rw-r--r--gnome-extra/gnome-do-plugins/metadata.xml13
-rw-r--r--gnome-extra/gnome-do/Manifest1
-rw-r--r--gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch17
-rw-r--r--gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch70
-rw-r--r--gnome-extra/gnome-do/files/gnome-do-0.8.4-mono-2.8.patch48
-rw-r--r--gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch16
-rw-r--r--gnome-extra/gnome-do/gnome-do-0.9.ebuild44
-rw-r--r--gnome-extra/gnome-do/metadata.xml19
-rw-r--r--gnome-extra/gnome-documents/Manifest3
-rw-r--r--gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch30
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.14.2.ebuild51
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.14.3.ebuild51
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild61
-rw-r--r--gnome-extra/gnome-documents/metadata.xml5
-rw-r--r--gnome-extra/gnome-dvb-daemon/Manifest1
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild74
-rw-r--r--gnome-extra/gnome-dvb-daemon/metadata.xml9
-rw-r--r--gnome-extra/gnome-getting-started-docs/Manifest2
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild27
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild27
-rw-r--r--gnome-extra/gnome-getting-started-docs/metadata.xml5
-rw-r--r--gnome-extra/gnome-integration-spotify/Manifest2
-rw-r--r--gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild45
-rw-r--r--gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild46
-rw-r--r--gnome-extra/gnome-integration-spotify/metadata.xml13
-rw-r--r--gnome-extra/gnome-logs/Manifest1
-rw-r--r--gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild33
-rw-r--r--gnome-extra/gnome-logs/metadata.xml5
-rw-r--r--gnome-extra/gnome-packagekit/Manifest1
-rw-r--r--gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild98
-rw-r--r--gnome-extra/gnome-packagekit/metadata.xml5
-rw-r--r--gnome-extra/gnome-power-manager/Manifest2
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild60
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild59
-rw-r--r--gnome-extra/gnome-power-manager/metadata.xml9
-rw-r--r--gnome-extra/gnome-search-tool/Manifest1
-rw-r--r--gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild43
-rw-r--r--gnome-extra/gnome-search-tool/metadata.xml5
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons/Manifest1
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-26.ebuild34
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons/metadata.xml5
-rw-r--r--gnome-extra/gnome-shell-extensions/Manifest3
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild79
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild79
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild79
-rw-r--r--gnome-extra/gnome-shell-extensions/metadata.xml5
-rw-r--r--gnome-extra/gnome-shell-frippery/Manifest2
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild39
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild39
-rw-r--r--gnome-extra/gnome-shell-frippery/metadata.xml5
-rw-r--r--gnome-extra/gnome-system-monitor/Manifest2
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild44
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild44
-rw-r--r--gnome-extra/gnome-system-monitor/metadata.xml9
-rw-r--r--gnome-extra/gnome-tweak-tool/Manifest3
-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/files/gnome-tweak-tool-3.8.1-wm-preferences.patch11
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild74
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild74
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild74
-rw-r--r--gnome-extra/gnome-tweak-tool/metadata.xml5
-rw-r--r--gnome-extra/gnome-user-docs/Manifest2
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild43
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild43
-rw-r--r--gnome-extra/gnome-user-docs/metadata.xml5
-rw-r--r--gnome-extra/gnome-user-share/Manifest1
-rw-r--r--gnome-extra/gnome-user-share/files/gnome-user-share-3.10.2-launch-obexd.patch29
-rw-r--r--gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild47
-rw-r--r--gnome-extra/gnome-user-share/metadata.xml6
-rw-r--r--gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild23
-rw-r--r--gnome-extra/gnome-utils/metadata.xml5
-rw-r--r--gnome-extra/gnome-weather/Manifest2
-rw-r--r--gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch59
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild34
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild38
-rw-r--r--gnome-extra/gnome-weather/metadata.xml5
-rw-r--r--gnome-extra/gnome-web-photo/Manifest1
-rw-r--r--gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild30
-rw-r--r--gnome-extra/gnome-web-photo/metadata.xml10
-rw-r--r--gnome-extra/gpointing-device-settings/Manifest1
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch30
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch26
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch22
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch35
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch201
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch107
-rw-r--r--gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch266
-rw-r--r--gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild55
-rw-r--r--gnome-extra/gpointing-device-settings/metadata.xml10
-rw-r--r--gnome-extra/gtkhtml/Manifest1
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild44
-rw-r--r--gnome-extra/gtkhtml/metadata.xml5
-rw-r--r--gnome-extra/gucharmap/Manifest4
-rw-r--r--gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch9
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild61
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.12.1.ebuild62
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.14.2.ebuild63
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.16.2.ebuild62
-rw-r--r--gnome-extra/gucharmap/metadata.xml8
-rw-r--r--gnome-extra/libgda/Manifest2
-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/libgda-5.2.2.ebuild154
-rw-r--r--gnome-extra/libgda/libgda-5.2.4.ebuild168
-rw-r--r--gnome-extra/libgda/metadata.xml16
-rw-r--r--gnome-extra/libgsf/Manifest3
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.30.ebuild40
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.32.ebuild40
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.33.ebuild40
-rw-r--r--gnome-extra/libgsf/metadata.xml8
-rw-r--r--gnome-extra/metadata.xml33
-rw-r--r--gnome-extra/mousetweaks/Manifest1
-rw-r--r--gnome-extra/mousetweaks/metadata.xml19
-rw-r--r--gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild31
-rw-r--r--gnome-extra/nautilus-actions/Manifest2
-rw-r--r--gnome-extra/nautilus-actions/metadata.xml5
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild59
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild59
-rw-r--r--gnome-extra/nautilus-dropbox/Manifest1
-rw-r--r--gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch13
-rw-r--r--gnome-extra/nautilus-dropbox/metadata.xml9
-rw-r--r--gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild85
-rw-r--r--gnome-extra/nautilus-sendto/Manifest2
-rw-r--r--gnome-extra/nautilus-sendto/metadata.xml6
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.1.ebuild29
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2.ebuild29
-rw-r--r--gnome-extra/nautilus-share/Manifest2
-rw-r--r--gnome-extra/nautilus-share/metadata.xml9
-rw-r--r--gnome-extra/nautilus-share/nautilus-share-0.7.3-r1.ebuild77
-rw-r--r--gnome-extra/nautilus-tracker-tags/Manifest3
-rw-r--r--gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile15
-rw-r--r--gnome-extra/nautilus-tracker-tags/metadata.xml5
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.5.ebuild41
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild41
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild41
-rw-r--r--gnome-extra/nemo/Manifest3
-rw-r--r--gnome-extra/nemo/metadata.xml15
-rw-r--r--gnome-extra/nemo/nemo-2.4.5.ebuild89
-rw-r--r--gnome-extra/nemo/nemo-2.6.5.ebuild89
-rw-r--r--gnome-extra/nemo/nemo-2.6.6.ebuild89
-rw-r--r--gnome-extra/nm-applet/Manifest5
-rw-r--r--gnome-extra/nm-applet/metadata.xml11
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild57
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.9.8.10-r1.ebuild58
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.0.0.ebuild54
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.0.2.ebuild55
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.0.4.ebuild55
-rw-r--r--gnome-extra/office-runner/Manifest1
-rw-r--r--gnome-extra/office-runner/metadata.xml10
-rw-r--r--gnome-extra/office-runner/office-runner-1.0.2.ebuild43
-rw-r--r--gnome-extra/polkit-gnome/Manifest1
-rw-r--r--gnome-extra/polkit-gnome/metadata.xml6
-rw-r--r--gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild45
-rw-r--r--gnome-extra/seahorse-nautilus/Manifest2
-rw-r--r--gnome-extra/seahorse-nautilus/metadata.xml5
-rw-r--r--gnome-extra/seahorse-nautilus/seahorse-nautilus-3.10.1.ebuild58
-rw-r--r--gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild56
-rw-r--r--gnome-extra/sushi/Manifest2
-rw-r--r--gnome-extra/sushi/metadata.xml9
-rw-r--r--gnome-extra/sushi/sushi-3.12.0.ebuild53
-rw-r--r--gnome-extra/sushi/sushi-3.16.0.ebuild52
-rw-r--r--gnome-extra/synapse/Manifest1
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-check-null-exec.patch16
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-fix-border-painting.patch74
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-fix-check-desktop.patch30
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-gnome-3.10.patch75
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-libgee-0.8.patch87
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.10-zeitgeist.patch12
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.8.2-underlinking.patch12
-rw-r--r--gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch12
-rw-r--r--gnome-extra/synapse/metadata.xml15
-rw-r--r--gnome-extra/synapse/synapse-0.2.10-r1.ebuild81
-rw-r--r--gnome-extra/synapse/synapse-0.2.10.ebuild83
-rw-r--r--gnome-extra/yelp-xsl/Manifest3
-rw-r--r--gnome-extra/yelp-xsl/metadata.xml5
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.12.0.ebuild27
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.14.0.ebuild27
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.16.1.ebuild27
-rw-r--r--gnome-extra/yelp/Manifest3
-rw-r--r--gnome-extra/yelp/files/yelp-3.0.3-man-compatibility.patch117
-rw-r--r--gnome-extra/yelp/files/yelp-3.16.0-man-compatibility.patch114
-rw-r--r--gnome-extra/yelp/metadata.xml5
-rw-r--r--gnome-extra/yelp/yelp-3.14.1.ebuild54
-rw-r--r--gnome-extra/yelp/yelp-3.14.2.ebuild53
-rw-r--r--gnome-extra/yelp/yelp-3.16.1.ebuild51
-rw-r--r--gnome-extra/zeitgeist-datahub/Manifest1
-rw-r--r--gnome-extra/zeitgeist-datahub/metadata.xml17
-rw-r--r--gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild51
-rw-r--r--gnome-extra/zeitgeist-datasources/Manifest1
-rw-r--r--gnome-extra/zeitgeist-datasources/metadata.xml28
-rw-r--r--gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild109
-rw-r--r--gnome-extra/zeitgeist-explorer/Manifest1
-rw-r--r--gnome-extra/zeitgeist-explorer/metadata.xml17
-rw-r--r--gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild29
-rw-r--r--gnome-extra/zeitgeist-extensions/Manifest1
-rw-r--r--gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-gobject.patch53
-rw-r--r--gnome-extra/zeitgeist-extensions/files/zeitgeist-extensions-0.0.13-python.patch17
-rw-r--r--gnome-extra/zeitgeist-extensions/metadata.xml23
-rw-r--r--gnome-extra/zeitgeist-extensions/zeitgeist-extensions-0.0.13-r2.ebuild71
-rw-r--r--gnome-extra/zeitgeist/Manifest2
-rw-r--r--gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch18
-rw-r--r--gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch29
-rw-r--r--gnome-extra/zeitgeist/files/zeitgeist-0.9.15-python-detection.patch38
-rw-r--r--gnome-extra/zeitgeist/metadata.xml25
-rw-r--r--gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild104
-rw-r--r--gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild99
-rw-r--r--gnome-extra/zenity/Manifest2
-rw-r--r--gnome-extra/zenity/metadata.xml5
-rw-r--r--gnome-extra/zenity/zenity-3.14.0.ebuild49
-rw-r--r--gnome-extra/zenity/zenity-3.16.3.ebuild50
395 files changed, 14766 insertions, 0 deletions
diff --git a/gnome-extra/activity-log-manager/Manifest b/gnome-extra/activity-log-manager/Manifest
new file mode 100644
index 00000000000..a221e896f55
--- /dev/null
+++ b/gnome-extra/activity-log-manager/Manifest
@@ -0,0 +1 @@
+DIST activity-log-manager-0.9.7.tar.xz 332004 SHA256 53014a08056168171579c210a8e5cfd949a0efe3bd23f6d38cd0ce0b0168841f SHA512 e0a43cae08e7f86b35ab8a4b0c70a4eb4a2ae821d3ab907a5c4135640e67c572ec2e735a3350099e3febe177d67db83af526c62b7b595894c0df08d84c3bb6ce WHIRLPOOL 7d92d5cb0fbc1b3353dab4164115e9e93efb4859a055ce9b9fffe3a580c49534e0b6e61c321ea7f896b7f166551c57bd3fd06a2692694a1c36e7554b0a014352
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
new file mode 100644
index 00000000000..04e1ea39d09
--- /dev/null
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions
+#VALA_MAX_API_VERSION="0.26" # build fails with vala-0.28
+WANT_AUTOMAKE=1.13
+
+inherit autotools eutils gnome2 vala versionator
+
+DESCRIPTION="GUI which lets you easily control what gets logged by Zeitgeist"
+HOMEPAGE="https://launchpad.net/activity-log-manager/"
+SRC_URI="http://launchpad.net/history-manager/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libgee:0
+ dev-libs/glib:2
+ gnome-extra/zeitgeist
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+src_prepare() {
+ DOCS="README NEWS INSTALL ChangeLog AUTHORS"
+
+ rm src/${PN}.c || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-0.9.0.1-gold.patch \
+ "${FILESDIR}"/${P}-gtk-icon_size.patch \
+ "${FILESDIR}"/${P}-ambiguous.patch
+ sed \
+ -e "/^almdocdir/s:=.*$:= \${prefix}/share/doc/${PF}:g" \
+ -i Makefile.am || die
+ vala_src_prepare
+ eautoreconf
+ gnome2_src_prepare
+}
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
new file mode 100644
index 00000000000..3bd0773f168
--- /dev/null
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions
+VALA_MAX_API_VERSION="0.26" # build fails with vala-0.28
+WANT_AUTOMAKE=1.13
+
+inherit autotools eutils gnome2 vala versionator
+
+DESCRIPTION="GUI which lets you easily control what gets logged by Zeitgeist"
+HOMEPAGE="https://launchpad.net/activity-log-manager/"
+SRC_URI="http://launchpad.net/history-manager/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libgee:0
+ dev-libs/glib:2
+ gnome-extra/zeitgeist
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ x11-libs/gtk+:3
+ x11-libs/pango"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ virtual/pkgconfig
+ dev-util/intltool
+ sys-devel/gettext"
+
+src_prepare() {
+ DOCS="README NEWS INSTALL ChangeLog AUTHORS"
+
+ rm src/${PN}.c || die
+
+ epatch \
+ "${FILESDIR}"/${PN}-0.9.0.1-gold.patch \
+ "${FILESDIR}"/${P}-gtk-icon_size.patch
+ sed \
+ -e "/^almdocdir/s:=.*$:= \${prefix}/share/doc/${PF}:g" \
+ -i Makefile.am || die
+ vala_src_prepare
+ eautoreconf
+ gnome2_src_prepare
+}
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch
new file mode 100644
index 00000000000..cffaf594feb
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.0.1-gold.patch
@@ -0,0 +1,16 @@
+ src/Makefile.am | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index eaf039f..05c1393 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -50,7 +50,7 @@ SHARED_LIBS = \
+ $(GEE_LIBS) \
+ $(GIO_UNIX_LIBS)
+ activity_log_manager_LDADD = \
+- $(SHARED_LIBS)
++ $(SHARED_LIBS) -lm
+ libactivity_log_manager_la_LIBADD = \
+ $(SHARED_LIBS) \
+ $(CCPANEL_LIBS)
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
new file mode 100644
index 00000000000..ba582aef897
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-ambiguous.patch
@@ -0,0 +1,139 @@
+ src/blacklist-dbus.vala | 4 ++--
+ src/security-widget.vala | 2 +-
+ src/unified-privacy-applications.vala | 16 ++++++++--------
+ src/unified-privacy.vala | 4 ++--
+ 4 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/blacklist-dbus.vala b/src/blacklist-dbus.vala
+index 355a684..fd165e3 100644
+--- a/src/blacklist-dbus.vala
++++ b/src/blacklist-dbus.vala
+@@ -137,7 +137,7 @@ namespace Alm {
+ return false;
+ }
+
+- public async void find_events (string id, TreeIter iter, ListStore store)
++ public async void find_events (string id, TreeIter iter, Gtk.ListStore store)
+ {
+ Event event = new Event();
+ event.manifestation = Zeitgeist.ZG.USER_ACTIVITY;
+@@ -165,7 +165,7 @@ namespace Alm {
+ store.set_value(iter, 5, counter);
+ }
+
+- public void get_count_for_app (string app_id, TreeIter iter, ListStore store) {
++ public void get_count_for_app (string app_id, TreeIter iter, Gtk.ListStore store) {
+ find_events(app_id, iter, store);
+ }
+
+diff --git a/src/security-widget.vala b/src/security-widget.vala
+index 4394924..e983c15 100644
+--- a/src/security-widget.vala
++++ b/src/security-widget.vala
+@@ -39,7 +39,7 @@ namespace Alm {
+
+ private void set_up_ui () {
+
+- var liststore_delay = new ListStore (2, typeof (string), typeof (int));
++ var liststore_delay = new Gtk.ListStore (2, typeof (string), typeof (int));
+ TreeIter iter;
+ liststore_delay.append (out iter);
+ liststore_delay.set (iter, 0, "1 second", 1, 0);
+diff --git a/src/unified-privacy-applications.vala b/src/unified-privacy-applications.vala
+index 9b06f44..a4966d3 100644
+--- a/src/unified-privacy-applications.vala
++++ b/src/unified-privacy-applications.vala
+@@ -60,7 +60,7 @@ namespace Alm {
+ }
+ }
+
+- public void get_count_for_app(string id, TreeIter iter, ListStore store) {
++ public void get_count_for_app(string id, TreeIter iter, Gtk.ListStore store) {
+ this.blacklist_interface.get_count_for_app(id, iter, store);
+ }
+
+@@ -131,7 +131,7 @@ namespace Alm {
+ private class ApplicationsTreeView : Gtk.Box {
+
+ private ApplicationBlacklist app_blacklist;
+- private ListStore store;
++ private Gtk.ListStore store;
+ private TreeView treeview;
+
+ HashTable<string, AppChooseInfo> blocked_apps;
+@@ -145,7 +145,7 @@ namespace Alm {
+ N_COLS
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return this.store;
+ }
+@@ -160,7 +160,7 @@ namespace Alm {
+ this.blocked_apps = blocked;
+ this.unblocked_apps = unblocked;
+
+- this.store = new ListStore (TreeViewCols.N_COLS,
++ this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ typeof (string),
+ typeof (Gdk.Pixbuf),
+ typeof (string));
+@@ -292,7 +292,7 @@ namespace Alm {
+ private class AppSelectionTreeView : Gtk.Box {
+
+ private ApplicationBlacklist app_blacklist;
+- private ListStore store;
++ private Gtk.ListStore store;
+ private TreeView treeview;
+
+ enum TreeViewCols
+@@ -312,7 +312,7 @@ namespace Alm {
+ }
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return store;
+ }
+@@ -323,7 +323,7 @@ namespace Alm {
+
+ this.app_blacklist = app_blacklist;
+
+- this.store = new ListStore (TreeViewCols.N_COLS,
++ this.store = new Gtk.ListStore (TreeViewCols.N_COLS,
+ typeof (string),
+ typeof (Gdk.Pixbuf),
+ typeof (string),
+@@ -426,7 +426,7 @@ namespace Alm {
+ }
+ }
+
+- public ListStore liststore {
++ public Gtk.ListStore liststore {
+ get {
+ return treeview.liststore;
+ }
+diff --git a/src/unified-privacy.vala b/src/unified-privacy.vala
+index 0d46370..c64f78d 100644
+--- a/src/unified-privacy.vala
++++ b/src/unified-privacy.vala
+@@ -55,7 +55,7 @@ namespace Alm {
+
+ //General stuffs
+ private TreeView exception_list;
+- private ListStore exception_list_store;
++ private Gtk.ListStore exception_list_store;
+
+ private Switch record_button;
+
+@@ -262,7 +262,7 @@ namespace Alm {
+ exception_vbox.pack_start (al2, false, false, 5);
+
+ // Exception TreeView
+- this.exception_list_store = new ListStore (4,
++ this.exception_list_store = new Gtk.ListStore (4,
+ typeof(string), // Full file path of application desktop file.
+ typeof(Gdk.Pixbuf?), // Pixbuf
+ typeof(string), // File basename or ApplicationName
diff --git a/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch
new file mode 100644
index 00000000000..07e082e269d
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/activity-log-manager-0.9.7-gtk-icon_size.patch
@@ -0,0 +1,13 @@
+=== modified file 'src/unified-privacy.vala'
+--- src/unified-privacy.vala 2014-11-10 06:31:32 +0000
++++ src/unified-privacy.vala 2014-11-10 19:34:43 +0000
+@@ -289,7 +289,7 @@
+ // Add/Remove buttons
+ var exception_toolbar = new Toolbar();
+ exception_toolbar.toolbar_style = ToolbarStyle.ICONS;
+- exception_toolbar.icon_size = 1;
++ exception_toolbar.icon_size = Gtk.IconSize.MENU;
+ exception_toolbar.icon_size_set = true;
+ exception_toolbar.visible = true;
+
+
diff --git a/gnome-extra/activity-log-manager/files/config.vapi b/gnome-extra/activity-log-manager/files/config.vapi
new file mode 100644
index 00000000000..9cd4f379291
--- /dev/null
+++ b/gnome-extra/activity-log-manager/files/config.vapi
@@ -0,0 +1,12 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Config {
+ public const string GETTEXT_PACKAGE;
+ public const string SPRITE_DIR;
+ public const string BACKGROUND_DIR;
+ public const string PACKAGE_DATA_DIR;
+ public const string PACKAGE_LOCALE_DIR;
+ public const string PACKAGE_NAME;
+ public const string PACKAGE_VERSION;
+ public const string VERSION;
+ public const string GNOMELOCALEDIR;
+}
diff --git a/gnome-extra/activity-log-manager/metadata.xml b/gnome-extra/activity-log-manager/metadata.xml
new file mode 100644
index 00000000000..9f2843cf0e6
--- /dev/null
+++ b/gnome-extra/activity-log-manager/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+Gnome Activity Journal (GAJ for friends) is your portal to the world of
+Zeitgeist. It's a user interface written in PyGTK ideated for easily
+browsing and finding files on your computer. It incorporates search,
+file preview, tag, bookmark and other useful features.
+</longdescription>
+ <upstream>
+ <remote-id type="launchpad">history-manager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
new file mode 100644
index 00000000000..3b2529feaeb
--- /dev/null
+++ b/gnome-extra/assogiate/Manifest
@@ -0,0 +1 @@
+DIST assogiate-0.2.1.tar.bz2 369446 SHA256 e5655af3a148f3446908ede69d47e005b2eadacbfe4e3d1a2b61d467ecac45ca SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac WHIRLPOOL c4ff6c9ffff041166164882a9bacff79d5cc1febab8a599212c84585a589daa333504f93d05e7d21abd391ad0f285887612b85d717ee56eeb9461f857d7037f3
diff --git a/gnome-extra/assogiate/assogiate-0.2.1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
new file mode 100644
index 00000000000..76b9d844e48
--- /dev/null
+++ b/gnome-extra/assogiate/assogiate-0.2.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit autotools gnome2 eutils
+
+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.8:2
+ >=dev-cpp/gtkmm-2.8:2.4
+ >=dev-cpp/libxmlpp-2.14
+ >=dev-cpp/gnome-vfsmm-2.6"
+DEPEND="${RDEPEND}
+ app-text/gnome-doc-utils
+ virtual/pkgconfig
+ dev-util/intltool"
+
+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
+}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
new file mode 100644
index 00000000000..3944938611d
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 00000000000..33d13bd067d
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 00000000000..0bcecc31e5a
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
@@ -0,0 +1,57 @@
+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
new file mode 100644
index 00000000000..188c69be7ca
--- /dev/null
+++ b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/assogiate/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/at-spi/at-spi-2.12.0.ebuild b/gnome-extra/at-spi/at-spi-2.12.0.ebuild
new file mode 100644
index 00000000000..3c360bdf8ff
--- /dev/null
+++ b/gnome-extra/at-spi/at-spi-2.12.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="The Gnome Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="2"
+KEYWORDS="amd64 arm ~hppa x86"
+IUSE=""
+
+RDEPEND="
+ >=app-accessibility/at-spi2-atk-${PV}:2
+ >=app-accessibility/at-spi2-core-${PV}:2
+ >=dev-python/pyatspi-${PV}
+ !<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND=""
diff --git a/gnome-extra/at-spi/at-spi-2.14.0.ebuild b/gnome-extra/at-spi/at-spi-2.14.0.ebuild
new file mode 100644
index 00000000000..a91f3c65f0f
--- /dev/null
+++ b/gnome-extra/at-spi/at-spi-2.14.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="The Gnome Accessibility Toolkit"
+HOMEPAGE="http://projects.gnome.org/accessibility/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="2"
+KEYWORDS="amd64 arm ~hppa x86"
+IUSE=""
+
+RDEPEND="
+ >=app-accessibility/at-spi2-atk-${PV}:2
+ >=app-accessibility/at-spi2-core-${PV}:2
+ >=dev-python/pyatspi-${PV}
+ !<gnome-extra/at-spi-1.32.0-r1
+"
+DEPEND=""
diff --git a/gnome-extra/at-spi/metadata.xml b/gnome-extra/at-spi/metadata.xml
new file mode 100644
index 00000000000..6949624e59d
--- /dev/null
+++ b/gnome-extra/at-spi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome-accessibility</herd>
+</pkgmetadata>
diff --git a/gnome-extra/avant-window-navigator-extras/Manifest b/gnome-extra/avant-window-navigator-extras/Manifest
new file mode 100644
index 00000000000..861afa14236
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/Manifest
@@ -0,0 +1 @@
+DIST awn-extras-0.4.0.tar.gz 3233697 SHA256 4ccb2bcfb944ed4dd0bf0d1f85c2c635de9549f141dcd923f5f8391e98d1efa5
diff --git a/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
new file mode 100644
index 00000000000..0b9f31e5218
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/avant-window-navigator-extras-0.4.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils gnome2 python
+
+DESCRIPTION="Applets for the Avant Window Navigator"
+HOMEPAGE="http://launchpad.net/awn-extras"
+SRC_URI="http://launchpad.net/awn-extras/0.4/${PV}/+download/awn-extras-${PV}.tar.gz"
+
+LICENSE="BSD CC-BY-SA-3.0 GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gconf gstreamer webkit"
+
+RDEPEND="dev-python/dbus-python
+ dev-python/feedparser
+ dev-python/gdata
+ dev-python/librsvg-python
+ dev-python/notify-python
+ dev-python/pycairo
+ dev-python/pygobject:2
+ dev-python/pygtk:2
+ dev-python/python-dateutil
+ dev-python/vobject
+ >=gnome-base/libgtop-2
+ >=gnome-extra/avant-window-navigator-${PV}[gconf?]
+ sys-apps/dbus
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libdesktop-agnostic
+ >=x11-libs/libnotify-0.7
+ >=x11-libs/libwnck-2.22:1
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXrender
+ x11-libs/vte:0
+ gconf? (
+ >=gnome-base/gconf-2
+ dev-python/gconf-python
+ )
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ dev-python/gst-python:0.10
+ )
+ webkit? ( net-libs/webkit-gtk:2 )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S=${WORKDIR}/awn-extras-${PV}
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+
+ if has_version gnome-extra/avant-window-navigator[vala]; then
+ export VALAC="$(type -P valac-0.10)"
+ export VALA_GEN_INTROSPECT="$(type -P vapigen-0.10)"
+ else
+ export VALAC=dIsAbLeVaLa
+ export VALA_GEN_INTROSPECT=dIsAbLeVaLa
+ fi
+
+ local sound=no
+ use gstreamer && sound=gstreamer
+
+ G2CONF="--disable-static
+ --enable-sound=${sound}
+ --disable-pymod-checks
+ $(use_enable gconf schemas-install)
+ $(use_with gconf)
+ --without-gnome
+ --without-mozilla
+ $(use_with webkit)"
+
+ DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-libnotify-0.7.patch \
+ "${FILESDIR}"/${P}-glib-2.31.patch \
+ "${FILESDIR}"/${P}-to-do.py.patch
+
+ >py-compile
+
+ gnome2_src_prepare
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ python_mod_optimize awn
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ python_mod_cleanup awn
+}
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch
new file mode 100644
index 00000000000..71c5bd9e50d
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-glib-2.31.patch
@@ -0,0 +1,150 @@
+--- applets/maintained/awnterm/keybinder.h
++++ applets/maintained/awnterm/keybinder.h
+@@ -24,7 +24,7 @@
+ #ifndef __AWN_KEY_BINDER_H__
+ #define __AWN_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- applets/maintained/notification-daemon/daemon.h
++++ applets/maintained/notification-daemon/daemon.h
+@@ -31,8 +31,6 @@
+
+ #include <libawn/awn-applet.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-cairo-utils.h>
+--- applets/maintained/notification-daemon/engines.c
++++ applets/maintained/notification-daemon/engines.c
+@@ -38,9 +38,6 @@
+
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+-
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+ #include <libawn/awn-cairo-utils.h>
+--- applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
++++ applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h
+@@ -25,7 +25,7 @@
+ //#include <libawn/awn-title.h>
+ #include <libawn/awn-tooltip.h>
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ #include <gconf/gconf-client.h>
+
+--- applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
++++ applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c
+@@ -43,8 +43,6 @@
+
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/cpu_component.c
++++ applets/unmaintained/awnsystemmonitor/cpu_component.c
+@@ -18,8 +18,6 @@
+ */
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/cpumetergconf.c
++++ applets/unmaintained/awnsystemmonitor/cpumetergconf.c
+@@ -20,13 +20,10 @@
+ * Boston, MA 02111-1307, USA.
+ */
+ #include <string.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include "cairo-utils.h"
+--- applets/unmaintained/awnsystemmonitor/dashboard.h
++++ applets/unmaintained/awnsystemmonitor/dashboard.h
+@@ -23,8 +23,6 @@
+
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/date_time_component.c
++++ applets/unmaintained/awnsystemmonitor/date_time_component.c
+@@ -19,8 +19,6 @@
+
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/loadavg_component.c
++++ applets/unmaintained/awnsystemmonitor/loadavg_component.c
+@@ -19,8 +19,6 @@
+
+ #include <glibtop/loadavg.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/sysmem_component.c
++++ applets/unmaintained/awnsystemmonitor/sysmem_component.c
+@@ -19,8 +19,6 @@
+
+ #include <glibtop/mem.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/awnsystemmonitor/uptime_component.c
++++ applets/unmaintained/awnsystemmonitor/uptime_component.c
+@@ -1,7 +1,5 @@
+
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+
+ #include <libawn/awn-dialog.h>
+--- applets/unmaintained/main-menu/applet.c
++++ applets/unmaintained/main-menu/applet.c
+@@ -23,8 +23,7 @@
+
+ #include <string.h>
+
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <libdesktop-agnostic/fdo.h>
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-libnotify-0.7.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-libnotify-0.7.patch
new file mode 100644
index 00000000000..5171adeea70
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-libnotify-0.7.patch
@@ -0,0 +1,11 @@
+--- applets/maintained/notification-daemon/daemon.c
++++ applets/maintained/notification-daemon/daemon.c
+@@ -1487,7 +1487,7 @@
+ if (fork() == 0)
+ {
+ notify_init("notify-send");
+- notify = notify_notification_new(summary, body, icon_str, NULL);
++ notify = notify_notification_new(summary, body, icon_str);
+ notify_notification_set_category(notify, type);
+ notify_notification_set_urgency(notify, urgency);
+ notify_notification_set_timeout(notify, expire_timeout);
diff --git a/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch
new file mode 100644
index 00000000000..0bd77d74bc4
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/files/avant-window-navigator-extras-0.4.0-to-do.py.patch
@@ -0,0 +1,22 @@
+/usr/bin/install: cannot create regular file ‘/var/tmp/portage/gnome-extra/avant-window-navigator-extras-0.4.0/image//usr/share/avant-window-navigator/applets/to-do/to-do.py’: File exists
+
+--- applets/maintained/to-do/Makefile.am
++++ applets/maintained/to-do/Makefile.am
+@@ -5,7 +5,6 @@
+ include $(top_srcdir)/Makefile.schemas
+
+ dist_applet_DATA = \
+- to-do.py \
+ settings.py \
+ icon.py \
+ prefs.py \
+--- applets/maintained/to-do/Makefile.in
++++ applets/maintained/to-do/Makefile.in
+@@ -327,7 +327,6 @@
+ @GCONF_SCHEMAS_INSTALL_TRUE@gconfschemasdir = @GCONF_SCHEMA_FILE_DIR@
+ @GCONF_SCHEMAS_INSTALL_TRUE@gconfschemas_DATA = $(schema_DATA:.schema-ini=.schemas)
+ dist_applet_DATA = \
+- to-do.py \
+ settings.py \
+ icon.py \
+ prefs.py \
diff --git a/gnome-extra/avant-window-navigator-extras/metadata.xml b/gnome-extra/avant-window-navigator-extras/metadata.xml
new file mode 100644
index 00000000000..407e733966a
--- /dev/null
+++ b/gnome-extra/avant-window-navigator-extras/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <use>
+ <flag name="gconf">Enable GConf as configuration backend</flag>
+ </use>
+ <herd>desktop-misc</herd>
+ <upstream>
+ <remote-id type="launchpad">awn-extras</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/avant-window-navigator/Manifest b/gnome-extra/avant-window-navigator/Manifest
new file mode 100644
index 00000000000..e210e4c28b4
--- /dev/null
+++ b/gnome-extra/avant-window-navigator/Manifest
@@ -0,0 +1 @@
+DIST avant-window-navigator-0.4.2.tar.gz 1452965 SHA256 f6876a39887e41c61c2c5ad132e592e61ea547250248b269a027cc39292a28e3 SHA512 fe7e2af6302242f1b3855dc3a0655c208b9cd60bd8c3a681a68476415335d75650651a3035dca0fda971932f8620faea3f290222b0b635c6cb6daa66915bcd37 WHIRLPOOL d15c600d32918c8b62f0a26edb0f3873fc90e85f42e15043ba0d3e44c65826589c64c7ecf9f76b832af248a0447f53b5078dd062e705b6b5c802e856deccac15
diff --git a/gnome-extra/avant-window-navigator/avant-window-navigator-0.4.2.ebuild b/gnome-extra/avant-window-navigator/avant-window-navigator-0.4.2.ebuild
new file mode 100644
index 00000000000..6bc9596875d
--- /dev/null
+++ b/gnome-extra/avant-window-navigator/avant-window-navigator-0.4.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+VALA_USE_DEPEND=vapigen
+
+inherit autotools eutils gnome2 python-single-r1 vala
+
+DESCRIPTION="A dock-like bar which sits at the bottom of the screen"
+HOMEPAGE="https://github.com/p12tic/awn"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +gconf"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/dbus-glib-0.80
+ >=dev-libs/glib-2.16
+ >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+ >=gnome-base/libgtop-2
+ >=x11-libs/gtk+-2.12:2
+ >=x11-libs/libdesktop-agnostic-0.3.9[gconf?]
+ >=x11-libs/libwnck-2.22:1
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/librsvg-python[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pyxdg[${PYTHON_USEDEP}]
+ dev-vcs/bzr
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXext
+ x11-libs/libXrender
+ gconf? ( >=gnome-base/gconf-2 )
+ "
+DEPEND="
+ ${RDEPEND}
+ $(vala_depend)
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xproto
+ dev-util/gtk-doc
+"
+
+S="${WORKDIR}/awn-${PV}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ G2CONF="--disable-static
+ --disable-pymod-checks
+ $(use_enable doc gtk-doc)
+ $(use_enable gconf schemas-install)
+ --disable-shave
+ --with-html-dir=/usr/share/doc/${PF}/html"
+
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.4.0-underlinking.patch
+ epatch "${FILESDIR}"/${PN}-0.4.2-Timeout.patch
+ eautoreconf
+
+ python_fix_shebang awn-settings/awnSettings{.py.in,Helper.py}
+
+ gnome2_src_prepare
+ vala_src_prepare
+}
diff --git a/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch
new file mode 100644
index 00000000000..c0ab1923083
--- /dev/null
+++ b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.0-underlinking.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -16,6 +16,7 @@
+ bin_PROGRAMS = avant-window-navigator
+
+ avant_window_navigator_LDADD = \
++ $(AWN_LIBS) \
+ $(DOCK_LIBS) \
+ $(top_builddir)/libawn/libawn.la \
+ $(NULL)
diff --git a/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.2-Timeout.patch b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.2-Timeout.patch
new file mode 100644
index 00000000000..19330174882
--- /dev/null
+++ b/gnome-extra/avant-window-navigator/files/avant-window-navigator-0.4.2-Timeout.patch
@@ -0,0 +1,11 @@
+--- a/applets/quick-prefs/applet.vala
++++ b/applets/quick-prefs/applet.vala
+@@ -288,7 +288,7 @@
+
+ if (this.timer_id == 0)
+ {
+- this.timer_id = Timeout.add (300, this.on_timer_tick);
++ this.timer_id = Gtk.Timeout.add (300, this.on_timer_tick);
+ }
+ if (this.autohide_cookie == 0)
+ {
diff --git a/gnome-extra/avant-window-navigator/metadata.xml b/gnome-extra/avant-window-navigator/metadata.xml
new file mode 100644
index 00000000000..eefc6380cd0
--- /dev/null
+++ b/gnome-extra/avant-window-navigator/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <use>
+ <flag name="gconf">Enable GConf as configuration backend</flag>
+ </use>
+ <herd>desktop-misc</herd>
+ <longdescription>
+ Avant Window Navigator (Awn) is a dock-like bar which sits at the
+ bottom of the screen. It has support for launchers, task lists, and
+ third party applets.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">p12tic/awn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cameramonitor/Manifest b/gnome-extra/cameramonitor/Manifest
new file mode 100644
index 00000000000..bf92df5afc4
--- /dev/null
+++ b/gnome-extra/cameramonitor/Manifest
@@ -0,0 +1 @@
+DIST cameramonitor-0.3.2.tar.bz2 216979 SHA256 04b120c8f3eb7f6c02976b0f3de21ecd13005c920e2acb294e3ffcad7fcd2058 SHA512 4e3d66f5829c111d524fe3cef5c9a330ee72e88c6c5dc3bbb528f10e81aa31682ab75a6fe7d4366ec63315341149d0472745917965bec2099590028327c75910 WHIRLPOOL 6ce61889e82aa0ad12f83ff99a8d497af83838fd1e206d7000cf2714793e0ed22ceeccf6b4089580f771db61a218be151640d0d7b46bbf7359d01a7f065cb7c7
diff --git a/gnome-extra/cameramonitor/cameramonitor-0.3.2.ebuild b/gnome-extra/cameramonitor/cameramonitor-0.3.2.ebuild
new file mode 100644
index 00000000000..842ab77edfb
--- /dev/null
+++ b/gnome-extra/cameramonitor/cameramonitor-0.3.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit gnome2 python autotools
+
+DESCRIPTION="Local Webcam monitoring in system tray"
+HOMEPAGE="https://launchpad.net/cameramonitor"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/gconf-python:2
+ dev-python/notify-python
+ dev-python/pyinotify
+ dev-python/dbus-python"
+
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_clean_py-compile_files
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ python_mod_optimize cameramonitor
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+ python_mod_cleanup cameramonitor
+}
diff --git a/gnome-extra/cameramonitor/metadata.xml b/gnome-extra/cameramonitor/metadata.xml
new file mode 100644
index 00000000000..90ea27a7ce6
--- /dev/null
+++ b/gnome-extra/cameramonitor/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>phobosk@fastmail.fm</email>
+ <name>PhobosK</name>
+ <description>Proxy maintainer. Assign bugs to him.</description>
+ </maintainer>
+ <longdescription>
+Camera Monitor is a little system tray icon that monitors your Webcam activity.
+It is designed for the GNOME desktop, but should work as well on KDE and Xfce.
+</longdescription>
+ <upstream>
+ <remote-id type="launchpad">cameramonitor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
new file mode 100644
index 00000000000..b2b4dc0096c
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -0,0 +1,2 @@
+DIST cinnamon-control-center-2.4.2.tar.gz 4305006 SHA256 7d25193a3cc13c12f22864f3c9a907acfaa616392cb2b7ab4e0624f0d200f188 SHA512 c3b4e5af84b7e6e01deaae51ed29e184158860c5effa2550b9d285902c2c35b690cb867ae747b437ed2ac2d0e75b0e6b36c97f9af3c5bf3f4621bdf304d5c253 WHIRLPOOL 41a32cb1c97f0fd3c57d67891c66082b66db6dc5a43737d50fdc6a17819c64d9b58ac2b679baa7f9bdd906643c02c161b4a72fd208b48561cdd43807a58f5621
+DIST cinnamon-control-center-2.6.0.tar.gz 4169903 SHA256 bbc39ac8ddcbc06b6aada1ef271f95f5f0d0fe439bec38b9cd847af420305c49 SHA512 ed383484b751a9d98de7f136c21c5eb6ce7cfe1418945bd0725aa9e9f08397eb78854b38db258434ed8895dbadd2ce29b5a423a9025dea17fb4876f8847ff125 WHIRLPOOL 7e6d3373e97116d5b531f4fcff85984050fd5d7ad343137b76e30089b3c6f4ff5409f68867289f3967a257a67cd04059f2aa02c48a4e0e4c29b43755d6f4cd84
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
new file mode 100644
index 00000000000..af72f34742b
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.4.2-r2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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 input_devices_wacom"
+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
+ >=media-libs/libcanberra-0.13[gtk3]
+ >=media-sound/pulseaudio-1.1[glib]
+ >=net-misc/modemmanager-0.7
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+ >=sys-auth/polkit-0.103
+ || ( >=sys-power/upower-0.9.1:= sys-power/upower-pm-utils )
+ >=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.8: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}
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ x11-themes/gnome-icon-theme
+ x11-themes/gnome-icon-theme-symbolic
+ 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-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ gnome-base/gnome-common
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+
+src_prepare() {
+ # make some panels optional
+ epatch "${FILESDIR}"/${PN}-2.2.5-optional.patch
+
+ # Fix NM version checking, bug #536850
+ epatch "${FILESDIR}"/${PN}-2.4.2-networkmanager-version.patch
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --enable-systemd doesn't do anything in $PN-2.2.5
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ --without-libsocialweb \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
new file mode 100644
index 00000000000..7b7384fb992
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.6.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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 input_devices_wacom"
+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
+ >=media-libs/libcanberra-0.13[gtk3]
+ >=media-sound/pulseaudio-1.1[glib]
+ >=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}
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ x11-themes/gnome-icon-theme
+ x11-themes/gnome-icon-theme-symbolic
+ 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-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ gnome-base/gnome-common
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+
+src_prepare() {
+ # make some panels optional
+ epatch "${FILESDIR}"/${PN}-2.6.0-optional.patch
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --enable-systemd doesn't do anything in $PN-2.2.5
+ gnome2_src_configure \
+ --disable-static \
+ --enable-documentation \
+ --without-libsocialweb \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable input_devices_wacom wacom)
+}
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
new file mode 100644
index 00000000000..e6a1f41c3ef
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
@@ -0,0 +1,93 @@
+diff --git a/configure.ac b/configure.ac
+index b900c53..0656e18 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
+ cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then
+ AC_SUBST(CUPS_LIBS)
+ fi
+
++build_color=false
++AC_ARG_ENABLE(color,
++ AC_HELP_STRING([--disable-color],
++ [disable color management panel]),
++ [case "${enableval}" in
++ yes) WANT_COLOR=yes ;;
++ no) WANT_COLOR=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++ esac],
++ [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
++ build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++ AC_HELP_STRING([--disable-wacom],
++ [disable wacom management panel]),
++ [case "${enableval}" in
++ yes) WANT_WACOM=yes ;;
++ no) WANT_WACOM=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++ esac],
++ [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++ PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+ cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+ cinnamon-desktop
+- gtk+-3.0 >= 3.8.0],
+- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++ gtk+-3.0 >= 3.8.0])
++ build_wacom="true"
++ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index ff8ea98..4a7fba7 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,7 +3,6 @@ NULL =
+ enabled_panels = \
+ common \
+ screen \
+- color \
+ display \
+ region \
+ universal-access \
+@@ -15,6 +14,12 @@ enabled_panels = \
+
+ disabled_panels = $(NULL)
+
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
new file mode 100644
index 00000000000..7c2078f1095
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.4.2-networkmanager-version.patch
@@ -0,0 +1,46 @@
+--- panels/network/cc-network-panel.c.old 2015-01-17 16:35:04.395520484 +0100
++++ panels/network/cc-network-panel.c 2015-01-17 16:36:11.706685966 +0100
+@@ -1311,30 +1311,18 @@
+ panel_check_network_manager_version (CcNetworkPanel *panel)
+ {
+ const gchar *version;
+- gchar **split = NULL;
+- guint major = 0;
+- guint micro = 0;
+- guint minor = 0;
+ gboolean ret = TRUE;
+
+ /* parse running version */
+ version = nm_client_get_version (panel->priv->client);
+- if (version != NULL) {
+- split = g_strsplit (version, ".", -1);
+- major = atoi (split[0]);
+- minor = atoi (split[1]);
+- micro = atoi (split[2]);
+- }
+
+- /* is it too new or old */
+- if (major > 0 || minor > 9 || (minor <= 8 && micro < 992)) {
++ if (version == NULL) {
+ ret = FALSE;
+
+ /* do modal dialog in idle so we don't block startup */
+ panel->priv->nm_warning_idle = g_idle_add ((GSourceFunc)display_version_warning_idle, panel);
+ }
+
+- g_strfreev (split);
+ return ret;
+ }
+
+@@ -1381,8 +1369,9 @@
+ {
+ gboolean ret;
+
+- /* is the user compiling against a new version, but running an
+- * old daemon version? */
++ /* is the user compiling against a new version, but not running
++ * the daemon? */
++
+ ret = panel_check_network_manager_version (panel);
+ if (ret) {
+ manager_running (panel->priv->client, NULL, panel);
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
new file mode 100644
index 00000000000..b76405c28da
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.6.0-optional.patch
@@ -0,0 +1,99 @@
+diff --git a/configure.ac b/configure.ac
+index 144bf78..a83e1eb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -121,7 +121,6 @@ PKG_CHECK_MODULES(DISPLAY_PANEL, $COMMON_MODULES cinnamon-desktop x11)
+ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
+@@ -197,15 +196,51 @@ if test x"$enable_cups" != x"no" ; then
+ AC_SUBST(CUPS_LIBS)
+ fi
+
++build_color=false
++AC_ARG_ENABLE(color,
++ AC_HELP_STRING([--disable-color],
++ [disable color management panel]),
++ [case "${enableval}" in
++ yes) WANT_COLOR=yes ;;
++ no) WANT_COLOR=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++ esac],
++ [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.14)
++ build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ build_wacom=false
+-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
++AC_ARG_ENABLE(wacom,
++ AC_HELP_STRING([--disable-wacom],
++ [disable wacom management panel]),
++ [case "${enableval}" in
++ yes) WANT_WACOM=yes ;;
++ no) WANT_WACOM=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++ esac],
++ [WANT_WACOM=yes]) dnl Default value
++
++if test x$WANT_WACOM = xyes; then
++ PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+ cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+ cinnamon-desktop
+- gtk+-3.0 >= 3.8.0],
+- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
+-
++ gtk+-3.0 >= 3.8.0])
++ build_wacom="true"
++ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
++fi
+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
++AC_SUBST(WACOM_PANEL_CFLAGS)
++AC_SUBST(WACOM_PANEL_LIBS)
+
+ # This is a hard-dependency for the region and user-accounts panels
+ PKG_CHECK_MODULES(ISOCODES, iso-codes)
+@@ -408,6 +443,13 @@ fi
+ #else
+ # AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
+ #fi
++
++if test "x$build_color" = "xtrue"; then
++ AC_MSG_NOTICE([** Colord support (Color management panel)])
++else
++ AC_MSG_NOTICE([ Colord support disabled])
++fi
++
+ if test "x$build_wacom" = "xtrue"; then
+ AC_MSG_NOTICE([** Wacom support (Wacom panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 76fbc88..466c2c6 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -18,6 +18,12 @@ else
+ disabled_panels += network
+ endif
+
++if BUILD_COLOR
++enabled_panels += color
++else
++disabled_panels += color
++endif
++
+ if BUILD_WACOM
+ enabled_panels += wacom
+ else
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
new file mode 100644
index 00000000000..1d34d2fb151
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <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/Manifest b/gnome-extra/cinnamon-desktop/Manifest
new file mode 100644
index 00000000000..9347c4221c4
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-desktop-2.4.2.tar.gz 524074 SHA256 62e2ff4fad405f8d4e7259dbeb2daf65c6f8b9995f2bb1e595a7cc0c2a7f9e0a SHA512 a36c26c262de72c8380c4d399129d610657a1d3ff3a45e688156c60f21957deb7fafb6deaafb442d85cb3ceea2e3c57dd59cb67588804a1e60607d6dbc7e6088 WHIRLPOOL a58cf18725c1f8dafd43495328f4727471ec09c7b851a031022befc10cce1cd12f05df14f59a1be4ffad6c6715d43f6b2b3a22bb1e1158976a898e1ee6b1512e
+DIST cinnamon-desktop-2.6.4.tar.gz 528598 SHA256 d40fc57202408476ff0bfa191958f16de07cf4c00d911bef57c3107c8e483970 SHA512 053cfad14a0ccd1dccb10128ba9c8b7199bb73794ddff83eb5565159acd8cb6f1c02df861a3757b78f03c47a7af1b4b47441ca486d24ff181f9687b1283e8437 WHIRLPOOL 639ac92935ceef2552f488280046cf9d548af9a3cdee66ec8a5784453b82a20445cd0c04636adebeb72198d1ef372d597985bcd9d52bc7cfc041152c1b969089
+DIST cinnamon-desktop-2.6.5.tar.gz 528817 SHA256 a004790f46d1960592f9462cbf6d394d9a5c66b31bb13cc295ed8acb1135924a SHA512 435542d6f5f58373e5bc7b8a613f06ffd4b7c3ec68e368620e66cc1527bceccd63ea5b79a3be3e29cc8ba14e53a6873740fd985c82a5b496141b5eed8297b30c WHIRLPOOL 7f441a120d6839f032eb0bb7fb43e5fafce2f9f1d5715f20ff82180826b5c58fa12401f62d122305ce5b34530406050ecf2335905dc74d8afa618c262764f03a
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
new file mode 100644
index 00000000000..bb0ee9f780f
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.4.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-any-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"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
+ >=x11-libs/gtk+-3.3.6: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 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.4
+ >=dev-util/intltool-0.40.6
+ gnome-base/gnome-common
+ x11-proto/randrproto
+ x11-proto/xproto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+
+ # Fix intltool unittest
+ echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
+
+ python_fix_shebang files
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
+
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection)
+}
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild
new file mode 100644
index 00000000000..318e399b436
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.4.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+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"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2
+ >=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 )
+
+ ${PYTHON_DEPS}
+"
+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-proto/randrproto
+ x11-proto/xproto
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+
+ # Fix intltool unittest
+ echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
+
+ python_fix_shebang files
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
+
+ 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/cinnamon-desktop-2.6.5.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild
new file mode 100644
index 00000000000..babfe557f86
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.6.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+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"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.3:2
+ >=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:= )
+
+ ${PYTHON_DEPS}
+"
+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-proto/randrproto
+ x11-proto/xproto
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ python_setup
+}
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+
+ # Fix intltool unittest
+ echo "schemas/org.cinnamon.desktop.keybindings.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.keybindings.media-keys.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.notifications.gschema.xml.in.in" >> po/POTFILES.in
+ echo "schemas/org.cinnamon.desktop.privacy.gschema.xml.in.in" >> po/POTFILES.in
+
+ python_fix_shebang files
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS README"
+
+ 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
new file mode 100644
index 00000000000..cf08f9ca2d2
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
@@ -0,0 +1,5 @@
+[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
new file mode 100644
index 00000000000..8cda79ca296
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
new file mode 100644
index 00000000000..548fb57b695
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-menus-2.4.1.tar.gz 518008 SHA256 7ab04bb668c80c3a1acccaa07f1b5d22023f397841735f4c4243c10cda717e5c SHA512 dc8504e822128c64b725b12515784c065cdb822f128ec661ece9a6867e80ccc7eabac49818e9984b31040f6e5592f607e3765da0f7b57509461b6c57a8621bc2 WHIRLPOOL 6533f1f28cba04515ef94130bdb276a654696c9a29c996a3f46ff50d1e460d759768a0003897e6806e3cfaad4235d007a642db7096e438aed0b97141567175ca
+DIST cinnamon-menus-2.4.2.tar.gz 518054 SHA256 6f3a2c64b47f3704d639213096ca44aee9a35ec8cd7d8d72fff52efc798928ed SHA512 d7c9ad185c7277441a41be4bdab82ee0e1c2fe1b402079dffc593a2bd0cc360995a5625170dd706fef7befd27e58a27cf2d1c4724091940a7009cbb68fee6025 WHIRLPOOL 6f0d081003c8ff828a28d0880f77818c57b92a4e964e4a11f19d1612968a5a215be5189f882cc825917037af8e817345a8577c62133561593c7cd1ac8569f33a
+DIST cinnamon-menus-2.6.0.tar.gz 208838 SHA256 8fe81ffe9818aa9412b4d89daf846f4c0c01f170838b121d4cba027a48068574 SHA512 2dc52e930bd597651aeb8f6c6c213241a9a7a75124bb86ee2d714a0268bb571df1739fa411edb15e1743744d0ec4c90711c22fd3967f28574c27d65f6ca3a00d WHIRLPOOL affc54689648d897edfa2a2a1d1a5c1580c6dfd079a9d7d28fef1d3762d800c19078e0b3ac9e9aee64935a83548e4c5db37ff5335b543bafae2f4e169babe8cd
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild
new file mode 100644
index 00000000000..2f8b6a98fdd
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit 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="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
new file mode 100644
index 00000000000..aae318d33b3
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.4.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit 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="+introspection"
+
+RDEPEND="
+ >=dev-libs/glib-2.29.15:2
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
new file mode 100644
index 00000000000..1da114d4678
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils 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="+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() {
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-static
+}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
new file mode 100644
index 00000000000..47ca5400d8f
--- /dev/null
+++ b/gnome-extra/cinnamon-menus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cinnamon-menus</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
new file mode 100644
index 00000000000..2d148bc3e94
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-screensaver-2.4.2.tar.gz 142557 SHA256 52afb2c9b5b00e1d026469c7f2b1865ca44c784b920e35bfcd61d2a75b87bbda SHA512 54131d1c8aab2abf31210031f0888e9913535ce2697e3310c6f86a9edefe832fc46b0340af792d88d97788aa65c15d210e703dc3b15d419f08f64352444ccc61 WHIRLPOOL 56f87bc6fdf5eba04cd68df9546d6451ba1d7c146903813b76e368e6a71f45a97814923cdfa5bba881d4e53761b3c711a51a139e38c09c3ecc29902aa3b9949d
+DIST cinnamon-screensaver-2.6.3.tar.gz 145989 SHA256 cef3e6ccbb77e91f7e4ef04115b45696c5b6070b8517a60c8782b1f0a67a348a SHA512 d18fac08f7a56e79629b1e78c7ea69bb14c8e906a56252d523bc1129e97f58a3f6a6dc9b9adc21b3e2fb8826783e74375abb50b5b14d35f178522eb5c6d7e509 WHIRLPOOL 4b534d363f04dbd7f3785e19c9ebd847f78b8263aadcf8f9e1ab80dc4183a866f8d269704ebe5bdb9c18b5f5dcd44b5908f5859d72d16f775e2d7d3052614b5b
+DIST cinnamon-screensaver-2.6.4.tar.gz 146059 SHA256 b5da1cd64ab20e52582088c1fa8ac79741b1a17cc018a8f370936d9707dbbbde SHA512 dca368928fc7edeaa83a36d2045926bd041e1a73815484be8ef37c758d75922ab54a196ebe075522e7363faa224547b94934b54019c417ba0da200c8ebf3b403 WHIRLPOOL c570c6803d8c8ce74a2d2143622bdfa0157b243f95e44ac84969c7426bbc6d0a8e7dad27fc9c0b61b1c750f4c37d5446f703d95ad1b93d55393b56266b868986
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild
new file mode 100644
index 00000000000..2fd988a37a3
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+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="doc pam systemd"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.25.6:2[dbus]
+ >=x11-libs/gtk+-2.99.3:3
+ >=gnome-extra/cinnamon-desktop-2.4:0=
+ >=gnome-base/gsettings-desktop-schemas-0.1.7
+ >=gnome-base/libgnomekbd-3.6
+ >=dev-libs/dbus-glib-0.71
+
+ 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/gnome-icon-theme-symbolic
+
+ pam? ( virtual/pam )
+ systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+ !~gnome-extra/cinnamon-1.8.8.1
+ !systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.35
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/randrproto
+ x11-proto/scrnsaverproto
+ x11-proto/xf86miscproto
+ doc? (
+ app-text/xmlto
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/docbook-xml-dtd:4.4 )
+"
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_enable doc docbook-docs) \
+ $(use_enable pam locking) \
+ $(use_with systemd) \
+ --with-mit-ext \
+ --with-pam-prefix=/etc \
+ --with-xf86gamma-ext \
+ --with-kbd-layout-indicator
+ # Do not use --without-console-kit, it would provide no benefit: there is
+ # no build-time or run-time check for consolekit, $PN merely listens to
+ # consolekit's messages over dbus.
+}
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
new file mode 100644
index 00000000000..3da50a3845d
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.3.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils 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="doc pam systemd"
+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:3[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/gnome-icon-theme-symbolic
+
+ ${PYTHON_DEPS}
+
+ pam? ( virtual/pam )
+ systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+ !~gnome-extra/cinnamon-1.8.8.1
+ !systemd? ( sys-auth/consolekit )
+
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.35
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/randrproto
+ x11-proto/scrnsaverproto
+ x11-proto/xf86miscproto
+ 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() {
+ epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+
+ # Fix xscreensaver paths for gentoo
+ sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \
+ -i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+ python_fix_shebang data/screensavers
+
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_enable doc docbook-docs) \
+ $(use_enable pam locking) \
+ $(use_enable systemd logind) \
+ --with-mit-ext \
+ --with-pam-prefix=/etc \
+ --with-xf86gamma-ext \
+ --with-kbd-layout-indicator
+ # Do not use --without-console-kit, it would provide no benefit: there is
+ # no build-time or run-time check for consolekit, $PN merely listens to
+ # consolekit's messages over dbus.
+}
+
+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/cinnamon-screensaver-2.6.4.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild
new file mode 100644
index 00000000000..9adc0c9dfb8
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.6.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils 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="doc pam systemd"
+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:3[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/gnome-icon-theme-symbolic
+
+ ${PYTHON_DEPS}
+
+ pam? ( virtual/pam )
+ systemd? ( >=sys-apps/systemd-31:0= )
+"
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
+RDEPEND="
+ !~gnome-extra/cinnamon-1.8.8.1
+ !systemd? ( sys-auth/consolekit )
+
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.35
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ x11-proto/xextproto
+ x11-proto/randrproto
+ x11-proto/scrnsaverproto
+ x11-proto/xf86miscproto
+ 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() {
+ epatch "${FILESDIR}"/${PN}-2.6.3-automagic-logind.patch
+
+ # Fix xscreensaver paths for gentoo
+ sed -e "s#/usr/lib/xscreensaver/#${EPREFIX}/usr$(get_libdir)/misc/xscreensaver/#" \
+ -i data/screensavers/xscreensaver@cinnamon.org/main || die
+
+ python_fix_shebang data/screensavers
+
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_configure \
+ $(use_enable doc docbook-docs) \
+ $(use_enable pam locking) \
+ $(use_enable systemd logind) \
+ --with-mit-ext \
+ --with-pam-prefix=/etc \
+ --with-xf86gamma-ext \
+ --with-kbd-layout-indicator
+ # Do not use --without-console-kit, it would provide no benefit: there is
+ # no build-time or run-time check for consolekit, $PN merely listens to
+ # consolekit's messages over dbus.
+}
+
+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/files/cinnamon-screensaver-2.6.3-automagic-logind.patch b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
new file mode 100644
index 00000000000..cc12685296c
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/files/cinnamon-screensaver-2.6.3-automagic-logind.patch
@@ -0,0 +1,33 @@
+From b382066324d2c42c3d5d04fbb21cf144c79daff0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 17:16:34 -0400
+Subject: [PATCH] Make logind check non-automagic
+
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c6c424c..0eae195 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -581,7 +581,15 @@ dnl ---------------------------------------------------------------------------
+ dnl logind support
+ dnl ---------------------------------------------------------------------------
+
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [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, [logind support])
+--
+2.4.3
+
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
new file mode 100644
index 00000000000..a5dc7d53ef2
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
new file mode 100644
index 00000000000..9da2f53c8ac
--- /dev/null
+++ b/gnome-extra/cinnamon-session/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-session-2.4.3.tar.gz 903363 SHA256 07afa992ae1c513b3a1e83a2fd29f83305f697dd45ba04121521ba8a7c005733 SHA512 318815e786f447237bceb08689eca5cf499c7fb0bd70b86c16f76af49e8f43c2a8c78e4caa96c0253a5e088702933ee53996286a8d4c2a68fa346832f12ec317 WHIRLPOOL 13e6c4d2e606484ad8fd290f195f9db4de6a9d09073b6bd8ae3c34af7786fee4aeff8a94e6aab03f5178c2721ec251d7fd2122fe1882002cfd4fdcf74c4624e8
+DIST cinnamon-session-2.6.2.tar.gz 610789 SHA256 42ea718b77240ff24061203bc03ba6af7d51bcba2323b0bb73a56870e232cb92 SHA512 93b2caab5164de470794947a63dbb05a21f47c10d14df81f7563fac404be11423a7083e8e2aae20f41e4f43ae29bbb1131b5b1c56e2b2cc37aff0686a6d0c450 WHIRLPOOL e37b101665b49a7710237e63bb12634dc059cf56ba37b196cf24f6e6a2af7d9d6055005b646cb916fbbb47133c97c8126da76e2cd6c9f7845a529c2331886162
+DIST cinnamon-session-2.6.3.tar.gz 612267 SHA256 391db79472cbd6c1546cec5e7e8e82f2a465fea92cda019fca14f7c54cfa4dc1 SHA512 91cf30dfd5fe7812c98d67233d54049ba11d04e142910f081a22bd48e2f0bbd0b4eeea4e66326628a0196c90164a146a2ef2ac61b26f289c17a0db8dbcc45a9b WHIRLPOOL f0841219624373c377e7f527b527682034d7b2519de105473395df87ab7aea3b130c5a45ad3141ca2fd4a1f523f3308b5af0e5409472e46131a6e68869134225
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
new file mode 100644
index 00000000000..9ebfeb69fc0
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.4.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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.76
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/json-glib-0.10
+ media-libs/libcanberra
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.90.7: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 )
+ !systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+ !systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+
+ gnome-base/gnome-common
+"
+# gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+ # make upower check non-automagic
+ epatch "${FILESDIR}/${PN}-2.2.0-automagic-upower.patch"
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS README README.md"
+
+ gnome2_src_configure \
+ --disable-gconf \
+ --disable-static \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6) \
+ $(use_enable systemd) \
+ $(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
new file mode 100644
index 00000000000..13d43b64fee
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.6.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 )
+ !systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-extra/cinnamon-desktop-2.6[systemd=]
+ !systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+
+ gnome-base/gnome-common
+"
+# gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+ # make upower and logind check non-automagic
+ epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch"
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS README README.md"
+
+ gnome2_src_configure \
+ --disable-gconf \
+ --disable-static \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6) \
+ $(use_enable systemd logind) \
+ $(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild
new file mode 100644
index 00000000000..13d43b64fee
--- /dev/null
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.6.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 )
+ !systemd? ( >=sys-power/upower-pm-utils-0.9.23 )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=gnome-extra/cinnamon-desktop-2.6[systemd=]
+ !systemd? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.6
+ virtual/pkgconfig
+ doc? ( app-text/xmlto )
+
+ gnome-base/gnome-common
+"
+# gnome-base/gnome-common for eautoreconf
+
+src_prepare() {
+ # make upower and logind check non-automagic
+ epatch "${FILESDIR}/${PN}-2.6.2-automagic.patch"
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS README README.md"
+
+ gnome2_src_configure \
+ --disable-gconf \
+ --disable-static \
+ $(use_enable doc docbook-docs) \
+ $(use_enable ipv6) \
+ $(use_enable systemd logind) \
+ $(usex systemd --disable-old-upower --enable-old-upower)
+}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
new file mode 100644
index 00000000000..76246802e22
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-2.2.0-automagic-upower.patch
@@ -0,0 +1,33 @@
+From 2f88efdaaefefabcc16d13f2ae63f57244de01ce Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 5 May 2014 22:34:14 -0400
+Subject: [PATCH] Make old upower check non-automagic
+
+---
+ configure.ac | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ec4ffac..a122872 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,7 +58,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION,
+
+ 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])
+ ])
+--
+1.9.2
+
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch
new file mode 100644
index 00000000000..48843728f4a
--- /dev/null
+++ b/gnome-extra/cinnamon-session/files/cinnamon-session-2.6.2-automagic.patch
@@ -0,0 +1,50 @@
+From 586c07b431e9b0e1f11a9017ee0b84dc9b8ec08a Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 5 May 2014 22:34:14 -0400
+Subject: [PATCH] Make logind and old upower check non-automagic
+
+---
+ configure.ac | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2f6fa7a..6e908cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,7 +56,15 @@ PKG_CHECK_MODULES(CINNAMON_SESSION,
+
+ 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,7 +104,15 @@ dnl ====================================================================
+ dnl Check for logind
+ dnl ====================================================================
+
+-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [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-login >= 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])
+--
+2.4.3
+
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
new file mode 100644
index 00000000000..8cf621dfc26
--- /dev/null
+++ b/gnome-extra/cinnamon-session/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cinnamon-session</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
new file mode 100644
index 00000000000..3a5736f9f30
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-settings-daemon-2.4.3.tar.gz 2998895 SHA256 1d3c47aad65f9c5064686352012cf1783e51440fa45f4ee030bb33ac66304fd2 SHA512 a70b04fbbddf735582043554c809f6dc098b58938b7245de8b1398ac4a38e9483f43e8b08ec7810d81cc3afabbad74045a1abfa6d2ed4e8b672f5df971e7c916 WHIRLPOOL 9416bd0af5f1bc27358768d46c6d51c25f49436825ac201b01c6986b80aebb78a91baaa79e72bc0577f818330bf19046e5f3dcdafb245779ddc47f3714d47eea
+DIST cinnamon-settings-daemon-2.6.2.tar.gz 2990964 SHA256 a97b85a2f9aafdc9c7c7facc97e422d7bc9531a920ac2e685fd82c56c01d8dec SHA512 72fc93ff27fc8b565349069a4713ac13f13dd600da64e9f35f35c9b2eb625afbc71bd5d1586653ad4f08cd3b65dbad9110aa21be24a6194eae40f367646608c9 WHIRLPOOL ed1d0a89465333c476e60cf9f49ef8e98e4dc2fcb65acc773fc662f06054f37d88407d04276b9d419ed017b5ed6af52731d97de4744a19b4c13af18df20b9fba
+DIST cinnamon-settings-daemon-2.6.3.tar.gz 2992102 SHA256 b71a515f9eed5efd35ef134f291a9dd9674d81026b23c85377493b53ec1cf0ae SHA512 ff6ec6be7a134414a525bd5dce6d90570800d0dbfc5f1641b02fbe17389bcf32d47832f5fcd736cdff8dfa09f129f998acd99d9358b1edf5315edb91c8b553ba WHIRLPOOL 9d2fb909fca23f7db2124e56e285e6c7623a9e7d710309f92894a2ab19b6a5a7e92b4e5c947e0cc74513eec30f7fa7bc7464997a1fdc3ff27ad19040579efdb0
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
new file mode 100644
index 00000000000..b19bf96237a
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.4.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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"
+
+# udev is non-optional since lots of plugins, not just gudev, pull it in
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ >=gnome-base/libgnomekbd-2.91.1
+ >=gnome-base/librsvg-2.36.2
+ >=gnome-extra/cinnamon-desktop-1.0:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ >=media-sound/pulseaudio-0.9.16:0=
+ sys-apps/dbus
+ >=sys-auth/polkit-0.97
+ || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-3.7.8: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:=
+
+ colord? ( >=x11-misc/colord-0.1.9:= )
+ 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/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2:2
+ >=dev-util/intltool-0.37.1
+ x11-proto/kbproto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # make colord and wacom optional
+ epatch "${FILESDIR}"/${PN}-2.4.3-optional.patch
+
+ # Disable broken test
+ sed -e '/g_test_add_func ("\/color\/edid/d' \
+ -i plugins/color/gcm-self-test.c || die
+
+ # Fix intltool unittest
+ cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog MAINTAINERS README"
+
+ # no point in disabling gudev since other plugins pull it in
+ gnome2_src_configure \
+ --disable-static \
+ --enable-gudev \
+ --enable-man \
+ --enable-polkit \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable systemd) \
+ $(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
new file mode 100644
index 00000000000..b3233736946
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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"
+
+# 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.6.3:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ >=media-sound/pulseaudio-0.9.16:0=
+ sys-apps/dbus
+ >=sys-auth/polkit-0.97
+ || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
+ 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:=
+
+ 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/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2:2
+ >=dev-util/intltool-0.37.1
+ x11-proto/kbproto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # make colord and wacom optional
+ epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
+
+ # Disable broken test
+ sed -e '/g_test_add_func ("\/color\/edid/d' \
+ -i plugins/color/gcm-self-test.c || die
+
+ # Fix intltool unittest
+ cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog MAINTAINERS README"
+
+ # no point in disabling gudev since other plugins pull it in
+ gnome2_src_configure \
+ --disable-static \
+ --enable-gudev \
+ --enable-man \
+ --enable-polkit \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable systemd logind) \
+ $(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
new file mode 100644
index 00000000000..b3233736946
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+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"
+
+# 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.6.3:0=
+ media-libs/fontconfig
+ >=media-libs/lcms-2.2:2
+ media-libs/libcanberra:0=[gtk3]
+ >=media-sound/pulseaudio-0.9.16:0=
+ sys-apps/dbus
+ >=sys-auth/polkit-0.97
+ || ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
+ 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:=
+
+ 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/consolekit:0= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxml2:2
+ >=dev-util/intltool-0.37.1
+ x11-proto/kbproto
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # make colord and wacom optional
+ epatch "${FILESDIR}"/${PN}-2.6.2-optional.patch
+
+ # Disable broken test
+ sed -e '/g_test_add_func ("\/color\/edid/d' \
+ -i plugins/color/gcm-self-test.c || die
+
+ # Fix intltool unittest
+ cat >>"${S}"/po/POTFILES.in <<EOF
+data/org.cinnamon.settings-daemon.peripherals.wacom.gschema.xml.in.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in
+data/org.cinnamon.settings-daemon.plugins.background.gschema.xml.in.in
+plugins/datetime/org.cinnamon.settingsdaemon.datetimemechanism.policy.in
+plugins/keyboard/csd-keyboard-xkb.c
+plugins/wacom/csd-wacom-device.c
+plugins/wacom/csd-wacom-osd-window.c
+plugins/wacom/org.cinnamon.settings-daemon.plugins.wacom.policy.in.in
+EOF
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog MAINTAINERS README"
+
+ # no point in disabling gudev since other plugins pull it in
+ gnome2_src_configure \
+ --disable-static \
+ --enable-gudev \
+ --enable-man \
+ --enable-polkit \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_enable systemd logind) \
+ $(use_enable input_devices_wacom wacom)
+}
+
+src_test() {
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
new file mode 100644
index 00000000000..894642781e6
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.4.3-optional.patch
@@ -0,0 +1,82 @@
+From 0bfad0d65540acc6598c694904cdb9f7032c952d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 5 May 2014 21:50:25 -0400
+Subject: [PATCH] Make colord and wacom support optional and non-automagic
+
+---
+ configure.ac | 20 +++++++++++++++++---
+ plugins/Makefile.am | 7 ++++++-
+ 2 files changed, 23 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a17530..e5a752c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,15 +260,28 @@ fi
+ dnl ---------------------------------------------------------------------------
+ dnl - color
+ dnl ---------------------------------------------------------------------------
++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.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++ build_color=true
++fi
+
+-PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
++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")
+
+@@ -604,6 +617,7 @@ echo "
+ LCMS DICT support: ${have_new_lcms}
+ Libnotify support: ${have_libnotify}
+
++ Colord support: ${build_color}
+ Wacom support: ${build_wacom}
+
+ Smartcard support: ${have_smartcard_support}
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index b9cb3a6..f37eec0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins = \
+ automount \
+ background \
+ clipboard \
+- color \
+ cursor \
+ dummy \
+ datetime \
+@@ -23,6 +22,12 @@ enabled_plugins = \
+
+ disabled_plugins = $(NULL)
+
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+--
+2.2.1
+
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
new file mode 100644
index 00000000000..e5abe075f5e
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-2.6.2-optional.patch
@@ -0,0 +1,99 @@
+From 884ce49f5bcdca37a30fef94d6649af012c88fee Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 18:03:09 -0400
+Subject: [PATCH] Make logind, colord, wacom optional and non-automagic
+
+---
+ configure.ac | 31 +++++++++++++++++++++++++++----
+ plugins/Makefile.am | 7 ++++++-
+ 2 files changed, 33 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ce79a6d..095a7a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -260,14 +260,28 @@ dnl ---------------------------------------------------------------------------
+ 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")
+
+@@ -373,7 +387,15 @@ dnl ====================================================================
+ dnl Check for logind
+ dnl ====================================================================
+
+-PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [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 +617,7 @@ echo "
+ LCMS DICT support: ${have_new_lcms}
+ Libnotify support: ${have_libnotify}
+
++ Colord support: ${build_color}
+ Wacom support: ${build_wacom}
+
+ Smartcard support: ${have_smartcard_support}
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index b9cb3a6..f37eec0 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins = \
+ automount \
+ background \
+ clipboard \
+- color \
+ cursor \
+ dummy \
+ datetime \
+@@ -23,6 +22,12 @@ enabled_plugins = \
+
+ disabled_plugins = $(NULL)
+
++if BUILD_COLOR
++enabled_plugins += color
++else
++disabled_plugins += color
++endif
++
+ if BUILD_WACOM
+ enabled_plugins += wacom
+ else
+--
+2.4.3
+
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
new file mode 100644
index 00000000000..427fb31d7e9
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <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/Manifest b/gnome-extra/cinnamon-translations/Manifest
new file mode 100644
index 00000000000..896b7c6360d
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-translations-2.4.4.tar.gz 6971880 SHA256 7e6f14dc98be622874ac5a50b45191a2147dda145bcd0f6f52ef56df0762c202 SHA512 43ed9877b41dcc224055bf04c66e87ffea6d7d841aaf46a5f6f2ec232b7e5d249b67c3bee4af3a8918fedf66a1be645d23d2b45a2160cbdefb777c8e3d64cc2c WHIRLPOOL f250b7016193fc9e5fe6f0d045adae3e007c3d5405a04f7a9a968a7a2d7452a88b5c08ac8780e3f7061549909a83505fb2c271e3256f1c02d5cd7efa770274c4
+DIST cinnamon-translations-2.6.1.tar.gz 7227837 SHA256 ed2c4a63a0193f770b0340a3281219a19e5e7102e287d533309f2f6de0dbf3c0 SHA512 949a49588dd3d6616c1ed9afa6dcfd0e3d941fbccde9cfa5065cc3d9df004a1670432854ad591dcffaf70cddaaf29218dd5a6861c1effa783dcfc081fcbbcd51 WHIRLPOOL 080dd6a18df9539ec865bf5461aebed2c3938c498d18ffe7c0a897ef128141805269a38880613725343592a28d72b31da527f3c970afd7feb12d7a1e67ea658f
+DIST cinnamon-translations-2.6.2.tar.gz 7309836 SHA256 8cbf6114a8b0b19ea0755f4527414661712b5d58fefa057593b4a05a2d1c1f03 SHA512 a9c1e109d1bc0e851f3424375acc4941ff866305b89fd66ea185cc8ba33acdecad056dd7160e9e8c80dddab0a4932927f5f12d9b13f060d5b74786886a46384d WHIRLPOOL 32166efe6522594768f212ec5a6caf1fc539113895c361e0b5b94d26b647fcbec9b2a284c4357d2806ac82561a20a817ffa1dd7af83b7a5a588025bcb1bca9de
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
new file mode 100644
index 00000000000..6ed65690553
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.4.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 fy ga gd gl gu he hi hr hu hy ia id 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 pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils 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_prepare() {
+ epatch_user
+}
+
+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-2.6.1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild
new file mode 100644
index 00000000000..ac03d3fd5b2
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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_AU en_CA en_GB en@shaw eo es es_AR et eu fa fi fil fo fr fr_CA fy ga gd gl gu he hi hr hu hy ia id 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 pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils 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_prepare() {
+ epatch_user
+}
+
+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-2.6.2.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild
new file mode 100644
index 00000000000..441beedb008
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 fy ga gd gl gu he hi hr hu hy ia id 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 pl ps pt pt_BR ro ru rue rw shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
+
+inherit eutils 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_prepare() {
+ epatch_user
+}
+
+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
new file mode 100644
index 00000000000..ab82430087f
--- /dev/null
+++ b/gnome-extra/cinnamon-translations/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cinnamon-translations</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
new file mode 100644
index 00000000000..644c5d4868c
--- /dev/null
+++ b/gnome-extra/cinnamon/Manifest
@@ -0,0 +1,3 @@
+DIST cinnamon-2.4.7.tar.gz 2812013 SHA256 d971c893d4617f482bad1d79b18cf14ccb3a2298f2381f1a64f1d72ee59cb40e SHA512 0450657804d5bd290177577a7059b494d7ef88bbfbec7b5a480cdc29894dd92d6f4e404d789009abcaad4c6adf279be991c5f8c3d300f70fec81acd57fb8700c WHIRLPOOL 43f31b2b83009321e3d7cd17a0570a2d83bed7fe0cef54966ff32c7075cf6e9181f96c5fd1725f540bb1cce00a6944f57b65bb77361995e527c85c74884e6a0d
+DIST cinnamon-2.6.8.tar.gz 2967957 SHA256 fe2e0e0a128711875a24c3511eff78e48ecd131db8f758781950784270af15a6 SHA512 687048660dbc7797dfa3fb6aeb6f58c334d1ae4c384d600031e74db661ce5edc8109dec5dfc7b643e0d52211e41723e22da725f7866a99949f0b3e07e0716c9e WHIRLPOOL 2dd103e0db3e80fddc94850936942d6ef13d3603f1fde4ad69fb554bb79f39bd7dbcb08bfd5c2f156f9da2802a43ee2c7c6169b0a68b6e8e269ed7774bb203dc
+DIST cinnamon-2.6.9.tar.gz 2968234 SHA256 9bed52d586480b888a414af6e306c2d8d6cf536aeb49e65304b8f3e2e422e756 SHA512 372492f9a9833ae3b7ba2b22d6c4cec8bb8c0a02282d1efe595e8a822a7064d7129b2a56f9df7dd4ec8f329bee3db22ffb41672752f5daa6811973d42cae150d WHIRLPOOL 83e04e781ac175f4ce885c84554d70d8322a613fac30735af3efb57e43afb8ffb757771cc153b4b1ae8070a219972d76f707ce2fe40b7714aee6854e9a0bdd0d
diff --git a/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
new file mode 100644
index 00000000000..6aff604ce3a
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.4.7.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-single-r1
+
+DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
+HOMEPAGE="http://cinnamon.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 bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND="
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.29.10: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-2.4:0=[introspection]
+ gnome-extra/cinnamon-menus[introspection]
+ >=gnome-extra/cjs-2.4
+ >=media-libs/clutter-1.7.5: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
+ media-sound/pulseaudio:0=[glib]
+ net-libs/libsoup:2.4[introspection]
+ >=sys-auth/polkit-0.100[introspection]
+ x11-libs/gdk-pixbuf:2[introspection]
+ >=x11-libs/gtk+-3.0.0:3[introspection]
+ x11-libs/pango[introspection]
+ >=x11-libs/startup-notification-0.11
+ x11-libs/libX11
+ >=x11-libs/libXfixes-5.0
+ >=x11-wm/muffin-2.4[introspection]
+ ${PYTHON_DEPS}
+ 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-2.4
+ >=gnome-extra/cinnamon-settings-daemon-2.4
+
+ >=sys-apps/accountsservice-0.6.14[introspection]
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-python/gconf-python:2[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyinotify[${PYTHON_USEDEP}]
+ dev-python/pypam[${PYTHON_USEDEP}]
+ virtual/python-imaging[${PYTHON_USEDEP}]
+
+ x11-themes/gnome-themes-standard[gtk]
+ x11-themes/gnome-icon-theme-symbolic
+
+ >=gnome-extra/nemo-2.4
+ >=gnome-extra/cinnamon-control-center-2.4
+ >=gnome-extra/cinnamon-screensaver-2.4
+
+ 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}
+ dev-python/polib[${PYTHON_USEDEP}]
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ 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-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Fix backgrounds path as cinnamon doesn't provide them
+ # https://github.com/linuxmint/Cinnamon/issues/3575
+ epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Optional NetworkManager, bug #488684
+ epatch "${FILESDIR}"/${PN}-2.4.5-optional-networkmanager.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ epatch "${FILESDIR}"/${PN}-2.4.5-set-wheel.patch
+
+ # Fix GNOME 3.14 support (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3577
+ epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.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
+
+ # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+ sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+ -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+ -i files/usr/lib/*/*.py \
+ -i files/usr/lib/*/*/*.py \
+ -i files/usr/bin/* || die "sed failed"
+ if [[ "$(get_libdir)" != lib ]]; then
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+ fi
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ epatch_user
+
+ python_fix_shebang .
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=536374
+ # https://github.com/linuxmint/Cinnamon/issues/3843
+ append-ldflags $(no-as-needed)
+
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --disable-rpath \
+ --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
+
+ if has_version "media-libs/mesa[video_cards_radeon]" ||
+ has_version "media-libs/mesa[video_cards_r300]" ||
+ has_version "media-libs/mesa[video_cards_r600]"; then
+ elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
+ elog "Make sure that gallium architecture for r300 and r600 drivers is"
+ elog "selected using 'eselect mesa'."
+ if ! has_version "media-libs/mesa[gallium]"; then
+ ewarn "You will need to emerge media-libs/mesa with USE=gallium."
+ fi
+ fi
+}
diff --git a/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
new file mode 100644
index 00000000000..5ac7b6b8cb4
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.6.8.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+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://cinnamon.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 bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python_targets_python2_7
+ || ( python_targets_python3_3 python_targets_python3_4 )
+ "
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.29.10: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-2.4:0=[introspection]
+ gnome-extra/cinnamon-menus[introspection]
+ >=gnome-extra/cjs-2.4
+ >=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
+ media-sound/pulseaudio:0=[glib]
+ 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-2.4[introspection]
+ ${PYTHON_DEPS}
+ 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-2.4
+ >=gnome-extra/cinnamon-settings-daemon-2.4
+
+ >=sys-apps/accountsservice-0.6.14[introspection]
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+
+ dev-python/dbus-python[python_targets_python2_7]
+ dev-python/gconf-python:2[python_targets_python2_7]
+ dev-python/lxml[python_targets_python2_7]
+ dev-python/pexpect[python_targets_python2_7]
+ dev-python/pycairo[python_targets_python2_7]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyinotify[python_targets_python2_7]
+ dev-python/pypam[python_targets_python2_7]
+ virtual/python-imaging[python_targets_python2_7]
+
+ x11-themes/gnome-themes-standard[gtk]
+ x11-themes/gnome-icon-theme-symbolic
+
+ >=gnome-extra/nemo-2.4
+ >=gnome-extra/cinnamon-control-center-2.4
+ >=gnome-extra/cinnamon-screensaver-2.4
+
+ 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}
+ dev-python/polib[python_targets_python2_7]
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ 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
+ epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Optional NetworkManager, bug #488684
+ epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
+
+ # Fix GNOME 3.14 support (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3577
+ epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.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
+
+ # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+ sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+ -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+ -i files/usr/lib/*/*.py \
+ -i files/usr/lib/*/*/*.py \
+ -i files/usr/bin/* || die "sed failed"
+ if [[ "$(get_libdir)" != lib ]]; then
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+ fi
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ epatch_user
+
+ # 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() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=536374
+ # https://github.com/linuxmint/Cinnamon/issues/3843
+ append-ldflags $(no-as-needed)
+
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --disable-rpath \
+ --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/cinnamon-2.6.9.ebuild b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
new file mode 100644
index 00000000000..19ddd139221
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-2.6.9.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+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://cinnamon.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 bug #511648
+IUSE="+nls +networkmanager" #+bluetooth
+
+# We need *both* python 2.7 and 3.x
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ python_targets_python2_7
+ || ( python_targets_python3_3 python_targets_python3_4 )
+ "
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-misc/ca-certificates
+ dev-libs/dbus-glib
+ >=dev-libs/glib-2.29.10: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-2.4:0=[introspection]
+ gnome-extra/cinnamon-menus[introspection]
+ >=gnome-extra/cjs-2.4
+ >=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
+ media-sound/pulseaudio:0=[glib]
+ 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-2.4[introspection]
+ ${PYTHON_DEPS}
+ 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-2.4
+ >=gnome-extra/cinnamon-settings-daemon-2.4
+
+ >=sys-apps/accountsservice-0.6.14[introspection]
+
+ >=app-accessibility/caribou-0.3
+
+ x11-misc/xdg-utils
+
+ dev-python/dbus-python[python_targets_python2_7]
+ dev-python/gconf-python:2[python_targets_python2_7]
+ dev-python/lxml[python_targets_python2_7]
+ dev-python/pexpect[python_targets_python2_7]
+ dev-python/pycairo[python_targets_python2_7]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pyinotify[python_targets_python2_7]
+ dev-python/pypam[python_targets_python2_7]
+ virtual/python-imaging[python_targets_python2_7]
+
+ x11-themes/gnome-themes-standard[gtk]
+ x11-themes/gnome-icon-theme-symbolic
+
+ >=gnome-extra/nemo-2.4
+ >=gnome-extra/cinnamon-control-center-2.4
+ >=gnome-extra/cinnamon-screensaver-2.4
+
+ 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}
+ dev-python/polib[python_targets_python2_7]
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+ 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
+ epatch "${FILESDIR}"/${PN}-2.4.5-background.patch
+
+ # Fix automagic gnome-bluetooth dep, bug #398145
+ epatch "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
+
+ # Optional NetworkManager, bug #488684
+ epatch "${FILESDIR}"/${PN}-2.6.7-optional-networkmanager.patch
+
+ # Use wheel group instead of sudo (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3576
+ epatch "${FILESDIR}"/${PN}-2.6.7-set-wheel.patch
+
+ # Fix GNOME 3.14 support (from Fedora/Arch)
+ # https://github.com/linuxmint/Cinnamon/issues/3577
+ epatch "${FILESDIR}"/${PN}-2.4.5-gnome-3.14.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
+
+ # Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
+ sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+ -e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
+ -i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
+ -i files/usr/lib/*/*.py \
+ -i files/usr/lib/*/*/*.py \
+ -i files/usr/bin/* || die "sed failed"
+ if [[ "$(get_libdir)" != lib ]]; then
+ mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
+ fi
+
+ if ! use networkmanager; then
+ rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
+ fi
+
+ epatch_user
+
+ # 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() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=536374
+ # https://github.com/linuxmint/Cinnamon/issues/3843
+ append-ldflags $(no-as-needed)
+
+ gnome2_src_configure \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --disable-rpath \
+ --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
new file mode 100644
index 00000000000..aa2e82bd13f
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
@@ -0,0 +1,44 @@
+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.4.5-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch
new file mode 100644
index 00000000000..7277fb26d27
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.4.5-background.patch
@@ -0,0 +1,26 @@
+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/lib/cinnamon-settings/modules/cs_backgrounds.py
++++ b/files/usr/lib/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-2.4.5-gnome-3.14.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch
new file mode 100644
index 00000000000..1af0e645679
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.4.5-gnome-3.14.patch
@@ -0,0 +1,43 @@
+From b048ad4144607cad258e4193235abeb3930ffcab Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:51:55 +0100
+Subject: [PATCH 5/5] Fix theme compatibility with Gnome 3.14
+
+from Fedora/Arch
+
+https://github.com/linuxmint/Cinnamon/issues/3577
+---
+ data/theme/cinnamon.css | 3 ++-
+ files/usr/lib/cinnamon-settings/modules/cs_themes.py | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/data/theme/cinnamon.css b/data/theme/cinnamon.css
+index 9539586..d931b86 100644
+--- a/data/theme/cinnamon.css
++++ b/data/theme/cinnamon.css
+@@ -1444,7 +1444,8 @@ StScrollBar StButton#vhandle:hover {
+ }
+ .applet-box:hover .applet-icon {
+ color: #fff;
+- icon-shadow: white 0px 0px 3px;
++/* Broken with GNOME 3.14 (icon-size is not honoured)
++ * icon-shadow: white 0px 0px 3px;*/
+ }
+
+ /* ===================================================================
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_themes.py b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+index 3002499..ab8b0b3 100644
+--- a/files/usr/lib/cinnamon-settings/modules/cs_themes.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_themes.py
+@@ -244,7 +244,7 @@ class Module:
+
+ def _load_icon_themes(self):
+ dirs = ("/usr/share/icons", os.path.join(os.path.expanduser("~"), ".icons"))
+- valid = walk_directories(dirs, lambda d: os.path.isdir(d) and not os.path.exists(os.path.join(d, "cursors")) and os.path.exists(os.path.join(d, "index.theme")))
++ valid = walk_directories(dirs, lambda d: os.path.isdir(d) and os.path.exists(os.path.join(d, "index.theme")))
+ valid.sort(lambda a,b: cmp(a.lower(), b.lower()))
+ res = []
+ for i in valid:
+--
+2.2.1
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch
new file mode 100644
index 00000000000..2fe3eff45d5
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.4.5-optional-networkmanager.patch
@@ -0,0 +1,89 @@
+From e89cbae294685195de51aca1e8e6cd400dc0822b Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 10 May 2014 15:14:05 -0400
+Subject: [PATCH 3/5] Make networkmanager dependency optional for Gentoo
+
+---
+ configure.ac | 36 ++++++++++++++++++++++++++++++++++--
+ js/misc/config.js.in | 2 ++
+ src/Makefile.am | 5 ++++-
+ 3 files changed, 40 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1977da8..920d256 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,8 +81,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+ clutter-x11-1.0 >= $CLUTTER_MIN_VERSION
+ libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+ gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+- polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+- libnm-glib libnm-util gnome-keyring-1)
++ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++ AS_HELP_STRING([--disable-networkmanager],
++ [disable NetworkManager support @<:@default=auto@:>@]),,
++ [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++ PKG_CHECK_MODULES(NETWORKMANAGER,
++ [libnm-glib libnm-util gnome-keyring-1],
++ [have_networkmanager=yes],
++ [have_networkmanager=no])
++
++ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
++ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
++else
++ have_networkmanager="no (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++ AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++ if test "x$enable_networkmanager" = "xyes"; then
++ AC_MSG_ERROR([Couldn't find NetworkManager.])
++ fi
++ AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
+ PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
+
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 704989b..df7e014 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* The system TLS CA list */
+ const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c0c6e7e..fc2dd14 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -286,7 +286,10 @@ libcinnamon_la_LIBADD = \
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
++if HAVE_NETWORKMANAGER
++Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+--
+2.2.1
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch
new file mode 100644
index 00000000000..db27d4cc27e
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.4.5-set-wheel.patch
@@ -0,0 +1,70 @@
+From 916b13aa2b86eb7e14f539293a0059a95c936393 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:50:13 +0100
+Subject: [PATCH 4/5] Use wheel group instead of sudo
+
+from Fedora/Arch
+
+https://github.com/linuxmint/Cinnamon/issues/3576
+---
+ .../cinnamon-settings-users/cinnamon-settings-users.py | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+index c4de658..d9062dc 100755
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -145,12 +145,11 @@ class EditableEntry (Gtk.Notebook):
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -216,12 +215,6 @@ class PasswordDialog(Gtk.Dialog):
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
+- mask = self.group_mask.get_text()
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
+
+@@ -516,7 +509,7 @@ class Module:
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+ user = model[treeiter][INDEX_USER_OBJECT]
+- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -753,11 +746,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:
+- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s,wheel" % (username, username))
+ else:
+- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s" % (username, username))
+ self.load_groups()
+ dialog.destroy()
+
+--
+2.2.1
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch
new file mode 100644
index 00000000000..6af4f8642f7
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.6.7-optional-networkmanager.patch
@@ -0,0 +1,88 @@
+From 3dbb6dc0b3dd08e6d5ae24fa079d9443c1b66ab9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 10 May 2014 15:14:05 -0400
+Subject: [PATCH] Make networkmanager dependency optional for Gentoo
+
+---
+ configure.ac | 35 ++++++++++++++++++++++++++++++++++-
+ js/misc/config.js.in | 2 ++
+ src/Makefile.am | 5 ++++-
+ 3 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b5668f4..5f600dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,7 +82,40 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION
+ libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_MIN_VERSION
+ gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+ polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes
+- libnm-glib libnm-util gnome-keyring-1 atk-bridge-2.0)
++ atk-bridge-2.0)
++
++##########################
++# Check for NetworkManager
++##########################
++NM_MIN_VERSION=0.9
++AC_ARG_ENABLE(networkmanager,
++ AS_HELP_STRING([--disable-networkmanager],
++ [disable NetworkManager support @<:@default=auto@:>@]),,
++ [enable_networkmanager=auto])
++
++if test "x$enable_networkmanager" != "xno"; then
++ PKG_CHECK_MODULES(NETWORKMANAGER,
++ [libnm-glib libnm-util gnome-keyring-1],
++ [have_networkmanager=yes],
++ [have_networkmanager=no])
++
++ CINNAMON_CFLAGS="$CINNAMON_CFLAGS $NETWORKMANAGER_CFLAGS"
++ CINNAMON_LIBS="$CINNAMON_LIBS $NETWORKMANAGER_LIBS"
++else
++ have_networkmanager="no (disabled)"
++fi
++
++if test "x$have_networkmanager" = "xyes"; then
++ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
++ AC_SUBST([HAVE_NETWORKMANAGER], [1])
++else
++ if test "x$enable_networkmanager" = "xyes"; then
++ AC_MSG_ERROR([Couldn't find NetworkManager.])
++ fi
++ AC_SUBST([HAVE_NETWORKMANAGER], [0])
++fi
++
++AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
+
+ PKG_CHECK_MODULES(CINNAMON_JS, gio-2.0 cjs-internals-1.0 >= $GJS_MIN_VERSION)
+
+diff --git a/js/misc/config.js.in b/js/misc/config.js.in
+index 704989b..df7e014 100644
+--- a/js/misc/config.js.in
++++ b/js/misc/config.js.in
+@@ -8,5 +8,7 @@ const PACKAGE_VERSION = '@PACKAGE_VERSION@';
+ const GJS_VERSION = '@GJS_VERSION@';
+ /* 1 if gnome-bluetooth is available, 0 otherwise */
+ const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
++/* 1 if networkmanager is available, 0 otherwise */
++const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+ /* The system TLS CA list */
+ const CINNAMON_SYSTEM_CA_FILE = '@CINNAMON_SYSTEM_CA_FILE@';
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0b0a4a9..cf3a606 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -290,7 +290,10 @@ libcinnamon_la_LIBADD = \
+ libcinnamon_la_CPPFLAGS = $(cinnamon_cflags)
+
+ Cinnamon-0.1.gir: libcinnamon.la St-1.0.gir
+-Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0 NetworkManager-1.0 NMClient-1.0
++Cinnamon_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-Muffin.0 Soup-2.4 CMenu-3.0
++if HAVE_NETWORKMANAGER
++Cinnamon_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
++endif
+ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_la_CPPFLAGS) -I $(srcdir)
+ Cinnamon_0_1_gir_LIBS = libcinnamon.la
+ Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
+--
+2.4.3
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch b/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch
new file mode 100644
index 00000000000..386f815959b
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-2.6.7-set-wheel.patch
@@ -0,0 +1,73 @@
+From 387df8aa7c950ab546a52edb36b39db5252dcd1e Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 11 Jan 2015 20:50:13 +0100
+Subject: [PATCH] Use wheel group instead of sudo
+
+from Fedora/Arch
+
+https://github.com/linuxmint/Cinnamon/issues/3576
+---
+ .../cinnamon-settings-users.py | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+index 6fa9374..364c155 100755
+--- a/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
++++ b/files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py
+@@ -146,12 +146,11 @@ class EditableEntry (Gtk.Notebook):
+
+ class PasswordDialog(Gtk.Dialog):
+
+- def __init__ (self, user, password_mask, group_mask):
++ def __init__ (self, user, password_mask):
+ super(PasswordDialog, self).__init__()
+
+ self.user = user
+ self.password_mask = password_mask
+- self.group_mask = group_mask
+
+ self.set_modal(True)
+ self.set_skip_taskbar_hint(True)
+@@ -217,14 +216,7 @@ class PasswordDialog(Gtk.Dialog):
+ def change_password(self):
+ newpass = self.new_password.get_text()
+ self.user.set_password(newpass, "")
+- mask = self.group_mask.get_text()
+- if "nopasswdlogin" in mask:
+- os.system("gpasswd -d '%s' nopasswdlogin" % self.user.get_user_name())
+- mask = mask.split(", ")
+- mask.remove("nopasswdlogin")
+- mask = ", ".join(mask)
+- self.group_mask.set_text(mask)
+- self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
++ self.password_mask.set_text(u'\u2022\u2022\u2022\u2022\u2022\u2022')
+ self.destroy()
+
+ def set_passwords_visibility(self):
+@@ -522,7 +514,7 @@ class Module:
+ model, treeiter = self.users_treeview.get_selection().get_selected()
+ if treeiter != None:
+ user = model[treeiter][INDEX_USER_OBJECT]
+- dialog = PasswordDialog(user, self.password_mask, self.groups_label)
++ dialog = PasswordDialog(user, self.password_mask)
+ response = dialog.run()
+
+ def _on_groups_button_clicked(self, widget):
+@@ -766,11 +758,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:
+- os.system("usermod %s -G %s,sudo,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s,wheel" % (username, username))
+ else:
+- os.system("usermod %s -G %s,nopasswdlogin" % (username, username))
++ os.system("usermod %s -G %s" % (username, username))
+ self.load_groups()
+ dialog.destroy()
+
+--
+2.4.3
+
diff --git a/gnome-extra/cinnamon/files/cinnamon-screensaver.desktop b/gnome-extra/cinnamon/files/cinnamon-screensaver.desktop
new file mode 100644
index 00000000000..ddc96869132
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
diff --git a/gnome-extra/cinnamon/files/cinnamon2d-screensaver.desktop b/gnome-extra/cinnamon/files/cinnamon2d-screensaver.desktop
new file mode 100644
index 00000000000..aed9557bff0
--- /dev/null
+++ b/gnome-extra/cinnamon/files/cinnamon2d-screensaver.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Type=Application
+Name=Cinnamon2d Screensaver
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+OnlyShowIn=GNOME;
+AutostartCondition=GNOME3 if-session cinnamon2d
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=3.6.0
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
new file mode 100644
index 00000000000..24e14f267e2
--- /dev/null
+++ b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
@@ -0,0 +1,9 @@
+[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
new file mode 100644
index 00000000000..3d2ab0c9802
--- /dev/null
+++ b/gnome-extra/cinnamon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/Cinnamon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
new file mode 100644
index 00000000000..2dab1c2c39d
--- /dev/null
+++ b/gnome-extra/cjs/Manifest
@@ -0,0 +1,3 @@
+DIST cjs-2.4.2.tar.gz 324509 SHA256 1310a2bfdebd6a50a09718abf3627daab097233781757509121257445e0423e3 SHA512 95c46808120392f4c9d74d5d94ee030be1b3a8a36ddabbd12560ea0ed16ac6bdeb78016a09eec315536ee094109c6f6fe07ee624300bd1eae88fdbdefbed0565 WHIRLPOOL e0dca618e2d166ee29ebc303d162dd7cd37c8d5381d68fd1c5824aba173cd651ab9825437f2096aede2be667bcd9633a21acd3bdee9002fee1d2f350cc454730
+DIST cjs-2.6.0.tar.gz 324623 SHA256 bb65b7238eabb265de256d6de0a183018a4ec28b7d161d439a809875ca6e2927 SHA512 49d920a81965575aa1ea9777dd1b41911cd61bc3b29ecb87d1c1923cf3a5d43520a9b036bfca006539be27ea7c83c1c9ddea7beafaf470d255322dad0bd170ec WHIRLPOOL 197199f4c5d53c0a6c77d411b0c3fce93cef81a4dd91b84387e0402b2b7d7e51e273c449a05cf39c1491c20b911847682e3d8dbe2c2549c4bf738e477d10b51b
+DIST cjs-2.6.1.tar.gz 324886 SHA256 1b431ccacfc6dac5f393ff6807dac69751eb943488422b7e26554f164a0e4309 SHA512 1c382a590def70f2d0ed554c5a345f3094d06ae4999aeb6b836d2867f947aeb5f60b222e4c139d89bdba0e855e6e844f80f4d0b08e3921e84c2e214e9d371a61 WHIRLPOOL 1cded0ba6da3baba6484785080cff9e08db5529e3f2a5c0a740e5f1a06b0c1e89b299f686c931724412ebdb0eb9dee509e517da5fad403eab5c4c043afabec84
diff --git a/gnome-extra/cjs/cjs-2.4.2.ebuild b/gnome-extra/cjs/cjs-2.4.2.ebuild
new file mode 100644
index 00000000000..b492980b796
--- /dev/null
+++ b/gnome-extra/cjs/cjs-2.4.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils 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:24
+ >=dev-libs/glib-2.36: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 )
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+ !<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+ # Disable broken unittests
+ epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+ # XXX: Do NOT enable coverage, completely useless for portage installs
+ gnome2_src_configure \
+ --disable-systemtap \
+ --disable-dtrace \
+ --disable-coverage \
+ $(use_with cairo) \
+ $(use_with gtk)
+}
+
+src_test() {
+ Xemake 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/cjs-2.6.0.ebuild b/gnome-extra/cjs/cjs-2.6.0.ebuild
new file mode 100644
index 00000000000..7f766c8bd95
--- /dev/null
+++ b/gnome-extra/cjs/cjs-2.6.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils 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:24
+ >=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 )
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+ !<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+ # Disable broken unittests
+ epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+ # XXX: Do NOT enable coverage, completely useless for portage installs
+ gnome2_src_configure \
+ --disable-systemtap \
+ --disable-dtrace \
+ --disable-coverage \
+ $(use_with cairo) \
+ $(use_with gtk)
+}
+
+src_test() {
+ Xemake 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/cjs-2.6.1.ebuild b/gnome-extra/cjs/cjs-2.6.1.ebuild
new file mode 100644
index 00000000000..7f766c8bd95
--- /dev/null
+++ b/gnome-extra/cjs/cjs-2.6.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils 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:24
+ >=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 )
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+ !<gnome-extra/cinnamon-2.4
+"
+
+src_prepare() {
+ # Disable broken unittests
+ epatch "${FILESDIR}"/${PN}-2.4.0-disable-unittest-*.patch
+
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # FIXME: add systemtap/dtrace support, like in glib:2
+ # FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
+ # XXX: Do NOT enable coverage, completely useless for portage installs
+ gnome2_src_configure \
+ --disable-systemtap \
+ --disable-dtrace \
+ --disable-coverage \
+ $(use_with cairo) \
+ $(use_with gtk)
+}
+
+src_test() {
+ Xemake 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-2.4.0-disable-unittest-1.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
new file mode 100644
index 00000000000..5afd8929369
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-1.patch
@@ -0,0 +1,48 @@
+From 554c220e78172213e9637f9a901009b4bc964e3a Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Wed, 15 Jan 2014 17:00:22 -0500
+Subject: [PATCH] gjs-tests: Remove dumpstack test
+
+OK, I lied. This is the most useless test ever.
+---
+ test/gjs-tests.cpp | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index b79b616..6cade7b 100644
+--- a/test/gs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -163,22 +163,6 @@ gjstest_test_func_gjs_jsapi_util_string_js_string_utf8(void)
+ }
+
+ static void
+-gjstest_test_func_gjs_stack_dump(void)
+-{
+- GjsContext *context;
+-
+- /* TODO this test could be better - maybe expose dumpstack as a JS API
+- * so that we have a JS stack to dump? At least here we're getting some
+- * coverage.
+- */
+- context = gjs_context_new();
+-
+- gjs_dumpstack();
+- g_object_unref(context);
+- gjs_dumpstack();
+-}
+-
+-static void
+ gjstest_test_func_gjs_jsapi_util_error_throw(void)
+ {
+ GjsUnitTestFixture fixture;
+@@ -348,7 +332,6 @@ main(int argc,
+ g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+ g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+ g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+- g_test_add_func("/gjs/stack/dump", gjstest_test_func_gjs_stack_dump);
+ g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+ g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+
+--
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
new file mode 100644
index 00000000000..2490a63fea9
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-2.patch
@@ -0,0 +1,40 @@
+From 4ea9fda3f323355d10e946d19d817fe8c4e6b533 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:11 +0200
+Subject: [PATCH 1/2] Comment broken unittests
+
+---
+ test/gjs-tests.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp
+index 6cade7b..4d6c61e 100644
+--- a/test/gjs-tests.cpp
++++ b/test/gjs-tests.cpp
+@@ -324,18 +324,18 @@ main(int argc,
+
+ g_test_init(&argc, &argv, NULL);
+
+- g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy);
++ /* g_test_add_func("/gjs/context/construct/destroy", gjstest_test_func_gjs_context_construct_destroy); */
+ g_test_add_func("/gjs/context/construct/eval", gjstest_test_func_gjs_context_construct_eval);
+- g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array);
+- g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw);
+- g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8);
++ /* g_test_add_func("/gjs/jsapi/util/array", gjstest_test_func_gjs_jsapi_util_array); */
++ /* g_test_add_func("/gjs/jsapi/util/error/throw", gjstest_test_func_gjs_jsapi_util_error_throw); */
++ /* g_test_add_func("/gjs/jsapi/util/string/js/string/utf8", gjstest_test_func_gjs_jsapi_util_string_js_string_utf8); */
+ g_test_add_func("/gjs/jsutil/strip_shebang/no_shebang", gjstest_test_strip_shebang_no_advance_for_no_shebang);
+ g_test_add_func("/gjs/jsutil/strip_shebang/have_shebang", gjstest_test_strip_shebang_advance_for_shebang);
+ g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_return_null_for_just_shebang);
+ g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null);
+ g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers);
+
+- gjs_test_add_tests_for_coverage ();
++ /* gjs_test_add_tests_for_coverage (); */
+
+ g_test_run();
+
+--
+2.1.2
+
diff --git a/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
new file mode 100644
index 00000000000..7b2898b75cf
--- /dev/null
+++ b/gnome-extra/cjs/files/cjs-2.4.0-disable-unittest-3.patch
@@ -0,0 +1,35 @@
+From da18a2676477138693e893d3245316f987d74497 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 12 Oct 2014 21:57:45 +0200
+Subject: [PATCH 2/2] Comment broken JS unittest
+
+---
+ installed-tests/js/testLocale.js | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/installed-tests/js/testLocale.js b/installed-tests/js/testLocale.js
+index b086a66..0c5abb1 100644
+--- a/installed-tests/js/testLocale.js
++++ b/installed-tests/js/testLocale.js
+@@ -1,14 +1,14 @@
+ // tests for JS_SetLocaleCallbacks().
+ const JSUnit = imports.jsUnit;
+
+-function testToLocaleDateString() {
+- let date = new Date();
++//function testToLocaleDateString() {
++ //let date = new Date();
+ // %A is the weekday name, this tests locale_to_unicode
+ // we're basically just testing for a non-crash, since
+ // we'd have to run in a specific locale to have any
+ // idea about the result.
+- date.toLocaleDateString("%A");
+-}
++ //date.toLocaleDateString("%A");
++//}
+
+ function testToLocaleLowerCase() {
+ JSUnit.assertEquals("aaa", "AAA".toLocaleLowerCase());
+--
+2.1.2
+
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
new file mode 100644
index 00000000000..72406f13266
--- /dev/null
+++ b/gnome-extra/cjs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <upstream>
+ <remote-id type="github">linuxmint/cjs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/connman-gnome/Manifest b/gnome-extra/connman-gnome/Manifest
new file mode 100644
index 00000000000..911d5bdf400
--- /dev/null
+++ b/gnome-extra/connman-gnome/Manifest
@@ -0,0 +1 @@
+DIST connman-gnome-0.7.tar.gz 98682 SHA256 d05d3c850667ec0881a0fa36975b53c8ad86a6860a15f95fca465de9096a887c SHA512 90bd42162e8735702dfb21b9e19b4bcc46000cc713e13c11f9a4769d789b42ddecfea3fb9f9fe5d7625c70a6243460e177a6be79319c272b2e9fe916754fc12a WHIRLPOOL 3790de959bd5d7dcc0dd692203e747cdb390c547515d4eef76a8f789f67e51949413a05bd8b4f9bc2b8f0da696d36aa9f73a3a57f9316f5e8480eab316cd1134
diff --git a/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild b/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild
new file mode 100644
index 00000000000..8395400b21e
--- /dev/null
+++ b/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vcs-snapshot autotools
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://github.com/connectivity/connman-gnome"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~arm ~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.16
+ >=sys-apps/dbus-1.2
+ >=dev-libs/dbus-glib-0.73
+ >=x11-libs/gtk+-2.10:2
+ >=net-misc/connman-1.0"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35
+ >=dev-lang/perl-5.8.1"
+
+src_prepare() {
+ eautoreconf
+}
diff --git a/gnome-extra/connman-gnome/metadata.xml b/gnome-extra/connman-gnome/metadata.xml
new file mode 100644
index 00000000000..6780ebb6929
--- /dev/null
+++ b/gnome-extra/connman-gnome/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">connectivity/connman-gnome</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/docky/Manifest b/gnome-extra/docky/Manifest
new file mode 100644
index 00000000000..b4cdf24329d
--- /dev/null
+++ b/gnome-extra/docky/Manifest
@@ -0,0 +1 @@
+DIST docky-2.2.0.tar.xz 570248 SHA256 28710b2deb998992184c96f1bfebdf43a8db1a074f716e309f955596be8f8af5 SHA512 054c3f8b10ccdc85b8defd108178ebcd880e46ec3d7d558cd2de8cc56f311dafe2efdb552ac8ff9a92cbe9279fdc44a66cad2395791e4a6de59a1cee1d2c6919 WHIRLPOOL db72c05e9e587eb0be661c2d0e6598064bfa4ea7456d16d08f4e533659c5e2cc76cfd6f1a4f669d67e8aa0275005ad0851b0c530715179f5d039e2edb200dde6
diff --git a/gnome-extra/docky/docky-2.2.0.ebuild b/gnome-extra/docky/docky-2.2.0.ebuild
new file mode 100644
index 00000000000..af5c8824591
--- /dev/null
+++ b/gnome-extra/docky/docky-2.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils gnome2 mono
+
+DESCRIPTION="Elegant, powerful, clean dock"
+HOMEPAGE="https://wiki.go-docky.com"
+SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug nls"
+
+RDEPEND="dev-dotnet/dbus-sharp
+ dev-dotnet/dbus-sharp-glib
+ dev-dotnet/gconf-sharp
+ >=dev-dotnet/gio-sharp-0.2-r1
+ dev-dotnet/glib-sharp
+ dev-dotnet/gnome-desktop-sharp
+ dev-dotnet/gnome-keyring-sharp
+ dev-dotnet/gtk-sharp
+ dev-dotnet/mono-addins[gtk]
+ dev-dotnet/notify-sharp
+ dev-dotnet/rsvg-sharp
+ dev-dotnet/wnck-sharp"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig"
+
+pkg_setup() {
+ G2CONF="${G2CONF}
+ --enable-release
+ $(use_enable nls)"
+
+ DOCS="AUTHORS NEWS"
+}
+
+src_prepare() {
+ sed -i -e "/warnaserror/d" configure.ac || die
+ eautoreconf
+}
diff --git a/gnome-extra/docky/metadata.xml b/gnome-extra/docky/metadata.xml
new file mode 100644
index 00000000000..6fe12e4ad78
--- /dev/null
+++ b/gnome-extra/docky/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>dotnet</herd>
+ <maintainer>
+ <email>angelos@gentoo.org</email>
+ <name>Christoph Mende</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">docky</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
new file mode 100644
index 00000000000..35091e6e920
--- /dev/null
+++ b/gnome-extra/eiciel/Manifest
@@ -0,0 +1,2 @@
+DIST eiciel-0.9.8.2.tar.bz2 648067 SHA256 fd99837a57adf83767765a4f096ae81c0af7e33f81df24c55c304b3b649c2079 SHA512 b50479f10d7516ecee2880a03d49ba0d5b13914b3c417f34f960fe7e28aefd0779650915326473180ec19d4c7b6a5998da603c9ccd90a05558521465f99aa9cb WHIRLPOOL 3cd792ca0fed6799a811a92205f32f2b208d684c4a8840cdc5baa8f4825ff55e29885999c0206fbb05ff4e02941f2b71ed2ccce959e1a9a81f7de810b928c229
+DIST eiciel-0.9.9.tar.bz2 647313 SHA256 c87635f15b381ae912d8d015badf9c0d1428c9a766383399c1351eb02e5b479b SHA512 d2031cdc479851ce207000251dcef9121501f8447b60d37fad9f0fe940bfde0e775443f6988f058e565920089cfacf007461f3c8b5a4146f779f9a22396ac7e9 WHIRLPOOL 4eebbab5a5847fd9f3ec6f937dae7a09a000b1b7d232cd366cf9dba6a7f479b16265bf0ba5ce8f5c5d6f36636007f33e3a5bef4a459523b737e83151a33a4fed
diff --git a/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild b/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild
new file mode 100644
index 00000000000..56c1bd7e19b
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.8.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/eiciel-0.9.9.ebuild b/gnome-extra/eiciel/eiciel-0.9.9.ebuild
new file mode 100644
index 00000000000..56c1bd7e19b
--- /dev/null
+++ b/gnome-extra/eiciel/eiciel-0.9.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/eiciel/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
new file mode 100644
index 00000000000..6e05d4fa391
--- /dev/null
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -0,0 +1,3 @@
+DIST evolution-data-server-3.12.11.tar.xz 5288904 SHA256 59023d2cf92e36b69c1f83b2e56a0ba037754982a23cb06f35f6cc5de7a12201 SHA512 851b5ba6384e918593043088ac093c02f31b0b3bcb6852f2ee24159cc0c99e28713db84d76339a40073da8cbe4857222031e7150f0f99dca61eaf910d76b139f WHIRLPOOL c90345f2273ff66156fd266521521fd381e1c8d9e05311067835e729c24d5544a1bf29f0d988c6585e9caf3b7f0107645c781a15fd7b4ca3d9367f45441ce4a4
+DIST evolution-data-server-3.16.4.tar.xz 5364536 SHA256 62af92dd5563d58a2f13eceeee99cbb7201c15a60eb9e6f4f2bf69688aa07a06 SHA512 7dfb5abc663c09f3bf43b8f34dc4eaab0d16107221ae862d6e4c7b2adc8fa16983a9c619020ce4c032866bd846491db693bcf231c8bdd7fdf6bdd75c3cc327cc WHIRLPOOL 41024ce5039189e5261df9f8ed74b860d712ff55ea0d4cc42d804ae052410fd502dc55d4cfffa70640c2a8747695687840905db145630cf7e1b858554d7761de
+DIST evolution-data-server-3.16.4_pre20150704.tar.xz 4139492 SHA256 2b52f062ab20edfbb99541e87ae1936ff80c5e4ca9a0d5d7ce8459e182aa8ae7 SHA512 9a0fba7588b2700810a2d7efbe6d50b1762ac4754d43d17bd55272ae3b51362c120462dbc6cd596fbb2691a75d14896d012963a3146483ccfbf0a712f34eb59e WHIRLPOOL 12beb7ddd0bc00452bc2070521c53ffc8cf07b9b08e73f5edf8df4fbd5dfb4b37c0f7b1d6da713b370b05b84a3fd901afe70b85e1dc21c153013ed8ce93ea3e1
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
new file mode 100644
index 00000000000..dc7c25acddb
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.12.11.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 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/49" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.5:=
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libgdata-0.10:=
+ >=dev-libs/libical-0.43:=
+ >=net-libs/libsoup-2.42:2.4
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=sys-libs/db-4:=
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.2:3
+ )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.8: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-3.5.5
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+# eautoreconf needs:
+# >=gnome-base/gnome-common-2
+
+# 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
+
+ # Fix relink issues in src_install
+ ELTCONF="--reverse-deps"
+
+ gnome2_src_prepare
+
+ # Fix compilation flags crazyness, upstream bug #653157
+ sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
+ -i configure || die "sed failed"
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ append-cppflags "-I$(db_includedir)"
+
+ # phonenumber does not exist in tree
+ gnome2_src_configure \
+ $(use_enable api-doc-extras gtk-doc) \
+ $(use_with api-doc-extras private-docs) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gtk) \
+ $(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-google \
+ --enable-largefile \
+ --enable-smime \
+ --with-libdb="${EPREFIX}"/usr \
+ --without-phonenumber \
+ --disable-examples \
+ --disable-uoa
+}
+
+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
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset ORBIT_SOCKETDIR
+ unset SESSION_MANAGER
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
new file mode 100644
index 00000000000..f9c7e626d79
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit db-use flag-o-matic gnome2 python-any-r1 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/52" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.15.1 is required for google tasks
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.5:=
+ >=dev-libs/glib-2.40:2
+ >=dev-libs/libgdata-0.10:=
+ >=dev-libs/libical-0.43:=
+ >=net-libs/libsoup-2.42:2.4
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=sys-libs/db-4:=
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.6:3
+ )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.8: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-3.5.5
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+# eautoreconf needs:
+# >=gnome-base/gnome-common-2
+
+# 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
+
+ # Fix relink issues in src_install
+ ELTCONF="--reverse-deps"
+
+ # Honor Google settings as defined in gnome-online-accounts (from 3.16 branch)
+ epatch "${FILESDIR}"/${P}-goa-gmail.patch
+
+ gnome2_src_prepare
+
+ # Fix compilation flags crazyness, upstream bug #653157
+ sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
+ -i configure || die "sed failed"
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ append-cppflags "-I$(db_includedir)"
+
+ # phonenumber does not exist in tree
+ gnome2_src_configure \
+ $(use_enable api-doc-extras gtk-doc) \
+ $(use_with api-doc-extras private-docs) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gtk) \
+ $(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-google \
+ --enable-largefile \
+ --enable-smime \
+ --with-libdb="${EPREFIX}"/usr \
+ --without-phonenumber \
+ --disable-examples \
+ --disable-uoa
+}
+
+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
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset ORBIT_SOCKETDIR
+ unset SESSION_MANAGER
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
new file mode 100644
index 00000000000..97b374e5160
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.16.4_pre20150704.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 python3_4 pypy pypy2_0 )
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use flag-o-matic gnome2 python-any-r1 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+COMMIT="d3587d1e064ff46406a3bd137ebdd3625c339001"
+SRC_URI="https://git.gnome.org/browse/${PN}/snapshot/${PN}-${COMMIT}.tar.xz -> ${P}.tar.xz"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/52" # subslot = libcamel-1.2 soname version
+IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+
+# sys-libs/db is only required for migrating from <3.13 versions
+# gdata-0.15.1 is required for google tasks
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5[crypt]
+ >=dev-db/sqlite-3.5:=
+ >=dev-libs/glib-2.40:2
+ >=dev-libs/libgdata-0.10:=
+ >=dev-libs/libical-0.43:=
+ >=net-libs/libsoup-2.42:2.4
+ >=dev-libs/libxml2-2
+ >=dev-libs/nspr-4.4:=
+ >=dev-libs/nss-3.9:=
+ >=sys-libs/db-4:=
+
+ dev-libs/icu:=
+ sys-libs/zlib:=
+ virtual/libiconv
+
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.6:3
+ )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+ kerberos? ( virtual/krb5:= )
+ ldap? ( >=net-nds/openldap-2:= )
+ weather? ( >=dev-libs/libgweather-3.8: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-3.5.5
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+
+ dev-util/gtk-doc
+"
+
+# FIXME: This version needs dev-util/gtk-doc to provide gtk-doc.make
+# Next one should be a proper tarball created after distcheck run and, then
+# shouldn't require that DEPEND.
+
+# eautoreconf needs:
+# >=gnome-base/gnome-common-2
+
+# 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"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ use vala && vala_src_prepare
+
+ # Fix relink issues in src_install
+ ELTCONF="--reverse-deps"
+
+ eautoreconf
+
+ gnome2_src_prepare
+
+ # Fix compilation flags crazyness, upstream bug #653157
+ sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \
+ -i configure || die "sed failed"
+}
+
+src_configure() {
+ # /usr/include/db.h is always db-1 on FreeBSD
+ # so include the right dir in CPPFLAGS
+ append-cppflags "-I$(db_includedir)"
+
+ # phonenumber does not exist in tree
+ gnome2_src_configure \
+ $(use_enable api-doc-extras gtk-doc) \
+ $(use_with api-doc-extras private-docs) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gtk) \
+ $(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-google \
+ --enable-largefile \
+ --enable-smime \
+ --with-libdb="${EPREFIX}"/usr \
+ --without-phonenumber \
+ --disable-examples \
+ --disable-uoa
+}
+
+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
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset ORBIT_SOCKETDIR
+ unset SESSION_MANAGER
+ unset DISPLAY
+ Xemake check
+}
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
new file mode 100644
index 00000000000..bc79da273cc
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/calentry.schema
@@ -0,0 +1,108 @@
+# 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/files/evolution-data-server-3.16.4-goa-gmail.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
new file mode 100644
index 00000000000..c5fc44e1aa0
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.16.4-goa-gmail.patch
@@ -0,0 +1,108 @@
+From c66b549c259d33e15947d89257c50d945e3020c7 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Tue, 14 Jul 2015 11:49:31 +0200
+Subject: Doesn't honor Google settings as defined in gnome-online-accounts
+
+Use mail-disabled, calendar-disabled and contacts-disabled properties,
+rather than rely on an interface addition/removal and a notification
+about the change.
+
+Reported at https://bugzilla.redhat.com/show_bug.cgi?id=1242541
+
+diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+index e800c23..2f9be5e 100644
+--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
++++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
+@@ -162,50 +162,6 @@ gnome_online_accounts_provider_type_to_backend_name (GBinding *binding,
+ return TRUE;
+ }
+
+-static gboolean
+-gnome_online_accounts_object_is_non_null (GBinding *binding,
+- const GValue *source_value,
+- GValue *target_value,
+- gpointer unused)
+-{
+- GoaObject *goa_object = GOA_OBJECT (g_binding_get_source (binding));
+- ESourceExtension *source_extension = E_SOURCE_EXTENSION (g_binding_get_target (binding));
+- ESource *source;
+- ESourceGoa *goa_extension;
+- gpointer v_object;
+-
+- v_object = g_value_get_object (source_value);
+- g_value_set_boolean (target_value, v_object != NULL);
+-
+- g_return_val_if_fail (goa_object != NULL, TRUE);
+- g_return_val_if_fail (source_extension != NULL, TRUE);
+-
+- source = e_source_extension_get_source (source_extension);
+- goa_extension = e_source_get_extension (source, E_SOURCE_EXTENSION_GOA);
+-
+- if (g_strcmp0 (g_binding_get_source_property (binding), "calendar") == 0) {
+- gchar *uri = NULL;
+-
+- if (v_object && GOA_IS_CALENDAR (v_object))
+- uri = goa_calendar_dup_uri (v_object);
+-
+- e_source_goa_set_calendar_url (goa_extension, uri);
+-
+- g_free (uri);
+- } else if (g_strcmp0 (g_binding_get_source_property (binding), "contacts") == 0) {
+- gchar *uri = NULL;
+-
+- if (v_object && GOA_IS_CONTACTS (v_object))
+- uri = goa_contacts_dup_uri (v_object);
+-
+- e_source_goa_set_contacts_url (goa_extension, uri);
+-
+- g_free (uri);
+- }
+-
+- return TRUE;
+-}
+-
+ static GoaObject *
+ gnome_online_accounts_ref_account (EGnomeOnlineAccounts *extension,
+ ESource *source)
+@@ -629,29 +585,20 @@ gnome_online_accounts_config_collection (EGnomeOnlineAccounts *extension,
+ source_extension, "identity",
+ G_BINDING_SYNC_CREATE);
+
+- e_binding_bind_property_full (
+- goa_object, "calendar",
++ e_binding_bind_property (
++ goa_account, "calendar-disabled",
+ source_extension, "calendar-enabled",
+- G_BINDING_SYNC_CREATE,
+- gnome_online_accounts_object_is_non_null,
+- NULL,
+- NULL, (GDestroyNotify) NULL);
++ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+- e_binding_bind_property_full (
+- goa_object, "contacts",
++ e_binding_bind_property (
++ goa_account, "contacts-disabled",
+ source_extension, "contacts-enabled",
+- G_BINDING_SYNC_CREATE,
+- gnome_online_accounts_object_is_non_null,
+- NULL,
+- NULL, (GDestroyNotify) NULL);
++ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+- e_binding_bind_property_full (
+- goa_object, "mail",
++ e_binding_bind_property (
++ goa_account, "mail-disabled",
+ source_extension, "mail-enabled",
+- G_BINDING_SYNC_CREATE,
+- gnome_online_accounts_object_is_non_null,
+- NULL,
+- NULL, (GDestroyNotify) NULL);
++ G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN);
+
+ g_clear_object (&goa_account);
+ g_clear_object (&goa_calendar);
+--
+cgit v0.10.2
+
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
new file mode 100644
index 00000000000..89e564fd964
--- /dev/null
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="api-doc-extras">Build documentation for private APIs</flag>
+ <flag name="gnome-online-accounts">Enable using
+ <pkg>net-libs/gnome-online-accounts</pkg> for authorization</flag>
+ <flag name="weather">Enable optional weather calendar support</flag>
+ </use>
+</pkgmetadata>
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
new file mode 100644
index 00000000000..f29df5a0653
--- /dev/null
+++ b/gnome-extra/evolution-ews/Manifest
@@ -0,0 +1,3 @@
+DIST evolution-ews-3.12.11.tar.xz 663288 SHA256 adbf4efd25e9c2df823a20d14f45027bacbaf14d57ffb5978ae4d33184315e83 SHA512 4756a185c55118622cff175c3fa8d4a2ae3e82ff926542dfd88d299a7f82e23dc90f66de0ce7e97db8a79dbd2a07d635ab9bdc8fac8f0be3bf10d5efb77a067e WHIRLPOOL 5802f9df6bf3d79c23238672da643cc781c048b1a2b0d4ee20dc6348c998a656567ccca8299ad8aa00e537c82e11fb9e26770d78adb70cf7a6030e802521ac22
+DIST evolution-ews-3.16.3.tar.xz 683876 SHA256 529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 SHA512 462b2c77033b351ddcd72ef4b4f7d8d5e4f7782d1ff4d25760d31fb7c0c1ed303fdc47063932961810b103204a59eccd91d4c888554010cd64c46be5eaeb53d9 WHIRLPOOL 56ff69cc1341ab9a7b38cdc8091dc15c3bba72226105f9fd907d800cffbeefe83555732c3e70d7edd76bdf6f9132e9621fd00252bf4a794198c7608c347af1a4
+DIST evolution-ews-3.16.4.tar.xz 684676 SHA256 fabacc8a3acb5998fa0aa750927defe3cd8198e3a8300190cb613dd779803bd4 SHA512 62b03cd7f6ddd648d781dafe4a40b0d128edfe21d6a28e15e8c1e70069c694bf1b66dbf9ede0613ca8ca08b234bae2f83280152f80afcdacd01decffdf07808f WHIRLPOOL cbcb1723779563680e3006c5149c83189d8cde0558a42d716389641be9d52147bd71b0e1259f36a3467fa8d83123c78f8bb01cfd6393bd7e4c4953794c7df716
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.12.11.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.12.11.ebuild
new file mode 100644
index 00000000000..0cd24a7c730
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.12.11.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit 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=""
+
+RDEPEND="
+ dev-db/sqlite:3=
+ >=dev-libs/glib-2.32:2
+ dev-libs/libical:0=
+ >=dev-libs/libxml2-2
+ >=gnome-extra/evolution-data-server-${PV}:0=
+ >=mail-client/evolution-${PV}:2.0
+ >=net-libs/libsoup-2.42:2.4
+ >=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35.5
+ virtual/pkgconfig
+"
+
+# Requires libhttpmock which is not in portage
+RESTRICT="test"
+
+src_configure() {
+ # We don't have libmspack, needing internal lzx
+ gnome2_src_configure --with-internal-lzx
+}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
new file mode 100644
index 00000000000..a1e8b9e6b4f
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.16.3-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils 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.40:2
+ dev-libs/libical:0=
+ >=dev-libs/libxml2-2
+ >=gnome-extra/evolution-data-server-${PV}:0=
+ >=mail-client/evolution-${PV}:2.0
+ >=net-libs/libsoup-2.42:2.4
+ >=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35.5
+ virtual/pkgconfig
+ test? ( net-libs/uhttpmock )
+"
+
+src_prepare() {
+ # Install locales in proper dir (from 'master')
+ epatch "${FILESDIR}"/${PN}-3.16.3-localedir.patch
+ eautoreconf
+}
+
+src_configure() {
+ # We don't have libmspack, needing internal lzx
+ gnome2_src_configure \
+ --with-internal-lzx \
+ $(use_enable test tests)
+}
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild
new file mode 100644
index 00000000000..f511fc91a43
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.16.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit 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.40:2
+ dev-libs/libical:0=
+ >=dev-libs/libxml2-2
+ >=gnome-extra/evolution-data-server-${PV}:0=
+ >=mail-client/evolution-${PV}:2.0
+ >=net-libs/libsoup-2.42:2.4
+ >=x11-libs/gtk+-3:3
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35.5
+ virtual/pkgconfig
+ test? ( net-libs/uhttpmock )
+"
+
+src_configure() {
+ # We don't have libmspack, needing internal lzx
+ gnome2_src_configure \
+ --with-internal-lzx \
+ $(use_enable test tests)
+}
diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
new file mode 100644
index 00000000000..e04d7baa32f
--- /dev/null
+++ b/gnome-extra/evolution-ews/files/evolution-ews-3.16.3-localedir.patch
@@ -0,0 +1,25 @@
+From 6f6bdc4b755ff2089d645ce1b2d09114fa72a1f9 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 11 Jun 2015 10:11:15 +0200
+Subject: configure.ac: Do not override localedir variable
+
+It could place locale files into $PREFIX/locale, instead of $PREFIX/share/locale.
+The change follows bug 703732.
+
+diff --git a/configure.ac b/configure.ac
+index 1d4d746..ede1ef2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -199,9 +199,6 @@ GETTEXT_PACKAGE=evolution-ews
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+
+-localedir='$(prefix)/$(DATADIRNAME)/locale'
+-AC_SUBST(localedir)
+-
+ dnl ****************************
+ dnl Initialize libtool
+ dnl ****************************
+--
+cgit v0.10.2
+
diff --git a/gnome-extra/evolution-ews/metadata.xml b/gnome-extra/evolution-ews/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/evolution-ews/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
new file mode 100644
index 00000000000..83e92e3913d
--- /dev/null
+++ b/gnome-extra/gconf-editor/Manifest
@@ -0,0 +1 @@
+DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49 WHIRLPOOL 991a5b7d6b02b3472a9207bb5750d18552ba5da15570f7f884950b838177431a42b1ebb0131bbf3f76abe8f6098a2af88e542ec88d22135f9c8684da0543703f
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
new file mode 100644
index 00000000000..b7df8f51007
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 00000000000..0d79ec56c39
--- /dev/null
+++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
@@ -0,0 +1,66 @@
+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
new file mode 100644
index 00000000000..8d963804eaf
--- /dev/null
+++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit eutils 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 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ >=x11-libs/gtk+-3.0.0:3
+ >=gnome-base/gconf-2.12:2
+"
+DEPEND="${RDEPEND}
+ app-text/scrollkeeper
+ 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
+
+src_prepare() {
+ # Fix assertion failed crash (from 'master')
+ epatch "${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
+
+ # Drop use GTK accel maps (from 'master')
+ epatch "${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
+
+ gnome2_src_prepare
+}
diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gconf-editor/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest
new file mode 100644
index 00000000000..3002c10b626
--- /dev/null
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -0,0 +1 @@
+DIST gdesklets-0.36.3.tar.bz2 3745626 SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5 SHA512 c54a759023fe31e97271fe1a400afda0c61163f3b6c5fa3f9e0ea8d4c048f7edad62273aab1fb2160a48a0289ead43c35eef920d83dfd3f653c79c53e367fc4c WHIRLPOOL b1000971867ca36dba1e805ae3d3430d3c5cdf5a6023a71754f59d8245e11217b5d883bd6031bb7a3f384ce819e1eb06cc246cf1f12cfb8448ff5c6d356a3271
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-control-getid b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
new file mode 100755
index 00000000000..b9af404a3b6
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-control-getid
@@ -0,0 +1,35 @@
+#!/usr/bin/env python2
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+#
+# A simple script to get the name and id from a Control.
+# Pretty much copied from test-control.py
+
+from plugin.Interface import Interface
+
+import sys
+import os
+import __builtin__
+
+if "." not in sys.path: sys.path.append(".")
+
+try:
+ path = os.path.abspath(sys.argv[1])
+ folder, base = os.path.split(path)
+except:
+ sys.exit("ERROR IN CONTROL INSTALLATION")
+
+
+os.chdir(folder)
+try:
+ module = __import__(base)
+ clss = module.get_class()
+
+except IOError:
+ sys.exit("Could not load control in %s!" % (folder))
+
+# Get the string in the form of "IMyControl:hash" and translate it to
+# "MyControl_hash"
+# gDesklets needs it in the form of a valid python module name
+print (Interface.get_id(Interface.get_interfaces(clss)[0]).replace(":", "_"))[1:]
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
new file mode 100644
index 00000000000..8d9b3dc10c9
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch
@@ -0,0 +1,12 @@
+=== modified file 'config/Makefile.am'
+--- config/Makefile.am 2008-12-29 15:33:52 +0000
++++ config/Makefile.am 2010-05-01 17:24:06 +0000
+@@ -21,7 +21,6 @@
+ ConfigUnit.py \
+ ConfigURI.py \
+ ConfigDialog.py \
+- ConfigWidget.py \
+ ConfigManager.py \
+ ConfigWidget.py \
+ DaemonConfigger.py \
+
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
new file mode 100644
index 00000000000..fc8753e46c8
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
@@ -0,0 +1,149 @@
+=== modified file 'Makefile.am'
+--- Makefile.am 2010-12-14 10:24:59 +0000
++++ Makefile.am 2011-01-31 01:20:58 +0000
+@@ -11,8 +11,12 @@
+ autostartdir = $(sysconfdir)/xdg/autostart
+ sharedmimepackagedir = $(datadir)/mime/packages
+ mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
++pixmapdir = $(datadir)/pixmaps
+ basicdeskletsdir = ${installdir}
+
++# initialize this so we can add to it later
++nobase_dist_install_DATA =
++
+ include Makefile_gdesklets.am
+ include Makefile_python.am
+
+
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am 2011-01-06 11:01:06 +0000
++++ Makefile_gdesklets.am 2011-01-31 01:20:58 +0000
+@@ -1,12 +1,14 @@
+ # Set the LDFLAGS for this section
+ AM_LDFLAGS = -module -avoid-version -as-needed
+
++# Libraries that get installed in these exact subdirectories
+ nobase_install_LTLIBRARIES = \
+ libdesklets/system/gtop.la \
+ utils/svg.la \
+ utils/tiling.la \
+ utils/x11.la
+
++# Scripts that get distributed and installed
+ dist_install_SCRIPTS = \
+ ctrlinfo \
+ gdesklets \
+@@ -16,38 +18,62 @@
+ gdesklets-shell \
+ test-control.py
+
++# "System" scripts that get distributed but not installed
+ dist_noinst_SCRIPTS = autogen.sh
+
++# Man page
+ dist_man_MANS = doc/man/gdesklets.1
+
+-EXTRA_DIST = \
+- AUTHORS \
+- COPYING \
+- README \
+- TODO \
+- NEWS \
+- contrib/bash/gdesklets
+-
++# The .desktop file
++desktop_in_files = data/gdesklets.desktop.in
++# The shared mime XML file
++sharedmimepackage_in_files = data/gdesklets.xml.in
++
++# Other odds and ends that get distributed, but not installed
++# It's up to distro package maintainers to install these
++EXTRA_DIST = \
++ AUTHORS \
++ COPYING \
++ README \
++ TODO \
++ NEWS \
++ contrib/bash/gdesklets \
++ $(desktop_in_files) \
++ $(sharedmimepackage_in_files)
++
++# Docs and images that get distributed and installed to these specific
++# directories
++nobase_dist_install_DATA += \
++ doc/basic/gdesklets-doc.xml \
++ doc/basic/Images/desklet-context-menu.png \
++ doc/basic/Images/desklet-start-shell.png \
++ doc/basic/Images/gdesklets.png \
++ doc/basic/Images/open-command.png \
++ doc/basic/Images/preferences.png \
++ doc/basic/Images/profile.png \
++ doc/basic/Images/remote.png \
++ doc/basic/Images/shell.png \
++ data/about.png \
++ data/gdesklets.png
++
++# Additional files that get cleaned by distclean
+ # See http://www.gnu.org/software/hello/manual/automake/Clean.html
+ CLEANFILES = \
+ po/.intltool-merge-cache
+
+ # The .desktop file
+-desktop_in_files = data/gdesklets.desktop.in
+-dist_desktop_DATA= $(desktop_in_files)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+
+ # The shared mime XML file
+-sharedmimepackage_in_files = data/gdesklets.xml.in
+-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+
+ # And the mime icon
+-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+
++# Note, this gets installed in both $(pixmapdir) and $(installdir)
+ pixmap_DATA = data/gdesklets.png
+
+ libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
+
+=== modified file 'Makefile_python.am'
+--- Makefile_python.am 2010-12-14 10:24:59 +0000
++++ Makefile_python.am 2011-01-31 01:20:58 +0000
+@@ -1,4 +1,4 @@
+-nobase_dist_install_DATA = \
++nobase_dist_install_DATA += \
+ Controls/__init__.py \
+ Controls/ArrayBuffer/__init__.py \
+ Controls/ArrayBuffer/IArrayBuffer.py \
+@@ -48,21 +48,6 @@
+ config/DisplayConfigger.py \
+ config/StateSaver.py \
+ config/settings.py \
+- data/about.png \
+- data/calendar.png \
+- data/gdesklets.desktop \
+- data/gdesklets.png \
+- data/gdesklets.xml \
+- data/gnome-mime-application-x-gdesklets-display.png \
+- doc/basic/gdesklets-doc.xml \
+- doc/basic/Images/desklet-context-menu.png \
+- doc/basic/Images/desklet-start-shell.png \
+- doc/basic/Images/gdesklets.png \
+- doc/basic/Images/open-command.png \
+- doc/basic/Images/preferences.png \
+- doc/basic/Images/profile.png \
+- doc/basic/Images/remote.png \
+- doc/basic/Images/shell.png \
+ display/__init__.py \
+ display/ContainerTarget.py \
+ display/DataTarget.py \
+@@ -212,4 +197,3 @@
+ utils/typeconverter.py \
+ utils/vfs.py \
+ utils/xdr.py
+-
+
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
new file mode 100644
index 00000000000..3abfb08b8ec
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-CFLAGS.patch
@@ -0,0 +1,37 @@
+=== modified file 'configure.ac'
+--- configure.ac 2011-02-15 10:13:11 +0000
++++ configure.ac 2011-04-08 01:27:57 +0000
+@@ -9,6 +9,7 @@
+ AC_CONFIG_MACRO_DIR([macros])
+ AC_CONFIG_FILES([Makefile])
+ AM_MAINTAINER_MODE
++: ${CFLAGS="-Os -g"}
+
+ dnl Required programs
+ AC_PROG_CC
+@@ -21,14 +22,12 @@
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+
+-CFLAGS="-Os -g"
+-
+ AC_ARG_ENABLE(debug,AS_HELP_STRING([--enable-debug],[Maximum debugging]),
+ set_debug="$enableval",[set_debug=no])
+ AC_MSG_CHECKING(for more debugging including macro expansion)
+ if test "$GCC" = "yes" -a "$set_debug" != "no"; then
+ AC_MSG_RESULT(yes)
+- CFLAGS="-O0 -g3"
++ CFLAGS="$CFLAGS -O0 -g3"
+ else
+ AC_MSG_RESULT(no)
+ fi
+@@ -39,7 +38,7 @@
+ AC_MSG_CHECKING(for more warnings, including -Werror)
+ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
+ AC_MSG_RESULT(yes)
+- CFLAGS="\
++ CFLAGS="$CFLAGS \
+ -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
+ -Wmissing-declarations -Wredundant-decls -Wunreachable-code \
+ -Wpointer-arith -Wcast-align -Wsign-compare -ansi \
+
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
new file mode 100644
index 00000000000..ae458a3bb2b
--- /dev/null
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-getid-fix.patch
@@ -0,0 +1,14 @@
+--- main/__init__.py 2009-09-20 20:02:48 +0000
++++ main/__init__.py 2010-05-08 15:41:26 +0000
+@@ -16,8 +16,11 @@
+ # case the DISPLAY variable doesn't contain the screen number)
+ DISPLAY = vfs.escape_path(gtk.gdk.Display(os.environ["DISPLAY"]).get_name()).replace("/", "_")
+ except:
+- print "Error: could not open display", os.environ["DISPLAY"]
+- sys.exit(1)
++ try:
++ print >> sys.stderr, "Error: could not open display", os.environ["DISPLAY"]
++ except:
++ print >> sys.stderr, "(could not get DISPLAY environment variable)"
++ DISPLAY = "0"
+
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild
new file mode 100644
index 00000000000..480ec6ecc88
--- /dev/null
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+GNOME2_LA_PUNT="yes"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 multilib bash-completion-r1
+
+MY_PN=${PN/-core}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="GNOME Desktop Applets: Core library for desktop applets"
+SRC_URI="http://gdesklets.de/files/${MY_P}.tar.bz2"
+HOMEPAGE="http://gdesklets.de"
+LICENSE="GPL-2"
+
+IUSE="dbus"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+
+# is libgsf needed for runtime or just compiling?
+# only need expat for python-2.4, I think
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2:2
+ >=gnome-base/librsvg-2.8
+ >=gnome-base/libgtop-2.8.2
+ >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+ >=dev-python/libbonobo-python-2.6[${PYTHON_USEDEP}]
+ >=dev-python/gconf-python-2.6[${PYTHON_USEDEP}]
+ >=dev-python/pygobject-2.6:2[${PYTHON_USEDEP}]
+ >=dev-python/pyorbit-2.0.1[${PYTHON_USEDEP}]
+ || ( >=dev-python/gnome-vfs-python-2.6[${PYTHON_USEDEP}] >=dev-python/libgnome-python-2.6[${PYTHON_USEDEP}] )
+ >=dev-libs/expat-1.95.8
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-.in-files.patch \
+ "${FILESDIR}"/${P}-CFLAGS.patch
+
+ python_fix_shebang .
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Install bash completion script
+ dobashcomp contrib/bash/gdesklets
+
+ # Install the gdesklets-control-getid script
+ insinto /usr/$(get_libdir)/gdesklets
+ insopts -m0555
+ doins "${FILESDIR}"/gdesklets-control-getid
+}
diff --git a/gnome-extra/gdesklets-core/metadata.xml b/gnome-extra/gdesklets-core/metadata.xml
new file mode 100644
index 00000000000..abdb9f8708a
--- /dev/null
+++ b/gnome-extra/gdesklets-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
+ <upstream>
+ <bugs-to>https://bugs.launchpad.net/gdesklets</bugs-to>
+ </upstream>
+ <use>
+ <flag name='dbus'>Enable gDesklets Controls to use DBus</flag>
+ </use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-activity-journal/Manifest b/gnome-extra/gnome-activity-journal/Manifest
new file mode 100644
index 00000000000..5374efe25f9
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/Manifest
@@ -0,0 +1 @@
+DIST gnome-activity-journal-0.8.0.tar.gz 334159 SHA256 c1be611ecfc433df038c71857c7ca80cc0f40c8943cfb6a7be91ef0022cd4f7e SHA512 5d92bb032328c9eb7c230015675c379b9cb9f3c31362128b8b25ede070df11120beadbf1766ba5d250006f1da523fc8a45f760119706a977de6e0124321375a7 WHIRLPOOL 30578bd247822c02e9459e9b7c2beb6a497a47b23d9dc5dc8876829110828d164f5d30203429cbc8ac22ab1246cc8340410d9ae13e0ce300eda6551a3460924b
diff --git a/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
new file mode 100644
index 00000000000..73e87e0b071
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/files/gnome-activity-journal-0.8.0-zg-0.9.patch
@@ -0,0 +1,15 @@
+--- a/src/external.py
++++ b/src/external.py
+@@ -41,7 +41,11 @@
+ _restarted = False
+
+ def __init__(self):
+- self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++ if CLIENT.get_version() >= [0, 8, 99]:
++ self._extension = CLIENT._iface.get_extension("Histogram", "journal/activity")
++ else:
++ self._extension = CLIENT._iface.get_extension("Log", "journal/activity")
++
+
+ def _show_error(self):
+ dialog = gtk.MessageDialog(
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
new file mode 100644
index 00000000000..17082891895
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=true
+
+inherit eutils gnome2 distutils-r1 gnome2-utils versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="http://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/libgnome-python
+ dev-python/gconf-python
+ dev-python/gst-python:0.10
+ dev-python/pycairo
+ dev-python/pygobject:2
+ dev-python/pygtk:2
+ dev-python/pyxdg
+ gnome-extra/zeitgeist
+ sys-apps/dbus"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-python/python-distutils-extra"
+
+PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch )
+
+src_configure() {
+ distutils-r1_src_configure
+}
+
+src_compile() {
+ distutils-r1_src_compile
+}
+
+src_install() {
+ distutils-r1_src_install
+ python_replicate_script "${ED}"/usr/bin/${PN}
+}
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
new file mode 100644
index 00000000000..7d34364beb1
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=true
+DISTUTILS_SINGLE_IMPL=true
+
+inherit eutils gnome2 distutils-r1 versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Tool for easily browsing and finding files on your computer"
+HOMEPAGE="https://launchpad.net/gnome-activity-journal/"
+SRC_URI="http://launchpad.net/gnome-activity-journal/${DIR_PV}/${PV}/+download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3 LGPL-3"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-python/dbus-python
+ dev-python/libgnome-python
+ dev-python/gconf-python
+ dev-python/gst-python:0.10
+ dev-python/pycairo
+ dev-python/pygobject:2
+ dev-python/pygtk:2
+ dev-python/pyxdg
+ gnome-extra/zeitgeist
+ sys-apps/dbus"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ dev-python/python-distutils-extra"
+
+PATCHES=( "${FILESDIR}"/${P}-zg-0.9.patch )
+
+src_configure() {
+ distutils-r1_src_configure
+}
+
+src_compile() {
+ distutils-r1_src_compile
+}
+
+src_install() {
+ distutils-r1_src_install
+ python_fix_shebang "${ED}"
+}
diff --git a/gnome-extra/gnome-activity-journal/metadata.xml b/gnome-extra/gnome-activity-journal/metadata.xml
new file mode 100644
index 00000000000..84adb08cf77
--- /dev/null
+++ b/gnome-extra/gnome-activity-journal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ <description>I do the work</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">gnome-activity-journal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
new file mode 100644
index 00000000000..6ecd51f2ce6
--- /dev/null
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-boxes-3.14.3.1.tar.xz 1363088 SHA256 048df41ce1bcece1d89dfddcb571ed17dfa7f614929cd63f3079d14c66c10f24 SHA512 c714ff854f63832a2d0b6660378d36d5dfd99ece584a12ebe066cb58da6ee374287069d23a28f1966c343e68b5db25dbac5651031316bbe464f37a0746bf5822 WHIRLPOOL 18ec809438a64d7fa8e96a3bff9beece05c9312e2920bc5c10ca9efd8669b9b0eb1ace403d5252729da23735f3f9aec3f58be5a269df56a18bb9ca11e6f7d137
+DIST gnome-boxes-3.16.2.tar.xz 1604664 SHA256 f5fecb1ba0769e2a3dbec31e6149fffbcbd59946e4dbab31fb3ec28a16e41995 SHA512 40fcb79cedfa070e6beed905ec814caff2764361a9b5205e68dbe8b6bbdc737a550d1c1695446ac053813b77e24bb2a6087a2eca352c9d28d13c0655142454c0 WHIRLPOOL 37cfbaafdaa724eaee10485415dac5e16161a41bfbdca83f86b806bd3f0b6143900e30154939db481e546b0bd87db8d32e505f482e1bd1a0f81ec051936be7b5
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild
new file mode 100644
index 00000000000..5135466f6a5
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.14.3.1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.26"
+
+inherit linux-info gnome2 readme.gentoo 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="smartcard usbredir" #bindist
+KEYWORDS="amd64" # qemu-kvm[spice] is 64bit-only
+
+# 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.
+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.11
+ >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
+ >=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+ >=app-emulation/libvirt-glib-0.1.9
+ >=x11-libs/gtk+-3.13.2:3
+ >=net-libs/gtk-vnc-0.4.4[gtk3]
+ >=net-misc/spice-gtk-0.16[gtk3,smartcard?,usbredir?]
+
+ >=app-misc/tracker-0.16:0=[iso]
+
+ >=sys-apps/util-linux-2.20
+ >=net-libs/libsoup-2.38:2.4
+
+ sys-fs/fuse
+ sys-fs/fuseiso
+ sys-fs/mtools
+ virtual/libgudev:=
+"
+# !bindist? ( gnome-extra/gnome-boxes-nonfree )
+
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-util/desktop-file-utils
+ >=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 \
+ $(use_enable usbredir) \
+ $(use_enable smartcard) \
+ --enable-ovirt=no
+}
+
+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/gnome-boxes-3.16.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild
new file mode 100644
index 00000000000..065d9cbebce
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.16.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.26"
+
+inherit linux-info gnome2 readme.gentoo 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="smartcard usbredir" #bindist
+KEYWORDS="~amd64" # qemu-kvm[spice] is 64bit-only
+
+# 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.
+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.11
+ >=app-emulation/qemu-1.3.1[spice,smartcard?,usbredir?]
+ >=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+ >=app-emulation/libvirt-glib-0.2
+ >=x11-libs/gtk+-3.13.2:3
+ >=net-libs/gtk-vnc-0.4.4[gtk3]
+ >=net-misc/spice-gtk-0.27[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/fuse
+ sys-fs/fuseiso
+ sys-fs/mtools
+ virtual/libgudev:=
+"
+# !bindist? ( gnome-extra/gnome-boxes-nonfree )
+
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ app-text/yelp-tools
+ dev-util/desktop-file-utils
+ >=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 \
+ $(use_enable usbredir) \
+ $(use_enable smartcard) \
+ --enable-ovirt=no
+}
+
+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
new file mode 100644
index 00000000000..fa5ebd0b3a2
--- /dev/null
+++ b/gnome-extra/gnome-boxes/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+ devices to another machine over TCP</flag>
+ </use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-builder/Manifest b/gnome-extra/gnome-builder/Manifest
new file mode 100644
index 00000000000..e915c345ca4
--- /dev/null
+++ b/gnome-extra/gnome-builder/Manifest
@@ -0,0 +1 @@
+DIST gnome-builder-3.16.3.tar.xz 1733356 SHA256 a1d7b287d39ce724114c128e25bb00e273ecd8982ed22c8aba48cad9c4d51e61 SHA512 bd552763e958dd121f20adefab68de7d40d66fb3253c21ac9fe97eef7ffb5e98ea2b4ba21522db2cf1626c989bd6c04b27a16ba5e7ecb0bb66afc6299979652c WHIRLPOOL e690fafd8271fd9fd2908424f684bf2704bb768e51e50a8a983eb32f22e1d6807d66f381ebee849b8d7b73d4658301a57fbe6eeb32958ca9dd84ecb934a01d61
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
new file mode 100644
index 00000000000..6ddc3f45038
--- /dev/null
+++ b/gnome-extra/gnome-builder/gnome-builder-3.16.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+introspection"
+
+# FIXME: some unittests seem to hang forever
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/gjs-1.42
+ >=dev-libs/glib-2.44:2
+ dev-libs/libgit2[ssh,threads]
+ >=dev-libs/libgit2-glib-0.22.6[ssh]
+ >=dev-libs/libxml2-2.9
+ dev-python/pygobject:3
+ >=dev-util/devhelp-3.16
+ dev-util/uncrustify
+ sys-devel/clang
+ >=x11-libs/gtk+-3.16.1:3[introspection?]
+ >=x11-libs/gtksourceview-3.16.1:3.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-1.42 )
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ >=dev-util/gtk-doc-am-1.11
+ >=dev-util/intltool-0.50.1
+ >=sys-devel/gettext-0.18
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ PYTHON3_CONFIG=${PYTHON}-config
+}
+
+src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+ GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" Xemake check
+}
diff --git a/gnome-extra/gnome-builder/metadata.xml b/gnome-extra/gnome-builder/metadata.xml
new file mode 100644
index 00000000000..dad9001338d
--- /dev/null
+++ b/gnome-extra/gnome-builder/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
new file mode 100644
index 00000000000..48657cffc25
--- /dev/null
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-calculator-3.14.1.tar.xz 1302628 SHA256 99cb2451d67d51486c0f54497dd26c0e57d0d984866ddf8678a62ba195fed140 SHA512 5c933704acbea762a9e34154d95f1634d97c6610317eb405bdc9f0a24b3c40e4da3cf5ffd8d9d47d4f4280fafeb335d33a0a214867fa7adc2cb777e80d1f603d WHIRLPOOL a7f120995f06414caaa1534e15ec05814478881a93c3afbea03cb1ae475ff6d606a0a3c58da1b4d7b356b22685453b3d4fc5226841d247b1e1ae01c8208080ee
+DIST gnome-calculator-3.16.1.tar.xz 1436992 SHA256 efceac11837ba0977eb5c3df1ea231628d4d12b8c3ad0f47be77929d97c9180b SHA512 1fadf8182f51728e4714f12beb97033b4ecbf8e94068639bce7089e7ae350eb1053a02edf767dfeeb309bece8711432d5c977c1ccde23b7c303b9c9876673677 WHIRLPOOL 1cbfb20dbce5f080c86199f8dd1703845f9c51add260c3eda9d898d49e200af409a64d704007b6e4cc442a53b0e78f1389701f2896fb34f38917d99c46caacf1
+DIST gnome-calculator-3.16.2.tar.xz 1437060 SHA256 f4c6ca7e0eda0dbb7d5cfb85ee9fe3351b1d8bd1bf05ce890939374b95e230a0 SHA512 f8141eca9eafa42277abd86fab4913e41c432471596f009c344915fc7f481172fcce240ab463597a70ff61c95e225fd0c618ca0fcb15b08c6f14e29b023cf218 WHIRLPOOL 0aca9c143d0c1334aa7c63061eba1606e16bb1593122f3d1d952118d1b8aa2f702c960ba875ac9b11ea1a5b74decae8d9eac7cea53040c34bb26fa0a7731d5a5
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild
new file mode 100644
index 00000000000..2addc5e75bc
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.14.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libxml2:2
+ >=x11-libs/gtk+-3.11.6:3
+ >=x11-libs/gtksourceview-3:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-extra/gnome-utils-2.3
+ !gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ ITSTOOL=$(type -P true) \
+ VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild
new file mode 100644
index 00000000000..8a1e9f864c5
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.16.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libxml2:2
+ dev-libs/mpfr:0
+ >=x11-libs/gtk+-3.11.6:3
+ >=x11-libs/gtksourceview-3.15.1:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-extra/gnome-utils-2.3
+ !gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ ITSTOOL=$(type -P true) \
+ VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild
new file mode 100644
index 00000000000..8a1e9f864c5
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.16.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 ~x86-freebsd ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.40:2
+ dev-libs/libxml2:2
+ dev-libs/mpfr:0
+ >=x11-libs/gtk+-3.11.6:3
+ >=x11-libs/gtksourceview-3.15.1:3.0
+"
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-extra/gnome-utils-2.3
+ !gnome-extra/gcalctool
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ ITSTOOL=$(type -P true) \
+ VALAC=$(type -P true)
+}
diff --git a/gnome-extra/gnome-calculator/metadata.xml b/gnome-extra/gnome-calculator/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-calculator/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
new file mode 100644
index 00000000000..8c54ce6bbc1
--- /dev/null
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -0,0 +1 @@
+DIST gnome-calendar-3.16.2.tar.xz 2226324 SHA256 b530e1de58f3e3db9ab1470ee5f2bbb72b5aedca0d127cf093c8416e90be1c6f SHA512 28777a2e87e519392b3f90f225c8450dab52e8cc1d4793820316b3ca2e681d924629e2621a88a3e4d198673a7ec5f548fb99b2e0a5915a6c3b10195849467727 WHIRLPOOL 63f61f2b779c1890fb236af902944ba21a9de00fdc7b5656eba289ad714215b6ecefb8ae5cc21097089d3a47649aadc4828bcb9fd29ee036dba4388d2dbd5ccc
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
new file mode 100644
index 00000000000..82dd2e0cb34
--- /dev/null
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.16.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Manage your online calendars with simple and modern interface"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
+RDEPEND="
+ >=dev-libs/glib-2.43.4:2
+ >=dev-libs/libical-1.0.1
+ >=gnome-extra/evolution-data-server-3.13.90
+ >=x11-libs/gtk+-3.15.4:3
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
diff --git a/gnome-extra/gnome-calendar/metadata.xml b/gnome-extra/gnome-calendar/metadata.xml
new file mode 100644
index 00000000000..dad9001338d
--- /dev/null
+++ b/gnome-extra/gnome-calendar/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
new file mode 100644
index 00000000000..112bd17f795
--- /dev/null
+++ b/gnome-extra/gnome-characters/Manifest
@@ -0,0 +1 @@
+DIST gnome-characters-3.16.2.tar.xz 1364196 SHA256 84616563f3c6c381bcbf5e059ed603f422af9775f744b19826f1ca4ac59845bf SHA512 0809f77bfcc173984fc45476f9766b4a3917247ab5d4cb957169b192eb5648a34bf73525c51a5f94681929d18d586f4e890f063df24395c65bde50344205d19e WHIRLPOOL 47cea0477e9a9fda228f07c3171c4c3427beeda977e559c17d9d7a4654791e444c74d0c5e2a552f10f726218e7cc4d9b1efe38fa7fee6d25556560c3eea1255d
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild
new file mode 100644
index 00000000000..dd33bda2899
--- /dev/null
+++ b/gnome-extra/gnome-characters/gnome-characters-3.16.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="${COMMON_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:3[introspection]
+ >=x11-libs/pango-1.36[introspection]
+"
+DEPEND="${RDEPEND}
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50.1
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( dev-util/dogtail )
+"
+
+src_configure() {
+ gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+ Xemake check
+}
diff --git a/gnome-extra/gnome-characters/metadata.xml b/gnome-extra/gnome-characters/metadata.xml
new file mode 100644
index 00000000000..dad9001338d
--- /dev/null
+++ b/gnome-extra/gnome-characters/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
new file mode 100644
index 00000000000..dd34fa42a66
--- /dev/null
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-clocks-3.14.1.tar.xz 872276 SHA256 9d6a6fe22e3e4569da44bb93e5e26eb3d3faf2b2edadfd45b088cea0e2c94b4b SHA512 6265f768dc6d87624c8f92690bdddc1b318bc97e7d18cad8654cc4ba75ec3265dabdbecf3c25cd8273e300f7febc2d07efa29d174425bb4d62905ead1bc391b2 WHIRLPOOL 95028888cfc9c79018085e49659a690b1ba8620e3de96e9e7c017e2cb0cfd09fc12c13cc63031e591e36c1c55f5a6e79f837d07a0041b3f6599a1f7fa360ce71
+DIST gnome-clocks-3.16.1.tar.xz 871648 SHA256 1804bac40d95044d43d6c04762dd2a0785f8783b38d9393290c31face083f3cc SHA512 bb41051259786f30e96c4551473f789c980ddcd39f10a7921c727068778464590c459a8a129740d1bc89a080c615e16429aa5287ee7b2570f3ce1fd4905a1853 WHIRLPOOL d21f9261e149c4f3a4ade4dcfc4e95bbbc7a3c11f3c899ab19ae6c5987d2cba599a35506005f93e08e6d19fac9e2ad4f21d2787faa73ff4e84d87c9c479c39c0
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.14.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.14.1.ebuild
new file mode 100644
index 00000000000..91a53749319
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.14.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="http://live.gnome.org/GnomeClocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.39:2
+ >=x11-libs/gtk+-3.12:3
+ >=media-libs/libcanberra-0.30
+ >=dev-libs/libgweather-3.13.91:2=
+ >=gnome-base/gnome-desktop-3.7.90:3=
+ >=sci-geosciences/geocode-glib-0.99.4
+ >=app-misc/geoclue-1.99.3:2.0
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
new file mode 100644
index 00000000000..6b5f9e3b728
--- /dev/null
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.16.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+
+inherit gnome2 vala
+
+DESCRIPTION="Clocks application for GNOME"
+HOMEPAGE="http://live.gnome.org/GnomeClocks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-misc/geoclue-1.99.3:2.0
+ >=dev-libs/glib-2.39: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.12:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.50.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure ITSTOOL=$(type -P true)
+}
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
new file mode 100644
index 00000000000..6e0e2ecb48c
--- /dev/null
+++ b/gnome-extra/gnome-clocks/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-color-chooser/Manifest b/gnome-extra/gnome-color-chooser/Manifest
new file mode 100644
index 00000000000..41640f7bf20
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/Manifest
@@ -0,0 +1 @@
+DIST gnome-color-chooser-0.2.5.tar.bz2 228808 SHA256 99133af61f5c2fe2272de115b485471dc4038f5d6964f2fab3feb574a4c1afd7 SHA512 bd29e005456142ffa459f38aedce13302e60dbb6e649883d099810df1f6b3765c28b8c69ef3f19c8252c2fec895df90ae660a43c5790d204e8690c74b35f3cc4 WHIRLPOOL 6fd17d84d6fcb40e99af05bef37893653280e870c91a24b78f9cbef5e1f2835005dde8bac9875cb47e6f07a534ebb308d9e4ffaae098feda9c91dfd6e38dbb3f
diff --git a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
new file mode 100644
index 00000000000..a5ab501a2f7
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2 flag-o-matic
+
+DESCRIPTION="GTK+/GNOME color customization tool"
+HOMEPAGE="http://gnomecc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gnomecc/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug"
+
+RDEPEND="dev-cpp/atkmm
+ >=dev-cpp/libglademm-2.6.0:2.4
+ dev-cpp/glibmm:2
+ >=dev-cpp/gtkmm-2.8.0:2.4
+ dev-libs/glib:2
+ dev-libs/libsigc++:2
+ >=dev-libs/libxml2-2.6.0
+ >=gnome-base/libgnome-2.16.0
+ >=gnome-base/libgnomeui-2.14.0
+ x11-libs/gtk+:2
+ x11-libs/pango"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ # Don't pass --enable/disable-assert since it has broken
+ # AC_ARG_ENABLE call. Pass -DNDEBUG to cppflags instead.
+ use debug || append-cppflags -DNDEBUG
+
+ econf \
+ --disable-dependency-tracking \
+ --disable-link-as-needed
+}
+
+pkg_postinst() {
+ elog "To use gnome-color-chooser themes you may need to add:"
+ elog " include \".gtkrc-2.0-gnome-color-chooser\""
+ elog "to ~/.gtkrc-2.0 for each user, otherwise themes may not be applied."
+
+ gnome2_pkg_postinst
+}
diff --git a/gnome-extra/gnome-color-chooser/metadata.xml b/gnome-extra/gnome-color-chooser/metadata.xml
new file mode 100644
index 00000000000..0bed7b3b76d
--- /dev/null
+++ b/gnome-extra/gnome-color-chooser/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <description>This package lacks a primary herd or maintainer.</description>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">gnomecc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
new file mode 100644
index 00000000000..9b9981a3b98
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-color-manager-3.12.3.tar.xz 2618564 SHA256 ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039 SHA512 991f2e98f60255ad28fb05d616ea0ac970cdc51558bd33ded5a89ab792f5c807f689c1a3ca4de4ae260a5e399afe75dac7c05b897423bf9a1052533452b8f555 WHIRLPOOL e310e478c93b158f21606e36b17e00f86ddfff05ff86655404fdccd88c43cf29ed96de0a731cb70ec29d440cc3bc3a43461767b25942cdfffba5ef3af80aec1e
+DIST gnome-color-manager-3.14.2.tar.xz 2630640 SHA256 a2fa17f17c1c7259dbf6f042b7adf2816a7ba54747706e1b245bcd6d6274eeef SHA512 662a35a841c410cedcb797187ceb6fa2abf2329822dd787d4c97aa97225d7a31899551f9425c59b7bc0a4f426c9f908d8d3d02c1111691991a92c42923df39af WHIRLPOOL c4a171baa678c9f5075c5d490fd72122ad9b92a19405dd7e770f2b311bab1d23256e7b9ce15d72e3f7dda703692076ed1318cb9cc108c96f3a3121fc9ad7b885
+DIST gnome-color-manager-3.16.0.tar.xz 2632592 SHA256 408890ae1d15cff6385b61b61e1a2de0b4236ef706eddd96181b227fda1daf0f SHA512 cdd6c2170d3335610cc32250ccd6c214e700e5f27d211757730e1b3a794d6651ec3b06bbae3b3e2782a784c175b4666d3b4761b47ebaecced84667d6c8dbaa4d WHIRLPOOL fd51703609f4a6d7125cc07c08cf96b0cf0d206a7299996d5885c4494f2311d2a2f2c9bb494007440f9beecb43a96d0d73561091f69e52368dfc740c269c3215
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
new file mode 100644
index 00000000000..2e5c31fa935
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.12.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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
+COMMON_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.90
+ >=x11-misc/colord-0.1.34:0=
+ >=x11-libs/colord-gtk-0.1.20
+
+ packagekit? ( app-admin/packagekit-base )
+ raw? ( media-gfx/exiv2 )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-dtd:4.1
+ app-text/docbook-sgml-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # Always enable tests since they are check_PROGRAMS anyway
+ gnome2_src_configure \
+ --disable-static \
+ --enable-tests \
+ $(use_enable packagekit) \
+ $(use_enable raw exiv) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ Xemake 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/gnome-color-manager-3.14.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild
new file mode 100644
index 00000000000..1bc89120da4
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.14.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+IUSE="packagekit raw"
+
+# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
+COMMON_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-0.1.34:0=
+ >=x11-libs/colord-gtk-0.1.20
+
+ packagekit? ( app-admin/packagekit-base )
+ raw? ( media-gfx/exiv2 )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-dtd:4.1
+ app-text/docbook-sgml-utils
+ dev-libs/appstream-glib
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ 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) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ Xemake 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/gnome-color-manager-3.16.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
new file mode 100644
index 00000000000..f42e905bb58
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.16.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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="~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
+COMMON_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-0.1.34:0=
+ >=x11-libs/colord-gtk-0.1.20
+
+ packagekit? ( app-admin/packagekit-base )
+ raw? ( media-gfx/exiv2 )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-dtd:4.1
+ app-text/docbook-sgml-utils
+ dev-libs/appstream-glib
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ 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) \
+ ITSTOOL=$(type -P true)
+}
+
+src_test() {
+ Xemake 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
new file mode 100644
index 00000000000..9ac3de3710d
--- /dev/null
+++ b/gnome-extra/gnome-color-manager/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <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/Manifest b/gnome-extra/gnome-commander/Manifest
new file mode 100644
index 00000000000..171df884c72
--- /dev/null
+++ b/gnome-extra/gnome-commander/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-commander-1.4.2.tar.xz 6285452 SHA256 8f47ac8428086406536c45b53cbf23b734322f2a557d91698cdeb2bd296f3029 SHA512 ad4b9b203f7f0040338f869fa4549a8d75494617d4117eab3449810467447c03c7e3d3f8ef09e755565f0f1266ead0981f8523619087284a891e61d0b6301d9b WHIRLPOOL a12f8cb94da1b8c5702e29c4f0f30df33181522c96ea68b1bf9d1c536238cff6ef968734b2c1a3df745d90b734c7e86e7cf13f6c306978a130b80920780a5960
+DIST gnome-commander-1.4.6.tar.xz 6350560 SHA256 55f3dd2ee4295c4b88a5c7810bbbd1db126213871b263dd5a44c0d48e8ef3a01 SHA512 e678234ffa12c4c44213c2a512a993008656e9a918f66d2731ab6f462f4c0345b6b71db72cae90b01309e5f422561cc6a09f631c90d906f49dc39b4f8c8f8ad2 WHIRLPOOL 5d2373a668ca2575726dce2d60134927b970e61e9da6b6c71b07f44dee623d73332eea69ebf95340fed3d324595257f544190db78da9b6d6716ece3ac9cb180e
+DIST gnome-commander-1.4.7.tar.xz 6368468 SHA256 54ac33b7df1268a8b1acf18d0b9dda35fa7438e15e2ace0f062e42525528a517 SHA512 3d7a5b00ffa5dd4666322312165670c8a04c6819234d3b3e5e44df2f3fb300ccac1ee8c4fb3961e963786eef543d8a77fcad3454b043dd5943f54d36dadf4403 WHIRLPOOL c6d73d58927bb9f6e224dff107b54047b95609060408b36992b4890318ebcb45a042f5117a3ed121d7fc5b563bbf402237e0a6bf94f684825d7ff0598a4eab23
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.2.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.2.ebuild
new file mode 100644
index 00000000000..5b2fe06d50d
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A full featured, twin-panel file manager for Gnome2"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="chm doc exif gsf pdf python taglib"
+
+RDEPEND="app-text/gnome-doc-utils
+ >=dev-libs/glib-2.6.0:2
+ >=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 )
+ doc? ( app-text/scrollkeeper )
+ exif? ( >=media-gfx/exiv2-0.14 )
+ gsf? ( >=gnome-extra/libgsf-1.12.0 )
+ pdf? ( >=app-text/poppler-0.18 )
+ python? ( >=dev-python/gnome-vfs-python-2.0.0 )
+ taglib? ( >=media-libs/taglib-1.4 )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_configure() {
+ G2CONF="$(use_enable doc scrollkeeper)
+ $(use_enable python)
+ $(use_with chm libchm)
+ $(use_with exif exiv2)
+ $(use_with gsf libgsf)
+ $(use_with taglib)
+ $(use_with pdf poppler)"
+ gnome2_src_configure
+}
+
+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.4.6.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.6.ebuild
new file mode 100644
index 00000000000..461187e76b5
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm doc exif gsf pdf python taglib"
+
+RDEPEND="app-text/gnome-doc-utils
+ >=dev-libs/glib-2.6.0:2
+ >=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 )
+ doc? ( app-text/scrollkeeper )
+ exif? ( >=media-gfx/exiv2-0.14 )
+ gsf? ( >=gnome-extra/libgsf-1.12.0 )
+ pdf? ( >=app-text/poppler-0.18 )
+ python? ( >=dev-python/gnome-vfs-python-2.0.0 )
+ taglib? ( >=media-libs/taglib-1.4 )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_configure() {
+ G2CONF="$(use_enable doc scrollkeeper)
+ $(use_enable python)
+ $(use_with chm libchm)
+ $(use_with exif exiv2)
+ $(use_with gsf libgsf)
+ $(use_with taglib)
+ $(use_with pdf poppler)"
+ gnome2_src_configure
+}
+
+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.4.7.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.7.ebuild
new file mode 100644
index 00000000000..4b9ca82e121
--- /dev/null
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A graphical, full featured, twin-panel file manager"
+HOMEPAGE="http://gcmd.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chm exif gsf pdf python taglib"
+
+RDEPEND="
+ app-text/gnome-doc-utils
+ >=dev-libs/glib-2.6.0:2
+ >=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 )
+ pdf? ( >=app-text/poppler-0.18 )
+ python? ( >=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
+"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_configure() {
+ DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable python) \
+ $(use_with chm libchm) \
+ $(use_with exif exiv2) \
+ $(use_with gsf libgsf) \
+ $(use_with taglib) \
+ $(use_with pdf poppler)
+}
+
+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
new file mode 100644
index 00000000000..53b83744b9f
--- /dev/null
+++ b/gnome-extra/gnome-commander/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>u.scholz83@gmx.de</email>
+ <name>Uwe Scholz</name>
+ <description>Proxy maintainer. Assign bugs to him.</description>
+ </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="pdf">Add metadata support for PDF</flag>
+ <flag name="python">Add support for python plugins"</flag>
+ <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
new file mode 100644
index 00000000000..a89a8209003
--- /dev/null
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-contacts-3.14.2.tar.xz 749320 SHA256 9a21171cb7a08299a937b7d940e362411b08cc8adbd248d5a1f59107f5d2925d SHA512 8b05f8313f5448f8922826759aa4eac9d5f64a3ef11cf49fae08572c7f19e9ce420fdf41e61451399bbc7487047ab53ab32a14b6dee22889a6624db313022c70 WHIRLPOOL 1d094fc0023bf44979bd730aa5c3f5ab876112cd1eddf7586dfcddbf822c083e60b142727726f26cdd473f30ec6ee0d93c8d414c99a7ff14a38cf92f0c76ce17
+DIST gnome-contacts-3.16.2.tar.xz 767720 SHA256 fb625a40fe915d866625a7d688c9a3b454d198c9474ce2efc3979f2b0d1687e7 SHA512 287f81be4452eb2fff6f0b3ab1b00aa4cb8fac1157f62dcd6a9f61928151617ca69f0b6463c83c69ad4d85e9656c49d65eb603f8f39d036bd7091353dc3b9ab7 WHIRLPOOL d633db8776914f287030b0ee2b473e694513b974fc47b1fcb93fedcb657438eda6fef998e971553e9e4071a9961102930ed02304c1847fa93fb3e01e85e92b28
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild
new file mode 100644
index 00000000000..edb2970b1aa
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.14.2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+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[introspection]
+ gnome-extra/evolution-data-server[vala]
+ net-libs/telepathy-glib[vala]
+ x11-libs/libnotify[introspection]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+ >=dev-libs/folks-0.9.5:=[eds,telepathy]
+ >=dev-libs/glib-2.37.6:2
+ >=dev-libs/libgee-0.10:0.8
+ >=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
+ >=gnome-base/gnome-desktop-3.0:3=
+ net-libs/gnome-online-accounts
+ >=net-libs/telepathy-glib-0.17.5
+ x11-libs/cairo:=
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libnotify:=
+ >=x11-libs/gtk+-3.12:3
+ x11-libs/pango
+ v4l? ( >=media-video/cheese-3.5.91:= )
+"
+DEPEND="${RDEPEND}
+ ${VALA_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+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 $(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
new file mode 100644
index 00000000000..3da430dca24
--- /dev/null
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.16.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+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[introspection]
+ gnome-extra/evolution-data-server[vala]
+ net-libs/telepathy-glib[vala]
+ x11-libs/libnotify[introspection]
+"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
+RDEPEND="
+ >=dev-libs/folks-0.9.5:=[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-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/libnotify:=
+ >=x11-libs/gtk+-3.12: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
+"
+
+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 $(use_with v4l cheese)
+}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
new file mode 100644
index 00000000000..6e0e2ecb48c
--- /dev/null
+++ b/gnome-extra/gnome-contacts/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
new file mode 100644
index 00000000000..778d57884ec
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/Manifest
@@ -0,0 +1 @@
+DIST gnome-directory-thumbnailer-0.1.6.tar.xz 260656 SHA256 35e6c8b4d11553b24eadb21dc2367072eedbd284cec4c23d06492ab2f26d0e04 SHA512 772c1e451d896d3704c25b5ab17ba74a52c14fb1103fb4ab18c67c6b2b5714b7ff5ac020252630b729aa081c8e1836a437487691590c3be1e63a0cc654f32dcf WHIRLPOOL 486277c694b0467c879cadace0f858e9a0e8346f024d4f1c54c958f1ac8a900012d901f11253f61e53e203535af56351f105977907ec2fe11d7db49faa3e22d5
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.6.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.6.ebuild
new file mode 100644
index 00000000000..b7576f20ffd
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Thumbnail generator for directories"
+HOMEPAGE="https://wiki.gnome.org/GnomeDirectoryThumbnailer"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="amd64"
+
+RDEPEND="
+ >=dev-libs/glib-2.35:2
+ >=x11-libs/gdk-pixbuf-2.6: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
new file mode 100644
index 00000000000..dad9001338d
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-do-plugins/Manifest b/gnome-extra/gnome-do-plugins/Manifest
new file mode 100644
index 00000000000..4eb0613a430
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/Manifest
@@ -0,0 +1 @@
+DIST gnome-do-plugins-0.8.5.tar.gz 3176035 SHA256 c4b544bd08a31e86b83311c49db85d8fdf3130803dfd37acd0c89e7843548f3c SHA512 55b1287fb1cca7cea8b681ebce470ee405594b64d6bf60b0f2dac60cc4267ac28c22fd8bdd8ffa9893abba7e93844eed498799cbe6594098bdca3d38923ea890 WHIRLPOOL dfa3810332f495f96085beef6c8893f4975da21050ed41d231ead43d3b4833d8973be112809bd08a0bda79c578e45e52cb3a414e689c6e9b304f62a15f458b6f
diff --git a/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild
new file mode 100644
index 00000000000..e25e772eed9
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/gnome-do-plugins-0.8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2 mono-env versionator
+
+MY_PN="do-plugins"
+PVC=$(get_version_component_range 1-3)
+
+DESCRIPTION="Plugins to put the Do in Gnome Do"
+HOMEPAGE="https://launchpad.net/do-plugins"
+SRC_URI="https://launchpad.net/${MY_PN}/trunk/${PVC}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="banshee"
+
+RDEPEND="
+ >=gnome-extra/gnome-do-0.9
+ dev-dotnet/wnck-sharp
+ banshee? ( >=media-sound/banshee-1.4.2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Skip failing plugins (from ArchLinux)
+ sed -i -e '/DiskMounter/d
+ /Transmission/d' Makefile.am || die
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use banshee) \
+ --disable-empathy \
+ --disable-flickr \
+ --disable-transmission
+}
+
+src_compile() {
+ # The make system is unfortunately broken for parallel builds and
+ # upstream indicated on IRC that they have no intention to fix
+ # that.
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile
+}
diff --git a/gnome-extra/gnome-do-plugins/metadata.xml b/gnome-extra/gnome-do-plugins/metadata.xml
new file mode 100644
index 00000000000..767c8263a78
--- /dev/null
+++ b/gnome-extra/gnome-do-plugins/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="banshee">Enables the Banshee (<pkg>media-sound/banshee</pkg>) plugin</flag>
+ </use>
+ <upstream>
+ <remote-id type="launchpad">do-plugins</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-do/Manifest b/gnome-extra/gnome-do/Manifest
new file mode 100644
index 00000000000..0c146fad184
--- /dev/null
+++ b/gnome-extra/gnome-do/Manifest
@@ -0,0 +1 @@
+DIST gnome-do-0.9.tar.gz 881467 SHA256 554b6f7f2b6e8c5fcdaeb41e17e460ac0b7f26bde7d42182cbec08b3abfd5317 SHA512 7fba3291c0320e92ab3c4a696c3e99bcf8a6171dae592a492a55dddfbf73355f749ebbf720f0a3d0e667b949cc74b8dcbba46af57e103dc3d0d3e5aa120296f9 WHIRLPOOL 2e7f6181a4aeff90553f349a237108280acd43e4ff0a971c61db14c9ad79e62258fadd3812c9085e9ac0b95f3527f483be19a5d9e14504d634caeb2ef9507296
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch
new file mode 100644
index 00000000000..02d973aa1e3
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-gtk-2.22.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=346123
+
+Removes depracted use of gdk_display.
+
+=== modified file 'libdo/keybinder.c'
+--- libdo/keybinder.c 2009-07-23 07:17:00 +0000
++++ libdo/keybinder.c 2010-11-09 10:45:25 +0000
+@@ -319,7 +319,7 @@
+ XModifierKeymap *mod_keymap;
+ gboolean retval = FALSE;
+
+- mod_keymap = XGetModifierMapping (gdk_display);
++ mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
+
+ map_size = 8 * mod_keymap->max_keypermod;
+
+
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch
new file mode 100644
index 00000000000..2e492a87edd
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.3.1-mono-2.8.patch
@@ -0,0 +1,70 @@
+https://bugs.launchpad.net/do/+bug/634556
+https://bugs.launchpad.net/do/+bug/634550
+
+Patches by Andrew Jorgensen
+
+--- Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do.Interface.Linux.Docky/src/Docky.Interface/TextRenderContext.cs 2010-09-01 13:11:53.000000000 -0600
+@@ -45,12 +45,12 @@
+
+ public TextRenderContext (Cairo.Context cr, string text, int width)
+ {
+- Context = cr;
+- Text = text;
+- Alignment = Alignment.Left;
+- MaximumWidth = width;
+- WrapMode = WrapMode.WordChar;
+- EllipsizeMode = EllipsizeMode.End;
++ this.Context = cr;
++ this.Text = text;
++ this.Alignment = Alignment.Left;
++ this.MaximumWidth = width;
++ this.WrapMode = WrapMode.WordChar;
++ this.EllipsizeMode = EllipsizeMode.End;
+ }
+ }
+ }
+--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2010-09-01 13:58:26.000000000 -0600
+@@ -57,7 +57,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.ColorConfigurationWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.ColorConfigurationWidget";
++ base.Name = "Do.UI.ColorConfigurationWidget";
+ // Container child Do.UI.ColorConfigurationWidget.Gtk.Container+ContainerChild
+ this.vbox2 = new Gtk.VBox();
+ this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs 2010-09-01 13:58:43.000000000 -0600
+@@ -33,7 +33,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.GeneralPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.GeneralPreferencesWidget";
++ base.Name = "Do.UI.GeneralPreferencesWidget";
+ // Container child Do.UI.GeneralPreferencesWidget.Gtk.Container+ContainerChild
+ this.alignment4 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+ this.alignment4.Name = "alignment4";
+--- Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs 2010-09-01 13:59:08.000000000 -0600
+@@ -27,7 +27,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.KeybindingsPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.KeybindingsPreferencesWidget";
++ base.Name = "Do.UI.KeybindingsPreferencesWidget";
+ // Container child Do.UI.KeybindingsPreferencesWidget.Gtk.Container+ContainerChild
+ this.vbox2 = new Gtk.VBox();
+ this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2010-09-01 13:59:19.000000000 -0600
+@@ -43,7 +43,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.ManagePluginsPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.ManagePluginsPreferencesWidget";
++ base.Name = "Do.UI.ManagePluginsPreferencesWidget";
+ // Container child Do.UI.ManagePluginsPreferencesWidget.Gtk.Container+ContainerChild
+ this.vbox3 = new Gtk.VBox();
+ this.vbox3.Name = "vbox3";
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.4-mono-2.8.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.4-mono-2.8.patch
new file mode 100644
index 00000000000..4054ae99ba1
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.4-mono-2.8.patch
@@ -0,0 +1,48 @@
+https://bugs.launchpad.net/do/+bug/634550
+
+Patches by Andrew Jorgensen
+
+--- Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ColorConfigurationWidget.cs 2010-09-01 13:58:26.000000000 -0600
+@@ -57,7 +57,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.ColorConfigurationWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.ColorConfigurationWidget";
++ base.Name = "Do.UI.ColorConfigurationWidget";
+ // Container child Do.UI.ColorConfigurationWidget.Gtk.Container+ContainerChild
+ this.vbox2 = new Gtk.VBox();
+ this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.GeneralPreferencesWidget.cs 2010-09-01 13:58:43.000000000 -0600
+@@ -33,7 +33,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.GeneralPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.GeneralPreferencesWidget";
++ base.Name = "Do.UI.GeneralPreferencesWidget";
+ // Container child Do.UI.GeneralPreferencesWidget.Gtk.Container+ContainerChild
+ this.alignment4 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+ this.alignment4.Name = "alignment4";
+--- Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.KeybindingsPreferencesWidget.cs 2010-09-01 13:59:08.000000000 -0600
+@@ -27,7 +27,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.KeybindingsPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.KeybindingsPreferencesWidget";
++ base.Name = "Do.UI.KeybindingsPreferencesWidget";
+ // Container child Do.UI.KeybindingsPreferencesWidget.Gtk.Container+ContainerChild
+ this.vbox2 = new Gtk.VBox();
+ this.vbox2.Name = "vbox2";
+--- Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2009-06-28 18:19:29.000000000 -0600
++++ Do/gtk-gui/Do.UI.ManagePluginsPreferencesWidget.cs 2010-09-01 13:59:19.000000000 -0600
+@@ -43,7 +43,7 @@
+ Stetic.Gui.Initialize(this);
+ // Widget Do.UI.ManagePluginsPreferencesWidget
+ Stetic.BinContainer.Attach(this);
+- this.Name = "Do.UI.ManagePluginsPreferencesWidget";
++ base.Name = "Do.UI.ManagePluginsPreferencesWidget";
+ // Container child Do.UI.ManagePluginsPreferencesWidget.Gtk.Container+ContainerChild
+ this.vbox3 = new Gtk.VBox();
+ this.vbox3.Name = "vbox3";
diff --git a/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch b/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch
new file mode 100644
index 00000000000..88fc0c443e3
--- /dev/null
+++ b/gnome-extra/gnome-do/files/gnome-do-0.8.5-glib-2.32.patch
@@ -0,0 +1,16 @@
+ libdo/keybinder.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/libdo/keybinder.h b/libdo/keybinder.h
+index 2a39958..da202e6 100644
+--- a/libdo/keybinder.h
++++ b/libdo/keybinder.h
+@@ -24,7 +24,7 @@
+ #ifndef __DO_KEY_BINDER_H__
+ #define __DO_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
diff --git a/gnome-extra/gnome-do/gnome-do-0.9.ebuild b/gnome-extra/gnome-do/gnome-do-0.9.ebuild
new file mode 100644
index 00000000000..56b1c22d706
--- /dev/null
+++ b/gnome-extra/gnome-do/gnome-do-0.9.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit gnome2 mono-env
+
+DESCRIPTION="GNOME Do allows you to get things done quickly"
+HOMEPAGE="http://do.davebsd.com/"
+SRC_URI="https://launchpad.net/do/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+RDEPEND="<dev-lang/mono-3
+ >=dev-dotnet/gconf-sharp-2.24.0
+ >=dev-dotnet/gtk-sharp-2.12.6
+ >=dev-dotnet/glade-sharp-2.12.6
+ dev-dotnet/ndesk-dbus
+ dev-dotnet/ndesk-dbus-glib
+ >=dev-dotnet/gnome-desktop-sharp-2.26.0
+ >=dev-dotnet/gnome-keyring-sharp-1.0.0
+ >=dev-dotnet/gnome-sharp-2.24.0
+ >=dev-dotnet/gnomevfs-sharp-2.24.0
+ >=dev-dotnet/wnck-sharp-2.24.0
+ >=dev-dotnet/art-sharp-2.24.0
+ >=dev-dotnet/rsvg-sharp-2.24.0
+ dev-dotnet/mono-addins[gtk]
+ dev-dotnet/notify-sharp
+ !<gnome-extra/gnome-do-plugins-0.8.4"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig"
+
+#src_prepare() {
+# sed -e 's: -Werror : :' \
+# -i configure.ac || die
+# eautoreconf
+#
+# gnome2_src_prepare
+#}
diff --git a/gnome-extra/gnome-do/metadata.xml b/gnome-extra/gnome-do/metadata.xml
new file mode 100644
index 00000000000..49a06810948
--- /dev/null
+++ b/gnome-extra/gnome-do/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>giuse88@gmail.com</email>
+ <name>Giuseppe Pes</name>
+ </maintainer>
+ <longdescription>
+ GNOME Do allows you to quickly search for many items present in your GNOME
+ desktop environment (applications, Evolution contacts, Firefox bookmarks,
+ files, artists and albums in Rhythmbox, Pidgin buddies, etc.) and perform
+ commonly used actions on those items (Run, Open, Email, Chat, Play, etc.).
+ GNOME Do is inspired by Quicksilver and GNOME Launch Box.
+ </longdescription>
+ <upstream>
+ <remote-id type="launchpad">do</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
new file mode 100644
index 00000000000..6b8a19dfd68
--- /dev/null
+++ b/gnome-extra/gnome-documents/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-documents-3.14.2.tar.xz 716320 SHA256 08115ae7cb1b427ed78c7d94c7a41d4396249f1d267bb4b9119655f61b898038 SHA512 15e469983745cee49d1245d9ac979eb7b5dd0a2b70ee3f869735436d7592393c05e210a8e1dc75605b2765e9bce66f9dad4012f45641346d0b33cd3df7df1f2d WHIRLPOOL 46bf7525d2273897874caf8fd04222967b9617e50f624b584b0f6cdd364709343231e139a65ba34f65eef34bc41e89b7ab32e5a50c47a7e1f0783aa1920ff02c
+DIST gnome-documents-3.14.3.tar.xz 718680 SHA256 478faba571fb8924043a74c04efa76f9beeed93618383f8771a78d53687ed5cf SHA512 41afb559a2aff1d5f8cc6b123dcfa0bacd16cee3ab7d133ca67b0109cab350ac20f69f84ec57c380ec42a0f9533a26b73240b04b308f39ab5c7dc8e18be14ac0 WHIRLPOOL ef6471e461052b76644f0324068460d3e738f5e1c9fc0f3aaa59feab0e9689e057c8f5ba5df758340539a47f40c5566334834ea39e137b2c9453f6669ac25202
+DIST gnome-documents-3.16.2.tar.xz 2276600 SHA256 ba7230f0f7bd83932e03b1c06c6b67a46f9bc2dd2a93d0193c402d60323ff4a3 SHA512 bb2b9a92a3ed62408227c6213fc68d1c7a1d953d30758dbc88814ce37c50dd870306f901671d2f43417f533527011d93bec6615cbae8de662d806c154c7b837a WHIRLPOOL 319beaa931ca2cbdd257c710f4d37e943fe838b9451200e43155a88fc58237f47d6c5da81338e3e9c6c8b1bfd0ade3dca42beb999dbf15a76a17af22daa2c743
diff --git a/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch b/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch
new file mode 100644
index 00000000000..d3208d57101
--- /dev/null
+++ b/gnome-extra/gnome-documents/files/gnome-documents-3.16.2-parallel-make.patch
@@ -0,0 +1,30 @@
+From d692f7ce6e18fa65e04be397627ae4eceab63f2d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 13 Jun 2015 14:16:03 -0400
+Subject: [PATCH] build: path.js should not be in both nodist_js_DATA and
+ dist_js_DATA
+
+Causes a parallel install failure
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750334
+---
+ src/Makefile-js.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/Makefile-js.am b/src/Makefile-js.am
+index 7e1ef60..97bbd93 100644
+--- a/src/Makefile-js.am
++++ b/src/Makefile-js.am
+@@ -28,8 +28,7 @@ dist_js_DATA = \
+ trackerUtils.js \
+ utils.js \
+ view.js \
+- windowMode.js \
+- path.js
++ windowMode.js
+
+ BUILT_SOURCES += \
+ path.js \
+--
+2.4.3
+
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.14.2.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.14.2.ebuild
new file mode 100644
index 00000000000..eb58e1dad08
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.14.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+ >=app-misc/tracker-1:=
+ >=app-text/evince-3.13.3[introspection]
+ dev-libs/gjs
+ >=dev-libs/glib-2.39.3:2
+ >=dev-libs/gobject-introspection-1.31.6
+ >=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+ gnome-base/gnome-desktop:3=
+ >=media-libs/clutter-1.10:1.0
+ >=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+ >=net-libs/gnome-online-accounts-3.2.0
+ >=net-libs/libsoup-2.41.3:2.4
+ >=net-libs/libzapojit-0.0.2
+ >=net-libs/webkit-gtk-1.10.0:3
+ >=x11-libs/gdk-pixbuf-2.25:2[introspection]
+ >=x11-libs/gtk+-3.13.2:3[introspection]
+ x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/clutter[introspection]
+ net-misc/gnome-online-miners
+ sys-apps/dbus
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure ITSTOOL="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.14.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.14.3.ebuild
new file mode 100644
index 00000000000..eb58e1dad08
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.14.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+ >=app-misc/tracker-1:=
+ >=app-text/evince-3.13.3[introspection]
+ dev-libs/gjs
+ >=dev-libs/glib-2.39.3:2
+ >=dev-libs/gobject-introspection-1.31.6
+ >=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+ gnome-base/gnome-desktop:3=
+ >=media-libs/clutter-1.10:1.0
+ >=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+ >=net-libs/gnome-online-accounts-3.2.0
+ >=net-libs/libsoup-2.41.3:2.4
+ >=net-libs/libzapojit-0.0.2
+ >=net-libs/webkit-gtk-1.10.0:3
+ >=x11-libs/gdk-pixbuf-2.25:2[introspection]
+ >=x11-libs/gtk+-3.13.2:3[introspection]
+ x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/clutter[introspection]
+ net-misc/gnome-online-miners
+ sys-apps/dbus
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure ITSTOOL="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild
new file mode 100644
index 00000000000..0b56416f038
--- /dev/null
+++ b/gnome-extra/gnome-documents/gnome-documents-3.16.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A document manager application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
+COMMON_DEPEND="
+ >=app-misc/tracker-1:=
+ >=app-text/evince-3.13.3[introspection]
+ dev-libs/gjs
+ >=dev-libs/glib-2.39.3:2
+ >=dev-libs/gobject-introspection-1.31.6
+ >=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+ gnome-base/gnome-desktop:3=
+ >=media-libs/clutter-1.10:1.0
+ >=media-libs/clutter-gtk-1.3.2:1.0[introspection]
+ >=net-libs/gnome-online-accounts-3.2.0
+ >=net-libs/libsoup-2.41.3:2.4
+ >=net-libs/libzapojit-0.0.2
+ >=net-libs/webkit-gtk-2.6:4
+ >=x11-libs/gdk-pixbuf-2.25:2[introspection]
+ >=x11-libs/gtk+-3.15.5:3[introspection]
+ x11-libs/pango[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+ media-libs/clutter[introspection]
+ net-misc/gnome-online-miners
+ sys-apps/dbus
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+
+ app-text/yelp-tools
+"
+# eautoreconf requires yelp-tools
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750334
+ epatch "${FILESDIR}"/${PN}-3.16.2-parallel-make.patch
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure ITSTOOL="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-documents/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
new file mode 100644
index 00000000000..3d742554d24
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/Manifest
@@ -0,0 +1 @@
+DIST gnome-dvb-daemon-0.2.10.tar.xz 696372 SHA256 c23fcd4744c91bda065036a1a9b4a77b4665d7ca237f489e89a4c2f3133adcfb SHA512 9bf99f3b9d3c6a96a0fd193e41d98017f60ffa6255ae5fea52d2360fed0a3f292fc28c59060f54eb58e321e32e06693f5443bd3a4aba41cbd579a07a3c9691fb WHIRLPOOL 18eaa5739788ae3d9c44ce596105b64fcf608a875d4aba224abe18c8e1eac14d388c22126a61c92abe5efbf54c1cfc37400eb6b70fb457f597b4cdc1cb3573d6
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
new file mode 100644
index 00000000000..1b2e4a9bf0b
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
+VALA_MIN_API_VERSION="0.16"
+
+inherit eutils python gnome2 multilib vala
+
+DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
+HOMEPAGE="https://live.gnome.org/DVBDaemon"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="nls totem vala"
+
+RDEPEND=">=dev-libs/glib-2.32.0:2
+ >=media-libs/gstreamer-0.10.29:0.10
+ >=media-libs/gst-plugins-good-0.10.14:0.10
+ >=media-libs/gst-plugins-bad-0.10.13:0.10
+ >=dev-libs/libgee-0.5:0
+ >=dev-db/sqlite-3.4
+ >=media-libs/gst-rtsp-server-0.10.7:0.10
+ media-plugins/gst-plugins-dvb:0.10
+ dev-python/gst-python:0.10
+ >=dev-python/pygobject-3.2.1:3
+ >=dev-libs/gobject-introspection-0.10.8
+ x11-libs/gtk+:3[introspection]
+ virtual/libgudev
+ vala? ( $(vala_depend) )
+ totem? ( media-video/totem )"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5.8.1
+ >=dev-util/intltool-0.40.0
+ virtual/pkgconfig
+ nls? ( >=sys-devel/gettext-0.18.1 )
+ >=sys-devel/libtool-2.2.6"
+
+pkg_setup() {
+ G2CONF="${G2CONF} \
+ $(use_enable nls)
+ $(use_enable totem totem-plugin)"
+ use totem && G2CONF="${G2CONF} \
+ --with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins"
+
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_clean_py-compile_files
+ python_convert_shebangs -r 2 .
+ gnome2_src_prepare
+ use vala && vala_src_prepare
+}
+
+pkg_postinst() {
+ python_mod_optimize gnomedvb
+ if use totem; then
+ python_mod_optimize "/usr/$(get_libdir)/totem/plugins"
+ fi
+ gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+ python_mod_cleanup gnomedvb
+ if use totem; then
+ python_mod_cleanup "/usr/$(get_libdir)/totem/plugins"
+ fi
+ gnome2_pkg_postrm
+}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
new file mode 100644
index 00000000000..222c199b4a1
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+ <flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
+ <flag name="vala">Add support for <pkg>dev-lang/vala</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
new file mode 100644
index 00000000000..322c09548ff
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-getting-started-docs-3.14.1.tar.xz 128492484 SHA256 692f62407b412236da0b7b38876bd8e196d5ba0f94160316540753ecca272d79 SHA512 0586c06ccf71159c2c4ae3d28d1f29a328f2466c1dd8062074854fba1e8b3b1b6eeacb2db505d74f7cafa4c75334875e0cd825b6774903328ea6a3c208ed1c44 WHIRLPOOL 91bd33904824cfe1711dc63c883719ebda62edd8890c63d50aae824e16b91f8a98048936268636d2f32d1482dc82207de8d100b7fcf41441b754e373e55f19f4
+DIST gnome-getting-started-docs-3.16.2.tar.xz 126333012 SHA256 ded7d7eea9c74f8b58289f43dad45f83abf5ad845b7ac6a1a6dba66b72199f1f SHA512 2ee10d2d5dd33ee7ab0b4dbd394cb18c4ceb595a6f6a6e1e200cc60cd15dd25c3f59797c4e730a17fbe5898aaa2f555987a06121c000cc523dd78a8fd3b5ff03 WHIRLPOOL 4e359b8a114f5d6adcbcce4cd176aff4308c28760a6d3d7d566b5d2c01ec0cae304cee517f15f0051985224d4b136a02d8e08f4d288940946ae4b7fb0daf7e84
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild
new file mode 100644
index 00000000000..b7985fda694
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.14.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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
+ dev-util/itstool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild
new file mode 100644
index 00000000000..dd1f78fee3c
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.16.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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
+ dev-util/itstool
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+# 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
new file mode 100644
index 00000000000..6e0e2ecb48c
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
new file mode 100644
index 00000000000..dc5157f4865
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-integration-spotify-20140907.tar.gz 6709 SHA256 f1906851329461d3e1a2a7171fd8c6be5082505b04415f2879b1f634b554bbfe SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874 WHIRLPOOL 4f0867fd2aa0d62d9e71c933541896092991ee4389a79845c2ceff2c2712935405134291024817e9039afa0b62da9538cc329e110b739db28e40c1df2a28070e
+DIST gnome-integration-spotify-git-20131013.tgz 6703 SHA256 bb55df923ddf4024f041ccb64753e394083e0c2eac7265f2c875e3432f99f5c8 SHA512 de4033c8bb955732eeb573a9328d068716584b85f4fa62d8090ea9f35c43a032389dd7cbf3d4f3380bb2e46ebc37737c8cf93d67b4f381939742001762da267c WHIRLPOOL 0c5684350fff53b5cb3aa67593c0d12fec69904bca6b55cd70d95a933589be4486e158f4d2cb04e294321ca10c05f2bc062cba0aa3503e6198048743b6d5ec47
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild
new file mode 100644
index 00000000000..ced929fb8b8
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2-utils
+
+DESCRIPTION="GNOME integration for Spotify"
+HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
+SRC_URI="http://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
+S="${WORKDIR}/mrpdaemon-${PN}-df9124d"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-lang/python
+ dev-python/dbus-python
+ media-gfx/imagemagick
+ x11-misc/wmctrl
+ x11-misc/xautomation
+ x11-misc/xdotool
+ x11-apps/xwininfo"
+
+src_install() {
+ dobin 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/gnome-integration-spotify-20140907.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
new file mode 100644
index 00000000000..ebe21c3dd44
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit gnome2-utils
+
+DESCRIPTION="GNOME integration for Spotify"
+HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
+#SRC_URI="http://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=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-lang/python
+ dev-python/dbus-python
+ media-gfx/imagemagick
+ x11-misc/wmctrl
+ x11-misc/xautomation
+ x11-misc/xdotool
+ x11-apps/xwininfo"
+
+src_install() {
+ dobin 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
new file mode 100644
index 00000000000..ff4612c9061
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>prometheanfire@gentoo.org</email>
+ <name>Matthew Thode</name>
+ </maintainer>
+ <longdescription lang="en">
+</longdescription>
+ <upstream>
+ <remote-id type="github">mrpdaemon/gnome-integration-spotify</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
new file mode 100644
index 00000000000..ccd1822d640
--- /dev/null
+++ b/gnome-extra/gnome-logs/Manifest
@@ -0,0 +1 @@
+DIST gnome-logs-3.16.2.tar.xz 624624 SHA256 e139a3c24c850074157fa637fe1449c5279966c48fc2dd223aa61518f792621c SHA512 6cd1e644c57d10102c541f4e4d28992f14cb5ab46bb5ad7c71eea6458bc5b0839fbf8b435f0991299e921c2479642b3c38031717d5b4b14831c990130ecc49f6 WHIRLPOOL a642dc593ffa0a1cf8c22845b35268ee70b6c983d0e7b4e88244448348a3ee2e88b424b5e0f74d4ce37066f49249c316b18b17e25557063ee5c57050ad2a39c3
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild
new file mode 100644
index 00000000000..5d6f3d25013
--- /dev/null
+++ b/gnome-extra/gnome-logs/gnome-logs-3.16.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Log messages and event viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ >=dev-libs/glib-2.43.90:2
+ sys-apps/systemd
+ >=x11-libs/gtk+-3.15.7:3
+"
+DEPEND="${RDEPEND}
+ ~app-text/docbook-xml-dtd-4.3
+ dev-libs/appstream-glib
+ dev-libs/libxslt
+ >=dev-util/intltool-0.50
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure ITSTOOL="$(type -P true)"
+}
diff --git a/gnome-extra/gnome-logs/metadata.xml b/gnome-extra/gnome-logs/metadata.xml
new file mode 100644
index 00000000000..dad9001338d
--- /dev/null
+++ b/gnome-extra/gnome-logs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
new file mode 100644
index 00000000000..37eb36aee31
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/Manifest
@@ -0,0 +1 @@
+DIST gnome-packagekit-3.12.2.tar.xz 4596908 SHA256 a4d5fca6f9481b48202f996c8a3835051c98b6e6df0929394704c3c41e28afb2 SHA512 e1e5cd296e4bc99c13d71805de530be644b4ac3a9bd5580d36ebd880a22292ec91ce9ad28a8ff66f0cb2285a5bc0c80f1b47421c9bbf7b2c9e2c1c17131bc21d WHIRLPOOL 66f23046d3fd262b5a5fbc470d762baaafbb75fb1c9e832f408672b8c399580a1ad2a9e7b03acd81c00c6a486074b224eed4b15d1377354f557823f6282013de
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild
new file mode 100644
index 00000000000..7169668a8bc
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.12.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="PackageKit client for the GNOME desktop"
+HOMEPAGE="http://www.freedesktop.org/software/PackageKit/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls systemd test udev"
+
+# 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+-2.91.0:3
+ >=x11-libs/libnotify-0.7.0:=
+ x11-libs/pango
+ >=dev-libs/dbus-glib-0.73
+
+ >=app-admin/packagekit-base-0.7.2[udev]
+ >=app-admin/packagekit-gtk-0.7.2
+ >=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-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
+# app-text/gnome-doc-utils and dev-libs/libxslt required for gnome help files
+# gtk-doc is generating a useless file, don't need it
+
+# UPSTREAM:
+# misuse of CPPFLAGS/CXXFLAGS ?
+# see if tests can forget about display (use eclass for that ?)
+# intltool and gettext only with +nls
+
+src_prepare() {
+ # Regenerate marshalers for <glib-2.31 compat
+ rm -v src/gpk-marshal.{c,h} || die
+
+ # * 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
+ 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' \
+ -i src/gpk-self-test.c || die
+
+ # Disable stupid flags
+ # FIXME: touching configure.ac triggers maintainer-mode
+ sed -e '/CPPFLAGS="$CPPFLAGS -g"/d' -i configure || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --localstatedir=/var \
+ --enable-iso-c \
+ $(use_enable nls) \
+ $(use_enable systemd) \
+ $(use_enable test tests) \
+ $(use_enable udev gudev) \
+ ITSTOOL="$(type -P true)"
+}
+
+src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+ unset DISPLAY
+ GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-packagekit/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
new file mode 100644
index 00000000000..989e7b045c5
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-power-manager-3.14.1.tar.xz 469568 SHA256 07790a9e8274fe950a6dd653a4e2f4a0f52cb9d89eb9d5320fa6e1b3b3aa9624 SHA512 4089cb3a35e96ac3566adbb2a0905efa048b80794643ca1d979d7208e9f06b9de94b55cad0da36805765d37e5e25727b2baf59af9dc6ea6b515a95600ec69db4 WHIRLPOOL a6d8ed9e42cdec053dfd09c6eb324d03c603278544b35f4b9f98da0c9aef60cfb6d23048bb2d3fbdbfe9766c17941bab16d1eca257328495073e813011914c69
+DIST gnome-power-manager-3.16.1.tar.xz 432360 SHA256 a4177dbff9fac1f1babf0d2715f950ee0fa3dd143d7b5d89311f33afca924231 SHA512 b4f04196f88bb43eaefc910e733cb291fd88c260baae275595fa1e9913ccb2577ea2192238c6bf18297c4cc69b0d0e88571b96ee526f37ad260f6e1b429488da WHIRLPOOL 41841940544807974d8497f0cecd8a20b4b8f18a4bc30155ba9893d45553ac57cc3ee206bc162132933aef6343a19ca30572fe36b7af6d422aef6e7d63c208ee
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild
new file mode 100644
index 00000000000..6ba0bd52be1
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.14.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils 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.36:2
+ >=x11-libs/gtk+-3.3.8:3
+ >=x11-libs/cairo-1
+ >=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-dtd:4.1
+ app-text/docbook-sgml-utils
+ >=app-text/gnome-doc-utils-0.3.2
+ app-text/scrollkeeper
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ x11-proto/randrproto
+ 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() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
new file mode 100644
index 00000000000..513a72b078d
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.16.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="GNOME power management service"
+HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.36:2
+ >=x11-libs/gtk+-3.3.8:3
+ >=x11-libs/cairo-1
+ >=sys-power/upower-0.99:=
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-sgml-dtd:4.1
+ app-text/docbook-sgml-utils
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ x11-proto/randrproto
+ 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() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
new file mode 100644
index 00000000000..13f2b4adffb
--- /dev/null
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <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/Manifest b/gnome-extra/gnome-search-tool/Manifest
new file mode 100644
index 00000000000..5cf9fd53225
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/Manifest
@@ -0,0 +1 @@
+DIST gnome-search-tool-3.6.0.tar.xz 685172 SHA256 a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5 WHIRLPOOL 065121d71b0855bfdae08e1c56e8a6552e78c07af010205d9852dcda06f02e687f66a765ec30e7e2b14bd4cb2ce9e291010dafdb001c50edf2691cffdeffa25e
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
new file mode 100644
index 00000000000..b1a14125ce2
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Search tool for GNOME 3"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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
+ 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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-search-tool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions-topicons/Manifest b/gnome-extra/gnome-shell-extensions-topicons/Manifest
new file mode 100644
index 00000000000..b2cc98c66a9
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons/Manifest
@@ -0,0 +1 @@
+DIST topicons-26.tar.xz 2112 SHA256 e8c937d9029f59717b3b67cb6f44f065f4d01622a71a38bdc16f1886ad537a32 SHA512 82974c444c1ceb23f6d290b3ec2d99b0505b38d39f90033ec8efece7ba5820e578ca53af6413bfa448ea1593522ff1a1aad46e5feafc5e8a8daebbf8873275e4 WHIRLPOOL bcdc3d4dbe074d7f07753cba1341160441161decb58e76934a338a1bf3ae0febf7b9eae4d156a78491e0b2fcfaa7f1cb455155a010872a60e8a7f8f90c0606cf
diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-26.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-26.ebuild
new file mode 100644
index 00000000000..ca699e5c3b3
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-26.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Shows legacy tray icons on top"
+HOMEPAGE="https://extensions.gnome.org/extension/495/topicons/"
+SRC_URI="http://94.247.144.115/repo/topicons/snapshot/topicons-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-3.10
+"
+DEPEND="app-arch/xz-utils"
+
+S="${WORKDIR}/topicons-${PV}"
+
+src_install() {
+ local uuid='topIcons@adel.gadllah@gmail.com'
+ insinto "/usr/share/gnome-shell/extensions/${uuid}"
+ doins *
+}
+
+pkg_postinst() {
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
diff --git a/gnome-extra/gnome-shell-extensions-topicons/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
new file mode 100644
index 00000000000..e99aee70f54
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-shell-extensions-3.14.4.tar.xz 229176 SHA256 05a1d5ecf3ebbf8215b46d91da25f9f6e66e917e79a59d609dd8b65cadf976e0 SHA512 17d041571eaa4717e301ea2c08d54ef7316ed11894d7c93b77314d08cb804665419c40a1225f3f0beb7286bac53f2c4831c3e3d924c8bac0c46e69b2d14749b5 WHIRLPOOL f51ec9bdc8b90f420808f94aea2219c3ae640a0c9f59c4b766e7a305e6f03aa81ebe088071d70f88458dce16f79e9cbbf0924223a773d2174d0c9c08aab52de6
+DIST gnome-shell-extensions-3.16.1.tar.xz 229704 SHA256 88cd3d2df1f0419066a7f01f28ee4fc8f8c4b361dbf44a93067166c8a796a741 SHA512 86e5394cece75f5feb5c79346957f728d107c6c5c3472c7b3c4b34c533a98f981fcc47f10b9b2565c529ef70da83e749287de5940bc8b020148d18c31343813f WHIRLPOOL d739de0750b8ecb4ed3c00f4635864118664e7838da669338f773b29aba069f9782a6dffb734602644906cab41fe6691c50b624257ec0f99c4ee03973a989a5e
+DIST gnome-shell-extensions-3.16.2.tar.xz 231292 SHA256 0dca1677ec9401dd7c1a7261164b7f4cc94d52207637cf9e8e350bb9f6d0e9bf SHA512 f7f2bd9fe0ea2e9e14b7163c30fcf2cd93698f43de6ebc4daf3a655293db438c24d12972ceda2bf95def5ed15891c9f347c8bca404357e1e0ad131ab00cf50dd WHIRLPOOL 216d35ec3a200e9c3ed67ff0912b844394b12e764a1170beaf21162feeec7b7bb4cc1ddfe9efcd3ddff9bd4fc4224ff408bdeaf262b700323507fff08fa47a31
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild
new file mode 100644
index 00000000000..c70c9dd1dba
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.14.4.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 readme.gentoo
+
+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/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ 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/gnome-shell-extensions-3.16.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild
new file mode 100644
index 00000000000..baeef2455c7
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 readme.gentoo
+
+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/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ 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/gnome-shell-extensions-3.16.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild
new file mode 100644
index 00000000000..abbf7b8e122
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.16.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 readme.gentoo
+
+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/gnome-icon-theme-symbolic
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ 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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
new file mode 100644
index 00000000000..18b28b06911
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-shell-frippery-0.10.2.tgz 85044 SHA256 26f9f89a1ee02204918280a5d12a955c5b26bdd9f3ea8d3ac081cd4882d61ec6 SHA512 815faea507d1bdb416427a91cee10e5ac9b853616e0fad0e54492545e2d05d1ff605da2991480e9beaf8348281d321c31df5700d044c80e7fd6b232a417c460b WHIRLPOOL bbecbae05f5c958371f3d0d190ca2b783f3e2ae3cdb2b7e5a43659520d94d8a8b0e78f84aaeb1ace1e3634db0ff00fa0908aa4a904aade6d695ff179a9cc804f
+DIST gnome-shell-frippery-0.9.0.tgz 82883 SHA256 ec48536cd3a543f27b1b07d2b36a220bbd66f2f4b9f71fb6ad712ff457e66343 SHA512 97fa737b2003453f0aba911618b363c138ee43761f351e0a03f968b31c1eae2ab883cb097568ff0f79770c90a598246d891177093fac4bd95ee43434b83fddac WHIRLPOOL 975c721e51a6505a974ee2ad92905665054cadedaf18c37d7773aa51ba0a9f321151f8348ff3ed14a83d7fe4cf3e7b0600a77b062d8f21850a5db0d573793963
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild
new file mode 100644
index 00000000000..ca879412a8c
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.10.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+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.16
+ 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/gnome-shell-frippery-0.9.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild
new file mode 100644
index 00000000000..c591c9337af
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-0.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
+HOMEPAGE="http://intgat.tigress.co.uk/rmy/extensions/index.html"
+SRC_URI="http://intgat.tigress.co.uk/rmy/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.14
+ 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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
new file mode 100644
index 00000000000..7a3b96bf520
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-system-monitor-3.14.1.tar.xz 852712 SHA256 948be34a5c3e91acd4a1af0c7711020dd76d274aac547d5836910f2fde09a5e6 SHA512 09f21f0a7fc3fdf0fc83e37a8429b2868fb8f55f39c3713db565b1d46035fa31907bcd21154636df26e192f2f455207b18f02a91ed59d48af0685f90bb2f23fd WHIRLPOOL 5503e42979785bbb0c9beef99f2d1234be0476b2271b9984fc83a48a9f98946c9a504ebf3e87007c7558cbd8bb91c9e58ca93183beedcbdf01f902b5b9cfafa8
+DIST gnome-system-monitor-3.16.0.tar.xz 856044 SHA256 00936e8b5d29fc01cd6daf6c119242877d81b2dcca33fb0ee9ce4adec8675391 SHA512 22722150478c6d449908b16bfe4683e29151023e8f47407ea76ed09d4612ffee74c190f22e89153b1e21ad990b9fca6e3c42295dee16e16685a08e9349a6a68c WHIRLPOOL 21b96c33c1ea38b58f1fb5a1c8b18147e5c6ff60effe41cfa50b2410b60a378be23d4223ba9d8c83e7ca3e86ca5474a70ede065e27b57eb88f62d162e5c01453
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild
new file mode 100644
index 00000000000..1bc052c0fa3
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.14.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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.12:3[X(+)]
+ >=dev-cpp/gtkmm-3.3.18:3.0
+ >=dev-cpp/glibmm-2.34:2
+ >=dev-libs/libxml2-2.0:2
+ >=gnome-base/librsvg-2.35:2
+
+ systemd? ( >=sys-apps/systemd-38:0= )
+ X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+#eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+ >=app-text/gnome-doc-utils-0.20
+ >=dev-util/intltool-0.41.0
+ virtual/pkgconfig
+
+ systemd? ( !=sys-apps/systemd-43* )
+"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable systemd) \
+ $(use_enable X wnck) \
+ ITSTOOL=$(type -P true)
+}
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild
new file mode 100644
index 00000000000..943cc960ed7
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.16.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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.12:3[X(+)]
+ >=dev-cpp/gtkmm-3.3.18:3.0
+ >=dev-cpp/glibmm-2.34:2
+ >=dev-libs/libxml2-2.0:2
+ >=gnome-base/librsvg-2.35:2
+
+ systemd? ( >=sys-apps/systemd-38:0= )
+ X? ( >=x11-libs/libwnck-2.91.0:3 )
+"
+#eautoreconf requires gnome-base/gnome-common
+DEPEND="${RDEPEND}
+ >=app-text/gnome-doc-utils-0.20
+ >=dev-util/intltool-0.41.0
+ virtual/pkgconfig
+
+ systemd? ( !=sys-apps/systemd-43* )
+"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable systemd) \
+ $(use_enable X wnck) \
+ ITSTOOL=$(type -P true)
+}
diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
new file mode 100644
index 00000000000..4ad8daa8fd7
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<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/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
new file mode 100644
index 00000000000..d2d15b891f3
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-tweak-tool-3.14.2.tar.xz 242680 SHA256 f38dbfabc6f566561592900d17d1c106f22a50438f77d70f9ec4e1093284cb97 SHA512 079943ddaf66a2facb59164ca330485983edd79cf6c4e0f148ae41bc866196b39686f6eee7b5ee9bb0132bbccc12789c4adc96e06dc11b361429bc0398663d5c WHIRLPOOL e34043c603244c304b18bcfd8fdf893b6de755323bdb2d3ac008033da613cbc43731557dd475512799f0b631b3dbb4fc6c074c9be68d620f5862b18aa0766f52
+DIST gnome-tweak-tool-3.14.3.tar.xz 244632 SHA256 efbc1ea34d1a12b910d59b881c959af3b7cc0acbfcc3e284742dec0b5c474f2d SHA512 ea808733a31a268df03a8866539916cc9a96bcf35daa0425c287c9ffa86ece631a56a5e486d86bcb122d2ce78ed8193362f1cf4463fe2d6beabeabf483d7b9d5 WHIRLPOOL 1e2845903c0ab970f584ecb1d2d054aa868d7fddffc81c35acaa0eb1e4e17021ce80a6421d84ed13a9490bf681e993aac36d3a7cc1877c6124b3e4893013091d
+DIST gnome-tweak-tool-3.16.2.tar.xz 242948 SHA256 b1e403725c3489be07e1d754f044d1128eddb38204a344bbe0baa523d531bd64 SHA512 02c0f2c0879e1fba7ced09cd8f973c697db915208df7cc2e13179367b52120c14ad76c395e366b584b88fbf5497b284d1a72a37c60c3db90b146519c9bb451e4 WHIRLPOOL f428cabad9bc2e7d21ce02489ed2dfb98c24b899e04d3a5790abfa0149fa44272ca28e557e5bedb0501f2da28034e84319750f31f4b5a2cc4633ee3378c6f81d
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
new file mode 100644
index 00000000000..b65a713277b
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
@@ -0,0 +1,26 @@
+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/files/gnome-tweak-tool-3.8.1-wm-preferences.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.8.1-wm-preferences.patch
new file mode 100644
index 00000000000..4283b51f571
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.8.1-wm-preferences.patch
@@ -0,0 +1,11 @@
+--- gtweak/gsettings.py.old 2013-11-16 09:00:44.863767301 +0100
++++ gtweak/gsettings.py 2013-11-16 09:01:18.873393932 +0100
+@@ -34,6 +34,8 @@
+ def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+ if not schema_dir:
+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++ if schema_name == "org.gnome.desktop.wm.preferences":
++ schema_filename = schema_name + ".gschema.xml"
+ if not schema_filename:
+ schema_filename = schema_name + ".gschema.xml"
+
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild
new file mode 100644
index 00000000000..1796840e51e
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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 ~sparc x86"
+
+# Newer pygobject needed due upstream bug #723951
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=gnome-base/gsettings-desktop-schemas-3.4
+ >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+"
+# 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[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
+ epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+ # Prevent problems setting WM preferences, upstream bug #706834
+ epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.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.14.3.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild
new file mode 100644
index 00000000000..1796840e51e
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.14.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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 ~sparc x86"
+
+# Newer pygobject needed due upstream bug #723951
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=gnome-base/gsettings-desktop-schemas-3.4
+ >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+"
+# 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[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
+ epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+ # Prevent problems setting WM preferences, upstream bug #706834
+ epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.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.16.2.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild
new file mode 100644
index 00000000000..5314e0a6ad0
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.16.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils 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 ~sparc ~x86"
+
+# Newer pygobject needed due upstream bug #723951
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ >=gnome-base/gsettings-desktop-schemas-3.4
+ >=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
+"
+# 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[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
+ epatch "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
+
+ # Prevent problems setting WM preferences, upstream bug #706834
+ epatch "${FILESDIR}/${PN}-3.8.1-wm-preferences.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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
new file mode 100644
index 00000000000..ea3869df71e
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-user-docs-3.14.2.tar.xz 14526736 SHA256 ee89e0891fcad30ceb9e93e57a40e59730e0fee7973be233e0c4992b1d5726f1 SHA512 a584fbc282fb167fb23a8b1a0327bcfe90450402241d0cfe510b90de3c2362f665e2ff25ac73fae10063ae23ffa03c8555118cc28a720e8e31646c732ea8b54e WHIRLPOOL 0a5b8d1f96c4aed2b315faaf3ac863ed1633665b6be7c10e1d297cb0f7ce1b1fbc859072b07db9712de05a0f5bf80a6603fa5cff59f9f89a229151181a863db1
+DIST gnome-user-docs-3.16.1.tar.xz 14174340 SHA256 9678f8ec22f4ead58c0a6f1c8886d6ee5bda696962b393acc2e6ab742d4c9331 SHA512 4892daac35469a46551833f327f2a7ff5b2b8e7361d223300c6cea7ab1f710760d697aa6f5a524768aed1b10402d00c8a6df371a7aa5c1988bb8ac7b274f666f WHIRLPOOL 07525cce41000fff351bc466383c5baff09d1ffda469d5bd143fcdbf60cae3c5ac8a4b564307acb02a417b990ca18ecf8159e57150a25e6f21790d15269c29dd
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild
new file mode 100644
index 00000000000..010662395a0
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.14.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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/gnome-user-docs-3.16.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild
new file mode 100644
index 00000000000..34dc73c7b5b
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.16.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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
new file mode 100644
index 00000000000..6e0e2ecb48c
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
new file mode 100644
index 00000000000..677a4eeddb8
--- /dev/null
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -0,0 +1 @@
+DIST gnome-user-share-3.14.2.tar.xz 391916 SHA256 6b05b3ef31af3bb39c903f94a0d163c0a9c4aa5266ae98e2281e0613f2972ee9 SHA512 d42587c0c64fda9d051f3d6c792358d02c32b95193df512016a04a0ee4861483f3060f1579de6fa229676795e420cf88732da334757471b79410d3be6ebe8bd1 WHIRLPOOL 14a191b8cbfa218e4dcde379212a00f0753d02726b55b16b9f67fbc2c5484038d9d18ababb5c2019624856041257a88cea6b00a3d4cf21a83c9369b9486452be
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.10.2-launch-obexd.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.10.2-launch-obexd.patch
new file mode 100644
index 00000000000..a6bb00156fe
--- /dev/null
+++ b/gnome-extra/gnome-user-share/files/gnome-user-share-3.10.2-launch-obexd.patch
@@ -0,0 +1,29 @@
+From 5bca8742e96bc5f3447be18e9c6ac5692cc3e3cd Mon Sep 17 00:00:00 2001
+From: Mario Sanchez Prada <mario@endlessm.com>
+Date: Thu, 30 Oct 2014 11:06:44 -0700
+Subject: obex: Make sure obexd daemon is launched if needed when starting to
+ watch it
+
+This fixes a situation where files can't be sent to the computer (e.g.
+from a phone) until you enable and then disable the bluetooth sharing
+options at least once, as the shutting down will cause the obexd daemon
+to run due to the UnregisterAgent D-Bus call in obex_agent_down().
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739417
+
+diff --git a/src/obexpush.c b/src/obexpush.c
+index 6424bd2..6d305d7 100644
+--- a/src/obexpush.c
++++ b/src/obexpush.c
+@@ -740,7 +740,7 @@ on_bus_acquired (GDBusConnection *connection,
+
+ self->obexd_watch_id = g_bus_watch_name_on_connection (self->connection,
+ MANAGER_SERVICE,
+- G_BUS_NAME_WATCHER_FLAGS_NONE,
++ G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+ obexd_appeared_cb,
+ NULL,
+ self,
+--
+cgit v0.10.1
+
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild
new file mode 100644
index 00000000000..76200e16959
--- /dev/null
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.14.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib
+
+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="bluetooth"
+
+# 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,apache2_mpms_prefork]
+ >=x11-libs/libnotify-0.7:=
+ bluetooth? (
+ >=net-wireless/gnome-bluetooth-3.9.3:2=
+ >=net-wireless/bluez-5[obex] )
+"
+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
+"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable bluetooth) \
+ --with-httpd=apache2 \
+ --with-modules-path=/usr/$(get_libdir)/apache2/modules/
+}
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
new file mode 100644
index 00000000000..e98dd9082dc
--- /dev/null
+++ b/gnome-extra/gnome-user-share/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
+
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
new file mode 100644
index 00000000000..6e4c15534ce
--- /dev/null
+++ b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Meta package for utilities for the GNOME desktop"
+HOMEPAGE="https://live.gnome.org/GnomeUtils"
+
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-utils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
new file mode 100644
index 00000000000..498860b2e93
--- /dev/null
+++ b/gnome-extra/gnome-weather/Manifest
@@ -0,0 +1,2 @@
+DIST gnome-weather-3.14.1.tar.xz 10520072 SHA256 e3acea9b5e9e7dd5e9d51c2793c568ea7378b08b4de1bcfe7f0b8b3c2004fe87 SHA512 e167fe07aacc0af8aa30ee40f8aca83e735ddc3c7278b221f09fecc82d513f90250e6079425dc04d4ae865a4a265753b9332234795326a84d7b3b1a228f4afa1 WHIRLPOOL 69a9f3ed5a947f3e4f681c9aa8c6a73f772b4496401a61456e33173cf23ebc34fd8a0711aee6bef889c7077c9cb6141e7036de454356ca9932f7b5d13210eca2
+DIST gnome-weather-3.16.2.1.tar.xz 10344692 SHA256 0fe481d4be192ca32cb401f3f4b74feb0f1ea3241f23dc51ec1949874836e355 SHA512 a4adb392da018cd4033416ae4d4e481a025455fab69213db9ab7fa42add635e87b9ed846bfa69dfdda591fb0ee58cd63c7486b74659f14e23b1bcd97f4d13e8d WHIRLPOOL 30ce35737658507b6d37cdc6e64a736a81ff0869ec9b48dbca094c1da25f622095411a6f67af731f4d68354b352d69e584c841c89b4abafc7fcafcb1e916cdbb
diff --git a/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
new file mode 100644
index 00000000000..c652651f973
--- /dev/null
+++ b/gnome-extra/gnome-weather/files/gnome-weather-3.8.2-temp-unit.patch
@@ -0,0 +1,59 @@
+From 7c901f42d2837e682f37d85b1fa3ee94922f2a05 Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Mon, 13 May 2013 21:19:49 +0000
+Subject: Add a submenu to the app menu to choose the temperature unit
+
+Among all the preferences in the old dialog, temperature unit
+is the only one that makes real sense, as we don't show wind
+speed, visibility or pressure.
+Also, exclude the Kelvin entry, which is there just to make
+cool screenshots :)
+---
+diff --git a/data/app-menu.ui b/data/app-menu.ui
+index 42a16a4..c332595 100644
+--- a/data/app-menu.ui
++++ b/data/app-menu.ui
+@@ -6,12 +6,25 @@
+ <attribute name="action">win.new</attribute>
+ <attribute name="accel">&lt;Primary&gt;n</attribute>
+ </item>
++ </section>
++ <submenu>
++ <attribute translatable="yes" name="label">Temperature unit</attribute>
++ <item>
++ <attribute translatable="yes" name="label">Celsius</attribute>
++ <attribute name="action">app.temperature-unit</attribute>
++ <attribute name="target">centigrade</attribute>
++ </item>
++ <item>
++ <attribute translatable="yes" name="label">Fahrenheit</attribute>
++ <attribute name="action">app.temperature-unit</attribute>
++ <attribute name="target">fahrenheit</attribute>
++ </item>
++ </submenu>
++ <section>
+ <item>
+ <attribute name="action">win.about</attribute>
+ <attribute name="label" translatable="yes">About Weather</attribute>
+ </item>
+- </section>
+- <section>
+ <item>
+ <attribute name="action">app.quit</attribute>
+ <attribute name="label" translatable="yes">Quit</attribute>
+diff --git a/src/main.js b/src/main.js
+index 687b79e..844a0d4 100644
+--- a/src/main.js
++++ b/src/main.js
+@@ -76,6 +76,9 @@ const Application = new Lang.Class({
+ [{ name: 'quit',
+ activate: this._onQuit }]);
+
++ let gwSettings = new Gio.Settings({ schema: 'org.gnome.GWeather' });
++ this.add_action(gwSettings.create_action('temperature-unit'));
++
+ this._initAppMenu();
+
+ this.add_accelerator("Escape", "win.selection-mode(false)", null);
+--
+cgit v0.9.2
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild
new file mode 100644
index 00000000000..c570659ea88
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.14.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+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=""
+
+RDEPEND="
+ >=dev-libs/gjs-1.41.4
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/gobject-introspection-1.35.9
+ >=dev-libs/libgweather-3.9.5
+ >=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+ dev-util/appdata-tools
+ >=dev-util/intltool-0.26
+ virtual/pkgconfig
+"
+
+src_configure() {
+ # dogtail is not packaged in gentoo
+ gnome2_src_configure --disable-dogtail
+}
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild
new file mode 100644
index 00000000000..2d218e40f13
--- /dev/null
+++ b/gnome-extra/gnome-weather/gnome-weather-3.16.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 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="
+ >=dev-libs/gjs-1.43.3
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/gobject-introspection-1.35.9
+ >=dev-libs/libgweather-3.15.90
+ >=x11-libs/gtk+-3.11.4:3
+"
+DEPEND="${RDEPEND}
+ dev-util/appdata-tools
+ >=dev-util/intltool-0.26
+ virtual/pkgconfig
+ test? ( dev-util/dogtail )
+"
+
+src_configure() {
+ gnome2_src_configure $(use_enable test dogtail)
+}
+
+src_test() {
+ Xemake check TESTS_ENVIRONMENT="dbus-run-session"
+}
diff --git a/gnome-extra/gnome-weather/metadata.xml b/gnome-extra/gnome-weather/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gnome-weather/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gnome-web-photo/Manifest b/gnome-extra/gnome-web-photo/Manifest
new file mode 100644
index 00000000000..0490c9a031a
--- /dev/null
+++ b/gnome-extra/gnome-web-photo/Manifest
@@ -0,0 +1 @@
+DIST gnome-web-photo-0.10.6.tar.xz 210176 SHA256 1353fc1abe9fcd38b3e09c6282e43aeb0c306201a4df9e25d4834407ba2cbe7f SHA512 8cdfe4e5b4b0eada66af7b5aa77791597197fa4829a7e8ea02b4204c1f7dfd8b9bd270719c27ed73c9119250c2b2d54dbad6d65250660f4e52c8c49d946df672 WHIRLPOOL ddc989f19b8a84626729389fc4f7010780b200db1f78c078bddab8d6c9791151f33d67be99e1ad5e2676d98678dc11538a37cc05ed71d36ad240c01a06f4e978
diff --git a/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild b/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild
new file mode 100644
index 00000000000..7702ff5edde
--- /dev/null
+++ b/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A tool to generate images and thumbnails from HTML files"
+HOMEPAGE="http://git.gnome.org/browse/gnome-web-photo/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.14:2
+ >=x11-libs/gtk+-2.99.3:3
+ >=net-libs/webkit-gtk-1.1.23:3
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+ G2CONF="${G2CONF} --with-gtk=3.0"
+}
diff --git a/gnome-extra/gnome-web-photo/metadata.xml b/gnome-extra/gnome-web-photo/metadata.xml
new file mode 100644
index 00000000000..2869616d866
--- /dev/null
+++ b/gnome-extra/gnome-web-photo/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/gnome-extra/gpointing-device-settings/Manifest b/gnome-extra/gpointing-device-settings/Manifest
new file mode 100644
index 00000000000..5c7653bfba8
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/Manifest
@@ -0,0 +1 @@
+DIST gpointing-device-settings-1.5.1.tar.gz 458352 SHA256 cccdbb5cd3ea18b9458ca23fd3bfbdc98410917f2037472b08ac239dbd2639b3 SHA512 37bcecdde4da1714de1c0562d0ba8c875aa197a0b2fad55a868d659ad0ed6a37156b408e9ae07f95091391d972ceaa268636ee579f4a3f176203898b227e3b76 WHIRLPOOL 195eebdacd3e02452e7ce3d30c827ba194827427b6b70cdf824ac2dc27179aeeb65710587b3d0c8757819bb95c5c5edf52cd30e318480f005fb8ace2729238f4
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
new file mode 100644
index 00000000000..789925c0bc9
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-crash.patch
@@ -0,0 +1,30 @@
+commit 70add06dec8413965f3e98b6ba9a3c82168ea72c
+Author: Hiroyuki Ikezoe <poincare@ikezoe.net>
+Date: Tue Mar 16 19:56:17 2010 +0900
+
+ Fix crash.
+
+ We need to get xinput property if there is no gconf value for tapping time.
+
+ Fix for #613022.
+
+diff --git a/modules/gpds-touchpad-ui.c b/modules/gpds-touchpad-ui.c
+index 3bbcda6..a1cd31b 100644
+--- a/modules/gpds-touchpad-ui.c
++++ b/modules/gpds-touchpad-ui.c
+@@ -1067,8 +1067,14 @@ set_tapping_time_from_preference (GpdsUI *ui, GtkBuilder *builder)
+ }
+ }
+
+- if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value))
++ if (!gpds_ui_get_gconf_int(ui, GPDS_TOUCHPAD_TAP_TIME_KEY, &value) && !values) {
++ if (!gpds_xinput_ui_get_xinput_int_property(GPDS_XINPUT_UI(ui),
++ GPDS_TOUCHPAD_TAP_TIME,
++ &values, &n_values)) {
++ return;
++ }
+ value = values[0];
++ }
+
+ double_value = value;
+ object = gpds_ui_get_ui_object_by_name(GPDS_UI(ui), "tapping_time_scale");
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
new file mode 100644
index 00000000000..341d96fc9b5
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-fix-build.patch
@@ -0,0 +1,26 @@
+diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac
+--- gpointing-device-settings-1.5.1.orig/configure.ac 2010-02-05 00:38:20.000000000 +0100
++++ gpointing-device-settings-1.5.1/configure.ac 2013-12-17 15:00:08.394574115 +0100
+@@ -3,10 +3,9 @@
+
+ AC_INIT(gpointing-device-settings, 1.5.1,
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings])
+-AM_INIT_AUTOMAKE([1.9 tar-pax])
+-AM_INIT_AUTOMAKE([foreign])
++AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AM_PROG_LIBTOOL
+@@ -146,9 +145,6 @@
+
+ GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS"
+ GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED"
+-GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED"
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
new file mode 100644
index 00000000000..c92f0bd54c9
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-3.2-fix.patch
@@ -0,0 +1,22 @@
+Fixes build failnure on gnome-base/gnome-settings-daemon-3.2.2
+
+ gsd-pointing-device-plugin.c:59:1: warning: 'gsd_pointing_device_plugin_class_finalize' used but never defined [enabled by default]
+ CCLD libpointing-device.la
+ ld: .libs/libpointing_device_la-gsd-pointing-device-plugin.o: relocation R_X86_64_PC32 against undefined symbol `gsd_pointing_device_plugin_class_finalize'
+
+Gentoo-bug: http://bugs.gentoo.org/384001
+Patch-by: battle.jerboa@gmail.com
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2012-02-02 13:32:20.000000000 +0400
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2012-02-02 13:32:04.000000000 +0400
+@@ -214,6 +214,11 @@
+ plugin_class->activate = activate;
+ plugin_class->deactivate = deactivate;
+ }
++
++static void
++gsd_pointing_device_plugin_class_finalize (GsdPointingDevicePluginClass *klass)
++{
++}
+ /*
+ vi:ts=4:nowrap:ai:expandtab:sw=4
+ */
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
new file mode 100644
index 00000000000..f694556b74e
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gsd-crash.patch
@@ -0,0 +1,35 @@
+diff -ru gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+--- gpointing-device-settings-1.5.1-orig/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 01:29:09.204274003 -0500
++++ gpointing-device-settings-1.5.1/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c 2010-12-20 02:15:21.652274002 -0500
+@@ -96,19 +96,21 @@
+ XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
+
+ device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
+- if (notify_event->devchange == DeviceEnabled) {
+- GsdPointingDeviceManager *manager;
++ if (device_info) {
++ if (notify_event->devchange == DeviceEnabled) {
++ GsdPointingDeviceManager *manager;
+
+- if (has_manager(plugin, device_info->name))
+- return GDK_FILTER_CONTINUE;
++ if (has_manager(plugin, device_info->name))
++ return GDK_FILTER_CONTINUE;
+
+- manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
+- device_info->name);
+- if (manager) {
+- gsd_pointing_device_manager_start(manager, NULL);
+- plugin->managers = g_list_prepend(plugin->managers, manager);
++ manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
++ device_info->name);
++ if (manager) {
++ gsd_pointing_device_manager_start(manager, NULL);
++ plugin->managers = g_list_prepend(plugin->managers, manager);
++ }
++ } else if (notify_event->devchange == DeviceRemoved) {
+ }
+- } else if (notify_event->devchange == DeviceRemoved) {
+ }
+ }
+
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
new file mode 100644
index 00000000000..154c5472854
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-gtk22.patch
@@ -0,0 +1,201 @@
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index 8a2d98f..ac0bcf1 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -124,7 +124,9 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
+
+ gint op_code, event, error;
+
+- if (!XQueryExtension(GDK_DISPLAY(),
++ display = gdk_x11_get_default_xdisplay();
++
++ if (!XQueryExtension(display,
+ "XInputExtension",
+ &op_code,
+ &event,
+@@ -132,8 +134,6 @@ add_device_presence_filter (GsdPointingDevicePlugin *plugin)
+ return;
+ }
+
+- display = gdk_x11_get_default_xdisplay();
+-
+ gdk_error_trap_push();
+ DevicePresence(display, xi_presence, class_presence);
+ XSelectExtensionEvent(display,
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
+index 2038d53..f47e0a4 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-touchpad-manager.c
+@@ -348,7 +348,9 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
+
+ gint op_code, event, error;
+
+- if (!XQueryExtension(GDK_DISPLAY(),
++ display = gdk_x11_get_default_xdisplay();
++
++ if (!XQueryExtension(display,
+ "XInputExtension",
+ &op_code,
+ &event,
+@@ -356,8 +358,6 @@ add_device_presence_filter (GsdPointingDeviceManager *manager)
+ return;
+ }
+
+- display = gdk_x11_get_default_xdisplay();
+-
+ gdk_error_trap_push();
+ DevicePresence(display, xi_presence, class_presence);
+ XSelectExtensionEvent(display,
+diff --git a/src/gpds-xinput-pointer-info.c b/src/gpds-xinput-pointer-info.c
+index d38afad..ce9a952 100644
+--- a/src/gpds-xinput-pointer-info.c
++++ b/src/gpds-xinput-pointer-info.c
+@@ -55,7 +55,8 @@ gpds_xinput_utils_collect_pointer_infos (void)
+ XDeviceInfo *device_infos;
+ gint i, n_device_infos;
+
+- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
++ &n_device_infos);
+
+ for (i = 0; i < n_device_infos; i++) {
+ GpdsXInputPointerInfo *info;
+diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
+index 0f7ceea..5a3e3a2 100644
+--- a/src/gpds-xinput-utils.c
++++ b/src/gpds-xinput-utils.c
+@@ -41,7 +41,8 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
+ XDeviceInfo *device_infos;
+ gint i, n_device_infos;
+
+- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(),
++ &n_device_infos);
+
+ for (i = 0; i < n_device_infos; i++) {
+ if (device_infos[i].use != IsXExtensionPointer)
+@@ -68,7 +69,7 @@ gpds_xinput_utils_get_device_info_from_id (XID id, GError **error)
+ XDeviceInfo *device_infos;
+ gint i, n_device_infos;
+
+- device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++ device_infos = XListInputDevices(gdk_x11_get_default_xdisplay(), &n_device_infos);
+
+ for (i = 0; i < n_device_infos; i++) {
+ if (device_infos[i].use != IsXExtensionPointer)
+@@ -125,7 +126,7 @@ gpds_xinput_utils_open_device (const gchar *device_name, GError **error)
+ return NULL;
+
+ gdk_error_trap_push();
+- device = XOpenDevice(GDK_DISPLAY(), device_info->id);
++ device = XOpenDevice(gdk_x11_get_default_xdisplay(), device_info->id);
+ gdk_error_trap_pop();
+ if (!device) {
+ g_set_error(error,
+diff --git a/src/gpds-xinput.c b/src/gpds-xinput.c
+index d8bd1a2..66634b3 100644
+--- a/src/gpds-xinput.c
++++ b/src/gpds-xinput.c
+@@ -100,7 +100,7 @@ dispose (GObject *object)
+ g_free(priv->device_name);
+
+ if (priv->device) {
+- XCloseDevice(GDK_DISPLAY(), priv->device);
++ XCloseDevice(gdk_x11_get_default_xdisplay(), priv->device);
+ priv->device = NULL;
+ }
+
+@@ -199,7 +199,8 @@ get_x_error_text (int x_error_code)
+ {
+ gchar buf[64];
+
+- XGetErrorText(GDK_DISPLAY(), x_error_code, buf, sizeof(buf) - 1);
++ XGetErrorText(gdk_x11_get_default_xdisplay(), x_error_code,
++ buf, sizeof(buf) - 1);
+
+ return g_strdup(buf);
+ }
+@@ -273,7 +274,7 @@ gpds_xinput_set_int_properties_by_name_with_format_type
+ }
+
+ gdk_error_trap_push();
+- XChangeDeviceProperty(GDK_DISPLAY(),
++ XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
+ device, property_atom,
+ XA_INTEGER, format_type, PropModeReplace,
+ (unsigned char*)property_data, n_properties);
+@@ -383,7 +384,8 @@ get_atom (GpdsXInput *xinput, const gchar *property_name, GError **error)
+ if (!device)
+ return -1;
+
+- properties = XListDeviceProperties(GDK_DISPLAY(), device, &n_properties);
++ properties = XListDeviceProperties(gdk_x11_get_default_xdisplay(),
++ device, &n_properties);
+ for (i = 0; i < n_properties; i++) {
+ const gchar *name;
+
+@@ -427,9 +429,9 @@ gpds_xinput_get_int_properties_by_name (GpdsXInput *xinput,
+ return FALSE;
+
+ gdk_error_trap_push();
+- status = XGetDeviceProperty(GDK_DISPLAY(), device, atom, 0, 1000, False,
+- XA_INTEGER, &actual_type, &actual_format,
+- n_values, &bytes_after, &data);
++ status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device, atom,
++ 0, 1000, False, XA_INTEGER, &actual_type,
++ &actual_format, n_values, &bytes_after, &data);
+ gdk_flush();
+ x_error_code = gdk_error_trap_pop();
+ if (status != Success || x_error_code != 0) {
+@@ -523,7 +525,7 @@ gpds_xinput_set_float_properties_by_name (GpdsXInput *xinput,
+ *(property_data + i) = (gfloat)properties[i];
+
+ gdk_error_trap_push();
+- XChangeDeviceProperty(GDK_DISPLAY(),
++ XChangeDeviceProperty(gdk_x11_get_default_xdisplay(),
+ device, property_atom,
+ float_atom, 32, PropModeReplace,
+ (unsigned char*)property_data, n_properties);
+@@ -594,7 +596,8 @@ gpds_xinput_get_float_properties_by_name (GpdsXInput *xinput,
+ return FALSE;
+
+ gdk_error_trap_push();
+- status = XGetDeviceProperty(GDK_DISPLAY(), device, property_atom, 0, 1000, False,
++ status = XGetDeviceProperty(gdk_x11_get_default_xdisplay(), device,
++ property_atom, 0, 1000, False,
+ float_atom, &actual_type, &actual_format,
+ n_properties, &bytes_after, &data);
+ gdk_flush();
+@@ -676,7 +679,8 @@ gpds_xinput_get_button_map (GpdsXInput *xinput,
+ *map = g_new0(guchar, *n_buttons);
+
+ gdk_error_trap_push();
+- status = XGetDeviceButtonMapping(GDK_DISPLAY(), device, *map, *n_buttons);
++ status = XGetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
++ device, *map, *n_buttons);
+ gdk_flush();
+
+ x_error_code = gdk_error_trap_pop();
+@@ -705,7 +709,8 @@ gpds_xinput_set_button_map (GpdsXInput *xinput,
+ return FALSE;
+
+ gdk_error_trap_push();
+- status = XSetDeviceButtonMapping(GDK_DISPLAY(), device, map, n_buttons);
++ status = XSetDeviceButtonMapping(gdk_x11_get_default_xdisplay(),
++ device, map, n_buttons);
+ gdk_flush();
+
+ x_error_code = gdk_error_trap_pop();
+diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
+index a06dcbc..f97f9d4 100644
+--- a/test/test-xinput-utils.c
++++ b/test/test-xinput-utils.c
+@@ -29,7 +29,7 @@ void
+ teardown (void)
+ {
+ if (device)
+- XCloseDevice(GDK_DISPLAY(), device);
++ XCloseDevice(gdk_x11_get_default_xdisplay(), device);
+ g_clear_error(&error);
+ g_clear_error(&expected_error);
+ }
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
new file mode 100644
index 00000000000..3e8612d96a5
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-plugin.patch
@@ -0,0 +1,107 @@
+commit 255334e6749ec4d4358e627dc6693b4159aaf912
+Author: Hiroyuki Ikezoe <poincare@ikezoe.net>
+Date: Fri Mar 12 19:13:54 2010 +0900
+
+ mouse extension -> pointing device.
+
+ Why did I use this weird name?
+
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index db4dd8e..31dd336 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -29,34 +29,34 @@
+ #include "gpds-gconf.h"
+ #include "gpds-xinput-pointer-info.h"
+
+-#define GSD_TYPE_MOUSE_EXTENSION_PLUGIN (gsd_mouse_extension_plugin_get_type ())
+-#define GSD_MOUSE_EXTENSION_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdMouseExtensionPlugin))
+-#define GSD_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
+-#define GSD_IS_MOUSE_EXTENSION_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+-#define GSD_IS_MOUSE_EXTENSION_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_MOUSE_EXTENSION_PLUGIN))
+-#define GSD_MOUSE_EXTENSION_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_MOUSE_EXTENSION_PLUGIN, GsdTracklassPointPluginClass))
++#define GSD_TYPE_POINTING_DEVICE_PLUGIN (gsd_pointing_device_plugin_get_type ())
++#define GSD_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
++#define GSD_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
++#define GSD_IS_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN))
++#define GSD_IS_POINTING_DEVICE_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSD_TYPE_POINTING_DEVICE_PLUGIN))
++#define GSD_POINTING_DEVICE_PLUGIN_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdTracklassPointPluginClass))
+
+-typedef struct _GsdMouseExtensionPlugin GsdMouseExtensionPlugin;
+-typedef struct _GsdMouseExtensionPluginClass GsdMouseExtensionPluginClass;
++typedef struct _GsdPointingDevicePlugin GsdPointingDevicePlugin;
++typedef struct _GsdPointingDevicePluginClass GsdPointingDevicePluginClass;
+
+-struct _GsdMouseExtensionPlugin
++struct _GsdPointingDevicePlugin
+ {
+ GnomeSettingsPlugin parent;
+ GList *managers;
+ };
+
+-struct _GsdMouseExtensionPluginClass
++struct _GsdPointingDevicePluginClass
+ {
+ GnomeSettingsPluginClass parent_class;
+ };
+
+-GType gsd_mouse_extension_plugin_get_type (void) G_GNUC_CONST;
++GType gsd_pointing_device_plugin_get_type (void) G_GNUC_CONST;
+ G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module);
+
+-GNOME_SETTINGS_PLUGIN_REGISTER(GsdMouseExtensionPlugin, gsd_mouse_extension_plugin)
++GNOME_SETTINGS_PLUGIN_REGISTER(GsdPointingDevicePlugin, gsd_pointing_device_plugin)
+
+ static void
+-gsd_mouse_extension_plugin_init (GsdMouseExtensionPlugin *plugin)
++gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
+ {
+ plugin->managers = NULL;
+ }
+@@ -104,10 +104,10 @@ collect_pointer_device_infos_from_gconf (void)
+ static void
+ activate (GnomeSettingsPlugin *plugin)
+ {
+- GsdMouseExtensionPlugin *mouse_extension_plugin;
++ GsdPointingDevicePlugin *pointing_device_plugin;
+ GList *pointer_device_infos, *node;
+
+- mouse_extension_plugin = GSD_MOUSE_EXTENSION_PLUGIN(plugin);
++ pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin);
+
+ pointer_device_infos = collect_pointer_device_infos_from_gconf();
+ for (node = pointer_device_infos; node; node = g_list_next(node)) {
+@@ -120,8 +120,8 @@ activate (GnomeSettingsPlugin *plugin)
+ continue;
+
+ gsd_pointing_device_manager_start(manager, NULL);
+- mouse_extension_plugin->managers =
+- g_list_prepend(mouse_extension_plugin->managers, manager);
++ pointing_device_plugin->managers =
++ g_list_prepend(pointing_device_plugin->managers, manager);
+ }
+ g_list_foreach(pointer_device_infos,
+ (GFunc)gpds_xinput_pointer_info_free, NULL);
+@@ -129,7 +129,7 @@ activate (GnomeSettingsPlugin *plugin)
+ }
+
+ static void
+-stop_all_managers (GsdMouseExtensionPlugin *plugin)
++stop_all_managers (GsdPointingDevicePlugin *plugin)
+ {
+ GList *node;
+
+@@ -147,11 +147,11 @@ stop_all_managers (GsdMouseExtensionPlugin *plugin)
+ static void
+ deactivate (GnomeSettingsPlugin *plugin)
+ {
+- stop_all_managers(GSD_MOUSE_EXTENSION_PLUGIN(plugin));
++ stop_all_managers(GSD_POINTING_DEVICE_PLUGIN(plugin));
+ }
+
+ static void
+-gsd_mouse_extension_plugin_class_init (GsdMouseExtensionPluginClass *klass)
++gsd_pointing_device_plugin_class_init (GsdPointingDevicePluginClass *klass)
+ {
+ GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS(klass);
+
diff --git a/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
new file mode 100644
index 00000000000..1793bdfaa0a
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/files/gpointing-device-settings-1.5.1-reboot.patch
@@ -0,0 +1,266 @@
+commit ff25a24d387887bc3bbacfb5bcaf2756695df096
+Author: Hiroyuki Ikezoe <hiikezoe@gnome.org>
+Date: Sat Jun 26 19:55:40 2010 +0900
+
+ Watch DevicePresenceNotify event.
+
+ Some devices are not reported by xserver at the time of startiung up
+ of gnome-settings-daemon, so we need to watch DevicePresenceNotify
+ event at that time.
+
+ Fix for bug #609050.
+
+diff --git a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+index 31dd336..8a2d98f 100644
+--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
++++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c
+@@ -24,10 +24,13 @@
+ #include <gnome-settings-daemon/gnome-settings-plugin.h>
+ #include <glib/gi18n.h>
+ #include <gconf/gconf-client.h>
++#include <gdk/gdkx.h>
++#include <X11/extensions/XInput.h>
+
+ #include "gsd-pointing-device-manager.h"
+ #include "gpds-gconf.h"
+ #include "gpds-xinput-pointer-info.h"
++#include "gpds-xinput-utils.h"
+
+ #define GSD_TYPE_POINTING_DEVICE_PLUGIN (gsd_pointing_device_plugin_get_type ())
+ #define GSD_POINTING_DEVICE_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GSD_TYPE_POINTING_DEVICE_PLUGIN, GsdPointingDevicePlugin))
+@@ -61,44 +64,90 @@ gsd_pointing_device_plugin_init (GsdPointingDevicePlugin *plugin)
+ plugin->managers = NULL;
+ }
+
+-static GList *
+-collect_pointer_device_infos_from_gconf (void)
++static gboolean
++has_manager (GsdPointingDevicePlugin *plugin, const gchar *device_name)
+ {
+- GConfClient *gconf;
+- GSList *dirs, *node;
+- GList *infos = NULL;
+-
+- gconf = gconf_client_get_default();
+- dirs = gconf_client_all_dirs(gconf, GPDS_GCONF_DIR, NULL);
+-
+- for (node = dirs; node; node = g_slist_next(node)) {
+- const gchar *dir = node->data;
+- gchar *device_type;
+- gchar *device_type_key;
+-
+- device_type_key = gconf_concat_dir_and_key(dir, GPDS_GCONF_DEVICE_TYPE_KEY);
+- device_type = gconf_client_get_string(gconf, device_type_key, NULL);
+- if (device_type) {
+- GpdsXInputPointerInfo *info;
+- gchar *device_name, *unescaped_device_name;
+-
+- device_name = g_path_get_basename(dir);
+- unescaped_device_name = gconf_unescape_key(device_name, -1);
+- info = gpds_xinput_pointer_info_new(unescaped_device_name, device_type);
+- infos = g_list_prepend(infos, info);
+- g_free(unescaped_device_name);
+- g_free(device_name);
++ GList *node;
++
++ for (node = plugin->managers; node; node = g_list_next(node)) {
++ GsdPointingDeviceManager *manager = node->data;
++
++ if (g_str_equal(gsd_pointing_device_manager_get_device_name(manager), device_name))
++ return TRUE;
++ }
++
++ return FALSE;
++}
++
++static GdkFilterReturn
++device_presence_filter (GdkXEvent *xevent,
++ GdkEvent *event,
++ gpointer data)
++{
++ XEvent *xev = (XEvent *)xevent;
++ XEventClass class_presence;
++ int xi_presence;
++ GsdPointingDevicePlugin *plugin = GSD_POINTING_DEVICE_PLUGIN(data);
++
++ DevicePresence(gdk_x11_get_default_xdisplay(), xi_presence, class_presence);
++
++ if (xev->type == xi_presence) {
++ XDeviceInfo *device_info = NULL;
++ XDevicePresenceNotifyEvent *notify_event = (XDevicePresenceNotifyEvent *)xev;
++
++ device_info = gpds_xinput_utils_get_device_info_from_id(notify_event->deviceid, NULL);
++ if (notify_event->devchange == DeviceEnabled) {
++ GsdPointingDeviceManager *manager;
++
++ if (has_manager(plugin, device_info->name))
++ return GDK_FILTER_CONTINUE;
++
++ manager = gsd_pointing_device_manager_new(gdk_x11_get_xatom_name(device_info->type),
++ device_info->name);
++ if (manager) {
++ gsd_pointing_device_manager_start(manager, NULL);
++ plugin->managers = g_list_prepend(plugin->managers, manager);
++ }
++ } else if (notify_event->devchange == DeviceRemoved) {
+ }
++ }
+
+- g_free(device_type_key);
+- g_free(device_type);
++ return GDK_FILTER_CONTINUE;
++}
++
++static void
++add_device_presence_filter (GsdPointingDevicePlugin *plugin)
++{
++ Display *display;
++ XEventClass class_presence;
++ gint xi_presence;
++
++ gint op_code, event, error;
++
++ if (!XQueryExtension(GDK_DISPLAY(),
++ "XInputExtension",
++ &op_code,
++ &event,
++ &error)) {
++ return;
+ }
+
+- g_slist_foreach(dirs, (GFunc)g_free, NULL);
+- g_slist_free(dirs);
+- g_object_unref(gconf);
++ display = gdk_x11_get_default_xdisplay();
+
+- return infos;
++ gdk_error_trap_push();
++ DevicePresence(display, xi_presence, class_presence);
++ XSelectExtensionEvent(display,
++ RootWindow(display, DefaultScreen(display)),
++ &class_presence, 1);
++ gdk_flush();
++ if (!gdk_error_trap_pop())
++ gdk_window_add_filter(NULL, device_presence_filter, plugin);
++}
++
++static void
++remove_device_presence_filter (GsdPointingDevicePlugin *plugin)
++{
++ gdk_window_remove_filter(NULL, device_presence_filter, plugin);
+ }
+
+ static void
+@@ -109,7 +158,10 @@ activate (GnomeSettingsPlugin *plugin)
+
+ pointing_device_plugin = GSD_POINTING_DEVICE_PLUGIN(plugin);
+
+- pointer_device_infos = collect_pointer_device_infos_from_gconf();
++ add_device_presence_filter(pointing_device_plugin);
++
++ pointer_device_infos = gpds_xinput_utils_collect_pointer_infos();
++
+ for (node = pointer_device_infos; node; node = g_list_next(node)) {
+ GsdPointingDeviceManager *manager;
+ GpdsXInputPointerInfo *info = node->data;
+@@ -133,6 +185,8 @@ stop_all_managers (GsdPointingDevicePlugin *plugin)
+ {
+ GList *node;
+
++ remove_device_presence_filter(plugin);
++
+ for (node = plugin->managers; node; node = g_list_next(node)) {
+ GsdPointingDeviceManager *manager = node->data;
+
+diff --git a/src/gpds-xinput-utils.c b/src/gpds-xinput-utils.c
+index 48dc2a5..0f7ceea 100644
+--- a/src/gpds-xinput-utils.c
++++ b/src/gpds-xinput-utils.c
+@@ -62,6 +62,33 @@ gpds_xinput_utils_get_device_info (const gchar *device_name, GError **error)
+ return NULL;
+ }
+
++XDeviceInfo *
++gpds_xinput_utils_get_device_info_from_id (XID id, GError **error)
++{
++ XDeviceInfo *device_infos;
++ gint i, n_device_infos;
++
++ device_infos = XListInputDevices(GDK_DISPLAY(), &n_device_infos);
++
++ for (i = 0; i < n_device_infos; i++) {
++ if (device_infos[i].use != IsXExtensionPointer)
++ continue;
++ if (device_infos[i].id == id) {
++ XFreeDeviceList(device_infos);
++ return &device_infos[i];
++ }
++ }
++
++ XFreeDeviceList(device_infos);
++
++ g_set_error(error,
++ GPDS_XINPUT_UTILS_ERROR,
++ GPDS_XINPUT_UTILS_ERROR_NO_DEVICE,
++ _("No device found for %d."), (int)id);
++
++ return NULL;
++}
++
+ gshort
+ gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error)
+ {
+diff --git a/src/gpds-xinput-utils.h b/src/gpds-xinput-utils.h
+index 9cc4564..74e491a 100644
+--- a/src/gpds-xinput-utils.h
++++ b/src/gpds-xinput-utils.h
+@@ -38,6 +38,8 @@ typedef enum
+ GQuark gpds_xinput_utils_error_quark (void);
+ XDeviceInfo *gpds_xinput_utils_get_device_info (const gchar *device_name,
+ GError **error);
++XDeviceInfo *gpds_xinput_utils_get_device_info_from_id (XID id,
++ GError **error);
+ XDevice *gpds_xinput_utils_open_device (const gchar *device_name, GError **error);
+ Atom gpds_xinput_utils_get_float_atom (GError **error);
+ gshort gpds_xinput_utils_get_device_num_buttons (const gchar *device_name, GError **error);
+diff --git a/test/test-xinput-utils.c b/test/test-xinput-utils.c
+index 29b3f4e..a06dcbc 100644
+--- a/test/test-xinput-utils.c
++++ b/test/test-xinput-utils.c
+@@ -6,6 +6,7 @@
+ void test_exist_device (void);
+ void test_get_float_atom (void);
+ void test_get_device_info (void);
++void test_get_device_info_from_id (void);
+ void test_open_device (void);
+ void test_open_no_device (void);
+ void test_get_device_num_buttons (void);
+@@ -49,7 +50,7 @@ test_get_float_atom (void)
+ void
+ test_get_device_info (void)
+ {
+- XDeviceInfo *device_info = NULL;
++ XDeviceInfo *device_info = NULL;
+ device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
+ cut_assert(device_info);
+
+@@ -57,6 +58,19 @@ test_get_device_info (void)
+ }
+
+ void
++test_get_device_info_from_id (void)
++{
++ XDeviceInfo *device_info = NULL;
++ device_info = gpds_xinput_utils_get_device_info(DEVICE_NAME, &error);
++ cut_assert(device_info);
++
++ gcut_assert_error(error);
++
++ device_info = gpds_xinput_utils_get_device_info_from_id(device_info->id, &error);
++ cut_assert_equal_string(DEVICE_NAME, device_info->name);
++}
++
++void
+ test_open_device (void)
+ {
+ device = gpds_xinput_utils_open_device(DEVICE_NAME, &error);
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
new file mode 100644
index 00000000000..55f3772e87d
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A GTK+ based configuration utility for the synaptics driver"
+HOMEPAGE="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
+SRC_URI="mirror://sourceforge.jp/gsynaptics/45812/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+# recent enough x11-base/xorg-server required
+RDEPEND="
+ >=dev-libs/glib-2.10:2
+ >=x11-libs/gtk+-2.14.0:2
+ >=gnome-base/gconf-2.24:2
+ >=gnome-base/gnome-settings-daemon-2.28
+ >=x11-libs/libXi-1.2
+ >=x11-libs/libX11-1.2.0
+ !<=x11-base/xorg-server-1.6.0
+ !gnome-extra/gsynaptics
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.35.5
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}/${P}-crash.patch" \
+ "${FILESDIR}/${P}-plugin.patch" \
+ "${FILESDIR}/${P}-reboot.patch" \
+ "${FILESDIR}/${P}-gtk22.patch" \
+ "${FILESDIR}/${P}-gsd-crash.patch" \
+ "${FILESDIR}/${P}-gsd-3.2-fix.patch" \
+ "${FILESDIR}/${P}-fix-build.patch"
+
+ # Disable gsd plugin as it's incompatible since 3.8, bug #514672
+ sed -i -e 's/ gnome-settings-daemon-plugins//' modules/Makefile.am || die
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
diff --git a/gnome-extra/gpointing-device-settings/metadata.xml b/gnome-extra/gpointing-device-settings/metadata.xml
new file mode 100644
index 00000000000..25e94b2c98b
--- /dev/null
+++ b/gnome-extra/gpointing-device-settings/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge-jp">gsynaptics</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
new file mode 100644
index 00000000000..786af27bf4d
--- /dev/null
+++ b/gnome-extra/gtkhtml/Manifest
@@ -0,0 +1 @@
+DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
new file mode 100644
index 00000000000..7f9522bdf0c
--- /dev/null
+++ b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86-freebsd ~amd64-linux ~ia64-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-proto/xproto
+ 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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/gtkhtml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
new file mode 100644
index 00000000000..1afa62e3f07
--- /dev/null
+++ b/gnome-extra/gucharmap/Manifest
@@ -0,0 +1,4 @@
+DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
+DIST gucharmap-3.12.1.tar.xz 1918188 SHA256 5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9 SHA512 47d5a85cd6941ea5698442658d7aa91ac9e2b86b861f2fa9fd2a397caddc81c89df550cd635c5cf080bb31e7f2f0968d4bd36c23dc231799af533736fe66bf6b WHIRLPOOL cd2986dc7070f94c66a61e51db7eca7fd5c4cd7cfcb13178e05446a5ea7a240f1b4d38a9b66ccabb60503e1b2c7ff7ca748248d0a31715fe7b0c09b37bae0c92
+DIST gucharmap-3.14.2.tar.xz 1986052 SHA256 fdc3e1889c48c0835d349e2910000f62946ee9f2735d7f64d6a3ad5869c87872 SHA512 e1678ce27dbf0d316bb3b25655323dca071141800a1f0d35f354093a2126c72758a8d004fcc95e7d4221f2cd5c1b0328b35a2ff43eb76e2338d165c5bc32744b WHIRLPOOL 3d100c39c123e8cac43769d50c9fd48088181a07efcd50ae977f9370a1312a134a27f1f544c06a282be0251c6bf29637cfef43b16ba7bcafd2b6e11e84a501cc
+DIST gucharmap-3.16.2.tar.xz 1996036 SHA256 0a3fa996ae271c8f4812a7d8dc573ece0c000d63185b4865fa99387455e1b13d SHA512 b20bf0d4a79bd926b0863b7451c6eaa3bba2741231c3719e4799df17aec86798362862ab0a7b19d0fa76d5f05e5fa34f0c516e76e5c0d0bf8e87d15f6e868662 WHIRLPOOL 285d9091d3a7281b84dc96e009a26eb0f154d63f9b222b3d5ae34d9fd6c3c14d7febaf110d26e5b8168b5be93a6d5f01bd70459606b563faf496a78e28b7c3b5
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
new file mode 100644
index 00000000000..52696b5128a
--- /dev/null
+++ b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
@@ -0,0 +1,9 @@
+--- 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-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
new file mode 100644
index 00000000000..4c578c79d3f
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="Unicode character map viewer library"
+HOMEPAGE="https://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="cjk 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}
+ app-text/scrollkeeper
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+
+ sys-devel/gettext
+
+ doc? ( >=dev-util/gtk-doc-1.0 )"
+
+src_prepare() {
+ G2CONF="${G2CONF}
+ --disable-static
+ --with-gtk=2.0
+ --disable-charmap
+ --disable-gconf
+ $(use_enable introspection)
+ $(use_enable cjk unihan)"
+ # gconf is only needed for the gucharmap program
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+ # .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"
+
+ epatch "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
+
+ gnome2_src_prepare
+}
+
+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-3.12.1.ebuild b/gnome-extra/gucharmap/gucharmap-3.12.1.ebuild
new file mode 100644
index 00000000000..ace6109ddf8
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.12.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/pango-1.2.1[introspection?]
+ >=x11-libs/gtk+-3.4.0: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() {
+ # Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
+ # dependency here for some LINGUAS.
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable cjk unihan) \
+ $(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/gucharmap-3.14.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.14.2.ebuild
new file mode 100644
index 00000000000..67b703cab27
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.14.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/pango-1.2.1[introspection?]
+ >=x11-libs/gtk+-3.4.0: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/appdata-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() {
+ # Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
+ # dependency here for some LINGUAS.
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable cjk unihan) \
+ $(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
new file mode 100644
index 00000000000..b10d1293018
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.16.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+ >=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() {
+ # Do not add ITSTOOL=$(type -P true); yelp-tools is a true required
+ # dependency here for some LINGUAS.
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable cjk unihan) \
+ $(use_enable vala)
+}
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
new file mode 100644
index 00000000000..c83b6723d9e
--- /dev/null
+++ b/gnome-extra/gucharmap/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<use>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
new file mode 100644
index 00000000000..93b2adaa05d
--- /dev/null
+++ b/gnome-extra/libgda/Manifest
@@ -0,0 +1,2 @@
+DIST libgda-5.2.2.tar.xz 12173216 SHA256 c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4 SHA512 b09ef364c3357a58b17508a39ee53ef462baa54bb3c8af580d23fd2771b034355092ecdb7ef29b29dd08533394a702f12b838732c712fb6b3a04b6b201cd3c74 WHIRLPOOL 463efc5825be741d55ab6741d250f537537d59c71d926c20c7202f384e5c7c9b2bcc49419a796df4bfa5e9248f59bcf12aa8331495c3aae7d56408f295c0693f
+DIST libgda-5.2.4.tar.xz 12320228 SHA256 2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc WHIRLPOOL fee9884ed9edb48603f0ce924316f00d2f38d490147d8c48e512cfd8f1282bd555f1767a56160afc2781b84c1a33466f42a12d4c5115e70af481c54c037bf519
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
new file mode 100644
index 00000000000..fe814a73049
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 00000000000..2fd31ab7d1d
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..81c7804c512
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 00000000000..f66fa8f9584
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
@@ -0,0 +1,14 @@
+--- 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/libgda-5.2.2.ebuild b/gnome-extra/libgda/libgda-5.2.2.ebuild
new file mode 100644
index 00000000000..1e0584682b1
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+#VALA_MIN_API_VERSION="0.18"
+#VALA_MAX_API_VERSION="0.18" # configure explicitly checks for 0.18
+#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 firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala
+REQUIRED_USE="
+ reports? ( ${PYTHON_REQUIRED_USE} )
+ canvas? ( gtk )
+ graphviz? ( gtk )
+ sourceview? ( gtk )
+"
+# 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:=
+ sys-libs/ncurses:=
+ berkdb? ( sys-libs/db )
+ firebird? ( dev-db/firebird )
+ 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:= )
+ libsecret? ( app-crypt/libsecret )
+ 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 )
+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() {
+ 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
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ epatch "${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() {
+ gnome2_src_configure \
+ --with-help \
+ --disable-static \
+ --enable-system-sqlite \
+ $(use_with berkdb bdb /usr) \
+ $(use_with canvas goocanvas) \
+ $(use_with firebird firebird /usr) \
+ $(use_with graphviz) \
+ $(use_with gtk ui) \
+ $(use_with http libsoup) \
+ $(use_enable introspection) \
+ "$(use_with java java $JAVA_HOME)" \
+ $(use_enable json) \
+ $(use_with ldap) \
+ $(use_with libsecret) \
+ $(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) \
+ --disable-default-binary \
+ --disable-vala
+ # vala bindings fail to build
+}
+
+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/libgda-5.2.4.ebuild b/gnome-extra/libgda/libgda-5.2.4.ebuild
new file mode 100644
index 00000000000..781520d4892
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.2.4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26" # configure explicitly checks for that version
+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 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 )
+"
+# 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:=
+ sys-libs/ncurses:=
+ 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')
+ epatch "${FILESDIR}"/${PN}-5.2.4-format-security.patch
+
+ # Support JRE 1.8 (from Fedora)
+ epatch "${FILESDIR}"/${PN}-5.2.4-jre18.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
+ epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+ epatch "${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() {
+ gnome2_src_configure \
+ --with-help \
+ --disable-default-binary \
+ --disable-static \
+ --enable-system-sqlite \
+ $(use_with berkdb bdb /usr) \
+ $(use_with canvas goocanvas) \
+ $(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_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) \
+ $(use_enable vala gda-gi) \
+ $(use_enable vala gdaui-gi) \
+ $(use_enable vala gdaui-vala)
+}
+
+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
new file mode 100644
index 00000000000..2467a1c19eb
--- /dev/null
+++ b/gnome-extra/libgda/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <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="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
+ store login credentials</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/Manifest b/gnome-extra/libgsf/Manifest
new file mode 100644
index 00000000000..114f65bcb96
--- /dev/null
+++ b/gnome-extra/libgsf/Manifest
@@ -0,0 +1,3 @@
+DIST libgsf-1.14.30.tar.xz 582556 SHA256 cb48c3480be4a691963548e664308f497d93c9d7bc12cf6a68d5ebae930a5b70 SHA512 26379375a7f8ce8031929c3a64d8fc2412d5b4aab511d33eaca52aef28aa0e5697b90cd35b70917d7d39a1dcb7fc2b49690d47d48c260a1fff4d2b741ad516ab WHIRLPOOL 84588a63ab47dbbb6fbfca7a7f088a2c9c3280c6392531f7eed8b5299c4617e6869d4ae2aa159e031c34879b8892867ade04be558144cb5f6855c49441ae030f
+DIST libgsf-1.14.32.tar.xz 606180 SHA256 13bf38b848c01e20eb89a48150b6f864434ee4dfbb6301ddf6f4080a36cd99e9 SHA512 5136065e272fa67c8dd702cb4217e5c48166712d5bc056f815ca74dba8d1926ba149904ff60e6ac19a24a30a9c7f64e8c3f3165f24bc83aadbd54d56e3b32f2d WHIRLPOOL 7a257281c29f5c2d3705fd09320233faa2f9ab8c4dc3bb05161700d709cc60347b031bb06608d4dbfa8e6fde177d7504c4cc19f271d7a3b867bf4ef6f679c17e
+DIST libgsf-1.14.33.tar.xz 608364 SHA256 82dd38e0c1f497704bf3b43682fca2768886058f004b14e9b5d103596f8c6e6b SHA512 9dbda65a610f3e6efaf40bb51ed9ebabe485e0c2c9c8d0ff155ae39fa1aa3074df8094f51d9b0f27eb251b1aed4b4faa77ffce4d6dc16ef7c99c5b697528be5f WHIRLPOOL e2c4bdaf9ee9ecb0255ac8af8d413cc73c6dc78295eaf9191e71841218187bf4e280500525dc7b6b8048e15e282d15f7f46b226a12361f112b63494e6d07f1bf
diff --git a/gnome-extra/libgsf/libgsf-1.14.30.ebuild b/gnome-extra/libgsf/libgsf-1.14.30.ebuild
new file mode 100644
index 00000000000..0829783e811
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/gtk+:2 )
+ 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() {
+ DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+ 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.32.ebuild b/gnome-extra/libgsf/libgsf-1.14.32.ebuild
new file mode 100644
index 00000000000..ed88221bd9f
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.32.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/gtk+:2 )
+ 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() {
+ DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+ 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.33.ebuild b/gnome-extra/libgsf/libgsf-1.14.33.ebuild
new file mode 100644
index 00000000000..63692f185d2
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.14.33.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~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/gtk+:2 )
+ 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() {
+ DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+ 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
new file mode 100644
index 00000000000..03ed476f352
--- /dev/null
+++ b/gnome-extra/libgsf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<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
new file mode 100644
index 00000000000..a7fd28d9993
--- /dev/null
+++ b/gnome-extra/metadata.xml
@@ -0,0 +1,33 @@
+<?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/Manifest b/gnome-extra/mousetweaks/Manifest
new file mode 100644
index 00000000000..4032414c2e1
--- /dev/null
+++ b/gnome-extra/mousetweaks/Manifest
@@ -0,0 +1 @@
+DIST mousetweaks-3.12.0.tar.xz 287236 SHA256 c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0 WHIRLPOOL 7bc760d7e851ec95038ccb303c694b710fa920a9ed85fca68b5df25daf80fc5f45cf7f2694cef3fcac65b28e2e973a7e638403e9151e6548550353bb5b59dedf
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
new file mode 100644
index 00000000000..ca8eef5fe3b
--- /dev/null
+++ b/gnome-extra/mousetweaks/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+<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
new file mode 100644
index 00000000000..7fc4cee3981
--- /dev/null
+++ b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
+HOMEPAGE="http://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
+ >=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/Manifest b/gnome-extra/nautilus-actions/Manifest
new file mode 100644
index 00000000000..5c6af70d88a
--- /dev/null
+++ b/gnome-extra/nautilus-actions/Manifest
@@ -0,0 +1,2 @@
+DIST nautilus-actions-3.2.3.tar.xz 8238308 SHA256 e2469e656fe3a246263c0c77cd99e2403dc519af357f3af5b79b9f2df753412a SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45 WHIRLPOOL 22d371653b644f67f2258f0a2fbea92539c538bb361d3e7195d12f8f2cb911d132a548d0950c997ab9dfa259c404d69c19f6c8f524674eb6b71133ba02ccbfd1
+DIST nautilus-actions-3.2.4.tar.xz 5148812 SHA256 10206c952ed3e916241168ebffd7ade9b9bcc18429ab33dfe24d9517a7371567 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0 WHIRLPOOL b8d9f8bef9138157c48ab0e3c8388108d242ef0ac0e5aaca74ac3d3ee92d8f84964e47ef19b805974da5630b7a6f6f5188204b5606c0e0fc113b5ac517221018
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/nautilus-actions/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</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
new file mode 100644
index 00000000000..eaa17bd1d86
--- /dev/null
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
new file mode 100644
index 00000000000..eaa17bd1d86
--- /dev/null
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/Manifest b/gnome-extra/nautilus-dropbox/Manifest
new file mode 100644
index 00000000000..7b016e277d8
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/Manifest
@@ -0,0 +1 @@
+DIST nautilus-dropbox-1.6.2.tar.bz2 354408 SHA256 63d53109c7d0efc0e83f36ac47be3be923115eaf0be56cfc9a1aa8e2ecc633e4 SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3 WHIRLPOOL b6e7f91674d5a9163ab7b46f95ffdcbdaa5815e9f7e16e37f8da38ab9028eaa09076afc49978465d8547bbf20971825b2dbd356766e99ed756ba96b79aeda649
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
new file mode 100644
index 00000000000..ea0053b4bbb
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 00000000000..7db3cda78c1
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+</longdescription>
+</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
new file mode 100644
index 00000000000..a96c98c3990
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="http://www.dropbox.com/"
+SRC_URI="http://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/Manifest b/gnome-extra/nautilus-sendto/Manifest
new file mode 100644
index 00000000000..c7706407665
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/Manifest
@@ -0,0 +1,2 @@
+DIST nautilus-sendto-3.8.1.tar.xz 344040 SHA256 03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab SHA512 4559bf14604ca553be9ccc4a3961a93917cd643338dd1f86fa2edbde2a7c66c4db35204a19ca6fde27ceef48736d552bdad750c24ab4b26238e478cd88caaf3a WHIRLPOOL aeeb170614cb405f5aa7f923eaa32b33be7961d982d7c7a1a639a387f4002b41a4430864eff1b473006b9136248cfaf7763cacde9d5aecca8788cdcca3c8a049
+DIST nautilus-sendto-3.8.2.tar.xz 343032 SHA256 932811e781457b1dbf7b396e930d588f433b9ba756b10bde9f03f6d71d54bdc5 SHA512 51ae4b4a14d21677b043c3023d548c1984808ab3216a14b89988bf6883e8807c8215375026f0558723792aba1552518d53631388b18c1c4346813f6246b8a422 WHIRLPOOL a38dab01ee907a23d36afcd6ce90af8b5c08e064435bbe2a96eae522d6fab568b0e5e8390e7f002ba87ee4c8bd06e1293e25057c7dbf4343ee788e8dbb52418d
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
new file mode 100644
index 00000000000..48a8d923286
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+</pkgmetadata>
+
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.1.ebuild
new file mode 100644
index 00000000000..583add93563
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A nautilus extension for sending files to locations"
+HOMEPAGE="http://www.gnome.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.90.3:3[X(+)]
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+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
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2.ebuild
new file mode 100644
index 00000000000..0f87b1f07a9
--- /dev/null
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+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 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.90.3:3[X(+)]
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+"
+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
diff --git a/gnome-extra/nautilus-share/Manifest b/gnome-extra/nautilus-share/Manifest
new file mode 100644
index 00000000000..d7bf8896908
--- /dev/null
+++ b/gnome-extra/nautilus-share/Manifest
@@ -0,0 +1,2 @@
+DIST nautilus-share_0.7.3-1.debian.tar.gz 9462 SHA256 691a6de3eb91475182850a0bd668cd5d01882fb4ae59921bb90f3e92344ed0cb SHA512 3f94e99510e26dddd348951825d07004e1195b37be45e11b38a4012764aa3b5558bd3f3b3693a07b474c0d31ce5c7152ac7ba359e44e97cf9acc940e19a3a337 WHIRLPOOL 9e21962f691da344a59d5530251f75e687322787f5be5a02f0b1b900acdc981b698f4c8fb99fba34db56cdd42b9ee79a121e51ea3399e32cba15dd89f0513c14
+DIST nautilus-share_0.7.3.orig.tar.bz2 319216 SHA256 5df9316bfbcda562b238b217d441dd5b08282d693cd205c53944d40fe89cf875 SHA512 b0d032a25a352ce1e1f5984e12ea4f842000b81700ec4fd1d08df5df5d178e71750817655a8b2f5789866153e35a70fb43a23fbfd4d391c809f3f16557571b47 WHIRLPOOL 4d5b49c01038ee7bd3e1a0a5e66ad640a9d5a18092f14b63e216162ef37f85d97d2e7f6329bdca0eb87d0f57ce74276908d10b5141745dd6b25d0f193348a1ba
diff --git a/gnome-extra/nautilus-share/metadata.xml b/gnome-extra/nautilus-share/metadata.xml
new file mode 100644
index 00000000000..5225cea25f5
--- /dev/null
+++ b/gnome-extra/nautilus-share/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+</maintainer>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-share/nautilus-share-0.7.3-r1.ebuild b/gnome-extra/nautilus-share/nautilus-share-0.7.3-r1.ebuild
new file mode 100644
index 00000000000..4e95f930406
--- /dev/null
+++ b/gnome-extra/nautilus-share/nautilus-share-0.7.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils user
+
+DESCRIPTION="A nautilus plugin to easily share folders over the SMB protocol"
+HOMEPAGE="http://gentoo.ovibes.net/nautilus-share http://packages.debian.org/unstable/nautilus-share"
+SRC_URI="mirror://debian/pool/main/n/${PN}/${PN}_${PV}.orig.tar.bz2
+ mirror://debian/pool/main/n/${PN}/${PN}_${PV}-1.debian.tar.gz"
+
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND=">=dev-libs/glib-2.4:2
+ >=gnome-base/nautilus-2.10"
+RDEPEND="${COMMON_DEPEND}
+ net-fs/samba"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+USERSHARES_DIR="/var/lib/samba/usershare"
+USERSHARES_GROUP="samba"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ G2CONF="${G2CONF} --disable-static"
+}
+
+src_prepare() {
+ epatch "${WORKDIR}"/debian/patches/15_user-acl.patch
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ keepdir ${USERSHARES_DIR}
+}
+
+pkg_postinst() {
+ enewgroup ${USERSHARES_GROUP}
+ einfo "Fixing ownership and permissions on ${EROOT}${USERSHARES_DIR#/}..."
+ chown root:${USERSHARES_GROUP} "${EROOT}"${USERSHARES_DIR#/}
+ chmod 01770 "${EROOT}"${USERSHARES_DIR#/}
+
+ einfo "To get nautilus-share working, add the lines"
+ einfo
+ einfo " # Allow users in group \"${USERSHARES_GROUP}\" to share"
+ einfo " # directories with the \"net usershare\" commands"
+ einfo " usershare path = \"${EROOT}${USERSHARES_DIR#/}\""
+ einfo " # Set a maximum of 100 user-defined shares in total"
+ einfo " usershare max shares = 100"
+ einfo " # Allow users to permit guest access"
+ einfo " usershare allow guests = yes"
+ einfo " # Only allow users to share directories they own"
+ einfo " usershare owner only = yes"
+ einfo
+ einfo "to the end of the [global] section in /etc/samba/smb.conf."
+ einfo
+ einfo "Users who are to be allowed to use nautilus-share should be added"
+ einfo "to the \"${USERSHARES_GROUP}\" group:"
+ einfo
+ einfo "# gpasswd -a USER ${USERSHARES_GROUP}"
+ einfo
+ einfo "Users may need to log out and in again for the group assignment to"
+ einfo "take effect and to restart Nautilus."
+ einfo
+ einfo "For more information, see USERSHARE in net(8)."
+}
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
new file mode 100644
index 00000000000..f9e25ec13ec
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/Manifest
@@ -0,0 +1,3 @@
+DIST tracker-1.2.5.tar.xz 6033708 SHA256 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa SHA512 8b2027e4350286d1d9c8274aa7addf0653f116389584b2cea35dc9d68563135340ac89873027d531beea2cce44b20d4a9718d6986fb486a2ef77f9cab8189699 WHIRLPOOL 4e1e923106a4b732029db9e12d8e4576aa71db64a803b8afc91f0d41793a6d22f8eb7654d0b3ac71af21ab5061432ddae1db0b3afc97d019c246c4eabf1f14d3
+DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
+DIST tracker-1.4.0.tar.xz 5940004 SHA256 c87c35b55ab3a201f6bf306b812532de2bd35f3946a7fe966963c5d3e3d251eb SHA512 1c2fd8d877297cbe30dfe933b05a5fcf46a1a9b96b76f09dc56e888223e7828ee75008e79505d86f4f824f449ac5f984cc7bebcdf23fe42924d7de98afc90626 WHIRLPOOL 69d72e138d9f63376591087b1d5d7e2335cde72bce5a9fd031fa5d4bbaf2b9d7d917871f0ea5df82e4790c043220a8afe21be74ac1ac1601a20d846ac04e2c1c
diff --git a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
new file mode 100644
index 00000000000..c2aececf863
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000000..da6fd63d008
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.5.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.5.ebuild
new file mode 100644
index 00000000000..c5784a9b0e5
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+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 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+COMMON_DEPEND="
+ ~app-misc/tracker-${PV}
+ >=dev-libs/glib-2.38: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() {
+ 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/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
new file mode 100644
index 00000000000..c5784a9b0e5
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.2.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+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 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE=""
+
+COMMON_DEPEND="
+ ~app-misc/tracker-${PV}
+ >=dev-libs/glib-2.38: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() {
+ 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/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild
new file mode 100644
index 00000000000..5bd4bccae48
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ ~app-misc/tracker-${PV}
+ >=dev-libs/glib-2.38: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() {
+ 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/Manifest b/gnome-extra/nemo/Manifest
new file mode 100644
index 00000000000..4a5c8508fc5
--- /dev/null
+++ b/gnome-extra/nemo/Manifest
@@ -0,0 +1,3 @@
+DIST nemo-2.4.5.tar.gz 1356445 SHA256 a4eae743f25d1a66cbb5b28675d78aee1d57224c825d6baebdf88068dc1d8d04 SHA512 1f6120569198f54e3fbc7f57ca9d4f644e617e029d28dc08669ae33774e474b838a5d430b0bf5ef3e0e253596a02666bbc1cbab32d1ef134971871567bf49bdb WHIRLPOOL 804c169fd6b22558718223bab44cafe183214bdd0325e1c1dcf67a41a28fddca35cf5890b42248c6b0ef485d6010cc9151c75a3994e792092b366fc98e11bd75
+DIST nemo-2.6.5.tar.gz 1380526 SHA256 bf7365cde5a7348376dda3e8c43ee33b9d592f04ddbeb767faf0d5ecbe26e89a SHA512 2d0fd351b13375322c4a74fb796356dfc1485c67f6f3cc15d7e044e08bc35dec3969ebba783cd3d140103e3db9ad097ce2a4c1dfff89a0768551d9331ee1f25d WHIRLPOOL e727661685521b429f096711b18e6aa7b9cdc184f50a7a3c763a26c21ae07168d5195cb02fd5e2eeb22117284de0288f2fe24e30b2f8533595e5d627bfa93e6c
+DIST nemo-2.6.6.tar.gz 1404568 SHA256 03e0345dad1e98b95e30b804acc5ec3613d4a258efce592db6e1296569a55a3f SHA512 2f234fa123202357f978603efa2ef20a7cf38a61d49205201c00f5e6d69add8e9ff1cbf1584a149b6ad333d974b406183d57511143d6cf20b186a68fd80e23a0 WHIRLPOOL a805a6a0698015d175fc79f8443192aed28f9dcc1b8064e98b450004b749cd88c52d4322314295e89fb77659dc8b8bed76eb79101b53a387427c6fa456dfe8ca
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
new file mode 100644
index 00000000000..ea7543e7c18
--- /dev/null
+++ b/gnome-extra/nemo/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="l10n">Pull in <pkg>gnome-extra/cinnamon-translations</pkg> for
+ localization support</flag>
+ <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-2.4.5.ebuild b/gnome-extra/nemo/nemo-2.4.5.ebuild
new file mode 100644
index 00000000000..174ee2a0f7d
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.4.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+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 +l10n packagekit tracker xmp"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.34:2
+ >=gnome-extra/cinnamon-desktop-1.0:0=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.3.17: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
+
+ 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.1.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+ l10n? ( >=gnome-extra/cinnamon-translations-2.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-proto/xproto
+
+ dev-util/gtk-doc
+ gnome-base/gnome-common
+"
+# For eautoreconf
+# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-more-warnings \
+ $(use_enable exif libexif) \
+ $(use_enable introspection) \
+ $(use_enable tracker) \
+ $(use_enable xmp)
+}
+
+src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+ gnome2_environment_reset
+ unset DBUS_SESSION_BUS_ADDRESS
+ cd src # we don't care about translation tests
+ GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
+}
diff --git a/gnome-extra/nemo/nemo-2.6.5.ebuild b/gnome-extra/nemo/nemo-2.6.5.ebuild
new file mode 100644
index 00000000000..85829811dcb
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.6.5.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+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 +l10n packagekit tracker xmp"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.34:2
+ >=gnome-extra/cinnamon-desktop-2.6.1:0=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.3.17: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
+
+ 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.1.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+ l10n? ( >=gnome-extra/cinnamon-translations-2.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-proto/xproto
+
+ dev-util/gtk-doc
+ gnome-base/gnome-common
+"
+# For eautoreconf
+# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-more-warnings \
+ $(use_enable exif libexif) \
+ $(use_enable introspection) \
+ $(use_enable tracker) \
+ $(use_enable xmp)
+}
+
+src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+ gnome2_environment_reset
+ unset DBUS_SESSION_BUS_ADDRESS
+ cd src # we don't care about translation tests
+ GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
+}
diff --git a/gnome-extra/nemo/nemo-2.6.6.ebuild b/gnome-extra/nemo/nemo-2.6.6.ebuild
new file mode 100644
index 00000000000..9080cb64046
--- /dev/null
+++ b/gnome-extra/nemo/nemo-2.6.6.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+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.34:2[dbus]
+ >=gnome-extra/cinnamon-desktop-2.6.1:0=
+ >=x11-libs/pango-1.28.3
+ >=x11-libs/gtk+-3.3.17: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
+
+ 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.1.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+ x11-themes/gnome-icon-theme-symbolic
+ nls? ( >=gnome-extra/cinnamon-translations-2.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-proto/xproto
+
+ dev-util/gtk-doc
+ gnome-base/gnome-common
+"
+# For eautoreconf
+# gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
+PDEPEND=">=gnome-base/gvfs-0.1.2"
+
+src_prepare() {
+ epatch_user
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-more-warnings \
+ $(use_enable exif libexif) \
+ $(use_enable introspection) \
+ $(use_enable tracker) \
+ $(use_enable xmp)
+}
+
+src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
+
+ gnome2_environment_reset
+ unset DBUS_SESSION_BUS_ADDRESS
+ cd src # we don't care about translation tests
+ GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" GSETTINGS_BACKEND="memory" Xemake check
+}
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
new file mode 100644
index 00000000000..7ba3620d13d
--- /dev/null
+++ b/gnome-extra/nm-applet/Manifest
@@ -0,0 +1,5 @@
+DIST network-manager-applet-0.9.10.0.tar.xz 1274656 SHA256 f5c26c692f538dc0145dc7d46d3d390754fad73d0ff06861c074c61f3dc54eca SHA512 d9472bb6613fa8feb7bbde15932542adcfdb99897d6f1376ea4d511a6ff785debb0b4dd630deb7dc6ba2c244ca2487a00cd8c758274a914d61864370226e2b1d WHIRLPOOL 8f03dabe55a29d24cb0959b4a36c63ca31a4866e6af04dbc8e0eed575c148d674d583d5e039721e9a6eed7a0115943d130dea9b0bce39ec167a3376a92b00365
+DIST network-manager-applet-0.9.8.10.tar.xz 1234720 SHA256 46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb SHA512 c943eff9eaba1f28ad9101c659d4e3da72d6190dd7fd58f3c3d54bcc53c21ec33247aee6dc7a3d7348efd905876f699c39fb3f64cf46f5f627a3976deaa06fa2 WHIRLPOOL 070e4fc914f5db60fc5e66884c7a1868a49cc011556685c9f64505e55d7c59ac749f9828c8fdf31c1e5e727b640943ea9663c6ef0139adb634f64097c4b4f243
+DIST network-manager-applet-1.0.0.tar.xz 1312480 SHA256 5fede8d2060002c695fbba07e59cbc7db90a39a3378bb9690274c205d2503152 SHA512 d1d4ea0f93dacf4068b46df5823c8d53cc792e4796ee592f538f00d3fb1f2c06e5624fafc45e1fd63f3301e5fe44fa2793bf33b428577bb662ac511e641ae970 WHIRLPOOL b53ee8aef1943d390cf05fbb75f78fbd87094fc5876b76bac3dfc37d7d3826dbbf10d76f414a68b190ee05ec7fd27f67a7be4ff794820b34e967aca7b0d86b71
+DIST network-manager-applet-1.0.2.tar.xz 1310236 SHA256 760af85b43fa5bcf74b96f899a6d4c1d5e9445e5eb63088c49e5164bbf88d9a9 SHA512 8b9da7bb12bb6bb4ee7717e041160d1541b4183a766828e28fcdc387c82ad7b5c299535575842058cf72c13b29967c16e78bee741a61c368996e9f560dc85fd7 WHIRLPOOL 72deb07c2d27e624fa05b023818e4326cb5483513b27ebc8aeef3faf30cf7458aee3dbe6bc7df09b7b682a5d2d0f4b1589734ac2bb8959ae9ab5254f16c16fbf
+DIST network-manager-applet-1.0.4.tar.xz 1336632 SHA256 2cc26f03d0011d2a067bd5205dc0c17d5aa0470020a8c36d319ae10e5728af72 SHA512 2a71f5416a668f26d9ce24f00b71ee5cf4d6af05fa4e5d13523c96dfe73528491d7ac2e45dc464d557d257f50ad14f11c9c2a767cb69ac0844ebd1753de1a8f5 WHIRLPOOL 093e092a1dc5289090aebb1b9dc788c058ac6eb87920a3762c94be1bf2d016946f158fc4dec388f96723c237a4be078e43d31bf03551dc7c215fde0d21ae1ea8
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
new file mode 100644
index 00000000000..e32318b66ac
--- /dev/null
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>gnome</herd>
+ <use>
+ <flag name="gconf">Build tool for migrating gconf settings from
+ nm-applet-0.8.x</flag>
+ <flag name="modemmanager">Enable support for mobile broadband devices
+ using <pkg>net-misc/modemmanager</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
new file mode 100644
index 00000000000..3adf7a02d58
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+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="bluetooth gconf +introspection modemmanager"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ app-crypt/libsecret
+ >=dev-libs/glib-2.32:2
+ >=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-0.9.9.95[introspection?]
+ net-misc/mobile-broadband-provider-info
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
+ gconf? (
+ >=gnome-base/gconf-2.20:2
+ gnome-base/libgnome-keyring )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+ virtual/freedesktop-icon-theme
+ virtual/notification-daemon
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-more-warnings \
+ --disable-static \
+ --localstatedir=/var \
+ $(use_with bluetooth) \
+ $(use_enable gconf migration) \
+ $(use_enable introspection) \
+ $(use_with modemmanager modem-manager-1)
+}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.10-r1.ebuild
new file mode 100644
index 00000000000..a78f4793e67
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.10-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="bluetooth gconf +introspection modemmanager"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+
+RDEPEND="
+ app-crypt/libsecret
+ >=dev-libs/glib-2.26:2
+ >=dev-libs/dbus-glib-0.88
+ >=sys-apps/dbus-1.4.1
+ >=sys-auth/polkit-0.96-r1
+ >=x11-libs/gtk+-3:3[introspection?]
+ >=x11-libs/libnotify-0.7.0
+
+ app-text/iso-codes
+ >=net-misc/networkmanager-0.9.8[introspection?]
+ net-misc/mobile-broadband-provider-info
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
+ gconf? (
+ >=gnome-base/gconf-2.20:2
+ gnome-base/libgnome-keyring )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+ modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+ virtual/freedesktop-icon-theme
+ virtual/notification-daemon
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.40
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --with-gtkver=3 \
+ --disable-more-warnings \
+ --disable-static \
+ --localstatedir=/var \
+ $(use_with bluetooth) \
+ $(use_enable gconf migration) \
+ $(use_enable introspection) \
+ $(use_with modemmanager modem-manager-1)
+}
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.0.ebuild
new file mode 100644
index 00000000000..ecd73eda08d
--- /dev/null
+++ b/gnome-extra/nm-applet/n