Удалены ebuild mate, обновлены маски

8 years ago · fe2a32b2b6
parent 54bed5c11c
commit fe2a32b2b6
167 changed files with 120 additions and 11785 deletions
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@ -1 +0,0 @@
-DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c
--- a/app-arch/engrampa/engrampa-1.14.1.ebuild
+++ b/app-arch/engrampa/engrampa-1.14.1.ebuild
@ -1,85 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="gtk3 caja"
-
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-#
-# ... thus we depend on Caja regardless of the Caja USE flag. Patches welcome.
-RDEPEND="!gtk3? ( >=x11-libs/gtk+-2.21.4:2 x11-libs/gdk-pixbuf:2 )
-          gtk3? ( x11-libs/gtk+:3 )
-	>=dev-libs/glib-2.25.5:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/pango:0
-	virtual/libintl:0
-	|| ( >=mate-base/caja-1.12:0[gtk3?] >=mate-base/mate-file-manager-1.6:0 )
-	!!app-arch/mate-file-archiver"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.2-r1
-	dev-util/itstool:0
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	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() {
-	        local myconf 
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-                gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-packagekit \
-		--disable-deprecations \
-                ${myconf} \
-		$(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"
-}
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@ -1,12 +0,0 @@
-# ChangeLog for app-arch/unzip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*unzip-6.0-r9 (17 Jun 2010)
-
-  17 Jun 2010; Mike Hiretsky (mhiretskiy) <mh@calculate.ru>
-  +unzip-6.0-r9.ebuild, +files/unzip-6.0-alt-natspec.patch,
-  +files/unzip-6.0-no-exec-stack.patch:
-  Add patch for unzip-6.0 for correct work with filenames in cp866
-  enconing.
-
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@ -1 +0,0 @@
-DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
--- a/app-arch/unzip/files/unzip-6.0-natspec.patch
+++ b/app-arch/unzip/files/unzip-6.0-natspec.patch
@ -1,372 +0,0 @@
-diff -pur unzip60orig/unix/configure unzip60/unix/configure
--- unzip60orig/unix/configure	2009-04-16 23:25:12.000000000 +0400
-+++ unzip60/unix/configure	2010-11-26 19:07:43.000000000 +0300
-@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
- IZ_BZIP2=${3}
- CFLAGS="${CFLAGS} -I. -DUNIX"
- LFLAGS1=""
-LFLAGS2="-s"
-+LFLAGS2="-l natspec"
- LN="ln -s"
- 
- CFLAGS_OPT=''
-diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile
--- unzip60orig/unix/Makefile	2009-01-19 01:41:18.000000000 +0300
-+++ unzip60/unix/Makefile	2010-11-29 14:25:58.461000001 +0300
-@@ -45,14 +45,14 @@
- CC = cc#	try using "gcc" target rather than changing this (CC and LD
- LD = $(CC)#	must match, else "unresolved symbol:  ___main" is possible)
- AS = as
-LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
-+LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP)
- AF = $(LOC)
- CFLAGS = -O
- CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
- CF = $(CFLAGS) $(CF_NOOPT)
- LFLAGS1 =
- LF = -o unzip$E $(LFLAGS1)
-LF2 = -s
-+LF2 = -l natspec
- 
- # UnZipSFX flags
- SL = -o unzipsfx$E $(LFLAGS1)
-@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL)
- INSTALL_D = mkdir -p
- # on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
- manext = 1
-prefix = /usr/local
-+prefix = /usr
- BINDIR = $(prefix)/bin#			where to install executables
- MANDIR = $(prefix)/man/man$(manext)#	where to install man pages
- INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
-diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c
--- unzip60orig/unix/unix.c	2009-01-24 02:31:26.000000000 +0300
-+++ unzip60/unix/unix.c	2010-11-26 16:58:35.000000000 +0300
-@@ -30,6 +30,9 @@
- #define UNZIP_INTERNAL
- #include "unzip.h"
- 
-+#include <iconv.h>
-+#include <natspec.h>
-+
- #ifdef SCO_XENIX
- #  define SYSNDIR
- #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
-@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len)
-     }
- }
- #endif /* QLZIP */
-+
-+
-+char OEM_CP[MAX_CP_NAME] = "";
-+char ISO_CP[MAX_CP_NAME] = "";
-+
-+/* Getr the default value of OEM_CP based on the current locale.
-+ * ISO_CP is left alone for now. */
-+void init_conversion_charsets()
-+{
-+    /* Make a guess only if OEM_CP not already set. */ 
-+    if(*OEM_CP == '\0') {
-+        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
-+        strncpy(OEM_CP, archive_charset, sizeof(OEM_CP));
-+    }
-+
-+    if(*ISO_CP == '\0') {
-+        const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, "");
-+        strncpy(ISO_CP, archive_charset, sizeof(ISO_CP));
-+    }
-+
-+}
-+
-+/* Convert a string from OEM_CP to the current locale charset. */
-+inline void oem_intern(char *string)
-+{
-+    char *buf = natspec_convert(string, 0, OEM_CP, 0);
-+	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+	   use FILNAMSIZ as string size */
-+    strncpy(string, buf, FILNAMSIZ);
-+	free (buf);
-+}
-+
-+/* Convert a string from ISO_CP to the current locale charset. */
-+inline void iso_intern(char *string)
-+{
-+    char *buf = natspec_convert(string, 0, ISO_CP, 0);
-+	/* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
-+	   use FILNAMSIZ as string size */
-+    strncpy(string, buf, FILNAMSIZ);
-+	free (buf);
-+}
-diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h
--- unzip60orig/unix/unxcfg.h	2009-04-16 22:36:12.000000000 +0400
-+++ unzip60/unix/unxcfg.h	2010-11-26 16:58:35.000000000 +0300
-@@ -227,4 +227,30 @@ typedef struct stat z_stat;
- /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
- /*    and notfirstcall are used by do_wild().                          */
- 
-+
-+#define MAX_CP_NAME 25 
-+   
-+#ifdef SETLOCALE
-+#  undef SETLOCALE
-+#endif
-+#define SETLOCALE(category, locale) setlocale(category, locale)
-+#include <locale.h>
-+   
-+#ifdef _ISO_INTERN
-+#  undef _ISO_INTERN
-+#endif
-+#define _ISO_INTERN(str1) iso_intern(str1)
-+
-+#ifdef _OEM_INTERN
-+#  undef _OEM_INTERN
-+#endif
-+#ifndef IZ_OEM2ISO_ARRAY
-+#  define IZ_OEM2ISO_ARRAY
-+#endif
-+#define _OEM_INTERN(str1) oem_intern(str1)
-+
-+void iso_intern(char *);
-+void oem_intern(char *);
-+void init_conversion_charsets(void);
-+   
- #endif /* !__unxcfg_h */
-diff -pur unzip60orig/unzip.c unzip60/unzip.c
--- unzip60orig/unzip.c	2009-04-16 22:26:52.000000000 +0400
-+++ unzip60/unzip.c	2010-11-26 16:58:35.000000000 +0300
-@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3
-   -h  print header line       -t  print totals for listed files or for all\n\
-   -z  print zipfile comment   -T  print file times in sortable decimal format\
- \n  -C  be case-insensitive   %s\
-  -x  exclude filenames that follow from listing\n";
-+  -x  exclude filenames that follow from listing\n\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #ifdef MORE
-    static ZCONST char Far ZipInfoUsageLine4[] =
-      "  -M  page output through built-in \"more\"\n";
-@@ -570,8 +572,7 @@ Send bug reports using //www.info-zip.or
- #else /* !VMS */
- # ifdef COPYRIGHT_CLEAN
-    static ZCONST char Far UnzipUsageLine1[] = "\
-UnZip %d.%d%d%s of %s, by Info-ZIP.  Maintained by C. Spieler.  Send\n\
-bug reports using http://www.info-zip.org/zip-bug.html; see README for details.\
-+UnZip %d.%d%d%s of %s, by ALT Linux Team.  Original by Info-ZIP.\
- \n\n";
- # else
-    static ZCONST char Far UnzipUsageLine1[] = "\
-@@ -673,7 +674,9 @@ modifiers:\n\
-   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
-lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #else /* !UNICODE_SUPPORT */
- #ifdef VMS
-@@ -692,7 +695,9 @@ modifiers:\n\
-   -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
-   -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
-   -C  match filenames case-insensitively     -L  make (some) names \
-lowercase\n %-42s  -V  retain VMS version numbers\n%s";
-+lowercase\n %-42s  -V  retain VMS version numbers\n%s\
-+  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
-+  -I CHARSET  specify a character encoding for UNIX and other archives\n";
- #endif /* ?VMS */
- #endif /* ?UNICODE_SUPPORT */
- 
-@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv)
- #endif /* UNICODE_SUPPORT */
- 
- 
-+#ifdef UNIX
-+    init_conversion_charsets();
-+#endif
-+
- #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
-     extern void DebugMalloc(void);
- 
-@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv)
-     argc = *pargc;
-     argv = *pargv;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
-+    
-     while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
-         s = *argv + 1;
-         while ((c = *s++) != 0) {    /* "!= 0":  prevent Turbo C warning */
-@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv)
-                     }
-                     break;
- #endif  /* MACOS */
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('j'):    /* junk pathnames/directory structure */
-                     if (negative)
-                         uO.jflag = FALSE, negative = 0;
-@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv)
-                     } else
-                         ++uO.overwrite_all;
-                     break;
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case ('p'):    /* pipes:  extract to stdout, no messages */
-                     if (negative) {
-                         uO.cflag = FALSE;
-diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h
--- unzip60orig/unzpriv.h	2009-04-20 03:59:26.000000000 +0400
-+++ unzip60/unzpriv.h	2010-11-26 16:58:35.000000000 +0300
-@@ -3008,7 +3008,7 @@ char    *GetLoadPath     OF((__GPRO));  
-          !(((islochdr) || (isuxatt)) && \
-            ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
-         (hostnum) == FS_HPFS_ || \
-        ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
-+        ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \
-         _OEM_INTERN((string)); \
-     } else { \
-         _ISO_INTERN((string)); \
-diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c
--- unzip60orig/zipinfo.c	2009-02-08 20:04:30.000000000 +0300
-+++ unzip60/zipinfo.c	2010-11-26 16:58:35.000000000 +0300
-@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv)
-     int    tflag_slm=TRUE, tflag_2v=FALSE;
-     int    explicit_h=FALSE, explicit_t=FALSE;
- 
-+#ifdef UNIX
-+    extern char OEM_CP[MAX_CP_NAME];
-+    extern char ISO_CP[MAX_CP_NAME];
-+#endif
- 
- #ifdef MACOS
-     uO.lflag = LFLAG;         /* reset default on each call */
-@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv)
-                             uO.lflag = 0;
-                     }
-                     break;
-+#ifdef UNIX
-+    			case ('I'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Icharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					} else { /* -I charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(ISO_CP, s, sizeof(ISO_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 'l':      /* longer form of "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
-@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv)
-                         G.M_flag = TRUE;
-                     break;
- #endif
-+#ifdef UNIX
-+    			case ('O'):
-+                    if (negative) {
-+                        Info(slide, 0x401, ((char *)slide,
-+                          "error:  encodings can't be negated"));
-+                        return(PK_PARAM);
-+    				} else {
-+    					if(*s) { /* Handle the -Ocharset case */
-+    						/* Assume that charsets can't start with a dash to spot arguments misuse */
-+    						if(*s == '-') { 
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -I argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					} else { /* -O charset */
-+    						++argv;
-+    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
-+    	                        Info(slide, 0x401, ((char *)slide,
-+        		                  "error:  a valid character encoding should follow the -O argument"));
-+    	                        return(PK_PARAM); 
-+    						}
-+    						s = *argv;
-+    						strncpy(OEM_CP, s, sizeof(OEM_CP));
-+    					}
-+    					while(*(++s)); /* No params straight after charset name */
-+    				}
-+    				break;
-+#endif /* ?UNIX */
-                 case 's':      /* default:  shorter "ls -l" type listing */
-                     if (negative)
-                         uO.lflag = -2, negative = 0;
--- a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
+++ b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
@ -1,13 +0,0 @@
-Make sure that the asm files don't incorrectly trigger an executable
-stack marking in the final shared library.  That's bad, mmmkay.
-
--- unzip/crc_i386.S
-+++ unzip/crc_i386.S
-@@ -302,3 +302,7 @@
- #endif /* i386 || _i386 || _I386 || __i386 */
- 
- #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
--- a/app-arch/unzip/unzip-6.0-r10.ebuild
+++ b/app-arch/unzip/unzip-6.0-r10.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r1.ebuild,v 1.9 2009/10/18 18:46:18 vapier Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-MY_P="${PN}${PV/.}"
-
-DESCRIPTION="unzipper for pkzip-compressed files"
-HOMEPAGE="http://www.info-zip.org/"
-SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
-
-LICENSE="Info-ZIP"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 m68k ~ppc ppc64 s390 sh ~sparc x86"
-IUSE="bzip2 +natspec unicode"
-
-DEPEND="bzip2? ( app-arch/bzip2 )
-	natspec? ( dev-libs/libnatspec )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
-	use natspec && epatch "${FILESDIR}"/${P}-natspec.patch
-	sed -i \
-		-e '/^CFLAGS/d' \
-		-e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
-		-e '/^STRIP/s:=.*:=true:' \
-		-e "s:CC=gcc :CC=$(tc-getCC) :" \
-		-e "s:LD=gcc :LD=$(tc-getCC) :" \
-		-e "s:AS=gcc :AS=$(tc-getCC) :" \
-		-e 's:LF2 = -s:LF2 = :' \
-		-e 's:LF = :LF = $(LDFLAGS) :' \
-		-e 's:SL = :SL = $(LDFLAGS) :' \
-		-e 's:FL = :FL = $(LDFLAGS) :' \
-		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
-		unix/Makefile \
-		|| die "sed unix/Makefile failed"
-}
-
-src_compile() {
-	local TARGET
-	case ${CHOST} in
-		i?86*-*linux*)       TARGET=linux_asm ;;
-		*linux*)             TARGET=linux_noasm ;;
-		i?86*-*bsd* | \
-		i?86*-dragonfly*)    TARGET=freebsd ;; # mislabelled bsd with x86 asm
-		*bsd* | *dragonfly*) TARGET=bsd ;;
-		*-darwin*)           TARGET=macosx ;;
-		*) die "Unknown target, you suck" ;;
-	esac
-
-	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
-	use bzip2 && append-cppflags -DUSE_BZIP2
-	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
-	append-cppflags -DLARGE_FILE_SUPPORT #281473
-
-	emake \
-		-f unix/Makefile \
-		${TARGET} || die "emake failed"
-}
-
-src_install() {
-	dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
-	dosym unzip /usr/bin/zipinfo || die
-	doman man/*.1
-	dodoc BUGS History* README ToDo WHERE
-}
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@ -1 +0,0 @@
-DIST pluma-1.14.0.tar.xz 3457640 SHA256 9e6f33bb335439f6684ea71e52fb5da3991431c6f6a2081d90049fd541d9f662 SHA512 b18d1209db0b244bd875a402a5331882f55614270cd88c49d217179a4a1b0bf72cbf09b0d46eecf7b4ab6fb18a016bb3cffbc1c7874e16df6518bb97066ab8fb WHIRLPOOL d5bc9f164f3fdffac636edf8fd17ab2f6f2e2ad5fb6a538e0943053012f011b10d39079775e0e3027507641a92e457196a6e2e4b5eb3b195c319c6c22f50c740
--- a/app-editors/pluma/pluma-1.14.0.ebuild
+++ b/app-editors/pluma/pluma-1.14.0.ebuild
@ -1,91 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="gtk3 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.12:0[gtk3?]
-	x11-libs/cairo:0
-	!gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.19:2
-	>=x11-libs/gtksourceview-2.9.7:2.0 )
-        gtk3? ( x11-libs/gtk+:3 x11-libs/gtksourceview:3.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.50.2-r1
-	>=sys-devel/libtool-2.2.6:2
-	>=mate-base/mate-common-1.12:0
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	       local myconf 
-               use gtk3 && myconf="${myconf} --with-gtk=3.0"
-               use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-               gnome2_src_configure \
-		--disable-updater \
-		${myconf} \
-                $(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
-}
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@ -1 +0,0 @@
-DIST media-player-info-17.tar.gz 107176 SHA256 ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 SHA512 7e9092b8f3f5a661f8e858647eea471851327fc0ef84ecbf45753f2a3fd564229754c866ed9e1eefba193739d38a2c6d04257c93b9525431d49034fbed6e38c5 WHIRLPOOL 00fa9c2b4cb6b990c60a77b2a3ef513cf8a3698104821dd9ad35f7872817cb171f793cae2ecb9f0bc680c32a6e609d4115de046a9b265a9ba1f87dce007a1067
--- a/app-misc/media-player-info/media-player-info-17-r1.ebuild
+++ b/app-misc/media-player-info/media-player-info-17-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/media-player-info/media-player-info-17.ebuild,v 1.6 2012/11/28 17:53:02 ssuominen Exp $
-
-EAPI=5
-
-DESCRIPTION="A repository of data files describing media player capabilities"
-HOMEPAGE="http://cgit.freedesktop.org/media-player-info/"
-SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@ -1 +0,0 @@
-DIST atril-1.14.1.tar.xz 1672396 SHA256 0d4f411f92e0a8156151d76f36fbc580f47cd070586f5aa8676a02077175b1ec SHA512 6ca588cfb6be587b85d2f27d2c19aa99c929531a015804e5bd390e9785d859e7f4cd748d42d5833be1af1393fb94c9edc279dc686d3baf4b3a4ee17d7559c173 WHIRLPOOL 8d084b8b825c4f27642f013ca461e8a278718bcded66727f805b4c34530fe28dace574c886eac3c85651a05d6f0a07847a8b02fa04a28006c84e80b83c69aeb2
--- a/app-text/atril/atril-1.14.1.ebuild
+++ b/app-text/atril/atril-1.14.1.ebuild
@ -1,107 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3 epub"
-
-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.12:0[gtk3?]
-	sys-libs/zlib:0
-	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.12:0
-	caja? ( || (
-		>=mate-base/caja-1.12:0[introspection?]
-		>=mate-base/mate-file-manager-1.6: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 )
-        !gtk3? ( x11-libs/gdk-pixbuf:2
-        epub? ( >=app-text/libebook-0.1.2 net-libs/webkit-gtk:2 )
-        >=x11-libs/gtk+-2.21.5:2[introspection?] )
-	gtk3? ( x11-libs/gtk+:3 
-        epub? ( >=app-text/libebook-0.1.2 net-libs/webkit-gtk:3 ) 
-        )
-        !!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.50.2-r1
-	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.
-	        local myconf 
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-                gnome2_src_configure \
-		--disable-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-thumbnailer \
-		--with-smclient=xsmp \
-		--with-platform=mate \
-		$(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) \
-                ${myconf} \
-                $(use_enable epub)
-}
-
-DOCS="AUTHORS NEWS README TODO"
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@ -1 +0,0 @@
-DIST libmateweather-1.14.0.tar.xz 3493728 SHA256 924d37fb6c700487448acbf445b97271fc18152c06f72e0189e9c0732008800e SHA512 061e91ad26ae2b31d91d75be6aaf0fa56628b4543c63f29374e13a9880614d5593de7ec8aeba39ecb11dc7773273a923c48c0ed7d993468347116d6658234fed WHIRLPOOL 0e9b00624efb9f375efe2b0acc822a62891f3a8358d638be3c062f5eb671859be779688707317f31d2cdc598baddac61d1dc982bdea3859f3f596664e18b0394
--- 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
@ -1,12 +0,0 @@
-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()
--- a/dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch
+++ b/dev-libs/libmateweather/files/libmateweather-1.6.1-fix-mkdirp.patch
@ -1,11 +0,0 @@
-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)	\
--- a/dev-libs/libmateweather/libmateweather-1.14.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.14.0.ebuild
@ -1,82 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI="5"
-
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,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="gtk3 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
-	!gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.11:2 )
-        gtk3? ( x11-libs/gtk+:3 )
-	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.50.2-r1
-	>=mate-base/mate-common-1.12: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() {
-	        local myconf
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-                my_command gnome2_src_configure \
-		--enable-locations-compression \
-		--disable-all-translations-in-one-xml \
-		${myconf} \
-                $(use_enable python)
-}
-
-src_compile() {
-	my_command gnome2_src_compile
-}
-
-DOCS="AUTHORS ChangeLog NEWS"
-
-src_install() {
-	my_command gnome2_src_install
-}
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@ -1,11 +0,0 @@
-DIST eric5-5.5.2.tar.gz 10649618 SHA256 501550e01617a3c8cd66ebcb5e071cd928029fb3aba64aec88617821bf5c3871 SHA512 ba48ffbda67de66f24819ac3389bb373a9945e8842a802ade185e5fcbfac34f8062999fe96cc5be9321dacca58f70c47bbe530ddef0349f3f103800b1fa689f9 WHIRLPOOL 7b450b6569b789c87d1a3b44d24fe91072f2a3d417249a46da8c6793b06a940807c724aad729dd7c969e816464bfe9c81fda82f3a8dbe3fccb4557cd33510bcc
-DIST eric5-i18n-cs-5.5.2.tar.gz 556017 SHA256 ead32f57107701f1664543fd0e8dbd07764f07e8c2e4f684977f8cabc3e26685 SHA512 b4bff691d4067d2d91923aeb823678a02775d4a275a4cc2ee7e0dd207d33c696c8eebad4bc2b9c4add1b2f928e868cd183d477c5939e81cc8ab96a42db0f818b WHIRLPOOL 475209f28eb62e58db9d4629c6c1de77a38407f6abd3a101b9d313314e708c9597f6cb802b1112935728628551b4555762e952c4f1cb0992a59632d57f28b886
-DIST eric5-i18n-de-5.5.2.tar.gz 759671 SHA256 b08d6ddb10c332c8c020d8f8a3dd1dae315427d7067b67643848c79733ecce38 SHA512 6fd4fc26995fde57caf182989da1db5cf5fb92eb185645f0130d1c19eeffca3a8d4c495e5c3673fc6ae89a33cbb8f5593b2fa34c1aa530e2393ecf5e7180000d WHIRLPOOL 2bab53467a11f79934399348d00f70502e5fdc2ffb5cf217426a2a5e9fe88b79edc546c3615642385be18e2c92f0cabdfdaf686a9a261062a3c3f81771389be3
-DIST eric5-i18n-en-5.5.2.tar.gz 205563 SHA256 934bd715cde409e9dc79245dbdd845f14aa4b6bb36cbad064e16c85106110b85 SHA512 51aa8c4e6b938f13ee95bfa1759dc2e83d4e3cdcbfcb4db4b86d494669e09ea51d173e16fad0bf31ba67cb06e910fa109e931a89f431ac8ca902def15067489c WHIRLPOOL c8235fe9b5e6754bebd60c98086086bb479ae1f8456787985a68ea02d68fd93ec04bc9947b2770f0cb1b604e68d5ba365e04bbb7b185147ee91c246deddaa368
-DIST eric5-i18n-es-5.5.2.tar.gz 761577 SHA256 b0ffdc03c02a0fde6fa030871677de72e44675f0c4d557c3abeeea44798a1907 SHA512 39332f66acd2014f60360647d2096792a8d9d7dbf356b983d00362e08b5fe90aa844399c980e7d8a45e67e361614c3f11b321998dc322a3ea53cdb9700a2ae42 WHIRLPOOL a6580465c3473b414a8a3de86fe9e9504e78a2f730bd02f7a9c9099cda26bd269c04da6d092f00a853162881f09c2159dab718a79758c21d149781ec2a98cde5
-DIST eric5-i18n-fr-5.5.2.tar.gz 504012 SHA256 294e92b114b881ed764489e9dba137bb113e02fda8a5089fe3480d417f7e120d SHA512 9fc8e1205f00f27407bf0e9c8ce401ec640abcadc8eb12afe4d5846f6ab48bb6294ef96c0265ed8f2dfb52229370d3f243b0863da3814ebf4851a440318e42ff WHIRLPOOL 0b24e5b975162e5d735d7c713750ec9f7feb605264392b710d35c243585a341d618ce8f4f5aa80aa8d2ce74705bb30ed203473d6225c85fd1df08650f19ec288
-DIST eric5-i18n-it-5.5.2.tar.gz 630960 SHA256 94300cfb84d9b811d76e0be98bbd60924845ae1dca788dd74f8d0c5fd55fa46c SHA512 5cc02d2c3238eb44a2dbda9323ff073c1b51d3029623337c243e0bfc57736b2ba859d9b6b00aa5dd4d875824d504c3d9d763c76d92b3a9525f637f9d6efeaf18 WHIRLPOOL f1da01ff437090f15bb9c612ca61c4d15e34f484f0c05eeb1c5147a131d441d9ee023b0376acf0ab3a8774707f06c419e8dd37502afd449fc150fd0f3abfc2da
-DIST eric5-i18n-pt-5.5.2.tar.gz 443308 SHA256 2baaa96bab273f8ad695101675fdac7a527ad7b62d14a25491dd846ca6933342 SHA512 6564fdab325251cd9898253c0c9ed9dc4406038600ccd6c7db5ec6da76517258919c8619846816ec43c6b799672c14306b291a4d274f980e35e634b98bc9e6f6 WHIRLPOOL 5ed5c90af0858cac6d275740c612c95a9f2af38c406cd090835cc07f5c63bdf23c319d4959654735d02066d4a8bf703375bf42d9d469034d7e65ed842731f8d0
-DIST eric5-i18n-ru-5.5.2.tar.gz 786342 SHA256 63c8fb9ab53010bddbb5049e227ca5cb49e50cc985745c7fd529fe4449d832ca SHA512 bbca86c04883d636d0a4afad721507a79796ee7a805e263845f1da79cbd0e2d098e93f919bc253a8a51d2ed003a24ae14fc9cda6d5e90568a928739582b0b486 WHIRLPOOL 714bdbf694326050e813b322576bc0009f12e3109a6a11f7acc0112fe15c332f83547308f6ab6ece117b8151f8bdae9551265344fd336d53014998a6f85436ac
-DIST eric5-i18n-tr-5.5.2.tar.gz 481796 SHA256 b5935c2384608d87a8ff3e7f4b90613c686e9af176a724da44fb67486175532a SHA512 8831fb2039745b40f9f74f3ec8801a0dab5ee96ceb6686e418bfb58ddeeb44c2400bc0e36aa0035475923aaf20724cfbb656adf8a0ae27b78247d372ed747fc8 WHIRLPOOL 12075a1d44d2ff01662d3323cf5c985890da44d62eb7aad782e50e4067cc4e930d0dcd47eec63dc77b6fd6e42bf6098d67f30de7034e44b9b1dc8c38ea7f56fb
-DIST eric5-i18n-zh_CN.GB2312-5.5.2.tar.gz 446780 SHA256 ebd592a1f28a28af2a00d79ebaa61e94b5ea8bc8b3883a098d79460c68940a97 SHA512 96a1263bca33c4a7709c8d86d5c5412779044f37d98fa62d18e37e7dd891607bf282808d25544bf7fef7206a669c57c49bf97bd5ae7db54fa49bc15c47dc5689 WHIRLPOOL 4d84c9b38f31a6fad71400367d20f6a707bc9dc4c2a30509bdde72fa83613e088e5c5ea36b173d69a9c7474929b81282a8cbbce3ea64a70877b9b5155f4346b4
--- a/dev-util/eric/eric-5.5.2-r1.ebuild
+++ b/dev-util/eric/eric-5.5.2-r1.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="sqlite,xml"
-PLOCALES="cs de en es fr it pt ru tr zh_CN"
-
-inherit eutils l10n python-single-r1
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-
-SLOT="5"
-MY_PV=${PV/_rc/-RC}
-MY_P=${PN}${SLOT}-${MY_PV}
-
-BASE_URI="mirror://sourceforge/eric-ide/${PN}${SLOT}/stable/${MY_PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-for L in ${PLOCALES}; do
-	SRC_URI+=" linguas_${L}? ( ${BASE_URI}/${PN}${SLOT}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
-done
-unset L
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.10[${PYTHON_USEDEP},X,help,sql,svg,webkit]
-	>=dev-python/qscintilla-python-2.7.1[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	>=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# Avoid file collisions between different slots of eric
-	sed -i -e 's/^Icon=eric$/&5/' eric/eric5.desktop || die
-	sed -i -e 's/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/' \
-		$(grep -lr 'eric\.png' .) || die
-	mv eric/icons/default/eric{,5}.png || die
-	mv eric/pixmaps/eric{,5}.png || die
-	rm -f eric/APIs/Python/zope-*.api
-	rm -f eric/APIs/Ruby/Ruby-*.api
-
-	# Delete internal copies of dev-python/chardet and dev-python/pygments
-	rm -fr eric/ThirdParty/{CharDet,Pygments}
-
-	# Delete internal copy of dev-python/coverage
-	rm -fr eric/DebugClients/Python{,3}/coverage
-	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
-		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
-
-	# Fix desktop files (bug 458092)
-	sed -i -e '/^Categories=/s:Python:X-&:' eric/eric5{,_webbrowser}.desktop || die
-}
-
-src_install() {
-	"${PYTHON}" install.py \
-		-b "${EPREFIX}/usr/bin" \
-		-d "$(python_get_sitedir)" \
-		-i "${D}" \
-		-c \
-		-z \
-		|| die
-
-	python_optimize
-
-	#doicon eric/icons/default/eric5.png
-	dodoc changelog THANKS
-}
-
-pkg_postinst() {
-	elog "The following packages will give Eric extended functionality:"
-	elog "  dev-python/cx_Freeze"
-	elog "  dev-python/pyenchant"
-	elog "  dev-python/pylint"
-	elog "  dev-python/pysvn"
-	elog "  dev-vcs/mercurial"
-	elog
-	elog "This version has a plugin interface with plugin-autofetch from"
-	elog "the application itself. You may want to check that as well."
-}
--- a/kde-misc/kde-gtk-config/Manifest
+++ b/kde-misc/kde-gtk-config/Manifest
@ -1 +0,0 @@
-DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802
--- a/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
+++ b/kde-misc/kde-gtk-config/files/kde-gtk-config-2.2.1-kdelibs-4.14.11.patch
@ -1,53 +0,0 @@
-From 386f6af25a4f5276765a121f98dd00d0bf6a743d Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 26 Jul 2015 17:04:43 +0200
-Subject: [PATCH] set proper cmake min req, matching kdelibs4, before project;
- fix build accordingly
-
---
- CMakeLists.txt             | 2 +-
- gtk3proxies/CMakeLists.txt | 2 +-
- gtkproxies/CMakeLists.txt  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ef2243..9d77fcd 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,6 @@
-+cmake_minimum_required(VERSION 2.8.9)
- project(kdegtkconfig)
-cmake_minimum_required(VERSION 2.6)
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
-+cmake_policy(SET CMP0002 OLD)
- 
- find_package(KDE4 REQUIRED)
-diff --git a/gtk3proxies/CMakeLists.txt b/gtk3proxies/CMakeLists.txt
-index 856a3f6..d43597e 100644
--- a/gtk3proxies/CMakeLists.txt
-+++ b/gtk3proxies/CMakeLists.txt
-@@ -2,7 +2,7 @@ find_package(GTK3 REQUIRED)
- 
- include_directories(${GTK3_INCLUDE_DIRS})
- 
-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
-+add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
- 
- add_executable(gtk3_preview preview3.c)
- target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
-diff --git a/gtkproxies/CMakeLists.txt b/gtkproxies/CMakeLists.txt
-index 9821cbf..18ee2d5 100644
--- a/gtkproxies/CMakeLists.txt
-+++ b/gtkproxies/CMakeLists.txt
-@@ -6,7 +6,7 @@ add_executable(reload_gtk_apps reload.c)
- target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
- install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
- 
-add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
-+add_definitions(-DDATA_DIR="\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
- 
- add_executable(gtk_preview preview.c)
- target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
-- 
-2.4.6
-
--- a/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1-r1.ebuild
+++ b/kde-misc/kde-gtk-config/kde-gtk-config-2.2.1-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el es et eu fi fr ga gl hu id it ja kk
-km lt mr nb nds nl pl pt pt_BR ro ru sk sl sv uk zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="KDE systemsettings kcm to set GTK application look&feel"
-HOMEPAGE="https://projects.kde.org/kde-gtk-config"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-3"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
-SLOT="4"
-IUSE="debug"
-
-CDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-"
-DEPEND="
-	${CDEPEND}
-	dev-util/automoc
-"
-RDEPEND="
-	${CDEPEND}
-	!kde-misc/kcm_gtk
-	$(add_kdeapps_dep kcmshell)
-"
-
-PATCHES=( "${FILESDIR}/${P}-kdelibs-4.14.11.patch" )
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-	einfo
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-	einfo
-}
--- a/kde-misc/kde-gtk-config/metadata.xml
+++ b/kde-misc/kde-gtk-config/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
--- a/lxqt-base/lxqt-session/Manifest
+++ b/lxqt-base/lxqt-session/Manifest
@ -1 +0,0 @@
-DIST lxqt-session-0.10.0.tar.xz 65012 SHA256 2aedbeef904c11679199bfcdbf141880082c4bbcbcdad2b89b47d5b833fe26d4 SHA512 13f7e93c4773e61c785599b552473dfb4d3d7833111717a4875e4c0c8892ee10a1a99b099e76332aab8d266f1c27fc253812a2e9ccb8106731942ed3f7705077 WHIRLPOOL d77e63f11e270252802a1f65e68c4454cab74f6c538406991ccf65adb871727196b6c01c080a3028dc2c0ac028d25e98520ff962ace618639416a7a8b95c3ce7
--- a/lxqt-base/lxqt-session/files/lxqt-fix-logout-dialog.patch
+++ b/lxqt-base/lxqt-session/files/lxqt-fix-logout-dialog.patch
--- a/lxqt-base/lxqt-session/lxqt-session-0.10.0-r9.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.10.0-r9.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="LXQT session manager"
-HOMEPAGE="http://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0"
-
-CDEPEND="
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	kde-frameworks/kwindowsystem:5[X]
-	~lxqt-base/liblxqt-${PV}
-	x11-libs/libX11"
-DEPEND="${CDEPEND}
-	dev-qt/linguist-tools:5
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	=lxqt-base/lxqt-common-0.10*"
-
-PATCHES=( ${FILESDIR}/lxqt-fix-logout-dialog.patch )
-
-src_install(){
-	cmake-utils_src_install
-	doman lxqt-config-session/man/*.1 lxqt-session/man/*.1
-}
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@ -1 +0,0 @@
-DIST claws-mail-3.13.2.tar.xz 5582600 SHA256 6a731052814b3284abeca1662d47817a86e018bc7123ab428f015f0cfab40ad1 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3 WHIRLPOOL ec64d157fffd7be2849c92209cf3a5cc29935fa60a9061577c1b0bbcdac28b51f800c731ebf5f9598bc34f56ee9815adddfb5691f5faa81c92252bd182ab5120
--- a/mail-client/claws-mail/claws-mail-3.13.2-r9.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.2-r9.ebuild
@ -1,205 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib gnome2-utils eutils python-single-r1
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="http://www.claws-mail.org/"
-
-SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="libcanberra? ( notification )
-	libindicate? ( notification )
-	libnotify? ( notification )
-	networkmanager? ( dbus )
-	smime? ( pgp )"
-
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
-	!!mail-client/claws-mail-archive
-	!!mail-client/claws-mail-att-remover
-	!!mail-client/claws-mail-attachwarner
-	!!mail-client/claws-mail-clamd
-	!!mail-client/claws-mail-fancy
-	!!mail-client/claws-mail-fetchinfo
-	!mail-client/claws-mail-gdata
-	!!mail-client/claws-mail-geolocation
-	!!mail-client/claws-mail-gtkhtml
-	!!mail-client/claws-mail-mailmbox
-	!!mail-client/claws-mail-newmail
-	!!mail-client/claws-mail-notification
-	!!mail-client/claws-mail-perl
-	!!mail-client/claws-mail-python
-	!!mail-client/claws-mail-rssyl
-	!!mail-client/claws-mail-spam-report
-	!!mail-client/claws-mail-tnef-parse
-	!!mail-client/claws-mail-vcalendar
-	!!mail-client/claws-mail-address_keeper
-	!!mail-client/claws-mail-pdf-viewer"
-
-COMMONDEPEND=">=sys-devel/gettext-0.12.1
-	gdata? ( >=dev-libs/libgdata-0.17.1 )
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( >=x11-libs/gtk+-2.20:2 )
-	pda? ( >=app-pda/jpilot-0.99 )
-	gnutls? ( >=net-libs/gnutls-2.2.0 )
-	ldap? ( >=net-nds/openldap-2.0.7 )
-	pgp? ( >=app-crypt/gpgme-0.4.5 )
-	valgrind? ( dev-util/valgrind )
-	dbus? ( >=dev-libs/dbus-glib-0.60 )
-	spell? ( >=app-text/enchant-1.0.0 )
-	imap? ( >=net-libs/libetpan-0.57 )
-	nntp? ( >=net-libs/libetpan-0.57 )
-	startup-notification? ( x11-libs/startup-notification )
-	session? ( x11-libs/libSM
-			x11-libs/libICE )
-	archive? ( app-arch/libarchive
-		>=net-misc/curl-7.9.7 )
-	bogofilter? ( mail-filter/bogofilter )
-	notification? (
-		libnotify? ( x11-libs/libnotify )
-		libcanberra? (  media-libs/libcanberra[gtk] )
-		libindicate? ( dev-libs/libindicate:3[gtk] )
-		dev-libs/glib:2
-	)
-	smime? ( >=app-crypt/gpgme-0.4.5 )
-	calendar? ( >=net-misc/curl-7.9.7 )
-	pdf? ( app-text/poppler[cairo] )
-	spam-report? ( >=net-misc/curl-7.9.7 )
-	webkit? ( >=net-libs/webkit-gtk-1.0:2
-		>=net-libs/libsoup-gnome-2.26:2.4 )
-"
-
-DEPEND="${PLUGINBLOCK}
-	${COMMONDEPEND}
-	app-arch/xz-utils
-	xface? ( >=media-libs/compface-1.4 )
-	virtual/pkgconfig"
-
-RDEPEND="${COMMONDEPEND}
-	pdf? ( app-text/ghostscript-gpl )
-	clamav? ( app-antivirus/clamav )
-	networkmanager? ( net-misc/networkmanager )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygtk-2.10.3 )
-	rss? ( net-misc/curl
-		dev-libs/libxml2 )
-	app-misc/mime-types
-	x11-misc/shared-mime-info"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug crash-dialog)
-		$(use_enable valgrind valgrind)
-		$(use_enable doc manual)
-		$(use_enable gtk3)
-		$(use_enable ipv6)
-		$(use_enable ldap)
-		$(use_enable dbus dbus)
-		$(use_enable networkmanager)
-		$(use_enable pda jpilot)
-		$(use_enable session libsm)
-		$(use_enable spell enchant)
-		$(use_enable gnutls)
-		$(use_enable startup-notification)
-		$(use_enable xface compface)
-		$(use_enable archive archive-plugin)
-		$(use_enable bogofilter bogofilter-plugin)
-		$(use_enable calendar vcalendar-plugin)
-		$(use_enable clamav clamd-plugin)
-		$(use_enable gdata gdata-plugin)
-		$(use_enable notification notification-plugin)
-		$(use_enable pdf pdf_viewer-plugin)
-		$(use_enable perl perl-plugin)
-		$(use_enable pgp pgpmime-plugin)
-		$(use_enable pgp pgpinline-plugin)
-		$(use_enable pgp pgpcore-plugin)
-		$(use_enable python python-plugin)
-		$(use_enable rss rssyl-plugin)
-		$(use_enable spamassassin spamassassin-plugin)
-		$(use_enable sieve managesieve-plugin)
-		$(use_enable smime smime-plugin)
-		$(use_enable spam-report spam_report-plugin)
-		$(use_enable webkit fancy-plugin)
-		--enable-alternate-addressbook
-		--enable-nls
-		--enable-acpi_notifier-plugin
-		--enable-address_keeper-plugin
-		--enable-att_remover-plugin
-		--enable-attachwarner-plugin
-		--enable-fetchinfo-plugin
-		--enable-mailmbox-plugin
-		--enable-newmail-plugin
-		--enable-tnef_parse-plugin
-		--disable-generic-umpc
-		--disable-bsfilter-plugin
-	)
-
-	# libetpan is needed if user wants nntp or imap functionality
-	if use imap || use nntp; then
-		myeconfargs+=( --enable-libetpan )
-	else
-		myeconfargs+=( --disable-libetpan )
-	fi
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
-	autotools-utils_src_install
-
-	# Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
-	# => also install it in /usr/share/pixmaps for other desktop envs
-	# => also install higher resolution icons in /usr/share/icons/hicolor/...
-	insinto /usr/share/pixmaps
-	doins ${PN}.png
-	local res resdir
-	for res in 64x64 128x128 ; do
-		resdir="/usr/share/icons/hicolor/${res}/apps"
-		insinto ${resdir}
-		newins ${PN}-${res}.png ${PN}.png
-	done
-
-	docinto tools
-	dodoc tools/README*
-
-	domenu ${PN}.desktop
-
-	einfo "Installing extra tools"
-	cd "${S}"/tools
-	exeinto /usr/$(get_libdir)/${PN}/tools
-	doexe *.pl *.py *.conf *.sh
-	doexe tb2claws-mail update-po uudec uuooffice
-
-	# kill useless files
-	rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
-	ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
-	ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
-	ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@ -1 +0,0 @@
-DIST caja-1.14.1.tar.xz 3611160 SHA256 2e7445a8ba77ff9fa7748645bdbe3b54d158db807fa40db25425d47101dd0dc2 SHA512 a179785c9ec5f322388082f7959df00a7b9014fbdcc3739c9f0b08466e8d404940278c4ac0caf06114176a8f75b2e49e2d11b0db63b5f82409ba52027b60afc7 WHIRLPOOL 3fdccd0632ce15494bc021c2a002262d3fbc8d9d6153bba8944bb02e4aef5ff540309f9c5715f9efc00c246c92f65dc652eb4c8000f0dfa8298f3d31e6451cc3
--- a/mate-base/caja/caja-1.14.1.ebuild
+++ b/mate-base/caja/caja-1.14.1.ebuild
@ -1,100 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="X +mate +introspection xmp +unique gtk3"
-
-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.12:0[gtk3?]
-	>=media-libs/libexif-0.5.12:0
-	x11-libs/cairo:0
-	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
-    x11-libs/gdk-pixbuf:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:0 )
-    xmp? ( >=media-libs/exempi-1.99.2:2 )
-    !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?]
-        unique? ( >=dev-libs/libunique-1:1 )
-    )
-    gtk3? ( x11-libs/gtk+:3 
-        unique? ( dev-libs/libunique:3 ) 
-    )"
-DEPEND="${RDEPEND}
-	!!mate-base/mate-file-manager
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	>=dev-util/intltool-0.50.2-r1
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-1.12.0: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() {
-                local myconf
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0" 
-          	gnome2_src_configure \
-		--enable-unique \
-		--disable-packagekit \
-		--disable-update-mimedb \
-		$(use_enable introspection) \
-		$(use_enable xmp) \
-                ${myconf} \
-                $(use_enable unique) \
-                $(use_with X x)
-}
-
-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."
-}
--- a/mate-base/libmatekbd/Manifest
+++ b/mate-base/libmatekbd/Manifest
@ -1 +0,0 @@
-DIST libmatekbd-1.14.0.tar.xz 366520 SHA256 b026b69d51b3d119ce005242383c046b56cbca7b807ef2ad00041afdb99505c9 SHA512 755068234bdceee3f2a69a309a7d140180ee968f50e3512f60ef9724e12726b72a3e1a1b1a2d19727c307a74bc0269725d99fb4361d5904298106c94809d477e WHIRLPOOL 5b3c7adfea45db6fbf03d319dc0655a2f0dd539849704033d1190d5da8bc1e8359f6e0394c598cbd0546a5803fbbbac5824cbc631dac1b950d3589e8587aa734
--- a/mate-base/libmatekbd/libmatekbd-1.14.0.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.14.0.ebuild
@ -1,47 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	x11-libs/cairo:0
-	!gtk3? ( >=x11-libs/gdk-pixbuf-2.18:2
-	>=x11-libs/gtk+-2.18:2 )
-        gtk3? ( x11-libs/gtk+:3 )
-	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.50.2-r1
-	virtual/pkgconfig:*"
-
-src_configure() {
-                local myconf
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-         	gnome2_src_configure \
-		$(use_enable test tests) \
-		${myconf} \
-                $(use_with X x)
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@ -1 +0,0 @@
-DIST mate-applets-1.14.0.tar.xz 7186552 SHA256 fceb0781d4481e805beb280e90a0ee3dabeca2238fef2de391fb0631541cec9f SHA512 5bce8d9ff7fcb341e17c8997f2302ab7220ff3d8d3bf0331a9509ac895f1b4b01cb126b80b9e3d7df46b9174a37463eee0684257de8b9bb1bf196a8bf61aa200 WHIRLPOOL 32837947bbeec5a485e27eb362d06b1c5a3bedefa04dea081e98206fa0edbcddaa6e7821d698364f581aac053af6ee4a0afddda68be1a212614055fc98f745a6
--- a/mate-base/mate-applets/files/mate-applets-1.10.0-replace-cpufreq-by-cpupower.patch
+++ b/mate-base/mate-applets/files/mate-applets-1.10.0-replace-cpufreq-by-cpupower.patch
@ -1,71 +0,0 @@
--- a/configure.ac	2015-06-16 01:32:25.485187109 +0000
-+++ b/configure.ac	2015-06-16 01:39:00.414170501 +0000
-@@ -409,12 +409,12 @@
- 
- 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="-l$with_cpufreq_lib"
-+if test "x$have_libcpupower" = "xyes"; then
-+   AC_DEFINE([HAVE_LIBCPOWER], [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
- 
--- a/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2015-06-16 01:42:36.709161405 +0000
-+++ b/cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2015-06-16 01:47:30.191149062 +0000
-@@ -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 @@
- {
- 	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 @@
- 	} 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;
- }
--- a/cpufreq/src/cpufreq-selector/Makefile.am	2015-06-16 01:49:29.208144057 +0000
-+++ b/cpufreq/src/cpufreq-selector/Makefile.am	2015-06-16 01:50:43.970140913 +0000
-@@ -16,7 +16,7 @@
- endif
- 
- 
-if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-selector-libcpufreq.c        cpufreq-selector-libcpufreq.h
- endif
- 
--- a/cpufreq/src/Makefile.am	2015-06-16 01:52:13.562137145 +0000
-+++ b/cpufreq/src/Makefile.am	2015-06-16 01:52:46.122135776 +0000
-@@ -12,7 +12,7 @@
- 
- libexec_PROGRAMS = mate-cpufreq-applet
- 
-if HAVE_LIBCPUFREQ
-+if HAVE_LIBCPUPOWER
- cpufreq_files=cpufreq-monitor-libcpufreq.c    cpufreq-monitor-libcpufreq.h
- endif
- 
--- a/mate-base/mate-applets/mate-applets-1.14.0-r1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.14.0-r1.ebuild
@ -1,110 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	!net-analyzer/mate-netspeed
-	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.12.0:0[gtk3?]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=mate-base/mate-settings-daemon-1.12:0[gtk3?]
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-        !gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libwnck-2.30:1
-        x11-libs/gtksourceview:2.0
-        )
-        gtk3? ( x11-libs/gtk+:3
-        x11-libs/gtksourceview:3.0
-        x11-libs/libwnck:3
-        )
-        upower?  ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-themes/mate-icon-theme-1.12: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.50.2-r1
-	dev-libs/libxslt:0
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	 epatch "${FILESDIR}"/${PN}-1.10.0-replace-cpufreq-by-cpupower.patch
-
-	eautoreconf
-}
-
-src_configure() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--without-hal \
-		$(use_enable ipv6) \
-		$(use_enable networkmanager) \
-		$(use_enable policykit polkit) \
-		$(use_with upower) \
-	        ${myconf} \
-         	$(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 timerapplet
-	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
-}
--- a/mate-base/mate-applets/mate-applets-1.14.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.14.0.ebuild
@ -1,109 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-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.12.0:0[gtk3?]
-	>=dev-libs/libxml2-2.5:2
-	dev-python/pygobject:3
-	>=gnome-base/libgtop-2.11.92:2=
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=mate-base/mate-settings-daemon-1.12:0[gtk3?]
-	>=sys-apps/dbus-1.1.2:0
-	sys-power/cpupower
-        !gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.24:2
-	>=x11-libs/libwnck-2.30:1
-        x11-libs/gtksourceview:2.0
-        )
-        gtk3? ( x11-libs/gtk+:3
-        x11-libs/gtksourceview:3.0
-        x11-libs/libwnck:3
-        )
-        upower?  ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-themes/mate-icon-theme-1.12: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.50.2-r1
-	dev-libs/libxslt:0
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	 epatch "${FILESDIR}"/${PN}-1.10.0-replace-cpufreq-by-cpupower.patch
-
-	eautoreconf
-}
-
-src_configure() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--without-hal \
-		$(use_enable ipv6) \
-		$(use_enable networkmanager) \
-		$(use_enable policykit polkit) \
-		$(use_with upower) \
-	        ${myconf} \
-         	$(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 timerapplet
-	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
-}
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@ -1 +0,0 @@
-DIST mate-common-1.14.0.tar.xz 72368 SHA256 04b7196ac6b301cc88dc31e88ef19a9732ac338c9bd5c3d9b42f6fc387e56cf6 SHA512 fe0a824796dd65756f7dcd351370f3f537d9990b422cb365419f2f6ec446b6ec9660be35685847ff8ae295a80cda8780a968ab11441c49ac152eb8e50f30dc6a WHIRLPOOL fddbb8fc3acc9b3c5e0231f8c2dfdd7f9a01f426adc3630332080c87b7895ee1eda1d74b2b46bd61170327ad3dcf9531e7d8c6a5df6722065d778e4ddc635eaa
--- a/mate-base/mate-common/mate-common-1.14.0.ebuild
+++ b/mate-base/mate-common/mate-common-1.14.0.ebuild
@ -1,24 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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
-}
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@ -1 +0,0 @@
-DIST mate-control-center-1.14.0.tar.xz 1380000 SHA256 ec29a37d287188c234badb846e43cd8e0b70e4a538684fc2a3588c9f1cea0c8e SHA512 b0739d782b08c380dce5ffe3fd3fa97ae4c6e0ba7225f9af5f72bea160ffecd0d14ee27d9187df88326c77b5e8537aaad072321d2cd23d50e34c14f794efa878 WHIRLPOOL a8bd13fea76a07b2b38cddaafda3859c8b0db087ab53bbfce480d4b0657762d5a21e192223266df2ec73d8dc2096c9ec852c6778ae36ccfe74192893788c824f
--- a/mate-base/mate-control-center/mate-control-center-1.14.0.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.14.0.ebuild
@ -1,97 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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"
-IUSE="gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.28:2
-	!gtk3? ( >=dev-libs/libunique-1:1
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.24:2
-	media-libs/libcanberra[gtk]
-        )
-        gtk3? ( dev-libs/libunique:3
-        x11-libs/gtk+:3
-	media-libs/libcanberra[gtk]
-        )
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.12:0[gtk3?]
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	|| (
-		>=mate-base/caja-1.12:0[gtk3?]
-		>=mate-base/mate-file-manager-1.12:0
-	)
-	>=mate-base/mate-menus-1.12:0
-	>=mate-base/mate-settings-daemon-1.12:0[gtk3?]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	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.12.0:0
-		>=x11-wm/mate-window-manager-1.6: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.12: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() {
-	        local myconf 
-                use gtk3 && myconf="${myconf} --with-gtk=3.0"
-                use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-                gnome2_src_configure \
-                ${myconf} \
-		--disable-update-mimedb \
-		--disable-appindicator
-}
-
-src_compile() {
-	emake -j1
-}
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@ -1 +0,0 @@
-DIST mate-desktop-1.14.1.tar.xz 829244 SHA256 97b5067c3b9a0b96494cf189dc94e64ac852cd21cddc27961e7b744f550d5786 SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d WHIRLPOOL ade1e0367d033386393d95eabafbcc0f8a8d21c025875997aa0e4ff52cdf5c53c7b61eccdf8cddcc81c023b4268dd35098807c111545b40dc81576d698dddff4
--- a/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.14.1.ebuild
@ -1,70 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.34:2
-	x11-libs/cairo:0
-	!gtk3? ( >=x11-libs/gdk-pixbuf-2.4:2
-	>=x11-libs/gtk+-2.24:2
-	>=dev-libs/libunique-1:1
-        )
-        gtk3? ( x11-libs/gtk+:3
-        dev-libs/libunique:3
-        ) 	
-        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.50.2-r1
-	>=gnome-base/dconf-0.10:0
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.2:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
- 	gnome2_src_configure \
-		--enable-mate-about \
-		--enable-mate-conf-import \
-		--disable-desktop-docs \
-		$(use_with X x) \
-		$(use_enable startup-notification) \
-                ${myconf}
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-src_install() {
-	gnome2_src_install
-
-	# Remove installed files that cause collissions.
-	rm -rf "${ED}"/usr/share/help/C/{lgpl,gpl,fdl}
-}
--- a/mate-base/mate-desktop/metadata.xml
+++ b/mate-base/mate-desktop/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>mate</herd>
-	<use>
-		<flag name="user-guide">Install MATE user guide</flag>
-		<flag name="gtk3">Build mate-desktop with GTK3 support</flag>
-	</use>
-    <upstream>
-        <remote-id type="github">mate-desktop/mate-desktop</remote-id>
-    </upstream>
-</pkgmetadata>
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@ -1 +0,0 @@
-DIST mate-menus-1.14.0.tar.xz 362136 SHA256 26585cafa82496e22851fd7c767260797eb029d24698ca8059ddfe3f70226cc5 SHA512 9d82737669b37e85ab76e94e84a464d7cafb837b71d6af90cf08b4286480de901e1a37d279ba7f0af25e655c3c9c67481b1394587b6aad902a284a8ac58559c6 WHIRLPOOL ac0a45e91ab619c40ba946624de68f71a6df8dec7c83562fa471018f7be113aa2ac9cbb9e74d44929923c3595bb0f4756d4f9458cb5f2572864ecc5e90a5fab6
--- a/mate-base/mate-menus/files/10-xdg-menu-mate
+++ b/mate-base/mate-menus/files/10-xdg-menu-mate
@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -z "$XDG_MENU_PREFIX" ] && [ "$DESKTOP_SESSION" = "mate" ]
-then
-	export XDG_MENU_PREFIX=mate-
-fi
--- a/mate-base/mate-menus/mate-menus-1.14.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.14.0.ebuild
@ -1,80 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="gtk3 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.50.2-r1
-	>=mate-base/mate-common-1.12: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"
-}
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@ -1 +0,0 @@
-DIST mate-panel-1.14.1.tar.xz 2013292 SHA256 1eacc629be62a3985b9f3403c0762b2dd79eb48399a5f41085977717dfa2148c SHA512 86aa8ca9e27f25f0ef3d1e67872986d855b0c683ca1cecc7d8da118300da7d58498cba883728ae9fa257358c6cadc0c3e3f22e8295184eeb00b2e9c4a35cf24a WHIRLPOOL b64a5b62f6a5f4d330a08e42498d5fdebef4d8dd4cd9b20adfc52161b92f668359bca4820aa8468cf7e9212124e4a7caac6b42b23230e8fe14ecbd915451f4be
--- a/mate-base/mate-panel/mate-panel-1.14.1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.14.1.ebuild
@ -1,85 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libmateweather-1.12[gtk3?]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	gnome-base/librsvg:2
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-menus-1.12:0
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[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 )
-        !gtk3? ( >=x11-libs/gdk-pixbuf-2.7.1:2
-	>=x11-libs/libwnck-2.30:1[introspection?]
-	>=x11-libs/gtk+-2.19.7:2[introspection?]
-	>=media-libs/libcanberra-0.23:0[gtk]
-        )
-        gtk3? ( x11-libs/gtk+:3[introspection?]
-        x11-libs/libwnck:3[introspection?]
-        media-libs/libcanberra[gtk3]
-        )"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	>=dev-util/intltool-0.50.2-r1
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	# Disable python check.
-	sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
-
-	epatch_user
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	   local myconf
-           use gtk3 && myconf="${myconf} --with-gtk=3.0"
-           use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-           gnome2_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-                ${myconf}
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@ -1 +0,0 @@
-DIST mate-session-manager-1.14.0.tar.xz 583132 SHA256 190b9d9d2d9e76b8aa8ef84f351aab07fbea7e0772cecc11dae8c441c67b8dde SHA512 bca0379e41c597a823c90ea9c56e13328a4e7066d4d1bc96e6a1dc2fc849f71891b6d626c7241a2ebf5b74221e23f6592913358c2de2f2ac23da31d761a6219e WHIRLPOOL 7311253e761396165425c6891c1de3df4b182c3c0104443489c417b67803b9c8d95abe812b683c44e606cccb89011d98fe722fa8f3e0acc28e986c3650f2e3fc
--- a/mate-base/mate-session-manager/files/10-user-dirs-update-mate
+++ b/mate-base/mate-session-manager/files/10-user-dirs-update-mate
@ -1,10 +0,0 @@
-#!/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
--- a/mate-base/mate-session-manager/files/15-xdg-data-mate
+++ b/mate-base/mate-session-manager/files/15-xdg-data-mate
@ -1,9 +0,0 @@
-#!/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
--- a/mate-base/mate-session-manager/files/MATE
+++ b/mate-base/mate-session-manager/files/MATE
@ -1,109 +0,0 @@
-#!/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
--- a/mate-base/mate-session-manager/files/defaults.list
+++ b/mate-base/mate-session-manager/files/defaults.list
@ -1,336 +0,0 @@
-[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
--- a/mate-base/mate-session-manager/files/mate-session-manager-1.12.0-save-session-ui.patch
+++ b/mate-base/mate-session-manager/files/mate-session-manager-1.12.0-save-session-ui.patch
@ -1,525 +0,0 @@
-diff -burN a/capplet/gsm-properties-dialog.c b/capplet/gsm-properties-dialog.c
--- a/capplet/gsm-properties-dialog.c   2015-10-08 17:47:18.000000000 -0300
-+++ b/capplet/gsm-properties-dialog.c   2015-10-21 21:29:32.538065780 -0300
-@@ -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 <gio/gio.h>
- 
-@@ -35,6 +37,10 @@
- #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 GTKBUILDER_FILE "session-properties.ui"
-@@ -44,6 +50,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"
-@@ -456,10 +463,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/data/session-properties.ui b/data/session-properties.ui
--- a/data/session-properties.ui        2015-10-08 17:47:18.000000000 -0300
-+++ b/data/session-properties.ui        2015-10-21 21:33:44.293460556 -0300
-@@ -149,6 +149,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>
-@@ -192,6 +193,16 @@
-             <property name="position">1</property>
-           </packing>
-         </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 2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-client.c 2015-10-21 21:35:30.644187677 -0300
-@@ -527,6 +527,18 @@
-         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 2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-client.h 2015-10-21 21:36:57.352933190 -0300
-@@ -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    2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-dbus-client.c    2015-10-21 21:39:43.779719130 -0300
-@@ -411,6 +411,20 @@
-         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)
-@@ -663,6 +677,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        2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-manager.c        2015-10-21 21:50:01.962069504 -0300
-@@ -73,6 +73,7 @@
- #define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
- 
- #define GSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */
-+#define GSM_MANAGER_SAVE_SESSION_TIMEOUT 2 /* seconds too */
- 
- #define MDM_FLEXISERVER_COMMAND "mdmflexiserver"
- #define MDM_FLEXISERVER_ARGS    "--startnew Standard"
-@@ -1375,6 +1376,70 @@
- 
- }
- 
-+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)
- {
-@@ -1455,6 +1520,22 @@
-         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)
- {
-@@ -2119,12 +2200,32 @@
-                                      const char *reason)
- {
-         /* just ignore if received outside of shutdown */
-        if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
-+        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;
-@@ -2239,6 +2340,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)
-@@ -2259,6 +2369,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,
-@@ -3375,6 +3489,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        2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-manager.h        2015-10-21 21:50:51.767092879 -0300
-@@ -161,6 +161,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    2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-xsmp-client.c    2015-10-21 21:54:24.958603896 -0300
-@@ -67,6 +67,7 @@
- enum {
-         REGISTER_REQUEST,
-         LOGOUT_REQUEST,
-+        SAVE_REQUEST,
-         LAST_SIGNAL
- };
- 
-@@ -500,6 +501,32 @@
-         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)
- {
-@@ -990,6 +1017,7 @@
-         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;
-@@ -1019,6 +1047,16 @@
-                               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);
- 
-         g_object_class_install_property (object_class,
-                                          PROP_ICE_CONNECTION,
-diff -burN a/mate-session/gsm-xsmp-client.h b/mate-session/gsm-xsmp-client.h
--- a/mate-session/gsm-xsmp-client.h    2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/gsm-xsmp-client.h    2015-10-21 21:55:16.493804715 -0300
-@@ -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.gnome.SessionManager.xml b/mate-session/org.gnome.SessionManager.xml
--- a/mate-session/org.gnome.SessionManager.xml 2015-10-08 17:47:18.000000000 -0300
-+++ b/mate-session/org.gnome.SessionManager.xml 2015-10-21 21:56:16.779888652 -0300
-@@ -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>
--- 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
@ -1,535 +0,0 @@
-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>
--- a/mate-base/mate-session-manager/mate-session-manager-1.14.0.ebuild
+++ b/mate-base/mate-session-manager/mate-session-manager-1.14.0.ebuild
@ -1,96 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-# 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=">=mate-base/mate-desktop-1.12:0[gtk3?]
-        >=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.25:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-apps/xdpyinfo
-	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 )
-        !gtk3? ( x11-libs/gdk-pixbuf:2
-        >=x11-libs/gtk+-2.14:2
-        )
-        gtk3? ( x11-libs/gtk+:3 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=mate-base/mate-common-1.12
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable ipv6) \
-		$(use_with systemd) \
-		$(use_enable upower) \
-                ${myconf}
-}
-
-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
-}
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@ -1 +0,0 @@
-DIST mate-settings-daemon-1.14.0.tar.xz 757756 SHA256 b9e9cdfccbdb226fd4d551303d3cb726625138e81fa48b55a31ed79e9d0457be SHA512 b332c639e69a3f0d88e43216de465cb841f1c45941cc47d5598203a5fffa8c4a7e1253e85b09f32d90b84d39bbd705eda19dacb56df7bf5aac1fa7d6f416fe07 WHIRLPOOL ffbaf10b4beeee6fa14a7c7fc1123a41cdfcaa8f7d626127f35612d8d0622cce89f8dea9f6695c0f1ea9965a1957efe5a8611476ada96600cb3262170cbaa58f
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.0.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.14.0.ebuild
@ -1,86 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=mate-base/libmatekbd-1.12:0[gtk3?]
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	media-libs/fontconfig:1.0
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	!gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.24:2
-	pulseaudio? (
-		media-libs/libcanberra:0[gtk]
-		>=media-sound/pulseaudio-0.9.15:0
-        )
-)
-        gtk3? ( x11-libs/gtk+:3
-        pulseaudio? (
-           media-libs/libcanberra[gtk3]
-           >=media-sound/pulseaudio-0.9.15:0
-        )
-)
-        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/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() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	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) \
-                ${myconf}
-}
-
-DOCS="AUTHORS NEWS ChangeLog"
--- a/mate-base/mate/mate-1.12.0-r1.ebuild
+++ b/mate-base/mate/mate-1.12.0-r1.ebuild
@ -1,73 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI="5"
-
-inherit multilib
-
-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 gtk3"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-menus-1.12:0
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=mate-base/mate-session-manager-1.12:0[gtk3?]
-	>=mate-base/mate-settings-daemon-1.12:0[gtk3?]
-	>=x11-wm/marco-1.12:0[gtk3?]
-	base? (
-		>=mate-base/caja-1.12:0[gtk3?]
-		>=mate-base/mate-applets-1.12:0[gtk3?]
-		>=mate-base/mate-control-center-1.12:0[gtk3?]
-		>=mate-extra/mate-media-1.12:0
-		>=x11-misc/mozo-1.12:0
-		>=x11-terms/mate-terminal-1.12:0[gtk3?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		>=x11-themes/mate-backgrounds-1.12:0
-		>=x11-themes/mate-icon-theme-1.12:0
-		>=x11-themes/mate-themes-1.12:0
-	)
-	extras? (
-		>=app-arch/engrampa-1.12:0[gtk3?]
-		>=app-editors/pluma-1.12:0[gtk3?]
-		>=app-text/atril-1.12:0[gtk3?]
-		!gtk3? ( >=mate-extra/mate-calc-1.8:0 )
-		gtk3? ( sci-calculators/galculator )
-                >=mate-extra/mate-power-manager-1.12:0[gtk3?]
-		>=mate-extra/mate-screensaver-1.12:0
-		>=mate-extra/mate-system-monitor-1.12:0
-		>=mate-extra/mate-utils-1.12:0
-		>=media-gfx/eom-1.12:0[gtk3?]
-	)
-"
-
-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.12 had some packages renamed, replaced and/or dropped; for more"
-	elog "details, see http://mate-desktop.org/blog/2015-11-05-mate-1-12-released/"
-	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"
-        elog ""
-        elog "For user guide information: emerge mate-user-guide-1.12.0"
-        elog ""
-        elog ""
-        elog "Thanks open-overlay 2015 by Alex"
-        elog ""
-}
--- a/mate-base/mate/mate-1.12.0.ebuild
+++ b/mate-base/mate/mate-1.12.0.ebuild
@ -1,73 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI="5"
-
-inherit multilib
-
-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 gtk3"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-menus-1.12:0
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=mate-base/mate-session-manager-1.12:0[gtk3?]
-	>=mate-base/mate-settings-daemon-1.12:0[gtk3?]
-	>=x11-wm/marco-1.12:0[gtk3?]
-	base? (
-		>=mate-base/caja-1.12:0[gtk3?]
-		>=mate-base/mate-applets-1.12:0[gtk3?]
-		>=mate-base/mate-control-center-1.12:0[gtk3?]
-		>=mate-extra/mate-media-1.12:0
-		>=x11-misc/mozo-1.12:0
-		>=x11-terms/mate-terminal-1.12:0[gtk3?]
-	)
-	bluetooth? ( net-wireless/blueman:0 )
-	themes? (
-		>=x11-themes/mate-backgrounds-1.12:0
-		>=x11-themes/mate-icon-theme-1.12:0
-		>=x11-themes/mate-themes-1.12:0
-	)
-	extras? (
-		>=app-arch/engrampa-1.12:0[gtk3?]
-		>=app-editors/pluma-1.12:0[gtk3?]
-		>=app-text/atril-1.12:0[gtk3?]
-		!gtk3? ( >=mate-extra/mate-calc-1.8:0 )
-		gtk3? ( sci-calculators/galculator )
-                >=mate-extra/mate-power-manager-1.12:0[gtk3?]
-		>=mate-extra/mate-screensaver-1.12:0
-		>=mate-extra/mate-system-monitor-1.12:0[gtk3?]
-		>=mate-extra/mate-utils-1.12:0
-		>=media-gfx/eom-1.12:0[gtk3?]
-	)
-"
-
-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.12 had some packages renamed, replaced and/or dropped; for more"
-	elog "details, see http://mate-desktop.org/blog/2015-11-05-mate-1-12-released/"
-	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"
-        elog ""
-        elog "For user guide information: emerge mate-user-guide-1.12.0"
-        elog ""
-        elog ""
-        elog "Thanks open-overlay 2015 by Alex"
-        elog ""
-}
--- a/mate-base/mdm/Manifest
+++ b/mate-base/mdm/Manifest
@ -1,3 +0,0 @@
-DIST gdm-2.8-gentoo-files-r2.tar.bz2 3101 SHA256 c9335d71ab0a2ceca6a5959947aabf3728031e86dcb5536b7b57c6115c4ce53e SHA512 785873f5ae702d3a49d51467f94cad77763f9379e9e2039b5229e9835410b11e517e2c490d73a1fd7237ceed4375964f6c21c20645d7f285fb1bf8543b9be85c WHIRLPOOL 869bede81425e6d23351d3b8c06a4ae2c9e9c27e01cf81213120c23b5b3ff21c76abbc83e2c74d46cf0b3468642c7bdedffb836e242d7126d5c2079edf0e88fc
-DIST mdm-2.0.4.tar.gz 4304238 SHA256 cf4875345f610b4d00e8edecf454052e5099f417b16abb7549e14ac465fe0ab9 SHA512 e0ba9d3f9d5a6be0a833f5052e872e50beae4533299be26c00878bfa25f62e93ef16f2c9f9aad71fb859c91726269e448725e8e018d52243ed5a3e87281f77be WHIRLPOOL f98343e472fbc695bb6f9ad041614aa203eb550214b3e65f7f5c51e55af5bf677367c2acf9905d66897423c89b451ad02ddca8a485599d72105286e4b058dc91
-DIST mdm-2.0.5.tar.gz 4307688 SHA256 e8936b772504895a5b9406ca7e23023be35c79040247d2181b8f0034808d551f SHA512 0e11e056553d1f6207834fd750324846614a00ad425b940399baf98f438611d145aa801325724010c0a3d0f1032b8ed8516d4aee76d4f37946b792fdb5f41827 WHIRLPOOL 1bbf3c30ab4ac552b993baeaa33f04742c5ede0d2a9dae6d5073562a26b56c2559ab98c52c62615e8dfb46761de11ec2a0fad84a57e2043bdecde2a6a475d378
--- a/mate-base/mdm/mdm-2.0.4.ebuild
+++ b/mate-base/mdm/mdm-2.0.4.ebuild
@ -1,126 +0,0 @@
-#Copyright open-overlay 2015 by Alex
-
-EAPI=5
-
-inherit autotools eutils libtool gnome2 pam user 
-DESCRIPTION="Mate Display Manager"
-HOMEPAGE="http://mate-desktop.org"
-LICENSE="GPL-2 LGPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~arm ~x86"
-GDM_EXTRA="gdm-2.8-gentoo-files-r2"
-SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-        http://mirror.yandex.ru/gentoo-distfiles/distfiles/${GDM_EXTRA}.tar.bz2"
-IUSE="accessibility afs elibc_glibc remote gnome-keyring ipv6 xinerama pam tcpd dmx selinux +consolekit"
-
-
-RDEPEND="
-        dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.36.8
-        x11-libs/gdk-pixbuf
-	gnome-base/libglade:2.0
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg:2
-	dev-libs/libxml2:2
-	media-libs/libart_lgpl
-	net-libs/webkit-gtk:2
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3
-"
-
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-pam-prefix=/etc
-         	--disable-static
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with accessibility xevie)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup mdm
-	enewuser mdm -1 -1 /var/lib/mdm mdm
-}
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-        gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# install XDG_DATA_DIRS mdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm
-	doenvd 99xdg-mdm
-
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		mv "${gentoodir}"/pam.d/{g,m}dm
-		mv "${gentoodir}"/pam.d/{g,m}dmsetup
-		mv "${gentoodir}"/pam.d/{g,m}dm-autologin
-		dopamd "${gentoodir}"/pam.d/*
-		sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup"
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup"
-	fi
-
-}
--- a/mate-base/mdm/mdm-2.0.5.ebuild
+++ b/mate-base/mdm/mdm-2.0.5.ebuild
@ -1,126 +0,0 @@
-#Copyright open-overlay 2015 by Alex
-
-EAPI=5
-
-inherit autotools eutils libtool gnome2 pam user 
-DESCRIPTION="Mate Display Manager"
-HOMEPAGE="http://mate-desktop.org"
-LICENSE="GPL-2 LGPL-2"
-SLOT=0
-KEYWORDS="~amd64 ~arm ~x86"
-GDM_EXTRA="gdm-2.8-gentoo-files-r2"
-SRC_URI="https://github.com/linuxmint/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-        http://mirror.yandex.ru/gentoo-distfiles/distfiles/${GDM_EXTRA}.tar.bz2"
-IUSE="accessibility afs elibc_glibc remote gnome-keyring ipv6 xinerama pam tcpd dmx selinux +consolekit"
-
-
-RDEPEND="
-        dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.36.8
-        x11-libs/gdk-pixbuf
-	gnome-base/libglade:2.0
-	gnome-base/libgnomecanvas
-	gnome-base/librsvg:2
-	dev-libs/libxml2:2
-	media-libs/libart_lgpl
-	net-libs/webkit-gtk:2
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( gnome-base/gnome-keyring[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3
-"
-
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-pam-prefix=/etc
-         	--disable-static
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with accessibility xevie)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup mdm
-	enewuser mdm -1 -1 /var/lib/mdm mdm
-}
-
-src_prepare() {
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-        gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# install XDG_DATA_DIRS mdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/mdm"' > 99xdg-mdm
-	doenvd 99xdg-mdm
-
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		mv "${gentoodir}"/pam.d/{g,m}dm
-		mv "${gentoodir}"/pam.d/{g,m}dmsetup
-		mv "${gentoodir}"/pam.d/{g,m}dm-autologin
-		dopamd "${gentoodir}"/pam.d/*
-		sed s/gdmsetup/mdmsetup/ "${gentoodir}/security/console.apps/gdmsetup" > "${gentoodir}/security/console.apps/mdmsetup"
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/mdmsetup"
-	fi
-
-}
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@ -1 +0,0 @@
-DIST caja-dropbox-1.14.0.tar.xz 310964 SHA256 780c7a734dff297b7c832affa01f223b88e8f61862f18d0563f934bb3d7eba87 SHA512 e13012bff812d43eb5ddd9ca8a73907bf9aa2d46bd8947f58695b32fe590a4ecd6bea2ac0d30330c8bd1fa8c652681beb964e7bd658525e99cda73e36a207a50 WHIRLPOOL 3dd0d73a2faf9d5c8c0a22439b3f47e48ded755408bb7ed39ddce593a2bc3b04884ef19aaa03467b49276eb5f2c6c01e1a4a2cc4d93efc375bd920492c95b8a5
--- a/mate-extra/caja-dropbox/caja-dropbox-1.14.0-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.14.0-r1.ebuild
@ -1,88 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 python-single-r1 linux-info user versionator
-
-MATE_BRANCH="1.14"
-
-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.14:0 >=mate-base/mate-file-manager-1.6: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} --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}"/${PN}-1.10.0-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
-}
--- a/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch
+++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch
@ -1,11 +0,0 @@
--- a/configure.ac	2015-06-15 21:20:56.514821667 +0000
-+++ b/configure.ac	2015-06-15 21:22:58.943816518 +0000
-@@ -32,7 +32,7 @@
- 
- 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
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@ -1 +0,0 @@
-DIST caja-extensions-1.14.0.tar.xz 398768 SHA256 8f3630eb5e393d357423f94a3a1f9a32bab7dc610d1aaa811019ec710a1fdf06 SHA512 3ee4641cca0e19d38f07af36c0a4adf2c6097a04254eba9bb6ebf3a127ba0bdb60ff40c22d66b7cda1645a0c8c559b628237621eaffc766a1b8706fa7c10612c WHIRLPOOL cda4cde3a4ee05b1cd0a8895a70941a11e24c3b092b552ab076b90526c6d36d8c7d4db14de49e64740d192987b51a7a0caeae57295dafdd7bb55bf51e634151c
--- a/mate-extra/caja-extensions/caja-extensions-1.14.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.14.0.ebuild
@ -1,81 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="gtk3 image-converter +open-terminal share ${SENDTO}"
-
-RDEPEND="!gtk3? ( >=x11-libs/gtk+-2.18:2
-         x11-libs/gdk-pixbuf:2
-        )
-        gtk3? ( x11-libs/gtk+:3 )
-	>=dev-libs/glib-2.26:2
-	>=mate-base/caja-1.12:0[gtk3?]
-	virtual/libintl:0
-	open-terminal? ( >=mate-base/mate-desktop-1.12:0[gtk3?] )
-	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.12: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() {
-
-	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
-        use gtk3 && MY_CONF="${MY_CONF} --with-gtk=3.0"
-	use !gtk3 && MY_CONF="${MY_CONF} --with-gtk=2.0"
-
-	gnome2_src_configure ${MY_CONF} \
-		--disable-gksu \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share)
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@ -1 +0,0 @@
-DIST mate-media-1.14.0.tar.xz 508404 SHA256 4e3e1f5d0d0df0b8707fc85719e8aeb5403db2fdbe86725a67be5a85ac444a36 SHA512 353a2b04535f1bcff104a8e259df4e495375efb17bcd17a6fd7a6c201e5b81012002d3804d51fc733aba68f4425033c877e966c3d6f239402d6072906fe6b985 WHIRLPOOL 5793558dec2d2cef8b5b903d6545f52ce6ed8230dc2829b20b51d67b9cd5e390110bc8db86fd2bf6646c8da71c158240ee88ee336c8b4e60d5bc34d4cb8b2cfc
--- a/mate-extra/mate-media/mate-media-1.14.0.ebuild
+++ b/mate-extra/mate-media/mate-media-1.14.0.ebuild
@ -1,100 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-# FIXME: automagic dev-util/glade:3 support
-COMMON_DEPEND="app-text/rarian:0
-	dev-libs/libxml2:2
-	>=dev-libs/glib-2.18.2:2
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=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
-	!gtk3? ( >=media-libs/libcanberra-0.13:0[gtk]
-        >=dev-libs/libunique-1:1
-        >=x11-libs/gtk+-2.24:2
-        )
-        gtk3? ( x11-libs/gtk+:3 
-        dev-libs/libunique:3
-        >=media-libs/libcanberra-0.13:0 )
-        >=media-plugins/gst-plugins-meta-0.10-r2:0.10
-	>=media-plugins/gst-plugins-gconf-0.10.1:0.10
-	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}
-        >=media-libs/libmatemixer-1.12.0
-	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.6:*"
-
-src_configure() {
-	  local  myconf
-          use gtk3 && myconf="${myconf} --with-gtk=3.0"
-          use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-          gnome2_src_configure \
-                ${myconf} \
-		$(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
-}
--- a/mate-extra/mate-polkit/Manifest
+++ b/mate-extra/mate-polkit/Manifest
@ -1 +0,0 @@
-DIST mate-polkit-1.14.0.tar.xz 339872 SHA256 929d5710d6284f924dc65824b75e9da23b5809c50033da18b6b4b79e0f599ddd SHA512 f3507380152798af192e3338b5f056b1105fd297e935f098803c21450b04b6d149bc22106f34129a6394655be2e6505c91ad1433e817c68274a1243cc862bcdf WHIRLPOOL 034f05c91c5f79f1c77b073ff8f310e0264541e9783d98dabdc0dda5b0bc36da83ad4468563d9ecb6bdd389065b1b5d828deba02c15a94867124c6687ff54098
--- a/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
+++ b/mate-extra/mate-polkit/mate-polkit-1.14.0.ebuild
@ -1,52 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=sys-auth/polkit-0.102:0[introspection?]
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	)
-        gtk3? ( x11-libs/gtk+:3[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.12
-	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() {
-        local myconf 
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		--disable-static \
-                ${myconf} \
-		$(use_enable introspection)
-}
-
-DOCS="AUTHORS HACKING NEWS README"
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@ -1 +0,0 @@
-DIST mate-power-manager-1.14.0.tar.xz 3221144 SHA256 2306f7210298dba705277b748f8e3da1481889af4cb047a3eb76f196c4ded898 SHA512 b1e6c5c0fe18b8e5d70ad66af450e86e7cf9fd5429973907618a742093fa9dec0c137e598f766824cb092d7c8c90a6d7116bc6b0417c81320dc21f8426d1eae2 WHIRLPOOL 80773ee914217c409ae49b8f8741b64ec55aa3ec8e6550441e4d0a3d99a7f44e3a0833b073c3be742fa30362da43425ace953af48820c09628ddef9c3443419a
--- a/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.14.0.ebuild
@ -1,96 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND="app-text/rarian:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.13:2
-	>=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
-	!gtk3? ( >=x11-libs/gdk-pixbuf-2.11:2
-	>=x11-libs/gtk+-2.17.7:2
-	unique? ( >=dev-libs/libunique-0.9.4:1 )
-	>=media-libs/libcanberra-0.10:0[gtk]
-        )
-        gtk3? ( x11-libs/gtk+:3 
-        >=media-libs/libcanberra-0.10:0[gtk3]
-        unique? ( dev-libs/libunique:3 ) 
-        )
-	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.12:0 )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.12:0[gtk3?] )"
-
-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() {
-
-	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() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		$(use_enable applet applets) \
-		$(use_enable test tests) \
-		$(use_enable unique) \
-		$(use_with gnome-keyring keyring) \
-		--enable-compile-warnings=minimum \
-                ${myconf}
-}
-
-DOCS="AUTHORS HACKING NEWS README TODO"
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@ -1 +0,0 @@
-DIST mate-screensaver-1.14.1.tar.xz 4912772 SHA256 e903932d9e3b01b527abf8b4957d68797afd1b6b035854bcbbd5e4e6934da5c6 SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8 WHIRLPOOL c39b1f2ee9bb3082a038c765c9c007c500470ab4c73d5221d3d5e49de9c54fa950e9eeabec9f02f4791f7ade984076574ad8c25357af43bf5ff39d3623cff74b
--- 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
@ -1,11 +0,0 @@
-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>
--- 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
@ -1,11 +0,0 @@
--- 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=""
- 
--- a/mate-extra/mate-screensaver/files/xss-conversion.txt
+++ b/mate-extra/mate-screensaver/files/xss-conversion.txt
@ -1,22 +0,0 @@
-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.
--- a/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.14.1.ebuild
@ -1,123 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-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.12:0[gtk3?]
-	>=mate-base/mate-desktop-1.12:0[gtk3?]
-	>=mate-base/mate-menus-1.12:0
-	>=sys-apps/dbus-0.30:0
-	!gtk3? ( >=x11-libs/gdk-pixbuf-2.14:2
-	>=x11-libs/gtk+-2.14:2
-        )
-        gtk3? ( x11-libs/gtk+:3 )
-	>=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.12
-	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() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	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 \
-                ${myconf}
-}
-
-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
-}
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@ -1 +0,0 @@
-DIST mate-sensors-applet-1.14.0.tar.xz 389960 SHA256 f825e663d409458cc9e6c399ae78140422e3f5f225aa3bebf2e1837434da1a8f SHA512 8d1afdb491e3a4a72dbee098ff3383a9562ab47da81d68807cb1fe72ee9f2ccad31cbe355268d7641fc213dcabf8a4527f03e04c4d8a166584730e934f006f5f WHIRLPOOL f1af968c8770482d4a11e6954aa12ae57a939997ffc06ae888672107138fe257af5aeeb99599f0ac47b464cad17f8dee9e24c8dec8720f418ac62a6e5e26cde6
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.14.0.ebuild
@ -1,74 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND="app-text/rarian:0
-	>=dev-libs/glib-2.26:2
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=x11-libs/cairo-1.0.4:0
-	!gtk3? ( x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.14:2
-        )
-        gtk3? ( x11-libs/gtk+:3 )
-	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
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-	use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-
-	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"
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@ -1 +0,0 @@
-DIST mate-system-monitor-1.14.0.tar.xz 2135464 SHA256 ccd7f52836af22d18138e516335ee259448749b6618327feb908ad396d0c650a SHA512 f19fa0241228be8ec8600db43e71495750039288292ba5714489a84acb3e5cc9f4c87d39a63d29a0fc6f907af6ecc319382cd4276ae2de1125bba059d5b24be5 WHIRLPOOL d354dfbf7121b838af6fac73148e381c23df4e3bc50a59f68f6469416f608235a0b6d990214e9de87bc01e1254f16e1ba9d1f631e18554205ae45ebc4b84f149
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
@ -1,54 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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"
-IUSE="systemd"
-
-RDEPEND="app-text/rarian:0
-	>=dev-cpp/glibmm-2.16:2
-	>=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/gtk+:3 
-    dev-cpp/gtkmm:3.0
-    >=x11-libs/libwnck-3.4:3
-        systemd? ( sys-apps/systemd )
-	>=x11-themes/mate-icon-theme-1.12:0
-	virtual/libintl:0"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.2-r1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	local myconf
-
-	myconf="${myconf} --with-gtk=3.0"
-
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		${myconf}
-}
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@ -1 +0,0 @@
-DIST mate-user-guide-1.14.0.tar.xz 8375176 SHA256 acf817fa980e78842f1b73da1b499a07018e15bb22fb53316fea23de4bae7988 SHA512 62df5ee3372d452f52d7e63f18991b68996081dad05ae04fb4902d65246aeef7fc85686b4c4145974fd5cd2db95178f156b9847003f6f0576939d0afae501e60 WHIRLPOOL 665b584bc168f8b65f7f6a4ae427aa514df200915f329f934e6243411e8192e8e655547e25a6c71b223ba45b9ba5f5ad58fbd362d7467ab0a9be5eb06aad1792
--- a/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.14.0.ebuild
@ -1,31 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 user-guide"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="virtual/libintl:0"
-
-DEPEND="${RDEPEND}
- 	gnome-extra/yelp
-        >=dev-util/intltool-0.40:*
-	app-text/yelp-tools
-	>=mate-base/mate-common-1.12:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-DOCS="AUTHORS ChangeLog NEWS README"
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@ -1 +0,0 @@
-DIST mate-user-share-1.14.0.tar.xz 902728 SHA256 b43c6658e941cef3781dba5eea47472aa50eb40815bdc36a983b95ef8c4d5f5c SHA512 a9ad934b0681d1168d7ea3b7d3120cb39f230b7267cd71a91f511f03f132a8e8022bb339fcd017c243988214a82dd337cacb65875d9e35e4c10f014f39eefbe1 WHIRLPOOL 8fb9d5ea5e89d9acfc08f83daf9f20985ec6d09236f40c4e7c9093ac72c5a17fec807cd2d205cfb8502fd1ff1eb872f378c3506b17e85d2fd7440d12b8c1b192
--- a/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.14.0.ebuild
@ -1,66 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND=">=app-mobilephone/obex-data-server-0.4:0
-	>=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.15.2:2
-	|| ( >=mate-base/caja-1.12:0[gtk3?] >=mate-base/mate-file-manager-1.6:0 )
-	>=sys-apps/dbus-1.1.1:0
-	!gtk3? ( >=x11-libs/gdk-pixbuf-2:2
-	>=x11-libs/gtk+-2.14:2
-	>=dev-libs/libunique-1:1
-	media-libs/libcanberra:0[gtk]
-        )
-        gtk3? ( x11-libs/gtk+:3 
-        dev-libs/libunique:3
-        media-libs/libcanberra[gtk3]
-        )	
-        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/mate-bluetooth-1.6:0
-		>=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() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	gnome2_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		$(use_enable bluetooth) \
-		$(use_with X x) \
-                ${myconf}
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@ -1 +0,0 @@
-DIST mate-utils-1.14.0.tar.xz 6526244 SHA256 05b0ffe73a49eb5d5a008e779c2280ab7c803a041681845f9735908f3275a519 SHA512 acb0e347b8c98e207842881c77f4e773771c3f230b437059d08916c8a559f6da33f4681b6b87be7d02f8775ec6cfa00d18079dcce66a23612f79cce2c3dececb WHIRLPOOL a1885455587a00116efd4c23279f819591530404f2b907e0ae3957ed04efb87d190757ae20c9605ffe199bfa0626e514b01217bb07cd5a6b67ecd1c208a8754a
--- a/mate-extra/mate-utils/mate-utils-1.14.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.14.0.ebuild
@ -1,90 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-RDEPEND="app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.20:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2
-	>=media-libs/libcanberra-0.4:0[gtk]
-	)
-        x11-libs/gdk-pixbuf:2
-        gtk3? ( x11-libs/gtk+:3
-        >=media-libs/libcanberra-0.4:0[gtk3]
-	)
-        x11-libs/cairo:0
-	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.12:0[gtk3?] )"
-
-DEPEND="${RDEPEND}
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.40:*
-	>=mate-base/mate-common-1.12: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
-        
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-	use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	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"
--- a/mate-extra/mintmenu/Manifest
+++ b/mate-extra/mintmenu/Manifest
@ -1,5 +0,0 @@
-DIST mint-translations_2015.02.23.tar.gz 2748483 SHA256 efff6e68e07c8fb7c07e2b6d3889d24440ec4e1cd4e9b1af15a5cc8765f0193b SHA512 bea1efa9de91197bc5127f96a824aaa1aadf9e760e7f3a15cade152f9b6691f08e837ae33dcb5eccdd40e43109ecbbd7d9cd59bc0bf0b03ac7e19e2752cc5fb3 WHIRLPOOL 7ba69895673146f2bc077eb629cde835421d09001fa4ac4de8e4c217511886cebbf3361967ec516be5f5b68155507bc7513b10c6e3bc78fc1b06455bff7c9d78
-DIST mintmenu_5.6.4.tar.gz 89049 SHA256 667a0178614eef32620df1c735020619369432872805960b590369475c9addb1 SHA512 3ed403c6ae2af3b83717be3d0f8616f48d8179fca99466f7420ea5b31bfd8365bc948e83a4e410143822b59a778b5cf44de7b93a85c204dc9788c2807e3d6115 WHIRLPOOL af004b730f155206e01a5bfa24c35d016871afe731cb697444f033eb6a3f1c1c192b56927f93f97cc2dc8454bdc3672429ecc4459a69c605c1b4ec3b4518e6d7
-DIST mintmenu_5.6.5.tar.gz 90242 SHA256 1b944abda4a395e419b5745c02f19c3787d17493d774678d84fb70af2bb502ef SHA512 d037a865233f12e5384859627c9aef67040789a0dbd3c344c9033fcad0ff64f08116f43eb7e94d366e0ae9ac4a04d56f66b3fb53ac4b10b4cd08f8edc5b076c3 WHIRLPOOL 337eda05683e5ae615224d055d8ea98b87291f3aaa27948b89682f48d9cb6578948f720d4ad184fe059df3b0d896c01b236e507925aaa64d7c18eeace0c7330c
-EBUILD mintmenu-5.6.4.ebuild 3413 SHA256 761bc3be79fd34dd6c43e5664657b44f63cc7ca4757c87af763d9df67e58dffd SHA512 a28d8665462d724f39c573f10b998a73a03b926277cafbf6e83cc087091fdb2650dbcec838b7992a0cf8537c52e7741c330bd6c12c1498979d3d1ee5700815e1 WHIRLPOOL aa1a5bb9957a7f681eaf8e9492fb834340ad87978403f6a2454ccd9c590d2dd4118547ca81c9c568f5935e1e0db687336ca27e50e8162a00cba0df1fc63e127f
-EBUILD mintmenu-5.6.5.ebuild 3413 SHA256 761bc3be79fd34dd6c43e5664657b44f63cc7ca4757c87af763d9df67e58dffd SHA512 a28d8665462d724f39c573f10b998a73a03b926277cafbf6e83cc087091fdb2650dbcec838b7992a0cf8537c52e7741c330bd6c12c1498979d3d1ee5700815e1 WHIRLPOOL aa1a5bb9957a7f681eaf8e9492fb834340ad87978403f6a2454ccd9c590d2dd4118547ca81c9c568f5935e1e0db687336ca27e50e8162a00cba0df1fc63e127f
--- a/mate-extra/mintmenu/mintmenu-5.6.4.ebuild
+++ b/mate-extra/mintmenu/mintmenu-5.6.4.ebuild
@ -1,104 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI=5
-
-PLOCALES=" \
-	af am ar ast be ber bg bn bs ca ckb csb cs cy da de el en_AU en_CA \
-	en_GB eo es et eu fa fi fo fr gl gv he hi hr hu hy id is it ja jv kk \
-	kn ko lt lv mk ml mr ms nb nds nl nn oc pa pl pt_BR pt ro ru si sk sl \
-	sq sr sv ta te th tr uk ur vi zh_CN zh_HK zh_TW"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1 l10n
-
-DESCRIPTION="MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features."
-MINT_TRANSLATIONS="mint-translations_2015.02.23.tar.gz"
-LANG_URL="http://packages.linuxmint.com/pool/main/m/mint-translations/${MINT_TRANSLATIONS}"
-SRC_URI="http://packages.linuxmint.com/pool/main/m/mintmenu/${PN}_${PV}.tar.gz ${LANG_URL}"
-HOMEPAGE="http://linuxmint.com"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	|| ( x11-misc/mate-menu-editor[${PYTHON_USEDEP}]
-		x11-misc/mozo[${PYTHON_USEDEP}] )
-	mate-base/mate-panel[introspection]
-	mate-base/mate-menus[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Install in correct libdir
-	sed -e "s:/usr/lib:/usr/$(get_libdir):g" -i \
-	mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml \
-	mintmenu/usr/bin/mintmenu || die
-	# Correct for the correct locale path.
-	sed -e "s:/usr/share/linuxmint/locale:/usr/share/locale:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/system_management.py || die
-
-	# Correct mate-folder.png -> folder.png
-	sed -e "s:mate-folder.png:folder.png:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/recent.py || die
-
-	# Add shebang
-	sed -e "1 i#!/usr/bin/env python" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/keybinding.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/__init__.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/recent.py || die
-
-	# Correct location nautilus -> caja
-	sed -e "s:/nautilus-:/caja-:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py || die
-
-	python_fix_shebang .
-}
-
-my_locale_install() {
-	dodir /usr/share/linuxmint/locale/${1}/LC_MESSAGES
-	insinto /usr/share/linuxmint/locale/${1}/LC_MESSAGES
-	doins mint-translations-*/usr/share/linuxmint/locale/${1}/LC_MESSAGES/mintmenu.mo
-}
-
-src_install() {
-	dobin mintmenu/usr/bin/mintmenu
-	dodir /usr/$(get_libdir)/linuxmint/
-	cp -R mintmenu/usr/lib/linuxmint/* ${D}/usr/$(get_libdir)/linuxmint/ || die
-	dodir /usr/share/
-	cp -R mintmenu/usr/share/* ${D}/usr/share/
-	dodoc mintmenu/debian/changelog
-
-	python_optimize ${ED}/usr/bin/mintmenu
-	python_optimize ${ED}/usr/lib64/linuxmint/mintMenu
-	python_optimize ${ED}/usr/lib64/linuxmint/mintMenu/plugins
-
-	l10n_for_each_locale_do my_locale_install
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-        echo 
-        elog "Please report bugs mintmenu on my email:a.xarlanov29@gmail.com"
-        elog "Thanks open-overlay 2015 by Alex"
-        echo
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
--- a/mate-extra/mintmenu/mintmenu-5.6.5.ebuild
+++ b/mate-extra/mintmenu/mintmenu-5.6.5.ebuild
@ -1,104 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-EAPI=5
-
-PLOCALES=" \
-	af am ar ast be ber bg bn bs ca ckb csb cs cy da de el en_AU en_CA \
-	en_GB eo es et eu fa fi fo fr gl gv he hi hr hu hy id is it ja jv kk \
-	kn ko lt lv mk ml mr ms nb nds nl nn oc pa pl pt_BR pt ro ru si sk sl \
-	sq sr sv ta te th tr uk ur vi zh_CN zh_HK zh_TW"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1 l10n
-
-DESCRIPTION="MintMenu supports filtering, favorites, easy-uninstallation, autosession, and many other features."
-MINT_TRANSLATIONS="mint-translations_2015.02.23.tar.gz"
-LANG_URL="http://packages.linuxmint.com/pool/main/m/mint-translations/${MINT_TRANSLATIONS}"
-SRC_URI="http://packages.linuxmint.com/pool/main/m/mintmenu/${PN}_${PV}.tar.gz ${LANG_URL}"
-HOMEPAGE="http://linuxmint.com"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/python-xlib[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	|| ( x11-misc/mate-menu-editor[${PYTHON_USEDEP}]
-		x11-misc/mozo[${PYTHON_USEDEP}] )
-	mate-base/mate-panel[introspection]
-	mate-base/mate-menus[python,${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	# Install in correct libdir
-	sed -e "s:/usr/lib:/usr/$(get_libdir):g" -i \
-	mintmenu/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml \
-	mintmenu/usr/bin/mintmenu || die
-	# Correct for the correct locale path.
-	sed -e "s:/usr/share/linuxmint/locale:/usr/share/locale:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/mintMenuConfig.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/mintMenu.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/system_management.py || die
-
-	# Correct mate-folder.png -> folder.png
-	sed -e "s:mate-folder.png:folder.png:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/recent.py || die
-
-	# Add shebang
-	sed -e "1 i#!/usr/bin/env python" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/keybinding.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/execute.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/__init__.py \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/recent.py || die
-
-	# Correct location nautilus -> caja
-	sed -e "s:/nautilus-:/caja-:g" -i \
-		mintmenu/usr/lib/linuxmint/mintMenu/plugins/applications.py || die
-
-	python_fix_shebang .
-}
-
-my_locale_install() {
-	dodir /usr/share/linuxmint/locale/${1}/LC_MESSAGES
-	insinto /usr/share/linuxmint/locale/${1}/LC_MESSAGES
-	doins mint-translations-*/usr/share/linuxmint/locale/${1}/LC_MESSAGES/mintmenu.mo
-}
-
-src_install() {
-	dobin mintmenu/usr/bin/mintmenu
-	dodir /usr/$(get_libdir)/linuxmint/
-	cp -R mintmenu/usr/lib/linuxmint/* ${D}/usr/$(get_libdir)/linuxmint/ || die
-	dodir /usr/share/
-	cp -R mintmenu/usr/share/* ${D}/usr/share/
-	dodoc mintmenu/debian/changelog
-
-	python_optimize ${ED}/usr/bin/mintmenu
-	python_optimize ${ED}/usr/lib64/linuxmint/mintMenu
-	python_optimize ${ED}/usr/lib64/linuxmint/mintMenu/plugins
-
-	l10n_for_each_locale_do my_locale_install
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-        echo 
-        elog "Please report bugs mintmenu on my email:a.xarlanov29@gmail.com"
-        elog "Thanks open-overlay 2015 by Alex"
-        echo
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@ -1 +0,0 @@
-DIST eom-1.14.1.tar.xz 2232412 SHA256 8c79ff62c73603175f51c34255edbc4c4e28d03a77a0fd17a308c1ae985a7c3f SHA512 9d7e828eb24aa849e404c058b651e3f4f5bc6688990212a7082657c6421dc3b88d1da4590a4bd12a5bb76a2f7391d8ba9af24e7684fce6cb0ccb9848dd685f53 WHIRLPOOL c6d69de23470dda35527888ef8571760e15340eda4226a853378b24f0973501e0ffc67abe914e6059245908ef2df4bc9f0aebe3d39f0aca19a3d9a6271b2bda0
--- a/media-gfx/eom/eom-1.14.1.ebuild
+++ b/media-gfx/eom/eom-1.14.1.ebuild
@ -1,80 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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 gtk3"
-
-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.12:0[gtk3?]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-        >=x11-libs/gdk-pixbuf-2.4:2[jpeg?,tiff?]
-        !gtk3? ( >=x11-libs/gtk+-2.18:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-        x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	>=x11-themes/mate-icon-theme-1.12: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() {
-        local myconf
-        use gtk3 && myconf="${myconf} --with-gtk=3.0"
-        use !gtk3 && myconf="${myconf} --with-gtk=2.0"
-	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 \
-                ${myconf}
-}
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@ -1 +0,0 @@
-DIST libmatemixer-1.14.0.tar.xz 413824 SHA256 8293a0b0c125b4749e415fb2e4f80adcf313b769ce02f49521d6ddd323d7c07d SHA512 e7ac0d583d740df87af75f3b590e81d0716e0169ec9021bfe2d0e2065f78905ed96a37b606233b4cfbf190116e111edfca89d912bdb37d37d724d22bfb8d84fb WHIRLPOOL 24d01b99c649e86b21f76fae740f19cd83d790d24972614ce26d6bd0b22ac177305bd5f92ca26ae6480b35c013698cd4a49b059abe8d330fe763051fa34a99f9
--- a/media-libs/libmatemixer/libmatemixer-1.14.0.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.14.0.ebuild
@ -1,33 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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="Mixer library for MATE Desktop"
-HOMEPAGE="http://mate-desktop.org"
-
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="alsa oss pulseaudio"
-
-DEPEND="pulseaudio? ( >=media-sound/pulseaudio-0.9.23:0[glib] )
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.50.2-r1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-null \
-		$(use_enable pulseaudio) \
-		$(use_enable alsa) \
-		$(use_enable oss)
-}
-
-DOCS="AUTHORS ChangeLog NEWS README"
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@ -1 +1,2 @@
 DIST 0.3.6.tar.gz 1640585 SHA256 146f5bf26bd56d68ff4506c9756526fbf60c8737cb023759250c357935b309b5 SHA512 54e07050ae58c2d59327b13be6613754ada26891c157c6e9d121db2658508245c8f9a6c92921fdc125cdf82611099abf9c89d64ee093a6592fc81fb9c96cb09d WHIRLPOOL 715be064a3e8fd86d299a22d92f812f45fa522652bb5ab21c1492a05dd384b2cc385ce62ab9cb74fe8e9ee7168c29ccc3ef5eae3d2412189ed2c8e1c891bd998
+DIST 0.3.8.tar.gz 2037017 SHA256 ef05f1b4c36e1d82a4e96f59c5f29aaae986ad6711ccc311d0e21c8e6c191c6d SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365 WHIRLPOOL 23a811f5af9921bfdaf8d5546b9497e4a46d923d6eeb38d572b4d243ca55e75f0528df4b31936f23684e9a3cd54f47c1289682d196a04d97927501e19362013b
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
@ -0,0 +1,112 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit flag-o-matic multilib-minimal
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-2
+fi
+
+DESCRIPTION="A Simple Screen Recorder"
+HOMEPAGE="http://www.maartenbaert.be/simplescreenrecorder"
+LICENSE="GPL-3"
+PKGNAME="ssr"
+S=${WORKDIR}/${PKGNAME}-${PV}
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="git://github.com/MaartenBaert/${PKGNAME}.git
+		https://github.com/MaartenBaert/${PKGNAME}.git"
+	EGIT_BOOTSTRAP=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+SLOT="0"
+IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264 +qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND="
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+	virtual/glu[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:*
+	media-libs/mesa[${MULTILIB_USEDEP}]
+	x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXext
+	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	jack? ( media-sound/jack-audio-connection-kit )
+	pulseaudio? ( media-sound/pulseaudio )
+	|| (
+		media-video/ffmpeg:0[vorbis?,vpx?,x264?,mp3?,theora?]
+		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
+	)
+	"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if [[ ${PV} == "9999" ]]; then
+		elog
+		elog "This ebuild merges the latest revision available from upstream's"
+		elog "git repository, and might fail to compile or work properly once"
+		elog "merged."
+		elog
+	fi
+
+	if [[ ${ABI} == amd64 ]]; then
+		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
+		elog "When added 32bit GLInject libraries are also included. This is"
+		elog "required if you want to use OpenGL recording on 32bit applications."
+		elog
+	fi
+
+	if ( has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ) && has_version media-libs/x264[10bit]; then
+		ewarn
+		ewarn "media-libs/x264 is currently built with 10bit useflag."
+		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
+		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
+		ewarn "record videos with x264."
+		ewarn
+	fi
+
+	# QT requires -fPIC. Compile fails otherwise.
+	# Recently removed from the default compile options upstream
+	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
+	append-flags -fPIC
+}
+
+multilib_src_configure() {
+
+	local myconf=(
+		--enable-dependency-tracking
+		$(multilib_native_use_enable debug assert)
+		$(multilib_native_use_with pulseaudio)
+		$(multilib_native_use_with jack)
+		$(multilib_native_use_with qt5)
+		$(use_enable asm x86-asm)
+	)
+
+	# libav doesn't have AVFrame::channels
+	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
+	if has_version media-video/libav; then
+		myconf+=( --disable-ffmpeg-versions )
+	fi
+
+	multilib_is_native_abi || myconf+=( --disable-ssrprogram )
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		${myconf[@]}
+
+}
--- a/net-analyzer/mate-netspeed/Manifest
+++ b/net-analyzer/mate-netspeed/Manifest
@ -1,2 +0,0 @@
-DIST mate-netspeed-1.12.0.tar.xz 563888 SHA256 1dec90c5211d306af8fe3a6c079a5d2ac1aeafad2b2de60ae177c97e3151e05d SHA512 1c6570ff4aac3b2e19c90e5805d8169a31a92289a39c6075b114a0c13e5d89f69b5fec48f549ce0c4d92b323034a18d4a26292c9a88a6995ccbf4d595e908e34 WHIRLPOOL 79315b745bf6e03d8a40ca2e047eb639ef85ae4cefcf5b4709414c72f51a8eac7e07bc316a0666c31fe5694ed45a6d2a0448f0d43d228c63db69aba73a7521d8
-EBUILD mate-netspeed-1.12.0.ebuild 834 SHA256 6f000ad00582e1e4e4e9e1447ebcf82e0cd44a52c32de8956505233bed0f5ca3 SHA512 5701a195273e429ed1d6b8efc7eb9b40ae457cf079b843f46e1d3b9acb432339ccf729b874beecb1fc4ffbe48ccf92655264694241277b8bcc14b2dd249a8565 WHIRLPOOL 08ae0117c4000dde636dce6644c75346fb0c6741cc3e15986d7946b554cce9ee432d82ecf511ea36ed0b3576cbc4a4c61df2c937c92fede4760c8da4ccf670ec
--- a/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
+++ b/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
@ -1,38 +0,0 @@
-# Copyright open-overlay 2015 by Alex
-
-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"
-IUSE="gtk3"
-
-# FIXME: wireless-tools >= 28pre9 is automagic
-RDEPEND="dev-libs/glib:2
-	>=gnome-base/libgtop-2.14.2:2
-	>=mate-base/mate-panel-1.12:0[gtk3?]
-	>=net-wireless/wireless-tools-28_pre9:0
-	!gtk3? ( x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	)
-        gtk3? ( x11-libs/gtk+:3 )
-        x11-libs/pango:0
-	virtual/libintl:0"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.2-r1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-DOCS="AUTHORS ChangeLog README"
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST engrampa-1.14.1.tar.xz 1417444 SHA256 43d882e772c53d13856f02e44454927e3bab4c5d77094057572be6972e0310d8 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763 WHIRLPOOL 6793b07c57d91ce73c102fc59b4e18141532f895814b4879547b10db4dec24029185d944cce5f34e8a880e9da2a2e229dfc44cf3d6d95ae264b2207ddcbedb8c`
				`@ -1 +0,0 @@`
				`DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808`
				`@ -1 +0,0 @@`
				`DIST pluma-1.14.0.tar.xz 3457640 SHA256 9e6f33bb335439f6684ea71e52fb5da3991431c6f6a2081d90049fd541d9f662 SHA512 b18d1209db0b244bd875a402a5331882f55614270cd88c49d217179a4a1b0bf72cbf09b0d46eecf7b4ab6fb18a016bb3cffbc1c7874e16df6518bb97066ab8fb WHIRLPOOL d5bc9f164f3fdffac636edf8fd17ab2f6f2e2ad5fb6a538e0943053012f011b10d39079775e0e3027507641a92e457196a6e2e4b5eb3b195c319c6c22f50c740`
				`@ -1 +0,0 @@`
				`DIST media-player-info-17.tar.gz 107176 SHA256 ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 SHA512 7e9092b8f3f5a661f8e858647eea471851327fc0ef84ecbf45753f2a3fd564229754c866ed9e1eefba193739d38a2c6d04257c93b9525431d49034fbed6e38c5 WHIRLPOOL 00fa9c2b4cb6b990c60a77b2a3ef513cf8a3698104821dd9ad35f7872817cb171f793cae2ecb9f0bc680c32a6e609d4115de046a9b265a9ba1f87dce007a1067`
				`@ -1 +0,0 @@`
				`DIST atril-1.14.1.tar.xz 1672396 SHA256 0d4f411f92e0a8156151d76f36fbc580f47cd070586f5aa8676a02077175b1ec SHA512 6ca588cfb6be587b85d2f27d2c19aa99c929531a015804e5bd390e9785d859e7f4cd748d42d5833be1af1393fb94c9edc279dc686d3baf4b3a4ee17d7559c173 WHIRLPOOL 8d084b8b825c4f27642f013ca461e8a278718bcded66727f805b4c34530fe28dace574c886eac3c85651a05d6f0a07847a8b02fa04a28006c84e80b83c69aeb2`
				`@ -1 +0,0 @@`
				`DIST libmateweather-1.14.0.tar.xz 3493728 SHA256 924d37fb6c700487448acbf445b97271fc18152c06f72e0189e9c0732008800e SHA512 061e91ad26ae2b31d91d75be6aaf0fa56628b4543c63f29374e13a9880614d5593de7ec8aeba39ecb11dc7773273a923c48c0ed7d993468347116d6658234fed WHIRLPOOL 0e9b00624efb9f375efe2b0acc822a62891f3a8358d638be3c062f5eb671859be779688707317f31d2cdc598baddac61d1dc982bdea3859f3f596664e18b0394`
				`@ -1 +0,0 @@`
				`DIST kde-gtk-config-2.2.1.tar.xz 86472 SHA256 9c890d7e39ab6ebfad13c5453051f0759cb61beac9f7fc2df7e331c9a4415c85 SHA512 24623b5f668cb7d5dd46b96bcd0ee1ba4f2c9068995716f6658c2bdf8a41a81d76848cf63c1749d3ff365ece0399d4a54e98be4d03f992d49a04616e26f1baeb WHIRLPOOL 49f0186c6a265eef8aa8972a77502b34bc130fd2df04faab4145c6b181ab80fdefc2b9ca7d2d7979c89a5b57e36b8d0787c986e584bd6f332915316d73c07802`
				`@ -1 +0,0 @@`
				`DIST lxqt-session-0.10.0.tar.xz 65012 SHA256 2aedbeef904c11679199bfcdbf141880082c4bbcbcdad2b89b47d5b833fe26d4 SHA512 13f7e93c4773e61c785599b552473dfb4d3d7833111717a4875e4c0c8892ee10a1a99b099e76332aab8d266f1c27fc253812a2e9ccb8106731942ed3f7705077 WHIRLPOOL d77e63f11e270252802a1f65e68c4454cab74f6c538406991ccf65adb871727196b6c01c080a3028dc2c0ac028d25e98520ff962ace618639416a7a8b95c3ce7`
				`@ -1 +0,0 @@`
				`DIST claws-mail-3.13.2.tar.xz 5582600 SHA256 6a731052814b3284abeca1662d47817a86e018bc7123ab428f015f0cfab40ad1 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3 WHIRLPOOL ec64d157fffd7be2849c92209cf3a5cc29935fa60a9061577c1b0bbcdac28b51f800c731ebf5f9598bc34f56ee9815adddfb5691f5faa81c92252bd182ab5120`
				`@ -1 +0,0 @@`
				`DIST caja-1.14.1.tar.xz 3611160 SHA256 2e7445a8ba77ff9fa7748645bdbe3b54d158db807fa40db25425d47101dd0dc2 SHA512 a179785c9ec5f322388082f7959df00a7b9014fbdcc3739c9f0b08466e8d404940278c4ac0caf06114176a8f75b2e49e2d11b0db63b5f82409ba52027b60afc7 WHIRLPOOL 3fdccd0632ce15494bc021c2a002262d3fbc8d9d6153bba8944bb02e4aef5ff540309f9c5715f9efc00c246c92f65dc652eb4c8000f0dfa8298f3d31e6451cc3`