summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNP-Hardass <np.hardass@gmail.com>2015-07-11 21:15:55 -0400
committerNP-Hardass <np.hardass@gmail.com>2015-07-11 21:15:55 -0400
commit8c31a4026eb053b5c0675c0e779817fb4abcf26b (patch)
tree94b3734e6125e7c82ae611c357c48c85c3c671bc
downloadgentoo-mate-8c31a4026eb053b5c0675c0e779817fb4abcf26b.tar.gz
gentoo-mate-8c31a4026eb053b5c0675c0e779817fb4abcf26b.tar.bz2
gentoo-mate-8c31a4026eb053b5c0675c0e779817fb4abcf26b.zip
Initial import of most recent MATE ebuilds
-rw-r--r--app-admin/mate-system-tools/ChangeLog46
-rw-r--r--app-admin/mate-system-tools/Manifest5
-rw-r--r--app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch32
-rw-r--r--app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild66
-rw-r--r--app-admin/mate-system-tools/metadata.xml19
-rw-r--r--app-arch/engrampa/ChangeLog43
-rw-r--r--app-arch/engrampa/Manifest5
-rw-r--r--app-arch/engrampa/engrampa-1.8.1-r1.ebuild82
-rw-r--r--app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch89
-rw-r--r--app-arch/engrampa/metadata.xml13
-rw-r--r--app-editors/pluma/ChangeLog39
-rw-r--r--app-editors/pluma/Manifest4
-rw-r--r--app-editors/pluma/metadata.xml8
-rw-r--r--app-editors/pluma/pluma-1.8.1.ebuild88
-rw-r--r--app-text/atril/ChangeLog32
-rw-r--r--app-text/atril/Manifest4
-rw-r--r--app-text/atril/atril-1.8.1.ebuild98
-rw-r--r--app-text/atril/metadata.xml18
-rw-r--r--dev-libs/libmateweather/ChangeLog52
-rw-r--r--dev-libs/libmateweather/Manifest26
-rw-r--r--dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch12
-rw-r--r--dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch11
-rw-r--r--dev-libs/libmateweather/libmateweather-1.8.0.ebuild79
-rw-r--r--dev-libs/libmateweather/metadata.xml8
-rw-r--r--dev-python/python-caja/ChangeLog37
-rw-r--r--dev-python/python-caja/Manifest24
-rw-r--r--dev-python/python-caja/metadata.xml8
-rw-r--r--dev-python/python-caja/python-caja-1.8.0.ebuild52
-rw-r--r--mate-base/caja/ChangeLog48
-rw-r--r--mate-base/caja/Manifest4
-rw-r--r--mate-base/caja/caja-1.8.2-r1.ebuild95
-rw-r--r--mate-base/caja/metadata.xml15
-rw-r--r--mate-base/libmatekbd/ChangeLog42
-rw-r--r--mate-base/libmatekbd/Manifest24
-rw-r--r--mate-base/libmatekbd/libmatekbd-1.8.0.ebuild45
-rw-r--r--mate-base/libmatekbd/metadata.xml8
-rw-r--r--mate-base/mate-applets/ChangeLog86
-rw-r--r--mate-base/mate-applets/Manifest5
-rw-r--r--mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch79
-rw-r--r--mate-base/mate-applets/mate-applets-1.8.1.ebuild101
-rw-r--r--mate-base/mate-applets/metadata.xml8
-rw-r--r--mate-base/mate-common/ChangeLog36
-rw-r--r--mate-base/mate-common/Manifest24
-rw-r--r--mate-base/mate-common/mate-common-1.8.0.ebuild26
-rw-r--r--mate-base/mate-common/metadata.xml8
-rw-r--r--mate-base/mate-control-center/ChangeLog56
-rw-r--r--mate-base/mate-control-center/Manifest5
-rw-r--r--mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch15
-rw-r--r--mate-base/mate-control-center/mate-control-center-1.8.1.ebuild83
-rw-r--r--mate-base/mate-control-center/metadata.xml8
-rw-r--r--mate-base/mate-desktop/ChangeLog76
-rw-r--r--mate-base/mate-desktop/Manifest4
-rw-r--r--mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild67
-rw-r--r--mate-base/mate-desktop/metadata.xml8
-rw-r--r--mate-base/mate-menus/ChangeLog50
-rw-r--r--mate-base/mate-menus/Manifest25
-rw-r--r--mate-base/mate-menus/files/10-xdg-menu-mate6
-rw-r--r--mate-base/mate-menus/mate-menus-1.8.0.ebuild82
-rw-r--r--mate-base/mate-menus/metadata.xml8
-rw-r--r--mate-base/mate-panel/ChangeLog70
-rw-r--r--mate-base/mate-panel/Manifest5
-rw-r--r--mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch11
-rw-r--r--mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild81
-rw-r--r--mate-base/mate-panel/metadata.xml8
-rw-r--r--mate-base/mate-session-manager/ChangeLog85
-rw-r--r--mate-base/mate-session-manager/Manifest32
-rwxr-xr-xmate-base/mate-session-manager/files/10-user-dirs-update-mate10
-rw-r--r--mate-base/mate-session-manager/files/15-xdg-data-mate9
-rw-r--r--mate-base/mate-session-manager/files/MATE109
-rw-r--r--mate-base/mate-session-manager/files/defaults.list336
-rw-r--r--mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch10
-rw-r--r--mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch535
-rw-r--r--mate-base/mate-session-manager/files/mate-session-manager-1.6-gnome-keyring.patch328
-rw-r--r--mate-base/mate-session-manager/files/mate-session-manager-1.6.1-login1.patch267
-rw-r--r--mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild101
-rw-r--r--mate-base/mate-session-manager/metadata.xml8
-rw-r--r--mate-base/mate-settings-daemon/ChangeLog61
-rw-r--r--mate-base/mate-settings-daemon/Manifest6
-rw-r--r--mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch22
-rw-r--r--mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch42
-rw-r--r--mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild83
-rw-r--r--mate-base/mate-settings-daemon/metadata.xml8
-rw-r--r--mate-base/mate/ChangeLog44
-rw-r--r--mate-base/mate/Manifest23
-rw-r--r--mate-base/mate/mate-1.8.0.ebuild74
-rw-r--r--mate-base/mate/metadata.xml19
-rw-r--r--mate-base/metadata.xml31
-rw-r--r--mate-extra/caja-dropbox/ChangeLog28
-rw-r--r--mate-extra/caja-dropbox/Manifest26
-rw-r--r--mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild90
-rw-r--r--mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch13
-rw-r--r--mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch13
-rw-r--r--mate-extra/caja-dropbox/metadata.xml8
-rw-r--r--mate-extra/caja-extensions/ChangeLog25
-rw-r--r--mate-extra/caja-extensions/Manifest25
-rw-r--r--mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild78
-rw-r--r--mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch316
-rw-r--r--mate-extra/caja-extensions/metadata.xml16
-rw-r--r--mate-extra/mate-calc/ChangeLog47
-rw-r--r--mate-extra/mate-calc/Manifest24
-rw-r--r--mate-extra/mate-calc/mate-calc-1.8.0.ebuild36
-rw-r--r--mate-extra/mate-calc/metadata.xml8
-rw-r--r--mate-extra/mate-dialogs/ChangeLog41
-rw-r--r--mate-extra/mate-dialogs/Manifest24
-rw-r--r--mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild46
-rw-r--r--mate-extra/mate-dialogs/metadata.xml8
-rw-r--r--mate-extra/mate-media/ChangeLog36
-rw-r--r--mate-extra/mate-media/Manifest24
-rw-r--r--mate-extra/mate-media/mate-media-1.8.0.ebuild93
-rw-r--r--mate-extra/mate-media/metadata.xml11
-rw-r--r--mate-extra/mate-polkit/ChangeLog44
-rw-r--r--mate-extra/mate-polkit/Manifest24
-rw-r--r--mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild48
-rw-r--r--mate-extra/mate-polkit/metadata.xml8
-rw-r--r--mate-extra/mate-power-manager/ChangeLog88
-rw-r--r--mate-extra/mate-power-manager/Manifest11
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch144
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch15
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch160
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch102
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch217
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch390
-rw-r--r--mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch263
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild92
-rw-r--r--mate-extra/mate-power-manager/metadata.xml14
-rw-r--r--mate-extra/mate-screensaver/ChangeLog79
-rw-r--r--mate-extra/mate-screensaver/Manifest7
-rw-r--r--mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch11
-rw-r--r--mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch11
-rw-r--r--mate-extra/mate-screensaver/files/xss-conversion.txt22
-rw-r--r--mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild119
-rw-r--r--mate-extra/mate-screensaver/metadata.xml12
-rw-r--r--mate-extra/mate-sensors-applet/ChangeLog49
-rw-r--r--mate-extra/mate-sensors-applet/Manifest24
-rw-r--r--mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild72
-rw-r--r--mate-extra/mate-sensors-applet/metadata.xml8
-rw-r--r--mate-extra/mate-system-monitor/ChangeLog40
-rw-r--r--mate-extra/mate-system-monitor/Manifest24
-rw-r--r--mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild45
-rw-r--r--mate-extra/mate-system-monitor/metadata.xml8
-rw-r--r--mate-extra/mate-user-share/ChangeLog36
-rw-r--r--mate-extra/mate-user-share/Manifest24
-rw-r--r--mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild56
-rw-r--r--mate-extra/mate-user-share/metadata.xml8
-rw-r--r--mate-extra/mate-utils/ChangeLog41
-rw-r--r--mate-extra/mate-utils/Manifest4
-rw-r--r--mate-extra/mate-utils/mate-utils-1.8.1.ebuild86
-rw-r--r--mate-extra/mate-utils/metadata.xml11
-rw-r--r--mate-extra/metadata.xml33
-rw-r--r--media-gfx/eom/ChangeLog39
-rw-r--r--media-gfx/eom/Manifest4
-rw-r--r--media-gfx/eom/eom-1.8.1.ebuild77
-rw-r--r--media-gfx/eom/metadata.xml8
-rw-r--r--metadata/layout.conf1
-rw-r--r--net-analyzer/mate-netspeed/ChangeLog33
-rw-r--r--net-analyzer/mate-netspeed/Manifest24
-rw-r--r--net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild37
-rw-r--r--net-analyzer/mate-netspeed/metadata.xml8
-rw-r--r--profiles/repo_name1
-rw-r--r--x11-misc/mate-notification-daemon/ChangeLog46
-rw-r--r--x11-misc/mate-notification-daemon/Manifest4
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild58
-rw-r--r--x11-misc/mate-notification-daemon/metadata.xml8
-rw-r--r--x11-misc/mozo/ChangeLog28
-rw-r--r--x11-misc/mozo/Manifest24
-rw-r--r--x11-misc/mozo/metadata.xml8
-rw-r--r--x11-misc/mozo/mozo-1.8.0.ebuild72
-rw-r--r--x11-terms/mate-terminal/ChangeLog41
-rw-r--r--x11-terms/mate-terminal/Manifest4
-rw-r--r--x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild41
-rw-r--r--x11-terms/mate-terminal/metadata.xml8
-rw-r--r--x11-themes/mate-backgrounds/ChangeLog37
-rw-r--r--x11-themes/mate-backgrounds/Manifest24
-rw-r--r--x11-themes/mate-backgrounds/mate-backgrounds-1.8.0.ebuild24
-rw-r--r--x11-themes/mate-backgrounds/metadata.xml8
-rw-r--r--x11-themes/mate-icon-theme-faenza/ChangeLog39
-rw-r--r--x11-themes/mate-icon-theme-faenza/Manifest24
-rw-r--r--x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.8.0.ebuild28
-rw-r--r--x11-themes/mate-icon-theme-faenza/metadata.xml8
-rw-r--r--x11-themes/mate-icon-theme/ChangeLog43
-rw-r--r--x11-themes/mate-icon-theme/Manifest24
-rw-r--r--x11-themes/mate-icon-theme/mate-icon-theme-1.8.0.ebuild35
-rw-r--r--x11-themes/mate-icon-theme/metadata.xml8
-rw-r--r--x11-themes/mate-themes/ChangeLog34
-rw-r--r--x11-themes/mate-themes/Manifest24
-rw-r--r--x11-themes/mate-themes/mate-themes-1.8.0.ebuild40
-rw-r--r--x11-themes/mate-themes/metadata.xml8
-rw-r--r--x11-wm/marco/ChangeLog29
-rw-r--r--x11-wm/marco/Manifest4
-rw-r--r--x11-wm/marco/marco-1.8.2.ebuild71
-rw-r--r--x11-wm/marco/metadata.xml8
191 files changed, 9145 insertions, 0 deletions
diff --git a/app-admin/mate-system-tools/ChangeLog b/app-admin/mate-system-tools/ChangeLog
new file mode 100644
index 0000000..9d4c284
--- /dev/null
+++ b/app-admin/mate-system-tools/ChangeLog
@@ -0,0 +1,46 @@
+# ChangeLog for app-admin/mate-system-tools
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/ChangeLog,v 1.8 2014/12/20 17:02:53 tamiko Exp $
+
+ 11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org>
+ mate-system-tools-1.8.0.ebuild, mate-system-tools-1.8.1.ebuild:
+ Finish deprecation of 1.6
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-system-tools-1.6.0.ebuild:
+ drop old
+
+*mate-system-tools-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-system-tools-1.8.1.ebuild:
+ version bump
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-system-tools-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-system-tools-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-system-tools-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-system-tools-1.6.0.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-system-tools-1.8.0 (10 Apr 2014)
+
+ 10 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-system-tools-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-system-tools-1.6.0 (22 Mar 2014)
+
+ 22 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch,
+ +mate-system-tools-1.6.0.ebuild, +metadata.xml:
+ New ebuild for app-admin/mate-system-tools, tools aimed to make easy the
+ administration of UNIX systems; imported from the mate-overlay, reviewed and
+ adjusted.
diff --git a/app-admin/mate-system-tools/Manifest b/app-admin/mate-system-tools/Manifest
new file mode 100644
index 0000000..28168e1
--- /dev/null
+++ b/app-admin/mate-system-tools/Manifest
@@ -0,0 +1,5 @@
+AUX mate-system-tools-1.6.0-Update-POTFILES-skip.patch 944 SHA256 0fc0d5ab157d1a8aefa8b403e84124b9fb8e0ca828bc1b7f8ce157eb4fec71b2 SHA512 b693cd64aba638d063203d7308b178caa742a3c414b7f3222b7137e9fc5f8c6860b39d2e27851b81c94c8572910bcc6cd28e9f6c2b55757cefbf495cfeadc8a2 WHIRLPOOL 181644c24d00f5b6b3fc22ba7c2ef74a732d54948fe2cb22c6dc2276c7aba3bf4d23723bb93243c1f186ea6e87df522d8742cc19b28ef094928102a553c73de8
+DIST mate-system-tools-1.8.1.tar.xz 4348304 SHA256 c5f1faee761deb679f7a37607cc7166ea81b7d16a7fbc05951b32f119bcb944e SHA512 a2cda52ebab386ebbf6c01288741f59914c8fe8a672a1220b0a8cc44afb51058e8545f385f4d5dab650bc36c3c18ad9519580ce255b4c607131c2c5dd3ce15ce WHIRLPOOL ba486ffcc9dd25aa10858e3b09a046eadbe99a11d4e98c872dd14b91002e9e62a17d88744707ef8fac80b44e27d6402b4532d77d30f6ce0f905335d0e9eee7d2
+EBUILD mate-system-tools-1.8.1.ebuild 1593 SHA256 b5f1aba8fc947282d940abd80bd34042fb6aff3ba9b4ca67b2ee895fdd330abd SHA512 8eeb5de77a795b1550710547c398942393a84ba1d24b49bfc1cae2ca642926f957a4b892c65035a3f4827937dedc1ae43dbc0b607dd0f2d61ec815f04081fb55 WHIRLPOOL b16e19217f98830b6e9a2c2ae695881bcb14aad139e7f1a0cd91dafeacac52f5385fe43fcc1f796884e29751bcb489dcf2a5aee6452b9d26014706696b7cb2b6
+MISC ChangeLog 1664 SHA256 bc2130f4c451e0b3bdfcafa0cfd161309fb8da9e6b0d1b141986c44fa5dd8484 SHA512 c9cbf4da712ab00597771527257f25e91af9213b0e7c4aba6be840a82ab49c0564527f27f353c9b9ff8424511a50e1f4a9185529c5a377f61866950a41c18bb4 WHIRLPOOL 5c96801ba46249a14e737ce0fa0ec9884146e62be1c2ec184989b9bd25aa91aeff409e916b48d5106d57d4bbb43c0462fe646520cc4589eeadc281c28b799e4e
+MISC metadata.xml 721 SHA256 cb5cd56a7f812b6814596a0d129f62999d44a28050bc365fc7f481790570c55c SHA512 e24bf00fbebb71df3a47f84d26c1cd35e6a5e87e42ddd8883cd0c7a9a3bee7d8fcd611b676f4bfab319a995b8195270ee5f46f4b037d1873861823f179ca1d2a WHIRLPOOL 46e613a9e99c8cb577d82ce59f91f75c6984adf85854be2c726fd6d7b02db6caf34445754d1f9b51eed8305206d55c44bc3473148b4972f1ce730f242ba4a0f0
diff --git a/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch b/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
new file mode 100644
index 0000000..ee89cf5
--- /dev/null
+++ b/app-admin/mate-system-tools/files/mate-system-tools-1.6.0-Update-POTFILES-skip.patch
@@ -0,0 +1,32 @@
+From 0dc126ba76d32a66c73daa5c2a93980efbc1264e Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano@karapetsas.com>
+Date: Sat, 25 Jan 2014 12:29:44 +0100
+Subject: [PATCH] Update POTFILES.skip
+
+---
+ po/POTFILES.skip | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index a6a3e9f..d54118d 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -6,11 +6,11 @@ interfaces/services.glade
+ interfaces/shares.glade
+ interfaces/time.glade
+ interfaces/users.glade
+-src/network/network.desktop.in
+-src/services/services.desktop.in
+-src/shares/shares.desktop.in
+-src/time/time.desktop.in
+-src/users/users.desktop.in
++src/network/mate-network.desktop.in
++src/services/mate-services.desktop.in
++src/shares/mate-shares.desktop.in
++src/time/mate-time.desktop.in
++src/users/mate-users.desktop.in
+ interfaces/disks.glade.in
+ src/disks/callbacks.c
+ src/disks/disks-cdrom-disc.c
+--
+1.8.5.5
diff --git a/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild b/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild
new file mode 100644
index 0000000..97b6f8b
--- /dev/null
+++ b/app-admin/mate-system-tools/mate-system-tools-1.8.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/mate-system-tools/mate-system-tools-1.8.0.ebuild,v 1.4 2014/07/02 09:45:16 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Tools aimed to make easy the administration of UNIX systems"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="caja nfs policykit samba"
+
+RDEPEND="app-text/rarian:0
+ >=app-admin/system-tools-backends-2.10.1:0
+ dev-libs/atk:0
+ dev-libs/dbus-glib:0
+ >=dev-libs/glib-2.25.3:2
+ >=dev-libs/liboobs-1.1:0
+ >=sys-apps/dbus-0.32:0
+ net-wireless/wireless-tools:0
+ sys-libs/cracklib:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango:0
+ >=x11-libs/gtk+-2.19.7:2
+ virtual/libintl:0
+ caja? ( >=mate-base/caja-1.8:0 )
+ nfs? ( net-fs/nfs-utils:0 )
+ policykit? (
+ >=mate-extra/mate-polkit-1.8:0
+ >=sys-auth/polkit-0.92:0
+ )
+ samba? ( >=net-fs/samba-3:0 )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ >=dev-util/intltool-0.35.0:*"
+
+src_configure() {
+ local myconf
+ if ! use nfs && ! use samba; then
+ myconf="--disable-shares"
+ fi
+
+ gnome2_src_configure \
+ ${myconf} \
+ --disable-static \
+ $(use_enable policykit polkit-gtk-mate) \
+ $(use_enable caja)
+}
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
diff --git a/app-admin/mate-system-tools/metadata.xml b/app-admin/mate-system-tools/metadata.xml
new file mode 100644
index 0000000..a405404
--- /dev/null
+++ b/app-admin/mate-system-tools/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>mate</herd>
+ <longdescription>
+ Formerly known as the Ximian Setup Tools, the GST are a fully
+ integrated set of tools aimed to make easy the job that means the
+ computer administration on an UNIX or Linux system. They're
+ thought to help from the new Linux or UNIX user to the system
+ administrators.
+ </longdescription>
+ <use>
+ <flag name="nfs">Adds support for NFS shares</flag>
+ <flag name="caja">Adds support for the Caja file manager</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-system-tools</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-arch/engrampa/ChangeLog b/app-arch/engrampa/ChangeLog
new file mode 100644
index 0000000..e2efec5
--- /dev/null
+++ b/app-arch/engrampa/ChangeLog
@@ -0,0 +1,43 @@
+# ChangeLog for app-arch/engrampa
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/ChangeLog,v 1.7 2014/12/09 22:35:42 tamiko Exp $
+
+*engrampa-1.8.0-r1 (06 Jul 2015)
+*engrampa-1.8.1-r1 (06 Jul 2015)
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> +engrampa-1.8.0-r1.ebuild,
+ +engrampa-1.8.1-r1.ebuild, +files/engrampa-1.8.0-caja-schema-fix.patch,
+ -engrampa-1.8.0.ebuild, -engrampa-1.8.1.ebuild:
+ Re-enable Caja USE flag functionality. Resolves bug #538218
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+*engrampa-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +engrampa-1.8.1.ebuild:
+ version bump
+
+ 18 Jul 2014; Tom Wijsman <TomWij@gentoo.org> engrampa-1.8.0.ebuild,
+ metadata.xml:
+ USE=-caja fails to build without Caja, temporarily adjust the dependencies to
+ unbreak that. Corrected the metadata.xml description. Bug #517018, reported by
+ Dmitry (sema19689).
+
+ 07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> engrampa-1.8.0.ebuild:
+ Add missing itstool dependency; fixes bug #515770, reported by Patrick Lauer.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> engrampa-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> engrampa-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> engrampa-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+*engrampa-1.8.0 (27 Apr 2014)
+
+ 27 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +engrampa-1.8.0.ebuild,
+ +metadata.xml:
+ Version bump to 1.8.0, continuation of app-arch/mate-file-archiver.
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
new file mode 100644
index 0000000..1bcc25a
--- /dev/null
+++ b/app-arch/engrampa/Manifest
@@ -0,0 +1,5 @@
+AUX engrampa-1.8.0-caja-schema-fix.patch 3013 SHA256 9756dd68492b00efea20136c213e73492143904190dcf0af0418c169eca1c12d SHA512 10adea46216871894143feaa4e738d1833f99f984920f9e6af03808dff545d00d41325e38bdcfc73b68cbf26ecab2e41e1704c6097132d8a42e312012b986efa WHIRLPOOL ef7d76bf1a869b4b7f745dcf5a49584aca1e59f0d3d5b01d3ce1a2f3d6563d15e904cc28c2bfcb192fd7e8eddf58f9e8ac2ae12b50f2e8cf6befc4e6361eafc6
+DIST engrampa-1.8.1.tar.xz 1367088 SHA256 f8c541de364352005b2f4a100140197a2190269d3dbffe032e284a98478f1be7 SHA512 0733ef93d34356d6c9cdda7ac91c97ef10fe47df0962375e0270b25873c2271ade4ee9b82f7d6c4c3fd1de5dbe51e9ca1b30acf208b3a7f80a19a4899299b00b WHIRLPOOL 63fde3e27240b175dff12d7a3e15123413033faa7f49a0dcb6fa75eb8b51ab63246879ebacd4295f95b8f9964b48fcba85264378ea3659e5864b43e591133318
+EBUILD engrampa-1.8.1-r1.ebuild 2277 SHA256 2921c0fc28a514a6de0ecf2f51a098fa6f6799cf949e88d86ccbb752cca6d8b3 SHA512 f3ec4102ab6efb40e0e60c8d8fd0263ba91ce38ae37198973733ce98537e52253f263fe0fe1cb23824cdf9e9215eb01dec5a761459a12d831b12357e6fa09c3c WHIRLPOOL 834393a901429c9126da4d65d1d1e9e33d4d95a5d58a853a5d2502e83e1738b94616088d94ca5cd22f2d8af5f87d890543ffc01ee20920342ef8379a2a2cce15
+MISC ChangeLog 1669 SHA256 be89057ef2e5d069b4dc34f35d99ee5fc901c7dda0402273048b263389c77db1 SHA512 e3ac412a4affd4cc7f48d0bdb8bdeabe0ce756b583bff906da7c2b7531110745955b0cc9b1fd657833c0bf34a2811018ecc67d4148fb9c0e6da56501400b7bc0 WHIRLPOOL 6b741b7fa8ff86d3ad51eb841f81755a037fc785a8c57ddff24f84144cd88280feafbf3746459ed66dc2309ccd775eefd87b4b8e95e3e99203f76baca4d600f1
+MISC metadata.xml 415 SHA256 e11774078e961a5a1f849f4d1f6a9eef0da01507f5c2010304497e75b16e59b4 SHA512 04e133803a40ff137535f9f3fa4e33b3f2e2beaaaaacabba71e9135d057fe04d291abbca462d5e93019673f4bb487ad018d3e2ffea9c65e2d6f3f4aa3dce2ce0 WHIRLPOOL 5a8655fcc48b71ebbb26873298c46b2d39dccbc1dfdc91ea9c79afa18ab23bd6ccb208a7b137042099e052071305655015f9466527d741af6239f64adf1e36b6
diff --git a/app-arch/engrampa/engrampa-1.8.1-r1.ebuild b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
new file mode 100644
index 0000000..f15fdfc
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/engrampa/engrampa-1.8.1.ebuild,v 1.1 2014/12/09 22:35:42 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Engrampa archive manager for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja"
+
+RDEPEND=">=x11-libs/gtk+-2.21.4:2
+ >=dev-libs/glib-2.25.5:2
+ >=dev-libs/json-glib-0.14:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/pango:0
+ virtual/libintl:0
+ caja? ( >=mate-base/caja-1.8:0 )
+ !!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35:*
+ dev-util/itstool:0
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ epatch "${FILESDIR}/engrampa-1.8.0-caja-schema-fix.patch"
+ gnome2_src_prepare
+
+ # Drop DEPRECATED flags as configure option doesn't do it, bug #385453
+ sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+ copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-run-in-place \
+ --disable-packagekit \
+ --disable-deprecations \
+ --with-gtk=2.0 \
+ $(use_enable caja caja-actions)
+}
+
+DOCS="AUTHORS HACKING MAINTAINERS NEWS README TODO"
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog ""
+ elog "${PN} is a frontend for several archiving utilities. If you want a"
+ elog "particular achive format supported install the relevant package."
+ elog
+ elog "For example:"
+ elog " 7-zip : emerge app-arch/p7zip"
+ elog " ace : emerge app-arch/unace"
+ elog " arj : emerge app-arch/arj"
+ elog " cpio : emerge app-arch/cpio"
+ elog " deb : emerge app-arch/dpkg"
+ elog " iso : emerge app-cdr/cdrtools"
+ elog " jar,zip : emerge app-arch/zip or emerge app-arch/unzip"
+ elog " lha : emerge app-arch/lha"
+ elog " lzma : emerge app-arch/xz-utils"
+ elog " lzop : emerge app-arch/lzop"
+ elog " rar : emerge app-arch/unrar"
+ elog " rpm : emerge app-arch/rpm"
+ elog " unstuff : emerge app-arch/stuffit"
+ elog " zoo : emerge app-arch/zoo"
+}
diff --git a/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch b/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch
new file mode 100644
index 0000000..2068046
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.8.0-caja-schema-fix.patch
@@ -0,0 +1,89 @@
+From 49f97664d7fdfc7914245cb26f660cbedd36afa4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Thu, 2 Oct 2014 14:29:01 +0200
+Subject: [PATCH] Use Caja GSettings schema optionally
+
+Excludes changes to glib version in configure.ac
+
+This makes Caja dependency optional.
+
+Closes https://github.com/mate-desktop/engrampa/pull/60
+---
+ configure.ac | 2 +-
+ src/fr-window.c | 34 ++++++++++++++++++++++++----------
+ 2 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/src/fr-window.c b/src/fr-window.c
+index f9ceef8..6994066 100644
+--- a/src/fr-window.c
++++ b/src/fr-window.c
+@@ -638,7 +638,9 @@ fr_window_free_private_data (FrWindow *window)
+ _g_object_unref (window->priv->settings_ui);
+ _g_object_unref (window->priv->settings_general);
+ _g_object_unref (window->priv->settings_dialogs);
+- _g_object_unref (window->priv->settings_caja);
++
++ if (window->priv->settings_caja)
++ _g_object_unref (window->priv->settings_caja);
+ }
+
+
+@@ -4598,11 +4600,13 @@ static gboolean
+ is_single_click_policy (FrWindow *window)
+ {
+ char *value;
+- gboolean result;
++ gboolean result = FALSE;
+
+- value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
+- result = (value != NULL) && (strncmp (value, "single", 6) == 0);
+- g_free (value);
++ if (window->priv->settings_caja) {
++ value = g_settings_get_string (window->priv->settings_caja, CAJA_CLICK_POLICY);
++ result = (value != NULL) && (strncmp (value, "single", 6) == 0);
++ g_free (value);
++ }
+
+ return result;
+ }
+@@ -5384,6 +5388,8 @@ fr_window_construct (FrWindow *window)
+ GtkToolItem *open_recent_tool_item;
+ GtkWidget *menu_item;
+ GError *error = NULL;
++ GSettingsSchemaSource *schema_source;
++ GSettingsSchema *caja_schema;
+
+ /* data common to all windows. */
+
+@@ -5401,7 +5407,13 @@ fr_window_construct (FrWindow *window)
+ window->priv->settings_ui = g_settings_new (ENGRAMPA_SCHEMA_UI);
+ window->priv->settings_general = g_settings_new (ENGRAMPA_SCHEMA_GENERAL);
+ window->priv->settings_dialogs = g_settings_new (ENGRAMPA_SCHEMA_DIALOGS);
+- window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
++
++ schema_source = g_settings_schema_source_get_default ();
++ caja_schema = g_settings_schema_source_lookup (schema_source, CAJA_SCHEMA, FALSE);
++ if (caja_schema) {
++ window->priv->settings_caja = g_settings_new (CAJA_SCHEMA);
++ g_settings_schema_unref (caja_schema);
++ }
+
+ /* Create the application. */
+
+@@ -5994,10 +6006,12 @@ fr_window_construct (FrWindow *window)
+ "changed::" PREF_LISTING_USE_MIME_ICONS,
+ G_CALLBACK (pref_use_mime_icons_changed),
+ window);
+- g_signal_connect (window->priv->settings_caja,
+- "changed::" CAJA_CLICK_POLICY,
+- G_CALLBACK (pref_click_policy_changed),
+- window);
++
++ if (window->priv->settings_caja)
++ g_signal_connect (window->priv->settings_caja,
++ "changed::" CAJA_CLICK_POLICY,
++ G_CALLBACK (pref_click_policy_changed),
++ window);
+
+ /* Give focus to the list. */
+
diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
new file mode 100644
index 0000000..b6e27c0
--- /dev/null
+++ b/app-arch/engrampa/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>mate</herd>
+ <use>
+ <flag name="caja">Enable engrampa to integrate with
+ <pkg>mate-base/caja</pkg> by providing entries in its context
+ menu</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/libmateweather</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-editors/pluma/ChangeLog b/app-editors/pluma/ChangeLog
new file mode 100644
index 0000000..3fee751
--- /dev/null
+++ b/app-editors/pluma/ChangeLog
@@ -0,0 +1,39 @@
+# ChangeLog for app-editors/pluma
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pluma/ChangeLog,v 1.9 2015/04/08 07:30:32 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> pluma-1.8.0.ebuild,
+ pluma-1.8.1.ebuild:
+ Remove old Python implementations
+
+ 10 Dec 2014; Matthias Maier <tamiko@gentoo.org> pluma-1.8.0.ebuild:
+ do not call to python-single-r1_pkg_setup if USE=-python, bug #518026
+
+ 10 Dec 2014; Matthias Maier <tamiko@gentoo.org> pluma-1.8.1.ebuild:
+ do not call to python-single-r1_pkg_setup if USE=-python, bug #518026
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> pluma-1.8.1.ebuild:
+ add mate-base/mate-desktop dependency wrt bug #523574
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> pluma-1.8.1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> pluma-1.8.1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> pluma-1.8.1.ebuild:
+ Add ~x86, wrt bug #508072
+
+*pluma-1.8.1 (09 May 2014)
+
+ 09 May 2014; Tom Wijsman <TomWij@gentoo.org> +pluma-1.8.1.ebuild:
+ Version bump to 1.8.1.
+
+*pluma-1.8.0 (27 Apr 2014)
+
+ 27 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +metadata.xml,
+ +pluma-1.8.0.ebuild:
+ Version bump to 1.8.0. Continuation of app-editors/mate-text-editor.
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
new file mode 100644
index 0000000..716d128
--- /dev/null
+++ b/app-editors/pluma/Manifest
@@ -0,0 +1,4 @@
+DIST pluma-1.8.1.tar.xz 3409032 SHA256 38accc5c05062981a0649874300bc21ab3ad1a5ef47491186dffe7c035ed9e8b SHA512 4429b95a6c692c524db481cc53a3d9d5fd252a2aafa49daf787df5d7b389806f520233bc054b701a3ca47a5df5917cf934dafee8327b0ac01b7fe25059b6adea WHIRLPOOL c1e61e32bc657b7097292869acd57e69b6c67d0610db0644c38141ca4e94b34b0b3bc3b941fc79b444c2f56d3140210f117fc80bfc2102b97d4f45af9e9e2057
+EBUILD pluma-1.8.1.ebuild 2119 SHA256 26b63fd01d7c79814646a0e22a83a4c55e4ba098316d644afc4671d124319271 SHA512 a81a555538c3d451dfa04a4c57d85cb17a3f6fa6836285239f625530dc450e38075e56c69106d6b3df1a193bc3f136c56914a1df047e7079bd6e78787ff2e62a WHIRLPOOL 471ff9bdd4b5c61e8e3fab423a30c8c62f28016d46b11af58ee42f230bf3101a36ec9674dc75b0a4b212fbb4f021e3dd1532e4dce79d62db7a2752d46f8b7a7b
+MISC ChangeLog 1445 SHA256 bd20ecf30397461747197e5af7808aa1b2335814755e6b988500f2711068bca8 SHA512 1a1928c6877ee01fbe61d1d2076b0de50cce0c05901f0bc377b4829fd65b595114fc86df06456a8516e0d396eea48eebc725c65490ec56288ef992ffd7563b79 WHIRLPOOL 37d782a50bdb1a5017e257f7003ec96355b8a1f5ad1a2df4e02646d43c934a00dedc6f514a0325085601a775874cc06b3ba680a0133a2721992a769cc4916420
+MISC metadata.xml 256 SHA256 66108875e3a6cc08c57c6dc8d194041e8afac7c54cd278c833395fbbf90a0704 SHA512 443d4706cbd96d2e8ddabec912885a97f45e218570dd29407cea2a135b804b1ab5b7af248be166f6180cadea2fc1b5be87aea7013f81c142e468ccee24944a7a WHIRLPOOL 910b96198476583a25fc25bfc5e30d7cb40033fb33a4d49770a386e3f316fab81e2f0a46e7dba0ac87914124aafa26da17b0e9d49c7f0620d62c492583fead18
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
new file mode 100644
index 0000000..cf4c89f
--- /dev/null
+++ b/app-editors/pluma/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/pluma</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-editors/pluma/pluma-1.8.1.ebuild b/app-editors/pluma/pluma-1.8.1.ebuild
new file mode 100644
index 0000000..36d6e77
--- /dev/null
+++ b/app-editors/pluma/pluma-1.8.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/pluma/pluma-1.8.1.ebuild,v 1.7 2015/04/08 07:30:32 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multilib python-single-r1 versionator virtualx
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Pluma text editor for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="python spell"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/libxml2-2.5:2
+ >=mate-base/mate-desktop-1.8:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.19:2
+ >=x11-libs/gtksourceview-2.9.7:2.0
+ x11-libs/libICE:0
+ x11-libs/libX11:0
+ >=x11-libs/libSM-1.0
+ x11-libs/pango:0
+ virtual/libintl:0
+ spell? (
+ >=app-text/enchant-1.2:0
+ >=app-text/iso-codes-0.35:0
+ )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtksourceview-2.9.2:2
+ )
+ !!app-editors/mate-text-editor"
+
+DEPEND="${RDEPEND}
+ ~app-text/docbook-xml-dtd-4.1.2
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ >=sys-devel/libtool-2.2.6:2
+ >=mate-base/mate-common-1.8:0
+ >=sys-devel/gettext-0.17:*
+ virtual/pkgconfig:*"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-updater \
+ $(use_enable python) \
+ $(use_enable spell)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_test() {
+ # FIXME: This should be handled at eclass level.
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-text/atril/ChangeLog b/app-text/atril/ChangeLog
new file mode 100644
index 0000000..eca9fcd
--- /dev/null
+++ b/app-text/atril/ChangeLog
@@ -0,0 +1,32 @@
+# ChangeLog for app-text/atril
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/atril/ChangeLog,v 1.7 2014/12/09 22:49:41 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> atril-1.8.1.ebuild:
+ sign manifest
+
+*atril-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +atril-1.8.1.ebuild:
+ version bump; closes bug #530604
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> atril-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> atril-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> atril-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 08 May 2014; Tom Wijsman <TomWij@gentoo.org> atril-1.8.0.ebuild:
+ Added a missing || ( ... ); fixes bug #509778, filed by Philipp Psurek.
+
+*atril-1.8.0 (27 Apr 2014)
+
+ 27 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +atril-1.8.0.ebuild,
+ +metadata.xml:
+ Version bump to 1.8.0, continuation of app-text/mate-document-viewer.
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
new file mode 100644
index 0000000..b0b79b9
--- /dev/null
+++ b/app-text/atril/Manifest
@@ -0,0 +1,4 @@
+DIST atril-1.8.1.tar.xz 1577776 SHA256 036b6bdf9f9caa7468c0cfb680360420cf8477007a0a04dc3b5c50b163c0333f SHA512 1a4a36135a39d216f1cfe5fb91c9d3c16d11da92fbb6b08c314ee09877c7232022a6653649a109ee7a7838a219015f5caab68b2a210399db96f87e4bae520518 WHIRLPOOL 7134a87e8cb3f490677f95f1b05716a4f14e2f8db2bd72d72e9462b061042d9247aca1340b606654aedded43277539c229999198734c4c614842c1aeb2f94fce
+EBUILD atril-1.8.1.ebuild 2640 SHA256 03313967f69fd77fcc5bc13592830610e7a8cf9d065c9aa49b3c9fe2af9cce69 SHA512 e6c7ff652d5efb32f4be5b67a46f0bdcee87c7325422dc197289c8171a27fabb6db5004e82aaabd59bccc0d0fc8c18088e2e7c217a97211b3ad43adb940e63a8 WHIRLPOOL 438d8f9992645ece23ef37911176c0665fbdfaf98fa90d4c5210daeb8460a0a84106869ae0f42e91f2a8df0c31e0badac585a678a16a793bfa87b8ff22c6138e
+MISC ChangeLog 1140 SHA256 5fb3b2ccf4473f87895b151c03a7d5cf5a015a9bb466bd21457f7cea4c7c632c SHA512 dda3caad0a5c5a689a32575a81fc29fdbcd9ce0b90e0362793c6be0d9849fb78269385be289ba25cd1fceec8b975251a77c08dbb887f90e951d5146b02dfbd10 WHIRLPOOL b6711ab5114bb1e110167e2e9827b43f18de036ca525c548010f05a0ec55d9f206b808a7f7b6711526946223354337c684f01d148c6d83e525a7d5f22f9bbca9
+MISC metadata.xml 678 SHA256 627b1ad8879fbd90b0aca1808fa6ffbf7e99d5b5f42f760da4934d2d78db11e5 SHA512 32cf61569693dc3b2a073c0d5bd1328577945674e395f571514080c7a87633c9716dda9b54d67245e8bd20a2c28eb3e2a33157318db6e10d616eacd9cdc20d1c WHIRLPOOL 84ec8d578278c8183cc41a18ff09618c1e4723356006c14b0de9e28d9156f09dbf73ddb7c619ec15d3240cb63d675daf4d56a3a8f0fc5b4e981204356953f07c
diff --git a/app-text/atril/atril-1.8.1.ebuild b/app-text/atril/atril-1.8.1.ebuild
new file mode 100644
index 0000000..64ec4f2
--- /dev/null
+++ b/app-text/atril/atril-1.8.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/atril/atril-1.8.1.ebuild,v 1.1 2014/12/09 22:48:41 tamiko Exp $
+
+EAPI="5"
+
+ELTCONF="--portage"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Atril document viewer for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +ps t1lib tiff xps"
+
+RDEPEND=">=app-text/poppler-0.14:0=[cairo]
+ app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.32:2
+ >=dev-libs/libxml2-2.5:2
+ >=mate-base/mate-desktop-1.8:0
+ sys-libs/zlib:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.21.5:2[introspection?]
+ x11-libs/libICE:0
+ >=x11-libs/libSM-1:0
+ x11-libs/libX11:0
+ >=x11-libs/cairo-1.9.10:0
+ x11-libs/pango:0
+ >=x11-themes/mate-icon-theme-1.8:0
+ caja? ( >=mate-base/caja-1.8:0[introspection?] )
+ djvu? ( >=app-text/djvu-3.5.17:0 )
+ dvi? (
+ virtual/tex-base:0
+ t1lib? ( >=media-libs/t1lib-5:5 )
+ )
+ gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+ introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
+ ps? ( >=app-text/libspectre-0.2:0 )
+ tiff? ( >=media-libs/tiff-3.6:0 )
+ xps? ( >=app-text/libgxps-0.0.1:0 )
+ !!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ >=dev-util/intltool-0.35:*
+ virtual/pkgconfig:*
+ sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_prepare() {
+ # Fix .desktop categories, upstream bug #666346.
+ sed -e "s:GTK\;Graphics\;VectorGraphics\;Viewer\;:GTK\;Office\;Viewer\;Graphics\;VectorGraphics;:g" -i data/atril.desktop.in.in || die
+
+ # Always autoreconf due to lib path conflict.
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Passing --disable-help would drop offline help, that would be inconsistent
+ # with helps of the most of GNOME apps that doesn't require network for that.
+ gnome2_src_configure \
+ --disable-tests \
+ --enable-comics \
+ --enable-pdf \
+ --enable-pixbuf \
+ --enable-thumbnailer \
+ --with-smclient=xsmp \
+ --with-platform=mate \
+ --with-gtk=2.0 \
+ $(use_enable dbus) \
+ $(use_enable djvu) \
+ $(use_enable dvi) \
+ $(use_with gnome-keyring keyring) \
+ $(use_enable introspection) \
+ $(use_enable caja) \
+ $(use_enable ps) \
+ $(use_enable t1lib) \
+ $(use_enable tiff) \
+ $(use_enable xps)
+}
+
+DOCS="AUTHORS NEWS README TODO"
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
new file mode 100644
index 0000000..d1de444
--- /dev/null
+++ b/app-text/atril/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>mate</herd>
+ <use>
+ <flag name="caja">Enable property page extension in
+ <pkg>mate-base/mate-file-manager</pkg></flag>
+ <flag name="dvi">Enable build-in DVI viewer</flag>
+ <flag name="ps">Enable build-in postscript viewer</flag>
+ <flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
+ (<pkg>media-libs/t1lib</pkg>)</flag>
+ <flag name="xps">Enable XPS viewer using
+ <pkg>app-text/libxps</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/atril</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-libs/libmateweather/ChangeLog b/dev-libs/libmateweather/ChangeLog
new file mode 100644
index 0000000..2cbaaf1
--- /dev/null
+++ b/dev-libs/libmateweather/ChangeLog
@@ -0,0 +1,52 @@
+# ChangeLog for dev-libs/libmateweather
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmateweather/ChangeLog,v 1.12 2015/04/08 17:51:55 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> libmateweather-1.8.0.ebuild:
+ Drop old Python implementations
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -libmateweather-1.6.2.ebuild:
+ drop old
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> libmateweather-1.8.0.ebuild:
+ fix compilation for -python -python_target_*, bug #523860
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> libmateweather-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> libmateweather-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> libmateweather-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> libmateweather-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*libmateweather-1.8.0 (11 Apr 2014)
+
+ 11 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +libmateweather-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> libmateweather-1.6.2.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ libmateweather-1.6.2.ebuild:
+ Remove guessed SLOT dependencies from gettext, intltool and pkg-config.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> libmateweather-1.6.2.ebuild:
+ Further review of dependencies.
+
+*libmateweather-1.6.2 (28 Feb 2014)
+
+ 28 Feb 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/libmateweather-1.5.0-fix-automagic-python-support.patch,
+ +files/libmateweather-1.6.1-fix-mkdirp.patch, +libmateweather-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for dev-libs/libmateweather, MATE library to access weather
+ information from online services; imported from the mate-overlay, reviewed and
+ adjusted.
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
new file mode 100644
index 0000000..ce33aee
--- /dev/null
+++ b/dev-libs/libmateweather/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX libmateweather-1.5.0-fix-automagic-python-support.patch 548 SHA256 e2fc5f1ff207d321fa4b2116af41bd324d8d1bc1dbd4f807bd442f6cae5af2f8 SHA512 6a8a9ed7b47a35aa8be67556c702596f1b7966ee25d7bb52877a23e12b2a4dea4a1a5786c0086a0047be69650bf2152e607433a53637b2f732025fc20e6c1aa5 WHIRLPOOL f70cae1c9cc704feb14b83e56da6903ee3592b214af13ecfe836d298b2dfe696e4f0adc4511b295d2a52215c3ead75a0cf477cbc555072a4825d76fcd959b65e
+AUX libmateweather-1.6.1-fix-mkdirp.patch 294 SHA256 9cf886494abbf8b7ff0ece10243ee98c2447a7fd691b2c39f6dd6fcfc4e6dd44 SHA512 edaa4c755d15701bc24b42824693f3c4df76c2963a018f40e8fdbd4410e1961f914bc0fce52735e2d68b03439ba4180c1167c025a865109e3412451000fb7da6 WHIRLPOOL 28494ca94edfb3770c8fb585c5c0e9fbbbd0a7c48d67641f6a748ae1483ced01f4c34a160c81eee31d5f973f671f5ef79daafc8845ca2c3d1b0bf1dd49c5a6d1
+DIST libmateweather-1.8.0.tar.xz 3530972 SHA256 801ec5512e9099c39ce819a82e2dde62477a3783894a5e7fbfff3493d04607ba SHA512 5942af847b6940f94e2ac48bdeb0d3ae96d1e61e1c3ce28d8a3cfa6e2b5b287e5d9f5a1a63481cbdaaf0595243a87c7a35886dc7fdab09f17527388149dd3422 WHIRLPOOL 8181d254bd836e96adaf6b5b7c8d58f9c0652175ccea78a66db12769840db2401d0b5e1a365660cbfa1463bdd4a312ebcd58738bac631b17c4b6ae39472e168b
+EBUILD libmateweather-1.8.0.ebuild 1752 SHA256 cde41b3ef806cce1ce548422e320a8fbf2a98733cdd6be197e8722b03a2eb4dc SHA512 7baef5ef009e3dd0dc90138565748021824caba2cedf5c5b26ccb22c70f2f6765757db5eb1bbb7b964b48a9d19d662630f665fba0c7b8f2bc51dca052d4edc2d WHIRLPOOL 2e99affa12e3827c39a229f3025159cff80dc78a8b6141cb0b99194a79a3b8bff27c9d3ad86d58763d93d586e0e3b8aded542a10ddf6b00d06d137ec9ff5b644
+MISC ChangeLog 2060 SHA256 07ed049b4090cc076794279086c1a1003f022a45508b00a0f7a2e9354a4a1c77 SHA512 16cb83091f0a530b2451612bc2ba0a949e6fb642c3c097d8f006889b9ffdbd9386a690703de433b4db40eb5476dd1e90ba868ca70d2ee2def9928aa679635517 WHIRLPOOL da3dc3d0f69ef679d2bca62f664d2d67aff22996b5e0d4e831d2d84d420f7d85980be0d8332f56cbc6c5f19fa13fb138b7c4302b4707521fc0d777b21d9b7f83
+MISC metadata.xml 250 SHA256 ba1c739540357b6007dbf2de034fa189f1883b4191cafc4017287f32e9d778eb SHA512 e09ce0c076a76b5847ab32a9bd89d712857d3cf628bed0cd40c707fe8ed2a6305ce6e117f331f2c330900f70e2c0c9793ac95509922af53f3e3bc61e26dc868f WHIRLPOOL 4978bb8ea6389217ba46d5cb22325ee3c34d9dcd8de12c5172dc5a6896cba316a745a97c14f227f19588b1a16cc063b394e2561fb48ba8ea9239b84263da5c35
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYMAAoJEBzZQR2yrxj7GR4P/3iTKHEDWs24yL2ta5XZE06T
+DcwrDGAGk+H4WNrR86q2Dpc8NeGGIcRP4EXSVgovUJs3aSutA9/O57uM9LnRSoea
+eaQzW8MDVTzaon3yQspu56OCgMp8fUr/fF8Q3NlkcaDVd/BrO0WG67ONLQp0Zuh8
+CB7u8DVKC78ATw5INIQI//L5uGxc5BwAMPGBcpK4Dt8sRnkqSVFPjto3O4/jQVDs
++QtLMAQWlXUrDQBFE7gb4mRHkmN+pEhCE+hcaWGdqCzMzTQtlpYvZQr+F9uDI3Qx
+XgHwPK5HPt/tpDBEaM/g/+q9n29ezhmySrtSKV9N3wNiJYg0lX7dW09s2B1Db8uk
+Tq63MxvYLdYWAHWgl0mVc/NV2L8do3pruTfjeXyDbH6H058iMKj2yqV5GQ7wjHca
+tOlNLg4FnCxkNe9sqoFABMJEGfHtmjbiGeY5XcB+3taeJb6edH22lYtWLZG8idoh
+IG4HWMpY8+ZzLzwYT3u1byVkw/+PqQL9X2sMKOrp5okSIWBVEl3h10DDdKGzsL84
+bQQ0ksbBSzUOpZnN3yC8L7WuUS8k3idxxv7QQnjYyaF7efR6GnHKYT//263bHyok
+3Wo9yNYq/shmy8AV08sQC9YgfGXvXB7YCZy5bi7zTsrzxtR67ZCghuvzYfC1VV0i
+Qdj6M8RRdFZkbNSxEzR+
+=C+Bf
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch b/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch
new file mode 100644
index 0000000..de5f44a
--- /dev/null
+++ b/dev-libs/libmateweather/files/libmateweather-1.5.0-fix-automagic-python-support.patch
@@ -0,0 +1,12 @@
+diff -burN libmateweather-1.5.1.orig/configure.ac libmateweather-1.5.1/configure.ac
+--- libmateweather-1.5.1.orig/configure.ac 2013-02-04 15:53:55.420890494 +0100
++++ libmateweather-1.5.1/configure.ac 2013-02-04 15:55:19.618967277 +0100
+@@ -215,7 +215,7 @@
+ AC_ARG_ENABLE(python,
+ [AC_HELP_STRING([--enable-python],
+ [Build libmateweather python bindings])],
+- [enable_python=yes],
++ [enable_python=$enableval],
+ [enable_python=no])
+ if test "$enable_python" = "yes"; then
+ AM_PATH_PYTHON()
diff --git a/dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch b/dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch
new file mode 100644
index 0000000..a76d6c7
--- /dev/null
+++ b/dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch
@@ -0,0 +1,11 @@
+diff -burN a/python/Makefile.am b/python/Makefile.am
+--- a/python/Makefile.am 2012-06-22 01:08:01.978411103 +0200
++++ b/python/Makefile.am 2012-06-22 01:11:02.007416691 +0200
+@@ -1,4 +1,7 @@
+ if BUILD_PYTHON
++
++MKDIR_P=@mkdir_p@
++
+ AM_CPPFLAGS = \
+ -I$(top_srcdir) \
+ $(PYTHON_INCLUDES) \
diff --git a/dev-libs/libmateweather/libmateweather-1.8.0.ebuild b/dev-libs/libmateweather/libmateweather-1.8.0.ebuild
new file mode 100644
index 0000000..7b8ad0e
--- /dev/null
+++ b/dev-libs/libmateweather/libmateweather-1.8.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmateweather/libmateweather-1.8.0.ebuild,v 1.6 2015/04/08 17:51:55 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools gnome2 python-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE library to access weather information from online services"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/glib-2.13:2[${PYTHON_USEDEP}]
+ >=dev-libs/libxml2-2.6:2
+ >=net-libs/libsoup-2.34:2.4
+ >=sys-libs/timezone-data-2010k:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.11:2
+ virtual/libintl:0
+
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2:2[${PYTHON_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.3:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+my_command() {
+ if use python ; then
+ python_foreach_impl run_in_build_dir $@
+ else
+ $@
+ fi
+}
+
+src_prepare() {
+ # Fix undefined use of MKDIR_P in python/Makefile.am.
+ epatch "${FILESDIR}"/${PN}-1.6.1-fix-mkdirp.patch
+ eautoreconf
+
+ use python && python_copy_sources
+ my_command gnome2_src_prepare
+}
+
+src_configure() {
+ my_command gnome2_src_configure \
+ --enable-locations-compression \
+ --disable-all-translations-in-one-xml \
+ $(use_enable python)
+}
+
+src_compile() {
+ my_command gnome2_src_compile
+}
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+src_install() {
+ my_command gnome2_src_install
+}
diff --git a/dev-libs/libmateweather/metadata.xml b/dev-libs/libmateweather/metadata.xml
new file mode 100644
index 0000000..d2f9020
--- /dev/null
+++ b/dev-libs/libmateweather/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/libmateweather</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-caja/ChangeLog b/dev-python/python-caja/ChangeLog
new file mode 100644
index 0000000..4f5acc0
--- /dev/null
+++ b/dev-python/python-caja/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for dev-python/python-caja
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-caja/ChangeLog,v 1.8 2014/12/20 17:06:42 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -python-caja-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> python-caja-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> python-caja-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> python-caja-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> python-caja-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+ 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> python-caja-1.6.1.ebuild,
+ python-caja-1.8.0.ebuild:
+ Adapt to latest pygobject don't providing python2.6 support
+
+*python-caja-1.8.0 (11 Apr 2014)
+
+ 11 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +python-caja-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*python-caja-1.6.1 (12 Mar 2014)
+
+ 12 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +metadata.xml,
+ +python-caja-1.6.1.ebuild:
+ New ebuild for dev-python/python-caja, Python bindings for the Caja file
+ manager; imported from the mate-overlay, reviewed and adjusted.
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
new file mode 100644
index 0000000..6b7ff94
--- /dev/null
+++ b/dev-python/python-caja/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST python-caja-1.8.0.tar.xz 250752 SHA256 bb872b99a4722af048990ffcd631e466dac808043bc02f7385e20845cf8b6d50 SHA512 571ee1016fb6d1d9a1e6f72da9b6959bad2734c24f5b2b2ab6af477eeb7c931c36758b09f8a0dea536f6d8ec5366747855d58764f36f2e6778c4a30b4fdebcd4 WHIRLPOOL 621a964a892d749d3619fea85f4f91ec7de2dc00ecc46b28202035b4f948133a669d4e10163a0c2fb0f35ea6261a6834ef3f7c0a9f3f6db9d3e2592a92a9906e
+EBUILD python-caja-1.8.0.ebuild 1233 SHA256 5786e86db3138f7cead469d06f8dba07121fe07000ae6bba1fed5ced1454f0dc SHA512 fac1c2ff1e765797bd091f53d4d11aebc03a2a0afe7979a2b9b81fc531a2d8550cbbf9beac7ade56ae5d2bb7751a94521ecb342785a37d7b7a32fe6e710762f1 WHIRLPOOL f3de37e557b20699ca57145a330f9490f8f1a84b04c5bd375a36793675f308c1560368553c669c9e15fbbdb2e79ea459fcc567b790b790ab2d23cbf25e9a37e8
+MISC ChangeLog 1389 SHA256 12da213724165f3bd009cef94958ebca4e2d05094cd6a51ccf247bd001f1d888 SHA512 8aa12c3b6908ffa646a43d98ee1a82a733fa6bb35f23da87cdc0c6a535921603feb47a0ea44dbc7b46e6e9412b4f1a93ddc5ef8981440b1e0acf1076a8240745 WHIRLPOOL 4d0be0f246bad950b2d4d15ec093a679809251dadd3416635c98a4526217231f6664777673e59a520f9d8fb1155b591c3dad8cb324f2ac91d5652cbc21a5ad78
+MISC metadata.xml 262 SHA256 536dfec0bd7db863862270ac5c5c2a3bc738579b24d9de26b1620515b3aead58 SHA512 df514686177c340f014be4e7bbfa8ecd6a3ceba4e3428dd1ee1f09260e3d19140e507407976b7802a798050f303b98a558ac5506d79893366acc1b9c2fd77ea1 WHIRLPOOL e5798d3c0d4be4f9e3452c9e61ff6e006e7010d68bdd4498ebd60f3ac1b73eb8303e3f6b3047d7c3785c0e164e9e6c601b92de9045d82c5722a932817acb72a8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYMAAoJEBzZQR2yrxj72RAP/i4erMhp6NSufPZGe+LGXv7K
+uPeZdGik45n456tYkzp6EWkwuhzCbbZLiX/XFKNLzASTJkTVgk69kdGkuEbXAs1u
+VFhx9ZpKg6303B+3mq/6dZgl231R4iLSwEbn3t/pJO5eNE7g0sl8ZW8yINOxPuuL
+fXPx9k1GdbqkYAOgTulDF1LrVwDAUxKEYcjkGjr6l4acef7qVM2x6GCabU4uyZ8q
+YUOItQC+BisMKscBkzPFZNF8p4d2A0RLhWlNMzfgQ+FWPAgUWV/uythdZdFaH/Ne
+q/4+TnXoQAekJU+S9OfoKFs92ACRGpRljzygfukma9nfahB0q3wXWKK62YgPzIq5
+LuxE4+td8ONE3AOUfFyYqhtRmgrOkjd4ZZ+y640OFCb2424JQlkp8EXWdE4A0Hzp
+CvlpEfgGsSmMq1c+PqysG66eybNFq3hnUi8cGgOGmelJ1GsitOFCk+hoYruQpZN2
+vAfEIAhl3CVXilwvmi+WVlfrnsuhHS2bg8OYC+hweYslKtq7U/UvlIOdpisnDEQo
+ND3020pPub1B60RwvilC8HlDtGxcidq+xLkkdLKGlw9+DTmIbvi4+p/6PRkmAd+h
+4j5gUHW5iP7VdU9LW3oX1kfz4kc1T+U1rJUa0Tp5UaU2DAm0dfVBCyXDkuYD2ows
+h5Gj5p9vbaZf4l8pXSiB
+=7ATJ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
new file mode 100644
index 0000000..3845a45
--- /dev/null
+++ b/dev-python/python-caja/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/python-caja</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/python-caja/python-caja-1.8.0.ebuild b/dev-python/python-caja/python-caja-1.8.0.ebuild
new file mode 100644
index 0000000..76c5519
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-caja/python-caja-1.8.0.ebuild,v 1.5 2014/07/02 09:45:52 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Python bindings for the Caja file manager"
+HOMEPAGE="http://www.mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="doc"
+
+RDEPEND="dev-libs/glib:2
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=mate-base/caja-1.8:0[introspection]
+ x11-libs/gtk+:2
+ ${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig:*
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+ gnome2_src_install
+
+ # Keep the directory for systemwide extensions.
+ keepdir /usr/share/python-caja/extensions/
+
+ # The HTML documentation generation is broken and commented out by upstream.
+ #
+ #if use doc ; then
+ # insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+ # doins -r docs/html/*
+ #fi
+}
diff --git a/mate-base/caja/ChangeLog b/mate-base/caja/ChangeLog
new file mode 100644
index 0000000..ff6f216
--- /dev/null
+++ b/mate-base/caja/ChangeLog
@@ -0,0 +1,48 @@
+# ChangeLog for mate-base/caja
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/ChangeLog,v 1.10 2014/12/08 23:44:40 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Dec 2014; Matthias Maier <tamiko@gentoo.org> caja-1.8.1.ebuild:
+ fix accidental checkin
+
+*caja-1.8.2-r1 (08 Dec 2014)
+
+ 08 Dec 2014; Matthias Maier <tamiko@gentoo.org> +caja-1.8.2-r1.ebuild,
+ -caja-1.8.2.ebuild, caja-1.8.1.ebuild:
+ just drop X use-flag wrt bug #526204
+
+*caja-1.8.2 (08 Dec 2014)
+
+ 08 Dec 2014; Matthias Maier <tamiko@gentoo.org> +caja-1.8.2.ebuild,
+ caja-1.8.1.ebuild:
+ version bump; cleanup obsolete dependency (bug #519152)
+
+ 07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> caja-1.8.1.ebuild:
+ Add missing dconf dependency; fixes bug #515148, reported by Patrick Lauer.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> caja-1.8.1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> caja-1.8.1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> caja-1.8.1.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 09 May 2014; Tom Wijsman <TomWij@gentoo.org> -caja-1.8.0.ebuild:
+ Remove broken 1.8.0 release that spawned endless windows.
+
+*caja-1.8.1 (09 May 2014)
+
+ 09 May 2014; Tom Wijsman <TomWij@gentoo.org> +caja-1.8.1.ebuild:
+ Version bump to 1.8.1.
+
+*caja-1.8.0 (10 Apr 2014)
+
+ 10 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +caja-1.8.0.ebuild,
+ +metadata.xml:
+ New package for mate-base/caja, continuation of mate-base/mate-file-manager;
+ version bump to 1.8.0.
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
new file mode 100644
index 0000000..5f038ec
--- /dev/null
+++ b/mate-base/caja/Manifest
@@ -0,0 +1,4 @@
+DIST caja-1.8.2.tar.xz 3596308 SHA256 99331a7439c346382c3b82c889fee9aaabca8760e9c7dfb60041c1fbcd2c6ac0 SHA512 0e704639ea895081f4175f88437d54635cf8b0891e04afda9f9cf87b6edae3ae32de35279f40518fb7044ef8fe38d1b2700acb5a93708e34e8ce2d6e7bc23ad6 WHIRLPOOL 28ec0d5f04c55bd71b368249a64bb0add323e3a0935d39e44b1f9c4919cfc4bfe3ce81d7e527a01abf033023405bdc272654a7ea05520004da7fb159e6abe47b
+EBUILD caja-1.8.2-r1.ebuild 2387 SHA256 3c093a80258eb205426c19571c1a619505de4e86de3f732ee9d2612a033ec6b3 SHA512 d6f644b23d1a7fc45674aefe9fca685749567b4619744715dfc9c6695e0e84f00a445e0342365ba18576f0a60d965ff3a7ed66163b9f4dbc1b4c2ad519cf8209 WHIRLPOOL 9a6b69e8d6a81193e2feca6c94b1a95df5b3e34e64d0c22f4697f5529b2f67a096f162e35c507bea81fc3e1deda20759f10355dcb0d19dde5cafb36b85fd0f45
+MISC ChangeLog 1653 SHA256 ec292aa32dae463eba8f5082105f7e0570ce7f60d00d6f753d0869be835381ce SHA512 0f74623a90eb3b4c4868d0327894f14c69b71a9d3b53b4a12bfc8e514b41b57cc5c810be0fe91e140f5823fafa3c127d846571ae247229acfccdd0a9c4e3606c WHIRLPOOL e1ddbfb4add7e3729d854a710601d1bcb6ca7792bc396099f9bc4b8751a923a8b6357d516e59b1f91481b39f766f025a4c8d830317d73e7d5ab7e6b53e064410
+MISC metadata.xml 524 SHA256 68b28e866a640d763940cd6f4cb62f1356f584c6f35d4c0c3fa8edf51624fbba SHA512 403f39bc3a66a1efad9a0d2dac019f6a31e7fee47b4c013c7845ab3b3cd309f51df18ab109e3fd8f005fef04388371eff2449d3e68fdbd8922cde6070c516dc3 WHIRLPOOL 0bc2658b8c7826d0c7c9b734f27b4b3bfdfd576edf7e1d32ab671afaa3f4fe8fe42b0246d5db648ff950a7c08d6928d9a2a1e43edd9cdf5f72fc39f551a1014d
diff --git a/mate-base/caja/caja-1.8.2-r1.ebuild b/mate-base/caja/caja-1.8.2-r1.ebuild
new file mode 100644
index 0000000..6e367e3
--- /dev/null
+++ b/mate-base/caja/caja-1.8.2-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/caja/caja-1.8.2-r1.ebuild,v 1.1 2014/12/08 23:42:59 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 versionator virtualx
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Caja file manager for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+mate +introspection +unique xmp"
+
+RDEPEND="dev-libs/atk:0
+ >=dev-libs/glib-2.28:2
+ >=dev-libs/libxml2-2.4.7:2
+ gnome-base/dconf:0
+ >=gnome-base/gvfs-1.10.1:0[udisks]
+ >=mate-base/mate-desktop-1.8:0
+ >=media-libs/libexif-0.5.12:0
+ >=x11-libs/gtk+-2.24:2[introspection?]
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ x11-libs/libXext:0
+ x11-libs/libXft:0
+ x11-libs/libXrender:0
+ >=x11-libs/pango-1.1.2:0
+ virtual/libintl:0
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 )
+ unique? ( >=dev-libs/libunique-1:1 )
+ xmp? ( >=media-libs/exempi-1.99.2:2 )"
+
+DEPEND="${RDEPEND}
+ !!mate-base/mate-file-manager
+ >=dev-lang/perl-5:0=
+ dev-util/gdbus-codegen:0
+ >=dev-util/intltool-0.40.1:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-1.8:0 )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+src_prepare() {
+ # Remove unnecessary CFLAGS.
+ sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+ configure{,.ac} eel/Makefile.{am,in} || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-unique \
+ --disable-packagekit \
+ --disable-update-mimedb \
+ --with-gtk=2.0 \
+ $(use_enable introspection) \
+ $(use_enable unique) \
+ $(use_enable xmp)
+}
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+src_test() {
+ unset SESSION_MANAGER
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ elog "Caja can use gstreamer to preview audio files. Just make sure"
+ elog "to have the necessary plugins available to play the media type you"
+ elog "want to preview."
+}
diff --git a/mate-base/caja/metadata.xml b/mate-base/caja/metadata.xml
new file mode 100644
index 0000000..3028d6e
--- /dev/null
+++ b/mate-base/caja/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>mate</herd>
+ <use>
+ <flag name="mate">Install <pkg>x11-themes/mate-icon-theme</pkg> which
+ is needed when this package is used in the MATE desktop
+ environment.</flag>
+ <flag name="unique">Enable single instance support using
+ <pkg>dev-libs/libunique</pkg>.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/caja</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/libmatekbd/ChangeLog b/mate-base/libmatekbd/ChangeLog
new file mode 100644
index 0000000..64a3ed1
--- /dev/null
+++ b/mate-base/libmatekbd/ChangeLog
@@ -0,0 +1,42 @@
+# ChangeLog for mate-base/libmatekbd
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/libmatekbd/ChangeLog,v 1.10 2014/12/20 17:07:57 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -libmatekbd-1.6.2.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> libmatekbd-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> libmatekbd-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> libmatekbd-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> libmatekbd-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*libmatekbd-1.8.0 (11 Apr 2014)
+
+ 11 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +libmatekbd-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> libmatekbd-1.6.2.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> libmatekbd-1.6.2.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> libmatekbd-1.6.2.ebuild:
+ Further review of dependencies.
+
+*libmatekbd-1.6.2 (28 Feb 2014)
+
+ 28 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +libmatekbd-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/libmatekbd, MATE keyboard configuration library;
+ imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/libmatekbd/Manifest b/mate-base/libmatekbd/Manifest
new file mode 100644
index 0000000..d34e121
--- /dev/null
+++ b/mate-base/libmatekbd/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST libmatekbd-1.8.0.tar.xz 364024 SHA256 b0e4b0e5388057a26e0ccd960b6f95281519805a4b46ac9a97ccc2ab62706f8d SHA512 4b789722a96bbb83e5baf5d7da668771a95dcdd678b137979ba990a7ae14129542fe7339b86706142b97ee3975d620b951a8c49833353c619474e8955d3a45bc WHIRLPOOL ede20a3037d47536fd610b23d042d1dd6cb3b46b08932fcf93104f470644f6cc697272c827eb06747f6ba3a236e6fb921ee4b6c78f115e3375ae3f2b8fd91c39
+EBUILD libmatekbd-1.8.0.ebuild 1007 SHA256 adbb248436be02de02fafb8f2844dd89611559af4934c74caeb458d99322dd0e SHA512 2dbdf38eeb8a2472d8ca8a445eb99c406bee66cc2c61a03b2ab0ed789b678ce66cca85fe8f8efe62224a2bbc4fe13563f1c19a32ae32b5b26bbf05fd170c1968 WHIRLPOOL 9c0e08ef0e0e27b8d00dbcb7cff8ed7000a39eb00a3271ff6d6a07621810f217ab0e29407b90beb767e1225436a976cf9baf36f39daa00669cf68fc961ae8495
+MISC ChangeLog 1603 SHA256 70de45c76339f1f147c18b480cc81752483756a6d24bc17a41a3acd9f77b2ae7 SHA512 69d1627d5ee81a165fbf152f3245e09711d1633d3e23859c79901d341f72b124d630deed6c8ee37b94224b38852b21d0a32149fb41007b22fe77b5144145e9b0 WHIRLPOOL 8f266491b39ba4174ef4affff7b4f4d4294b8ec3c13570407aef280b72993cf1530d5c9adf62ede7df93085f5b5c01f1f3c9cba8a3e9d68fe0b2fdef66b01f75
+MISC metadata.xml 261 SHA256 098c359b3f39f7d6bafeb56ce70de560a8a53dd040bc431b1be6f82c67b2dd16 SHA512 e5d6ab165c5a39437fbaac870ab78f614bc4f48150ed2a567e78661eb3c5dc699ad46b86576ec155606c9fa903e5f23a0af3c739dc8460f7ccbe62136d67c2bc WHIRLPOOL fccffbc79e56920d3984aa1046bb92074c5c76a4f140e61ba268372af30a892164015a3e3715b7f7ffd9373a8107e8d62c4115bc5539721393378c2bc2972a7b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYMAAoJEBzZQR2yrxj7XQUQAKT85tR0yS3sUgUzNUFcUE/I
+1BrlB0QeDpoRyWKc1CW0VKACG4xv4ZGKhHhfDC/ElDue/rggBBjeTUFJVr5pLjYd
+ZUy/ZZIXp/0jSKQPpXK5jadXyxinNUIo9Tb9r4Puk+B6fpmOI/kb6ONdfbd0ihg5
+LeMvr06WQ82QvwZlETooKH1Qi4xwCUNSxyvq9U0QgW1JAsyjX9ZxX9dKUXQr+Ger
+MmkKjkaGKKdznTfCyrp4XbEyrorQd1ZBhNqD4lsI2b6eBRyvWJolVf04QYRPnvrp
+1ciQbP5wYzxon+YrjtBs16/ZlyIveDTIylZFuYfDITVLuEK+ZtR1azpDp3W+xsk7
+ol6cwDMYXpGX93U9UYvns947GtxTFau0D4ltO4M40JWpKdXW+0VdZuf7gH2TjMit
++ag0Qjffv7gSRrJcn86MJzPWq8f6WOOzgwFitbGKhiyAj/5P5LyxrPI8/0IBFU25
+9w00d9P4dgo57RhNRusOICVc0U4NvWJMv5KWanSH1dVSpocI8RDQzUyIsho3dpef
+i0GhLcwWn+ni37NzkV1OXe22P3v1VtX/dyd9qeulgt9b0kKAadZ0mPvSICrFG0oI
+tu296T9C6yatUL2J41qFnTKIWfVLDc9K+V91otXmR+UcTDkuqHOCbqspG2ZDvinw
+Sg7ekjB1TiNTiLorDv8G
+=Ooyb
+-----END PGP SIGNATURE-----
diff --git a/mate-base/libmatekbd/libmatekbd-1.8.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.8.0.ebuild
new file mode 100644
index 0000000..60441e1
--- /dev/null
+++ b/mate-base/libmatekbd/libmatekbd-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/libmatekbd/libmatekbd-1.8.0.ebuild,v 1.4 2014/07/02 09:46:06 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE keyboard configuration library"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="X test"
+
+RDEPEND=">=dev-libs/glib-2.18:2
+ x11-libs/cairo:0
+ >=x11-libs/gdk-pixbuf-2.18:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libX11:0
+ >=x11-libs/libxklavier-5.0:0
+ x11-libs/pango:0
+ virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+ sys-devel/gettext:*
+ >=dev-util/intltool-0.35:*
+ virtual/pkgconfig:*"
+
+src_configure() {
+ gnome2_src_configure \
+ --with-gtk=2.0 \
+ $(use_enable test tests) \
+ $(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-base/libmatekbd/metadata.xml b/mate-base/libmatekbd/metadata.xml
new file mode 100644
index 0000000..29638e6
--- /dev/null
+++ b/mate-base/libmatekbd/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/libmatekbd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-applets/ChangeLog b/mate-base/mate-applets/ChangeLog
new file mode 100644
index 0000000..21c579c
--- /dev/null
+++ b/mate-base/mate-applets/ChangeLog
@@ -0,0 +1,86 @@
+# ChangeLog for mate-base/mate-applets
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/ChangeLog,v 1.18 2015/04/08 18:13:42 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> mate-applets-1.8.0-r1.ebuild,
+ mate-applets-1.8.1.ebuild:
+ Drop old Python implementations
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-applets-1.6.2-r1.ebuild:
+ drop old
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> mate-applets-1.8.1.ebuild:
+ also provide a upower use-flag, bug #527400
+
+*mate-applets-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +mate-applets-1.8.1.ebuild:
+ version bump; add missing ${PYTHON_REQUIRED_USE}, bug #518030
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-applets-1.6.2-r1.ebuild:
+ Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-applets-1.8.0-r1.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 01 Jun 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2-r1.ebuild,
+ mate-applets-1.8.0-r1.ebuild:
+ Fix up upower dependency, due to 0.9 -> 0.99 bump; 0.99 is only supported
+ since 1.8 due to f17654d853e603b1e4c6c22ffb1abbd6b364f4dc and therefore not
+ supported in 1.6.
+
+ 01 Jun 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.6.2-r1.ebuild,
+ mate-applets-1.8.0-r1.ebuild:
+ mate-applets are ready for upower-1 since 1.6.2 when upstream accepted the
+ patches for that
+
+ 31 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2-r1.ebuild,
+ mate-applets-1.8.0-r1.ebuild:
+ Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+ ssuominen.
+
+ 31 May 2014; Pacho Ramos <pacho@gentoo.org> mate-applets-1.8.0-r1.ebuild:
+ Needs to be rebuilt with libgtop soname bumps
+
+ 18 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2-r1.ebuild,
+ mate-applets-1.8.0-r1.ebuild:
+ Add missing inherits and eautoreconf, fixes bug #510034 and bug #510548;
+ reported by Sven on the Bugzilla and Silent-Hunter on the Forums.
+
+*mate-applets-1.8.0-r1 (16 May 2014)
+*mate-applets-1.6.2-r1 (16 May 2014)
+
+ 16 May 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch,
+ +mate-applets-1.6.2-r1.ebuild, +mate-applets-1.8.0-r1.ebuild,
+ -mate-applets-1.6.2.ebuild, -mate-applets-1.8.0.ebuild:
+ Revision bump, use cpupower instead of cpufrequtils; fixes bug #510034,
+ reported by Pacho Ramos.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-applets-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-applets-1.8.0 (17 Apr 2014)
+
+ 17 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-applets-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 17 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-applets-1.6.2.ebuild:
+ Added missing virtual/libintl dependency for gettext.
+
+*mate-applets-1.6.2 (17 Mar 2014)
+
+ 17 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-applets-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/mate-applets, applets for the MATE Desktop and Panel;
+ imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
new file mode 100644
index 0000000..4755606
--- /dev/null
+++ b/mate-base/mate-applets/Manifest
@@ -0,0 +1,5 @@
+AUX mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch 3196 SHA256 2a0e69b60f0a2777190eba9b4d2bf7cfabb7912c302e992ca5b6e49971a58eba SHA512 6506e1346a972384916e54bc675db7457f9f93ade8617db291214cf9842049f3653e00d7a02bc158c19ab902b21fe276282f4f118d097d576608536899dc8ae3 WHIRLPOOL c7e5aaf8546e9879b79abe4ddf4e71afc3e9e44adaa637673844e4dcec0525416902abee6fb0eabbc88ab0095795a0da3753ef9431c4cad7cabff633845b5ffa
+DIST mate-applets-1.8.1.tar.xz 6877876 SHA256 6f1a88453e526a7ee67e14fa4d6b3dc74fb954a1465c7cb3a76f205389a2df83 SHA512 054d74be78175a4b8d29f854d6ee9c4eaadca518c6382a58230b0131115aff30567c4005f8601c5c6fc629d8c2b46d2512c24cb235c35d921d6fcd97a7ef24d9 WHIRLPOOL c426ba49c5e52541ca55843422249c487da7a05a1cf06c54f3db601b548a231c629ebbed504e5ae3552705096ec3506e29c17e30530dafdffd2b654dd0732434
+EBUILD mate-applets-1.8.1.ebuild 2619 SHA256 583869b19b54ab63f7da7f3b5bc25e0c6c46237aebf170f202a007c49d2ff789 SHA512 dd0cb57d578f870003c26664cd0f9102f645b840d1b7177a759b67295a2f800a30e69b905094ad0921a6be305c3f0a4e17930b3fd2850c4e422e2c0fed35e2ef WHIRLPOOL 221264f6f3dae4f488a729761039f5992017a58343693fcd5985325c2e16927391a51d7545d5c3a06b085ca876a21ea89bbbde31f362c15732107a5492ed2261
+MISC ChangeLog 3452 SHA256 2c00a4f2fbcdc8bd2e356f816deafa828234095631a335cb0e2e9a0ba95d59ae SHA512 270eb8de9fe9427ccafe5e3141b0092c45cac0b2c5201cc1da77cc251a3d423b5037632db3c6f81f1fa27e8dea877eb19b092bc42f0c6729dfeb04a8a09d466d WHIRLPOOL d833ba89ea21e146cdbcc0833ffe771c727e84b89ce53d3ead22f9a857a2ba463d18a59156da94f5ffd0aaa297c8fecb481e9ef67a21f01a7a336f97f4ae45d0
+MISC metadata.xml 263 SHA256 eb1dbd269d9ba341e7cf8a9af1584b6dd5733fa27023aca988d23d88c884c19a SHA512 0ffacb7b59b84c697640ba1b694b4ce27f1b62269e244276237992bd554e1a239d50cb23cfe90f99d3567c338e33f88159dd88e5bf3deed6ef93304d303c4493 WHIRLPOOL 239414c3d8402167c59bec65d5b8b400cf4eba9eeec2182110e3c6c4b225026455c33884a424a5292c98b8bf5236c1a5a2709d2a9ea0c9a9f8565897dfb939ed
diff --git a/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
new file mode 100644
index 0000000..880afc7
--- /dev/null
+++ b/mate-base/mate-applets/files/mate-applets-1.6.2-r1-replace-cpufreq-by-cpupower.patch
@@ -0,0 +1,79 @@
+Obtained from: http://pkgs.fedoraproject.org/cgit/mate-applets.git/plain/cpufreq.patch
+
+diff -upr mate-applets-1.5.0-orig/configure.ac mate-applets-1.5.0/configure.ac
+--- mate-applets-1.5.0-orig/configure.ac 2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/configure.ac 2013-01-14 18:04:15.726598991 +0100
+@@ -506,13 +506,13 @@ if test "x$HAVE_POLKIT" = "xyes"; then
+ fi
+
+ AC_CHECK_HEADER(cpufreq.h, have_libcpufreq=yes, have_libcpufreq=no)
+-LIBCPUFREQ_LIBS=
+-if test "x$have_libcpufreq" = "xyes"; then
+- AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.])
+- LIBCPUFREQ_LIBS=-lcpufreq
++LIBCPUPOWER_LIBS=
++if test "x$have_libcpupower" = "xyes"; then
++ AC_DEFINE([HAVE_LIBCPUPOWER], [1], [Have libcpupower.])
++ LIBCPUPOWER_LIBS=-lcpupower
+ fi
+-AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
+-AC_SUBST(LIBCPUFREQ_LIBS)
++AM_CONDITIONAL(HAVE_LIBCPUPOWER, test x$have_libcpupower = xyes)
++AC_SUBST(LIBCPUPOWER_LIBS)
+
+ build_cpufreq_applet=no
+
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c
+--- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c 2013-01-14 19:15:28.432366287 +0100
+@@ -24,7 +24,7 @@
+ #include "cpufreq-selector-factory.h"
+ #include "cpufreq-selector-sysfs.h"
+ #include "cpufreq-selector-procfs.h"
+-#ifdef HAVE_LIBCPUFREQ
++#ifdef HAVE_LIBCPUPOWER
+ #include "cpufreq-selector-libcpufreq.h"
+ #endif
+
+@@ -33,7 +33,7 @@ cpufreq_selector_factory_create_selector
+ {
+ CPUFreqSelector *selector = NULL;
+
+-#ifdef HAVE_LIBCPUFREQ
++#ifdef HAVE_LIBCPUPOWER
+ selector = cpufreq_selector_libcpufreq_new (cpu);
+ #else
+ if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
+@@ -41,7 +41,7 @@ cpufreq_selector_factory_create_selector
+ } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
+ selector = cpufreq_selector_procfs_new (cpu);
+ }
+-#endif /* HAVE_LIBCPUFREQ */
++#endif /* HAVE_LIBCPUPOWER */
+
+ return selector;
+ }
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am
+--- mate-applets-1.5.0-orig/cpufreq/src/cpufreq-selector/Makefile.am 2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/cpufreq-selector/Makefile.am 2013-01-14 19:13:27.223180712 +0100
+@@ -16,7 +16,7 @@ if CPUFREQ_SELECTOR_SUID
+ endif
+
+
+-if HAVE_LIBCPUFREQ
++if HAVE_LIBCPUPOWER
+ cpufreq_files=cpufreq-selector-libcpufreq.c cpufreq-selector-libcpufreq.h
+ endif
+
+diff -upr mate-applets-1.5.0-orig/cpufreq/src/Makefile.am mate-applets-1.5.0/cpufreq/src/Makefile.am
+--- mate-applets-1.5.0-orig/cpufreq/src/Makefile.am 2012-12-08 22:37:32.000000000 +0100
++++ mate-applets-1.5.0/cpufreq/src/Makefile.am 2013-01-14 19:14:01.647517888 +0100
+@@ -12,7 +12,7 @@ INCLUDES = \
+
+ libexec_PROGRAMS = mate-cpufreq-applet
+
+-if HAVE_LIBCPUFREQ
++if HAVE_LIBCPUPOWER
+ cpufreq_files=cpufreq-monitor-libcpufreq.c cpufreq-monitor-libcpufreq.h
+ endif
+
diff --git a/mate-base/mate-applets/mate-applets-1.8.1.ebuild b/mate-base/mate-applets/mate-applets-1.8.1.ebuild
new file mode 100644
index 0000000..196a040
--- /dev/null
+++ b/mate-base/mate-applets/mate-applets-1.8.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-applets/mate-applets-1.8.1.ebuild,v 1.3 2015/04/08 18:13:42 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Applets for the MATE Desktop and Panel"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X ipv6 networkmanager policykit +upower"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/dbus-glib-0.74:0
+ >=dev-libs/glib-2.22:2
+ >=dev-libs/libmateweather-1.8:0
+ >=dev-libs/libxml2-2.5:2
+ dev-python/pygobject:3
+ >=gnome-base/libgtop-2.11.92:2=
+ >=mate-base/mate-desktop-1.8:0
+ >=mate-base/mate-panel-1.8:0
+ >=mate-base/mate-settings-daemon-1.8:0
+ >=sys-apps/dbus-1.1.2:0
+ sys-power/cpupower
+ upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.24:2
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ >=x11-libs/libxklavier-4:0
+ >=x11-libs/libwnck-2.30:1
+ x11-libs/pango:0
+ >=x11-themes/mate-icon-theme-1.8:0
+ virtual/libintl:0
+ networkmanager? ( >=net-misc/networkmanager-0.7:0 )
+ policykit? ( >=sys-auth/polkit-0.92:0 )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.3
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ dev-libs/libxslt:0
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.6.2-r1-replace-cpufreq-by-cpupower.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --libexecdir=/usr/libexec/mate-applets \
+ --without-hal \
+ $(use_enable ipv6) \
+ $(use_enable networkmanager) \
+ $(use_enable policykit polkit) \
+ $(use_with upower) \
+ $(use_with X x)
+}
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ emake check
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+ python_fix_shebang invest-applet timer-applet/src
+ gnome2_src_install
+
+ local APPLETS="accessx-status battstat charpick command cpufreq drivemount
+ geyes invest-applet mateweather mini-commander mixer multiload
+ null_applet stickynotes timerapplet trashapplet"
+
+ for applet in ${APPLETS}; do
+ docinto ${applet}
+
+ for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
+ [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
+ done
+ done
+}
diff --git a/mate-base/mate-applets/metadata.xml b/mate-base/mate-applets/metadata.xml
new file mode 100644
index 0000000..7cc8907
--- /dev/null
+++ b/mate-base/mate-applets/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-applets</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-common/ChangeLog b/mate-base/mate-common/ChangeLog
new file mode 100644
index 0000000..bb5915e
--- /dev/null
+++ b/mate-base/mate-common/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for mate-base/mate-common
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-common/ChangeLog,v 1.8 2014/12/20 17:10:32 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-common-1.6.2.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-common-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-common-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-common-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-common-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-common-1.8.0 (11 Apr 2014)
+
+ 11 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-common-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 27 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
+ Correct metadata.
+
+*mate-common-1.6.2 (26 Feb 2014)
+
+ 26 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +mate-common-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/mate-common, common files for development of MATE
+ packages; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
new file mode 100644
index 0000000..2103531
--- /dev/null
+++ b/mate-base/mate-common/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-common-1.8.0.tar.xz 71072 SHA256 0b04310e61d0f9a7dd3ba32aadae38a6d0089b464b134bf015472fc9f47a23cc SHA512 a73e42a8a09a444ace9cf54efdfecf8204db55800f1d04915bae724ad259c2f87c94b147f7299f081c700bed8659e06720a2af31e7d2c3ceb42cb6cab8ea1818 WHIRLPOOL 5083276c41b02be82e1789c1d35a1d8292faf460be5b8e045593f4915f7b274671bfd3d8c02b740b2bd8ff3778d9e1f49e7fb2c1b683f3715f6306bf3fbfa2cb
+EBUILD mate-common-1.8.0.ebuild 662 SHA256 fdcef06e23387adffd88f4592a374d6992b24abbe38e62eb4ce7298dd05040cc SHA512 dcc4dfd0a9cae9a82976bb3536af793beb9e2f5ec350e6f687474b2fbea98dc4670f4bb6b8461050e241de60feec82ffe8552c643bc90ba99afaca0016e4e03f WHIRLPOOL db391e5c16e23fb7cfc30b80900a1c3915f9e25b8df962d29e510ee3c5d6d0feb81149fda15608cf2f6fd379bd64fbe6bbb1df47d92cc6f06e43f9ad79311966
+MISC ChangeLog 1309 SHA256 d60eb8a32e85b17da482c10ca00cf2541ab502fc9b52e888dbaf2becf6ec7284 SHA512 c49d63dba22d524587856a5acd63e7eac48972ef2b6dff2ab00486b8479e53b9b2ea2a9c76bb89987123bd8ba32c9a9561e8d276fe183d37704440c577dda7be WHIRLPOOL b527477314ea43b8fb7c8d7b045553c33948e946c51bd5cda3016e44c906f5b493adf4d66cf6c73f4901bf5daad23103619336335f685287771a3955d948433c
+MISC metadata.xml 262 SHA256 bb9c5f03ab8024d93d64436645c157837cc2415c7431a31fb6aa941094503b57 SHA512 0dbdd58101f9b1438ce1fcd9265ccd87cf90517440471a1be1db4c6024fa77dcfee009185269e5786ee8b3f9233efe8ab89b421cad525810e7d4774fbd3f4c6e WHIRLPOOL c26cb4e0b3e7b0d07f19be60aae56ba66e2c68a7bbd9a95cfa0f7795f85c8201362dc1d26abae0d21a842e12b7ecc0d2228b7a7c14028d3f7d2c79bc296b704d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYMAAoJEBzZQR2yrxj7/u0QAKt23zo9P189fhGIFJ0H7c0E
+vYcmhh86dHjilLX53mkPMKnMx5kunVXk+SHoFcscj9liA/WthmICEoZmOOexDSke
+HCB7VNiYzLMb+AOMB19H1fdHafJDa17xvqVVpbVy8hvoKgTvspWPT/sYwRuFqeug
+ZSrAvRyUIhRqRc3tMiZZIlFJd0rEwVzjXX0QufnYvAWH9+Z9qHw8ZbDip1MwlxqZ
+bSXzmX39aj1ri2WPPXc/rwLgEmrecuCC3OrkikrAZP14Yz1WeR31fFGW7w5YHpj9
+Yn3HjdFbkDXBN3nckeOj4CreuVZ3sX7F2DX56oKRVlkm6wrfsMO+VTWteFfWl7A2
+18TQ4AsEAuP0xpwBCc9oFhXn5yLi+N2O3s9Vdy3ubc6f0+w30vbHps/zt0jbDtJh
+BbHtFQi5yCPT/kctXT8gQomkHLw5Stt2QQi9BspxRPIYd/Qfq5ahELO2EIuv+B2a
+f+HyMCg/UAHMB6eFfj6t9DRXWJ2H4xif/UoTtKb0/f/XgGaoxOsvWW7dSkgv12FF
+Lb8S/d9kGVzcUbTeUWPUoCrG0pxAvtz4qF8i7lS2nrju1ywD3P4jXJprjTkAY29S
+O7sq4DhlvJdq3M8NdBDvYq4PhNL7PV9zif2WNidSWJUi4mgIta8GkHWTOJx6hL74
+tIvvxEWdEdgHinbOARfU
+=xwf+
+-----END PGP SIGNATURE-----
diff --git a/mate-base/mate-common/mate-common-1.8.0.ebuild b/mate-base/mate-common/mate-common-1.8.0.ebuild
new file mode 100644
index 0000000..b3fcddd
--- /dev/null
+++ b/mate-base/mate-common/mate-common-1.8.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-common/mate-common-1.8.0.ebuild,v 1.4 2014/07/02 09:46:22 pacho Exp $
+
+EAPI="5"
+
+inherit versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Common files for development of MATE packages"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+src_install() {
+ mv doc-build/README README.doc-build \
+ || die "Failed to rename doc-build/README."
+
+ default
+
+ dodoc doc/usage.txt
+}
diff --git a/mate-base/mate-common/metadata.xml b/mate-base/mate-common/metadata.xml
new file mode 100644
index 0000000..9c63ff9
--- /dev/null
+++ b/mate-base/mate-common/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-common</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-control-center/ChangeLog b/mate-base/mate-control-center/ChangeLog
new file mode 100644
index 0000000..cb0ac8c
--- /dev/null
+++ b/mate-base/mate-control-center/ChangeLog
@@ -0,0 +1,56 @@
+# ChangeLog for mate-base/mate-control-center
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-control-center/ChangeLog,v 1.11 2014/12/20 17:12:16 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-control-center-1.6.2.ebuild:
+ drop old
+
+*mate-control-center-1.8.3 (11 Dec 2014)
+
+ 11 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-control-center-1.8.3.ebuild:
+ version bump
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-control-center-1.8.1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-control-center-1.8.1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-control-center-1.8.1.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-control-center-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+ 02 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-control-center-1.6.2.ebuild,
+ mate-control-center-1.8.1.ebuild:
+ Remove libappindicator dependency, fixes bug #509278; restrict mate-desktop
+ dependency to 1.6 for mate-control-center 1.6, due to build failure.
+
+*mate-control-center-1.8.1 (28 Apr 2014)
+
+ 28 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-control-center-1.8.1.ebuild:
+ Version bump to 1.8.1.
+
+ 24 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-control-center-1.6.2.ebuild:
+ SLOT move from 2 to 0.
+
+ 24 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-control-center-1.6.2.ebuild:
+ Temporarily fix parallel build issue with -j1, discovered while building all
+ MATE packages at once.
+
+*mate-control-center-1.6.2 (22 Mar 2014)
+
+ 22 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-control-center-1.6.2-libsecret.patch,
+ +mate-control-center-1.6.2.ebuild, +metadata.xml:
+ New ebuild for mate-base/mate-control-center, the MATE Desktop configuration
+ tool; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
new file mode 100644
index 0000000..8614ced
--- /dev/null
+++ b/mate-base/mate-control-center/Manifest
@@ -0,0 +1,5 @@
+AUX mate-control-center-1.6.2-libsecret.patch 568 SHA256 3518a51ca310ff548a5e910ff709ef6393a80b279213d145194d72b11a481470 SHA512 29eb83df4e65167c7f92d146c5f92ddee593f6f4895c3edfd9da243ef7c3c7c50c5c85a0c1e27ec6685aa2020679ed959a0953930768c9c2ec91fdf483b52523 WHIRLPOOL ecfc5a228a16c4ac9b9e4890ad1f3a4edfec999cc19b819f7b1842085bc12dd5f7aa6a418930765d8a4eccad04f8e58227f94b9aa3853e4b074ae5687f124110
+DIST mate-control-center-1.8.1.tar.xz 1306504 SHA256 caf482b5944680b5f3e03334bd5932d2f7befda1855d0abb2aef73fbe9e5e8f0 SHA512 12edce98ebe45925ca3b4539d43a940f7d7de72163a9d4d742ff801fbc1198a980790e8e87366fffcdbd172e8b2f18de1fcffc8912c41b66fc6bdf28d2e800e7 WHIRLPOOL ccf44af90596dd493a67c52ffa068ccec1a1e6a62102f1d15eb308a4e63f7e1a7cd08a2b283c967a964dcc2afcc19cd2c2da578b5525034e1e18b2526ba873ca
+EBUILD mate-control-center-1.8.1.ebuild 1973 SHA256 2b7d9694e2b9e48d4fd9c9fb2dd77513c0b4b44812c4403a7d78e475ab4501b0 SHA512 429a34809775e1e6cb5247e918256dec8a7a58e352f7a6eed61dc7053b10c45470581bd015d37cbad17e23a6dd1ff8481ddfdc0b38462f3dd84adde3bba26f72 WHIRLPOOL f303d474c19dcc1d1c6d92171784c2c61482f0b5229fc3f836af301b1d7e2471f60e0c90b8a5eea3053aa72e57fbe3e6b713b40fc9b67386ae258cb6ac738eef
+MISC ChangeLog 2079 SHA256 514a134c3838fe5c40da610ada6d8e0c3e4404ab2fce05c0b35de2f5b65e71c6 SHA512 5a7d28d969b564209dd3bb025e5c1874c8367f5fb0616ed69ec41785172ca3ecebf833616cc6a7e3354d764cba9dbc063dc3d4208b9504a1ee76ac6f5627e458 WHIRLPOOL ecc651a01a957e16e9b83f993e37d732e99c207c226ac8661b0dbea3d74fdb64001fff5544cdabc287c9c506ccf722041c12821d9cbc21afdc770470fdf51ceb
+MISC metadata.xml 270 SHA256 89cf6530cb49cc54f9b56e8d177667ac69c66beffd5a62225902b65ff08131a8 SHA512 89259f32f4f64729778da393f9788c1c847c1a104c4f568a6ed47559689922b6eaea7d92f6323fc1787ebebbd1f93e4a444af0938d9c0d760dc4505a6abf7fc2 WHIRLPOOL da791309b14b8778bb38dec4f6ca8a67166314f7369b61b2f6952988f9162116a703f7728f823706b4e0671443315ea8b0a99fbf9cbf94270d6dba64c500010d
diff --git a/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
new file mode 100644
index 0000000..b66a9af
--- /dev/null
+++ b/mate-base/mate-control-center/files/mate-control-center-1.6.2-libsecret.patch
@@ -0,0 +1,15 @@
+diff --git a/libslab/app-shell.c b/libslab/app-shell.c
+index 3c33230..5f4af23 100644
+--- a/libslab/app-shell.c
++++ b/libslab/app-shell.c
+@@ -987,8 +987,8 @@ static void handle_menu_action_performed (Tile * launcher, TileEvent * event, Ti
+ return TRUE;
+ }
+
+- /* discard mate-keyring-manager if CASA is installed */
+- if ((exec && !strcmp (exec, "mate-keyring-manager"))
++ /* discard gnome-keyring-manager if CASA is installed */
++ if ((exec && !strcmp (exec, "gnome-keyring-manager"))
+ && (path = g_find_program_in_path ("CASAManager.sh")))
+ {
+ g_free (path);
diff --git a/mate-base/mate-control-center/mate-control-center-1.8.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.8.1.ebuild
new file mode 100644
index 0000000..cc2ada1
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.8.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-control-center/mate-control-center-1.8.1.ebuild,v 1.5 2014/07/02 09:46:30 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE Desktop configuration tool"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/dbus-glib-0.73:0
+ >=dev-libs/glib-2.28:2
+ >=dev-libs/libunique-1:1
+ dev-libs/libxml2:2
+ >=gnome-base/dconf-0.13.4:0
+ >=gnome-base/librsvg-2.0:2
+ >=mate-base/libmatekbd-1.8:0
+ >=mate-base/mate-desktop-1.8:0
+ >=mate-base/caja-1.8:0
+ >=mate-base/mate-menus-1.8:0
+ >=mate-base/mate-settings-daemon-1.8:0
+ >=media-libs/fontconfig-1:1.0
+ media-libs/freetype:2
+ media-libs/libcanberra:0[gtk]
+ >=sys-apps/dbus-1:0
+ x11-apps/xmodmap:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libX11:0
+ x11-libs/libXScrnSaver:0
+ x11-libs/libXcursor:0
+ x11-libs/libXext:0
+ x11-libs/libXft:0
+ >=x11-libs/libXi-1.2:0
+ x11-libs/libXrandr:0
+ x11-libs/libXrender:0
+ x11-libs/libXxf86misc:0
+ >=x11-libs/libxklavier-4:0
+ x11-libs/pango:0
+ >=x11-wm/marco-1.8:0
+ virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ dev-util/desktop-file-utils:0
+ >=dev-util/intltool-0.37.1:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ x11-proto/kbproto:0
+ x11-proto/randrproto:0
+ x11-proto/renderproto:0
+ x11-proto/scrnsaverproto:0
+ x11-proto/xextproto:0
+ x11-proto/xf86miscproto:0
+ x11-proto/xproto:0
+ virtual/pkgconfig:*"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-appindicator
+}
+
+src_compile() {
+ emake -j1
+}
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/mate-base/mate-control-center/metadata.xml b/mate-base/mate-control-center/metadata.xml
new file mode 100644
index 0000000..0647922
--- /dev/null
+++ b/mate-base/mate-control-center/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-control-center</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-desktop/ChangeLog b/mate-base/mate-desktop/ChangeLog
new file mode 100644
index 0000000..90616fa
--- /dev/null
+++ b/mate-base/mate-desktop/ChangeLog
@@ -0,0 +1,76 @@
+# ChangeLog for mate-base/mate-desktop
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/ChangeLog,v 1.17 2015/04/08 18:13:42 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> mate-desktop-1.8.0-r1.ebuild,
+ mate-desktop-1.8.1-r1.ebuild:
+ Drop old Python implementations
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-desktop-1.6.2-r1.ebuild:
+ drop old
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> mate-desktop-1.8.1-r1.ebuild:
+ add missing ${PYTHON_REQUIRED_USE}, bug #523858
+
+ 26 Oct 2014; Mart Raudsepp <leio@gentoo.org> mate-desktop-1.8.1-r1.ebuild:
+ Add ~arm keyword for bug 508072 and me
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-desktop-1.8.1-r1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-desktop-1.8.1-r1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-desktop-1.8.1-r1.ebuild:
+ Add ~x86, wrt bug #508072
+
+*mate-desktop-1.8.1-r1 (10 May 2014)
+
+ 10 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.1-r1.ebuild,
+ -mate-desktop-1.8.0.ebuild, -mate-desktop-1.8.1.ebuild:
+ Bring over changes from the revision bump, remove old revisions; fixes bug
+ #509756, comment #4.
+
+*mate-desktop-1.8.1 (09 May 2014)
+
+ 09 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.1.ebuild:
+ Version bump to 1.8.1.
+
+*mate-desktop-1.8.0-r1 (07 May 2014)
+
+ 07 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.0-r1.ebuild:
+ Revision bump; do not install desktop documentation, temporarily fix bug
+ #509756.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-desktop-1.6.2-r1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-desktop-1.8.0 (10 Apr 2014)
+
+ 10 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-desktop-1.6.2-r1 (24 Mar 2014)
+
+ 24 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.6.2-r1.ebuild,
+ -mate-desktop-1.6.2.ebuild:
+ Revision bump. Properly install Python script.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-desktop-1.6.2.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-desktop-1.6.2.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-desktop-1.6.2.ebuild:
+ Further review of dependencies.
+
+*mate-desktop-1.6.2 (02 Mar 2014)
+
+ 02 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-desktop-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/mate-desktop, libraries for the MATE desktop that are
+ not part of the UI; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
new file mode 100644
index 0000000..8fe1ff7
--- /dev/null
+++ b/mate-base/mate-desktop/Manifest
@@ -0,0 +1,4 @@
+DIST mate-desktop-1.8.1.tar.xz 8027312 SHA256 a4e1316f9468150e30495b54024fbc9f98e12cc7f9750d972f5457f13ca908f3 SHA512 64c32ea32a0e0e88df314297b2b45c5a6da2747a3bed41437eb17bf282511a4d01bd678728005a6301f93ae2b3c09a38039af85a8666d18e51958d6ffa091d9b WHIRLPOOL f5ed8a0b338b453ccbf7fcb560dd2490f43edceff21c8b6104eb91e8df6e016890174d34a1be3eec2b20322fd34a5c9ce553d0450a533407d4ef8269ff1aa4f8
+EBUILD mate-desktop-1.8.1-r1.ebuild 1674 SHA256 7108608f9789845244c2d05bdff6fa5941268cdc80cd5b73414d60aa42e3027c SHA512 7ecfd48914fa34d002942a943dbeb361c05bcd7177ff20906ec23889fa7c597046f56d078f940b32500c97fe357794e2cf9f7193fb977982ed815a2289b21bf8 WHIRLPOOL 8568dbd505304b7950efdb4c5d29ef5d246f6f3f57c2946d9d0c7ea7c13adb347ffde93a6175de0d3119f9f3db02e25e9363af3f08f7167afee5855f974ffadd
+MISC ChangeLog 2878 SHA256 06631cefa30f882fec75596cf2921b55f897f276a6c422b6e9ee9ddedd2710ef SHA512 280678bbe871d5274db2a1a095b28bc73418c05c2df7cb4f6791c486124b00e23e6888406b2820ebb5f83d6e95d8ceae387c24ea37272366f3556aa5050c8f8a WHIRLPOOL e0d49658ecbfce228cc8efe5303af5a1fd22d4ca41a21c6fb6adf10ded72c8e869704a1bbb8a09b6b0782a01b874508976b04fa425343a1e09ae2ec34baf218f
+MISC metadata.xml 263 SHA256 1e43c379370759dd15d1d3dd61a13ce6e0b83c658b98f87e5f81f39065f88519 SHA512 93f625b20ba195d11fa65c462801681cd0b3b864543eff4185e6300796a59164192fa05ba1e42e8dcf8ffec926411fbc2365a7f36ff0b9e3e20582e8dbd2fd44 WHIRLPOOL 52e3bf7f5e8733609138b9ca00074fc6c8fcaa6f50f86e0b75b9a719ba34c2554fb403357c97163dc0c4629ad1a57f573bbeaeb4d2529c7b36f741e8f6b875c4
diff --git a/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild b/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild
new file mode 100644
index 0000000..964e7bf
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-desktop/mate-desktop-1.8.1-r1.ebuild,v 1.7 2015/04/08 18:13:42 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multilib python-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+IUSE="X startup-notification"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.34:2
+ >=dev-libs/libunique-1:1
+ x11-libs/cairo:0
+ >=x11-libs/gdk-pixbuf-2.4:2
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libX11:0
+ >=x11-libs/libXrandr-1.2:0
+ virtual/libintl:0
+ startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ >=gnome-base/dconf-0.10:0
+ sys-devel/gettext:*
+ >=x11-proto/randrproto-1.2:0
+ x11-proto/xproto:0
+ virtual/pkgconfig:*"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-mate-about \
+ --enable-mate-conf-import \
+ --disable-desktop-docs \
+ --with-gtk=2.0 \
+ $(use_with X x) \
+ $(use_enable startup-notification)
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+src_install() {
+ gnome2_src_install
+
+ python_replicate_script "${ED}"/usr/bin/mate-conf-import
+
+ # Remove installed files that cause collissions.
+ rm -rf "${ED}"/usr/share/help/C/{lgpl,gpl,fdl}
+}
diff --git a/mate-base/mate-desktop/metadata.xml b/mate-base/mate-desktop/metadata.xml
new file mode 100644
index 0000000..fef3aeb
--- /dev/null
+++ b/mate-base/mate-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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-desktop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-menus/ChangeLog b/mate-base/mate-menus/ChangeLog
new file mode 100644
index 0000000..cee193d
--- /dev/null
+++ b/mate-base/mate-menus/ChangeLog
@@ -0,0 +1,50 @@
+# ChangeLog for mate-base/mate-menus
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/ChangeLog,v 1.12 2015/04/08 18:13:42 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> mate-menus-1.8.0.ebuild:
+ Drop old Python implementations
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-menus-1.6.0.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-menus-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-menus-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-menus-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-menus-1.6.0.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-menus-1.8.0 (12 Apr 2014)
+
+ 12 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-menus-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-menus-1.6.0.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-menus-1.6.0.ebuild:
+ Revert and remove bogus dependencies (again) from the packages I'm
+ maintaining. They wouldn't be slotted like this for a fact.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-menus-1.6.0.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-menus-1.6.0.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-menus-1.6.0 (28 Feb 2014)
+
+ 28 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +files/10-xdg-menu-mate,
+ +mate-menus-1.6.0.ebuild, +metadata.xml:
+ New ebuild for mate-base/mate-menus, MATE menu system, implementing the F.D.O
+ cross-desktop spec; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
new file mode 100644
index 0000000..d09bad4
--- /dev/null
+++ b/mate-base/mate-menus/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 10-xdg-menu-mate 113 SHA256 8e09c26f25cbdd6869bc13fb35fb67096f25c4e1f99bdd9302a3fce242a97023 SHA512 8d4c30c79ecca4d1ff4dad7e7946f9e967ac33cf54dcccb1e1325bff298ffef6306bcf5865071e388e3a17ba77bc79896246a4b44b42c72c20ed13c4677fb8ef WHIRLPOOL 9eace58d3e30f41e967ddf920e9ad50c01bd8d5c1dff12837bdba8b19b048e920af7a924dfa9b33a0c988c2b7b0690d95bbbd44fc1953ec5969a7179606b5f96
+DIST mate-menus-1.8.0.tar.xz 342768 SHA256 0610c1c5c2348e8bcd1dae7bed808c451917a69b31d4b80de2b2f6288005b43c SHA512 724c0f4d98cabcc8d186e27024f116ba97ed4219ea563aecf14c22ef8d6b4dc1f5281ace2f836a5cfa32984e43cb3dd2b0ac1a9390dde9d477394c74a62348a0 WHIRLPOOL e5671a62f60eb8560a62e9f5e12267cd8cae34817a51a31afc58e26d3787ec7e9bdd2e17e81a3119892f2dc03df11004455d4c75247bef224428041003f3439b
+EBUILD mate-menus-1.8.0.ebuild 1707 SHA256 8e3efaa69e45a8083c72c109f6f4cb253edb0c2ea51528e903788af8e6680bf7 SHA512 be2c1afe864e34cd73e5f1ff7a576755868570b5a17e91ffea6929c2f69cd8b4780983bdfddac9d5fb0f08c6cae3344910aaea159cf74ea457895b31c8c03c97 WHIRLPOOL 111aee4b915c2553daa794bc848a9bd61a81389d039ba16be8113aeafac3bb524d4fb4ad07cf4f9b68cfa1d236bb799f708858f19b3d63acf9d0e2a70e0454ad
+MISC ChangeLog 2015 SHA256 0f5ce2c60d484b8602d93a62159178d0cee623adf7a8a40c52c09126b096177d SHA512 8a16ab47a590c42ffbe792b4029846dd00096f6d7a172da2267ad2552b9cb8b7052241097e901f43b6e58272b306aac069848c8797b37950715e5502532b8159 WHIRLPOOL eb3b134d4b81fa30dc185b218ec15677c8cdffc400d5bd090121c462aecb97797b39232d5850247d1700a635c04a4de9387d552482487ed6f4d0adf782eda013
+MISC metadata.xml 261 SHA256 d9e15c582b5bea312c4f4fceabe05d4d46a5e9440b6a55c7c041ba2feaeec99d SHA512 9766f787e542035256f10aa388e334b2b893b8584f591ba55394de1d85f13d4171a9a7541be0d3603c834e49dc424495fc5b38bf99d37e9409ea468688503938 WHIRLPOOL f9dd1b85e5da0e344c73d75e1d61c73c0f605361ac29273d3f6416a50c95ad2e82fb7f704b76e711d7d26552269f2ec26f6af520170fb76f4a063da34ede477a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7m+kP/26ksdBUeR6adKd5SbLeepVA
+ZXo7ji8g8ipzFwoOGs6C1NaXmG0cFGDL5bAVojATKzK7Otxbp0OaJqmo8nfEAd3h
+yNx9cRW9G2kppMm4YXeW35PuoUyHW5LifiqYyLGAlFYja4RW75kpCcogiylnPIbc
+vxxzSjJkN1VwmgR2or8XQ5rBD+GKLJ9lWvtMe5NPhrQe1pMEd441HnAxIqpdXFr8
+1v2lh4ue8yQGjy1bhzQgoIQH6tKSju8bMEdpOuRNcx+4C6siqO6ovl6S8lGubGD6
+3S8coGL5yDSOBpy7CWs25xgAREuV6kQiGE9w9wbZG1smGUksn8tYFzCDTc7kIWKq
+kO6saveXgf2jVB/JG8diMbwxprwjKjLxSzaCINPqDRqhm+oTsTP0shLfKNsVuWWO
+oWRGCZpBtgaO7MJrWgJ5cehjQbJhvs16QTP9VdmFOIVj+OI1vKLRQ2N1AV1FW7od
+DTF+zfe1fAWfhuFdjDZXxnwAwlpwzTCNgFXyQHqkAB5DWQ1gqUcOPeJFX5VgBQMf
+IWS0T60t9GZ1zqsIDQ9iO5UWVnZwjvuCSwADeNCeGGF+AcUPVvv0FLCOL0BZbTDG
+qp6kacnuCEyM4ieHJ4wRDhNAHtLaRB1BuLKhkLH17LynlgCidZ7T15vk/aRURqcd
++CB2SuXhJhe9SlbgawCv
+=B4Ie
+-----END PGP SIGNATURE-----
diff --git a/mate-base/mate-menus/files/10-xdg-menu-mate b/mate-base/mate-menus/files/10-xdg-menu-mate
new file mode 100644
index 0000000..06a6a91
--- /dev/null
+++ b/mate-base/mate-menus/files/10-xdg-menu-mate
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
+then
+ export XDG_MENU_PREFIX=mate-
+fi
diff --git a/mate-base/mate-menus/mate-menus-1.8.0.ebuild b/mate-base/mate-menus/mate-menus-1.8.0.ebuild
new file mode 100644
index 0000000..d39c0eb
--- /dev/null
+++ b/mate-base/mate-menus/mate-menus-1.8.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-menus/mate-menus-1.8.0.ebuild,v 1.6 2015/04/08 18:13:42 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="debug +introspection python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=dev-libs/glib-2.15.2:2
+ virtual/libintl:0
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 )
+ python? (
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+my_command() {
+ if use python ; then
+ python_foreach_impl run_in_build_dir $@
+ else
+ $@
+ fi
+}
+
+src_configure() {
+ G2CONF="${G2CONF} \
+ $(use_enable python) \
+ $(use_enable introspection)"
+
+ # Do NOT compile with --disable-debug/--enable-debug=no as it disables API
+ # usage checks.
+ if ! use debug ; then
+ G2CONF="${G2CONF} --enable-debug=minimum"
+ fi
+
+ if use python ; then
+ python_copy_sources
+ fi
+
+ my_command gnome2_src_configure
+}
+
+src_compile() {
+ my_command gnome2_src_compile
+}
+
+src_test() {
+ my_command emake check
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+ my_command gnome2_src_install
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}/10-xdg-menu-mate"
+}
diff --git a/mate-base/mate-menus/metadata.xml b/mate-base/mate-menus/metadata.xml
new file mode 100644
index 0000000..e356fdf
--- /dev/null
+++ b/mate-base/mate-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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-menus</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-panel/ChangeLog b/mate-base/mate-panel/ChangeLog
new file mode 100644
index 0000000..bcddab5
--- /dev/null
+++ b/mate-base/mate-panel/ChangeLog
@@ -0,0 +1,70 @@
+# ChangeLog for mate-base/mate-panel
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/ChangeLog,v 1.16 2014/12/20 17:19:11 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-panel-1.6.1.ebuild:
+ drop old
+
+*mate-panel-1.8.1-r1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +files/mate-panel-1.8.1-update_marco_wm_name.patch,
+ +mate-panel-1.8.1-r1.ebuild, -mate-panel-1.8.1.ebuild:
+ fix a renaming issue with marco, bug #525512, enable epatch_user
+
+*mate-panel-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +mate-panel-1.8.1.ebuild:
+ version bump; also fixes bug #523162
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-panel-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-panel-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-panel-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+ Restrict upper limit for mate-desktop dependency of mate-panel due to
+ compilation failure.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-panel-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-panel-1.8.0 (12 Apr 2014)
+
+ 12 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-panel-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 24 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+ Temporarily fix parallel build issue with -j1, discovered while building all
+ MATE packages at once.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-panel-1.6.1.ebuild:
+ Revert and remove bogus dependencies (again) from the packages I'm
+ maintaining. They wouldn't be slotted like this for a fact.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-panel-1.6.1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+ 09 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-panel-1.6.1.ebuild:
+ Remove gtk-doc dependency as we don't build documentation.
+
+*mate-panel-1.6.1 (05 Mar 2014)
+
+ 05 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-panel-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/mate-panel, the MATE panel; imported from the mate-
+ overlay, reviewed and adjusted.
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
new file mode 100644
index 0000000..f02c3c2
--- /dev/null
+++ b/mate-base/mate-panel/Manifest
@@ -0,0 +1,5 @@
+AUX mate-panel-1.8.1-update_marco_wm_name.patch 357 SHA256 998659a98f8ebfae8a8fec28fc3ca66081e19ab3224bd3373f4f2ace15311c10 SHA512 80ac08bd4c8ba9f4534e7192c7e0822d745fe91cb60b31b26b0691d9099282e4848aae0173d1963dc9aa35b261c3680aaa772ba6ac1b0971155b26fe5b4b684f WHIRLPOOL fbc68f65f3004a99546f1ba1de3f6757bae18b066671592a4d5368a3c3edbd08bcd2edde1c1a2c0079a3b4fb60491ca68e2189a628e482768e17ef8c4ced5de6
+DIST mate-panel-1.8.1.tar.xz 1953156 SHA256 d53d1546577db3e45ce6b46b4a40b2edc066781cc1e864eef47ad07b0fdb3f19 SHA512 925189eedf604117b4b4033b77a6ec4096f5c663218ca6736d549cdfd69c5476eebed56688632a6a20d0e2de49bc09ebd8373ecf45f486161b012346bb2eff8b WHIRLPOOL bb298e1b4b4078409e3a6b7858e2abf1667339c8581ee728f95f8ab0ea63288598e9c205b63baed40a57b19268c062a099fc98600502fd3723675ccfc19baade
+EBUILD mate-panel-1.8.1-r1.ebuild 2002 SHA256 037f5756f2d3aa48e632d0ab44894a279279ed36e666aa6332eb75875b32d961 SHA512 bbc804ac4431fdcf467b815982438fc7581442e2b23e1319be7fde20351ce2e0a5495c55ba105b3963bfeb78d916d933adbf453a629ded7b43eb9ff43668a610 WHIRLPOOL 944dc76cb437858710cdfbf17efdf77dd4e9c0de540a0153affa96f01d783457b854ab16a5f8c7c687a7721016d0f618202fcea3b5082a0f755d293360607269
+MISC ChangeLog 2729 SHA256 57932347f9f30805bf06e9171eb673e0503756d8d2826b654c66a4afafed4d73 SHA512 a2ebf441296af774280ed86fb102a60128df00a835b997e0836ed711885e8cee06980340b1b3a4978c580daabc85f4f77ba18ffa541dacfa26a2e79fcbbb85f8 WHIRLPOOL b18040e95a749eff2a3db63ac4fec3d88b8f52d2c99d719c738fdafa6a99002979b6cf817afe9855b5ddda7872bd2d88aabfdfa6cbf958dfa7a8a6006a367c62
+MISC metadata.xml 261 SHA256 1a7cacccececa2ed08808f01561d554016f40bd582a1fd8f99597c1ab9ed129b SHA512 ab7be4704d94ddaed9699024d7f9925f3291048fb6c69e73bc88abbd0d03ffd9f5186a5c4c2843b2978e925afb0a083d570e938d5439b07e60ab54faef0661c7 WHIRLPOOL 4fdbfbb163fede6f1398a6fed36cad42c1097b8cdf5d1d7a9b5dce95bf2edefbb6b7cbee76ced3d0959eb96ec97ebaa8c6a7398ff1708cd253e57312c11b05d6
diff --git a/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
new file mode 100644
index 0000000..f57bf98
--- /dev/null
+++ b/mate-base/mate-panel/files/mate-panel-1.8.1-update_marco_wm_name.patch
@@ -0,0 +1,11 @@
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -143,6 +143,8 @@
+
+ if (!wm_name)
+ pager->wm = PAGER_WM_UNKNOWN;
++ else if (strcmp(wm_name, "Metacity (Marco)") == 0)
++ pager->wm = PAGER_WM_MARCO;
+ else if (strcmp(wm_name, "Marco") == 0)
+ pager->wm = PAGER_WM_MARCO;
+ else if (strcmp(wm_name, "Compiz") == 0)
diff --git a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
new file mode 100644
index 0000000..ae8fe44
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild,v 1.1 2014/12/09 21:39:06 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE panel"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X +introspection networkmanager"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/dbus-glib-0.80:0
+ >=dev-libs/glib-2.26:2
+ >=dev-libs/libmateweather-1.8
+ dev-libs/libxml2:2
+ >=gnome-base/dconf-0.10:0
+ gnome-base/librsvg:2
+ >=mate-base/mate-desktop-1.8:0
+ >=mate-base/mate-menus-1.8:0
+ >=media-libs/libcanberra-0.23:0[gtk]
+ >=sys-apps/dbus-1.1.2:0
+ >=x11-libs/cairo-1:0
+ >=x11-libs/gdk-pixbuf-2.7.1:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ >=x11-libs/libwnck-2.30:1[introspection?]
+ >=x11-libs/pango-1.15.4:0[introspection?]
+ >=x11-libs/gtk+-2.19.7:2[introspection?]
+ x11-libs/libXau:0
+ >=x11-libs/libXrandr-1.2:0
+ virtual/libintl:0
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7:0 )
+ networkmanager? ( >=net-misc/networkmanager-0.6:0 )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools:0
+ >=dev-lang/perl-5:0=
+ >=dev-util/intltool-0.40:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ # Disable python check.
+ sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
+
+ epatch "${FILESDIR}/${P}-update_marco_wm_name.patch"
+
+ epatch_user
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --libexecdir=/usr/libexec/mate-applets \
+ --disable-deprecation-flags \
+ $(use_enable networkmanager network-manager) \
+ $(use_enable introspection) \
+ $(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/mate-base/mate-panel/metadata.xml b/mate-base/mate-panel/metadata.xml
new file mode 100644
index 0000000..89e7d8d
--- /dev/null
+++ b/mate-base/mate-panel/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-panel</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-session-manager/ChangeLog b/mate-base/mate-session-manager/ChangeLog
new file mode 100644
index 0000000..c56b688
--- /dev/null
+++ b/mate-base/mate-session-manager/ChangeLog
@@ -0,0 +1,85 @@
+# ChangeLog for mate-base/mate-session-manager
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/ChangeLog,v 1.16 2014/12/20 17:20:35 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-session-manager-1.6.1-r1.ebuild:
+ drop old
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ -mate-session-manager-1.8.1.ebuild:
+ old
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild:
+ Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
+
+ 24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
+ Punt description for USE="upower" which is a global USE flag now.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-session-manager-1.8.1-r1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-session-manager-1.8.1-r1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-session-manager-1.8.1-r1.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 31 May 2014; Tom Wijsman <TomWij@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild, mate-session-manager-1.8.1-r1.ebuild,
+ mate-session-manager-1.8.1.ebuild:
+ Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+ ssuominen.
+
+*mate-session-manager-1.8.1-r1 (29 May 2014)
+
+ 29 May 2014; Pacho Ramos <pacho@gentoo.org>
+ +mate-session-manager-1.8.1-r1.ebuild:
+ upower support relies on old upower, systemd setups are supposed to rely on
+ systemd to do all the stuff now (#508920#c15)
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-session-manager-1.8.1 (17 Apr 2014)
+
+ 17 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-session-manager-1.8.1.ebuild, metadata.xml:
+ Version bump to 1.8.1.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild:
+ revert
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-session-manager-1.6.1-r1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext, intltool and xdg-
+ user-dirs. Remove bogus sys-libs/glibc dependency.
+
+*mate-session-manager-1.6.1-r1 (27 Feb 2014)
+
+ 27 Feb 2014; Tom Wijsman <TomWij@gentoo.org> +files/10-user-dirs-update-mate,
+ +files/15-xdg-data-mate, +files/MATE, +files/defaults.list,
+ +files/mate-session-manager-1.2.0-idle-transition.patch,
+ +files/mate-session-manager-1.5.2-save-session-ui.patch,
+ +files/mate-session-manager-1.6-gnome-keyring.patch,
+ +files/mate-session-manager-1.6.1-login1.patch,
+ +mate-session-manager-1.6.1-r1.ebuild, +metadata.xml:
+ New ebuild for mate-base/mate-session-manager, MATE session manager; imported
+ from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
new file mode 100644
index 0000000..7a9635b
--- /dev/null
+++ b/mate-base/mate-session-manager/Manifest
@@ -0,0 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 10-user-dirs-update-mate 267 SHA256 b973a333aae367d0b9786e4b67c14f08acab7cf8959ebc747a665066ee0ad5dc SHA512 3f2803e9dfc7368ce6effdd538f67714e3ec5554b32fcc4ada4ef033e8e4dabcca17db095c49c368ab7f76a478bf536bd0ce26cceaf1b20ec5e75db470656076 WHIRLPOOL 4d08fc8df30a60627b869230c1f87617364d81d5441ba23c739ed82f5dedeb3f4bd6e6dc89f9210febc55c88f6b908a1f6ff9af744c62b5bfb7cdeda5e095dbd
+AUX 15-xdg-data-mate 224 SHA256 cb56c4b4ed8fb2c53de0c85d73e478da567ae01f3eceda8518089f1963120564 SHA512 a19acef85d510d6244fd29ba7daa6d5cc314392257b47574d8aedea235e4a5273d36bd67c138da9496663c2786ba5f7f433ff4aa6990a91a39be267026e5694d WHIRLPOOL 43470f1c5fb41e29b783bf8b550c4fcca0ae2f2a23093d673bdf4b6269dc703c24cfb11d55ef558961c1034304e99df1dcc4472988964be170def4255da1eace
+AUX MATE 2378 SHA256 dd97845a38a2ba17694c671edd9d42be3457de1f192931856ad4b729821b0932 SHA512 dbb162f694eeee806a12b46bf45d47f4887a83562b61d05037b3de5a7778a68d79de5528327588da13a5c17c283c8b7590c10877eba77cea75ebe5113ef2c920 WHIRLPOOL 06cd034b3a63a8595b48e1b3f4830b10af583963ca1ed4eeb5d84c3ffb6e6f8c5db3646ad37b808573cc7c71faef29d0e311204c3a1d93288d2e0556a5bd2c7f
+AUX defaults.list 14293 SHA256 ccb574804b6f0efd1868e4db7e1ab7810df5391e82af334969cb38fa2a319686 SHA512 d3b14a4676bbadb93bc33e94ddf74fc6a2c072c52ada51d8f658008301d795102d47b3e1b71f9884d117111329774deaab1a5c1718c3dab5bcf96df1657f3c9d WHIRLPOOL 4a343f0bca9bb25695f1235ca2c18184843104dd3688e4db2167274b5480dee442ee84f2e0a846eebaa72e1bf568a0cac4a08ca6e4617c1d97b14558b4349c84
+AUX mate-session-manager-1.2.0-idle-transition.patch 527 SHA256 baa4444b92309ec76fdbabc1bfa8fe8e25620ee449c15c66c5fbf7d6b98c1721 SHA512 bfd8c481acacaa95ec358da125ff56daf055dcbcb07c7640ab0e7c609db8e764c404f7326d07c7cf332ae13947a5674234d98061d8135ca4004ba2dc8b4e17e2 WHIRLPOOL be8e0733f184e5d5a9cdf68ec961738ebd5d8f49015b7590fc149f520151d7b763e4ac3c24405230a44047679203b1a6cf3287b0652781d970a0ed3740125010
+AUX mate-session-manager-1.5.2-save-session-ui.patch 20021 SHA256 b0b7d5564c5dd6424091a09061d0f5ccc415e51947bb55dcbe54c33f2ab314e5 SHA512 24814f1d7a02e2b84196706edbf0db9da93b80412ed5a116f6842d65049f285237fa4731ca3279b425c765034c2951cdfda17d2d654c794e1c1f8f23a32f94e1 WHIRLPOOL bac7a9eb01d99ea07b9755dd2bd2b58d27f630d861dcf0a84f8908889afcd3a27a07fd205d20719b7054b48a2fb4e43f2383a6d972dd259b88270355310261db
+AUX mate-session-manager-1.6-gnome-keyring.patch 8857 SHA256 d0fae72ab5be01d9f072d217eb88503fe45321dda41ec8e6f17d7be940675428 SHA512 2c929cf7085a8674dfe461bc343d1d9b2e5661d91ae49d1dbff130e295a517eddd2a32a8faef0eedff2e070069fe1e38f5b9298e5d47f0e6e3dd773a87c07eb7 WHIRLPOOL 58c6e5ea3fbec264126c29da25c316d5ab1a6eaecf2d9e64a29a908faf03b8347f4fbbcd373feb6cbae01a522c1103c1be8ed5f803e9d93f0998a61905eb18ed
+AUX mate-session-manager-1.6.1-login1.patch 7819 SHA256 7d0141356e09e00812165b55a0e8a04659decb304a9eebd6737f1bccd83cb80f SHA512 55452c738cbd80b80cfcd1cfda0e23e79a5d1626e34e75a978561ff748787e5283c09531db435333bf2fcd7f06249d738b4a08929ae902da2ef4c11c9baf2bbc WHIRLPOOL 01ff8e0b89cb480b07d2adb5bd2f608da1432ae35028a407776306ec386953785b45fcf75e1cd269558cf8fe27268141629d44679d11ae72ea822305b8b2b863
+DIST mate-session-manager-1.8.1.tar.xz 524204 SHA256 2f85a714704bc475d08809be6ecf24a5d94d2e2d0ea5ac704d67557c349d7b8c SHA512 1b09a471db710193a643ec90c9b153468d9a303957b9c4da4e30cf470aa5f582b6992f5e0ed69129943aa44f7c4e372e2a8554fc6020627817a3c49d656ca5b5 WHIRLPOOL 8c771ac713da92c2ae8bccc173a9cba4fc5bb16a943e588c679624e3e945555f2c37511426e666f38440947ec37139452ee230d07bc3a414a65629c04bfd31a6
+EBUILD mate-session-manager-1.8.1-r1.ebuild 2682 SHA256 425e8fab136a4eb72338595cb81ac6e087fe7b4ef2641587e4563b735db6573a SHA512 3030ec367a36f476ae8d0bef6d31def77bcea91142b865006e6093e86156221950d9e6ed56e748f5c6a79ba0753ed707283dd6d6ebfb4aff2f8fcbeef76c1a55 WHIRLPOOL 94ae18ff3aaf9888c2d59de380a2d3a2773a8f146e9fe98a9b077361114610fab58636d26b45ae82a4e475be1362c1d528b2abe8c84c2451d06ecddba0d83c19
+MISC ChangeLog 3226 SHA256 1605ed6032aafa66312fbe02ed01004ddf5564f3d5d00cc0dd1a39f07a944427 SHA512 ca6ab7c01625d16719af2d94b633bceec8023117c4286ca596abd67002f87bc260d1ca74cbf24c508c6daf90fd01d8687b5f7cbdf12d6844fb9893352d67a949 WHIRLPOOL 11630955afd2b951e3fc3ca4c820ebfc2e776d592c53d574f19d1cb0516248a71bdcf72f006d8e2cca440de3aa03334582e915b4eaa05b7add8f0581d9dad1fd
+MISC metadata.xml 271 SHA256 7e3d0b8509870eaa0238a46ec383250288382a1733764f2e1be76298a640845e SHA512 1c4be914d1764dae6071e7b25d652275d9eef62d96aa2630dce7298e4b392b89ddde264b9d35c6a020cf82bcdf7948e4240ca864b32b07ffbba27891dd8c2cb3 WHIRLPOOL 3e60f953449a94cc05c20dc0c017e0b06f629d3ae03d7ac442e85ddb3b53271f54a1d27428b2ccfa5c3c2bf835a1eb3c489d507f0e542e1af2753549eed7247c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7h2kP/i/ZUxrt0C81H+o/7+tB9+jj
+fXf1zj6hIkuVi+SlHMDQZInEK8hshW8rzPzijyE+tCYbc6Nn21OWH11r5k8CMt6c
+4OmMaKqH9L0+8EZ9vEnoCOydZIT6Ik6Z4m1jO5CfUwCl8DDcGrE+1kvd9EU3fCam
+qQ6h91ypnOPc74O1DPc1eU9qY6GHVMPARU1n6IecFaFSGoImS3hlqqnU1nW9t4DG
+F/eigZsIzcfpsvtrT9dNOAbJpAotTNFdzEsRQ9DbkA+GhjoZUMezoDTigkash1i7
+suWg/mrx/e/04y34FZPKnas2uxQzMhGxI3i98r0X7X0zBsr69Fl9/F7tmUikWs7Z
+PwIwEC8H8aCloYASMQI/Yge/tQOIgfegS+BLz7sFPXblfUFIZeeWF8D7EL1ogN43
+j4VtRadbCjUR/3tJm4kM4HzavyUAEKrXe+mEtNoemDRp4uLUBuLR+qyN+VA4tXWx
+L47ymMl0se1uNHbhBSTUiyK1EIseh9mCBJ+pRzgnTf4DoSCX5ym+KOFEfjx6ZTOt
+LIWVbZYUPAWnupviQBREuCLSALMPTgTVBxLlluDeJdWl9qEN4JDND6XibQj4WMFd
+kxwTLLonWlyyivHUyz7BXmv56UddIRrfCd3xypgxA5Yxx4PSBpnEjWJKr+byzBKm
+aFSdm2aM/ja8SnWtkvF4
+=z5Zy
+-----END PGP SIGNATURE-----
diff --git a/mate-base/mate-session-manager/files/10-user-dirs-update-mate b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
new file mode 100755
index 0000000..35973aa
--- /dev/null
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
+# That file is read by glib to get XDG_PICTURES_DIR, etc
+
+if [ "$DESKTOP_SESSION" = "mate" ]; then
+ if type xdg-user-dirs-update >/dev/null 2>&1; then
+ xdg-user-dirs-update
+ fi
+fi
diff --git a/mate-base/mate-session-manager/files/15-xdg-data-mate b/mate-base/mate-session-manager/files/15-xdg-data-mate
new file mode 100644
index 0000000..df360cf
--- /dev/null
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$DESKTOP_SESSION" = "mate" ]; then
+ if [ -z "$XDG_DATA_DIRS" ]; then
+ export XDG_DATA_DIRS=/usr/share/mate:/usr/local/share/:/usr/share/
+ else
+ export XDG_DATA_DIRS=/usr/share/mate:"$XDG_DATA_DIRS"
+ fi
+fi
diff --git a/mate-base/mate-session-manager/files/MATE b/mate-base/mate-session-manager/files/MATE
new file mode 100644
index 0000000..baa154b
--- /dev/null
+++ b/mate-base/mate-session-manager/files/MATE
@@ -0,0 +1,109 @@
+#!/bin/sh
+#
+# This file has bitrotted badly. Someone needs to clean this up.
+#
+
+if [ -f /etc/xdg/menus/mate-applications.menu ] ; then
+ export XDG_MENU_PREFIX=mate-
+fi
+
+for errfile in "$HOME/.materc-errors" "${TMPDIR-/tmp}/materc-$USER/tmp/materc-$USER"
+do
+ if ( cp /dev/null "$errfile" 2> /dev/null )
+ then
+ chmod 600 "$errfile"
+ exec > "$errfile" 2>&1
+ break
+ fi
+done
+#
+# Distributors:
+# You should modify the paths here to fit your distro
+# If you need to do so, send me (jirka@5z.com) a patch
+# and I'll try to make the script detect the distro stuff
+#
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+if [ -x "$HOME/.materc" ]; then
+ command="$HOME/.materc"
+elif [ -x /etc/X11/gdm/materc ]; then
+ command="/etc/X11/gdm/materc"
+else
+ # as fallback in case the config is screwed
+ command=`which mate-session`
+fi
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+ xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+ xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+ xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+ setxkbmap `cat "$sysxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+ setxkbmap `cat "$userxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+ if [ -n "$xkbsymbols" ]; then
+ setxkbmap -symbols "$xkbsymbols"
+ XKB_IN_USE=yes
+ fi
+ fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+ if [ -f "$rh6sysmodmap" ]; then
+ xmodmap "$rh6sysmodmap"
+ fi
+
+ if [ -f "$sysmodmap" ]; then
+ xmodmap "$sysmodmap"
+ fi
+
+ if [ -f "$usermodmap" ]; then
+ xmodmap "$usermodmap"
+ fi
+fi
+
+unset XKB_IN_USE
+
+# run all system xinitrc shell scripts.
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for i in /etc/X11/xinit/xinitrc.d/* ; do
+ if [ -x "$i" ]; then
+ . "$i"
+ fi
+ done
+fi
+
+exec $command
diff --git a/mate-base/mate-session-manager/files/defaults.list b/mate-base/mate-session-manager/files/defaults.list
new file mode 100644
index 0000000..0d6d6bf
--- /dev/null
+++ b/mate-base/mate-session-manager/files/defaults.list
@@ -0,0 +1,336 @@
+[Default Applications]
+application/rtf=abiword.desktop
+application/x-abiword=abiword.desktop
+text/abiword=abiword.desktop
+text/richtext=abiword.desktop
+text/rtf=abiword.desktop
+text/x-abiword=abiword.desktop
+text/x-xml-abiword=abiword.desktop
+x-content/blank-bd=brasero-caja.desktop
+x-content/blank-dvd=brasero-caja.desktop
+x-content/blank-cd=brasero-caja.desktop
+x-content/blank-hddvd=brasero-caja.desktop
+application/x-dia-diagram=dia.desktop
+image/bmp=eom.desktop
+image/gif=eom.desktop
+image/jpeg=eom.desktop
+image/jpg=eom.desktop
+image/pjpeg=eom.desktop
+image/png=eom.desktop
+image/svg+xml=eom.desktop
+image/svg+xml-compressed=eom.desktop
+image/x-bmp=eom.desktop
+image/x-gray=eom.desktop
+image/x-icb=eom.desktop
+image/x-ico=eom.desktop
+image/x-pcx=eom.desktop
+image/x-png=eom.desktop
+image/x-portable-anymap=eom.desktop
+image/x-portable-bitmap=eom.desktop
+image/x-portable-graymap=eom.desktop
+image/x-portable-pixmap=eom.desktop
+image/x-xbitmap=eom.desktop
+image/x-xpixmap=eom.desktop
+image/vnd.wap.wbmp=eom.desktop
+image/g3fax=gimp.desktop
+image/x-compressed-xcf=gimp.desktop
+image/x-fits=gimp.desktop
+image/x-icon=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-sgi=gimp.desktop
+image/x-sun-raster=gimp.desktop
+image/x-tga=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-xwindowdump=gimp.desktop
+application/xhtml+xml=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+text/html=firefox.desktop;firefox-3.6.desktop;epiphany.desktop
+application/pdf=atril.desktop
+application/x-bzpdf=atril.desktop
+application/x-gzpdf=atril.desktop
+application/postscript=atril.desktop
+application/x-bzpostscript=atril.desktop
+application/x-gzpostscript=atril.desktop
+image/x-eps=atril.desktop
+image/x-bzeps=atril.desktop
+image/x-gzeps=atril.desktop
+application/x-dvi=atril.desktop
+application/x-bzdvi=atril.desktop
+application/x-gzdvi=atril.desktop
+image/vnd.djvu=atril.desktop
+image/tiff=atril.desktop
+application/x-cbr=atril.desktop
+application/x-cbz=atril.desktop
+application/x-cb7=atril.desktop
+application/x-7z-compressed=engrampa.desktop
+application/x-7z-compressed-tar=engrampa.desktop
+application/x-ace=engrampa.desktop
+application/x-alz=engrampa.desktop
+application/x-ar=engrampa.desktop
+application/x-arj=engrampa.desktop
+application/x-bzip=engrampa.desktop
+application/x-bzip-compressed-tar=engrampa.desktop
+application/x-bzip1=engrampa.desktop
+application/x-bzip1-compressed-tar=engrampa.desktop
+application/x-cabinet=engrampa.desktop
+application/x-cd-image=engrampa.desktop
+application/x-compress=engrampa.desktop
+application/x-compressed-tar=engrampa.desktop
+application/x-cpio=engrampa.desktop
+application/x-deb=engrampa.desktop
+application/x-ear=engrampa.desktop
+application/x-gtar=engrampa.desktop
+application/x-gzip=engrampa.desktop
+application/x-java-archive=engrampa.desktop
+application/x-lha=engrampa.desktop
+application/x-lhz=engrampa.desktop
+application/x-lzip=engrampa.desktop
+application/x-lzip-compressed-tar=engrampa.desktop
+application/x-lzma=engrampa.desktop
+application/x-lzma-compressed-tar=engrampa.desktop
+application/x-lzop=engrampa.desktop
+application/x-lzop-compressed-tar=engrampa.desktop
+application/x-rar=engrampa.desktop
+application/x-rar-compressed=engrampa.desktop
+application/x-rpm=engrampa.desktop
+application/x-rzip=engrampa.desktop
+application/x-tar=engrampa.desktop
+application/x-tarz=engrampa.desktop
+application/x-stuffit=engrampa.desktop
+application/x-war=engrampa.desktop
+application/x-xz=engrampa.desktop
+application/x-xz-compressed-tar=engrampa.desktop
+application/x-zip=engrampa.desktop
+application/x-zip-compressed=engrampa.desktop
+application/x-zoo=engrampa.desktop
+application/zip=engrampa.desktop
+multipart/x-zip=engrampa.desktop
+text/plain=pluma.desktop
+text/css=pluma.desktop
+text/javascript=pluma.desktop
+text/mathml=pluma.desktop
+text/x-csrc=pluma.desktop
+text/x-chdr=pluma.desktop
+text/x-dtd=pluma.desktop
+text/x-java=pluma.desktop
+text/x-javascript=pluma.desktop
+text/x-patch=pluma.desktop
+text/x-perl=pluma.destkop
+text/x-php=pluma.destkop
+text/x-python=pluma.destkop
+text/x-sql=pluma.desktop
+text/xml=pluma.desktop
+application/javascript=pluma.destkop
+application/x-cgi=pluma.desktop
+application/x-javascript=pluma.desktop
+application/x-perl=pluma.desktop
+application/x-php=pluma.desktop
+application/x-python=pluma.desktop
+application/xml=pluma.desktop
+application/xml-dtd=pluma.desktop
+application/x-font-ttf=mate-font-viewer.desktop
+application/x-font-pcf=mate-font-viewer.desktop
+application/x-font-type1=mate-font-viewer.desktop
+application/x-font-otf=mate-font-viewer.desktop
+application/csv=gnumeric.desktop
+application/excel=gnumeric.desktop
+application/msexcel=gnumeric.desktop
+application/tab-separated-values=gnumeric.desktop
+application/vnd.lotus-1-2-3=gnumeric.desktop
+application/vnd.ms-excel=gnumeric.desktop
+application/x-123=gnumeric.desktop
+application/x-applix-spreadsheet=gnumeric.desktop
+application/x-dbase=gnumeric.desktop
+application/x-dbf=gnumeric.desktop
+application/x-dos_ms_excel=gnumeric.desktop
+application/x-excel=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
+application/x-mps=gnumeric.desktop
+application/x-ms-excel=gnumeric.desktop
+application/x-msexcel=gnumeric.desktop
+application/x-oleo=gnumeric.desktop
+application/x-planperfect=gnumeric.desktop
+application/x-quattropro=gnumeric.desktop
+application/x-sc=gnumeric.desktop
+application/x-sylk=gnumeric.desktop
+application/x-xbase=gnumeric.desktop
+application/x-xls=gnumeric.desktop
+application/xls=gnumeric.desktop
+text/comma-separated-values=gnumeric.desktop
+text/csv=gnumeric.desktop
+text/spreadsheet=gnumeric.desktop
+text/tab-separated-values=gnumeric.desktop
+text/x-comma-separated-values=gnumeric.desktop
+text/x-csv=gnumeric.desktop
+zz-application/zz-winassoc-xls=gnumeric.desktop
+x-content/software=caja-autorun-software.desktop
+x-directory/gnome-default-handler=caja-folder-handler.desktop
+x-directory/normal=caja-folder-handler.desktop
+inode/directory=caja-folder-handler.desktop
+application/x-gnome-saved-search=caja-folder-handler.desktop
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop
+application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop
+x-content/audio-player=rhythmbox.desktop
+x-content/audio-cdda=sound-juicer.desktop
+application/x-shockwave-flash=swfdec-player.desktop
+application/futuresplash=swfdec-player.desktop
+application/mxf=vlc.desktop
+application/ogg=vlc.desktop
+application/ram=vlc.desktop
+application/sdp=vlc.desktop
+application/smil=vlc.desktop
+application/smil+xml=vlc.desktop
+application/vnd.ms-wpl=vlc.desktop
+application/vnd.rn-realmedia=vlc.desktop
+application/x-extension-m4a=vlc.desktop
+application/x-extension-mp4=vlc.desktop
+application/x-flac=vlc.desktop
+application/x-flash-video=vlc.desktop
+application/x-lyx=lyx.desktop
+application/x-matroska=vlc.desktop
+application/x-netshow-channel=vlc.desktop
+application/x-ogg=vlc.desktop
+application/x-quicktime-media-link=vlc.desktop
+application/x-quicktimeplayer=vlc.desktop
+application/x-shorten=vlc.desktop
+application/x-smil=vlc.desktop
+application/xspf+xml=vlc.desktop
+audio/3gpp=vlc.desktop
+audio/ac3=vlc.desktop
+audio/AMR=vlc.desktop
+audio/AMR-WB=vlc.desktop
+audio/basic=vlc.desktop
+audio/midi=vlc.desktop
+audio/mp4=vlc.desktop
+audio/mpeg=vlc.desktop
+audio/mpegurl=vlc.desktop
+audio/ogg=vlc.desktop
+audio/prs.sid=vlc.desktop
+audio/vnd.rn-realaudio=vlc.desktop
+audio/x-ape=vlc.desktop
+audio/x-flac=vlc.desktop
+audio/x-gsm=vlc.desktop
+audio/x-it=vlc.desktop
+audio/x-m4a=vlc.desktop
+audio/x-matroska=vlc.desktop
+audio/x-mod=vlc.desktop
+audio/x-mp3=vlc.desktop
+audio/x-mpeg=vlc.desktop
+audio/x-mpegurl=vlc.desktop
+audio/x-ms-asf=vlc.desktop
+audio/x-ms-asx=vlc.desktop
+audio/x-ms-wax=vlc.desktop
+audio/x-ms-wma=vlc.desktop
+audio/x-musepack=vlc.desktop
+audio/x-pn-aiff=vlc.desktop
+audio/x-pn-au=vlc.desktop
+audio/x-pn-realaudio=vlc.desktop
+audio/x-pn-realaudio-plugin=vlc.desktop
+audio/x-pn-wav=vlc.desktop
+audio/x-pn-windows-acm=vlc.desktop
+audio/x-realaudio=vlc.desktop
+audio/x-real-audio=vlc.desktop
+audio/x-sbc=vlc.desktop
+audio/x-scpls=vlc.desktop
+audio/x-speex=vlc.desktop
+audio/x-tta=vlc.desktop
+audio/x-vorbis=audacious.desktop
+audio/x-vorbis+ogg=audacious.desktop
+audio/x-wav=audacious.desktop
+audio/x-wavpack=audacious.desktop
+audio/x-xm=audacious.desktop
+image/vnd.rn-realpix=vlc.desktop
+image/x-pict=vlc.desktop
+misc/ultravox=vlc.desktop
+text/google-video-pointer=vlc.desktop
+text/x-google-video-pointer=vlc.desktop
+video/3gpp=vlc.desktop
+video/dv=vlc.desktop
+video/fli=vlc.desktop
+video/flv=vlc.desktop
+video/mp2t=vlc.desktop
+video/mp4=vlc.desktop
+video/mp4v-es=vlc.desktop
+video/mpeg=vlc.desktop
+video/msvideo=vlc.desktop
+video/ogg=vlc.desktop
+video/quicktime=vlc.desktop
+video/vivo=vlc.desktop
+video/vnd.divx=vlc.desktop
+video/vnd.rn-realvideo=vlc.desktop
+video/vnd.vivo=vlc.desktop
+video/webm=vlc.desktop
+video/x-anim=vlc.desktop
+video/x-avi=vlc.desktop
+video/x-flc=vlc.desktop
+video/x-fli=vlc.desktop
+video/x-flic=vlc.desktop
+video/x-flv=vlc.desktop
+video/x-m4v=vlc.desktop
+video/x-matroska=vlc.desktop
+video/x-mpeg=vlc.desktop
+video/x-ms-asf=vlc.desktop
+video/x-ms-asx=vlc.desktop
+video/x-msvideo=vlc.desktop
+video/x-ms-wm=vlc.desktop
+video/x-ms-wmv=vlc.desktop
+video/x-ms-wmx=vlc.desktop
+video/x-ms-wvx=vlc.desktop
+video/x-nsv=vlc.desktop
+video/x-ogm+ogg=vlc.desktop
+video/x-theora+ogg=vlc.desktop
+video/x-totem-stream=vlc.desktop
+x-content/video-dvd=vlc.desktop
+x-content/video-vcd=vlc.desktop
+x-content/video-svcd=vlc.desktop
+x-scheme-handler/ghelp=yelp.desktop;
+x-scheme-handler/help=yelp.desktop;
+x-scheme-handler/http=firefox.desktop;epiphany.desktop
+x-scheme-handler/https=firefox.desktop;epiphany.desktop
+x-scheme-handler/mailto=evolution.desktop
+application/x-bittorrent=transmission-gtk.desktop;deluge.desktop
+x-scheme-handler/magnet=transmission-gtk.desktop;deluge.desktop
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch
new file mode 100644
index 0000000..62a229e
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.2.0-idle-transition.patch
@@ -0,0 +1,10 @@
+--- a/mate-session/gs-idle-monitor.c 2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gs-idle-monitor.c 2012-08-08 11:49:13.308281663 +0200
+@@ -448,6 +448,7 @@
+ attr.delta = delta;
+ attr.events = TRUE;
+
++ attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1);
+ attr.trigger.test_type = XSyncPositiveTransition;
+ if (watch->xalarm_positive != None) {
+ g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld",
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch
new file mode 100644
index 0000000..8a57d44
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.5.2-save-session-ui.patch
@@ -0,0 +1,535 @@
+diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
+--- a/capplet/gsm-properties-dialog.c 2012-02-29 22:03:08.000000000 +0100
++++ b/capplet/gsm-properties-dialog.c 2012-08-08 12:16:37.527332034 +0200
+@@ -26,6 +26,8 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
++#include <dbus/dbus-glib.h>
++#include <dbus/dbus-glib-lowlevel.h>
+
+ #include <mateconf/mateconf-client.h>
+
+@@ -36,6 +38,11 @@
+ #include "gsp-app.h"
+ #include "gsp-app-manager.h"
+
++
++#define GSM_SERVICE_DBUS "org.mate.SessionManager"
++#define GSM_PATH_DBUS "/org/mate/SessionManager"
++#define GSM_INTERFACE_DBUS "org.mate.SessionManager"
++
+ #define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
+
+ #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0')
+@@ -50,6 +57,7 @@
+ #define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button"
+ #define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button"
+ #define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button"
++#define CAPPLET_SESSION_SAVED_WIDGET_NAME "session_properties_session_saved_label"
+ #define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle"
+
+ #define STARTUP_APP_ICON "system-run"
+@@ -493,10 +501,66 @@
+ }
+
+ static void
++session_saved_message (GsmPropertiesDialog *dialog,
++ const char *msg,
++ gboolean is_error)
++{
++ GtkLabel *label;
++ gchar *markup;
++
++ label = GTK_LABEL (gtk_builder_get_object (dialog->priv->xml, CAPPLET_SESSION_SAVED_WIDGET_NAME));
++ if (is_error)
++ markup = g_markup_printf_escaped ("<span foreground=\"red\">%s</span>", msg);
++ else
++ markup = g_markup_escape_text (msg, -1);
++
++ gtk_label_set_markup (label, markup);
++ g_free (markup);
++}
++
++static void
++session_saved_cb (DBusGProxy *proxy,
++ DBusGProxyCall *call_id,
++ void *user_data)
++{
++ gboolean res;
++ GsmPropertiesDialog *dialog = user_data;
++
++ res = dbus_g_proxy_end_call (proxy, call_id, NULL, G_TYPE_INVALID);
++ if (res)
++ session_saved_message (dialog, _("Your session has been saved."), FALSE);
++ else
++ session_saved_message (dialog, _("Failed to save session"), TRUE);
++
++ g_object_unref (proxy);
++}
++
++static void
+ on_save_session_clicked (GtkWidget *widget,
+ GsmPropertiesDialog *dialog)
+ {
+- g_debug ("Session saving is not implemented yet!");
++ DBusGConnection *conn;
++ DBusGProxy *proxy;
++ DBusGProxyCall *call;
++
++ conn = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
++ if (conn == NULL) {
++ session_saved_message (dialog, _("Could not connect to the session bus"), TRUE);
++ return;
++ }
++
++ proxy = dbus_g_proxy_new_for_name (conn, GSM_SERVICE_DBUS, GSM_PATH_DBUS, GSM_INTERFACE_DBUS);
++ if (proxy == NULL) {
++ session_saved_message (dialog, _("Could not connect to the session manager"), TRUE);
++ return;
++ }
++
++ call = dbus_g_proxy_begin_call (proxy, "SaveSession", session_saved_cb, dialog, NULL, G_TYPE_INVALID);
++ if (call == NULL) {
++ session_saved_message (dialog, _("Failed to save session"), TRUE);
++ g_object_unref (proxy);
++ return;
++ }
+ }
+
+ static void
+diff -burN a/configure.ac b/configure.ac
+--- a/configure.ac 2012-02-29 22:03:09.000000000 +0100
++++ b/configure.ac 2012-08-08 12:18:58.740336360 +0200
+@@ -75,6 +75,7 @@
+ PKG_CHECK_MODULES(SESSION_PROPERTIES,
+ glib-2.0 >= $GLIB_REQUIRED
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
++ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+ )
+
+ PKG_CHECK_MODULES(SM, sm)
+diff -burN a/data/session-properties.ui b/data/session-properties.ui
+--- a/data/session-properties.ui 2012-02-29 22:03:08.000000000 +0100
++++ b/data/session-properties.ui 2012-08-08 12:22:36.619343035 +0200
+@@ -148,6 +148,7 @@
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="session_properties_save_button">
++ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+@@ -191,6 +192,17 @@
+ <property name="position">1</property>
+ </packing>
+ </child>
++ <child>
++ <object class="GtkLabel" id="session_properties_session_saved_label">
++ <property name="visible">True</property>
++ <property name="wrap">True</property>
++ </object>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+diff -burN a/mate-session/gsm-client.c b/mate-session/gsm-client.c
+--- a/mate-session/gsm-client.c 2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-client.c 2012-08-08 12:24:20.120346205 +0200
+@@ -510,6 +510,17 @@
+ g_signal_emit (client, signals[DISCONNECTED], 0);
+ }
+
++gboolean
++gsm_client_request_save (GsmClient *client,
++ guint flags,
++ GError **error)
++{
++ g_return_val_if_fail (GSM_IS_CLIENT (client), FALSE);
++
++ return GSM_CLIENT_GET_CLASS (client)->impl_request_save (client, flags, error);
++}
++
++
+ GKeyFile *
+ gsm_client_save (GsmClient *client,
+ GError **error)
+diff -burN a/mate-session/gsm-client.h b/mate-session/gsm-client.h
+--- a/mate-session/gsm-client.h 2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-client.h 2012-08-08 12:26:38.848350455 +0200
+@@ -94,6 +94,9 @@
+ GError **error);
+ gboolean (*impl_stop) (GsmClient *client,
+ GError **error);
++ gboolean (*impl_request_save) (GsmClient *client,
++ guint flags,
++ GError **error);
+ GKeyFile * (*impl_save) (GsmClient *client,
+ GError **error);
+ };
+@@ -139,6 +142,10 @@
+
+ void gsm_client_disconnected (GsmClient *client);
+
++gboolean gsm_client_request_save (GsmClient *client,
++ guint flags,
++ GError **error);
++
+ GKeyFile *gsm_client_save (GsmClient *client,
+ GError **error);
+ /* exported to bus */
+diff -burN a/mate-session/gsm-dbus-client.c b/mate-session/gsm-dbus-client.c
+--- a/mate-session/gsm-dbus-client.c 2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-dbus-client.c 2012-08-08 12:38:15.393371794 +0200
+@@ -413,6 +413,19 @@
+ G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
+ }
+
++static gboolean
++dbus_client_request_save (GsmClient *client,
++ guint flags,
++ GError **error)
++{
++ g_debug ("GsmDBusClient: sending save request to client with id %s",
++ gsm_client_peek_id (client));
++
++ /* FIXME: The protocol does not support this */
++
++ return FALSE;
++}
++
+ static GKeyFile *
+ dbus_client_save (GsmClient *client,
+ GError **error)
+@@ -665,6 +678,7 @@
+ object_class->set_property = gsm_dbus_client_set_property;
+ object_class->dispose = gsm_dbus_client_dispose;
+
++ client_class->impl_request_save = dbus_client_request_save;
+ client_class->impl_save = dbus_client_save;
+ client_class->impl_stop = dbus_client_stop;
+ client_class->impl_query_end_session = dbus_client_query_end_session;
+diff -burN a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c
+--- a/mate-session/gsm-manager.c 2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-manager.c 2012-08-08 12:47:24.627388620 +0200
+@@ -68,6 +68,7 @@
+ #define GSM_MANAGER_DBUS_NAME "org.mate.SessionManager"
+
+ #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
++#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2
+
+ #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
+ #define MDM_FLEXISERVER_ARGS "--startnew Standard"
+@@ -1176,6 +1177,69 @@
+
+ }
+
++static gboolean
++_client_request_save (GsmClient *client,
++ ClientEndSessionData *data)
++{
++ gboolean ret;
++ GError *error;
++
++ error = NULL;
++ ret = gsm_client_request_save (client, data->flags, &error);
++ if (ret) {
++ g_debug ("GsmManager: adding client to query clients: %s", gsm_client_peek_id (client));
++ data->manager->priv->query_clients = g_slist_prepend (data->manager->priv->query_clients,
++ client);
++ } else if (error) {
++ g_debug ("GsmManager: unable to query client: %s", error->message);
++ g_error_free (error);
++ }
++
++ return FALSE;
++}
++
++static gboolean
++_client_request_save_helper (const char *id,
++ GsmClient *client,
++ ClientEndSessionData *data)
++{
++ return _client_request_save (client, data);
++}
++
++static void
++query_save_session_complete (GsmManager *manager)
++{
++ GError *error = NULL;
++
++ if (g_slist_length (manager->priv->next_query_clients) > 0) {
++ ClientEndSessionData data;
++
++ data.manager = manager;
++ data.flags = GSM_CLIENT_END_SESSION_FLAG_LAST;
++
++ g_slist_foreach (manager->priv->next_query_clients,
++ (GFunc)_client_request_save,
++ &data);
++
++ g_slist_free (manager->priv->next_query_clients);
++ manager->priv->next_query_clients = NULL;
++
++ return;
++ }
++
++ if (manager->priv->query_timeout_id > 0) {
++ g_source_remove (manager->priv->query_timeout_id);
++ manager->priv->query_timeout_id = 0;
++ }
++
++ gsm_session_save (manager->priv->clients, &error);
++
++ if (error) {
++ g_warning ("Error saving session: %s", error->message);
++ g_error_free (error);
++ }
++}
++
+ static guint32
+ generate_cookie (void)
+ {
+@@ -1250,6 +1314,21 @@
+ return FALSE;
+ }
+
++static gboolean
++_on_query_save_session_timeout (GsmManager *manager)
++{
++ manager->priv->query_timeout_id = 0;
++
++ g_debug ("GsmManager: query to save session timed out");
++
++ g_slist_free (manager->priv->query_clients);
++ manager->priv->query_clients = NULL;
++
++ query_save_session_complete (manager);
++
++ return FALSE;
++}
++
+ static void
+ do_phase_query_end_session (GsmManager *manager)
+ {
+@@ -1886,13 +1965,32 @@
+ const char *reason,
+ GsmManager *manager)
+ {
+- /* just ignore if received outside of shutdown */
+- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
++ /* just ignore if we are not yet running */
++ if (manager->priv->phase < GSM_MANAGER_PHASE_RUNNING) {
+ return;
+ }
+
+ g_debug ("GsmManager: Response from end session request: is-ok=%d do-last=%d cancel=%d reason=%s", is_ok, do_last, cancel, reason ? reason :"");
+
++ if (manager->priv->phase == GSM_MANAGER_PHASE_RUNNING) {
++ /* Ignore responses when no requests were sent */
++ if (manager->priv->query_clients == NULL) {
++ return;
++ }
++
++ manager->priv->query_clients = g_slist_remove (manager->priv->query_clients, client);
++
++ if (do_last) {
++ manager->priv->next_query_clients = g_slist_prepend (manager->priv->next_query_clients,
++ client);
++ }
++
++ if (manager->priv->query_clients == NULL) {
++ query_save_session_complete (manager);
++ }
++ return;
++ }
++
+ if (cancel) {
+ cancel_end_session (manager);
+ return;
+@@ -1991,6 +2089,15 @@
+ }
+
+ static void
++on_xsmp_client_save_request (GsmXSMPClient *client,
++ gboolean show_dialog,
++ GsmManager *manager)
++{
++ g_debug ("GsmManager: save_request");
++ gsm_manager_save_session (manager, NULL);
++}
++
++static void
+ on_store_client_added (GsmStore *store,
+ const char *id,
+ GsmManager *manager)
+@@ -2011,6 +2118,10 @@
+ "logout-request",
+ G_CALLBACK (on_xsmp_client_logout_request),
+ manager);
++ g_signal_connect (client,
++ "save-request",
++ G_CALLBACK (on_xsmp_client_save_request),
++ manager);
+ }
+
+ g_signal_connect (client,
+@@ -2968,6 +3079,41 @@
+ }
+
+ gboolean
++gsm_manager_save_session (GsmManager *manager,
++ GError **error)
++{
++ ClientEndSessionData data;
++
++ g_debug ("GsmManager: SaveSession called");
++
++ g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
++
++ if (manager->priv->phase != GSM_MANAGER_PHASE_RUNNING) {
++ g_set_error (error,
++ GSM_MANAGER_ERROR,
++ GSM_MANAGER_ERROR_NOT_IN_RUNNING,
++ "SaveSession interface is only available during the Running phase");
++ return FALSE;
++ }
++
++ data.manager = manager;
++ data.flags = 0;
++ gsm_store_foreach (manager->priv->clients,
++ (GsmStoreFunc)_client_request_save_helper,
++ &data);
++
++ if (manager->priv->query_clients) {
++ manager->priv->query_timeout_id = g_timeout_add_seconds (GSM_MANAGER_SAVE_SESSION_TIMEOUT,
++ (GSourceFunc)_on_query_save_session_timeout,
++ manager);
++ return TRUE;
++ } else {
++ g_debug ("GsmManager: Nothing to save");
++ return FALSE;
++ }
++}
++
++gboolean
+ gsm_manager_can_shutdown (GsmManager *manager,
+ gboolean *shutdown_available,
+ GError **error)
+diff -burN a/mate-session/gsm-manager.h b/mate-session/gsm-manager.h
+--- a/mate-session/gsm-manager.h 2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-manager.h 2012-08-08 12:49:14.262391979 +0200
+@@ -154,6 +154,9 @@
+ gboolean gsm_manager_shutdown (GsmManager *manager,
+ GError **error);
+
++gboolean gsm_manager_save_session (GsmManager *manager,
++ GError **error);
++
+ gboolean gsm_manager_can_shutdown (GsmManager *manager,
+ gboolean *shutdown_available,
+ GError **error);
+diff -burN a/mate-session/gsm-xsmp-client.c b/mate-session/gsm-xsmp-client.c
+--- a/mate-session/gsm-xsmp-client.c 2012-02-29 22:03:08.000000000 +0100
++++ b/mate-session/gsm-xsmp-client.c 2012-08-08 12:52:27.719397905 +0200
+@@ -69,6 +69,7 @@
+ enum {
+ REGISTER_REQUEST,
+ LOGOUT_REQUEST,
++ SAVE_REQUEST,
+ LAST_SIGNAL
+ };
+
+@@ -502,6 +503,31 @@
+ return TRUE;
+ }
+
++static gboolean
++xsmp_request_save (GsmClient *client,
++ guint flags,
++ GError **error)
++{
++ GsmXSMPClient *xsmp = (GsmXSMPClient *) client;
++
++ g_debug ("GsmXSMPClient: xsmp_request_save ('%s')", xsmp->priv->description);
++
++ if (xsmp->priv->conn == NULL) {
++ g_set_error (error,
++ GSM_CLIENT_ERROR,
++ GSM_CLIENT_ERROR_NOT_REGISTERED,
++ "Client is not registered");
++ return FALSE;
++ }
++
++ if (flags & GSM_CLIENT_END_SESSION_FLAG_LAST)
++ xsmp_save_yourself_phase2 (client);
++ else
++ do_save_yourself (xsmp, SmSaveLocal, FALSE);
++
++ return TRUE;
++}
++
+ static char *
+ get_desktop_file_path (GsmXSMPClient *client)
+ {
+@@ -976,6 +1002,8 @@
+ object_class->get_property = gsm_xsmp_client_get_property;
+ object_class->set_property = gsm_xsmp_client_set_property;
+
++
++ client_class->impl_request_save = xsmp_request_save;
+ client_class->impl_save = xsmp_save;
+ client_class->impl_stop = xsmp_stop;
+ client_class->impl_query_end_session = xsmp_query_end_session;
+@@ -1003,6 +1031,16 @@
+ NULL,
+ NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
++ G_TYPE_NONE,
++ 1, G_TYPE_BOOLEAN);
++ signals[SAVE_REQUEST] =
++ g_signal_new ("save-request",
++ G_OBJECT_CLASS_TYPE (object_class),
++ G_SIGNAL_RUN_LAST,
++ G_STRUCT_OFFSET (GsmXSMPClientClass, save_request),
++ NULL,
++ NULL,
++ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE,
+ 1, G_TYPE_BOOLEAN);
+
+diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
+--- a/mate-session/gsm-xsmp-client.h 2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/gsm-xsmp-client.h 2012-08-08 12:53:39.629400108 +0200
+@@ -57,6 +57,8 @@
+ gboolean (*logout_request) (GsmXSMPClient *client,
+ gboolean prompt);
+
++ gboolean (*save_request) (GsmXSMPClient *client,
++ gboolean prompt);
+
+ void (*saved_state) (GsmXSMPClient *client);
+
+diff -burN a/mate-session/org.mate.SessionManager.xml b/mate-session/org.mate.SessionManager.xml
+--- a/mate-session/org.mate.SessionManager.xml 2012-02-29 22:03:09.000000000 +0100
++++ b/mate-session/org.mate.SessionManager.xml 2012-08-08 12:57:41.216407509 +0200
+@@ -256,6 +256,14 @@
+ </doc:doc>
+ </method>
+
++ <method name="SaveSession">
++ <doc:doc>
++ <doc:description>
++ <doc:para>Request to save session</doc:para>
++ </doc:description>
++ </doc:doc>
++ </method>
++
+ <method name="CanShutdown">
+ <arg name="is_available" direction="out" type="b">
+ <doc:doc>
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.6-gnome-keyring.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.6-gnome-keyring.patch
new file mode 100644
index 0000000..28bb80e
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.6-gnome-keyring.patch
@@ -0,0 +1,328 @@
+diff --git a/mate-session/Makefile.am b/mate-session/Makefile.am
+index f37a0e2..2c73d63 100644
+--- a/mate-session/Makefile.am
++++ b/mate-session/Makefile.am
+@@ -42,6 +42,8 @@ mate_session_SOURCES = \
+ mdm-signal-handler.c \
+ mdm-log.h \
+ mdm-log.c \
++ msm-gnome.c \
++ msm-gnome.h \
+ main.c \
+ gsm-store.h \
+ gsm-store.c \
+diff --git a/mate-session/main.c b/mate-session/main.c
+index 6cfbbe6..f6bee9a 100644
+--- a/mate-session/main.c
++++ b/mate-session/main.c
+@@ -51,6 +51,8 @@
+ #include "gsm-xsmp-server.h"
+ #include "gsm-store.h"
+
++#include "msm-gnome.h"
++
+ #define GSM_SCHEMA "org.mate.session"
+ #define GSM_DEFAULT_SESSION_KEY "default-session"
+ #define GSM_REQUIRED_COMPONENTS_SCHEMA GSM_SCHEMA ".required-components"
+@@ -542,6 +544,9 @@ int main(int argc, char** argv)
+ */
+ acquire_name();
+
++ /* Starts gnome compat mode */
++ msm_compat_gnome_startup ();
++
+ manager = gsm_manager_new(client_store, failsafe);
+
+ signal_handler = mdm_signal_handler_new();
+@@ -583,6 +588,7 @@ int main(int argc, char** argv)
+ g_object_unref(client_store);
+ }
+
++ msm_compat_gnome_shutdown();
+ mdm_log_shutdown();
+
+ return 0;
+diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
+new file mode 100644
+index 0000000..5c7d8dc
+--- /dev/null
++++ b/mate-session/msm-gnome.c
+@@ -0,0 +1,242 @@
++/*
++ * Copyright (c) 2004-2005 Benedikt Meurer <benny@xfce.org>
++ * 2013 Stefano Karapetsas <stefano@karapetsas.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301 USA.
++ *
++ * Most parts of this file where taken from xfce4-session and
++ * gnome-session.
++ */
++
++#include "config.h"
++
++#include <sys/types.h>
++#include <sys/wait.h>
++#include <signal.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <errno.h>
++
++#include <X11/Xatom.h>
++#include <X11/Xlib.h>
++
++#include <gdk/gdkx.h>
++
++#include "msm-gnome.h"
++
++#define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
++
++
++static gboolean gnome_compat_started = FALSE;
++static int keyring_lifetime_pipe[2];
++static pid_t gnome_keyring_daemon_pid = 0;
++static Window gnome_smproxy_window = None;
++
++static void
++child_setup (gpointer user_data)
++{
++ gint open_max;
++ gint fd;
++ char *fd_str;
++
++ open_max = sysconf (_SC_OPEN_MAX);
++ for (fd = 3; fd < open_max; fd++)
++ {
++ if (fd != keyring_lifetime_pipe[0])
++ fcntl (fd, F_SETFD, FD_CLOEXEC);
++ }
++
++ fd_str = g_strdup_printf ("%d", keyring_lifetime_pipe[0]);
++ g_setenv ("GNOME_KEYRING_LIFETIME_FD", fd_str, TRUE);
++ g_free (fd_str);
++}
++
++
++static void
++gnome_keyring_daemon_startup (void)
++{
++ GError *error = NULL;
++ gchar *sout;
++ gchar **lines;
++ gsize lineno;
++ gint status;
++ glong pid;
++ gchar *end;
++ gchar *argv[3];
++ gchar *p;
++ gchar *name;
++ const gchar *value;
++
++ /* Pipe to slave keyring lifetime to */
++ if (pipe (keyring_lifetime_pipe))
++ {
++ g_warning ("Failed to set up pipe for gnome-keyring: %s", strerror (errno));
++ return;
++ }
++
++ error = NULL;
++ argv[0] = GNOME_KEYRING_DAEMON;
++ argv[1] = "--start";
++ argv[2] = NULL;
++ g_spawn_sync (NULL, argv, NULL,
++ G_SPAWN_SEARCH_PATH | G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
++ child_setup, NULL,
++ &sout, NULL, &status, &error);
++
++ close (keyring_lifetime_pipe[0]);
++ /* We leave keyring_lifetime_pipe[1] open for the lifetime of the session,
++ in order to slave the keyring daemon lifecycle to the session. */
++
++ if (error != NULL)
++ {
++ g_printerr ("Failed to run gnome-keyring-daemon: %s\n",
++ error->message);
++ g_error_free (error);
++ }
++ else
++ {
++ if (WIFEXITED (status) && WEXITSTATUS (status) == 0 && sout != NULL)
++ {
++ lines = g_strsplit (sout, "\n", 0);
++
++ for (lineno = 0; lines[lineno] != NULL; lineno++)
++ {
++ p = strchr (lines[lineno], '=');
++ if (p == NULL)
++ continue;
++
++ name = g_strndup (lines[lineno], p - lines[lineno]);
++ value = p + 1;
++
++ g_setenv (name, value, TRUE);
++
++ if (g_strcmp0 (name, "GNOME_KEYRING_PID") == 0)
++ {
++ pid = strtol (value, &end, 10);
++ if (end != value)
++ gnome_keyring_daemon_pid = pid;
++ }
++
++ g_free (name);
++ }
++
++ g_strfreev (lines);
++ }
++ else
++ {
++ /* daemon failed for some reason */
++ g_printerr ("gnome-keyring-daemon failed to start correctly, "
++ "exit code: %d\n", WEXITSTATUS (status));
++ }
++
++ g_free (sout);
++ }
++}
++
++static void
++gnome_keyring_daemon_shutdown (void)
++{
++ if (gnome_keyring_daemon_pid != 0)
++ {
++ kill (gnome_keyring_daemon_pid, SIGTERM);
++ gnome_keyring_daemon_pid = 0;
++ }
++}
++
++
++
++static void
++msm_compat_gnome_smproxy_startup (void)
++{
++ Atom gnome_sm_proxy;
++ Display *dpy;
++ Window root;
++
++ gdk_error_trap_push ();
++
++ /* Set GNOME_SM_PROXY property, since some apps (like OOo) seem to require
++ * it to behave properly. Thanks to Jasper/Francois for reporting this.
++ * This has another advantage, since it prevents people from running
++ * gnome-smproxy in xfce4, which would cause trouble otherwise.
++ */
++ dpy = gdk_display;
++ root = RootWindow (dpy, 0);
++
++ if (gnome_smproxy_window != None)
++ XDestroyWindow (dpy, gnome_smproxy_window);
++
++ gnome_sm_proxy = XInternAtom (dpy, "GNOME_SM_PROXY", False);
++ gnome_smproxy_window = XCreateSimpleWindow (dpy, root, 1, 1, 1, 1, 0, 0, 0);
++
++ XChangeProperty (dpy, gnome_smproxy_window, gnome_sm_proxy,
++ XA_CARDINAL, 32, PropModeReplace,
++ (unsigned char *) (void *) &gnome_smproxy_window, 1);
++ XChangeProperty (dpy, root, gnome_sm_proxy,
++ XA_CARDINAL, 32, PropModeReplace,
++ (unsigned char *) (void *) &gnome_smproxy_window, 1);
++
++ XSync (dpy, False);
++
++ gdk_error_trap_pop ();
++}
++
++
++static void
++msm_compat_gnome_smproxy_shutdown (void)
++{
++ gdk_error_trap_push ();
++
++ if (gnome_smproxy_window != None)
++ {
++ XDestroyWindow (gdk_display, gnome_smproxy_window);
++ XSync (gdk_display, False);
++ gnome_smproxy_window = None;
++ }
++
++ gdk_error_trap_pop ();
++}
++
++
++void
++msm_compat_gnome_startup (void)
++{
++ if (G_UNLIKELY (gnome_compat_started))
++ return;
++
++ msm_compat_gnome_smproxy_startup ();
++
++ gnome_keyring_daemon_startup ();
++
++ gnome_compat_started = TRUE;
++}
++
++
++void
++msm_compat_gnome_shutdown (void)
++{
++ if (G_UNLIKELY (!gnome_compat_started))
++ return;
++
++ /* shutdown the keyring daemon */
++ gnome_keyring_daemon_shutdown ();
++
++ msm_compat_gnome_smproxy_shutdown ();
++
++ gnome_compat_started = FALSE;
++}
++
+diff --git a/mate-session/msm-gnome.h b/mate-session/msm-gnome.h
+new file mode 100644
+index 0000000..2f15909
+--- /dev/null
++++ b/mate-session/msm-gnome.h
+@@ -0,0 +1,30 @@
++/*
++ * Copyright (c) 2004 Benedikt Meurer <benny@xfce.org>
++ * 2013 Stefano Karapetsas <stefano@karapetsas.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2, or (at your option)
++ * any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301 USA.
++ *
++ * Most parts of this file where taken from xfce4-session and
++ * gnome-session.
++ */
++
++#ifndef __MSM_GNOME_H__
++#define __MSM_GNOME_H__
++
++void msm_compat_gnome_startup (void);
++void msm_compat_gnome_shutdown (void);
++
++#endif /* !__MSM_GNOME_H__ */
diff --git a/mate-base/mate-session-manager/files/mate-session-manager-1.6.1-login1.patch b/mate-base/mate-session-manager/files/mate-session-manager-1.6.1-login1.patch
new file mode 100644
index 0000000..009677b
--- /dev/null
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.6.1-login1.patch
@@ -0,0 +1,267 @@
+diff -up mate-session-manager-1.6.1/mate-session/gsm-logout-dialog.c.login1 mate-session-manager-1.6.1/mate-session/gsm-logout-dialog.c
+--- mate-session-manager-1.6.1/mate-session/gsm-logout-dialog.c.login1 2013-07-25 10:35:06.000000000 -0500
++++ mate-session-manager-1.6.1/mate-session/gsm-logout-dialog.c 2013-09-10 08:25:55.450880450 -0500
+@@ -200,13 +200,29 @@ gsm_logout_dialog_destroy (GsmLogoutDial
+ static gboolean
+ gsm_logout_supports_system_suspend (GsmLogoutDialog *logout_dialog)
+ {
+- return up_client_get_can_suspend (logout_dialog->priv->up_client);
++ gboolean ret;
++#ifdef HAVE_SYSTEMD
++ if (LOGIND_RUNNING())
++ ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
++ else
++#endif
++ ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
++
++ return ret;
+ }
+
+ static gboolean
+ gsm_logout_supports_system_hibernate (GsmLogoutDialog *logout_dialog)
+ {
+- return up_client_get_can_hibernate (logout_dialog->priv->up_client);
++ gboolean ret;
++#ifdef HAVE_SYSTEMD
++ if (LOGIND_RUNNING())
++ ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
++ else
++#endif
++ ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
++
++ return ret;
+ }
+
+ static gboolean
+diff -up mate-session-manager-1.6.1/mate-session/gsm-manager.c.login1 mate-session-manager-1.6.1/mate-session/gsm-manager.c
+--- mate-session-manager-1.6.1/mate-session/gsm-manager.c.login1 2013-07-25 10:35:06.000000000 -0500
++++ mate-session-manager-1.6.1/mate-session/gsm-manager.c 2013-09-10 08:39:41.199847380 -0500
+@@ -1101,6 +1101,20 @@ manager_attempt_hibernate (GsmManager *m
+ GError *error;
+ gboolean ret;
+
++#ifdef HAVE_SYSTEMD
++ if (LOGIND_RUNNING()) {
++
++ GsmSystemd *systemd;
++
++ systemd = gsm_get_systemd ();
++
++ /* lock the screen before we suspend */
++ manager_perhaps_lock (manager);
++
++ gsm_systemd_attempt_hibernate (systemd);
++ }
++ else {
++#endif
+ can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
+ if (can_hibernate) {
+
+@@ -1115,6 +1129,9 @@ manager_attempt_hibernate (GsmManager *m
+ g_error_free (error);
+ }
+ }
++#ifdef HAVE_SYSTEMD
++ }
++#endif
+ }
+
+ static void
+@@ -1124,6 +1141,20 @@ manager_attempt_suspend (GsmManager *man
+ GError *error;
+ gboolean ret;
+
++#ifdef HAVE_SYSTEMD
++ if (LOGIND_RUNNING()) {
++
++ GsmSystemd *systemd;
++
++ systemd = gsm_get_systemd ();
++
++ /* lock the screen before we suspend */
++ manager_perhaps_lock (manager);
++
++ gsm_systemd_attempt_suspend (systemd);
++ }
++ else {
++#endif
+ can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+ if (can_suspend) {
+
+@@ -1138,6 +1169,9 @@ manager_attempt_suspend (GsmManager *man
+ g_error_free (error);
+ }
+ }
++#ifdef HAVE_SYSTEMD
++ }
++#endif
+ }
+
+ static void
+diff -up mate-session-manager-1.6.1/mate-session/gsm-systemd.c.login1 mate-session-manager-1.6.1/mate-session/gsm-systemd.c
+--- mate-session-manager-1.6.1/mate-session/gsm-systemd.c.login1 2013-07-25 10:35:06.000000000 -0500
++++ mate-session-manager-1.6.1/mate-session/gsm-systemd.c 2013-09-10 08:51:06.174857597 -0500
+@@ -725,6 +725,141 @@ gsm_systemd_can_stop (GsmSystemd *manage
+ return can_stop;
+ }
+
++gboolean
++gsm_systemd_can_hibernate (GsmSystemd *manager)
++{
++ gboolean res;
++ gchar *value;
++ gboolean can_hibernate;
++ GError *error;
++
++ error = NULL;
++
++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++ g_warning ("Could not connect to Systemd: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++ "CanHibernate",
++ INT_MAX,
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_STRING, &value,
++ G_TYPE_INVALID);
++ if (res == FALSE) {
++ g_warning ("Could not make DBUS call: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ can_hibernate = g_strcmp0 (value, "yes") == 0 ||
++ g_strcmp0 (value, "challenge") == 0;
++ g_free (value);
++ return can_hibernate;
++}
++
++gboolean
++gsm_systemd_can_suspend (GsmSystemd *manager)
++{
++ gboolean res;
++ gchar *value;
++ gboolean can_suspend;
++ GError *error;
++
++ error = NULL;
++
++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++ g_warning ("Could not connect to Systemd: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++ "CanSuspend",
++ INT_MAX,
++ &error,
++ G_TYPE_INVALID,
++ G_TYPE_STRING, &value,
++ G_TYPE_INVALID);
++ if (res == FALSE) {
++ g_warning ("Could not make DBUS call: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ can_suspend = g_strcmp0 (value, "yes") == 0 ||
++ g_strcmp0 (value, "challenge") == 0;
++ g_free (value);
++ return can_suspend;
++}
++
++void
++gsm_systemd_attempt_hibernate (GsmSystemd *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++ g_warning ("Could not connect to Systemd: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++ "Hibernate",
++ INT_MAX,
++ &error,
++ G_TYPE_BOOLEAN, TRUE, /* interactive */
++ G_TYPE_INVALID,
++ G_TYPE_INVALID);
++ if (res == FALSE) {
++ g_warning ("Could not make DBUS call: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++}
++
++void
++gsm_systemd_attempt_suspend (GsmSystemd *manager)
++{
++ gboolean res;
++ GError *error;
++
++ error = NULL;
++
++ if (!gsm_systemd_ensure_sd_connection (manager, &error)) {
++ g_warning ("Could not connect to Systemd: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++
++ res = dbus_g_proxy_call_with_timeout (manager->priv->sd_proxy,
++ "Suspend",
++ INT_MAX,
++ &error,
++ G_TYPE_BOOLEAN, TRUE, /* interactive */
++ G_TYPE_INVALID,
++ G_TYPE_INVALID);
++ if (res == FALSE) {
++ g_warning ("Could not make DBUS call: %s",
++ error->message);
++ g_error_free (error);
++ return FALSE;
++ }
++}
++
+ gchar *
+ gsm_systemd_get_current_session_type (GsmSystemd *manager)
+ {
+diff -up mate-session-manager-1.6.1/mate-session/gsm-systemd.h.login1 mate-session-manager-1.6.1/mate-session/gsm-systemd.h
+--- mate-session-manager-1.6.1/mate-session/gsm-systemd.h.login1 2013-07-25 10:35:06.000000000 -0500
++++ mate-session-manager-1.6.1/mate-session/gsm-systemd.h 2013-09-10 08:39:15.689107516 -0500
+@@ -89,10 +89,18 @@ gboolean gsm_systemd_can_stop
+
+ gboolean gsm_systemd_can_restart (GsmSystemd *manager);
+
++gboolean gsm_systemd_can_hibernate (GsmSystemd *manager);
++
++gboolean gsm_systemd_can_suspend (GsmSystemd *manager);
++
+ void gsm_systemd_attempt_stop (GsmSystemd *manager);
+
+ void gsm_systemd_attempt_restart (GsmSystemd *manager);
+
++void gsm_systemd_attempt_hibernate (GsmSystemd *manager);
++
++void gsm_systemd_attempt_suspend (GsmSystemd *manager);
++
+ void gsm_systemd_set_session_idle (GsmSystemd *manager,
+ gboolean is_idle);
+
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
new file mode 100644
index 0000000..82208ff
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-session-manager/mate-session-manager-1.8.1-r1.ebuild,v 1.6 2014/09/19 17:25:19 ssuominen Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="ipv6 elibc_FreeBSD gnome-keyring systemd upower"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+RDEPEND=">=dev-libs/dbus-glib-0.76
+ >=dev-libs/glib-2.25:2
+ dev-libs/libxslt
+ sys-apps/dbus
+ x11-apps/xdpyinfo
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.14:2
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/libXtst
+ x11-libs/pango
+ x11-libs/xtrans
+ x11-misc/xdg-user-dirs
+ x11-misc/xdg-user-dirs-gtk
+ virtual/libintl
+ elibc_FreeBSD? ( dev-libs/libexecinfo )
+ gnome-keyring? ( gnome-base/gnome-keyring )
+ systemd? ( sys-apps/systemd )
+ upower? ( >=sys-power/upower-pm-utils-0.9.23 )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40:*
+ >=dev-lang/perl-5
+ >=mate-base/mate-common-1.8
+ >=sys-devel/gettext-0.10.40:*
+ virtual/pkgconfig:*
+ !<gnome-base/gdm-2.20.4"
+
+src_prepare() {
+ # Add "session saving" button back,
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=575544
+ epatch "${FILESDIR}"/${PN}-1.5.2-save-session-ui.patch
+
+ # Fix race condition in idle monitor, GNOME bug applies to MATE too,
+ # see https://bugzilla.gnome.org/show_bug.cgi?id=627903
+ epatch "${FILESDIR}"/${PN}-1.2.0-idle-transition.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --with-default-wm=mate-wm \
+ --with-gtk=2.0 \
+ $(use_enable ipv6) \
+ $(use_with systemd) \
+ $(use_enable upower)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install() {
+ gnome2_src_install
+
+ dodir /etc/X11/Sessions/
+ exeinto /etc/X11/Sessions/
+ doexe "${FILESDIR}"/MATE
+
+ dodir /usr/share/mate/applications/
+ insinto /usr/share/mate/applications/
+ doins "${FILESDIR}"/defaults.list
+
+ dodir /etc/X11/xinit/xinitrc.d/
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/15-xdg-data-mate
+
+ # This should be done in MATE too, see Gentoo bug #270852
+ doexe "${FILESDIR}"/10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-session-manager/metadata.xml b/mate-base/mate-session-manager/metadata.xml
new file mode 100644
index 0000000..8cebc02
--- /dev/null
+++ b/mate-base/mate-session-manager/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-session-manager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate-settings-daemon/ChangeLog b/mate-base/mate-settings-daemon/ChangeLog
new file mode 100644
index 0000000..1c947c3
--- /dev/null
+++ b/mate-base/mate-settings-daemon/ChangeLog
@@ -0,0 +1,61 @@
+# ChangeLog for mate-base/mate-settings-daemon
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-settings-daemon/ChangeLog,v 1.11 2014/12/20 17:22:04 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-settings-daemon-1.6.2.ebuild:
+ drop old
+
+*mate-settings-daemon-1.8.2 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-settings-daemon-1.8.2.ebuild, mate-settings-daemon-1.6.2.ebuild,
+ mate-settings-daemon-1.8.1.ebuild:
+ version bump; ebuild maintenance wrt bug #510004
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-settings-daemon-1.8.1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-settings-daemon-1.8.1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-settings-daemon-1.8.1.ebuild:
+ Add ~x86, wrt bug #508072
+
+*mate-settings-daemon-1.8.1 (09 May 2014)
+
+ 09 May 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-settings-daemon-1.8.1.ebuild:
+ Version bump to 1.8.1.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-settings-daemon-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-settings-daemon-1.8.0 (17 Apr 2014)
+
+ 17 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-settings-daemon-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ mate-settings-daemon-1.6.2.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-settings-daemon-1.6.2.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-settings-daemon-1.6.2 (05 Mar 2014)
+
+ 05 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-settings-daemon-1.2.0-syndaemon-mode.patch,
+ +files/mate-settings-daemon-1.4.0-netfs-monitor.patch,
+ +mate-settings-daemon-1.6.2.ebuild, +metadata.xml:
+ New ebuild for mate-base/mate-settings-daemon, MATE Settings Daemon; imported
+ from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
new file mode 100644
index 0000000..ceabe6d
--- /dev/null
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -0,0 +1,6 @@
+AUX mate-settings-daemon-1.2.0-syndaemon-mode.patch 786 SHA256 f1c2bbf58cd58f7439664c68fbf010aacd229edde40ff187f03b8d3b17371b2b SHA512 694cd2339c0b45cee51df126b51bc481615aedaae1c8e6ee46ce1d6f6cc1d6cd268464f290738e5eb7f222fe0382d8086d4110e2291288c501da881e61848091 WHIRLPOOL 67cb40fb1f169947440d0709009f8a32a4af7530fc076534ee98f8e424e65b28ef65a4a675297aa06ab3004fd78fa1ebdbcfc4973921ee8946f06f23deb8704b
+AUX mate-settings-daemon-1.4.0-netfs-monitor.patch 1276 SHA256 b823e5d0bcebdb578bf7c75c982e894d4d443f734326c8e9e133855affd7102a SHA512 99ad3ef055129cca52402b35a391fc7f9f4e5d81db554e4582efb9251d95d75707a17e2a5ea7e1a8c0b547daad50717f6846540b692cc1b3c403f09ccd0b99ff WHIRLPOOL dbea48de8b29d3cbe2eff150130744b58f2f0d815208da4eecc6f6b8a3cda282c216e1bdc1ca10a6e9a1b87f70d0866288416b3e1741d04d96bde5ddb39237bf
+DIST mate-settings-daemon-1.8.2.tar.xz 782780 SHA256 2d38c9eff00a7ad239613b5f59e95a08705601a64f3a660b34919a4818da9d87 SHA512 46fd2009463c5f4f46ad6941444b42e0146caea0daec8d6ccd253adb08fc8b905419c5763756c05c4ab1404b2eb9b775f7730babe790194e145e5c0a6829f1d1 WHIRLPOOL 09d908b098a7e469c2eb9eecafc5551fd5986d4c0967da62ad2924d5cc309e856ebe4c523a22ef2d844bfeab829049c6f36f6275cb4d82ad48ed4fdd5ce972b5
+EBUILD mate-settings-daemon-1.8.2.ebuild 2082 SHA256 644eb8f99b99ee6b9c73ced2450cf905747c7f667a51b2c2beb3759d6a70cf5b SHA512 32e907982e62268dda7b34b59e16540bf18dae6feb955e2f9adedca5d95856ead2c6e13ed5b72c49e766f08554242cf5821b02ec41b06f80542c1e090cef5d2d WHIRLPOOL 8efcc0e12d99367debd7dc87a5e17d522edb4770e4874aa25a95d0eb86ff0aa8026d9b4bb0235ba0ca8dbe46a880eb8ace5c1e5a45ec4d1c30bf8942dfbc3ea3
+MISC ChangeLog 2170 SHA256 e8c7dad2688416910321adbef26d8fba4f979a4fd65f428351cde495e6391eb8 SHA512 ea69868214fc499fd122ec225f484161b65dc6ffde2ee2a6d7c4822f764fa51ba1b18dcf607d6694044029a6e57988794240abc50fcd4acaa2b35b1ddb6c4b77 WHIRLPOOL d889ba12a8d4247ec5ef8ce2b40ae260be1ee13121821f9b7803849d549c3bcbf2ab3fbaa4c7bd09ce70345ccd04cf8f342e111ca0669d1ef659b859ced38b90
+MISC metadata.xml 271 SHA256 5c12d7b13c1726753eb11cccc129c7973140cd5069d591f8d563a5aa7ce55dea SHA512 0266224d220023fd36a2e6817c659ceff41a7040315ac561f5df3ae17260c3eaee7f594d3edc388ae438f8d88b65aff4c3ba9f258349549d924204f390f948cd WHIRLPOOL df9afbda0295939bad96da1564416f5436bca934a30281fd3c8db561c18a59191c6b067681d6bf04bc0eda74e38c098ad60d399c52125333b9e4ee3a482fdc3f
diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch
new file mode 100644
index 0000000..a03571a
--- /dev/null
+++ b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.2.0-syndaemon-mode.patch
@@ -0,0 +1,22 @@
+diff -burN a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c
+--- a/plugins/mouse/msd-mouse-manager.c 2012-02-28 23:45:55.000000000 +0100
++++ b/plugins/mouse/msd-mouse-manager.c 2012-08-03 20:22:19.204115652 +0200
+@@ -548,7 +548,7 @@
+
+ if (state) {
+ GError *error = NULL;
+- char *args[5];
++ char *args[6];
+
+ if (manager->priv->syndaemon_spawned)
+ return 0;
+@@ -557,7 +557,8 @@
+ args[1] = "-i";
+ args[2] = "0.5";
+ args[3] = "-k";
+- args[4] = NULL;
++ args[4] = "-R";
++ args[5] = NULL;
+
+ if (!g_find_program_in_path (args[0]))
+ return 0;
diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch
new file mode 100644
index 0000000..1890c91
--- /dev/null
+++ b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.4.0-netfs-monitor.patch
@@ -0,0 +1,42 @@
+diff -burN a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c
+--- a/plugins/housekeeping/msd-disk-space.c 2012-07-11 03:54:10.000000000 +0200
++++ b/plugins/housekeeping/msd-disk-space.c 2012-08-07 22:54:59.872216471 +0200
+@@ -309,19 +309,38 @@
+ * purpose
+ */
+
++ /* We also ignore network filesystems */
++
+ const gchar *ignore_fs[] = {
++ "adfs",
++ "afs",
+ "auto",
+ "autofs",
++ "autofs4",
++ "cifs",
++ "cxfs",
+ "devfs",
+ "devpts",
+ "ecryptfs",
++ "gfs",
++ "gfs2",
+ "kernfs",
+ "linprocfs",
++ "linsysfs",
++ "lustre",
++ "lustre_lite",
++ "ncpfs",
++ "nfs",
++ "nfs4",
++ "nfsd",
++ "ocfs2",
+ "proc",
+ "procfs",
+ "ptyfs",
++ "rpc_pipefs",
+ "selinuxfs",
+ "linsysfs",
++ "smbfs",
+ "sysfs",
+ "tmpfs",
+ "usbfs",
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild
new file mode 100644
index 0000000..4dc6858
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild,v 1.1 2014/12/09 01:07:11 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE Settings Daemon"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X debug libnotify policykit pulseaudio smartcard"
+
+RDEPEND=">=dev-libs/dbus-glib-0.74:0
+ >=dev-libs/glib-2.17.3:2
+ >=mate-base/libmatekbd-1.8:0
+ >=mate-base/mate-desktop-1.8.1:0
+ media-libs/fontconfig:1.0
+ >=gnome-base/dconf-0.13.4:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libX11:0
+ x11-libs/libXi:0
+ x11-libs/libXext:0
+ x11-libs/libXxf86misc:0
+ >=x11-libs/libxklavier-5:0
+ virtual/libintl:0
+ libnotify? ( >=x11-libs/libnotify-0.7:0 )
+ policykit? (
+ >=dev-libs/dbus-glib-0.71:0
+ >=sys-apps/dbus-1.1.2:0
+ >=sys-auth/polkit-0.97:0
+ )
+ pulseaudio? (
+ media-libs/libcanberra:0[gtk]
+ >=media-sound/pulseaudio-0.9.15:0
+ )
+ !pulseaudio? (
+ >=media-libs/gstreamer-0.10.1.2:0.10
+ >=media-libs/gst-plugins-base-0.10.1.2:0.10
+ )
+ smartcard? ( >=dev-libs/nss-3.11.2:0 )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.37.1:0
+ sys-devel/gettext:0
+ virtual/pkgconfig:0
+ x11-proto/inputproto:0
+ x11-proto/xproto:0"
+
+src_prepare() {
+ # More network filesystems not to monitor, upstream bug #606421
+ epatch "${FILESDIR}/${PN}-1.4.0-netfs-monitor.patch"
+
+ # mouse: Use event driven mode for syndaemon
+ epatch "${FILESDIR}/${PN}-1.2.0-syndaemon-mode.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_with libnotify) \
+ $(use_enable debug) \
+ $(use_enable policykit polkit) \
+ $(use_enable pulseaudio pulse) \
+ $(use_enable !pulseaudio gstreamer) \
+ $(use_enable smartcard smartcard-support) \
+ $(use_with X x)
+}
+
+DOCS="AUTHORS NEWS ChangeLog"
diff --git a/mate-base/mate-settings-daemon/metadata.xml b/mate-base/mate-settings-daemon/metadata.xml
new file mode 100644
index 0000000..d86e814
--- /dev/null
+++ b/mate-base/mate-settings-daemon/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-settings-daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-base/mate/ChangeLog b/mate-base/mate/ChangeLog
new file mode 100644
index 0000000..b99a27c
--- /dev/null
+++ b/mate-base/mate/ChangeLog
@@ -0,0 +1,44 @@
+# ChangeLog for mate-base/mate
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/ChangeLog,v 1.9 2014/12/20 17:08:53 tamiko Exp $
+
+ 11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> mate-1.8.0.ebuild:
+ Finish deprecation of 1.6
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-1.6.0.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 06 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-1.8.0.ebuild, metadata.xml:
+ Introduce more USE flags in the meta package to allow users to micro manage
+ MATE a bit more; as a result, a minimal MATE desktop with a ~10 packages total
+ could be installed up to a full MATE desktop with over 50 packages.
+
+*mate-1.8.0 (04 May 2014)
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-1.6.0.ebuild:
+ Stable for amd64, wrt bug #509268
+
+ 14 Apr 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
+ Add maintainer information and wonder why we don't have a check for that.
+
+*mate-1.6.0 (24 Mar 2014)
+
+ 24 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-1.6.0.ebuild,
+ +metadata.xml:
+ New ebuild for mate-base/mate, meta ebuild for MATE, The traditional desktop
+ environment; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-base/mate/Manifest b/mate-base/mate/Manifest
new file mode 100644
index 0000000..ecf9d38
--- /dev/null
+++ b/mate-base/mate/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD mate-1.8.0.ebuild 2390 SHA256 b53694595b68b48132a4e27b1e84d5ddd607a7f01eccdce977603c265948ee21 SHA512 d9e4091297ef5cd4f997164be728c652351b819e86ebdb96dc366ed15c5efeee42e7fa9e6414fafbad5d8487c5dfa03ac1c27ab6c3a5b1cb51dbff60d71e7bd6 WHIRLPOOL ed9f0963e50a073737d74ffea1a094dd660144f3b42b3f5864ac7df15be19dc253d579de60594a4c244a7a7059cf8b0dd204022fed6a5f0a89e3a18f1ea1b859
+MISC ChangeLog 1701 SHA256 9a187fa4f793b818d91bc73d42d7c5d72d1950835fbed59f1a857c28c51d18d0 SHA512 82562ed4d7d190e1e079c9e18a0a6d52d70aa1411e710572561593d574f022fd3a9e13ce5c5794be0bd886097c2732048fb54de81a429ca8ba972cbb4c9f8801 WHIRLPOOL 2e5e42c77b9df2e90e25db5d1dfb866d5ae2cd3abfb2314edd8fdcf98ada23915e8d45f7a8c396639c4afd10507eb8ca32016dc96cf6100b46961e2c73198f89
+MISC metadata.xml 920 SHA256 b163702f25260e444bbfb7df723d259641c385c788f6844a37214bb2e5b5a755 SHA512 c049a975317ffb02c4e5d0d71a7ff414635abcaf0da38c6ae85ab692739233d131e51832c09dc048321514dca9f4c7f73915e13ed8d0190cc63310d7a3326174 WHIRLPOOL b81d113b788a57725c8c02dee1f6c3ca4605538374d15e651626f2dc0455939c02c61b72dd445a3015d69fbad387bd2611f2c77f8a8a157238465692f2808346
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVoZLTAAoJEBzZQR2yrxj7T50P/0KHfM74t7HN0tTX9Lm6wtap
+xS5P5Py3jgNcX86FjnZfvXSFFyJEUjumDGFaM5n9uVv9uaAdN0ox8GB9hR7tQF2D
+lx1x4bHoGUKPdJMUfbXSHm9pZanyorgAWXSPLwJEO0Ost/W5FcP3L8NM0iVetBcw
+0CT/6yFj1UCPfUilhpLxti2GrOgeHfXcM8iLDLsf1onDpRHtH6/QQUuFzCmKqS8L
+xYEnDCromGKKfi3CghK5Ric09OPX/TLY0Ae1iAoJ3WN0bwA9ox3EUPVACqpGOj/K
+QrVdvDvmH120nIksBj+i700LV+r4gB4vsz+Pqk4FtzdTc0gr2Ik5bvBrfY820ZgL
+bnRSuEMHhR0EwK4se7IgqcdzfTIDnni8ICsdiXwfSjMvnj93jsIcdb/yg3tIlxvs
+uLFurTOHLzxdJ4CCCF6fGgTaG3hxXCtMDsn2jWeD6x1pnYejjwLkieE5Jd0I83Np
+WmN38gKFOUxcCzQyzyu5NPvaU0/ssGA/ixHxIGSxn5igLo2MJf9U3fSGrcjYRvCN
+pEg1y2h4WocWreKYs77NuyFmgWbFSgmziAeCuy1+SJbsQjc+cooG0nVRxGpkC1Gs
+TuwtLzjhP3QLVxwTpNgkJgn1oMwfaCWyWKUxBfaslfE/qVFS0+dsPJTaxBrwEEqt
+6bUYpEM5AIqTuJBv2RLG
+=U9a3
+-----END PGP SIGNATURE-----
diff --git a/mate-base/mate/mate-1.8.0.ebuild b/mate-base/mate/mate-1.8.0.ebuild
new file mode 100644
index 0000000..15d90fd
--- /dev/null
+++ b/mate-base/mate/mate-1.8.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-base/mate/mate-1.8.0.ebuild,v 1.5 2014/07/02 09:47:11 pacho Exp $
+
+EAPI="5"
+
+inherit versionator
+
+MATE_MV="$(get_version_component_range 1-2)"
+
+SRC_URI=""
+DESCRIPTION="Meta ebuild for MATE, a traditional desktop environment"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="metapackage"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+base -bluetooth +themes +extras"
+
+S="${WORKDIR}"
+
+RDEPEND="
+ =mate-base/mate-desktop-${MATE_MV}*:0
+ =mate-base/mate-menus-${MATE_MV}*:0
+ =mate-base/mate-panel-${MATE_MV}*:0
+ =mate-base/mate-session-manager-${MATE_MV}*:0
+ =mate-base/mate-settings-daemon-${MATE_MV}*:0
+ =x11-wm/marco-${MATE_MV}*:0
+ base? (
+ =mate-base/caja-${MATE_MV}*:0
+ =mate-base/mate-applets-${MATE_MV}*:0
+ =mate-base/mate-control-center-${MATE_MV}*:0
+ =mate-extra/mate-media-${MATE_MV}*:0
+ =x11-misc/mozo-${MATE_MV}*:0
+ =x11-terms/mate-terminal-${MATE_MV}*:0
+ )
+ bluetooth? ( net-wireless/blueman:0 )
+ themes? (
+ =x11-themes/mate-backgrounds-${MATE_MV}*:0
+ =x11-themes/mate-icon-theme-${MATE_MV}*:0
+ =x11-themes/mate-themes-${MATE_MV}*:0
+ )
+ extras? (
+ =app-arch/engrampa-${MATE_MV}*:0
+ =app-editors/pluma-${MATE_MV}*:0
+ =app-text/atril-${MATE_MV}*:0
+ =mate-extra/mate-calc-${MATE_MV}*:0
+ =mate-extra/mate-power-manager-${MATE_MV}*:0
+ =mate-extra/mate-screensaver-${MATE_MV}*:0
+ =mate-extra/mate-system-monitor-${MATE_MV}*:0
+ =mate-extra/mate-utils-${MATE_MV}*:0
+ =media-gfx/eom-${MATE_MV}*:0
+ )
+"
+
+PDEPEND="virtual/notification-daemon:0"
+
+pkg_postinst() {
+ elog "For installation, usage and troubleshooting details regarding MATE;"
+ elog "read more about it at Gentoo Wiki: https://wiki.gentoo.org/wiki/MATE"
+ elog ""
+ elog "MATE 1.8 had some packages renamed, replaced and/or dropped; for more"
+ elog "details, see http://mate-desktop.org/blog/2014-03-04-mate-1-8-released"
+ elog ""
+ elog "MATE 1.6 has moved from mateconf to gsettings. This means that the"
+ elog "desktop settings and panel applets will return to their default."
+ elog "You will have to reconfigure your desktop appearance."
+ elog ""
+ elog "There is mate-conf-import that converts from mateconf to gsettings."
+ elog ""
+ elog "For support with mate-conf-import see the following MATE forum topic:"
+ elog "http://forums.mate-desktop.org/viewtopic.php?f=16&t=1650"
+}
diff --git a/mate-base/mate/metadata.xml b/mate-base/mate/metadata.xml
new file mode 100644
index 0000000..a2016fc
--- /dev/null
+++ b/mate-base/mate/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>mate</herd>
+ <use>
+ <flag name="base">Install base MATE Desktop applications that are
+ recommended for the most common usage; for example, this installs
+ the file manager. Disable this and other USE flags if you want a
+ more minimal MATE Desktop.</flag>
+ <flag name="themes">Install MATE Desktop's themes; if you use other
+ themes, you can disable this to spare some space and time.</flag>
+ <flag name="extras">Install additional MATE Desktop applications that
+ are recommended for extended usage of the MATE Desktop as upstream
+ sees it; for example, this installs MATE Desktop's office related
+ applications. Disable this if you plan to use your own non-MATE
+ Desktop alternatives or a custom mixture of MATE and non-MATE
+ packages.</flag>
+ </use>
+</pkgmetadata>
diff --git a/mate-base/metadata.xml b/mate-base/metadata.xml
new file mode 100644
index 0000000..faf5057
--- /dev/null
+++ b/mate-base/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The mate-base category contains core MATE packages.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie mate-base enthält die MATE Basispakete.
+ </longdescription>
+ <longdescription lang="es">
+ La catagoría mate-base contiene los paquetes principales de MATE.
+ </longdescription>
+ <longdescription lang="ja">
+ mate-baseカテゴリーにはMATEのコア・パッケージが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De mate-base categorie bevat de basisonderdelen van de MATE desktopomgeving.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm mate-base chứa các gói MATE cốt lõi.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria mate-base contiene i pacchetti base di MATE.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria mate-base contém os pacotes principais de MATE.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria mate-base zawiera podstawowe pakiety środowiska MATE.
+ </longdescription>
+</catmetadata> \ No newline at end of file
diff --git a/mate-extra/caja-dropbox/ChangeLog b/mate-extra/caja-dropbox/ChangeLog
new file mode 100644
index 0000000..791d27f
--- /dev/null
+++ b/mate-extra/caja-dropbox/ChangeLog
@@ -0,0 +1,28 @@
+# ChangeLog for mate-extra/caja-dropbox
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/ChangeLog,v 1.5 2015/04/08 18:13:51 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> caja-dropbox-1.8.0.ebuild:
+ Drop old Python implementations
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -caja-dropbox-0.7.1.ebuild:
+ drop old; drop to unstable
+
+*caja-dropbox-1.8.0 (22 Jul 2014)
+
+ 22 Jul 2014; Tom Wijsman <TomWij@gentoo.org> +caja-dropbox-1.8.0.ebuild,
+ +files/caja-dropbox-1.8.0-system-rst2man.patch:
+ Version bump to 1.8.0; fixes bug #510464, reported by nihil39.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> caja-dropbox-0.7.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*caja-dropbox-0.7.1 (17 Mar 2014)
+
+ 17 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +caja-dropbox-0.7.1.ebuild,
+ +files/caja-dropbox-0.7.0-system-rst2man.patch, +metadata.xml:
+ New ebuild for mate-extra/caja-dropbox, store, sync and share files online;
+ imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
new file mode 100644
index 0000000..15a0c9f
--- /dev/null
+++ b/mate-extra/caja-dropbox/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX caja-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702 SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb WHIRLPOOL 75f33c78b99b923da61a2dc926e0c4a62973cc61e36e7c5bd0a52fa840757b876fd9badf158ba1e78a42094023f76eaedf0fa72ba6795acd90bc3dd30683d9e6
+AUX caja-dropbox-1.8.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
+DIST caja-dropbox-1.8.0.tar.xz 310592 SHA256 bb26151cad68e910979af6dd8b323434462a2457998ad67529660135c0caa513 SHA512 33c0804ba756ec50b531e4992b74577848f52fef60b8c69b96f307a2b8a57fd42ff951d6d3fdd55a6b1e260c4f46d0a26f90f730a88dc45a66e2d78888492fbc WHIRLPOOL 3b200e6a1b5e6f9926566962c48b9585fa0f9cc1ccc8ee89e45489d87c41cbf50a2b1bd62036140ba7492edf5a2812b918c4c4596b17c4674e0821a72d29550f
+EBUILD caja-dropbox-1.8.0.ebuild 2215 SHA256 55b47cc5f0e2a11de79af5b52001218072f3b0473573c178f4a6cc939f30d4ac SHA512 584fab1cd025714cdbb0da3a566d36702def1b0e084db88fc05a4679fbd2405a18dfadbc2bece33cb30c3800af65dc3154b74647bf31004da35b6caa154fe7cb WHIRLPOOL acfa74e33f840acfdbd80d1f39b57dff61b4149a98396bb246d9e0419b680cf141349c9e2db5f70dfa3559f264203887a80e1f425f47b8cabb844d9b6a624554
+MISC ChangeLog 1194 SHA256 7f0ee75b6796e6155e2feff0fe4372eadd2beec3752bc68c42906dc5b0b1cd43 SHA512 032540ae360a1954fddb5065e167d4b3ae334e0a9b5f1c7cf74b62814da6cf7f864bf6398e7b92c7c11fd702a70d21c5caf77bd8f3db8e4ac50b15a9f390fae6 WHIRLPOOL b1a118835659fd3539e83d7bb3e5c8bc2aec1811249a227cffa04b5df15d18b13d2bc7b2eb46ae838ad28bb5daf69879524b3fe6eddd586097fb7605766434df
+MISC metadata.xml 263 SHA256 f0c6fe36b36ad3b31ebf4ec4942b3d919cf22ecfaef865f7db06a84210431d46 SHA512 b1584eb694eaa1b44bd08248244135adedfd08e14e7bf6e80e3d360a836b28e6bdba969a6562597b8d9c1252f06f6779c3bc57a4d65a323457a81d5a0244fdad WHIRLPOOL 0cecf7185350c35ce3a284a79827fbee923a140e4b616ddd3b5e8cace9ce30a97784aff506ac7a57c668e81fe65eb17159594d72da841f4c24a69b73fbe12ea1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7VFgQALYfdkAmcpOb9E+FFDQbhhYj
+R6p1JecMEOjP6f/Ddhd375bNSYtulATEpS7AXD1G7X5QJCJ3rLS9B5Tcg/E5aadS
+mj4RjVDubcmlSEKVdKXGdER/Hg0kD3KUCG9XBgmm3rkczkYnLwAZ+6w91+PEQz37
+6vs68UvSGh4wUv3Zd0fWiNXQ2e2YsWkmq/oiq+kuje3jtIWbeG1LdVXAFcoGYyGt
+7NL15n5E+W756DV84pxthvf84nlZTsL1lQHSZN4jWYDvYRcrI33wxvN5vzqGR8fF
+Okiju/BiHw9vK0qt+8yzKX/fkbnfuBqftfMdwp0GZL8v0OW2Y/503vOo9u9qfEc8
+sN2oaZN+48NDGp9PjGPVpcv0wsLgJ9dRXSGHHq7/q/ZrZ+juLQRVEJXIB94iH7H+
+KPxR5Jk690hlaQ/D/4ulPDj2Hw0FryCSmQzpV2YgzTGDzdqmCbqLNhjHwb4Hs0/E
+iQ6eDVm/8FDNTcrnah/q4q4INMNuBB2OvEmZxmqfqK8pB42C/LisCfFeVKsWZBDk
+grgDy09y7fP3hdDZxSGIcoE+vEOLwhz6g8xZi3jOvDOxE2+4tPf2uIlMDLKHh1O0
+ih1tVHU7yzTp21sk4KXoeGmQQhmsY9csvPuSpCJH/TuOh4y/MpuP4Bnd+8SIPqq8
+bJp+TitNpyO9wX1nluXC
+=ygvW
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
new file mode 100644
index 0000000..32ff9a5
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild,v 1.2 2015/04/08 18:13:51 mgorny Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 python-single-r1 linux-info user versionator
+
+MATE_BRANCH="1.8"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Store, Sync and Share Files Online"
+HOMEPAGE="http://www.dropbox.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="debug"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/glib-2.14:2
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ >=mate-base/caja-1.8:0
+ media-libs/fontconfig:1.0
+ media-libs/freetype:2
+ net-misc/dropbox:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libXinerama:0
+ x11-libs/pango:0"
+
+DEPEND="${RDEPEND}
+ dev-python/docutils:0
+ virtual/pkgconfig:*"
+
+G2CONF="${G2CONF} $(use_enable debug) --disable-static"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup () {
+ python-single-r1_pkg_setup
+ check_extra_config
+ enewgroup dropbox
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Use system dropbox.
+ sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
+ -e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
+ -i caja-dropbox.in || die
+
+ # Use system rst2man.
+ epatch "${FILESDIR}"/${P}-system-rst2man.patch
+
+ AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install () {
+ python_fix_shebang caja-dropbox.in
+
+ gnome2_src_install
+
+ local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
+ [ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
+
+ # Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
+ extensiondir="${extensiondir#${EPREFIX}}"
+ use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
+ fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
+}
+
+pkg_postinst () {
+ gnome2_pkg_postinst
+
+ elog
+ elog "Add any users who wish to have access to the dropbox caja"
+ elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+ elog "before using this plugin. Visit ${HOMEPAGE} for more information."
+ elog
+}
diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch
new file mode 100644
index 0000000..ea0053b
--- /dev/null
+++ b/mate-extra/caja-dropbox/files/caja-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/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
new file mode 100644
index 0000000..7404182
--- /dev/null
+++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+Index: nautilus-dropbox-0.7.0/configure.ac
+===================================================================
+--- nautilus-dropbox-0.7.0.orig/configure.ac
++++ nautilus-dropbox-0.7.0/configure.ac
+@@ -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/mate-extra/caja-dropbox/metadata.xml b/mate-extra/caja-dropbox/metadata.xml
new file mode 100644
index 0000000..8f12c89
--- /dev/null
+++ b/mate-extra/caja-dropbox/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/caja-dropbox</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/caja-extensions/ChangeLog b/mate-extra/caja-extensions/ChangeLog
new file mode 100644
index 0000000..5a56259
--- /dev/null
+++ b/mate-extra/caja-extensions/ChangeLog
@@ -0,0 +1,25 @@
+# ChangeLog for mate-extra/caja-extensions
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/ChangeLog,v 1.4 2014/07/02 09:47:20 pacho Exp $
+
+ 11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> caja-extensions-1.8.0.ebuild:
+ Finish deprecation of 1.6
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> caja-extensions-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> caja-extensions-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> caja-extensions-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+*caja-extensions-1.8.0 (04 May 2014)
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> +caja-extensions-1.8.0.ebuild,
+ +files/caja-extensions-1.8.0-sendto-options.patch, +metadata.xml:
+ New ebuild for mate-extra/caja-extensions for MATE 1.8, several Caja
+ extensions; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
new file mode 100644
index 0000000..7f2ed69
--- /dev/null
+++ b/mate-extra/caja-extensions/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX caja-extensions-1.8.0-sendto-options.patch 12563 SHA256 1e00f86c960d28b6495c7a514a3897bc7f1c2e204518b6565fbe0e99f3a274de SHA512 95f78cc155aeb6576c4f938f5960516043897d0353ebf8ecf1fe130dc3771708c4838116efc0de4e8e4cc17bdf76715bb50cac9c4fb5ace0ddaa3348feb100a4 WHIRLPOOL 58a74ac39898c8bc4cfdcfec303a7812db11556a8a7bb37ff546c7a6ca1c26161ba08d78d4eaad5aa64dec414ae4c21107c454b7305c303165aebdfc647f179e
+DIST caja-extensions-1.8.0.tar.xz 343784 SHA256 71b4353236b4f13e1984a8497ff80ed63d74141833ba47a32629a5d3505bbc91 SHA512 1a59bf3ed7300d790f47494d0bef677a760fa069aaf76c2f35eb4d17b67be0fcdfa904e3a05d45ca1ff9f3016961c689aa620d37f020ed199ca2ddb3d8dd3663 WHIRLPOOL f192f8e966de8272ca65d7e856ebf26bfdbca8cf559da7571c6e372b5c9ad3b21f1e08691014546ed4cd9b6b60a5840b8a02c53d9d7ed34a8876a873771dc2be
+EBUILD caja-extensions-1.8.0.ebuild 2066 SHA256 939f26ba8b539d0e058bd9ca0592983134cad5ed90b226853f39b2cd39f16ef9 SHA512 5f87a0434755c98ab5aed1a1d77a2cd4a03ae29792e153390b4610e1c42c07eac083ef6a5fb9c8752071ef0a02379a204b7504ae620d4852721fbfb582ecea47 WHIRLPOOL 42754abc5b29b849b7f236955120a3fdfdeedb450ff083d1192f5179deed1297b19f0993c1ee0ae6d8004afb0902ee09aa2d51780858d40338ada756d9af7c8b
+MISC ChangeLog 1077 SHA256 644b2af627de3edbf5e95fdd166f38c3b1e11a2661f6ca205526546f4884154d SHA512 ec45d9c56c36cf74df788feb31e9db593fab577278a987ad6472734c7cbd8f0a878f9329156d321f7a5fb3d3286eccb93ff82ab70903bcb68debfc719b8486fe WHIRLPOOL e364153074cad308b01db0718a1392db2ccc4b306e12da0ad95cb62482dda99998e1bf69b3fe82ab12f37e18849f7ce13c2731dac103c586999e7db67ab0caa1
+MISC metadata.xml 742 SHA256 3e78dc18ccb97ad8df4afb39eb311741e5cdabd8dae4b5d414d9b4c8cfd1686c SHA512 baf8cb4a5b473980833264e273ce4450e2b65a26cd0c8c721a93c3296559c3cb7afe9710c6fc9ea7fda48a936b3ded6c900220fdcf8317116259f027327c9688 WHIRLPOOL c59c7956c71022e2cd2d499e3208badf42e160c13e839606669dc28532a1c73930e441e7c587354561b38f1fbda2ebb864c01328782e7437f1e932c9768cf3ca
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVoZLTAAoJEBzZQR2yrxj7DcUP+wVnKfKZf1HUvr7OQKOLxYNK
+QpXxT0l+TXoI5t27BmqAeztov8HIiqiVuWvl0SK8u2PDX22keXbhDQGOKcoKhvzY
+hLB4r54sGFZxbAsfiE2mLDOi5iTvmcaFoA5lH/9Bts7e/9l2eSb53qeN0Kp2XSqr
+N9fdqFfVCsHPPUuNabTQVv/5ztiCwzK7hDMBiGHBmcd6D4HuRjK9ejkUtlrYjINj
+I/wqea/9D800K68tYb5VxdxiR23adhRKjgcGPqtG6VV56ts38FOamtwOHmCzBKJ8
+a9O2Bcg6lbHOa+C4NDeI+5gPTJgnPhvxIsKfFqLg05tbGcQnhQxw9EBqJpj3oSFw
+xLdRSEreGfSLkPKu7Ix8VBMP6zVDYrNJA+RnqSZ53yIbYT6V/TRP2+eiXQ4BE987
+jug26/SrAY9bpcLmaZCafQsNc6peWaoMYyqV/zOuF1x+wFpVEL1khnD8ZYo7+Lxs
+iW3eTOsAxe1AVcaTJqkZo6314CyFyp+6a9+Oc2JkN/ZHv5C3Tefse+YF2dKM8AUp
+BobzujsigD1y9NhNl4mif5D/kqtwjNuTtZRqtQfrK6diiDTZv96MlPzIAf3pPu8U
+x6aAGqSeRmh9gRe715IxTKYrtuhHn4+I3+IqnZRPw1VzUht4g+umWuC7EacouK3w
+JW8JWJ6Pn1eeA0B6aYIl
+=duvU
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild
new file mode 100644
index 0000000..f1580e4
--- /dev/null
+++ b/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-extensions/caja-extensions-1.8.0.ebuild,v 1.4 2014/07/02 09:47:20 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Several Caja extensions"
+HOMEPAGE="http://www.mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+SENDTO="cdr gajim +mail pidgin upnp"
+IUSE="image-converter +open-terminal share ${SENDTO}"
+
+RDEPEND=">=x11-libs/gtk+-2.18:2
+ >=dev-libs/glib-2.26:2
+ >=mate-base/caja-1.8:0
+ virtual/libintl:0
+ x11-libs/gdk-pixbuf:2
+ open-terminal? ( >=mate-base/mate-desktop-1.8:0 )
+ cdr? ( >=app-cdr/brasero-2.32.1:0= )
+ gajim? (
+ net-im/gajim:0
+ >=dev-libs/dbus-glib-0.60:0
+ >=sys-apps/dbus-1:0
+ )
+ pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
+ upnp? ( >=net-libs/gupnp-0.13:0= )"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.18:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ !!mate-extra/mate-file-manager-open-terminal
+ !!mate-extra/mate-file-manager-sendto
+ !!mate-extra/mate-file-manager-image-converter
+ !!mate-extra/mate-file-manager-share"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.8.0-sendto-options.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ MY_CONF=""
+
+ if use cdr || use mail || use pidgin || use gajim || use upnp ; then
+ MY_CONF="${MY_CONF} --enable-sendto"
+ MY_CONF="${MY_CONF} --with-sendto-plugins=removable-devices"
+ use cdr && MY_CONF="${MY_CONF},caja-burn"
+ use mail && MY_CONF="${MY_CONF},emailclient"
+ use pidgin && MY_CONF="${MY_CONF},pidgin"
+ use gajim && MY_CONF="${MY_CONF},gajim"
+ use upnp && MY_CONF="${MY_CONF},upnp"
+ else
+ MYCONF="${MY_CONF} --disable-sendto"
+ fi
+
+ gnome2_src_configure ${MY_CONF} \
+ --disable-gksu \
+ $(use_enable image-converter) \
+ $(use_enable open-terminal) \
+ $(use_enable share)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch
new file mode 100644
index 0000000..5e0953a
--- /dev/null
+++ b/mate-extra/caja-extensions/files/caja-extensions-1.8.0-sendto-options.patch
@@ -0,0 +1,316 @@
+diff --git a/configure.ac b/configure.ac
+index fcf02d6..c38061f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,19 +102,173 @@ if test "x$enable_sendto" = "xyes"; then
+ GUPNP_REQUIRED=0.13
+ PKG_CHECK_MODULES(SENDTO,
+ glib-2.0 >= $GLIB_REQUIRED
+- gio-2.0 >= $GLIB_REQUIRED
+ gthread-2.0 >= $GTHREAD_REQUIRED
+ gmodule-2.0 >= $GLIB_REQUIRED
+ gobject-2.0 >= $GLIB_REQUIRED
+- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+- dbus-1 >= $DBUS_REQUIRED
+- dbus-glib-1 >= $DBUS_GLIB_REQUIRED
+- gupnp-1.0 >= $GUPNP_REQUIRED)
++ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
+ AC_SUBST(SENDTO_CFLAGS)
+ AC_SUBST(SENDTO_LIBS)
+- AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$prefix/share/gajim", [path to gajim share dir])
+-fi
+
++ # The full list of plugins
++ allowed_sendto_plugins="emailclient gajim caja-burn pidgin removable-devices upnp"
++
++ sendto_plugin_error_or_ignore()
++ {
++ if test "${error_on_bad_sendto_plugin}" = "1" ; then
++ AC_MSG_ERROR([$1])
++ else
++ AC_MSG_WARN([$1 (disabling sendto plugin)])
++ fi
++ }
++
++ AC_ARG_WITH([sendto-plugins],
++ [AS_HELP_STRING([--with-sendto-plugins],[Which caja-sendto plugins to compile (default: auto; "all", "autodetect" are valid)])],
++ [], [with_sendto_plugins=autodetect])
++
++ used_sendto_plugins=""
++ used_sendto_plugins2=""
++
++ if test "x${with_sendto_plugins}" = "xautodetect" ; then
++ # Default to all plugins and just ignore them if they won't compile
++ with_sendto_plugins="all"
++ error_on_bad_sendto_plugin="0"
++ else
++ # Clean up the plugin list and error if a plugin won't compile
++ with_sendto_plugins=`echo ,"${with_sendto_plugins}", | sed -e 's/[[ ,]][[ ,]]*/ /g' -e 's/,$//'`
++ error_on_bad_sendto_plugin="1"
++ fi
++
++ # Iterate through the wanted plugins and weed out bad ones (or error)
++ for wanted_sendto_plugin in ${with_sendto_plugins}; do
++ for allowed_sendto_plugin in ${allowed_sendto_plugins}; do
++ case ${wanted_sendto_plugin} in
++ all)
++ # List all plugins as being used
++ used_sendto_plugins=${allowed_sendto_plugins}
++ ;;
++ autodetect)
++ # List all plugins as being used
++ used_sendto_plugins=${allowed_sendto_plugins}
++ ;;
++ ${allowed_sendto_plugin}) used_sendto_plugins="${used_sendto_plugins} ${wanted_sendto_plugin}";; # List the plugin
++ *) ;;
++ esac
++ done
++ done
++
++ # Check for plugin-specific requirements and error if necessary
++ for sendto_plugin in ${used_sendto_plugins}; do
++ add_sendto_plugin="1"
++
++ case ${sendto_plugin} in
++ emailclient)
++ PKG_CHECK_MODULES(EMAILCLIENT, gio-2.0,
++ enable_emailclient=yes, enable_emailclient=no)
++ if test "${enable_emailclient}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need gio-2.0 to build the emailclient plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ gajim)
++ AC_ARG_WITH(sendto_gajim,
++ [AS_HELP_STRING(--with-sendto-gajim,[Path to Gajim install prefix])],
++ [GAJIM_PATH="$withval"],[GAJIM_PATH="$prefix"])
++
++ GAJIM_SHARE_DIR="$GAJIM_PATH"/share/gajim
++
++ PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
++ [AC_SUBST(DBUS_CFLAGS)
++ AC_SUBST(DBUS_LIBS)
++ enable_sendto_gajim=yes
++ AC_DEFINE_UNQUOTED(GAJIM_SHARE_DIR, "$GAJIM_SHARE_DIR", [path to gajim share dir])],
++ [enable_gajim=no])
++
++ if test "${enable_gajim}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need gajim and dbus-glib installed for the gajim plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ caja-burn)
++ PKG_CHECK_MODULES(GIO, gio-2.0,
++ enable_burn=yes, enable_burn=no)
++ if test "${enable_burn}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need gio installed for the caja-burn plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ pidgin)
++ PKG_CHECK_MODULES(PIDGIN, dbus-glib-1 >= $DBUS_GLIB_REQUIRED,
++ enable_pidgin=yes, enable_pidgin=no)
++ if test "${enable_pidgin}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need dbus-glib to build the pidgin plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ removable-devices)
++ PKG_CHECK_MODULES(GIO, gio-2.0,
++ enable_removable=yes, enable_removable=no)
++ if test "${enable_removable}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need gio-2.0 to build the removable-devices plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ upnp)
++ PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED,
++ enable_upnp=yes, enable_upnp=no)
++ if test "${enable_upnp}" != "yes" ; then
++ sendto_plugin_error_or_ignore "you need gupnp installed for the upnp plugin"
++ add_sendto_plugin="0"
++ fi
++ ;;
++ esac
++
++ # Add the specified plugin
++ if test "${add_sendto_plugin}" = "1" ; then
++ used_sendto_plugins2="${used_sendto_plugins2} ${sendto_plugin}"
++ fi
++ done
++
++ ALL_SENDTO_PLUGINS=$allowed_sendto_plugins
++ SENDTO_PLUGINS=$used_sendto_plugins2
++
++ dnl Error out if no plugins will be built
++ if test -z "${SENDTO_PLUGINS}" ; then
++ AC_MSG_ERROR([No sendto plugins will be built, and caja-sendto requires at least one])
++ fi
++
++ AC_MSG_CHECKING([which sendto plugins to compile])
++ AC_MSG_RESULT([$SENDTO_PLUGINS])
++
++ AC_SUBST([ALL_SENDTO_PLUGINS])
++ AC_SUBST([SENDTO_PLUGINS])
++
++ dnl For the pidgin sendto plugin
++ AM_CONDITIONAL(HAVE_SENDTO_PIDGIN, test "x$enable_pidgin" = "xyes")
++
++ dnl For the GIO based plugins
++ enable_nst_common=no
++ if test "x$enable_burn" = "xyes" -o "x$enable_removable" = "xyes"; then
++ enable_nst_common=yes
++ fi
++ AM_CONDITIONAL(HAVE_GIO, test "x$enable_nst_common" = "xyes")
++
++ if test "x${SENDTO_PLUGINS}" != "x" ; then
++ for allowed_sendto_plugin in ${ALL_SENDTO_PLUGINS}; do
++ for sendto_plugin in ${SENDTO_PLUGINS}; do
++ case ${allowed_sendto_plugin} in
++ ${sendto_plugin})
++ AC_MSG_NOTICE([** ${allowed_sendto_plugin} sendto plugin enabled])
++ continue 2
++ ;;
++ *);;
++ esac
++ done
++ AC_MSG_NOTICE([ ${allowed_sendto_plugin} sendto plugin disabled])
++ done
++ else
++ AC_MSG_NOTICE([ No caja-sendto plugins enabled])
++ fi
++fi
+ AM_CONDITIONAL(ENABLE_SENDTO, test x"$enable_sendto" = "xyes")
+
+ # share extension
+diff --git a/sendto/plugins/Makefile.am b/sendto/plugins/Makefile.am
+index 10097e8..6d17c98 100644
+--- a/sendto/plugins/Makefile.am
++++ b/sendto/plugins/Makefile.am
+@@ -1,16 +1,13 @@
+-SUBDIRS = . \
+- caja-burn \
+- emailclient \
+- gajim \
+- pidgin \
+- removable-devices \
+- upnp
++SUBDIRS = . $(SENDTO_PLUGINS)
++DIST_SUBDIRS = $(ALL_SENDTO_PLUGINS)
+
+ NST_COMMON_SOURCES = nst-common.c nst-common.h
+
++if HAVE_GIO
+ noinst_LTLIBRARIES = libnstcommon.la
+ libnstcommon_la_SOURCES = $(NST_COMMON_SOURCES)
+ libnstcommon_la_CFLAGS = $(SENDTO_CFLAGS)
+ libnstcommon_la_LIBADD = $(SENDTO_LIBS)
++endif
+
+ EXTRA_DIST = $(NST_COMMON_SOURCES)
+diff --git a/sendto/plugins/caja-burn/Makefile.am b/sendto/plugins/caja-burn/Makefile.am
+index 50c309b..00f95c2 100644
+--- a/sendto/plugins/caja-burn/Makefile.am
++++ b/sendto/plugins/caja-burn/Makefile.am
+@@ -9,11 +9,12 @@ AM_CPPFLAGS = \
+ -I$(srcdir)/../ \
+ $(SENDTO_CFLAGS) \
+ $(WARN_CFLAGS) \
+- $(DISABLE_DEPRECATED)
++ $(DISABLE_DEPRECATED) \
++ $(GIO_CFLAGS)
+
+ plugin_LTLIBRARIES = libnstburn.la
+
+ libnstburn_la_SOURCES = caja-burn.c
+ libnstburn_la_LDFLAGS = -module -avoid-version
+-libnstburn_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
++libnstburn_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+
+diff --git a/sendto/plugins/emailclient/Makefile.am b/sendto/plugins/emailclient/Makefile.am
+index 31ba40e..c4af752 100644
+--- a/sendto/plugins/emailclient/Makefile.am
++++ b/sendto/plugins/emailclient/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/sendto \
+ -I$(top_builddir) \
+ $(SENDTO_CFLAGS) \
++ $(EMAILCLIENT_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS)
+
+@@ -14,4 +15,4 @@ plugin_LTLIBRARIES = libnstemailclient.la
+
+ libnstemailclient_la_SOURCES = emailclient.c
+ libnstemailclient_la_LDFLAGS = -module -avoid-version
+-libnstemailclient_la_LIBADD = $(SENDTO_LIBS)
++libnstemailclient_la_LIBADD = $(SENDTO_LIBS) $(EMAILCLIENT_LIBS)
+diff --git a/sendto/plugins/gajim/Makefile.am b/sendto/plugins/gajim/Makefile.am
+index 5acd5b0..c39a3c0 100644
+--- a/sendto/plugins/gajim/Makefile.am
++++ b/sendto/plugins/gajim/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/sendto \
+ -I$(top_builddir) \
+ $(SENDTO_CFLAGS) \
++ $(DBUS_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS)
+
+@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstgajim.la
+
+ libnstgajim_la_SOURCES = gajim.c
+ libnstgajim_la_LDFLAGS = -module -avoid-version
+-libnstgajim_la_LIBADD = $(SENDTO_LIBS)
++libnstgajim_la_LIBADD = $(DBUS_LIBS) $(SENDTO_LIBS)
+
+diff --git a/sendto/plugins/pidgin/Makefile.am b/sendto/plugins/pidgin/Makefile.am
+index b7f650a..bcfe1d3 100644
+--- a/sendto/plugins/pidgin/Makefile.am
++++ b/sendto/plugins/pidgin/Makefile.am
+@@ -7,6 +7,8 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/sendto \
+ -I$(top_builddir) \
+ $(SENDTO_CFLAGS) \
++ $(NST_EBOOK_CFLAGS) \
++ $(PIDGIN_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS)
+
+@@ -14,5 +16,5 @@ plugin_LTLIBRARIES = libnstpidgin.la
+
+ libnstpidgin_la_SOURCES = pidgin.c
+ libnstpidgin_la_LDFLAGS = -module -avoid-version
+-libnstpidgin_la_LIBADD = $(SENDTO_LIBS)
++libnstpidgin_la_LIBADD = $(PIDGIN_LIBS) $(SENDTO_LIBS)
+
+diff --git a/sendto/plugins/removable-devices/Makefile.am b/sendto/plugins/removable-devices/Makefile.am
+index 294ca90..797353b 100644
+--- a/sendto/plugins/removable-devices/Makefile.am
++++ b/sendto/plugins/removable-devices/Makefile.am
+@@ -15,5 +15,5 @@ plugin_LTLIBRARIES = libnstremovable_devices.la
+
+ libnstremovable_devices_la_SOURCES = removable-devices.c
+ libnstremovable_devices_la_LDFLAGS = -module -avoid-version
+-libnstremovable_devices_la_LIBADD = $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
++libnstremovable_devices_la_LIBADD = $(GIO_LIBS) $(SENDTO_LIBS) $(builddir)/../libnstcommon.la
+
+diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am
+index 4127abd..31a8bd6 100644
+--- a/sendto/plugins/upnp/Makefile.am
++++ b/sendto/plugins/upnp/Makefile.am
+@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/sendto \
+ -I$(top_builddir) \
+ $(SENDTO_CFLAGS) \
++ $(UPNP_CFLAGS) \
+ $(DISABLE_DEPRECATED) \
+ $(WARN_CFLAGS)
+
+@@ -14,5 +15,5 @@ plugin_LTLIBRARIES = libnstupnp.la
+
+ libnstupnp_la_SOURCES = upnp.c
+ libnstupnp_la_LDFLAGS = -module -avoid-version
+-libnstupnp_la_LIBADD = $(SENDTO_LIBS)
++libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS)
+
diff --git a/mate-extra/caja-extensions/metadata.xml b/mate-extra/caja-extensions/metadata.xml
new file mode 100644
index 0000000..d719a85
--- /dev/null
+++ b/mate-extra/caja-extensions/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>mate</herd>
+ <use>
+ <flag name="gajim">Add an extension to support <pkg>net-im/gajim</pkg>.</flag>
+ <flag name="image-converter">Add image conversion support.</flag>
+ <flag name="mail">Add an extension to support e-mail functionality.</flag>
+ <flag name="open-terminal">Add an extension to support an open terminal.</flag>
+ <flag name="pidgin">Add an extension to support <pkg>net-im/pidgin</pkg></flag>
+ <flag name="share">Add an extension to support sharing files.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/caja-extensions</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-calc/ChangeLog b/mate-extra/mate-calc/ChangeLog
new file mode 100644
index 0000000..20b0427
--- /dev/null
+++ b/mate-extra/mate-calc/ChangeLog
@@ -0,0 +1,47 @@
+# ChangeLog for mate-extra/mate-calc
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-calc/ChangeLog,v 1.11 2014/12/20 17:26:10 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-calc-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-calc-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-calc-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-calc-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-calc-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-calc-1.8.0 (22 Apr 2014)
+
+ 22 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-calc-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-calc-1.6.1.ebuild:
+ Update dependencies per the consensus formed with ssuominen.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-calc-1.6.1.ebuild:
+ Remove unwanted :0 SLOT operator from gettext, intltool and pkgconfig
+ dependencies since we don't know yet how they would be slotted in the future.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-calc-1.6.1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-calc-1.6.1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-calc-1.6.1 (09 Mar 2014)
+
+ 09 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-calc-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-calc, a calculator application for MATE;
+ imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
new file mode 100644
index 0000000..7614f46
--- /dev/null
+++ b/mate-extra/mate-calc/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-calc-1.8.0.tar.xz 753972 SHA256 13d56287430cbb7d60a74666ba752a1a8ea9692125c6a02f97d0cc98d451d99a SHA512 92cd2e5ee8f6943b70ba1402909698f0ca922864bf3553d04ba3212673824b3f1f2042786f77814bf004e93408f46b7be438ddbe1046884f834abc90606bdf11 WHIRLPOOL 7743c0d132d3ca4b71072bd61e152dd44f9688e5f55efc2fb358c5ff238594488f03d4501d0efd6aa687df3925dbe3a265aa2d910a9670446e39c113436f3520
+EBUILD mate-calc-1.8.0.ebuild 872 SHA256 fd508c89f031740644a1621d9727115e5aa8a5676cb82319266d6c76ee0c944c SHA512 947fd031363db06d5ba8ff83296abf67681ae901e21bbed6212136a438955f604237e83f708dfb008da0fb5fab4f2cce652ede133760b2aeeb2801fe1bdad818 WHIRLPOOL 0eab0e6add2b4a3532b93951c1b69fd14361f6052b7fa08df3379ca62fc67e632cd91ff5f929712df495ace7b572d452a5014b23ab0e20cb7734b6400d85e865
+MISC ChangeLog 1862 SHA256 c8dd70c790ff3337a7a53e09945afd7857de302d18407cd82f3e05ab45190368 SHA512 9af9b8c2b5670ad6208ad2489aa58122497495eeb417a80d58cc1f3be5f687b0e733a0aabe5bff08266b758dc8a62711f9b5314a4b185d508d36ba31ef97278b WHIRLPOOL e222a835c61c781ab9a686f4eb901573181d177b8720336dfde89a79cab37fe6a2892cf2c6321e4709074f370b9627441e28637bb70b6e0f69bba9facfcf51de
+MISC metadata.xml 260 SHA256 a78d2bc475f9d9470ba779387b9d552a92c6c81e2d4d7ed58bcb910155b8bd60 SHA512 8b84f2d2fe0f811dca46ed1c277c145a794787c6f9b96a98f248b30b43875a20a862eac9354446e8063c934ad7f763937135c4e8aa83ccf44b4fde47fe36f4f3 WHIRLPOOL b66c5abf2d4a61de81b072177ba6630b4ea346ee5007ed57c21cef1233d41794de24686eb464d19b88e2ed9fa9f68bcf81b698c2da5b360b4786af5450a6b305
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7S0wP/iB44KNvyN9mladLjfz9+12k
+cUyVrEiKW7jDreaRLfFMHvkOqR7+2tCFNtn8eXR8drl4mGeSi5hx8PS+ZHa4dw9N
+t/kk16SPTrx534LpCsRLPm7xNL554vrv7wyOwWeOiGEsLoNxStGzn25AwQ4rMXyV
+lKKANkUDImDX+GUXU1Zi5nAwIJhEA6IPU183faWH7Fa3vupOyvcjYMt65nS0okvU
+ZdP0T+4sEg6hOMA/luX1DnJmI7EG8kndKXCX2WYoEOaw2CG9h+K6gR1tws3ku5DT
+6taAxaphK4UcxaAiCYztOq9BgQxLQW2qW4IlIxexa1LkGtJh7uohg9lqdOS7LwKC
+zWi280rYkk/Ac9Sg50MHjDHLldZ/xC3PJFTWJqC0rK/1ZAahogXSMVQlKH4AZ8Y7
+fEGYvlJMgM2MYZ55Gz1zXD7PgsRL2MhUdOo7IYqFG+VJDuphUPwf4cqKW9eSgJAJ
+yZcgNNO/kbY1nao1fhFJ//n6NUBm85SD4xe/u9G5H9e4T/sLTAETeZyQfjXervqU
++/pQOUJr9uowsuE+GEu8vrQptqrKHcAylvdckCMDgmECWm85eA8jZOcKVWvImL7Z
+vwDTUo+R30OGJIOkY5LC+07/XJQQF1oKedq0gys1HAM6YZd3S4UMvCkDOphTzKFe
+s0GbhqB0JAn9l3Dt39QN
+=gQ1M
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-calc/mate-calc-1.8.0.ebuild b/mate-extra/mate-calc/mate-calc-1.8.0.ebuild
new file mode 100644
index 0000000..3825b84
--- /dev/null
+++ b/mate-extra/mate-calc/mate-calc-1.8.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-calc/mate-calc-1.8.0.ebuild,v 1.4 2014/07/02 09:47:27 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A calculator application for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-text/rarian:0
+ >=dev-libs/glib-2.30:2
+ dev-libs/atk:0
+ dev-libs/libxml2:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/pango:0
+ virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/mate-calc/metadata.xml b/mate-extra/mate-calc/metadata.xml
new file mode 100644
index 0000000..815ce85
--- /dev/null
+++ b/mate-extra/mate-calc/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-calc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-dialogs/ChangeLog b/mate-extra/mate-dialogs/ChangeLog
new file mode 100644
index 0000000..fa1d90a
--- /dev/null
+++ b/mate-extra/mate-dialogs/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for mate-extra/mate-dialogs
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-dialogs/ChangeLog,v 1.9 2014/12/20 17:28:00 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-dialogs-1.6.2.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-dialogs-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-dialogs-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-dialogs-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-dialogs-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-dialogs-1.8.0 (22 Apr 2014)
+
+ 22 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-dialogs-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-dialogs-1.6.2.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-dialogs-1.6.2.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-dialogs-1.6.2 (02 Mar 2014)
+
+ 02 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-dialogs-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-dialogs, display MATE dialogs from the
+ commandline and shell scripts; imported from the mate-overlay, reviewed and
+ adjusted.
diff --git a/mate-extra/mate-dialogs/Manifest b/mate-extra/mate-dialogs/Manifest
new file mode 100644
index 0000000..6733aca
--- /dev/null
+++ b/mate-extra/mate-dialogs/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-dialogs-1.8.0.tar.xz 2786956 SHA256 1db39f743846377c1b5e065c1199285cd70509a26ae2fbdec0884b06f00bcbda SHA512 82b54e034e9ec4d8b1819c5ca9817b9f12fd2273345a26aa9d75b5d1ee307a8d2254f5ba3e4a7a3e8e482344a4be71d95bed8a9f6af9e691babcdeea1f2c0fa3 WHIRLPOOL 12aacb04567b23c089fb2879817d2b2583896dbb5b6290ba4284487c9816ce0629a067990c0fd13698cfbcc502c70ad9f0faf3c9e06de10ed3c07637ec4e7827
+EBUILD mate-dialogs-1.8.0.ebuild 1136 SHA256 f125fe71ddf8d0cecf5017d5bf58778e52dfa315fe5c65343d57543ee84880e2 SHA512 c64c3f6d12b4e3c7e926ffef1856075c5715d062b27f54b88ae7f0aad62fbc52525bbc6ea52c8e2cb54c98c4c8a229d3ba760e0e69f3323aaeb3f29663153e03 WHIRLPOOL 73778d68c3f8d338bb610f0bdad0b84c0524d4b87581850a203d82b7c90344dc7872e31583747cad31d79dace96c6870e0ad9f47ad8444a76e7fb3a110da2559
+MISC ChangeLog 1565 SHA256 df1bd19bf01105e8634a013f7e45c229bf9a918e48a5cf8a6d474e00674da072 SHA512 9f43b89a695a992484f424dd28ef2c7df6d34906a40b02faecfaeeeab4b368d4d7f6f85a82258ae17182ae1430b29140e57b5813f1ed3f890364e7e7f8ceb1be WHIRLPOOL a6b943759dfbab73ee92673bccc83c52f514ba6b5ecfa7c7c2fcb50805aa47d4467e89cecd5f256d751b9304a75f26fc056bf42a878c57d6e0db6b3f8e42a15d
+MISC metadata.xml 263 SHA256 f30f4574dd4f9d97ebc936428981bcf6f970f402824ba43b26503d23fc83588b SHA512 6e9ceffd2fcea2dd7a587df7db0148aab91624f78c8dc5e52cd19aed7aae54c0c1cfbc6c4d0ef1655aa2eadeb4537f00d171b32feea1a126785f80a3771831d2 WHIRLPOOL 714fc2c077511c41802a54e43fa04e89e7a7e8ec613bf210aa6d0bde6bd8f4ccba2cb7c094f0a6063be6e404cc4f17fd77981fc0c76cea2fff67c2064a6075f2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7n3kP/0jFNvsfLVk+V5xsMWlekbnj
+o5cswisMvcjvogC0VfPEwkz90qKlN+hEZ2HvXwe1I7v4AAukKme2E7uS3ul41O1Q
+3opS02KE6FOn4Pgayity6TjZPv/PkIlGJnxY4VXL7t+3C1u6gYT73KJl9PGhJaL5
+oFkdn398fkmQEVbUCEaWWa4trXIVKNky3ybw2YCEoOzoiW0sDIa1qH4ZxWVxBlIc
+97QZhHjQYmi1jU7krdixWFn5Q6U+XsRzZn/pzvjr/uFMmYvsSbsE4vKzrvafaWDz
+kZbswL+2zYd1YH1hUnYuDXLHCIjtvSAvrAPSB7ENZ0oHRsrOX9cMPSbbQtW1lOOe
+pEU4Zozbd4DTOczswxj3E71QaQ0FXRNqUoH+wFMzlluhO5nsDpYRWnQnyEfxf/L6
+00X52aAh9ntbR/cWL/d9Glt8HNkDGydVppXC7cj2sEeL/C04ciyOjEYYvC6SkiVB
+YtAkuynytRAOBybqT6agFyEKS0o00eeixjAOD0oWW2OUjsg/80/shm7zy+daZjpM
+/R581yh2Zs/aTnxeawPHqbZ0LSrL4ze3GrIbh9LvX8or6LBk3BXjmF7PFei9N+O6
++KJr4BBTrLnfhS4kxSHQjzUGrnMednd6xZU8jXPaYWr2/5sV8yRhJ6usmgnLp9zB
+YoHVBO6z6+0LbicETqtM
+=EF1s
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild b/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild
new file mode 100644
index 0000000..cb1c4b6
--- /dev/null
+++ b/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-dialogs/mate-dialogs-1.8.0.ebuild,v 1.4 2014/07/02 09:47:33 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Display MATE dialogs from the commandline and shell scripts"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="libnotify"
+
+RDEPEND="app-text/rarian:0
+ >=dev-libs/glib-2.8:2
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libX11:0
+ virtual/libintl:0
+ libnotify? ( >=x11-libs/libnotify-0.7.0:0 )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ >=mate-base/mate-common-1.8:0
+ >=sys-devel/gettext-0.14:*
+ virtual/pkgconfig:*"
+
+src_configure() {
+ gnome2_src_configure \
+ --with-gtk=2.0 \
+ $(use_enable libnotify)
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
diff --git a/mate-extra/mate-dialogs/metadata.xml b/mate-extra/mate-dialogs/metadata.xml
new file mode 100644
index 0000000..e05b855
--- /dev/null
+++ b/mate-extra/mate-dialogs/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-dialogs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-media/ChangeLog b/mate-extra/mate-media/ChangeLog
new file mode 100644
index 0000000..652a4c9
--- /dev/null
+++ b/mate-extra/mate-media/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for mate-extra/mate-media
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-media/ChangeLog,v 1.8 2014/12/20 17:30:33 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-media-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-media-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-media-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-media-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-media-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-media-1.8.0 (22 Apr 2014)
+
+ 22 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-media-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 22 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-media-1.6.1.ebuild:
+ Added missing rarian depedency.
+
+*mate-media-1.6.1 (22 Mar 2014)
+
+ 22 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-media-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-media, multimedia related programs for the MATE
+ desktop; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
new file mode 100644
index 0000000..5dfcbaf
--- /dev/null
+++ b/mate-extra/mate-media/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-media-1.8.0.tar.xz 939728 SHA256 a264f9afcae7dff50aefb813616857db10ed62ac30c4071e690485ee9c6e5f61 SHA512 c41f35e3827246f16eea8887f9e3226c32dad260af478b8923d9d80ea4b9eb0e6ab87f975e2ad4838bf567494d5c5c1039f325033d5244dd677f73ef00ef865a WHIRLPOOL 771705bebee18c901c0def8bcc3b0a843cace5ce7c88558d8f008c520c46aa695ca6dd1071edbdf9bc7246aa72eb41e5e8c427805806bad7866bfcfc0969bca9
+EBUILD mate-media-1.8.0.ebuild 2615 SHA256 da1abb8c0f2a2d034aadcdf364768441116605567c641ee7a883ac202bfca5bb SHA512 ece904a8e522ce8aaf57b39aa59761eb6b13e761028388065e3fc38bf1b79f89fee2a8028379cbe6ec08d823fdd2989c99025d74f36e98cf5bd40de31a4a466a WHIRLPOOL 701ce00333afe617d32abe00ed35761aa67532963bc11beac4add198c7a78ec54c953dcdc2f95f31181028e19261a03e6cf71390bdedb056d616030fa4283b55
+MISC ChangeLog 1328 SHA256 7392eaf9f6348162f9e6c283bf0b6cdee896a7bbf09a10bf5f0e609424b71ca6 SHA512 d9813df2bbb2249fbf0736d2eb66196ee4668d5dc2175fcc085c5bd26143d8cc35abb2f1e1246856f606181b9619973f9a48e8b08243a120b16df2a68054bd52 WHIRLPOOL 725107d1ad0002f3058d4d94ffef488829550e8b6bd5a4f2aa6bc64a4b5a60fe1e2c41bfb55861ecc84e78bebdf6625db93fc80cc6c37266dd34c72a8e644286
+MISC metadata.xml 341 SHA256 156fb59fd240bd185d43ea6ef1950ca296b4f44a90744c9ca0c318ea0bdbd3bc SHA512 b0abf46c4ca8047fe62288e1a33624edd7c57137edc2c4b8af0e969421cdd89c71f1953a92a7c1c063d12b661a3fb4625258f1dedb14d1f07e5b4527cfc9b586 WHIRLPOOL 77bce3ab987b436945a23da080cc1b149419acf74168c18a0a181b36add4d5b60c18d5598d3f71a7e7ad4b413df7baa5031f90900666594d24a614a2679a4768
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7OJ8P/jkEpkuP9DiKMAGrEavcTYPf
+V5Dh4ip4d/xqVXoEszgfzcz8XiuJ0SzAYpcdl4+FGihXVCvx3qsi9iuQOYGvCxz2
+XsB2+YbGnLiAjMUzADUReDkTAV4773Qc2xeinufvzHhyOKHlKtZzme3fwzwTk+zT
+D5W3kVes+aF1M3+k4Coy3tTDyLCLhKIEyMExvURTA8Br/XmDXL4VUneFMN6CuoYx
+J9w30jzAOJObjRik0vJQG/KfXWX6r3/ywmRWncZGoATOZ0j11HwSNI61r0Sze9VR
+CMI1ttKG2A0aD/Sk8qN/DiAthqOqV8UsDf16hWwAqzTnR/FnnViVph+4yEh2WP/q
+jnYkYMZQy5QZ8lUX04g72Wp9UmVvSV6EO5pzvcPQuvOpgFaC2S3xe8NXtVJd/dxm
+p3dCFPfXsZZt7g6fgzL9UifYe3KA3JGkfAthZPn9FzlPT5tP5VACHyZiWElhtIio
+0h7FdxjRl4Hc7mbLfsSGGPzrPqxu+q9UyNJIUVSnqMX0yJe/RGhjrdlQZIEcxeBm
+vx/bHLVQUZeGiqIpquxV8A1XKm72oraRbxasrx9/x1PNi3T2PTm9CZlkqb2Q3GEl
+QjUBsLXhjlgZi9dvPRA0lKhRIhxTbBshrYxF9TN8e1DRETV3DU06P7C0WIvwt4V1
+QaMvdQWZehRucmfhm8zF
+=GqjM
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-media/mate-media-1.8.0.ebuild b/mate-extra/mate-media/mate-media-1.8.0.ebuild
new file mode 100644
index 0000000..e646b81
--- /dev/null
+++ b/mate-extra/mate-media/mate-media-1.8.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-media/mate-media-1.8.0.ebuild,v 1.4 2014/07/02 09:47:40 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Multimedia related programs for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2 GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="aac flac mp3 pulseaudio speex twolame vorbis"
+
+# FIXME: automagic dev-util/glade:3 support
+COMMON_DEPEND="app-text/rarian:0
+ dev-libs/libxml2:2
+ >=dev-libs/glib-2.18.2:2
+ >=x11-libs/gtk+-2.24:2
+ >=mate-base/mate-panel-1.8:0
+ >=mate-base/mate-desktop-1.8:0
+ >=media-libs/gstreamer-0.10.23:0.10
+ >=media-libs/gst-plugins-base-0.10.23:0.10
+ >=media-libs/gst-plugins-good-0.10:0.10
+ >=media-libs/libcanberra-0.13:0[gtk]
+ >=media-plugins/gst-plugins-meta-0.10-r2:0.10
+ >=media-plugins/gst-plugins-gconf-0.10.1:0.10
+ >=dev-libs/libunique-1:1
+ x11-libs/cairo:0
+ x11-libs/pango:0
+ virtual/libintl:0
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.16:0[glib] )"
+
+# Specific gst plugins are used by the default audio encoding profiles
+RDEPEND="${COMMON_DEPEND}
+ >=media-plugins/gst-plugins-meta-0.10:0.10[flac?,vorbis?]
+ aac? (
+ >=media-plugins/gst-plugins-faac-0.10.23:0.10
+ >=media-plugins/gst-plugins-ffmpeg-0.10:0.10
+ )
+ mp3? (
+ >=media-libs/gst-plugins-ugly-0.10:0.10
+ >=media-plugins/gst-plugins-taglib-0.10.23:0.10
+ >=media-plugins/gst-plugins-lame-0.10:0.10
+ )
+ speex? (
+ >=media-plugins/gst-plugins-ogg-0.10.23:0.10
+ >=media-plugins/gst-plugins-speex-0.10.23:0.10
+ )
+ twolame? (
+ >=media-plugins/gst-plugins-taglib-0.10.23:0.10
+ >=media-plugins/gst-plugins-twolame-0.10:0.10
+ )"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools:0
+ >=app-text/scrollkeeper-dtd-1:1.0
+ >=dev-util/intltool-0.35.0:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ !!<mate-base/mate-applets-1.8:*"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable pulseaudio) \
+ $(use_enable !pulseaudio gstmix) \
+ $(use_enable !pulseaudio gst-mixer-applet)
+}
+
+DOCS="AUTHORS ChangeLog* NEWS README"
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ ewarn
+ ewarn "If you cannot play some music format, please check your"
+ ewarn "USE flags on media-plugins/gst-plugins-meta"
+ ewarn
+
+ if use pulseaudio ; then
+ ewarn "You have enabled pulseaudio support, gstmixer will not be built"
+ ewarn "If you do not use pulseaudio, you do not want this"
+ fi
+}
diff --git a/mate-extra/mate-media/metadata.xml b/mate-extra/mate-media/metadata.xml
new file mode 100644
index 0000000..032165d
--- /dev/null
+++ b/mate-extra/mate-media/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>mate</herd>
+ <use>
+ <flag name="twolame">Bring in twolame gstreamer support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-media</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-polkit/ChangeLog b/mate-extra/mate-polkit/ChangeLog
new file mode 100644
index 0000000..f2e4446
--- /dev/null
+++ b/mate-extra/mate-polkit/ChangeLog
@@ -0,0 +1,44 @@
+# ChangeLog for mate-extra/mate-polkit
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-polkit/ChangeLog,v 1.9 2014/12/20 17:32:01 tamiko Exp $
+
+ 11 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> mate-polkit-1.8.0.ebuild:
+ Finish deprecation of 1.6
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-polkit-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-polkit-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-polkit-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-polkit-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-polkit-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-polkit-1.8.0 (23 Apr 2014)
+
+ 23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-polkit-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-polkit-1.6.1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> mate-polkit-1.6.1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-polkit-1.6.1 (02 Mar 2014)
+
+ 02 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-polkit-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-polkit, a MATE specific DBUS session bus
+ service that is used to bring up authentication dialogs; imported from the
+ mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-polkit/Manifest b/mate-extra/mate-polkit/Manifest
new file mode 100644
index 0000000..75d9590
--- /dev/null
+++ b/mate-extra/mate-polkit/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-polkit-1.8.0.tar.xz 324960 SHA256 bc01640c63f6248497ca78c3d8df8ff608d8bf1fbfce7c11416b014a109aeccd SHA512 6e7324c539f86a906cd192f8e6a17c417717ae80c0b9d8d46907f1e911f364f73933365520469bbed3201287ae897d8055a7fa14b103ade8e6c7cee9e30912cf WHIRLPOOL b3243bd5814e2d156fd85a376294f1c102dd8661e8716e2007291a9513429202b11ff15bbb53a5b33ea5a9cabac559836374778b99627767973f935a05617d6f
+EBUILD mate-polkit-1.8.0.ebuild 1362 SHA256 bc3a0d41be120641ceb1b053168b9f0b0e7aa6044d290f489c96d0d6a24b6a6a SHA512 aa1b4d646b8bd8fc836e3bb6044893ae7abd6952220ca2b803b488a66771d054f6a6177b5ff0c096fd31275614455da0c285451d370ab79bf0f94703f1481f4c WHIRLPOOL 6b63588e6de9958794acb01fdcf043551ead86ce74a7f1ddd390957e5c8d553a5d4874ff3adfc16d9c18b5591a07b3e1fc3b766bd224e03121ab54b4b808e1f9
+MISC ChangeLog 1685 SHA256 f0ea362efeedbd6b58107ea870ce8b150528f6f4945f4c6ffc9ea90dc802a595 SHA512 716b523d5870220bcab73749a80d1949d376ec0656bec2149c4ff40af9072124a0674fd34753b9eac635b323e03b5d434a400caaeee8b2d02b145f8e12d7c54e WHIRLPOOL 277cc5279c4fa385af5d2e68e5ea794d71a11bccb9e27609201ad7075b039e461452b283cefe7f23bb0ee0ea7ec82757a9acf84290e4ba932734cfe3ba7fcf67
+MISC metadata.xml 262 SHA256 e519aee5184522216acb477db86e0b1472433dee5c0eb99038fbbb970f4bb443 SHA512 24f3ec0210198272a574326aae569913021dfe75176a5361c155b8a132f09d2d2b8071542fc8dca3e18636c3ff58f53f5f8a1978b3ecf31b33ddd270db2ac674 WHIRLPOOL 03a1da40e546707b61833f6cd2d744a500e9dab8fe08ef0f032b652f47d1de88a9888fd25b90dab1fb0222b90bb06d9182e384daa564b9a6caa9be74c7cdaf77
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVoZLTAAoJEBzZQR2yrxj79XwP/j3zW7aea2Yt45txyvaWaSOz
+5bxmedU783bnyADSLvrmy6HCrmo9IOERgxvvpLVOZNhYERuK+053uZyXVGNRElKI
++nOX9zNh3VNFY9kOiCP+OzAXmxs57CuhjJ33e9juQffmDWYwLG4GKeA6GlubRjdN
+8tisgRpDlc2ca3dmScTKfo0nBcidXeOPeodDhwwH0xpmJpaM4JzGEHQxa0UjS/AQ
+yWQs1G2JuuAIIQUgI0/Eq3QS0wCA9H/x7tMF7erVf4GCg57/N9PM9sxerBA7wVvb
+1bwf/Q58VeB6ZIJDik/FRWELLMcoop6vR393kMJI3YEP3PjqYJtgx9UiHDQ+OoyH
+NCoAPE2GXgWuKfXIB8Y9vNhIi1+rD839aQP7hLldhMPKYuvkhTxAT3CKjM84Q490
+rfaIil1zcOxx+9BFbDEeDnFl1W1bOFr+A7PV3Z/vnUEOj40IsWE5uQ9mMkSOSA0Z
+Lcdl0Dp34RqoK7reEB8YkSEo2uAe7I+6ITY2wq1/hf0j3zKmyg32xD5bHLllshdf
+yFX31J8zbFV3IqhZ08vDpsRh6XLJp1YXgS0ZnhHdTZC43j4JxxTKIdsYLtwjMdrn
+EPDdQHD8eGqUsmkpcVL8gm4EaKzARbT2ia86UwnFvy7H1DzPmMteo6FdxAm6R6uH
+T0i0sDJzlp0uK818qhkr
+=+tOa
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild b/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild
new file mode 100644
index 0000000..fa8e869
--- /dev/null
+++ b/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-polkit/mate-polkit-1.8.0.ebuild,v 1.4 2014/07/02 09:47:46 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A MATE specific DBUS session bus service that is used to bring up authentication dialogs"
+HOMEPAGE="https://github.com/mate-desktop/mate-polkit"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="+introspection"
+
+RDEPEND=">=dev-libs/glib-2.28:2
+ >=sys-auth/polkit-0.102:0[introspection?]
+ >=x11-libs/gtk+-2.24:2[introspection?]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ virtual/libintl:0
+ introspection? ( >=dev-libs/gobject-introspection-0.6.2:0 )"
+
+# We call gtkdocize so we need to depend on gtk-doc.
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-1.3:0
+ >=dev-util/intltool-0.35:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ !<gnome-extra/polkit-gnome-0.102:0"
+
+# Entropy PMS specific. This way we can install the pkg into the build chroots.
+ENTROPY_RDEPEND="!lxde-base/lxpolkit"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection)
+}
+
+DOCS="AUTHORS HACKING NEWS README"
diff --git a/mate-extra/mate-polkit/metadata.xml b/mate-extra/mate-polkit/metadata.xml
new file mode 100644
index 0000000..98365c2
--- /dev/null
+++ b/mate-extra/mate-polkit/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-polkit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-power-manager/ChangeLog b/mate-extra/mate-power-manager/ChangeLog
new file mode 100644
index 0000000..063a67b
--- /dev/null
+++ b/mate-extra/mate-power-manager/ChangeLog
@@ -0,0 +1,88 @@
+# ChangeLog for mate-extra/mate-power-manager
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/ChangeLog,v 1.16 2014/12/20 17:34:03 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-power-manager-1.6.3.ebuild:
+ drop old
+
+*mate-power-manager-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-power-manager-1.8.1.ebuild:
+ version bump; fix libgnome-keyring dependency wrt bug #522798; fix subslot
+ dependency wrt bug #523826; fix unique configuration wrt bug #514176
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ -mate-power-manager-1.8.0.ebuild:
+ old
+
+ 19 Sep 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-power-manager-1.6.3.ebuild:
+ Remove dependency of <sys-power/upower-0.99 from || ( ) construct.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-power-manager-1.8.0-r1.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-power-manager-1.8.0-r1.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-power-manager-1.8.0-r1.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 01 Jun 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-power-manager-1.8.0-r1.ebuild:
+ -r1 is compatible with upower-1
+
+ 31 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-power-manager-1.6.3.ebuild,
+ mate-power-manager-1.8.0-r1.ebuild, mate-power-manager-1.8.0.ebuild:
+ Fix up upower dependency, due to the 0.9 -> 0.99 bump; with help from
+ ssuominen.
+
+*mate-power-manager-1.8.0-r1 (06 May 2014)
+
+ 06 May 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch, +files/mat
+ e-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch,
+ +files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch, +files/mate-
+ power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch,
+ +files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch,
+ +files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch,
+ +mate-power-manager-1.8.0-r1.ebuild:
+ Revision bump, backported and/or upstreamed patches; imported from the mate-
+ overlay, by infirit.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-power-manager-1.6.3.ebuild:
+ Stable for amd64, wrt bug #509268
+
+ 23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> mate-power-manager-1.8.0.ebuild:
+ Removed autotools inherit to make repoman happy.
+
+*mate-power-manager-1.8.0 (23 Apr 2014)
+
+ 23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-power-manager-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-power-manager-1.6.3.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-power-manager-1.6.3.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext and intltool. Remove
+ bogus sys-libs/glibc dependency.
+
+*mate-power-manager-1.6.3 (09 Mar 2014)
+
+ 09 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-power-manager-1.6-libsecret.patch,
+ +mate-power-manager-1.6.3.ebuild, +metadata.xml:
+ New ebuild for mate-extra/mate-power-manager, a session daemon for MATE that
+ makes it easy to manage your laptop or desktop system; imported from the mate-
+ overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
new file mode 100644
index 0000000..bf12d4e
--- /dev/null
+++ b/mate-extra/mate-power-manager/Manifest
@@ -0,0 +1,11 @@
+AUX mate-power-manager-1.6-libsecret.patch 5563 SHA256 58b16367b2c9accb51a582a506a062615bc3f4acce5b0975537c2934d78df5b1 SHA512 96bca058d5b1cf1dba3453096bc0899bfd5459bbe141e15cff769ee352d629cceeaf9a0467022601e4127f753412eda0feed36e1f6302f9b166077b239307e28 WHIRLPOOL 4e3314f02e88f961feb029a4d1663257deaca88cee098f9174c91c531e60a38edab0302d996fee6ac7d0c430835656c299fe5289d2b1df14190743a1f428e1e2
+AUX mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch 588 SHA256 dd6c00f1fb55aaf028c3aac812c0091975a36a1c7c71a2fca27888e37a57b406 SHA512 3ae07dc504fa8251f2fe33ade563ca8073664240c0c9ec84726094477f9cd9c9e27be01f10484442ca7ddd507889c8252f9445702b7163ef7874d5a7a5003551 WHIRLPOOL fb0c1b6a07c85c1b43517f462e0dee6e7ed25c9084809d69b8dabbcf4880fd4a03471bbb3933dd2260952a527d138194daf60e2ba23742ccc51217cf4767d686
+AUX mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch 6642 SHA256 bdee76c39f9b3a8363494f9475dc398587133f85bdad3d544ecb63e2e5f67dbf SHA512 8ab9606de1ff0f763c11954f2c0ad43e920fb4dee2964eea188e83a27186d1e2e7cf3422fbe106f54049ec3fee867980258c03f20de43427df6a82efed1a2632 WHIRLPOOL 1ffd8164e990e943f18ecbc2758b36f0609c7cca816d3bab849d05998df1dd4301dc1280cbf89a2a15f88db4cae38160aace257fc707e984b85dc288970d6be0
+AUX mate-power-manager-1.8.0-r1-improve-UPower1-support.patch 3627 SHA256 ad4648ef22c73ac9eedad6ed6513d11e718309d6f0431593469c577f81663e31 SHA512 13e7add5f61fca590ee2268aed82920c0e0c5441c64b2fba90a71848fd97b3096ffabb348e87a5284e5ddda68cd71c1d4f59b44e636aa482ec0851ef293cdb69 WHIRLPOOL f3c8f298add9517ef64203dfd6f7712931fb6290e2378882c88cd5b6d2b094f1ac2094a575004c1c4d1887005ff5c33be70a1dca801ed4f0f1e3ba9405c59190
+AUX mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch 7041 SHA256 31643f4258b1764cfe2291a20af2b5f46840a2f9f6efb175d26b11df094e8d2d SHA512 76ca9d7a7474deeab40780726b8ba451cf823a896943bcdbc447834187560cc9125723258cb2b9d7a375a1ffc2eb798c1d4401265d851dbb780ee017fb116ceb WHIRLPOOL a19a20368c47e2c8a2f335b2a63ea1e48afe4926bc2b8441ebc720212329670c8d5a773c6d188afe181bb4335bdac6011daebff7d6d2de814f6addf33d3b16c1
+AUX mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch 12875 SHA256 8171d8e38e4ecd10a63af5b9765208f6db92451132ebc436a7567959506c126f SHA512 a2bc47142c024804638f916788f006edd4fb575c6e1a39a76dbae4c6e0455ab8f23170167296ca3b3aca9a9617665c9800e048ae668cec0600ab9080b47107f9 WHIRLPOOL 1b3bfd608e6d5de7f9d265bbff2be7564bf373241c5d9d5b445d3dbd0e432c4b08898e8c3feda18c19c0d9e4404c52b612e74d78517ec82771f8341f28059bf6
+AUX mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch 9292 SHA256 c20e8b1274f7779b559179eceba9cc4c16eee2f903e44338d8e9891d6ac87007 SHA512 53872f88bf882cafa9dd6f91d2fb9923940d8a23e95577dacf4d7fdf299c8a1ccc7f9e0add802f22f5134d24e84e71d47b847b1e2aa6a26502b31fcaf680a503 WHIRLPOOL e6b641e787f42d8b4050b7e6d93ae40f80487d240fe19bd93e3cd2225fae4e868e1d9924ed34c58ec703964daf4050d3c9c6bf38f3a67602e0f450053dd5412e
+DIST mate-power-manager-1.8.1.tar.xz 3341892 SHA256 6fa72d4e6a018a44144d06b68c8f67e067e3847ad83b4b8a8aaa0e2a8c9b6147 SHA512 1715d4f5515245d1fb4543dcce60b1f391ddf78bca50b28fd9097330ea42080873b0bf956a7510adc153679da239092035c62969e2f2afc4a635335ffcb714b7 WHIRLPOOL a6ef0581e13d0414b52f4efd3d9e60ca97a885639d3288ff00d1382d5b1bb6d9b04590ad92912a0123ea248f7d6f138dc680bc9d83087f99d4361d2ede10ec20
+EBUILD mate-power-manager-1.8.1.ebuild 2492 SHA256 561b725ec76c345f897a6132cb3cda91f64fbe1ced35965d37d1afe79234fddc SHA512 d086365206427b8cc983dacd22d788599e32aca9553d553022557199cb0aaea696dd0a3d9daf24afd7a46931ca06afdadde8930dd6f465fc6c867ccf9da53247 WHIRLPOOL 28ef07e2197b3680a1300943c10ace4d4db981b147095e9969a9309b15c8190d5ffc80f0b20513db85f94f153a202b5e3f58b5cf3ae568774b2896cc7a427725
+MISC ChangeLog 3459 SHA256 e0eb8cbc835b44818fde0f74bd20da696760877e3f8c0f32adcae09269ac55f7 SHA512 5af72b4585e4072eb79cc64bbc489eac30427cfb30a085a222a7a9f1e8de4826b068c6a080c211f74d85e5da89d08e52ecec3e7f296fd98e3d615ec5a1ac63e8 WHIRLPOOL 1d20d5cfc8262ddd1a222aa74230e4c84f6ad2c27cf26ae6256aa7ad6addd5bf4ef0d4b9a3d705cb77b24bd85a180d3af0f8e0cf8981b0eea9678fdbccd98237
+MISC metadata.xml 507 SHA256 09fa6b61e393e6cf01fd7285574554d21f3c873b114f495ae6bcc30a0d36f3cb SHA512 fa6565dea69221c6fc48cc024af8ef303450c483f5f00283da84d02b1d9f7f9959024fbf0d808d3f479615e64d1169cdfc1589f17c6e146d709b46048e7d3037 WHIRLPOOL e8c6a0a7595a1277f19777dc1f9d9f74157f40f6ee8c490375ce4e9f8c46a5496666ba484204eb539a680ab907755f2661e463d2a7d6f5cfc795e00ddf0a31b5
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch
new file mode 100644
index 0000000..b36ce4e
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.6-libsecret.patch
@@ -0,0 +1,144 @@
+diff --git a/README b/README
+index 77e1213..3f6a122 100644
+--- a/README
++++ b/README
+@@ -15,7 +15,7 @@ To build, MATE Power Manager requires
+
+ - Glib (2.13.0 or later)
+ - Gtk2+ (2.11.0 or later)
+- - MATE Keyring (1.1.0 or later)
++ - GNOME Keyring (3.0.0 or later)
+ - DBus (0.70 or later)
+ - libnotify (0.7.0 or later)
+ - Cairo (1.0.0 or later)
+diff --git a/configure.ac b/configure.ac
+index 89309ff..912c362 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -102,7 +102,7 @@ GLIB_REQUIRED=2.13.0
+ GIO_REQUIRED=2.25.0
+ GTK_REQUIRED=2.17.7
+ GDK_REQUIRED=2.11.0
+-MATE_KEYRING_REQUIRED=1.1.0
++GNOME_KEYRING_REQUIRED=3.0.0
+ DBUS_REQUIRED=1.0
+ DBUS_GLIB_REQUIRED=0.70
+ LIBNOTIFY_REQUIRED=0.7.0
+@@ -249,18 +249,18 @@ fi
+ AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes])
+
+ dnl ---------------------------------------------------------------------------
+-dnl - Build mate-keyring support
++dnl - Build gnome-keyring support
+ dnl ---------------------------------------------------------------------------
+ AC_ARG_WITH(keyring,
+ [AS_HELP_STRING([--without-keyring],
+- [Disable the use of mate-keyring])],
++ [Disable the use of gnome-keyring])],
+ [],
+ [with_keyring=yes])
+
+ AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
+
+ if test "$with_keyring" = "yes"; then
+- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
++ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
+ AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
+ fi
+
+@@ -393,7 +393,7 @@ echo "
+ datadir: ${datadir}
+ compiler: ${CC}
+ cflags: ${CFLAGS}
+- mate-keyring support: ${with_keyring}
++ gnome-keyring support: ${with_keyring}
+ Building extra applets: ${enable_applets}
+ Self test support: ${have_tests}
+ Use libunique: ${enable_libunique}
+diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
+index dcd2cd4..adecce0 100644
+--- a/data/org.mate.power-manager.gschema.xml.in
++++ b/data/org.mate.power-manager.gschema.xml.in
+@@ -183,13 +183,13 @@
+ </key>
+ <key name="lock-keyring-suspend" type="b">
+ <default>false</default>
+- <_summary>Lock MATE keyring on sleep</_summary>
+- <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
++ <_summary>Lock GNOME keyring on sleep</_summary>
++ <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
+ </key>
+ <key name="lock-keyring-hibernate" type="b">
+ <default>true</default>
+- <_summary>Lock MATE keyring on sleep</_summary>
+- <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
++ <_summary>Lock GNOME keyring on sleep</_summary>
++ <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
+ </key>
+ <key name="spindown-enable-ac" type="b">
+ <default>false</default>
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index cb84814..8253336 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -42,7 +42,7 @@
+ #include <libupower-glib/upower.h>
+
+ #ifdef WITH_KEYRING
+-#include <mate-keyring.h>
++#include <gnome-keyring.h>
+ #endif /* WITH_KEYRING */
+
+ #include "egg-debug.h"
+@@ -212,8 +212,8 @@ enum {
+ GpmScreensaver *screensaver;
+ guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
+- gboolean lock_mate_keyring;
+- MateKeyringResult keyres;
++ gboolean lock_gnome_keyring;
++ GnomeKeyringResult keyres;
+ #endif /* WITH_KEYRING */
+
+ GError *dbus_error = NULL;
+@@ -234,10 +234,10 @@ enum {
+
+ #ifdef WITH_KEYRING
+ /* we should perhaps lock keyrings when sleeping #375681 */
+- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
+- if (lock_mate_keyring) {
+- keyres = mate_keyring_lock_all_sync ();
+- if (keyres != MATE_KEYRING_RESULT_OK)
++ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
++ if (lock_gnome_keyring) {
++ keyres = gnome_keyring_lock_all_sync ();
++ if (keyres != GNOME_KEYRING_RESULT_OK)
+ egg_warning ("could not lock keyring");
+ }
+ #endif /* WITH_KEYRING */
+@@ -323,8 +323,8 @@ enum {
+ GpmScreensaver *screensaver;
+ guint32 throttle_cookie = 0;
+ #ifdef WITH_KEYRING
+- gboolean lock_mate_keyring;
+- MateKeyringResult keyres;
++ gboolean lock_gnome_keyring;
++ GnomeKeyringResult keyres;
+ #endif /* WITH_KEYRING */
+
+ GError *dbus_error = NULL;
+@@ -345,10 +345,10 @@ enum {
+
+ #ifdef WITH_KEYRING
+ /* we should perhaps lock keyrings when sleeping #375681 */
+- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
+- if (lock_mate_keyring) {
+- keyres = mate_keyring_lock_all_sync ();
+- if (keyres != MATE_KEYRING_RESULT_OK) {
++ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
++ if (lock_gnome_keyring) {
++ keyres = gnome_keyring_lock_all_sync ();
++ if (keyres != GNOME_KEYRING_RESULT_OK) {
+ egg_warning ("could not lock keyring");
+ }
+ }
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch
new file mode 100644
index 0000000..9bccb5c
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-avoid-levels-is-0-warning.patch
@@ -0,0 +1,15 @@
+diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
+index 0ac6801..a439e94 100644
+--- a/src/gpm-kbd-backlight.c
++++ b/src/gpm-kbd-backlight.c
+@@ -113,6 +113,9 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight,
+ guint goal;
+
+ g_return_val_if_fail (GPM_IS_KBD_BACKLIGHT (backlight), FALSE);
++ /* avoid warnings if no keyboard brightness is available */
++ if (backlight->priv->max_brightness < 1)
++ return FALSE;
+ /* if we're setting the same we are, don't bother */
+ //g_return_val_if_fail (backlight->priv->brightness_percent != percentage, FALSE);
+
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch
new file mode 100644
index 0000000..689192f
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch
@@ -0,0 +1,160 @@
+diff -uprN mate-power-manager-orig/src/gpm-common.h mate-power-manager/src/gpm-common.h
+--- mate-power-manager-orig/src/gpm-common.h 2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-common.h 2013-10-13 19:54:10.649901214 +0200
+@@ -33,6 +33,7 @@ G_BEGIN_DECLS
+ #define GPM_DBUS_SERVICE "org.mate.PowerManager"
+ #define GPM_DBUS_INTERFACE "org.mate.PowerManager"
+ #define GPM_DBUS_INTERFACE_BACKLIGHT "org.mate.PowerManager.Backlight"
++#define GPM_DBUS_INTERFACE_KBD_BACKLIGHT "org.mate.PowerManager.KbdBacklight"
+ #define GPM_DBUS_PATH "/org/mate/PowerManager"
+ #define GPM_DBUS_PATH_BACKLIGHT "/org/mate/PowerManager/Backlight"
+ #define GPM_DBUS_PATH_KBD_BACKLIGHT "/org/mate/PowerManager/KbdBacklight"
+diff -uprN mate-power-manager-orig/src/gpm-kbd-backlight.c mate-power-manager/src/gpm-kbd-backlight.c
+--- mate-power-manager-orig/src/gpm-kbd-backlight.c 2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-kbd-backlight.c 2013-10-13 19:58:07.154258855 +0200
+@@ -31,21 +31,6 @@
+ #include "gpm-kbd-backlight.h"
+ #include "gsd-media-keys-window.h"
+
+-static const gchar *kbd_backlight_introspection = ""
+-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">"
+- "<interface name=\"org.mate.PowerManager.Backlight\">"
+- "<method name=\"GetBrightness\">"
+- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
+- "</method>"
+- "<method name=\"SetBrightness\">"
+- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"in\"/>"
+- "</method>"
+- "<signal name=\"BrightnessChanged\">"
+- "<arg type=\"u\" name=\"percentage_brightness\" direction=\"out\"/>"
+- "</signal>"
+- "</interface>"
+-"</node>";
+-
+ #define GPM_KBD_BACKLIGHT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_KBD_BACKLIGHT, GpmKbdBacklightPrivate))
+
+ struct GpmKbdBacklightPrivate
+@@ -430,40 +415,6 @@ gpm_kbd_backlight_dbus_property_set (GDB
+ return FALSE;
+ }
+
+-/**
+- * gpm_kbd_backlight_register_dbus:
+- * @backlight:
+- * @connection:
+- * @error:
+- **/
+-void
+-gpm_kbd_backlight_register_dbus (GpmKbdBacklight *backlight,
+- GDBusConnection *connection,
+- GError **error)
+-{
+- GDBusNodeInfo *node_info;
+- GDBusInterfaceInfo *interface_info;
+- GDBusInterfaceVTable interface_vtable = {
+- gpm_kbd_backlight_dbus_method_call,
+- gpm_kbd_backlight_dbus_property_get,
+- gpm_kbd_backlight_dbus_property_set
+- };
+-
+- node_info = g_dbus_node_info_new_for_xml (kbd_backlight_introspection, NULL);
+- interface_info = g_dbus_node_info_lookup_interface (node_info, GPM_DBUS_INTERFACE_BACKLIGHT);
+-
+- backlight->priv->bus_connection = g_object_ref (connection);
+- backlight->priv->bus_object_id =
+- g_dbus_connection_register_object (connection,
+- GPM_DBUS_PATH_KBD_BACKLIGHT,
+- interface_info,
+- &interface_vtable,
+- backlight,
+- NULL,
+- error);
+- g_dbus_node_info_unref (node_info);
+-}
+-
+ static gboolean
+ gpm_kbd_backlight_evaluate_power_source_and_set (GpmKbdBacklight *backlight)
+ {
+diff -uprN mate-power-manager-orig/src/gpm-manager.c mate-power-manager/src/gpm-manager.c
+--- mate-power-manager-orig/src/gpm-manager.c 2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/gpm-manager.c 2013-10-13 20:05:11.449488592 +0200
+@@ -63,6 +63,7 @@
+ #include "gpm-disks.h"
+
+ #include "org.mate.PowerManager.Backlight.h"
++#include "org.mate.PowerManager.KbdBacklight.h"
+
+ static void gpm_manager_finalize (GObject *object);
+
+@@ -1986,12 +1987,13 @@ gpm_manager_init (GpmManager *manager)
+ G_OBJECT (manager->priv->backlight));
+ }
+
+- manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
+- if (manager->priv->kbd_backlight != NULL) {
+- gpm_kbd_backlight_register_dbus (manager->priv->kbd_backlight,
+- g_connection,
+- NULL);
+- }
++ manager->priv->kbd_backlight = gpm_kbd_backlight_new ();
++ if (manager->priv->kbd_backlight != NULL) {
++ dbus_g_object_type_install_info (GPM_TYPE_KBD_BACKLIGHT,
++ &dbus_glib_gpm_kbd_backlight_object_info);
++ dbus_g_connection_register_g_object (connection, GPM_DBUS_PATH_KBD_BACKLIGHT,
++ G_OBJECT (manager->priv->kbd_backlight));
++ }
+
+ manager->priv->idle = gpm_idle_new ();
+ g_signal_connect (manager->priv->idle, "idle-changed",
+diff -uprN mate-power-manager-orig/src/Makefile.am mate-power-manager/src/Makefile.am
+--- mate-power-manager-orig/src/Makefile.am 2013-10-03 13:56:55.000000000 +0200
++++ mate-power-manager/src/Makefile.am 2013-10-13 20:10:17.374533688 +0200
+@@ -6,6 +6,7 @@ NULL =
+ EXTRA_DIST = \
+ org.mate.PowerManager.xml \
+ org.mate.PowerManager.Backlight.xml \
++ org.mate.PowerManager.KbdBacklight.xml \
+ gpm-marshal.list \
+ $(NULL)
+
+@@ -270,6 +271,7 @@ endif
+ BUILT_SOURCES = \
+ org.mate.PowerManager.h \
+ org.mate.PowerManager.Backlight.h \
++ org.mate.PowerManager.KbdBacklight.h \
+ gpm-marshal.c \
+ gpm-marshal.h \
+ $(NULL)
+@@ -295,6 +297,13 @@ org.mate.PowerManager.Backlight.h: org.m
+ --output=org.mate.PowerManager.Backlight.h \
+ $(srcdir)/org.mate.PowerManager.Backlight.xml
+
++org.mate.PowerManager.KbdBacklight.h: org.mate.PowerManager.KbdBacklight.xml
++ libtool --mode=execute dbus-binding-tool \
++ --prefix=gpm_kbd_backlight \
++ --mode=glib-server \
++ --output=org.mate.PowerManager.KbdBacklight.h \
++ $(srcdir)/org.mate.PowerManager.KbdBacklight.xml
++
+ clean-local:
+ rm -f *~
+ rm -f gpm-marshal.c gpm-marshal.h
+diff -uprN mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml
+--- mate-power-manager-orig/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:12:11.556667787 +0200
++++ mate-power-manager/src/org.mate.PowerManager.KbdBacklight.xml 2013-10-13 20:11:45.972413654 +0200
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<node name="/">
++ <interface name="org.mate.PowerManager.KbdBacklight">
++ <method name="GetBrightness">
++ <arg type="u" name="percentage_brightness" direction="out"/>
++ </method>
++ <method name="SetBrightness">
++ <arg type="u" name="percentage_brightness" direction="in"/>
++ </method>
++ <signal name="BrightnessChanged">
++ <arg type="u" name="percentage_brightness" direction="out"/>
++ </signal>
++ </interface>
++</node>
++
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch
new file mode 100644
index 0000000..d3e9d85
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-improve-UPower1-support.patch
@@ -0,0 +1,102 @@
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index e6c6bf2..fe458e3 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -82,6 +82,9 @@ G_DEFINE_TYPE (GpmEngine, gpm_engine, G_TYPE_OBJECT)
+
+ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device);
+ static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device);
++#if UP_CHECK_VERSION (0, 99, 0)
++static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine);
++#endif
+
+ typedef enum {
+ GPM_ENGINE_WARNING_NONE = 0,
+@@ -757,6 +760,13 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ g_object_get (composite, "state", &state, NULL);
+ g_object_set_data (G_OBJECT(composite), "engine-state-old", GUINT_TO_POINTER(state));
+ }
++
++#if UP_CHECK_VERSION (0, 99, 0)
++ if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER)
++ return;
++ g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#endif
++
+ }
+
+ /**
+@@ -851,19 +861,20 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ **/
+ static void
+ #if UP_CHECK_VERSION(0, 99, 0)
+-gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine)
+-{
+- gpm_engine_recalculate_state (engine);
+-}
++gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine)
+ #else
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
++#endif
+ {
++#if !UP_CHECK_VERSION(0, 99, 0)
+ UpDeviceKind kind;
++#endif
+ UpDeviceState state;
+ UpDeviceState state_old;
+ GpmEngineWarning warning_old;
+ GpmEngineWarning warning;
+
++#if !UP_CHECK_VERSION(0, 99, 0)
+ /* get device properties */
+ g_object_get (device,
+ "kind", &kind,
+@@ -874,6 +885,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ egg_debug ("updating because %s changed", up_device_get_object_path (device));
+ device = gpm_engine_update_composite_device (engine, device);
+ }
++#endif
+
+ /* get device properties (may be composite) */
+ g_object_get (device,
+@@ -917,7 +929,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+
+ gpm_engine_recalculate_state (engine);
+ }
+-#endif
+
+ /**
+ * gpm_engine_get_devices:
+@@ -1042,10 +1053,7 @@ gpm_engine_init (GpmEngine *engine)
+ G_CALLBACK (gpm_engine_device_added_cb), engine);
+ g_signal_connect (engine->priv->client, "device-removed",
+ G_CALLBACK (gpm_engine_device_removed_cb), engine);
+-#if UP_CHECK_VERSION(0, 99, 0)
+- g_signal_connect (engine->priv->client, "notify",
+- G_CALLBACK (gpm_engine_device_changed_cb), engine);
+-#else
++#if !UP_CHECK_VERSION(0, 99, 0)
+ g_signal_connect (engine->priv->client, "device-changed",
+ G_CALLBACK (gpm_engine_device_changed_cb), engine);
+ #endif
+@@ -1075,6 +1083,11 @@ gpm_engine_init (GpmEngine *engine)
+ #endif
+
+ /* create a fake virtual composite battery */
++#if UP_CHECK_VERSION(0, 99, 0)
++ engine->priv->battery_composite = up_client_get_display_device (engine->priv->client);
++ g_signal_connect (engine->priv->client, "notify",
++ G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#else
+ engine->priv->battery_composite = up_device_new ();
+ g_object_set (engine->priv->battery_composite,
+ "kind", UP_DEVICE_KIND_BATTERY,
+@@ -1083,6 +1096,7 @@ gpm_engine_init (GpmEngine *engine)
+ "power-supply", TRUE,
+ "is-present", TRUE,
+ NULL);
++#endif
+
+ engine->priv->previous_icon = NULL;
+ engine->priv->previous_summary = NULL;
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch
new file mode 100644
index 0000000..8344729
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-other-round-of-fixes-for-UPower-0.99-API-changes.patch
@@ -0,0 +1,217 @@
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index fe458e3..56d19e2 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -84,7 +84,29 @@ static UpDevice *gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *o
+ static UpDevice *gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device);
+ #if UP_CHECK_VERSION (0, 99, 0)
+ static void gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *engine);
+-#endif
++
++#define GPM_ENGINE_WARNING_NONE UP_DEVICE_LEVEL_NONE
++#define GPM_ENGINE_WARNING_DISCHARGING UP_DEVICE_LEVEL_DISCHARGING
++#define GPM_ENGINE_WARNING_LOW UP_DEVICE_LEVEL_LOW
++#define GPM_ENGINE_WARNING_CRITICAL UP_DEVICE_LEVEL_CRITICAL
++#define GPM_ENGINE_WARNING_ACTION UP_DEVICE_LEVEL_ACTION
++
++/**
++ * gpm_engine_get_warning:
++ *
++ * This gets the possible engine state for the device according to the
++ * policy, which could be per-percent, or per-time.
++ *
++ * Return value: A GpmEngine state, e.g. GPM_ENGINE_WARNING_DISCHARGING
++ **/
++static UpDeviceLevel
++gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
++{
++ UpDeviceLevel warning;
++ g_object_get (device, "warning-level", &warning, NULL);
++ return warning;
++}
++#else
+
+ typedef enum {
+ GPM_ENGINE_WARNING_NONE = 0,
+@@ -226,6 +248,7 @@ gpm_engine_get_warning (GpmEngine *engine, UpDevice *device)
+ out:
+ return warning_type;
+ }
++#endif
+
+ /**
+ * gpm_engine_get_summary:
+@@ -282,12 +305,20 @@ gpm_engine_get_summary (GpmEngine *engine)
+ * Returns the icon
+ **/
+ static gchar *
++#if UP_CHECK_VERSION (0, 99, 0)
++gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, UpDeviceLevel warning, gboolean use_state)
++#else
+ gpm_engine_get_icon_priv (GpmEngine *engine, UpDeviceKind device_kind, GpmEngineWarning warning, gboolean use_state)
++#endif
+ {
+ guint i;
+ GPtrArray *array;
+ UpDevice *device;
++#if UP_CHECK_VERSION (0, 99, 0)
++ UpDeviceLevel warning_temp;
++#else
+ GpmEngineWarning warning_temp;
++#endif
+ UpDeviceKind kind;
+ UpDeviceState state;
+ gboolean is_present;
+@@ -572,6 +603,9 @@ gpm_engine_device_check_capacity (GpmEngine *engine, UpDevice *device)
+ static UpDevice *
+ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++ return engine->priv->battery_composite;
++#else
+ guint battery_devices = 0;
+ GPtrArray *array;
+ UpDevice *device;
+@@ -601,6 +635,7 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ out:
+ /* return composite device or original device */
+ return device;
++#endif
+ }
+
+ /**
+@@ -609,6 +644,18 @@ gpm_engine_get_composite_device (GpmEngine *engine, UpDevice *original_device)
+ static UpDevice *
+ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++ gchar *text;
++
++ text = up_device_to_text (engine->priv->battery_composite);
++ egg_debug ("composite:\n%s", text);
++ g_free (text);
++
++ /* force update of icon */
++ gpm_engine_recalculate_state_icon (engine);
++
++ return engine->priv->battery_composite;
++#else
+ guint i;
+ gdouble percentage = 0.0;
+ gdouble energy = 0.0;
+@@ -720,6 +767,7 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device
+ out:
+ /* return composite device or original device */
+ return device;
++#endif
+ }
+
+ /**
+@@ -728,7 +776,11 @@ gpm_engine_update_composite_device (GpmEngine *engine, UpDevice *original_device
+ static void
+ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++ UpDeviceLevel warning;
++#else
+ GpmEngineWarning warning;
++#endif
+ UpDeviceState state;
+ UpDeviceKind kind;
+ UpDevice *composite;
+@@ -762,9 +814,9 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ }
+
+ #if UP_CHECK_VERSION (0, 99, 0)
+- if (kind == UP_DEVICE_KIND_BATTERY || kind == UP_DEVICE_KIND_UPS || kind == UP_DEVICE_KIND_LINE_POWER)
+- return;
+ g_signal_connect (device, "notify", G_CALLBACK (gpm_engine_device_changed_cb), engine);
++ g_ptr_array_add (engine->priv->array, g_object_ref (device));
++ gpm_engine_recalculate_state (engine);
+ #endif
+
+ }
+@@ -820,10 +872,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ static void
+ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
++#if UP_CHECK_VERSION (0, 99, 0)
++ gpm_engine_device_add (engine, device);
++#else
+ /* add to list */
+ g_ptr_array_add (engine->priv->array, g_object_ref (device));
+
+ gpm_engine_recalculate_state (engine);
++#endif
+ }
+
+ /**
+@@ -866,15 +922,17 @@ gpm_engine_device_changed_cb (UpDevice *device, GParamSpec *pspec, GpmEngine *en
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ #endif
+ {
+-#if !UP_CHECK_VERSION(0, 99, 0)
+ UpDeviceKind kind;
+-#endif
+ UpDeviceState state;
+ UpDeviceState state_old;
++#if UP_CHECK_VERSION(0, 99, 0)
++ UpDeviceLevel warning_old;
++ UpDeviceLevel warning;
++#else
+ GpmEngineWarning warning_old;
+ GpmEngineWarning warning;
++#endif
+
+-#if !UP_CHECK_VERSION(0, 99, 0)
+ /* get device properties */
+ g_object_get (device,
+ "kind", &kind,
+@@ -885,7 +943,6 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ egg_debug ("updating because %s changed", up_device_get_object_path (device));
+ device = gpm_engine_update_composite_device (engine, device);
+ }
+-#endif
+
+ /* get device properties (may be composite) */
+ g_object_get (device,
+@@ -1070,22 +1127,10 @@ gpm_engine_init (GpmEngine *engine)
+ g_signal_connect (engine->priv->phone, "device-refresh",
+ G_CALLBACK (phone_device_refresh_cb), engine);
+
+-#if UP_CHECK_VERSION(0, 99, 0)
+- /* coldplug */
+- array = up_client_get_devices(engine->priv->client);
+- if (array) {
+- for (i = 0; i < array->len; i++) {
+- UpDevice *device = g_ptr_array_index (array, i);
+- gpm_engine_device_added_cb(engine->priv->client, device, engine);
+- }
+- g_ptr_array_free (array, TRUE);
+- }
+-#endif
+-
+ /* create a fake virtual composite battery */
+ #if UP_CHECK_VERSION(0, 99, 0)
+ engine->priv->battery_composite = up_client_get_display_device (engine->priv->client);
+- g_signal_connect (engine->priv->client, "notify",
++ g_signal_connect (engine->priv->battery_composite, "notify",
+ G_CALLBACK (gpm_engine_device_changed_cb), engine);
+ #else
+ engine->priv->battery_composite = up_device_new ();
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index df84cac..09bd0c0 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -1858,7 +1858,9 @@ gpm_manager_init (GpmManager *manager)
+ G_CALLBACK (gpm_manager_settings_changed_cb), manager);
+ manager->priv->client = up_client_new ();
+ #if UP_CHECK_VERSION(0, 99, 0)
+- g_signal_connect (manager->priv->client, "notify",
++ g_signal_connect (manager->priv->client, "notify::lid-is-closed",
++ G_CALLBACK (gpm_manager_client_changed_cb), manager);
++ g_signal_connect (manager->priv->client, "notify::on-battery",
+ G_CALLBACK (gpm_manager_client_changed_cb), manager);
+ #else
+ g_signal_connect (manager->priv->client, "changed",
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch
new file mode 100644
index 0000000..7202575
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-port-to-upower-0.99-API.patch
@@ -0,0 +1,390 @@
+diff --git a/src/gpm-backlight.c b/src/gpm-backlight.c
+index 1f1d834..d2938a4 100644
+--- a/src/gpm-backlight.c
++++ b/src/gpm-backlight.c
+@@ -410,7 +410,11 @@ gpm_settings_key_changed_cb (GSettings *settings, const gchar *key, GpmBacklight
+ * Does the actions when the ac power source is inserted/removed.
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_backlight_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmBacklight *backlight)
++#else
+ gpm_backlight_client_changed_cb (UpClient *client, GpmBacklight *backlight)
++#endif
+ {
+ gpm_backlight_brightness_evaluate_and_set (backlight, FALSE, TRUE);
+ }
+@@ -727,8 +731,13 @@ gpm_backlight_init (GpmBacklight *backlight)
+
+ /* we use up_client for the ac-adapter-changed signal */
+ backlight->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (backlight->priv->client, "notify",
++ G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
++#else
+ g_signal_connect (backlight->priv->client, "changed",
+ G_CALLBACK (gpm_backlight_client_changed_cb), backlight);
++#endif
+
+ /* gets caps */
+ backlight->priv->can_dim = gpm_brightness_has_hw (backlight->priv->brightness);
+diff --git a/src/gpm-button.c b/src/gpm-button.c
+index 1e38173..b331cf6 100644
+--- a/src/gpm-button.c
++++ b/src/gpm-button.c
+@@ -324,7 +324,11 @@ gpm_button_reset_time (GpmButton *button)
+ * gpm_button_client_changed_cb
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_button_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmButton *button)
++#else
+ gpm_button_client_changed_cb (UpClient *client, GpmButton *button)
++#endif
+ {
+ gboolean lid_is_closed;
+
+@@ -363,9 +367,13 @@ gpm_button_init (GpmButton *button)
+
+ button->priv->client = up_client_new ();
+ button->priv->lid_is_closed = up_client_get_lid_is_closed (button->priv->client);
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (button->priv->client, "notify",
++ G_CALLBACK (gpm_button_client_changed_cb), button);
++#else
+ g_signal_connect (button->priv->client, "changed",
+ G_CALLBACK (gpm_button_client_changed_cb), button);
+-
++#endif
+ /* register the brightness keys */
+ gpm_button_xevent_key (button, XF86XK_PowerOff, GPM_BUTTON_POWER);
+ #ifdef HAVE_XF86XK_SUSPEND
+diff --git a/src/gpm-control.c b/src/gpm-control.c
+index ec50136..0562d38 100644
+--- a/src/gpm-control.c
++++ b/src/gpm-control.c
+@@ -289,10 +289,11 @@ gpm_control_suspend (GpmControl *control, GError **error)
+ }
+ g_object_unref(proxy);
+ }
++#if !UP_CHECK_VERSION(0, 99, 0)
+ else {
+ ret = up_client_suspend_sync (control->priv->client, NULL, error);
+ }
+-
++#endif
+ egg_debug ("emitting resume");
+ g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_SUSPEND);
+
+@@ -399,10 +400,11 @@ gpm_control_hibernate (GpmControl *control, GError **error)
+ ret = TRUE;
+ }
+ }
++#if !UP_CHECK_VERSION(0, 99, 0)
+ else {
+ ret = up_client_hibernate_sync (control->priv->client, NULL, error);
+ }
+-
++#endif
+ egg_debug ("emitting resume");
+ g_signal_emit (control, signals [RESUME], 0, GPM_CONTROL_ACTION_HIBERNATE);
+
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index 96a043e..e6c6bf2 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -768,12 +768,14 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ guint i;
+ GPtrArray *array = NULL;
+ UpDevice *device;
++#if !UP_CHECK_VERSION(0, 99, 0)
+ gboolean ret;
+ GError *error = NULL;
++#endif
+
+ g_return_val_if_fail (engine != NULL, FALSE);
+ g_return_val_if_fail (GPM_IS_ENGINE (engine), FALSE);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ /* get devices from UPower */
+ ret = up_client_enumerate_devices_sync (engine->priv->client, NULL, &error);
+ if (!ret) {
+@@ -781,7 +783,7 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ g_error_free (error);
+ goto out;
+ }
+-
++#endif
+ /* connected mobile phones */
+ gpm_phone_coldplug (engine->priv->phone);
+
+@@ -793,7 +795,9 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ device = g_ptr_array_index (array, i);
+ gpm_engine_device_add (engine, device);
+ }
++#if !UP_CHECK_VERSION(0, 99, 0)
+ out:
++#endif
+ if (array != NULL)
+ g_ptr_array_unref (array);
+ /* never repeat */
+@@ -816,6 +820,22 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin
+ * gpm_engine_device_removed_cb:
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_engine_device_removed_cb (UpClient *client, const char *object_path, GpmEngine *engine)
++{
++ guint i;
++
++ for (i = 0; i < engine->priv->array->len; i++) {
++ UpDevice *device = g_ptr_array_index (engine->priv->array, i);
++
++ if (g_strcmp0 (object_path, up_device_get_object_path (device)) == 0) {
++ g_ptr_array_remove_index (engine->priv->array, i);
++ break;
++ }
++ }
++ gpm_engine_recalculate_state (engine);
++}
++#else
+ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
+ gboolean ret;
+@@ -824,12 +844,18 @@ gpm_engine_device_removed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+ return;
+ gpm_engine_recalculate_state (engine);
+ }
+-
++#endif
+
+ /**
+ * gpm_engine_device_changed_cb:
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_engine_device_changed_cb (UpClient *client, GParamSpec *pspec, GpmEngine *engine)
++{
++ gpm_engine_recalculate_state (engine);
++}
++#else
+ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *engine)
+ {
+ UpDeviceKind kind;
+@@ -891,6 +917,7 @@ gpm_engine_device_changed_cb (UpClient *client, UpDevice *device, GpmEngine *eng
+
+ gpm_engine_recalculate_state (engine);
+ }
++#endif
+
+ /**
+ * gpm_engine_get_devices:
+@@ -1003,7 +1030,10 @@ phone_device_refresh_cb (GpmPhone *phone, guint idx, GpmEngine *engine)
+ static void
+ gpm_engine_init (GpmEngine *engine)
+ {
+-
++#if UP_CHECK_VERSION(0, 99, 0)
++ GPtrArray *array = NULL;
++ guint i;
++#endif
+ engine->priv = GPM_ENGINE_GET_PRIVATE (engine);
+
+ engine->priv->array = g_ptr_array_new_with_free_func (g_object_unref);
+@@ -1012,8 +1042,13 @@ gpm_engine_init (GpmEngine *engine)
+ G_CALLBACK (gpm_engine_device_added_cb), engine);
+ g_signal_connect (engine->priv->client, "device-removed",
+ G_CALLBACK (gpm_engine_device_removed_cb), engine);
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (engine->priv->client, "notify",
++ G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#else
+ g_signal_connect (engine->priv->client, "device-changed",
+ G_CALLBACK (gpm_engine_device_changed_cb), engine);
++#endif
+
+ engine->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+ g_signal_connect (engine->priv->settings, "changed",
+@@ -1027,6 +1062,18 @@ gpm_engine_init (GpmEngine *engine)
+ g_signal_connect (engine->priv->phone, "device-refresh",
+ G_CALLBACK (phone_device_refresh_cb), engine);
+
++#if UP_CHECK_VERSION(0, 99, 0)
++ /* coldplug */
++ array = up_client_get_devices(engine->priv->client);
++ if (array) {
++ for (i = 0; i < array->len; i++) {
++ UpDevice *device = g_ptr_array_index (array, i);
++ gpm_engine_device_added_cb(engine->priv->client, device, engine);
++ }
++ g_ptr_array_free (array, TRUE);
++ }
++#endif
++
+ /* create a fake virtual composite battery */
+ engine->priv->battery_composite = up_device_new ();
+ g_object_set (engine->priv->battery_composite,
+diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
+index a439e94..3a0f6e6 100644
+--- a/src/gpm-kbd-backlight.c
++++ b/src/gpm-kbd-backlight.c
+@@ -486,6 +486,9 @@ gpm_kbd_backlight_control_resume_cb (GpmControl *control,
+ **/
+ static void
+ gpm_kbd_backlight_client_changed_cb (UpClient *client,
++#if UP_CHECK_VERSION(0, 99, 0)
++ GParamSpec *pspec,
++#endif
+ GpmKbdBacklight *backlight)
+ {
+ gpm_kbd_backlight_evaluate_power_source_and_set (backlight);
+@@ -755,8 +758,13 @@ gpm_kbd_backlight_init (GpmKbdBacklight *backlight)
+
+ /* Use upower for ac changed signal */
+ backlight->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (backlight->priv->client, "notify",
++ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
++#else
+ g_signal_connect (backlight->priv->client, "changed",
+ G_CALLBACK (gpm_kbd_backlight_client_changed_cb), backlight);
++#endif
+
+ backlight->priv->settings = g_settings_new (GPM_SETTINGS_SCHEMA);
+ //g_signal_connect (backlight->priv->settings, "changed", G_CALLBACK (gpm_settings_key_changed_cb), backlight);
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index c4d0530..df84cac 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -971,7 +971,11 @@ gpm_manager_get_spindown_timeout (GpmManager *manager)
+ * gpm_manager_client_changed_cb:
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_manager_client_changed_cb (UpClient *client, GParamSpec *pspec, GpmManager *manager)
++#else
+ gpm_manager_client_changed_cb (UpClient *client, GpmManager *manager)
++#endif
+ {
+ gboolean event_when_closed;
+ gint timeout;
+@@ -1853,8 +1857,13 @@ gpm_manager_init (GpmManager *manager)
+ g_signal_connect (manager->priv->settings, "changed",
+ G_CALLBACK (gpm_manager_settings_changed_cb), manager);
+ manager->priv->client = up_client_new ();
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (manager->priv->client, "notify",
++ G_CALLBACK (gpm_manager_client_changed_cb), manager);
++#else
+ g_signal_connect (manager->priv->client, "changed",
+ G_CALLBACK (gpm_manager_client_changed_cb), manager);
++#endif
+
+ /* use libmatenotify */
+ notify_init (GPM_NAME);
+diff --git a/src/gpm-prefs-core.c b/src/gpm-prefs-core.c
+index 7a2662d..6abb792 100644
+--- a/src/gpm-prefs-core.c
++++ b/src/gpm-prefs-core.c
+@@ -811,7 +811,9 @@ gpm_prefs_init (GpmPrefs *prefs)
+ UpDevice *device;
+ UpDeviceKind kind;
+ GpmBrightness *brightness;
++#if !UP_CHECK_VERSION(0, 99, 0)
+ gboolean ret;
++#endif
+ guint i;
+
+ GDBusProxy *proxy;
+@@ -897,9 +899,11 @@ gpm_prefs_init (GpmPrefs *prefs)
+ else {
+ /* are we allowed to shutdown? */
+ egg_console_kit_can_stop (prefs->priv->console, &prefs->priv->can_shutdown, NULL);
++#if !UP_CHECK_VERSION(0, 99, 0)
+ /* get values from UpClient */
+ prefs->priv->can_suspend = up_client_get_can_suspend (prefs->priv->client);
+ prefs->priv->can_hibernate = up_client_get_can_hibernate (prefs->priv->client);
++#endif
+ }
+
+ if (LOGIND_RUNNING()) {
+@@ -953,14 +957,14 @@ gpm_prefs_init (GpmPrefs *prefs)
+ brightness = gpm_brightness_new ();
+ prefs->priv->has_lcd = gpm_brightness_has_hw (brightness);
+ g_object_unref (brightness);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ /* get device list */
+ ret = up_client_enumerate_devices_sync (prefs->priv->client, NULL, &error);
+ if (!ret) {
+ egg_warning ("failed to get device list: %s", error->message);
+ g_error_free (error);
+ }
+-
++#endif
+ devices = up_client_get_devices (prefs->priv->client);
+ for (i=0; i<devices->len; i++) {
+ device = g_ptr_array_index (devices, i);
+diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
+index 98b5632..13489dc 100644
+--- a/src/gpm-statistics.c
++++ b/src/gpm-statistics.c
+@@ -1236,6 +1236,12 @@ gpm_stats_device_added_cb (UpClient *client, UpDevice *device, gpointer user_dat
+ * gpm_stats_device_changed_cb:
+ **/
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
++gpm_stats_device_changed_cb (UpClient *client, GParamSpec *pspec, gpointer user_data)
++{
++ gpm_stats_button_update_ui();
++}
++#else
+ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_data)
+ {
+ const gchar *object_path;
+@@ -1246,6 +1252,7 @@ gpm_stats_device_changed_cb (UpClient *client, UpDevice *device, gpointer user_d
+ if (g_strcmp0 (current_device, object_path) == 0)
+ gpm_stats_update_info_data (device);
+ }
++#endif
+
+ /**
+ * gpm_stats_device_removed_cb:
+@@ -1794,11 +1801,12 @@ main (int argc, char *argv[])
+
+ wakeups = up_wakeups_new ();
+ g_signal_connect (wakeups, "data-changed", G_CALLBACK (gpm_stats_data_changed_cb), NULL);
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ /* coldplug */
+ ret = up_client_enumerate_devices_sync (client, NULL, NULL);
+ if (!ret)
+ goto out;
++#endif
+ devices = up_client_get_devices (client);
+
+ /* add devices in visually pleasing order */
+@@ -1814,7 +1822,11 @@ main (int argc, char *argv[])
+ /* connect now the coldplug is done */
+ g_signal_connect (client, "device-added", G_CALLBACK (gpm_stats_device_added_cb), NULL);
+ g_signal_connect (client, "device-removed", G_CALLBACK (gpm_stats_device_removed_cb), NULL);
++#if UP_CHECK_VERSION(0, 99, 0)
++ g_signal_connect (client, "notify", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
++#else
+ g_signal_connect (client, "device-changed", G_CALLBACK (gpm_stats_device_changed_cb), NULL);
++#endif
+
+ /* set current device */
+ if (devices->len > 0) {
+@@ -1854,8 +1866,9 @@ main (int argc, char *argv[])
+ gtk_widget_show (widget);
+
+ gtk_main ();
+-
++#if !UP_CHECK_VERSION(0, 99, 0)
+ out:
++#endif
+ g_object_unref (settings);
+ g_object_unref (client);
+ g_object_unref (wakeups);
+
diff --git a/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch
new file mode 100644
index 0000000..6d462b9
--- /dev/null
+++ b/mate-extra/mate-power-manager/files/mate-power-manager-1.8.0-r1-remove-battery-recall-logic.patch
@@ -0,0 +1,263 @@
+diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
+index adecce0..ca009b5 100644
+--- a/data/org.mate.power-manager.gschema.xml.in
++++ b/data/org.mate.power-manager.gschema.xml.in
+@@ -211,11 +211,6 @@
+ <_summary>Seconds of inactivity to spin down when on battery</_summary>
+ <_description>The number of seconds of inactivity to spin down the disks when on battery power.</_description>
+ </key>
+- <key name="notify-perhaps-recall" type="b">
+- <default>true</default>
+- <_summary>If we should show the recalled battery warning for a broken battery</_summary>
+- <_description>If we should show the recalled battery warning for a broken battery. Set this to false only if you know your battery is okay.</_description>
+- </key>
+ <key name="notify-low-capacity" type="b">
+ <default>true</default>
+ <_summary>If we should show the low capacity warning for a broken battery</_summary>
+diff --git a/src/gpm-common.h b/src/gpm-common.h
+index ef20f88..303bdd1 100644
+--- a/src/gpm-common.h
++++ b/src/gpm-common.h
+@@ -98,7 +98,6 @@ G_BEGIN_DECLS
+ #define GPM_SETTINGS_SPINDOWN_TIMEOUT_BATT "spindown-timeout-battery"
+
+ /* notify */
+-#define GPM_SETTINGS_NOTIFY_PERHAPS_RECALL "notify-perhaps-recall"
+ #define GPM_SETTINGS_NOTIFY_LOW_CAPACITY "notify-low-capacity"
+ #define GPM_SETTINGS_NOTIFY_DISCHARGING "notify-discharging"
+ #define GPM_SETTINGS_NOTIFY_FULLY_CHARGED "notify-fully-charged"
+diff --git a/src/gpm-engine.c b/src/gpm-engine.c
+index 0f9d0c1..96a043e 100644
+--- a/src/gpm-engine.c
++++ b/src/gpm-engine.c
+@@ -72,7 +72,6 @@ enum {
+ CHARGE_ACTION,
+ DISCHARGING,
+ LOW_CAPACITY,
+- PERHAPS_RECALL,
+ LAST_SIGNAL
+ };
+
+@@ -761,42 +760,6 @@ gpm_engine_device_add (GpmEngine *engine, UpDevice *device)
+ }
+
+ /**
+- * gpm_engine_check_recall:
+- **/
+-static gboolean
+-gpm_engine_check_recall (GpmEngine *engine, UpDevice *device)
+-{
+- UpDeviceKind kind;
+- gboolean recall_notice = FALSE;
+- gchar *recall_vendor = NULL;
+- gchar *recall_url = NULL;
+-
+- /* get device properties */
+- g_object_get (device,
+- "kind", &kind,
+- "recall-notice", &recall_notice,
+- "recall-vendor", &recall_vendor,
+- "recall-url", &recall_url,
+- NULL);
+-
+- /* not battery */
+- if (kind != UP_DEVICE_KIND_BATTERY)
+- goto out;
+-
+- /* no recall data */
+- if (!recall_notice)
+- goto out;
+-
+- /* emit signal for manager */
+- egg_debug ("** EMIT: perhaps-recall");
+- g_signal_emit (engine, signals [PERHAPS_RECALL], 0, device, recall_vendor, recall_url);
+-out:
+- g_free (recall_vendor);
+- g_free (recall_url);
+- return recall_notice;
+-}
+-
+-/**
+ * gpm_engine_coldplug_idle_cb:
+ **/
+ static gboolean
+@@ -829,7 +792,6 @@ gpm_engine_coldplug_idle_cb (GpmEngine *engine)
+ for (i=0;i<array->len;i++) {
+ device = g_ptr_array_index (array, i);
+ gpm_engine_device_add (engine, device);
+- gpm_engine_check_recall (engine, device);
+ }
+ out:
+ if (array != NULL)
+@@ -846,7 +808,6 @@ gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engin
+ {
+ /* add to list */
+ g_ptr_array_add (engine->priv->array, g_object_ref (device));
+- gpm_engine_check_recall (engine, device);
+
+ gpm_engine_recalculate_state (engine);
+ }
+@@ -1134,14 +1095,6 @@ gpm_engine_class_init (GpmEngineClass *klass)
+ G_STRUCT_OFFSET (GpmEngineClass, low_capacity),
+ NULL, NULL, g_cclosure_marshal_VOID__POINTER,
+ G_TYPE_NONE, 1, G_TYPE_POINTER);
+- signals [PERHAPS_RECALL] =
+- g_signal_new ("perhaps-recall",
+- G_TYPE_FROM_CLASS (object_class),
+- G_SIGNAL_RUN_LAST,
+- G_STRUCT_OFFSET (GpmEngineClass, perhaps_recall),
+- NULL, NULL, gpm_marshal_VOID__POINTER_STRING_STRING,
+- G_TYPE_NONE,
+- 3, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_STRING);
+ signals [FULLY_CHARGED] =
+ g_signal_new ("fully-charged",
+ G_TYPE_FROM_CLASS (object_class),
+diff --git a/src/gpm-engine.h b/src/gpm-engine.h
+index be1ccd6..43f8956 100644
+--- a/src/gpm-engine.h
++++ b/src/gpm-engine.h
+@@ -49,10 +49,6 @@ typedef struct
+ gchar *icon);
+ void (* summary_changed) (GpmEngine *engine,
+ gchar *status);
+- void (* perhaps_recall) (GpmEngine *engine,
+- UpDevice *device,
+- const gchar *oem_vendor,
+- const gchar *website);
+ void (* low_capacity) (GpmEngine *engine,
+ UpDevice *device);
+ void (* charge_low) (GpmEngine *engine,
+diff --git a/src/gpm-manager.c b/src/gpm-manager.c
+index 6ca9dea..c4d0530 100644
+--- a/src/gpm-manager.c
++++ b/src/gpm-manager.c
+@@ -68,7 +68,6 @@
+ static void gpm_manager_finalize (GObject *object);
+
+ #define GPM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_MANAGER, GpmManagerPrivate))
+-#define GPM_MANAGER_RECALL_DELAY 30 /* seconds */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_NEVER 0 /* ms */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */
+ #define GPM_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */
+@@ -1092,111 +1091,6 @@ gpm_manager_settings_changed_cb (GSettings *settings, const gchar *key, GpmManag
+ }
+
+ /**
+- * gpm_manager_perhaps_recall_response_cb:
+- */
+-static void
+-gpm_manager_perhaps_recall_response_cb (GtkDialog *dialog, gint response_id, GpmManager *manager)
+-{
+- GdkScreen *screen;
+- GtkWidget *dialog_error;
+- GError *error = NULL;
+- gboolean ret;
+- const gchar *website;
+-
+- /* don't show this again */
+- if (response_id == GTK_RESPONSE_CANCEL) {
+- g_settings_set_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL, FALSE);
+- goto out;
+- }
+-
+- /* visit recall website */
+- if (response_id == GTK_RESPONSE_OK) {
+- screen = gdk_screen_get_default();
+- website = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-website");
+- ret = gtk_show_uri (screen, website, gtk_get_current_event_time (), &error);
+- if (!ret) {
+- dialog_error = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK,
+- "Failed to show url %s", error->message);
+- gtk_dialog_run (GTK_DIALOG (dialog_error));
+- g_error_free (error);
+- }
+- goto out;
+- }
+-out:
+- gtk_widget_destroy (GTK_WIDGET (dialog));
+- return;
+-}
+-
+-/**
+- * gpm_manager_perhaps_recall_delay_cb:
+- */
+-static gboolean
+-gpm_manager_perhaps_recall_delay_cb (GpmManager *manager)
+-{
+- const gchar *oem_vendor;
+- gchar *title = NULL;
+- gchar *message = NULL;
+- GtkWidget *dialog;
+-
+- oem_vendor = (const gchar *) g_object_get_data (G_OBJECT (manager), "recall-oem-vendor");
+-
+- /* TRANSLATORS: the battery may be recalled by it's vendor */
+- title = g_strdup_printf ("%s: %s", GPM_NAME, _("Battery may be recalled"));
+- message = g_strdup_printf (_("A battery in your computer may have been "
+- "recalled by %s and you may be at risk.\n\n"
+- "For more information visit the battery recall website."), oem_vendor);
+- dialog = gtk_message_dialog_new_with_markup (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+- GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
+- "<span size='larger'><b>%s</b></span>", title);
+-
+- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", message);
+-
+- /* TRANSLATORS: button text, visit the manufacturers recall website */
+- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Visit recall website"), GTK_RESPONSE_OK);
+-
+- /* TRANSLATORS: button text, do not show this bubble again */
+- gtk_dialog_add_button (GTK_DIALOG (dialog), _("Do not show me this again"), GTK_RESPONSE_CANCEL);
+-
+- /* wait async for response */
+- gtk_widget_show (dialog);
+- g_signal_connect (dialog, "response", G_CALLBACK (gpm_manager_perhaps_recall_response_cb), manager);
+-
+- g_free (title);
+- g_free (message);
+-
+- /* never repeat */
+- return FALSE;
+-}
+-
+-/**
+- * gpm_manager_engine_perhaps_recall_cb:
+- */
+-static void
+-gpm_manager_engine_perhaps_recall_cb (GpmEngine *engine, UpDevice *device, gchar *oem_vendor, gchar *website, GpmManager *manager)
+-{
+- gboolean ret;
+-
+- /* don't show when running under GDM */
+- if (g_getenv ("RUNNING_UNDER_GDM") != NULL) {
+- egg_debug ("running under gdm, so no notification");
+- return;
+- }
+-
+- /* already shown, and dismissed */
+- ret = g_settings_get_boolean (manager->priv->settings, GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
+- if (!ret) {
+- egg_debug ("Gsettings prevents notification: %s", GPM_SETTINGS_NOTIFY_PERHAPS_RECALL);
+- return;
+- }
+-
+- g_object_set_data_full (G_OBJECT (manager), "recall-oem-vendor", (gpointer) g_strdup (oem_vendor), (GDestroyNotify) g_free);
+- g_object_set_data_full (G_OBJECT (manager), "recall-oem-website", (gpointer) g_strdup (website), (GDestroyNotify) g_free);
+-
+- /* delay by a few seconds so the panel can load */
+- g_timeout_add_seconds (GPM_MANAGER_RECALL_DELAY, (GSourceFunc) gpm_manager_perhaps_recall_delay_cb, manager);
+-}
+-
+-/**
+ * gpm_manager_engine_icon_changed_cb:
+ */
+ static void
+@@ -2023,8 +1917,6 @@ gpm_manager_init (GpmManager *manager)
+ gpm_manager_sync_policy_sleep (manager);
+
+ manager->priv->engine = gpm_engine_new ();
+- g_signal_connect (manager->priv->engine, "perhaps-recall",
+- G_CALLBACK (gpm_manager_engine_perhaps_recall_cb), manager);
+ g_signal_connect (manager->priv->engine, "low-capacity",
+ G_CALLBACK (gpm_manager_engine_low_capacity_cb), manager);
+ g_signal_connect (manager->priv->engine, "icon-changed",
+
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild
new file mode 100644
index 0000000..4932ec9
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild,v 1.1 2014/12/09 22:10:53 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit autotools gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop system"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+applet gnome-keyring man policykit test unique"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND="app-text/rarian:0
+ >=dev-libs/dbus-glib-0.70:0
+ >=dev-libs/glib-2.13:2
+ >=media-libs/libcanberra-0.10:0[gtk]
+ >=sys-apps/dbus-1:0
+ || ( >=sys-power/upower-0.9.23:= >=sys-power/upower-pm-utils-0.9.23 )
+ >=x11-apps/xrandr-1.2:0
+ >=x11-libs/cairo-1:0
+ >=x11-libs/gdk-pixbuf-2.11:2
+ >=x11-libs/gtk+-2.17.7:2
+ x11-libs/libX11:0
+ x11-libs/libXext:0
+ x11-libs/libXrandr:0
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/pango:0
+ applet? ( >=mate-base/mate-panel-1.8:0 )
+ gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+ unique? ( >=dev-libs/libunique-0.9.4:1 )"
+
+RDEPEND="${COMMON_DEPEND}
+ policykit? ( >=mate-extra/mate-polkit-1.8:0 )"
+
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xml-dtd:4.3
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ x11-proto/randrproto:0
+ >=x11-proto/xproto-7.0.15:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ man? ( app-text/docbook-sgml-utils:0
+ >=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+ # Upstreamed patches
+ epatch "${FILESDIR}"/${PN}-1.8.0-r1-dbus_interface_keyboard_backlight_controls.patch
+
+ eautoreconf
+ gnome2_src_prepare
+
+ # This needs to be after eautoreconf to prevent problems like bug #356277
+ # Remove the docbook2man rules here since it's not handled by a proper
+ # parameter in configure.in.
+ if ! use man; then
+ sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+ || die "docbook sed failed"
+ fi
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable applet applets) \
+ $(use_enable test tests) \
+ $(use_enable unique) \
+ $(use_with gnome-keyring keyring) \
+ --enable-compile-warnings=minimum \
+ --with-gtk=2.0
+}
+
+DOCS="AUTHORS HACKING NEWS README TODO"
+
+src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+
+ dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-power-manager/metadata.xml b/mate-extra/mate-power-manager/metadata.xml
new file mode 100644
index 0000000..bfcc294
--- /dev/null
+++ b/mate-extra/mate-power-manager/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>mate</herd>
+ <use>
+ <flag name="applet">Enable building of the MATE applet.</flag>
+ <flag name="man">Build power manager's man page.</flag>
+ <flag name="unique">Enable single instance support using
+ <pkg>dev-libs/libunique</pkg>.</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-power-manager</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-screensaver/ChangeLog b/mate-extra/mate-screensaver/ChangeLog
new file mode 100644
index 0000000..819c87e
--- /dev/null
+++ b/mate-extra/mate-screensaver/ChangeLog
@@ -0,0 +1,79 @@
+# ChangeLog for mate-extra/mate-screensaver
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.16 2014/12/20 17:35:40 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-screensaver-1.6.1-r2.ebuild:
+ drop old
+
+ 11 Dec 2014; Pacho Ramos <pacho@gentoo.org> mate-screensaver-1.8.1.ebuild:
+ Use readme.gentoo.eclass (#510000), settings DOC is not needed here as they
+ are the default DOCS handled by gnome2.eclass itself.
+
+*mate-screensaver-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-screensaver-1.8.1.ebuild:
+ version bump
+
+ 07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> mate-screensaver-1.8.0.ebuild:
+ Add missing dconf dependency; fixes bug #515810, reported by Patrick Lauer.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-screensaver-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-screensaver-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 18 Jun 2014; Tom Wijsman <TomWij@gentoo.org> mate-screensaver-1.6.1-r2.ebuild,
+ mate-screensaver-1.8.0.ebuild:
+ Remove dot at end of DESCRIPTION.
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-screensaver-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 16 May 2014; Tom Wijsman <TomWij@gentoo.org> mate-screensaver-1.6.1-r2.ebuild:
+ Add eautoreconf; fixes bug #510002, reported by Pacho.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-screensaver-1.6.1-r2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-screensaver-1.8.0 (23 Apr 2014)
+
+ 23 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-screensaver-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-screensaver-1.6.1-r2 (13 Mar 2014)
+
+ 13 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-screensaver-1.6.1-r2.ebuild, -mate-screensaver-1.6.1-r1.ebuild:
+ Revision bump, fixed up gnome-keyring dependency by adding it in the pam USE
+ flag check; fixes bug #504350, reported by Thibaud "thican" CANALE.
+
+*mate-screensaver-1.6.1-r1 (13 Mar 2014)
+
+ 13 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-screensaver-1.6.1-r1.ebuild, -mate-screensaver-1.6.1.ebuild:
+ Added dependencies on gnome-keyring and pam; fixes bug #504350, reported by
+ Thibaud "thican" CANALE.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-screensaver-1.6.1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-screensaver-1.6.1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext, intltool and
+ consolekit. Remove unrequired virtual/libc dependency.
+
+*mate-screensaver-1.6.1 (10 Mar 2014)
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +files/mate-screensaver-1.2.0-fix-popsquares-includes.patch,
+ +files/mate-screensaver-1.2.0-fix-with-libgl.patch, +files/xss-conversion.txt,
+ +mate-screensaver-1.6.1.ebuild, +metadata.xml:
+ New ebuild for mate-extra/mate-screensaver, replaces xscreensaver, integrating
+ with the MATE desktop; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
new file mode 100644
index 0000000..d8768c1
--- /dev/null
+++ b/mate-extra/mate-screensaver/Manifest
@@ -0,0 +1,7 @@
+AUX mate-screensaver-1.2.0-fix-popsquares-includes.patch 309 SHA256 f21d10a9a3ffecbe1dfc90d27c032a7678f7918fdcb14e5575e1935c90506a59 SHA512 14dac0aca344c414123bf2feac312d09800c89299568ee9b0d8fa84858702a54a57b0eeee15574509a1d5e11181c217890bf09c864dac7e0facaade7ebd2d5d3 WHIRLPOOL dfe99f877dbc50ef80f99c5f7f483ba5fd0ed3a2ef4077f2c5098f89ad19ba5bb83896b5b1f889007a739e653b98888d725c33cbdedd952cbeb9355ab0572c10
+AUX mate-screensaver-1.2.0-fix-with-libgl.patch 381 SHA256 f4860df79ec7ebcc46da120095f726031ba39b806bc2107817095193ea27f008 SHA512 ce5675738d3a53ad864a4a8fdaa39ac50037c0ba23e598838b7a0bdd4104e97e2ee23dd0bcb7830c6fdf878680596a9668cac6f4ca1cdee43117c3f31ea4ac8c WHIRLPOOL 5a355a4f05a837795043a585a516a00cc3a3c73e098f0fdee7a2d0c54f4774da86d3875402d8ddf506cce7ed06681fe2f2d3e0981a35d86664b49554e9020ea5
+AUX xss-conversion.txt 1026 SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a WHIRLPOOL 95492336413595cd91fbf31dc44f616500714ec11ddedcbdf98e9c18b0d0897d83b3f5ef82fe410cdd45409060a2560a873b67141576ed3a196bc33f87734ee3
+DIST mate-screensaver-1.8.1.tar.xz 4874424 SHA256 a3dd1fe9e8d05b7815544fa186c43a35271dd8b512d6b0377038df02c28c9d62 SHA512 e2bb5b4efbd5818834d0e9f9bf13e9f362f1251bdfc975fc93c69ab90163db859ebfc089e056fa73801053cd396d661954bb6e906e02881452b01a0394d7d2ff WHIRLPOOL a46bc84824205bc6a257325dda507b38a83751c30275052e921c3cbceb53a9243caed8704f0e63888f5fa927ff2a0b04b693e5c7fe0514e709fc356a7756af57
+EBUILD mate-screensaver-1.8.1.ebuild 3429 SHA256 7e19419c5f24724d4478bafb0c97be4e452a96ba76005e2d0d87c5fc587dcdca SHA512 80fe9e66c7b260054fededa10e58ccd01d82ecd62d7cdd160d07088a506e4269a74e69f8ef90a0d7476d0ef317996023b520b02e2c4cda9e44871c47a088bfa8 WHIRLPOOL e21adeb66ea79f48aad3ef014f78af31482c32641db79b9b329eacb46b119bf1521290fc27ad72c53aaa7e8c7af2308cdbd65111c7465744fdef0b295df76f5a
+MISC ChangeLog 3161 SHA256 4720125c2fe1292b2b88cd07c26d2821a68168adb53321836333269c020c0153 SHA512 f22361e52f1b108507be7d3f10a0d785288aec5af6f51a2229ffdabd1f36f69cd1516a02e9f5fad60b3d2c0220c95a8444fdd9a5df471df0b31aaaa789d57510 WHIRLPOOL 212aec557de378d5bc1773f03395ff8b067be570e3cbea629ee3ee10d802d18b6df3c2c4c8d4f942a2c7c1f7555273a34d573c53919fcc07b06fb63d61101a14
+MISC metadata.xml 370 SHA256 07fb28280997f4fe7e601716108ae8f7c24abd6c708e6af02e9b768d1f34a17d SHA512 23272568fa455380d4752bedef956a4349b524d85dd6c33740db9b8553ef8f7dab7210285ec38ba603ba602d96b3693153fc152a8f5d17d09ae16690af310f0c WHIRLPOOL 958f1f74fb0a5f83934f6d5be24aa88dcaf42447b8c90d0dc6db423576cd1f662046790b7b685b2b4982261938b0dd30c5d94e10751b205c1167879772534a9b
diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch
new file mode 100644
index 0000000..5d13f69
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-popsquares-includes.patch
@@ -0,0 +1,11 @@
+diff -burN a/savers/popsquares.c b/savers/popsquares.c
+--- a/savers/popsquares.c 2012-03-07 22:28:11.000000000 +0100
++++ b/savers/popsquares.c 2012-07-17 19:54:44.062628969 +0200
+@@ -21,6 +21,7 @@
+
+ #include "config.h"
+
++#include <stdlib.h>
+ #include <string.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
diff --git a/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch
new file mode 100644
index 0000000..45638c0
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/mate-screensaver-1.2.0-fix-with-libgl.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2012-08-08 19:23:14.026623125 +0200
++++ b/configure.ac 2012-08-08 19:23:20.766623326 +0200
+@@ -545,7 +545,7 @@
+ dnl - Check for GL
+ dnl ---------------------------------------------------------------------------
+
+-AC_ARG_WITH(gl, [ --with-libgl build with GL support])
++AC_ARG_WITH(libgl, [ --with-libgl build with GL support])
+ have_libgl=no
+ GL_LIBS=""
+
diff --git a/mate-extra/mate-screensaver/files/xss-conversion.txt b/mate-extra/mate-screensaver/files/xss-conversion.txt
new file mode 100644
index 0000000..d69e506
--- /dev/null
+++ b/mate-extra/mate-screensaver/files/xss-conversion.txt
@@ -0,0 +1,22 @@
+There is a conversion script which you can use to convert XScreenSaver
+screensavers to the gnome-screensaver format. The conversion script is located
+in the documentation directory (/usr/share/doc/${PF}/).
+
+The migrate-xscreensaver-config.sh and xscreensaver-config.xsl files will be
+needed to convert the screensaver. Make sure to enable the executable bit on
+the script (chmod +x migrate-xscreensaver-config.sh).
+
+The script takes the module to convert and creates a .desktop file corresponding
+to the module.
+
+migrate-xscreensaver-config.sh /usr/share/xscreensaver/config/*.xml
+
+The above command should convert all xscreensaver modules.
+
+You must copy the desktop files into /usr/share/applications/gnome-screensavers (cp
+*.desktop /usr/share/applications/screensavers), and the executables from
+/usr/lib/misc/xscreensaver into /usr/libexec/gnome-screensaver
+(cp /usr/lib/misc/xscreensaver/* /usr/libexec/gnome-screensaver)
+
+Going to the gnome-screensaver-preferences dialog should now show the new
+modules in the list.
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild
new file mode 100644
index 0000000..1c9f7a2
--- /dev/null
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/mate-screensaver-1.8.1.ebuild,v 1.2 2014/12/11 09:55:55 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2 multilib readme.gentoo versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X consolekit kernel_linux libnotify opengl pam systemd"
+
+DOC_CONTENTS="
+ Information for converting screensavers is located in
+ /usr/share/doc/${PF}/xss-conversion.txt*
+"
+
+RDEPEND="
+ >=dev-libs/dbus-glib-0.71:0
+ >=dev-libs/glib-2.26:2
+ gnome-base/dconf:0
+ >=mate-base/libmatekbd-1.8:0
+ >=mate-base/mate-desktop-1.8:0
+ >=mate-base/mate-menus-1.8:0
+ >=sys-apps/dbus-0.30:0
+ >=x11-libs/gdk-pixbuf-2.14:2
+ >=x11-libs/gtk+-2.14:2
+ >=x11-libs/libX11-1:0
+ x11-libs/cairo:0
+ x11-libs/libXext:0
+ x11-libs/libXrandr:0
+ x11-libs/libXScrnSaver:0
+ x11-libs/libXxf86misc:0
+ x11-libs/libXxf86vm:0
+ x11-libs/libxklavier:0
+ x11-libs/pango:0
+ virtual/libintl:0
+ libnotify? ( >=x11-libs/libnotify-0.7:0 )
+ opengl? ( virtual/opengl:0 )
+ pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
+ !pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
+ !!<gnome-extra/gnome-screensaver-3:0"
+
+# FIXME: Why is systemd and consolekit only a DEPEND? ConsoleKit can't be used build-time only.
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35:*
+ >=mate-base/mate-common-1.8:0
+ sys-devel/gettext:*
+ x11-proto/randrproto:0
+ x11-proto/scrnsaverproto:0
+ x11-proto/xextproto:0
+ x11-proto/xf86miscproto:0
+ virtual/pkgconfig:*
+ consolekit? ( sys-auth/consolekit:0 )
+ systemd? ( sys-apps/systemd:0= )"
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_with consolekit console-kit) \
+ $(use_enable debug) \
+ $(use_with libnotify) \
+ $(use_with opengl libgl) \
+ $(use_enable pam) \
+ $(use_with systemd) \
+ $(use_with X x) \
+ --enable-locking \
+ --with-kbd-layout-indicator \
+ --with-xf86gamma-ext \
+ --with-xscreensaverdir=/usr/share/xscreensaver/config \
+ --with-xscreensaverhackdir=/usr/$(get_libdir)/misc/xscreensaver
+}
+
+src_install() {
+ gnome2_src_install
+
+ # Install the conversion script in the documentation.
+ dodoc "${S}"/data/migrate-xscreensaver-config.sh
+ dodoc "${S}"/data/xscreensaver-config.xsl
+ dodoc "${FILESDIR}"/xss-conversion.txt
+
+ # Non PAM users will need this suid to read the password hashes.
+ # OpenPAM users will probably need this too when
+ # http://bugzilla.gnome.org/show_bug.cgi?id=370847
+ # is fixed.
+ if ! use pam ; then
+ fperms u+s /usr/libexec/mate-screensaver-dialog
+ fi
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ if has_version "<x11-base/xorg-server-1.5.3-r4" ; then
+ ewarn "You have a too old xorg-server installation. This will cause"
+ ewarn "mate-screensaver to eat up your CPU. Please consider upgrading."
+ echo
+ fi
+
+ if has_version "<x11-misc/xscreensaver-4.22-r2" ; then
+ ewarn "You have xscreensaver installed, you probably want to disable it."
+ ewarn "To prevent a duplicate screensaver entry in the menu, you need to"
+ ewarn "build xscreensaver with -gnome in the USE flags."
+ ewarn "echo \"x11-misc/xscreensaver -gnome\" >> /etc/portage/package.use"
+ echo
+ fi
+
+ readme.gentoo_print_elog
+}
diff --git a/mate-extra/mate-screensaver/metadata.xml b/mate-extra/mate-screensaver/metadata.xml
new file mode 100644
index 0000000..96aee56
--- /dev/null
+++ b/mate-extra/mate-screensaver/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>mate</herd>
+ <use>
+ <flag name="consolekit">Enable support for
+ <pkg>sys-auth/consolkekit</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-screensaver</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-sensors-applet/ChangeLog b/mate-extra/mate-sensors-applet/ChangeLog
new file mode 100644
index 0000000..93e3cc5
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/ChangeLog
@@ -0,0 +1,49 @@
+# ChangeLog for mate-extra/mate-sensors-applet
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-sensors-applet/ChangeLog,v 1.10 2014/12/20 17:37:49 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-sensors-applet-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-sensors-applet-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-sensors-applet-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-sensors-applet-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-sensors-applet-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-sensors-applet-1.8.0 (23 Apr 2014)
+
+ 23 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-sensors-applet-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-sensors-applet-1.6.1.ebuild:
+ Remove scrollkeeper configure flag.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-sensors-applet-1.6.1.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-sensors-applet-1.6.1.ebuild:
+ Remove invalid SLOT dependencies from pkg-config, gettext, intltool and
+ lm_sensors.
+
+*mate-sensors-applet-1.6.1 (10 Mar 2014)
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-sensors-applet-1.6.1.ebuild, +metadata.xml:
+ New ebuild for mate-extra/mate-sensors-applet, MATE panel applet to display
+ readings from hardware sensors; imported from the mate-overlay, reviewed and
+ adjusted.
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
new file mode 100644
index 0000000..bceab7a
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-sensors-applet-1.8.0.tar.xz 352128 SHA256 9bc6f42eae4b866f83d0fa9566e0111fd379dc6cf9dcc020b1fcca1c8a49d410 SHA512 8074900157c0d62b060f273fa975efcfa3808afb9c81c44089c1f255ce95ed34744070f98893d7b6bbb16d076ae7b7ddec391ef46459e06646d2586797df85fc WHIRLPOOL d245ed9cce0a9bd9eed1e3996529227e3fa909ba9dba37975599409783bd7f34ead6ca0d477dbac6d41462c85ba599ecb14f18a80e6ab604a29bfce413289bfe
+EBUILD mate-sensors-applet-1.8.0.ebuild 1902 SHA256 2f5d915dbc7d2a984172f9f59da6f91ef4a26185cf909dcb396d48e7cb250893 SHA512 26c142070eb2a4b9ffb22d64c7a7c7015029c6371de67e2fbcf06d827666a44470432df2c332fb284999d512e9f8677e1f393454431cbf1fbdc315c396a71b32 WHIRLPOOL f057e8b30d19a94afbe5314546a73fc522e2101190e85e14b81544b5709b02d234ceafab71321a47f8a98721e0f915bd53ce72798e95493d273f69a8089e278d
+MISC ChangeLog 1766 SHA256 2a59c70e65c16b7e231831193ca380a56ab475b56dc7df9d19319f578c839c90 SHA512 5645fa93e4c93b2fb7a87a1b374d2203df08298390f89b8d0b8f74ccace66c69e96508eab20adf7715cf2141f74fea10334375bc022a8e045bba3805b2bd7402 WHIRLPOOL 9e7bda65939a154f158c03ab789bce9196e77648e16cb00e6f6f6946fde7e560dc5b8051b61a178da5fe4de95ceb608e6d6b7317d6c237dbbae639d85ecd5cf5
+MISC metadata.xml 270 SHA256 6746c6cc4826bba198db09f22ee574d2789284b9e609046d84697ad027523b53 SHA512 ffaac135cd0f50999a32d419fce1d7c6b3c1b46f2fbfec5772153ebc98a265df9dfc5843bdcd650f7efd4017aea332bc207ca6f93185111d1ae86bbac09c527f WHIRLPOOL 7064e75898f6cfbf1b4181535ad16623e69c2f74236612af16a1ae2725c8f999e42f9cc348714c1a6d2c74fc47163016e4a7546f4c46120bf0b3d4dac39c25af
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj73eEQAJvJSBE+AZ3RR0eY/c+Xsh7F
+iwrOqdXc2tngwI0zs9jH2xC5tQsFZvn3DMEmy/iQtJUvF7PELgECOMxZt39vggIk
+ux4xoy5JRZ6GdagpDIpV8YalPO6pfd/TQw72XjMN9K+jyqaopxdLVHkWe7ylYptq
+Ghky1Ze10f8kDjCEoG7lRN9JOkwly1RgZ93fTlGLf4AKLqrzBX6JvHTQBdb59ZLu
+/SrIj38UoYG5P4nDxaiCUFlFwWUFM3K2iF45wk90P31hnSh44buRSGuwKcUqzyyE
+bj7Swgw1ROab06id/JBVwDZ2mzNU1LdmK1nPdu9OMg93kkCiauEwZp2bzKY3GmRY
+nACf7n/kcbAtOh3CmxHzDS2kTV5izoA+FJYYLXJM5WGMIwjiD7oKX1xkKDCsmt2f
+k4vHI5eZqQDhhpw+L+v+jd8MXAxlEcK+KIhAylexaH/N1+HmVUIE1pZ56tBdJtnN
+Im3QYoMWGzYU0iryokZ4y6va5oj7l6fSPzy25GM6yIy/UgYU1B1ewcmnk+kgLpfk
+NtTCCp16kbYJVgdqHJbgBZVvbV4vHn5KOjhXQ+j/ScPAhAdFMzGtVbST+eEvrmJT
+w2BfNemI8Fj8wyLJfdBb0MbWixGii21yKgpk9NDcxlCIBMuwDKUxJbYdGEGtiLVf
+9rvVB33y5YBSYIy45DEJ
+=eDP0
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild
new file mode 100644
index 0000000..8f46e32
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-sensors-applet/mate-sensors-applet-1.8.0.ebuild,v 1.4 2014/07/02 09:48:12 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 eutils versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="+dbus hddtemp libnotify lm_sensors video_cards_fglrx video_cards_nvidia"
+
+RDEPEND="app-text/rarian:0
+ >=dev-libs/glib-2.26:2
+ >=mate-base/mate-panel-1.8:0
+ >=x11-libs/cairo-1.0.4:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.14:2
+ virtual/libintl:0
+ hddtemp? (
+ dbus? (
+ >=dev-libs/dbus-glib-0.80:0
+ >=dev-libs/libatasmart-0.16:0 )
+ !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
+ libnotify? ( >=x11-libs/libnotify-0.7:0 )
+ lm_sensors? ( sys-apps/lm_sensors:0 )
+ video_cards_fglrx? ( x11-drivers/ati-drivers:* )
+ video_cards_nvidia? ( || (
+ >=x11-drivers/nvidia-drivers-100.14.09:0
+ media-video/nvidia-settings:0
+ ) )"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ dev-util/intltool:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+# Requires libxslt only for use by gnome-doc-utils.
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
+
+src_configure() {
+ local myconf
+
+ if use hddtemp && use dbus; then
+ myconf="${myconf} $(use_enable dbus udisks)"
+ else
+ myconf="${myconf} --disable-udisks"
+ fi
+
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable libnotify) \
+ $(use_with lm_sensors libsensors) \
+ $(use_with video_cards_fglrx aticonfig) \
+ $(use_with video_cards_nvidia nvidia) \
+ ${myconf}
+}
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/mate-extra/mate-sensors-applet/metadata.xml b/mate-extra/mate-sensors-applet/metadata.xml
new file mode 100644
index 0000000..5c977d7
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-sensors-applet</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-system-monitor/ChangeLog b/mate-extra/mate-system-monitor/ChangeLog
new file mode 100644
index 0000000..7bd23ef
--- /dev/null
+++ b/mate-extra/mate-system-monitor/ChangeLog
@@ -0,0 +1,40 @@
+# ChangeLog for mate-extra/mate-system-monitor
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-system-monitor/ChangeLog,v 1.8 2014/12/20 17:38:51 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-system-monitor-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-system-monitor-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-system-monitor-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-system-monitor-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 31 May 2014; Pacho Ramos <pacho@gentoo.org> mate-system-monitor-1.8.0.ebuild:
+ Needs to be rebuilt with libgtop soname bumps
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-system-monitor-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-system-monitor-1.8.0 (25 Apr 2014)
+
+ 25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-system-monitor-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-system-monitor-1.6.1 (10 Mar 2014)
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-system-monitor-1.6.1.ebuild, +metadata.xml:
+ New ebuild for mate-extra/mate-system-monitor, the MATE System Monitor;
+ imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
new file mode 100644
index 0000000..aed41d9
--- /dev/null
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-system-monitor-1.8.0.tar.xz 2099600 SHA256 00ef3c595d4837e44f70c40e683a292836c9c8a84d1f9ab66f5b97a206f47712 SHA512 175c46b05544de70fca37c444fd2ad4f578f62e50da1e0d30136fc2c6f79d49ff68c1d6fe6675d2aafd5d726c0b96d82971df3dc964b7430b2f4db179db91856 WHIRLPOOL 3a30f5c441ee1f60c7e735e7ea6c57d8e03cb22e7b3edb83bf2739548a939fc1ed64dd561bb3bd7e3f33de5643c25d14b940f8d9bb209403af1e30297728c266
+EBUILD mate-system-monitor-1.8.0.ebuild 1141 SHA256 4d4b8275ebfc459523ff72586fd61989d5b129572c2556dd78e9d0fcaff62a23 SHA512 bad01d03c931c26809738c22cb762e206ae4b6fd235b1784291438f734ff9c87eb50655ba2f51ab35c60766afd82f7e3e6e1528ca26b1bd95eee62c13dd471fe WHIRLPOOL de426ff7e8e1229735ffa52a48eea3f3dc829632ccc900f8a5fe8fe57cff4dff84212eec385b9af118ebc2d3ac4a80529f00dc6c6d0fcb091d3c989e08f11e0b
+MISC ChangeLog 1441 SHA256 89dcf70b084a0a104eeb47e49d7d2e6905585665a5233114dd27056806375064 SHA512 bdd3fa0170335a4056fb3fd67f013b90e180fd0841cac78182edb31d4573a13c328cc05d4bf780f3d19091f6457140ebbbe1a0d4eac563f611a16cb0ff34d15a WHIRLPOOL e545b5102d3e09a80a25f24420643c427344f61b0fbec3267ddf4e7ebfc0624c047295edfd0259fa60aa6bee502d1c334479564547bfb2edf102dfac1bd37be7
+MISC metadata.xml 270 SHA256 a34248f9989e878645498a88b0281b0bb11c24ae6f1467f2dd9739f92e25d97c SHA512 a4255c719f5deba97b108ee1fe844bd460151ca042adef0c3321bda7bcbb0d67abb656b3c425a8574d2bc5f56ec858656f770a3b4e9dc29204ebfb7f69be9469 WHIRLPOOL d8a7bb0fa977d7cd314ebfc7ec259aff394259cb334a12121cd4f9599eb1ca2b38877d71a059bc96567f6de85aa9d2398904f5f5e28062804450a676312268b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7+7QP/2u/Qe5knUekqAuNw4UEyG5L
+bcNVb0rPJvERYw9oI5id/6zlt37TzDBSqpMxRztox5/T9MFZQMrNQwcj+jxMzTgx
+wkPmiAXhwcmXZp6/M9empZERfuxWQvtv4Ub+DmDk+vDZAG7c5LXwS5crFtPmFRa9
+v+e9dqVpr3KBf/YEW1cFGRvpTv9pH3ImJ+TLhIu2LkrxYAKC/hGOs5Fy9keKqLSs
+o2C82gqVHNM/FCK606X+MVmpwoB32j3KlKBg1uLBawXt5QXaOy4vrYS3VdYemBy7
+c7Csl57jxge6y60jtyKB1e4hB3oYmJSzLur5l1yrgxD7TgorCg7W4DlBcEhtGCPm
+BZWRKIYkHT3Hln/gAb6/owARuk2P4oigJI0D+8zyi8MMRp/PcTMp8Wttnvo/cOoK
+BsNWOjuu6hf5aETYM/GC/CGFLJf/qABuwEbsszAzGUOSOUPIIF+qiNArwbkAFr4x
+sm3FqsMVCt2KOchp0oxVapVjag5hsTNSyz+Q/a+rktpjK9dFC3G+nW+ueUW/nCi7
+HBpdy4cfvwr48Bpj31IuTWDvtV4kf2A2jiHupDG3W5+tJHWUr3ejmXSyke78qEXw
+5sQFMvnM22ldY9WUut4U9+6k4iPNCi/mW7MKrH8Qo8loxFmmMIJQk+WDuYWSvK1M
+1EgByClwObxuF38NuRl7
+=gsyQ
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild
new file mode 100644
index 0000000..5a49373
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-system-monitor/mate-system-monitor-1.8.0.ebuild,v 1.5 2014/07/02 09:48:18 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE System Monitor"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-text/rarian:0
+ >=dev-cpp/glibmm-2.16:2
+ >=dev-cpp/gtkmm-2.22:2.4
+ >=dev-libs/dbus-glib-0.70:0
+ >=dev-libs/glib-2.28:2
+ dev-libs/libsigc++:2
+ >=dev-libs/libxml2-2:2
+ >=gnome-base/libgtop-2.23.1:2=
+ >=gnome-base/librsvg-2.12:2
+ >=sys-apps/dbus-0.7:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.20:2
+ >=x11-libs/libwnck-2.5:1
+ >=x11-themes/mate-icon-theme-1.8:0
+ virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/mate-system-monitor/metadata.xml b/mate-extra/mate-system-monitor/metadata.xml
new file mode 100644
index 0000000..8a00985
--- /dev/null
+++ b/mate-extra/mate-system-monitor/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-system-monitor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-user-share/ChangeLog b/mate-extra/mate-user-share/ChangeLog
new file mode 100644
index 0000000..722ea64
--- /dev/null
+++ b/mate-extra/mate-user-share/ChangeLog
@@ -0,0 +1,36 @@
+# ChangeLog for mate-extra/mate-user-share
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/ChangeLog,v 1.8 2014/12/20 17:40:09 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-user-share-1.6.1.ebuild:
+ drop old
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> mate-user-share-1.8.0.ebuild:
+ relax dependency on apache, wrt bug #532740
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-user-share-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-user-share-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-user-share-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+*mate-user-share-1.8.0 (04 May 2014)
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-user-share-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-user-share-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-user-share-1.6.1 (23 Mar 2014)
+
+ 23 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-user-share-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-user-share, personal file sharing for the MATE
+ desktop; imported from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
new file mode 100644
index 0000000..b7636c8
--- /dev/null
+++ b/mate-extra/mate-user-share/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-user-share-1.8.0.tar.xz 928348 SHA256 8cfe07fcf728384b073557aa17bc10c9e221c6d714a1009ace582c3c74cc8b5a SHA512 0d0231abfc65fc8d0a16ec871bc534d788d9699f5a3a8b2f967c6532b06266591c11199eb9630121c595513fb7255175bdd8eeae0a265e68c7d0f5059daf4947 WHIRLPOOL ecb66912c6015f97f24156f8b83824873136177acc525bbed72606af35cd21d95e1cd2ea556ac9b7c403e6a756e9e9577189ee4cd19301e721113c51780f6d01
+EBUILD mate-user-share-1.8.0.ebuild 1554 SHA256 d1a09b240b4385fe11e418c0b2acc23372b627f98fe10c04f4305c6b239e1bea SHA512 63756146991c90d79ae99d35fd4e8789aa1450493a64649bdb128993e391b110a848de2b7877adb9ecd4a806ff043975bc4ae03d37b40aab2ccf5e9291ddd608 WHIRLPOOL 4dacd937f827d4072a040c0fd8278de9b30b00e0c4daeb5fb03bd3f2174e4cc155cd2143cfd1c5a85e2ade049d6c32ce4d0024ba6c4ea6d6f33aaea6c1bb4246
+MISC ChangeLog 1402 SHA256 da90e6f9d8cf90856182513c6c2a49b301a4cf57b9662e09655e6203674dd1e7 SHA512 62909f5b05bc97378522fba36183f2ad867db2816d4a59f819585802ff1de2777db2d8f11a3a6dbc4ec03f6b37f2e7d48d9bc7687cbfc1b6fd1280ba3c1c0b8a WHIRLPOOL fb277808fc440aa68278ac1ca91dbd4b696145aab8157a8742ac9a969111972d3dc7dbf041fa1b214dbfae87e5178102f5e23fd58686668eb42b47158fb5be7a
+MISC metadata.xml 266 SHA256 3cc457f543fccf8a1543757e74b11dfe76eea705ed9054d085ff8303f1d9cc98 SHA512 481dc9079f73abfb3b56e98c5f74b7b2953b673fd88d9abeb453da13207759304878e4bcf52ccf90f0d9e4b34e2da128620bcd979cd720388e905c68f4618c96 WHIRLPOOL ccadfd85f04b39a8791ed8c0208c038ad4960acfd15473ff2c3ff2a16963f3ac0a2cb5771a206a73ff4bcab421b74f2d57965f3502a0c7f7dfdab485ee51eb78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7amAP/R2Z2cxXCsomCW+ITQQnWCLY
+ujn7US4Yx7mSwQiOzsYLcXWah92LZqeBnu9tyYRn3vlbTbWf3cU7AI7Eduzf7baf
+Ltg/U9+u3Acg0NdlUQlhXgrVjroDqWA6C6oOCL7f2Z3xVZ1bzpuy0oYOOL846iJe
+YQIU0dQXG6dR8neKXyHV/BrTCSV48M6lelXvqWRn/xHO5RMaRUz/h/7BIEyeK5x5
+zxYAhzoLfMGXPfBndQC6vEphU/u+ReGkzPVRSchQbZOsSfPd7bsyETMyqtIkVhnF
+rrTwX+U6rQGx3L09IUutQ6KJuRzmA+0NpbUewzq6Yf801y1rltGqo4MdqEzwo4vm
+c9Jo+5CvCPsVAzmK7Kp0jj5oYlHlgMPJKkQnmKZhQZOfI1d+pld9Porofet+XYte
+AzPjcQ1uE/oA/P3P1PaoplO4GaoGmA/ypQPOCh4NDLBGJYU6AFs5xioIrd6/JBW/
+Ajs2iuEJjvSaF+8KBD8VqwLpqjFAnIV4WN37JpcfwUEsLOlXqFnqH+4O2lJNtvps
+lGUAagoah3+b3gT56Gi7Mk/FlMP7qjpK6tlGdY+5A7/j6BRc5Lh3XI27rrXcUkLW
+x5ylaEIO0tVO3OVanLQB7Xghnh9UTpQnMbzHJCTAgI+TdGy2eFHLmdUum3yo5ZTl
++q4u9/DzTubfJDhhX8vw
+=We2p
+-----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild
new file mode 100644
index 0000000..c6dd789
--- /dev/null
+++ b/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-user-share/mate-user-share-1.8.0.ebuild,v 1.5 2014/12/20 10:25:22 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Personal file sharing for the MATE desktop"
+HOMEPAGE="http://www.mate-desktop.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="X bluetooth"
+
+RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
+ >=dev-libs/dbus-glib-0.70:0
+ >=dev-libs/glib-2.15.2:2
+ >=dev-libs/libunique-1:1
+ >=mate-base/caja-1.8:0
+ media-libs/libcanberra:0[gtk]
+ >=sys-apps/dbus-1.1.1:0
+ >=x11-libs/gdk-pixbuf-2:2
+ >=x11-libs/gtk+-2.14:2
+ x11-libs/libX11:0
+ x11-libs/pango:0
+ >=x11-libs/libnotify-0.7:0
+ >=www-apache/mod_dnssd-0.6:0
+ >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
+ virtual/libintl:0
+ bluetooth? ( >=net-wireless/bluez-4.18:0= )"
+
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_configure() {
+ gnome2_src_configure \
+ --with-httpd=apache2 \
+ --with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
+ $(use_enable bluetooth) \
+ $(use_with X x)
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/mate-extra/mate-user-share/metadata.xml b/mate-extra/mate-user-share/metadata.xml
new file mode 100644
index 0000000..3b08cd8
--- /dev/null
+++ b/mate-extra/mate-user-share/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-user-share</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/mate-utils/ChangeLog b/mate-extra/mate-utils/ChangeLog
new file mode 100644
index 0000000..494174d
--- /dev/null
+++ b/mate-extra/mate-utils/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for mate-extra/mate-utils
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-utils/ChangeLog,v 1.9 2014/12/20 17:41:13 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-utils-1.6.1.ebuild:
+ drop old
+
+*mate-utils-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +mate-utils-1.8.1.ebuild:
+ version bump
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-utils-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-utils-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-utils-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 31 May 2014; Pacho Ramos <pacho@gentoo.org> mate-utils-1.8.0.ebuild:
+ Needs to be rebuilt with libgtop soname bumps
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-utils-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-utils-1.8.0 (25 Apr 2014)
+
+ 25 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-utils-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-utils-1.6.1 (11 Mar 2014)
+
+ 11 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-utils-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for mate-extra/mate-utils, utilities for the MATE desktop; imported
+ from the mate-overlay, reviewed and adjusted.
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
new file mode 100644
index 0000000..4af521b
--- /dev/null
+++ b/mate-extra/mate-utils/Manifest
@@ -0,0 +1,4 @@
+DIST mate-utils-1.8.1.tar.xz 2648184 SHA256 0ad9c40c656214caaa6cbd2107ebb13e3cea0b64b4e31c7105568726313522a5 SHA512 71a6a57365a067012447222b2ef4b768234b2e58bf88b5b45c6e4b7f746c81136ea1dfee45257406b19f2c4f4c51adc3279b09f7c9c41bfe7be9c66321ad0eef WHIRLPOOL fc35c564fb378ebfc147b9344790aae5a3934e86f6cf642dedb2ab98ae093bb259e298f4fa6de98157f3c4775445862888a56464de8852d829e6040f9a42fc95
+EBUILD mate-utils-1.8.1.ebuild 2135 SHA256 33c0f6cb6d2f8f4f7d70cadafb8c3e4d88914ec75ac2de74ba6cf7609bd67910 SHA512 2f97e16e8bb2941f5b5e0cc18001629ff178ba0f6378cffd53eb09901f52098c9e3c6a0039597fb9f1718c2f53fca76474146a87ad4839bab461fdd2591001c8 WHIRLPOOL 0e7e199cd321df19430ffa974b51a6eda0c17f5d3e4f050d77cf6a7103ae7aba4f67113c7239dbacf414eb43e99a7936b744a4786f7e93e492ad9205ae946939
+MISC ChangeLog 1448 SHA256 8ed84091bb2729658f55e7cf505cb6c4f47f74899475d53f050cbb6ddf98f005 SHA512 bec2de2ddb2072e600f1b1828b12518865f530d3c483ea4ddb40d8b7cdc835e2e93e1648628594f02554dd6bc57cf65df0a95ab68e1da7a370698a8fa3c6ab09 WHIRLPOOL 2c8a7c4d80f16bfac5cd94c9cfb7e294f9cab9ee7f98646768323489b94654629f9513ae2051142bc564d3625d1d58a819b3fc2b6eeab7a956006ce16bf15c6b
+MISC metadata.xml 336 SHA256 0d2a2881231c126306ca4f87b5d50b6c24a43cf7660364045c7ece9da966d4b8 SHA512 83ec5ac8b9aa3dba5f4aacba706d0af08ce916548fd5df681ebbd261e234fadaa430a32535bcdcca83fa533dc3a7f042980b42405b8cfc5ebea2351f37173490 WHIRLPOOL f3fa5097a9f676552b9e26c0e9216d769cdd74954d86d950c2b7ed3897cf0ce418352aa5b9cb039a007bbb729ab8a2598040abc12d225729a092a50b037de2ad
diff --git a/mate-extra/mate-utils/mate-utils-1.8.1.ebuild b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild
new file mode 100644
index 0000000..81ea0ab
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-utils/mate-utils-1.8.1.ebuild,v 1.1 2014/12/09 22:23:27 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Utilities for the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="X applet ipv6 test"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.20:2
+ >=gnome-base/libgtop-2.12:2=
+ >=media-libs/libcanberra-0.4:0[gtk]
+ sys-libs/zlib:0
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ x11-libs/libXext:0
+ x11-libs/pango:0
+ applet? ( >=mate-base/mate-panel-1.8:0 )"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ >=mate-base/mate-common-1.8:0
+ x11-proto/xextproto:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Remove -D.*DISABLE_DEPRECATED cflagss
+ # This method is kinda prone to breakage. Recheck carefully with next bump.
+ # bug 339074
+ LC_ALL=C find . -iname 'Makefile.am' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+ # Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+ LC_ALL=C find . -iname 'Makefile.in' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die
+
+ if ! use test; then
+ sed -e 's/ tests//' -i logview/Makefile.{am,in} || die
+ fi
+
+ # Fix up desktop files.
+ LC_ALL=C find . -iname '*.desktop.in*' -exec \
+ sed -e 's/Categories\(.*\)MATE/Categories\1X-MATE/' -i {} + || die
+}
+
+src_configure() {
+ local myconf
+ if ! use debug; then
+ myconf="${myconf} --enable-debug=minimum"
+ fi
+
+ gnome2_src_configure \
+ $(use_enable applet gdict-applet) \
+ $(use_enable ipv6) \
+ $(use_with X x) \
+ --disable-maintainer-flags \
+ --enable-zlib \
+ ${myconf}
+}
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS"
diff --git a/mate-extra/mate-utils/metadata.xml b/mate-extra/mate-utils/metadata.xml
new file mode 100644
index 0000000..dca7782
--- /dev/null
+++ b/mate-extra/mate-utils/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>mate</herd>
+ <use>
+ <flag name="applet">Enable the mate dictionary applet</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-utils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/mate-extra/metadata.xml b/mate-extra/metadata.xml
new file mode 100644
index 0000000..211105c
--- /dev/null
+++ b/mate-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 mate-extra category contains additional non-core MATE packages.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie mate-extra enthält zusätzliche MATE-Pakete die nicht
+ Teil des Basissystems sind.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría mate-extra contiene paquetes adicionales de MATE.
+ </longdescription>
+ <longdescription lang="ja">
+ mate-extraカテゴリーにはMATEのコアなし拡張パッケージが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De mate-extra categorie bevat optionele extra's voor de MATE desktopomgeving.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm mate-extra chứa các gói MATE bổ sung, không thuộc về các gói cốt lõi.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria mate-extra contiene pacchetti vari per MATE.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria mate-extra contém pacotes adicionais de MATE.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria mate-extra zawiera dodatkowe pakiety dla środowiska MATE.
+ </longdescription>
+</catmetadata>
+
diff --git a/media-gfx/eom/ChangeLog b/media-gfx/eom/ChangeLog
new file mode 100644
index 0000000..5ed68dd
--- /dev/null
+++ b/media-gfx/eom/ChangeLog
@@ -0,0 +1,39 @@
+# ChangeLog for media-gfx/eom
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eom/ChangeLog,v 1.9 2015/04/08 17:58:14 mgorny Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> eom-1.8.0.ebuild,
+ eom-1.8.1.ebuild:
+ Drop old Python implementations
+
+ 10 Dec 2014; Matthias Maier <tamiko@gentoo.org> eom-1.8.0.ebuild,
+ eom-1.8.1.ebuild:
+ do not call python-single-target-r1_pkg_setup if USE=-python, bug #518026
+
+*eom-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +eom-1.8.1.ebuild:
+ version bump
+
+ 26 Oct 2014; Mart Raudsepp <leio@gentoo.org> eom-1.8.0.ebuild:
+ Add ~arm keyword, bug 508072
+
+ 07 Jul 2014; Tom Wijsman <TomWij@gentoo.org> eom-1.8.0.ebuild:
+ Add missing dconf dependency; fixes bug #516272, reported by Patrick Lauer.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> eom-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> eom-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> eom-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+*eom-1.8.0 (04 May 2014)
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> +eom-1.8.0.ebuild, +metadata.xml:
+ Version bump to 1.8.0, continuation of media-gfx/mate-image-viewer.
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
new file mode 100644
index 0000000..05fec6f
--- /dev/null
+++ b/media-gfx/eom/Manifest
@@ -0,0 +1,4 @@
+DIST eom-1.8.1.tar.xz 2192220 SHA256 d8c97de2aab548dce910cdfd98a11b671c943e9b195d38b043e482e2323ac6d8 SHA512 e054286eebdc88390dd8855d6b43704d4bc5d0b7d69f0dc73108d26e75882ee13bfaec01a30dbc42cee14e10ca42eeb9a6f576fe8435055ba289fe2292f97837 WHIRLPOOL 10856132756b1ea7ab9be23547d94968fcce3183528cb0d656c9cd307108fe8623a70a7ee53c85db6ef74a333691ffcf1210f8c9885db4a31b63713d8924c0d9
+EBUILD eom-1.8.1.ebuild 1885 SHA256 39108d38b05bdb914b2cdf08c5b43c80a348e28d55e4ea88a517d57a776071b4 SHA512 871544f34ab93a064dcd7800964a54a4e2ed0fa12ae548008ca078151d03a3a62d346f33e66ba711de4e3ef343ca860a2f1fe0e78bcab4b3ec77a55a719cdfa5 WHIRLPOOL 05a998b31a6cc3416a4d0407f4963f0b6cdefd6e194589051aea89857e82404f1e19f4a5ffe6ab994a4ca451c65a7ee1ebd870a5d7c5db1103b07bd52e23eb2a
+MISC ChangeLog 1400 SHA256 bd1bed92ac88b0a232d6aff6bc2c8183ef2227b7f98b6279466b3c1eedd9775d SHA512 a3b9d8022118d839d35e9cbad3cdac00c5c4aaa2625413f96711853e6934d0e798d16fdd4763906eadca540e139d13f298443b870ee71908f990c5ef6ed9a853 WHIRLPOOL d78db8e87d14a8742f6df4f049c0812715912b8f05efc24bf7d1d90bcfc0498da033ecd24f2ed0a50b64823daa3b0a9c109143eff4d8b9a33b3a65fd87f09fdd
+MISC metadata.xml 254 SHA256 ef0adb681f94285ec55719bd9db5deab138de1abf51f70cd1458a0e6866999f3 SHA512 1b907bbe283c87f8e36dd6314c234e970ad51526a1beaad2b38a65e82d2cc8628170a847c190915632d66a66d11568080aefec5c9123b95788ffcd48f38fa2c5 WHIRLPOOL b3d11b33e0e6efc6a2950a64c83f587040941d1893023cb803a3a1ba47275ab21bb132926f320ce4fa60104db8734b474e19ede2ce1fed24ea006abc72b25301
diff --git a/media-gfx/eom/eom-1.8.1.ebuild b/media-gfx/eom/eom-1.8.1.ebuild
new file mode 100644
index 0000000..abedc97
--- /dev/null
+++ b/media-gfx/eom/eom-1.8.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eom/eom-1.8.1.ebuild,v 1.3 2015/04/08 17:58:14 mgorny Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE image viewer"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="X dbus exif jpeg lcms python svg tiff xmp"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/glib-2.25.9:2
+ >=dev-libs/libxml2-2:2
+ gnome-base/dconf:0
+ >=mate-base/mate-desktop-1.8:0
+ sys-libs/zlib:0
+ x11-libs/cairo:0
+ >=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?]
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libX11:0
+ >=x11-misc/shared-mime-info-0.20:0
+ >=x11-themes/mate-icon-theme-1.8:0
+ virtual/libintl:0
+ dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+ exif? (
+ >=media-libs/libexif-0.6.14:0
+ virtual/jpeg:0 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( media-libs/lcms:2 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}] )
+ svg? ( >=gnome-base/librsvg-2.26:2 )
+ xmp? ( >=media-libs/exempi-1.99.5:2 )
+ !!media-gfx/mate-image-viewer"
+
+DEPEND="${RDEPEND}
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable python) \
+ $(use_with jpeg libjpeg) \
+ $(use_with exif libexif) \
+ $(use_with dbus) \
+ $(use_with lcms cms) \
+ $(use_with xmp) \
+ $(use_with svg librsvg) \
+ $(use_with X x) \
+ --without-cms
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
new file mode 100644
index 0000000..b8d1003
--- /dev/null
+++ b/media-gfx/eom/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/eom</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..d43e61c
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/net-analyzer/mate-netspeed/ChangeLog b/net-analyzer/mate-netspeed/ChangeLog
new file mode 100644
index 0000000..a6bdb8a
--- /dev/null
+++ b/net-analyzer/mate-netspeed/ChangeLog
@@ -0,0 +1,33 @@
+# ChangeLog for net-analyzer/mate-netspeed
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mate-netspeed/ChangeLog,v 1.7 2014/12/20 17:44:41 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-netspeed-1.6.1.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-netspeed-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-netspeed-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-netspeed-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-netspeed-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-netspeed-1.8.0 (25 Apr 2014)
+
+ 25 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-netspeed-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-netspeed-1.6.1 (19 Mar 2014)
+
+ 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-netspeed-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for net-analyzer/mate-netspeed, applet showing network traffic for
+ MATE; imported from the mate-overlay, reviewed and adjusted.
diff --git a/net-analyzer/mate-netspeed/Manifest b/net-analyzer/mate-netspeed/Manifest
new file mode 100644
index 0000000..7caea70
--- /dev/null
+++ b/net-analyzer/mate-netspeed/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-netspeed-1.8.0.tar.xz 567724 SHA256 991be6016800ed4b7db35b5157f176fee033e376a9480a94ef5f5fce63c1759f SHA512 e957fd3d63e87ddf3e9eb51c595611208d81ccbd4b7281814518ae36f016fe80931cfb62df62731a0dce7102e25c4d48427f45787bacc7f8018a8682725c7a8b WHIRLPOOL 50f32654520c7090d8b66cd64519bf83bd4c281f996ecbccac8a271fb715242b5a6c895f0d4156b7e23cd512a384a415a4fce05926f69d17ffe38405711094f4
+EBUILD mate-netspeed-1.8.0.ebuild 956 SHA256 c379611205201aaf3e0572afc4c84ee7fa653a07acd7aa5bc36ba6d38e7e2733 SHA512 8034663d979678b7081ca43eaadb93d5fa0b2f24f5b5c15f9f3754fc9cfe993444093dc4c41ddacbb47212eb89d40d34617f9ce03bc98e9a12c921482fb14c53 WHIRLPOOL 159097d9882c681be25f34704a8beca3aaef81ec87bfc760074c0f144d114fa22409270239c79745e9a527ec2ecd9ec63fdc35ba1ddd44b35261d403dc0446e7
+MISC ChangeLog 1254 SHA256 d635b52419282ff09aff1ebb15f41b32b2a0b5cc2f59ed8098e2bf0169d2bd3c SHA512 1e073e91254dfe044645e202095d7b70317c29ac48b87b3df926c3f09dc225facf5818712f9c9e4dbf7a9fff84a9d08d4b08ca05cd921ad77bb9d68f9d831f8f WHIRLPOOL 39d724a45afda35ce69388a26b2072d0eda085024f693b7d6384d55757aa457ad509633440984fcca828d1876567929d611321a39af4f8f8ff37a3bfc15bee10
+MISC metadata.xml 264 SHA256 e2cb2d8183377f49a3b3dd99ac858f592bec5ea0a71d4157026aad31a787493f SHA512 aae27e01251fe3608566171c2e47ca7a66fcc9a00ce68d8f5eb48274d053b697e1c58b0480d13480dfcb2e578dba690dc215002c1d79ead3f577c7fac1c69a74 WHIRLPOOL c70247d56f4a5ed92b80123d118929f5b7184023a523c4e04d0d5db9c5166952ed6cdb5b850353bb2a7cfb11cddc3e60534bb3567eab63feaa8221decbf6f100
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7R3oP/0In1vHJTJA2q//Hg0SLtsAL
+LKO3KiTUEAxixl9BQ1/LnPWsoJX1+Mo2srakHxNdVn/ueOAAyLQHOGF+vFkGQAEu
+cROFGl9FTouoB1moRLKUIH7E94fCRmMjF6kQ/7gc10rMyGKDGyzZnyYUr+s5Khsz
+WVldgwth7WDRnM38szZc5sHWWfWyw/3yj34kK9iuPPXegcHyy8xrc8jV1v1FAFpB
+/5kw0e3cVAuVzd+U94Y5oNMErB4E43Cr1uYWdpZcccAXTOdZHz1j9oa402F3Buow
+rvTKQA1J/7LgX/Ungcsy2V9hACj2OLim8jL/vN5UXdYkrtsox1dq1mSz16tefmnX
+lFb99qZkHt712jccYv+FTq5vorWB/EwRJHN05AqXsZoYpZ5kRutKGSx410UFcGO9
+PirJYP9drGNeyRfVBv/iYNf0OIFi77hLVQAXQVaJrx4WME6X+sv+TnCblDYH+gW+
+4PQxdZ4pDkswBp+JGE9wtq1oG/PEubeVifua4hS8AwynRh7Ysp23Fn2EUC5PFVHO
+/2cbqUsf+GSwanRVpYzh2O46gJz/1XtFxf5jAByKGgFPKJm52l8FGDGo/TutJTU6
+NCCxAhSg0s1IXBCIoDuDdZ9a+RNRg4iw/ks5vP8+5YNTFmH/v27H5L9eqz/C8tMl
+UidbsLiFamKJZL1S1c+K
+=pl1J
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
new file mode 100644
index 0000000..7177669
--- /dev/null
+++ b/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mate-netspeed/mate-netspeed-1.8.0.ebuild,v 1.5 2015/04/02 18:29:55 mr_bones_ Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Applet showing network traffic for MATE"
+HOMEPAGE="http://mate-desktop.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+
+# FIXME: wireless-tools >= 28pre9 is automagic
+RDEPEND="dev-libs/glib:2
+ >=gnome-base/libgtop-2.14.2:2
+ >=mate-base/mate-panel-1.8:0
+ >=net-wireless/wireless-tools-28_pre9:0
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/pango:0
+ virtual/libintl:0"
+
+DEPEND="${RDEPEND}
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.35:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog README"
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
new file mode 100644
index 0000000..fcdaefc
--- /dev/null
+++ b/net-analyzer/mate-netspeed/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-netspeed</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/profiles/repo_name b/profiles/repo_name
new file mode 100644
index 0000000..3bea4b1
--- /dev/null
+++ b/profiles/repo_name
@@ -0,0 +1 @@
+gentoo-mate
diff --git a/x11-misc/mate-notification-daemon/ChangeLog b/x11-misc/mate-notification-daemon/ChangeLog
new file mode 100644
index 0000000..6e346d3
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/ChangeLog
@@ -0,0 +1,46 @@
+# ChangeLog for x11-misc/mate-notification-daemon
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mate-notification-daemon/ChangeLog,v 1.8 2014/12/20 17:46:20 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-notification-daemon-1.6.1.ebuild:
+ drop old
+
+*mate-notification-daemon-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ +mate-notification-daemon-1.8.1.ebuild, mate-notification-daemon-1.6.1.ebuild,
+ mate-notification-daemon-1.8.0.ebuild:
+ version bump; fix typo (bug #523160)
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-notification-daemon-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-notification-daemon-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-notification-daemon-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-notification-daemon-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-notification-daemon-1.8.0 (25 Apr 2014)
+
+ 25 Apr 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-notification-daemon-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-notification-daemon-1.6.1 (19 Mar 2014)
+
+ 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-notification-daemon-1.6.1.ebuild, +metadata.xml:
+ New ebuild for x11-misc/mate-notification-daemon; imported from the mate-
+ overlay, reviewed and adjusted.
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
new file mode 100644
index 0000000..b3c6748
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -0,0 +1,4 @@
+DIST mate-notification-daemon-1.8.1.tar.xz 300984 SHA256 322b0f461d0972536916191481ee8f71b94c9534049498617c78218c9ce792a6 SHA512 45d9d8e95628a4ea384335a2293c85cda3177676acf6b4d3ee877f85f7b631c8f19429884017414f6882c4b6dcb32a1c2dbeb3bebaee8f8ab3107003bf3c9d92 WHIRLPOOL 4c88feacefd6e1f5b741e19694f8c17e83ff0963340b4f6a90bec07d532608e39ad617f41d5301e703dc3c3326021062edd748a44899e61905cabd1173b86120
+EBUILD mate-notification-daemon-1.8.1.ebuild 1404 SHA256 2e6dcfef22dada7c312cbcc5a2c576eef97439cb43f1b3990410193979efa7ff SHA512 9d4c5bb76635ef02cfe29a11976b99b7a0113e613b6550f349991fb28b70e27da3aa723397055ecc38177160f2149bfd907c99fe9b5210834fa465f1dc778940 WHIRLPOOL 28cd75792914d0fda1421edec2862f47da8a04f1186240b826d06725e4bcde9b693fdee731bb4f79b7ff9a2e0b02ba9df008b9533b7a6fee36bdbb76903426da
+MISC ChangeLog 1605 SHA256 40e57e829841d1bb5c9a9d998b591cf9a6e2cf6f98537e6b3f9bc47e74cf30d1 SHA512 961d9ac8461d65335a75d6922af42020ee1c20b4417acb25c1286c7bcde7c3b412071522da2e294338613470e984dcc9d4f775fddf8d33b6981a81a966d1ad56 WHIRLPOOL 79b9047a7a08e54cd4dec3ae0499fcccf6e5ecf13287435166be48ec167724fffa202b25ab05f15bb286223d605099c339e8de681dff1512ba9310dccb9c6ccd
+MISC metadata.xml 275 SHA256 1fb9b861a3144e296a8503be65dfa7a6407322ed692785db522b363e440a0429 SHA512 dbf8291f49135e714247468169ee0f08396c363cca295ab52b3d2d9c08a83bf5e0c5440c7f3ee361edfea80fd7932f30b453cf6360e2630b7b538e1ab8a107f5 WHIRLPOOL a5aaa8db1c4d521723233c08d16ab54b8543901e0e6ec13c3495be088c6a75f017f5c74027d6391ad829ad86fc0e665232b0345e2c0521f48e117e74657668f6
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
new file mode 100644
index 0000000..af34b4a
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild,v 1.1 2014/12/09 23:17:58 tamiko Exp $
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE Notification daemon"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/dbus-glib-0.78:0
+ >=dev-libs/glib-2.18:2
+ >=media-libs/libcanberra-0.4:0[gtk]
+ >=sys-apps/dbus-1:0
+ x11-libs/cairo:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ >=x11-libs/libnotify-0.7:0
+ x11-libs/libX11:0
+ >=x11-libs/libwnck-1:1
+ virtual/libintl:0
+ !x11-misc/notify-osd:*
+ !x11-misc/qtnotifydaemon:*
+ !x11-misc/notification-daemon:*"
+
+DEPEND="${RDEPEND}
+ app-arch/xz-utils:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ >=sys-devel/libtool-2.2.6:2
+ virtual/pkgconfig:*"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_install() {
+ gnome2_src_install
+
+ cat <<-EOF > "${T}/org.freedesktop.Notifications.service"
+ [D-BUS Service]
+ Name=org.freedesktop.Notifications
+ Exec=/usr/libexec/mate-notification-daemon
+ EOF
+
+ insinto /usr/share/dbus-1/services
+ doins "${T}/org.freedesktop.Notifications.service"
+}
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
new file mode 100644
index 0000000..504b80a
--- /dev/null
+++ b/x11-misc/mate-notification-daemon/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-misc/mozo/ChangeLog b/x11-misc/mozo/ChangeLog
new file mode 100644
index 0000000..969e395
--- /dev/null
+++ b/x11-misc/mozo/ChangeLog
@@ -0,0 +1,28 @@
+# ChangeLog for x11-misc/mozo
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mozo/ChangeLog,v 1.6 2014/12/28 21:43:33 eva Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 28 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> mozo-1.8.0.ebuild:
+ Drop support of unsupported python2.6. Drop run_in_build_dir which is
+ guaranteed to be included by python-r1.
+
+ 28 Dec 2014; Mike Gilbert <floppym@gentoo.org> mozo-1.8.0.ebuild:
+ Drop SUPPORT_PYTHON_ABIS, bug 533836.
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mozo-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mozo-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mozo-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+*mozo-1.8.0 (04 May 2014)
+
+ 04 May 2014; Tom Wijsman <TomWij@gentoo.org> +metadata.xml,
+ +mozo-1.8.0.ebuild:
+ Version bump to 1.8.0, continuation of x11-misc/mate-menu-editor.
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
new file mode 100644
index 0000000..cb0024c
--- /dev/null
+++ b/x11-misc/mozo/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mozo-1.8.0.tar.xz 162484 SHA256 326f0a6c30c07381b113b243ccdcc46269b2cab1e998ea6e1f9e79f520f015cb SHA512 4d5a0f8881b65c7ebf82686735f42183853c0c3687b5e15e594a0d9c88b6eb0d19201105773c3f3a539e93f045732a2c4e6d4718073283c4d518e505fed7e4ab WHIRLPOOL f47637cf8a6cb0ea2f805a3acf72df391e4c3dfb0f65af433be591a30e24f64ee3cf233b821dd4b790efecad468e66d23ca175b83ea309a3ac436b5d6d13cc00
+EBUILD mozo-1.8.0.ebuild 1612 SHA256 b30ecba2649a0d0c5446b4af5b1c910fdbc324831b8247c94a4f3ede20c6fc83 SHA512 8dbb394de01bfd1e124a46fb347dc4cfd0e790bc125c2e8ba5b99cbf73b553533102d966850c01eed4b7dec253da040a9d3b4bac4a75755d84074f55c4a0cc59 WHIRLPOOL 1e61daec30211430ba52b32a95592ef2218937209c801802a775abc8d93ab2fb59f26a73102f448822cd105b9725724667fdb0e1025ef9050104eb131db78ad6
+MISC ChangeLog 1059 SHA256 6e42f99bbf126bc30dffb6d73e6c16ef1cd1357ec5f74450a8ed81f95c9727bb SHA512 429fa12e73a331ae5089b9295e3e908c2c10c79c7529eb5c739e5cd793eec2cf16c132a15d4e168c3cf56038df0b3fe2d6c5ecf6e27c18936c2eb25a6c3306f4 WHIRLPOOL 3fa7b7fe18283b110c41867bc767f76dd195e89b487c14eee7d31781934e7aa3fb5b537505feadede2d5274ba80fac6fdf72d90f0a82d91494e9e5eff5df9015
+MISC metadata.xml 255 SHA256 285d7aebbd0b4cfa066330d6bb7f9cb85ee51d02e1f592410a7a0862d66671c0 SHA512 942ab18540e90651bdad3f1822711655442a64d84478a1a2da91334d64332209f737625fa3a2b7231581f1b57cdb7fa9d4fdde4229a9f754c281cb5a02e7f985 WHIRLPOOL 035015120c5576fb2dffaeeae7de3463a2ce5c1d83ba4a1cf0d3982e5badcb465a8b4fcc4f0cc790d67faca839a969d05876003675ab0321b65f24007140c195
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7SJIP+wZfO2hS1axEuVjw12PjmL/z
+TBIg6R0/qsfjx1IvY/kHikec8b7x4Gu5tqeuG9rYtlqzACcF+ZhqW8neI2S3hqeK
+hLC9cRf0ZzLtq93dLTgqBE/e3DQ6HuJ2TJ2FeJvjROVvXqtSeDxWF2x+jjjjnIT1
+pmhngbWKRY4RGBCTyx1wA+mFhFMKeiWHIg60h6/gujBQM3BGmLLf3sLM+yMGoAnZ
+Ea1FO1uySpqjs2rAAemHCYLBHC4UrlD+53zebWP9N8pYfFBdYtfQSYUdQ6Ckn+NT
+NCrNe1HLIV9JVgw2iJwo0e+HT0B7wf5MNf6xZlNliPDXHEEjVBsTJsmK2RbsZjS9
+dN4Cz59Xl8dhMo/6Vb3bNQTQZmtyAAYYwClkBufgBS0gEfSnG2wFb3YGm+hITCRu
+lFeZpvry3KPm5ADfwehLba3SRMJh178OCY7u+19QE0o6dC5YZGbHFldk+UHJkISG
+aU2uA41GW6gooZUREwWWWGYLnhpoCQMeLEffnYHSYt09x9TB/htKn3AJ1ecZZy4f
+wWCO+NzJHKgg2j+V7ucQrAyvmbnMPBcL8Gki+jLlM02Y6jQYQByMg/q8z3pjZome
+ijilFyWed4O+Ayxr0IdKH89AGRZXzpMGOUxzXcmc4xns3JprJrkp/5voiDglyYxh
+j7gOq02jHJy1kZDShAv3
+=XteT
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
new file mode 100644
index 0000000..07173e3
--- /dev/null
+++ b/x11-misc/mozo/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mozo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-misc/mozo/mozo-1.8.0.ebuild b/x11-misc/mozo/mozo-1.8.0.ebuild
new file mode 100644
index 0000000..2396aee
--- /dev/null
+++ b/x11-misc/mozo/mozo-1.8.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/mozo/mozo-1.8.0.ebuild,v 1.6 2014/12/28 21:43:33 eva Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+
+inherit gnome2 python-r1 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Mozo menu editor for MATE"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEPEND=">=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
+ >=mate-base/mate-menus-1.8:0[introspection,python]"
+
+RDEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=mate-base/mate-panel-1.8:0
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:2[introspection]
+ virtual/libintl:0
+ !!x11-misc/mate-menu-editor"
+
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+src_prepare() {
+ gnome2_src_prepare
+ python_copy_sources
+}
+
+src_configure() {
+ python_foreach_impl run_in_build_dir gnome2_src_configure \
+ --disable-icon-update
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+ python_foreach_impl run_in_build_dir emake check
+}
+
+DOCS="AUTHORS NEWS README"
+
+src_install() {
+ installing() {
+ gnome2_src_install
+
+ # Massage shebang to make python_doscript happy
+ sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+ -i mozo || die
+
+ python_doscript mozo
+ }
+
+ python_foreach_impl run_in_build_dir installing
+}
diff --git a/x11-terms/mate-terminal/ChangeLog b/x11-terms/mate-terminal/ChangeLog
new file mode 100644
index 0000000..2e1ba77
--- /dev/null
+++ b/x11-terms/mate-terminal/ChangeLog
@@ -0,0 +1,41 @@
+# ChangeLog for x11-terms/mate-terminal
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mate-terminal/ChangeLog,v 1.9 2014/12/20 18:05:11 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-terminal-1.6.2.ebuild:
+ drop old
+
+*mate-terminal-1.8.1 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +mate-terminal-1.8.1.ebuild:
+ version bump
+
+ 26 Oct 2014; Mart Raudsepp <leio@gentoo.org> mate-terminal-1.8.0.ebuild:
+ Add ~arm keyword for bug 508072 and me
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-terminal-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-terminal-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-terminal-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-terminal-1.6.2.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-terminal-1.8.0 (17 Apr 2014)
+
+ 17 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +mate-terminal-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-terminal-1.6.2 (11 Mar 2014)
+
+ 11 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-terminal-1.6.2.ebuild,
+ +metadata.xml:
+ New ebuild for x11-terms/mate-terminal, the MATE Terminal; imported from the
+ mate-overlay, reviewed and adjusted.
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
new file mode 100644
index 0000000..5151dd3
--- /dev/null
+++ b/x11-terms/mate-terminal/Manifest
@@ -0,0 +1,4 @@
+DIST mate-terminal-1.8.1.tar.xz 1160064 SHA256 d4ba3fd495feb4f8836ea9ca4c201c78fe9564c8190a2d3c84ca4e514a7aa39d SHA512 fec2b2a48ca5a6218a73694627e9a690f61be9706c12999428467755949a47d1f57fb5767370fe9c1fba02333b4802ecbebae0b7f87f547539cdd1b3eaa44ee1 WHIRLPOOL 8d1ed15964ffc67d22094c52a68b6c88aded026511d3de2c9bf9c0a494424ae27f5f234db5b9e2ce29eabfd512605cd478a5f255b22f6281f8da536fb5298cbd
+EBUILD mate-terminal-1.8.1.ebuild 1003 SHA256 d22d63713a35f0517839a76327bc227b323ac8504869fe998e886d1148a69450 SHA512 f9cce86b5b84cd40e3688290c4e2cbbcab4517fa5304b09e1783b24693598a94026d5453e99097df2003509c84c47c52db96b2e7f3794bcb24f991afc537a674 WHIRLPOOL 0cc3d78438a1eee8cbbe868b0fd659110eaf76645462badbc4bd8f9dd72377b4382820ee06557a08f054660b49754b385fba976479ecd5bc7efd5d9473568847
+MISC ChangeLog 1471 SHA256 39cb546514d356e050499e03c34686db48432002ee6d488a35e40429ec88a15c SHA512 28c2f9c61f1b28eee5cdcd39722b4ee73edd4f420bf4cab9a0e540c6029e88ed00b705faf5cf28a278cb2ceeb7a09db0776aaa41b4457405e7035f697b33501c WHIRLPOOL e2e540f738dd644ee1c39bbb8e029b9023b12ab14d44f559165585a234aab544b1e4da0cf641e3554b5ed04d153d0467d5b9ab692637063b38d29175a220e44d
+MISC metadata.xml 264 SHA256 e8e29a149f9db5dfc46476bb542bb10be41b2363779f0757afe343ec16086462 SHA512 19e1b64b25df123b13121aec5318384ec14b0804e08398f4c17c359d2d0d7fc39898917fa88247d53db83916a855f0e7d437d3363a4cf20362eaaf4f144fdfbd WHIRLPOOL e841f3182ac1fc5215bbcf6590a69626e1a1ca892965f12bbab6babd248cc768c5cc65cdcd6b3bdd29f21a174484e05a39969e40691710ed6538b02f8f785589
diff --git a/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
new file mode 100644
index 0000000..112d6e9
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild,v 1.1 2014/12/09 23:21:14 tamiko Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="The MATE Terminal"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="app-text/rarian:0
+ dev-libs/atk:0
+ >=dev-libs/glib-2.25:2
+ >=gnome-base/dconf-0.10:0
+ >=mate-base/mate-desktop-1.8:0
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ x11-libs/pango:0
+ >=x11-libs/vte-0.27.1:0"
+
+DEPEND="${RDEPEND}
+ >=app-text/scrollkeeper-dtd-1:1.0
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.40:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
new file mode 100644
index 0000000..8cdad0d
--- /dev/null
+++ b/x11-terms/mate-terminal/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-terminal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-themes/mate-backgrounds/ChangeLog b/x11-themes/mate-backgrounds/ChangeLog
new file mode 100644
index 0000000..b6d2ff0
--- /dev/null
+++ b/x11-themes/mate-backgrounds/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for x11-themes/mate-backgrounds
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-backgrounds/ChangeLog,v 1.8 2014/12/20 18:06:13 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-backgrounds-1.6.1.ebuild:
+ drop out
+
+ 26 Oct 2014; Mart Raudsepp <leio@gentoo.org> mate-backgrounds-1.8.0.ebuild:
+ Add ~arm keyword, bug 508072
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-backgrounds-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-backgrounds-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-backgrounds-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-backgrounds-1.6.1.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-backgrounds-1.8.0 (01 May 2014)
+
+ 01 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-backgrounds-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-backgrounds-1.6.1 (11 Mar 2014)
+
+ 11 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-backgrounds-1.6.1.ebuild,
+ +metadata.xml:
+ New ebuild for x11-themes/mate-backgrounds, a set of backgrounds packaged with
+ the MATE desktop; imported from the mate-overlay, reviewed and adjusted.
diff --git a/x11-themes/mate-backgrounds/Manifest b/x11-themes/mate-backgrounds/Manifest
new file mode 100644
index 0000000..d5438a9
--- /dev/null
+++ b/x11-themes/mate-backgrounds/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-backgrounds-1.8.0.tar.xz 11663712 SHA256 c7e46f9c4456b5a4c602c11653912ca51b055f777934897f8baced8ce21d0b05 SHA512 ee7658e61ec68c3d85eb9c5eb033468f2c93b54c62dd31d8bf84a71e744fec2c600ea5af0aa9db85f50df3bca282d6f92d4adf65aeb6a78653caa609d32e4334 WHIRLPOOL 09c0f783eefd662ec3bb2425ff2a17faead620630afbb7ba3ffd2f0279865a78fd33e2bd30cb32c782c86a3925a50c939feac70b934cb118548f71760f06a0e7
+EBUILD mate-backgrounds-1.8.0.ebuild 667 SHA256 fb42c7ce42baf340116c11262fe3aa149300521e858e2c34f039e8f555a05c67 SHA512 f30401c7c35c958f629ad856ec60775ae0f45777e69c2552c7cc9a25e8c5781d9d942da69cb57f133311aa5925e20bdf1ec452a1e834181b088c36230afd08ac WHIRLPOOL b050a98c8271cdb5737731e3ce068621bf2433755621df2dca575d3a79997a42af0a64413a4046fc852f100ae286930d0cf7f4153ad3ee5dc79d1ac9d5331a72
+MISC ChangeLog 1408 SHA256 bfa89034858a04394c0b95bf50f557ff89b703a52b45cc97c65f914aa46c15a6 SHA512 3cae86e4c69067a2c3607002d1ca75d8dba4cbbf14cafb810308dd3fcca96ca76ea1b1eac839836379d7133265d1fdb660bd91e14cb694ef7cd712980b04eb9e WHIRLPOOL 76f8f0a5ae4971da2a8b65c7b57e0b95963e533468628716b683a81fd3b8304f02d5fff3273b122844195d69534897a4dff02d52473fc746ed902114a02050e5
+MISC metadata.xml 267 SHA256 a97e7fc6a30c99dde87d45db3f22474c113ee0087f38a2c5fac6ebe0c8e5aa4d SHA512 9f808c058392378e1fa0eb4d1a5ab08d2a8914b80b2ba98c7848f3b2a90299771dce0654fc2a5bf1d39c6644347fc91538e660ffdb10867ecb389290c466be7b WHIRLPOOL b53457768d7f40c620b8a15b7323a39d5c1985dcca2947a341aecaf6d519aaf7aff9a682e7d96a4820ee11ae4b23aa38c85b2dff07553138ea1d90479ab9c8aa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7eIQQALpvFQcbS+T7GSATePE0D9Nc
+ytgth2l3vGs7pi0yMg0EX+rlMnSHQoi8JTaaGAllh9enGdBjfwED6KM63py8abAO
+BjO27CsoRwxahQQgtWMw+rP2ckW0EuXv9edd58PwxnuWg+jlXPC8O8Ibb+5oOGbz
+6XNs+AW8aHp34cPjRF1tZtlw7SCeEvQ7Voau0AV+Rv7+PGDOKT7X2aa9/gN/XHg7
+iwOJonNvKJWTN+phHqDkHj17IFsNhOKhRug36qUyWXrbMWBIfX07ICffd88AutwW
+UTtHpuE6Nzq4WWuJISqBOWfzv50Rsy7wINSmZTieqph4b6brtDf0Yrl5Gp2tqOIF
+TKgfJhW+JOSFwlCnmnO982pkJbOiX9o0tIGo3arPwWgeY+u4CgyzQq0TCkf2nzoM
+EdCtxITR7dHTjV5wGDOcvbtOwVTah7LjN8Zike50WP5nSiEQEMLlxJtPOJSjHx4R
+GzM1MueI30VDYRXe19cvYOgQcQuezG6kuXqwQDOOQS6oW6xEoZpIS44dFnszKAP8
+q+WL0DZsITclW85SoHunRHxYvZ7+5fJ/qwfRA6BJXDNhb9p83EcMi5NpMN2b9nTV
+1inhsak/G521v3luxC2WABAYzfmE3v1PHdaqdw5UGukmVpq7W7H40F/y7YdOLThv
+6pvzYb5PcDIz0ciK+zgj
+=h1Wz
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/mate-backgrounds/mate-backgrounds-1.8.0.ebuild b/x11-themes/mate-backgrounds/mate-backgrounds-1.8.0.ebuild
new file mode 100644
index 0000000..b56fd7d
--- /dev/null
+++ b/x11-themes/mate-backgrounds/mate-backgrounds-1.8.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-backgrounds/mate-backgrounds-1.8.0.ebuild,v 1.5 2014/10/26 04:19:32 leio Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A set of backgrounds packaged with the MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+DEPEND=">=dev-util/intltool-0.35:*
+ sys-devel/gettext:*"
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-backgrounds/metadata.xml b/x11-themes/mate-backgrounds/metadata.xml
new file mode 100644
index 0000000..17a1804
--- /dev/null
+++ b/x11-themes/mate-backgrounds/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-backgrounds</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-themes/mate-icon-theme-faenza/ChangeLog b/x11-themes/mate-icon-theme-faenza/ChangeLog
new file mode 100644
index 0000000..543d447
--- /dev/null
+++ b/x11-themes/mate-icon-theme-faenza/ChangeLog
@@ -0,0 +1,39 @@
+# ChangeLog for x11-themes/mate-icon-theme-faenza
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme-faenza/ChangeLog,v 1.7 2014/12/20 18:08:32 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+ -mate-icon-theme-faenza-1.6.0.ebuild:
+ drop old
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-icon-theme-faenza-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org>
+ mate-icon-theme-faenza-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-icon-theme-faenza-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org>
+ mate-icon-theme-faenza-1.6.0.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-icon-theme-faenza-1.8.0 (01 May 2014)
+
+ 01 May 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-icon-theme-faenza-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-icon-theme-faenza-1.6.0 (19 Mar 2014)
+
+ 19 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+ +mate-icon-theme-faenza-1.6.0.ebuild, +metadata.xml:
+ New ebuild for x11-themes/mate-icon-theme-faenza, Faenza icon theme, that was
+ adapted for MATE desktop; imported from mate-overlay, reviewed and adapted.
diff --git a/x11-themes/mate-icon-theme-faenza/Manifest b/x11-themes/mate-icon-theme-faenza/Manifest
new file mode 100644
index 0000000..46fa9c1
--- /dev/null
+++ b/x11-themes/mate-icon-theme-faenza/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-icon-theme-faenza-1.8.0.tar.xz 20817400 SHA256 6d1044af459373178ce05305db66b7dc6afb03b5475eacd122c19156fea0307b SHA512 38e60a44df80223a0c72b6cc124aa79ae5df8f90a842ef1c5c54bcb66b2aaf926c197ff8f8869d4643bdda1d4a168e4334b35ba06f1cdf13959d0b1ca994ea6c WHIRLPOOL 6600e068bbf2d82bf94f15f23ac905b2361ebd9cd388ad0b392672121848991b34771eaec1821a8b7fb957e9245b357d03b1363a185ea411e4fd76fa6aad7566
+EBUILD mate-icon-theme-faenza-1.8.0.ebuild 817 SHA256 b6f0bbfa6c3befaf74d1d5783bad1a3c14b3bd905389d98cf0f3f56292fa6b91 SHA512 c4267eeea8e2ec5c16ce46e102d368408a4db636e7ff1c344b9e435320f772017fac331fc1d4278848135e3b6a1fbaa845f7bc29aeaaae61788ed70b845fcdf6 WHIRLPOOL 724185a2024ed09125b31206eb42538f3476f498dcd68e4b0b47081c158b325d8d895cf8e3e553b09a032d0c69547deff3e0d7fa22bae4215c38132c55d1cb2e
+MISC ChangeLog 1376 SHA256 b5af1610b660170d5b9959f55787101b50e3c3ad600a946d63679debc84181ae SHA512 d0f35ef4c118db3b474a53a1065ad8e215b9cc07b6c07cc0fbfe8af6c9d2efc617022678e2ad31a2c7b8fcc50dea6845097c643a39244b41541a33c73e562943 WHIRLPOOL 563ef63b5955c46a7b9540ef04d85158569ecd0c2046b654fb2a9743cbc230ac345a203b58f6a771126ed6854cd08c772708df9e1276ce7839f29e3e24134e8a
+MISC metadata.xml 273 SHA256 fcff3b27af3d892f209117452e5fc4a47ef49856f88b448a64980ce4a6a79d7e SHA512 de4dd6308d9bd8fefa819529ee20ae424ebd58e9398bcfc71fe0552518b030cd9b07e7249f79f86dfe9c752a7da0635acd9413df7c6a089c1ca2ea0619c8d50e WHIRLPOOL 43f7d69f3f542c20c9a5c4be030abdc024cfdf3cb7b3978d5084f0179f98649ce894a6739a5957c29d3b1aad97232af489c17ee7e96c2939b7bd32aa42adf949
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7jDcP/iG4Zd8vXTIDysEMVpBTMYc7
+/pWRzeupCzo6Narl5dWsfLq7n9nDT6fPj8wlKV8OXmEYOmsCJ+BoAyczr8fbC4CP
+mudhEfjsHKCiDue8A2Ki6u52UmKe6EtIj9Y1RKYyRBjWY4vM6VvEd3ZaPVYwkk8E
+RzwaMjKIMfVCfrFXmRPyBqeBxYsE/7DewOC7kJDe8KaW7yLZtHAXVKJNd3BbgVuk
+/1fOo4ATeeq0IzUVSEfRpJTMkr4cIa88bp08QL8fqNDbkvpVJN8s2OlDsLbiLd08
+HwdVwUUCPaw6Aen30cd88apll7ojQed2vARehsUCSgAnhUvvf5j8y9NTzYogq1+N
++/pENHbhKglokufaT3Qc/N5R/xBxzCtUrQJhu1rm3eyxjHfOR/vVS3jiUXI9wbbT
+tURB766lYfxJ2JPQL36zCFoc77cQnxwfU9wVPgO1+/itYiHJ4ej296K5ErWw1D8b
+3VeWN2yk4n85a9Bnzg7ZhSv8h9g9YOkaqQhWfF0dqI5YV4i5U4K7FJ7iJBYv1PrB
+uPpmy0utSKh1CPgftawY0RAyRK1GTcH1GemFFTbvbCluiH0YRpRKPsvuoMMYDjIF
+1GOj4N279MkDEOWJILKeI8O+2K5Q6wx9w1sQiNXrdoFYlpg5/9wKCmMLAhgCptx3
+OwNOny3noVawP0w69zkR
+=58Cd
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.8.0.ebuild b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.8.0.ebuild
new file mode 100644
index 0000000..3470805
--- /dev/null
+++ b/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme-faenza/mate-icon-theme-faenza-1.8.0.ebuild,v 1.4 2014/07/02 09:49:20 pacho Exp $
+
+EAPI="5"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Faenza icon theme, that was adapted for MATE desktop"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="minimal"
+
+RDEPEND="!minimal? ( >=x11-themes/mate-icon-theme-1.8:0 )
+ x11-themes/hicolor-icon-theme:0"
+
+RESTRICT="binchecks strip"
+
+src_prepare() {
+ # Remove broken libreoffice icons (dangling symlinks).
+ rm matefaenza/apps/16/*libreoffice* || die
+}
diff --git a/x11-themes/mate-icon-theme-faenza/metadata.xml b/x11-themes/mate-icon-theme-faenza/metadata.xml
new file mode 100644
index 0000000..42eff31
--- /dev/null
+++ b/x11-themes/mate-icon-theme-faenza/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-icon-theme-faenza</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-themes/mate-icon-theme/ChangeLog b/x11-themes/mate-icon-theme/ChangeLog
new file mode 100644
index 0000000..41ea82e
--- /dev/null
+++ b/x11-themes/mate-icon-theme/ChangeLog
@@ -0,0 +1,43 @@
+# ChangeLog for x11-themes/mate-icon-theme
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme/ChangeLog,v 1.10 2014/12/20 18:07:13 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 20 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-icon-theme-1.6.3.ebuild:
+ drop out
+
+ 26 Oct 2014; Mart Raudsepp <leio@gentoo.org> mate-icon-theme-1.8.0.ebuild:
+ Add ~arm keyword, bug 508072
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-icon-theme-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-icon-theme-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-icon-theme-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-icon-theme-1.6.3.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-icon-theme-1.8.0 (01 May 2014)
+
+ 01 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-icon-theme-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+ 10 Mar 2014; Tom Wijsman <TomWij@gentoo.org> mate-icon-theme-1.6.3.ebuild:
+ Further review of dependencies.
+
+ 10 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ mate-icon-theme-1.6.3.ebuild:
+ Remove guessed SLOTs from icon-naming-utils, gettext, intltool and pkg-config.
+
+*mate-icon-theme-1.6.3 (07 Mar 2014)
+
+ 07 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-icon-theme-1.6.3.ebuild,
+ +metadata.xml:
+ New ebuild for x11-themes/mate-icon-theme, MATE default icon themes; imported
+ from the mate-overlay, reviewed and adjusted.
diff --git a/x11-themes/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
new file mode 100644
index 0000000..4eb438c
--- /dev/null
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-icon-theme-1.8.0.tar.xz 15512320 SHA256 e6b981f74e7e5faa9d3a3b64580b66a327737152c1a230608367e9fa7bb63eac SHA512 c8f37498ad7789eab66e4c8fb9de3c0821a49f099a875dc487b2897fce04e015ad5015343d0dd56df11e761fc98cc11090878eb7db82aaea478937ce7823ef80 WHIRLPOOL 8e9da6b8f329d5a72175157419c047fbd7b499269eae132384dc650e850a0dbcd39d4f566a402afd1e8817464b4ac3c5873cd14942fb5ea70d389c4d87c40908
+EBUILD mate-icon-theme-1.8.0.ebuild 838 SHA256 2905c0c4570b17c2cb7eff0c7db024dedb704faa2fa96e3b7dfb663e3808209d SHA512 fd94eab3964a7804043c92231dbd89e59576af836a41c8011548257c6b6ede5f55161ee3f7300492f5766b177147eda52f75c8cf2d19c4fda979712729c61f63 WHIRLPOOL 797a795ecffc3cd4bd889c3747958a15a46822c8d7ae23dcfca9c5cb1ed4b3c6814610f41cbc953aeda9ad14e1cda2567054d815a7145c4580730fda988970aa
+MISC ChangeLog 1647 SHA256 4badc271c7c480e76fcb914f1b8701feeecdf3f5b76c318cd31572169ea6ccf6 SHA512 c3e30abca63db65a0aa16381f79655d1fa08e22cd8212ef0d829ed54184762ff4ddbd8f20916534e4e9b8c1696ed94bdc83cdeaa28cf0514d7a577d6628ed7c0 WHIRLPOOL 348f4d784a194b89f3db7e5098d119de22af0950b074646c72b1182cbc6d8314b4b050d9595374ec7f6ae37d96df179753223351e2278cfba4a10819c42a2593
+MISC metadata.xml 266 SHA256 fdbd74c0c962334395566d6bf2a7a9ab2c040ad1dd5d3d3808b30f5264edde28 SHA512 ba3f21863036083541b88de078d767adfe30c01862873e1628f7279ffa13f3ebd1e7461e1505d26f96b3b6e1d524146196a88ae823e7a1be45bcd3646928434a WHIRLPOOL 1d38ae1b017dc8ee24d26afcc8607259aaa29810c3048d685ae435f14a0a522e500f3b41f43ceac9887b13018e831aa241c4323def0f5e517355a9a1f902da02
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7qWsP/2VHClb/LEN4vpUiU/lJErWD
+8AnHWw8B9pbG0TRcbggigZB6TkOiMV4XH2NvMO/5+1svByu4BVA3n9Ja2DJhDqxs
+uHS6pjNzO8N6g2E/w2jwWBqxiecrBElkXIFLtvopRHHbku+0mO36o//lVtsTHRWq
+rjL0MFH2qNSaFaTEH+h+kayGpDf9rQrJU2aza7C/neN/F8ZkxX3BeSRpLaTz8gqa
+ZhguHtULrycPzESVmphRR0gC0We+i8j1B4Gt/41hEHbStqfxavU3yKRlqvbKjAXF
+/UbqiB56+2GISoC+S8u5h8T9nHH+joN7dwRSofMichlSiGM1YRS8mHcJP286qe9R
+lFP1LRYp3MnXC3afr6oqHrFxaWcrIqEbPNj6o4vvgcypceWmWoXRHkxadossu4MC
+jBlkMp0/kOmJa6pul2AbHcSJ+5PUodWrAyKGcPmdfU3bW0dvx2ZfRyUYCss9z1Vn
+yU4qIOY05AUJsEvpo3GgBoYIYg7vcJXEE79nUKBf+VsOYj5dgvOLm1Cvt2C/YT8U
+HyLYJTBeH8GmK5Op6xjVhpSz2QjHcj5uevCAY74YyG+LSAEwACXKjjDqH4S3/UCt
+YSz1ZOOBEOhVC+xmJvuwDcQGuqGZYex2Z4AJ2EK5PyOiB3m936aXgXaYYW3EgB8/
+AGO/8t5kGRiSOBR1Hupu
+=RJGq
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.8.0.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.8.0.ebuild
new file mode 100644
index 0000000..394edc9
--- /dev/null
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-icon-theme/mate-icon-theme-1.8.0.ebuild,v 1.5 2014/10/26 03:54:16 leio Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE default icon themes"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40:*
+ >=x11-misc/icon-naming-utils-0.8.7:0
+ sys-devel/gettext:*
+ virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_configure() {
+ gnome2_src_configure --enable-icon-mapping
+}
+
+DOCS="AUTHORS NEWS TODO"
diff --git a/x11-themes/mate-icon-theme/metadata.xml b/x11-themes/mate-icon-theme/metadata.xml
new file mode 100644
index 0000000..21fac76
--- /dev/null
+++ b/x11-themes/mate-icon-theme/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-icon-theme</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-themes/mate-themes/ChangeLog b/x11-themes/mate-themes/ChangeLog
new file mode 100644
index 0000000..bc18fbf
--- /dev/null
+++ b/x11-themes/mate-themes/ChangeLog
@@ -0,0 +1,34 @@
+# ChangeLog for x11-themes/mate-themes
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-themes/ChangeLog,v 1.7 2014/12/22 00:53:42 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+ 22 Dec 2014; Matthias Maier <tamiko@gentoo.org> -mate-themes-1.6.3.ebuild:
+ drop old, fixes bug #533250
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-themes-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> mate-themes-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mate-themes-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 04 May 2014; Agostino Sarubbo <ago@gentoo.org> mate-themes-1.6.3.ebuild:
+ Stable for amd64, wrt bug #509268
+
+*mate-themes-1.8.0 (01 May 2014)
+
+ 01 May 2014; Tom Wijsman <TomWij@gentoo.org> +mate-themes-1.8.0.ebuild:
+ Version bump to 1.8.0.
+
+*mate-themes-1.6.3 (11 Mar 2014)
+
+ 11 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +mate-themes-1.6.3.ebuild,
+ +metadata.xml:
+ New ebuild for x11-themes/mate-themes, a set of MATE themes, with sets for
+ users with limited or low vision; imported from the mate-overlay, reviewed and
+ adjusted.
diff --git a/x11-themes/mate-themes/Manifest b/x11-themes/mate-themes/Manifest
new file mode 100644
index 0000000..d2fcc77
--- /dev/null
+++ b/x11-themes/mate-themes/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST mate-themes-1.8.0.tar.xz 2885328 SHA256 bd64599e2b6354b744e5ff574877f7195ab204b4d3921eb7324eb8de4f9e0628 SHA512 00853c8c675dcaa0eeb96aaead24c0065a1c0982a3c88ba144dd25241c1639dd05969dfe9127b2451b6878134c257b1c211175403a1a9d0f3d29bb3b303337ec WHIRLPOOL 5a6faed68f0cfb4db56cac15b902215e0cf7f176d3df3437bff5c8a95390f81ef49cb7f289716c2135727cb8127ab0b84ac12f76de8e3b94414902197bf8fea4
+EBUILD mate-themes-1.8.0.ebuild 989 SHA256 4df9f2773fac2a01928350aef1ba43ce6bc14ca63ad33845f99783640d1acb27 SHA512 f6768bb6f9b61da855ff512eb1c02a8377e0c6d12562feaba0b3da963340d1858a723df05e50c352c3dc1651d32a54f01091ca3cd0b6ddca681ae88ce8dcaaf0 WHIRLPOOL 2de9a53571276a9092e90be49ba432e077850654738a718312f7757c60eb14bd34e4450b2281d4157d0c85a1277bb974ea7a6367edb0a3f66b98666909e89cc6
+MISC ChangeLog 1274 SHA256 eedaf280f0e35b2319850fcfd7e56736711ed1301098dc6049acb0a767a38830 SHA512 c9721ce0c5df9535da2e0f2041abe5684db80c4b54bec0de267990ed3bfb0d378d9cfc098517c45ced65e14a2dfe31d72e1e63d08b2eb01e4f574c5aecdf1d4b WHIRLPOOL b858c0e8a04d18fecd2f910c21dd3fb4ffc8c576f2e49f91a9d595f997cb2726a3e8b892eece87a6969183fefd359f66c13644d7075dc5fbd2325c3152898716
+MISC metadata.xml 262 SHA256 069edbb584e7d252157bf069cac742e7e101b45700aa7ad2c7a55fd3b8119a81 SHA512 ed808f6f5e59c1289546255f39cb33803ae7f5fedbd98a1f50a3cc855b5720ea6dcae775713fbc35a610f8641cb064c393beee569c9e9540a7f8b65700a51a10 WHIRLPOOL 2ef63d793c70084042dd0539ce1698ad5a7ec72678b41f379c7ebbe0869013723a1bd9eee9359cf73aa9ce3f9934ec68c3cc861d6b53f4a44d15c5f747c90263
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVmgYNAAoJEBzZQR2yrxj7a5sQAKraUHCNZv5OHOJARnZCjJoD
+9M71ccD/zD3n7XnNaWWK/bCuDclIL7vha3rbq1pe1F+qiN3MwIB698dTDpR47cbn
+jmL9G67X+YZwZlyMuAuRBLR3QJz5T1sd6IvpKrOzIpNEsoeYKzREq1FwDARa/09+
+6qOW3DwvvY6YpwbEzX9SHHccQvJ7BZa8PKQnUXq1sWyfJWSXb7sK7p5x5HYgre91
+qiRBRCI9TbUqi8qeKdjWvlRhmAQNdMNtHujAW92masRZqT+HcmY+RPpm9svrKOcM
++xzojKN4TBZYEMp1GstYYFNWK1tvxM2unWTa/YA5svlt02ksFETdkpaUHxPvHpu1
+K02urThigzNexcNF/wrYLy/klA/OQablPRIEMfwpVrM0m5o+fpBTF1NMoFeyUzrl
+vuE+JDnPFsmhh1hriLYQONm4cSNBo4tnq7bJvEg2EKW3pkjsRE8hcbCF2wkFbzqM
+69i5PkXYoc1fy6NGQMPtQZmiQgXeKgGDb0CgYNpxHabsuWj/R4hzmQhKPnNX/PBH
+89vZygjGqQ6M8pHW5TD+L8AY60KmvEOV1LawwdLr08228cXEyzDxDPJH1Nre/BH5
+9TifFM0ahRR9Zd8nzaGKFINBwJEfz6VNHfdZhnS+sFWsnFUXHMKCv7YQY1tATl4u
+xKgUPa23HBRkPHZkY/et
+=jRTP
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/mate-themes/mate-themes-1.8.0.ebuild b/x11-themes/mate-themes/mate-themes-1.8.0.ebuild
new file mode 100644
index 0000000..8a03102
--- /dev/null
+++ b/x11-themes/mate-themes/mate-themes-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/mate-themes/mate-themes-1.8.0.ebuild,v 1.4 2014/07/02 09:49:32 pacho Exp $
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="A set of MATE themes, with sets for users with limited or low vision"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=x11-libs/gdk-pixbuf-2:2
+ >=x11-libs/gtk+-2:2
+ >=x11-themes/gtk-engines-2.15.3:2
+ x11-themes/murrine-themes:0"
+
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35:*
+ sys-devel/gettext:*
+ >=x11-misc/icon-naming-utils-0.8.7:0
+ virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-test-themes \
+ --enable-icon-mapping
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
diff --git a/x11-themes/mate-themes/metadata.xml b/x11-themes/mate-themes/metadata.xml
new file mode 100644
index 0000000..d4b54b3
--- /dev/null
+++ b/x11-themes/mate-themes/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/mate-themes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-wm/marco/ChangeLog b/x11-wm/marco/ChangeLog
new file mode 100644
index 0000000..dee2eab
--- /dev/null
+++ b/x11-wm/marco/ChangeLog
@@ -0,0 +1,29 @@
+# ChangeLog for x11-wm/marco
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/marco/ChangeLog,v 1.6 2014/12/09 00:30:28 tamiko Exp $
+
+ 06 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
+ Updated maintainer and add remote IDs.
+
+*marco-1.8.2 (09 Dec 2014)
+
+ 09 Dec 2014; Matthias Maier <tamiko@gentoo.org> +marco-1.8.2.ebuild:
+ version bump
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> marco-1.8.0.ebuild:
+ x86 stable, bug 513714
+
+ 02 Jul 2014; Pacho Ramos <pacho@gentoo.org> marco-1.8.0.ebuild:
+ amd64 stable, bug 513714
+
+ 07 Jun 2014; Agostino Sarubbo <ago@gentoo.org> marco-1.8.0.ebuild:
+ Add ~x86, wrt bug #508072
+
+ 31 May 2014; Pacho Ramos <pacho@gentoo.org> marco-1.8.0.ebuild:
+ Needs to be rebuilt with libgtop soname bumps
+
+*marco-1.8.0 (28 Apr 2014)
+
+ 28 Apr 2014; Tom Wijsman <TomWij@gentoo.org> +marco-1.8.0.ebuild,
+ +metadata.xml:
+ Version bump to 1.8.0, continuation of x11-wm/mate-window-manager.
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
new file mode 100644
index 0000000..a59e635
--- /dev/null
+++ b/x11-wm/marco/Manifest
@@ -0,0 +1,4 @@
+DIST marco-1.8.2.tar.xz 1119448 SHA256 a5ef03dfd4de035ed6c99aca500256c6f4564a090702066303770dbf7c893443 SHA512 9d8ea38e78a07cd94737bd1da7956b09fba8adc7716b63b281300cdf7c43db1fbed285b6f6085b41bf8ff367e48993ecd230e1ce8a29f3c476d5247274087959 WHIRLPOOL 53ae69ddd5146b6d1342f9ff70d3d5f587befbef25d90d70ae4a2327d3f3b62cb6255ff8840ea88b8d74b8b4b50062a801219dff6b9b6df676726749e4d38027
+EBUILD marco-1.8.2.ebuild 1725 SHA256 a36e6a5039bee48c5eca71af3d9426431ebec46716a05043bf0aabfd88c281f7 SHA512 fc668c9c5491e64ea9ed46b1109643566df5742ad096194ac23c22f813e05a3accce1057fb845b0e541cf5d4e2f998848b920ced6d5581202367b13716b0b4e6 WHIRLPOOL 02af6990755aca5dd48abaff9acbfd26e67853673082d781a3102f21c2c13e851d768ea73c3ad04f48875e1605dd0896df4cec7f81ea9d221a156ab0eb29f9ec
+MISC ChangeLog 999 SHA256 66256f85aca28e4bcc8fa7dfe8e290b1fa67aa6a36e15dd1a570e28c41f5d45f SHA512 661941e6b5651b419783d8e84df9b8784d79a05f90d99404204ee5326d4fe4241396d26017a3f6f2fa3cc3777a159eede6df3eff718735c6ccb07c5e5521652e WHIRLPOOL 4de678a07f94beaee625239147a3e9b91a4261751de2ff9cba116519afc5cfab70d4e0d1face1ee2bd484db8dbb899e4b27801853653bc73f66deb8f06c42fc8
+MISC metadata.xml 256 SHA256 108934a08ab750d7f0494ffefb3d8b2309dbc7c52036b096109961bb043b330e SHA512 07eab3de273b886fae269e4da4802257d0b82832ac69b643fe73079f4d60ee971f617dc9e357e998eab79d8a4cfbf4ec17ec38f600783e66132c537f635d5fff WHIRLPOOL f121a9c0827cfbd6f682b8d8bb26ddb4bcdbfdead6775e559d13c4f65a5b3e1f2071808d5a921351f8c3f47fff001f16d652247e3e844fa0faafab0264a66f45
diff --git a/x11-wm/marco/marco-1.8.2.ebuild b/x11-wm/marco/marco-1.8.2.ebuild
new file mode 100644
index 0000000..edcc67e
--- /dev/null
+++ b/x11-wm/marco/marco-1.8.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/marco/marco-1.8.2.ebuild,v 1.1 2014/12/09 00:30:28 tamiko Exp $
+
+EAPI="5"
+
+# Debug only changes CFLAGS
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 versionator
+
+MATE_BRANCH="$(get_version_component_range 1-2)"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="MATE default window manager"
+HOMEPAGE="http://mate-desktop.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="startup-notification test xinerama"
+
+RDEPEND="
+ dev-libs/atk:0
+ >=dev-libs/glib-2.25.10:2
+ >=mate-extra/mate-dialogs-1.8:0
+ media-libs/libcanberra:0[gtk]
+ >=gnome-base/libgtop-2:2=
+ x11-libs/cairo:0
+ >=x11-libs/pango-1.2:0[X]
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.20:2
+ x11-libs/libICE:0
+ x11-libs/libSM:0
+ x11-libs/libX11:0
+ >=x11-libs/libXcomposite-0.2:0
+ x11-libs/libXcursor:0
+ x11-libs/libXdamage:0
+ x11-libs/libXext:0
+ x11-libs/libXfixes:0
+ x11-libs/libXrandr:0
+ x11-libs/libXrender:0
+ >=x11-libs/startup-notification-0.7:0
+ virtual/libintl:0
+ xinerama? ( x11-libs/libXinerama:0 )
+ !!x11-wm/mate-window-manager"
+
+DEPEND="${RDEPEND}
+ app-text/yelp-tools:0
+ >=dev-util/intltool-0.34.90:*
+ sys-devel/gettext:*
+ virtual/pkgconfig:*
+ x11-proto/xextproto:0
+ x11-proto/xproto:0
+ test? ( app-text/docbook-xml-dtd:4.5 )
+ xinerama? ( x11-proto/xineramaproto:0 )"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-compositor \
+ --enable-render \
+ --enable-shape \
+ --enable-sm \
+ --enable-xsync \
+ --with-gtk=2.0 \
+ $(use_enable startup-notification) \
+ $(use_enable xinerama)
+}
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
new file mode 100644
index 0000000..1a53cd0
--- /dev/null
+++ b/x11-wm/marco/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>mate</herd>
+ <upstream>
+ <remote-id type="github">mate-desktop/marco</remote-id>
+ </upstream>
+</pkgmetadata>