Sync with portage [Fri Aug 12 09:05:36 MSK 2016].

8 years ago · 93222f9a3b
parent 4aa375ef62
commit 93222f9a3b
621 changed files with 11580 additions and 7409 deletions
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@ -1 +1 @@
-DIST collectd-5.5.1.tar.bz2 1797852 SHA256 f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f SHA512 1935809571b8f0e0870399385312a5687f441d11e08a0c7d1337384b3790c3436ba84f89226aad979584045cc13bdf88f1350a0f49c94bcd0dbcf12ae4704dae WHIRLPOOL 3efeeb9262344a8a1c0aa068e64f5d45ff536d1fc1399b4599143a6e47740d5a33aedf482dbf9110cc5f0345d624fbe71ff00fc6f7afeee891326617f7979e41
+DIST collectd-5.5.2.tar.bz2 1800476 SHA256 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f SHA512 9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3 WHIRLPOOL 98ed4fb29eec0ae660d3e1651380a3f17f7bf7f22e687633c4a44974bc84e49cf8de11fd6fea349bfe24809ac3c29a407459a1203b72bcf741e1587c6c0b1773
--- a/app-admin/collectd/collectd-5.5.1-r4.ebuild
+++ b/app-admin/collectd/collectd-5.5.1-r4.ebuild
@ -6,7 +6,7 @@ EAPI="6"

 PYTHON_COMPAT=( python{2_7,3_4,3_5} )

-inherit autotools fcaps java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user
+inherit autotools fcaps flag-o-matic java-pkg-opt-2 linux-info multilib perl-functions python-single-r1 systemd user

 DESCRIPTION="Collects system statistics and provides mechanisms to store the values"

@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev"
+IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"

 # The plugin lists have to follow here since they extend IUSE

@ -66,6 +66,7 @@ COMMON_DEPEND="
 	dev-libs/libltdl:0=
 	perl?					( dev-lang/perl:=[ithreads] )
 	udev?					( virtual/udev )
+	xfs?					( sys-fs/xfsprogs )
 	collectd_plugins_amqp?			( net-libs/rabbitmq-c )
 	collectd_plugins_apache?		( net-misc/curl:0= )
 	collectd_plugins_ascent?		( net-misc/curl:0= dev-libs/libxml2:2= )
@ -123,8 +124,6 @@ COMMON_DEPEND="

 # Enforcing <=sys-kernel/linux-headers-4.4 due to #577846
 DEPEND="${COMMON_DEPEND}
-	collectd_plugins_cgroups?		( sys-fs/xfsprogs )
-	collectd_plugins_df?			( sys-fs/xfsprogs )
 	collectd_plugins_genericjmx?		( >=virtual/jdk-1.6 )
 	collectd_plugins_iptables?		( <=sys-kernel/linux-headers-4.4 )
 	collectd_plugins_java?			( >=virtual/jdk-1.6 )
@ -144,7 +143,8 @@ REQUIRED_USE="

 PATCHES=(
 	"${FILESDIR}"/${PN}-4.10.3-werror.patch
-	"${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal,issue-1637}.patch
+	"${FILESDIR}"/${PN}-5.5.1-{libocci,lt,nohal}.patch
+	"${FILESDIR}"/${PN}-5.5.2-issue-{1870,1877}.patch
 )

 # @FUNCTION: collectd_plugin_kernel_linux
@ -400,6 +400,12 @@ src_configure() {
 	KERNEL_DIR="${KERNEL_DIR}" econf --config-cache --disable-ltdl-install \
 		--without-included-ltdl $(use_enable static-libs static) \
 		--localstatedir=/var ${myconf}
+
+	if ! use xfs; then
+		# Workaround for https://github.com/collectd/collectd/issues/1878
+		einfo "Disabling XFS support ..."
+		sed -i -e "s/HAVE_XFS_XQM_H 1/HAVE_XFS_XQM_H 0/" src/config.h || die
+	fi
 }

 src_install() {
--- a/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch
+++ b/app-admin/collectd/files/collectd-5.5.1-issue-1637.patch
@ -1,68 +0,0 @@
-From 7630585ca596af6334f89db26272d80f4ef02a8a Mon Sep 17 00:00:00 2001
-From: Ruben Kerkhof <ruben@rubenkerkhof.com>
-Date: Sat, 26 Mar 2016 18:18:44 +0100
-Subject: [PATCH 4/4] Fix building with xfsprogs 4.5.0
-
-commit 865a6c83250e3d4381596a0d937df31d563f97c6 upstream.
-
-xfsprogs 4.5.0 started to use off64_t in its headers,
-which is hidden behind _GNU_SOURCE
-
-Fixes #1637
---
- configure.ac      |  7 ++++++-
- src/utils_mount.c | 13 ++++++++-----
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 129b9d4..a2058d0 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -593,7 +593,12 @@ AC_CHECK_HEADERS(linux/un.h, [], [],
- #endif
- ])
- 
-AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
-+AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h sys/vmmeter.h kvm.h wordexp.h locale.h)
-+
-+AC_CHECK_HEADERS([xfs/xqm.h], [], [],
-+[
-+#define _GNU_SOURCE
-+])
- 
- # For the dns plugin
- AC_CHECK_HEADERS(arpa/nameser.h)
-diff --git a/src/utils_mount.c b/src/utils_mount.c
-index f2b7943..cf5e97a 100644
--- a/src/utils_mount.c
-+++ b/src/utils_mount.c
-@@ -21,18 +21,21 @@
-  *   Niki W. Waibel <niki.waibel@gmx.net>
- **/
- 
-#include "collectd.h"
-#include "utils_mount.h"
-
-#include "common.h" /* sstrncpy() et alii */
-#include "plugin.h" /* ERROR() macro */
-+#if HAVE_CONFIG_H
-+# include "config.h"
-+#endif
- 
- #if HAVE_XFS_XQM_H
-+# define _GNU_SOURCE
- # include <xfs/xqm.h>
- #define XFS_SUPER_MAGIC_STR "XFSB"
- #define XFS_SUPER_MAGIC2_STR "BSFX"
- #endif
- 
-+#include "common.h"
-+#include "plugin.h"
-+#include "utils_mount.h"
-+
- #if HAVE_GETVFSSTAT
- #  if HAVE_SYS_TYPES_H
- #    include <sys/types.h>
-- 
-2.7.4
-
--- a/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch
+++ b/app-admin/collectd/files/collectd-5.5.2-issue-1870.patch
@ -0,0 +1,127 @@
+From 262915c450f3a45579069212560ca9715aa5bd4b Mon Sep 17 00:00:00 2001
+From: Florian Forster <octo@collectd.org>
+Date: Tue, 26 Jul 2016 08:54:42 +0200
+Subject: [PATCH] network plugin: Fix error message for GCRYCTL_INIT_SECMEM
+ failure.
+
+---
+ src/network.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network.c b/src/network.c
+index b347f4a..45f2436 100644
+--- a/src/network.c
+++ b/src/network.c
+@@ -527,7 +527,7 @@ static void network_init_gcrypt (void) /* {{{ */
+   err = gcry_control (GCRYCTL_INIT_SECMEM, 32768);
+   if (err)
+   {
+-    ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
+    ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
+     abort ();
+   }
+ 
+--
+2.9.2
+
+
+From a3000cbe3a12163148a28c818269bbdabda1cf5c Mon Sep 17 00:00:00 2001
+From: Sebastian Harl <sh@tokkee.org>
+Date: Wed, 27 Jul 2016 09:45:48 +0200
+Subject: [PATCH] network plugin: Don't abort() if gcrypt initialization
+ failed.
+
+Instead, report an error and let plugin initialization fail.
+---
+ src/network.c | 31 +++++++++++++++++++++++--------
+ 1 file changed, 23 insertions(+), 8 deletions(-)
+
+diff --git a/src/network.c b/src/network.c
+index 45f2436..71eb1f2 100644
+--- a/src/network.c
+++ b/src/network.c
+@@ -496,7 +496,7 @@ static int network_dispatch_notification (notification_t *n) /* {{{ */
+ } /* }}} int network_dispatch_notification */
+ 
+ #if HAVE_LIBGCRYPT
+-static void network_init_gcrypt (void) /* {{{ */
+static int network_init_gcrypt (void) /* {{{ */
+ {
+   gcry_error_t err;
+ 
+@@ -504,7 +504,7 @@ static void network_init_gcrypt (void) /* {{{ */
+    * Because you can't know in a library whether another library has
+    * already initialized the library */
+   if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P))
+-    return;
+    return (0);
+ 
+  /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html
+   * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS
+@@ -518,7 +518,7 @@ static void network_init_gcrypt (void) /* {{{ */
+   if (err)
+   {
+     ERROR ("network plugin: gcry_control (GCRYCTL_SET_THREAD_CBS) failed: %s", gcry_strerror (err));
+-    abort ();
+    return (-1);
+   }
+ # endif
+ 
+@@ -528,11 +528,12 @@ static void network_init_gcrypt (void) /* {{{ */
+   if (err)
+   {
+     ERROR ("network plugin: gcry_control (GCRYCTL_INIT_SECMEM) failed: %s", gcry_strerror (err));
+-    abort ();
+    return (-1);
+   }
+ 
+   gcry_control (GCRYCTL_INITIALIZATION_FINISHED);
+-} /* }}} void network_init_gcrypt */
+  return (0);
+} /* }}} int network_init_gcrypt */
+ 
+ static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */
+     const void *iv, size_t iv_size, const char *username)
+@@ -2066,7 +2067,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
+ 	{
+ 		if (se->data.client.security_level > SECURITY_LEVEL_NONE)
+ 		{
+-			network_init_gcrypt ();
+			if (network_init_gcrypt () < 0)
+			{
+				ERROR ("network plugin: Cannot configure client socket with "
+						"security: Failed to initialize crypto library.");
+				return (-1);
+			}
+ 
+ 			if ((se->data.client.username == NULL)
+ 					|| (se->data.client.password == NULL))
+@@ -2086,7 +2092,12 @@ static int sockent_init_crypto (sockent_t *se) /* {{{ */
+ 	{
+ 		if (se->data.server.security_level > SECURITY_LEVEL_NONE)
+ 		{
+-			network_init_gcrypt ();
+			if (network_init_gcrypt () < 0)
+			{
+				ERROR ("network plugin: Cannot configure server socket with "
+						"security: Failed to initialize crypto library.");
+				return (-1);
+			}
+ 
+ 			if (se->data.server.auth_file == NULL)
+ 			{
+@@ -3519,7 +3530,11 @@ static int network_init (void)
+ 	have_init = 1;
+ 
+ #if HAVE_LIBGCRYPT
+-	network_init_gcrypt ();
+	if (network_init_gcrypt () < 0)
+	{
+		ERROR ("network plugin: Failed to initialize crypto library.");
+		return (-1);
+	}
+ #endif
+ 
+ 	if (network_config_stats != 0)
+--
+2.9.2
--- a/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch
+++ b/app-admin/collectd/files/collectd-5.5.2-issue-1877.patch
@ -0,0 +1,37 @@
+[PATCH 5/5] Fix compilation against >=xfsprogs-4.7.0
+
+Gentoo-Bug: https://bugs.gentoo.org/590998
+Bug: https://github.com/collectd/collectd/issues/1877
+---
+ src/utils_mount.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/utils_mount.c b/src/utils_mount.c
+index da53b98..37b52d6 100644
+--- a/src/utils_mount.c
+++ b/src/utils_mount.c
+@@ -24,16 +24,17 @@
+ # include "config.h"
+ #endif
+ 
+#define _GNU_SOURCE
+
+#include "collectd.h"
+#include "utils_mount.h"
+
+ #if HAVE_XFS_XQM_H
+-# define _GNU_SOURCE
+ # include <xfs/xqm.h>
+ #define XFS_SUPER_MAGIC_STR "XFSB"
+ #define XFS_SUPER_MAGIC2_STR "BSFX"
+ #endif
+ 
+-#include "collectd.h"
+-#include "utils_mount.h"
+-
+ #include "common.h" /* sstrncpy() et alii */
+ #include "plugin.h" /* ERROR() macro */
+ 
+-- 
+2.9.2
+
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@ -151,5 +151,6 @@
 		<flag name="filecaps">When set collectd daemon will have set required capabilities to run most plugins even if run as unprivileged user</flag>
 		<flag name="java">Must be set (workaround for java-pkg-opt-2 eclass limitation) when you want java or genericjmx plugin</flag>
 		<flag name="udev">Enable optional udev usage in disk plugin; Required for smart plugin</flag>
+		<flag name="xfs">Enable optional capability to filter on XFS file system in df plugin; Requires XFS headers from <pkg>sys-fs/xfsprogs</pkg></flag>
 	</use>
 </pkgmetadata>
--- a/app-admin/mcollective/Manifest
+++ b/app-admin/mcollective/Manifest
@ -1,2 +1,3 @@
 DIST mcollective-2.8.0.tar.gz 718292 SHA256 47084f9285707f2e457850adcf90811f3d39d4f4baa950d822b20b45633db259 SHA512 edc3da334dbd3afd18fcedc675c6498edce1c799d9b472f70ebfe1b972e013cba5217ec492ea4128b15d886edaf283246ba70915180f9a10a67f7c0957fd1c8e WHIRLPOOL 0c6461a43c4533334dee420e7a0debfa8aa2e0079b83407c1313a28689b5ecbd891c94740553947bdce4023786eb0e95e497da73108e283619f358d67dac7c0c
 DIST mcollective-2.8.8.tar.gz 1500476 SHA256 503b26cb0beeb505bf9cd2abbb8724c67bc743ffff4fbaddc321e2a4d663b133 SHA512 fad2a277bdcb06adb56e87f545c4b85a4b8039263e7230c7b386c561a04d6f3bf80923733e1087c8090b43da734d6b7efe02e52a757191c3cb3ecab50cc97bb6 WHIRLPOOL 3e7a52b1ce3b705ed6f705067a4ab900a2faa226d19a36f106e2c2c1e4c4fc3e631630c04012ca456f0230f8fcb47dd5bd97f1d2e849af6edde67fac129301d4
+DIST mcollective-2.9.0.tar.gz 1503682 SHA256 93c97ee026986f8e966125551d7e481bd539a98f9f2f2ea94c98c024963ae331 SHA512 7d7dec7e68840bf9aea2890645f5d86389c6be8f84ad330b6ae342edf03d88cdef9f225aef741245a0f9606a46fe9394b9f740b4bf987c6f21ad018c05d84660 WHIRLPOOL 336673cdd5cfba14154435810fdbe3449646df8a85d057fc6a8bfe6d1f1d5fa5b3c4f9d9f470f0fd88d4170cbc1d6af646cfd959661720992dcffb08491657d1
--- a/app-admin/mcollective/mcollective-2.9.0.ebuild
+++ b/app-admin/mcollective/mcollective-2.9.0.ebuild
@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+USE_RUBY="ruby21 ruby22 ruby23"
+
+inherit ruby-ng
+
+DESCRIPTION="Framework to build server orchestration or parallel job execution
+systems"
+HOMEPAGE="http://marionette-collective.org/"
+SRC_URI="https://github.com/puppetlabs/marionette-collective/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/all/marionette-collective-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +client"
+
+DEPEND=""
+RDEPEND="dev-ruby/stomp"
+
+src_compile() {
+	einfo "nothing to compile"
+}
+
+each_ruby_install() {
+	cd "marionette-collective-${PV}"
+	doruby -r lib/*
+	insinto /usr/share/mcollective
+	use client && dosbin bin/mco
+	dosbin bin/mcollectived
+	if use doc ; then
+		dohtml -r doc/*
+		insinto /usr/share/doc/${P}/ext
+		doins -r ext/*
+	fi
+	newinitd "${FILESDIR}"/mcollectived.initd mcollectived
+	insinto /etc/mcollective
+	cd etc
+	for cfg in *.dist ; do
+		newins "${cfg}" "${cfg%%.dist}"
+		sed -i -e "s:^libdir.*:libdir = /usr/share/mcollective/plugins:" \
+			"${D}"/etc/mcollective/${cfg%%.dist} || die "sed failed"
+	done
+	insinto /etc/mcollective/plugin.d
+}
+
+pkg_postinst() {
+	einfo "Mcollective requires a stomp server installed and functioning before"
+	einfo "you can use it. The recommended server to use is ActiveMQ [1] but"
+	einfo "any other stomp compatible server should work."
+	einfo
+	einfo "It is recommended you read the \'getting started\' guide [2] if this"
+	einfo "is a new installation"
+	einfo
+	einfo "[1] http://activemq.apache.org/"
+	einfo "[2] https://code.google.com/p/mcollective/wiki/GettingStarted"
+}
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@ -1 +1,2 @@
 DIST engrampa-1.10.2.tar.xz 1378888 SHA256 964bf6fd8463b378e3bdd7713e86eca9dd65f1a6d99e10bb59cb2185084f986b SHA512 86772801d80584c4020fce63cde11478a914372598f3c41774f4248817a05e37eb72842cd2f88be81c22969452f33806738d94a872ffe4ca8743fe8a9c115e1d WHIRLPOOL db2824550840296b636ea48ac987e004184d9cc41c669f0f2c30b67da8ebd6e991d5e27a55a5691c004cce4df26fb101318420d67f20015af55b6f5521525891
+DIST engrampa-1.12.0.tar.xz 1380144 SHA256 4f1f8b0829000f6bb2d8a53a8da098dc5b177638c6d8e5b3fb52402a4541759c SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec WHIRLPOOL b1132440b2d02fd2bfa9c903794113cf7d36eb7e67b4dc3222635dc7c33c459a87885ce1ec7bcdc623db8c75a6d33015ade6faaf3cfa8fd85fc85631d87366da
--- a/app-arch/engrampa/engrampa-1.12.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.12.0.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja gtk3 magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=] )
+	!gtk3? ( >=x11-libs/gtk+-2.24.0:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.50.1:*
+	dev-util/itstool:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_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/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@ -9,8 +9,11 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="magic">Enable filetype auto-detection via
 			<pkg>sys-apps/file</pkg></flag>
+		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
+			based on archive type</flag>
 	</use>
    <upstream>
        <remote-id type="github">mate-desktop/engrampa</remote-id>
--- a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
+++ b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
@ -0,0 +1,48 @@
+From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
+Date: Thu, 11 Aug 2016 14:44:37 +0200
+Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
+
+ * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
+
+--
+Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
+compiled with at least this standard.
+
+This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
+building against Qt 5.7 or higher.
+---
+ m4/qt.m4 | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/m4/qt.m4 b/m4/qt.m4
+index 093f428..90c4a6e 100644
+--- a/m4/qt.m4
+++ b/m4/qt.m4
+@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
+                 enable_pinentry_qt5="try")
+ 
+   have_qt5_libs="no";
+  require_qt_cpp11="no";
+ 
+   if test "$enable_pinentry_qt5" != "no"; then
+     PKG_CHECK_MODULES(PINENTRY_QT,
+@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
+     fi
+   fi
+   if test "$have_qt5_libs" = "yes"; then
+    PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
+                      Qt5Core >= 5.7.0,
+                      [require_qt_cpp11="yes"],
+                      [require_qt_cpp11="no"])
+
+    if test "${require_qt_cpp11}" = "yes"; then
+      PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
+    fi
+
+     AC_CHECK_TOOL(MOC, moc)
+     AC_MSG_CHECKING([moc version])
+     mocversion=`$MOC -v 2>&1`
+-- 
+2.7.3
+
--- a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
@ -0,0 +1,123 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="http://gnupg.org/aegypten2/index.html"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static"
+
+CDEPEND="
+	>=dev-libs/libgpg-error-1.17
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	ncurses? ( sys-libs/ncurses:0= )
+	gtk? ( x11-libs/gtk+:2 )
+	qt4? (
+		>=dev-qt/qtgui-4.4.1:4
+	     )
+	qt5? (
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	     )
+	caps? ( sys-libs/libcap )
+	static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] )
+	app-eselect/eselect-pinentry
+	gnome-keyring? ( app-crypt/libsecret )
+"
+
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+RDEPEND="
+	${CDEPEND}
+	gnome-keyring? ( app-crypt/gcr )
+"
+
+REQUIRED_USE="
+	|| ( ncurses gtk qt4 qt5 )
+	gtk? ( !static )
+	qt4? ( !static )
+	qt5? ( !static )
+	static? ( ncurses )
+	?? ( qt4 qt5 )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"\
+		   "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	use static && append-ldflags -static
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	QT_MOC=""
+	if use qt4; then
+		myconf+=( --enable-pinentry-qt
+			  --disable-pinentry-qt5
+			)
+		QT_MOC="$(qt4_get_bindir)"/moc
+		# Issues finding qt on multilib systems
+		export QTLIB="$(qt4_get_libdir)"
+	elif use qt5; then
+		myconf+=( --enable-pinentry-qt )
+		QT_MOC="$(qt5_get_bindir)"/moc
+		export QTLIB="$(qt5_get_libdir)"
+	else
+		myconf+=( --disable-pinentry-qt )
+	fi
+
+	econf \
+		--enable-pinentry-tty \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gtk pinentry-gtk2) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_with caps libcap) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gnome-keyring pinentry-gnome3) \
+		"${myconf[@]}" \
+		MOC="${QT_MOC}"
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/bin/pinentry || die
+
+	if use qt4 || use qt5; then
+		dosym pinentry-qt /usr/bin/pinentry-qt4
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
+		elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
+		elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
+		elog "The soft resource limit for memory locking specifies the limit an"
+		elog "unprivileged process may lock into memory. You can also use POSIX"
+		elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
+		elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
+		elog "your users."
+	fi
+
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@ -1,3 +1,4 @@
 DIST nano-2.4.3.tar.gz 1878096 SHA256 32d627072b6026678e4f4095c047adec92ac7ec542dd6d91cf27f49b601768f2 SHA512 53c9f93b0f001a3d6c292a6995d66b6bcca033407b6b69995c62b9e9f721fd5566fbd0e22ece1b2561a47e56ef19c3f1ee196e23edfe832289704e0ebef45de9 WHIRLPOOL cd2e4d7175521835c71f0338a2115d2d9fec4da1d4eb2abbb633cfef907fde69fb12acd5e0db343d1f90945f05d60abb85daa5a045d9b97ef8cd19fb9b226607
 DIST nano-2.5.3.tar.gz 1967760 SHA256 b2b060129b9feff2d4870d803a441178c96531de9aed144ec0b83bd63ccb12ee SHA512 1d859f0bd88b9d907cfcaa84edc212bcaea4335c203922eb5b7378c2b45d88dffe1f3e4cb499a824d33781485834ef564997c58cf1fd92610d08f6ce8dcb67d5 WHIRLPOOL a2ca1c41d3cb26756cc9aba5b5fa0aeaea220626b98d0abfa1c5c4d4d57c3a5ef688d5edf00a6a00849ee25a67b2bbab93c4d454f6eb5a204b10fa01de3e298f
 DIST nano-2.6.1.tar.gz 1999439 SHA256 56f2ba1c532647bee36abd5f87a714400af0be084cf857a65bc8f41a0dc28fe5 SHA512 224d643ce08b4c031263c1926d767c671d41e58b182b7ad32f9de2a8ed606c5b39da924cbe62052455584e087a8966285da17cb1fbf235680639351c390aec90 WHIRLPOOL da902989aceac4b15438c58603a56e1cc02b61ff0972f56032130af25d40b0d40344b063feb1aa2f1fd3f5bacbb325505865d0d0daf2e215aafbac0527ee41d6
+DIST nano-2.6.3.tar.gz 2019354 SHA256 4f4054e12f2181c8e436163e931a0a565612242ff9e566c4d1adeda0f91fd503 SHA512 5079c0da976e3cfef9f3980e37c2501837bc66bb98fadd6fe7f02b061b83c99454678833fd43c74e6796cdc4ee9028ccba7a8a05e0f86e7a6517ba4d4c6bc95e WHIRLPOOL 94520ca9c7a11342133adfd3a1e9e9c77a6c07ab18b1b51bf39918b331abc6bd7ebeb937c2ec8ed3e59b8d0468e40f4e5811e66a8aecd469ad42c595c1b61fe4
--- a/app-editors/nano/nano-2.6.3.ebuild
+++ b/app-editors/nano/nano-2.6.3.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
+	inherit git-r3 autotools
+else
+	MY_P=${PN}-${PV/_}
+	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="GNU GPL'd Pico clone with more functionality"
+HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="debug justify +magic minimal ncurses nls slang +spell static unicode"
+
+LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
+	sys-libs/ncurses:0=[static-libs(+)]
+	magic? ( sys-apps/file[static-libs(+)] )
+	nls? ( virtual/libintl )
+	!ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
+	epatch_user
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	local myconf=()
+	case ${CHOST} in
+	*-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
+	esac
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--htmldir=/trash \
+		$(use_enable !minimal color) \
+		$(use_enable !minimal multibuffer) \
+		$(use_enable !minimal nanorc) \
+		--disable-wrapping-as-root \
+		$(use_enable magic libmagic) \
+		$(use_enable spell speller) \
+		$(use_enable justify) \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable unicode utf8) \
+		$(use_enable minimal tiny) \
+		$(usex ncurses --without-slang $(use_with slang)) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	rm -rf "${D}"/trash
+
+	dodoc doc/nanorc.sample
+	dohtml doc/faq.html
+	insinto /etc
+	newins doc/nanorc.sample nanorc
+	if ! use minimal ; then
+		# Enable colorization by default.
+		sed -i \
+			-e '/^# include /s:# *::' \
+			"${ED}"/etc/nanorc || die
+	fi
+
+	dodir /usr/bin
+	dosym /bin/nano /usr/bin/nano
+}
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@ -1 +1,2 @@
 DIST pluma-1.10.2.tar.xz 3442784 SHA256 c0614334dc99e5dde73cbda6cb561cb1a5dc3e3269d74a4134095f9abf73c89a SHA512 bb41e18419fee07c812ebebb9802a77c325d876d05d37e1e9229e4228b0939ef8c80b1377922b94f02a7b7d02fbff62d4e4959815bd94d5b0da3bfa1afebae60 WHIRLPOOL 2edf0078267887af4349537f3c36f7971ab9aad66219e02fe41e47cacc9b91408e668c2294a8c6d6a497b68017b704fe7c7c17fe7ff22030b4c36e330b0def5a
+DIST pluma-1.12.2.tar.xz 3397280 SHA256 eb74988a9fa9892f883b2ccdc9cf217478576815bcb02662d2e3cf2ae39ef870 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275 WHIRLPOOL 30e45dc3e399e77403d23ebe1c8fb98592f3a408de3bd5ee724e621168b26116de0c520348dd74929e360a251b8d727ef9967746b14732fc6e03d63ffb3091c4
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/metadata.xml
@ -5,6 +5,9 @@
        <email>mate@gentoo.org</email>
        <name>Gentoo MATE Desktop</name>
    </maintainer>
+	<use>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+	</use>
    <upstream>
        <remote-id type="github">mate-desktop/pluma</remote-id>
    </upstream>
--- a/app-editors/pluma/pluma-1.12.2-r1.ebuild
+++ b/app-editors/pluma/pluma-1.12.2-r1.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate multilib python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 python spell"
+
+REQUIRED_USE="
+	gtk3? ( !python )
+	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.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libX11:0
+	>=x11-libs/libSM-1.0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/gtksourceview-2.9.7:2.0
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=x11-libs/gtksourceview-2.9.7:3.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/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.17:*
+	virtual/pkgconfig:*"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable python) \
+		$(use_enable spell)
+}
+
+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-editors/qxmledit/Manifest
+++ b/app-editors/qxmledit/Manifest
@ -1,2 +1 @@
-DIST qxmledit-0.9.3-src.tgz 17564710 SHA256 f4f1e305712ca033d8fe9cef8ddce6a94fd4deffd9e723c1734786e18a49fc50 SHA512 b7377c73d2e2aff1670e94c8c86c146e85d70841c638878f6be17ff939167c7d17f28095d4929388212380957cd4e3537450549827d8a8b239f5510f27e01afa WHIRLPOOL 214662e68d42c86745524278ac5809e6beb3d7e36ecffa4e6041447c521b733a97673adb93f00ab8513be870bfdb12a3adb950f8238bab15591993f3677373c2
 DIST qxmledit-0.9.4-src.tgz 18834064 SHA256 ef78d66c6214a1af2d95ea98c441cad5be91e3064faca4bf9edef952ed6d0133 SHA512 ff479ca8930bd2cbeaa26d09eeafcdff4520f0e62c79c8f8c854ed119967a3c11555a5aa8f92edda2be53adb6d6511c6ebb8e2aeb274a922964eed4fd9e0b056 WHIRLPOOL 9917e8b205dad00d2150afa4c3b660454fa529cf347b937a55b905295c37977221854b8b4ea76701f57d4ceb9289be245bcdde4c294168062eee2a0fafa62164
--- a/app-editors/qxmledit/qxmledit-0.9.3.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.3.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Simple Qt-based XML editor"
-HOMEPAGE="http://qxmledit.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5"
-
-DEPEND="
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsql:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-		dev-qt/qtxmlpatterns:5
-	)
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsql:4
-		dev-qt/qtsvg:4
-		dev-qt/qtxmlpatterns:4
-	)
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS NEWS README)
-
-src_prepare() {
-	default
-
-	# bug 568746
-	sed -i -e '/QMAKE_CXXFLAGS/s:-Werror::' \
-		src/{QXmlEdit,QXmlEditWidget,sessions/QXmlEditSessions}.pro || die
-}
-
-src_configure() {
-	export \
-		QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \
-		QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \
-		QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \
-		QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-
-	if use qt5; then
-		eqmake5
-	else
-		eqmake4
-	fi
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-
-	doicon install_scripts/environment/icon/qxmledit.png
-	domenu install_scripts/environment/desktop/QXmlEdit.desktop
-	einstalldocs
-}
--- a/app-editors/qxmledit/qxmledit-0.9.4.ebuild
+++ b/app-editors/qxmledit/qxmledit-0.9.4.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz"

 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="qt5"

 DEPEND="
--- a/app-editors/tea/Manifest
+++ b/app-editors/tea/Manifest
@ -1 +1,2 @@
 DIST tea-41.1.1.tar.bz2 382592 SHA256 5f17a1f190c7a31f326273f5c987378f9fdbc3fc34a7d0a97529bc926492bef9 SHA512 087325a80f86b27c20174849a8477d1d994176f560fc0bc353cfa6bfcfc1e916bac42607d94640cd1c2e1abd6385db7a836557a6ef2defae6de0901195fc7975 WHIRLPOOL d1e48c2ba40d2978a06c2069927ba664b17f84039e96b349937ae5f159e32998a964fd86e8c89725bb36845aba541ba4eccfb91f939fb352b727e1cf2aa72548
+DIST tea-42.0.0.tar.bz2 383237 SHA256 4981a361985677fceaa32d2911a95522ea715a362d05d9f61501063495321203 SHA512 d5b746198ff1c02cb832db333b1ff0d141427b4dccbf2d3d3d0ee8722089a4c1ca0a70af7331b78f1a296f4201d25252a7f9f7040bbcd89b6bde09f2fe9a1b7d WHIRLPOOL 2bb3c7863f362be8488683b260d3a9de76ecf7ec1a0b21417ce65d6cc83c57f629db530d71b5fbedc42043a110e76b47ccf20e20290ed191274d92ca61e934c4
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/metadata.xml
@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <longdescription>
-    A very small Qt text editor. It has lots of extra features including syntax
-    highlighting and a built in file manager as well as a built in image viewer.
-    It can also read lots of 'other' filetypes.
-  </longdescription>
-  <use>
-    <flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
-    <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<longdescription>
+		A very small Qt text editor. It has lots of extra features including syntax
+		highlighting and a built in file manager as well as a built in image viewer.
+		It can also read lots of 'other' filetypes.
+	</longdescription>
+	<use>
+		<flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag>
+		<flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag>
+	</use>
 </pkgmetadata>
--- a/app-editors/tea/tea-42.0.0.ebuild
+++ b/app-editors/tea/tea-42.0.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Small, lightweight Qt text editor"
+HOMEPAGE="http://tea.ourproject.org/"
+SRC_URI="http://tea.ourproject.org/dloads/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="aspell hunspell"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell:= )
+"
+DEPEND="${RDEPEND}
+	hunspell? ( virtual/pkgconfig )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO )
+
+src_configure() {
+	eqmake5 src.pro \
+		$(use aspell || echo CONFIG+=noaspell) \
+		$(use hunspell || echo CONFIG+=nohunspell)
+}
+
+src_install() {
+	dobin bin/tea
+
+	einstalldocs
+	docinto html
+	dodoc manuals/*.html
+
+	insinto /usr/share/qt5/translations
+	doins translations/${PN}_*.qm
+
+	newicon icons/tea-icon-v3-01.png ${PN}.png
+	make_desktop_entry ${PN} 'Tea Editor'
+}
--- a/app-emulation/docker-compose/files/expand-request-versions.patch
+++ b/app-emulation/docker-compose/files/expand-request-versions.patch
@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 9bca475..5ea5e73 100644
--- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,7 @@ def find_version(*file_paths):
- install_requires = [
-     'docopt >= 0.6.1, < 0.7',
-     'PyYAML >= 3.10, < 4',
-    'requests >= 2.6.1, < 2.7',
-+    'requests >= 2.6.1',
-     'texttable >= 0.8.1, < 0.9',
-     'websocket-client >= 0.32.0, < 1.0',
-     'docker-py >= 1.3.1, < 1.4',
--- a/app-emulation/docker-compose/files/requests-requirements.patch
+++ b/app-emulation/docker-compose/files/requests-requirements.patch
@ -1,13 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 39ac0f6..91d8b5b 100644
--- a/setup.py
-+++ b/setup.py
-@@ -27,7 +27,7 @@ def find_version(*file_paths):
- install_requires = [
-     'docopt >= 0.6.1, < 0.7',
-     'PyYAML >= 3.10, < 4',
-    'requests >= 2.2.1, < 2.6',
-+    'requests >= 2.2.1',
-     'texttable >= 0.8.1, < 0.9',
-     'websocket-client >= 0.11.0, < 1.0',
-     'docker-py >= 1.0.0, < 1.2',
--- a/app-emulation/dosemu/files/dosemu-1.3.4-shm.diff
+++ b/app-emulation/dosemu/files/dosemu-1.3.4-shm.diff
@ -1,11 +0,0 @@
--- dosemu-1.3.4/etc/dosemu.conf.orig	2007-01-28 22:19:44.000000000 +0100
-+++ dosemu-1.3.4/etc/dosemu.conf	2007-01-28 22:19:58.000000000 +0100
-@@ -166,7 +166,7 @@
- # preferred mapping driver, one of: auto, mapshm, mapashm, mapfile
- # Default: ""="auto"
- 
-# $_mapping= ""
-+$_mapping= "mapshm"
- 
- ##############################################################################
- ## Debug settings
--- a/app-emulation/dosemu/files/dosemu-1.4.0.1-gcc433.diff
+++ b/app-emulation/dosemu/files/dosemu-1.4.0.1-gcc433.diff
@ -1,11 +0,0 @@
--- trunk/src/tools/periph/dexeconfig.c	2008/03/28 14:01:17	1854
-+++ trunk/src/tools/periph/dexeconfig.c	2008/03/30 22:58:55	1855
-@@ -238,7 +238,7 @@
-     exit(1);
-   }
-   close(fd);
-  fc = open(cfile, O_WRONLY | O_CREAT | O_TRUNC);
-+  fc = creat(cfile, S_IWUSR | S_IRUSR);
-   if (fc < 0) {
-     perror("cannot open config file");
-     exit(1);
--- a/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
+++ b/app-emulation/ganeti/files/ganeti-2.12-cfgupgrade-state.patch
@ -1,15 +0,0 @@
-diff --git a/tools/cfgupgrade b/tools/cfgupgrade
-index c8dfdec..0f886b2 100755
--- a/tools/cfgupgrade
-+++ b/tools/cfgupgrade
-@@ -169,6 +169,10 @@ def UpgradeCluster(config_data):
-     cluster.get("zeroing_image", "")
-   cluster["compression_tools"] = \
-     cluster.get("compression_tools", constants.IEC_DEFAULT_TOOLS)
-+  cluster["hv_state_static"] = \
-+    cluster.get("hv_state_static", {})
-+  cluster["disk_state_static"] = \
-+    cluster.get("disk_state_static", {})
-   if "enabled_user_shutdown" not in cluster:
-     cluster["enabled_user_shutdown"] = False
- 
--- a/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
+++ b/app-emulation/ganeti/files/ganeti-2.12-daemon-util.patch
@ -1,37 +0,0 @@
-diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 6a47253..5d7c4cf 100644
--- a/daemons/daemon-util.in
-+++ b/daemons/daemon-util.in
-@@ -31,18 +31,24 @@ set -e
- 
- @SHELL_ENV_INIT@
- 
-readonly defaults_file="$SYSCONFDIR/default/ganeti"
-+readonly defaults_file="$SYSCONFDIR/conf.d/ganeti"
- 
- # This is a list of all daemons and the order in which they're started. The
- # order is important as there are dependencies between them. On shutdown,
- # they're stopped in reverse order.
-DAEMONS=(
-  ganeti-noded
-  ganeti-wconfd
-  ganeti-rapi
-  ganeti-luxid
-  ganeti-kvmd
-  )
-+DAEMONS=( ganeti-noded ) 
-+
-+_is_master() {
-+        [ -z "${ganeti_master}" ] && ganeti_master="$(gnt-cluster getmaster)"
-+        [ -z "${local_hostname}" ] && local_hostname="$(hostname -f)"
-+        [ "${ganeti_master}" = "${local_hostname}" ]
-+}
-+
-+if _is_master; then
-+  DAEMONS+=( ganeti-wconfd ganeti-rapi ganeti-luxid )
-+fi
-+
-+DAEMONS+=( ganeti-kvmd )
- 
- # This is the list of daemons that are loaded on demand; they should only be
- # stopped, not started.
--- a/app-emulation/libguestfs/files/env.file
+++ b/app-emulation/libguestfs/files/env.file
@ -1 +0,0 @@
-LIBGUESTFS_PATH=/usr/share/guestfs/appliance/ 
--- a/app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch
+++ b/app-emulation/open-vm-tools-kmod/files/1098359-vmblock-3.10.0.patch
@ -1,24 +0,0 @@
--- a/modules/linux/vmblock/linux/control.c
-+++ b/modules/linux/vmblock/linux/control.c
-@@ -208,9 +208,10 @@
-    VMBlockSetProcEntryOwner(controlProcMountpoint);
- 
-    /* Create /proc/fs/vmblock/dev */
-   controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME,
-                                        VMBLOCK_CONTROL_MODE,
-                                        controlProcDirEntry);
-+   controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME,
-+                                  VMBLOCK_CONTROL_MODE,
-+                                  controlProcDirEntry,
-+                                  &ControlFileOps);
-    if (!controlProcEntry) {
-       Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n");
-       remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry);
-@@ -218,7 +219,6 @@
-       return -EINVAL;
-    }
- 
-   controlProcEntry->proc_fops = &ControlFileOps;
-    return 0;
- }
- 
--- a/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch
+++ b/app-emulation/open-vm-tools-kmod/files/vmhgfs-linux-3.11.patch
@ -1,42 +0,0 @@
-Source: https://github.com/rasa/vmware-tools-patches/
-
--- a/modules/linux/vmhgfs/inode.c
-+++ b/modules/linux/vmhgfs/inode.c
-@@ -31,6 +31,9 @@
- #include <linux/namei.h>
- #endif
- #include <linux/highmem.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+#include <linux/dcache.h>
-+#endif
-
- #include "compat_cred.h"
- #include "compat_fs.h"
-@@ -1890,7 +1893,11 @@
- #endif
-                            &inode->i_dentry,
-                            d_alias) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+         int dcount = d_count(dentry);
-+#else
-          int dcount = dentry->d_count;
-+#endif
-          if (dcount) {
-             LOG(4, ("Found %s %d \n", dentry->d_name.name, dcount));
-             return HgfsAccessInt(dentry, mask & (MAY_READ | MAY_WRITE | MAY_EXEC));
-@@ -1943,10 +1950,12 @@
-       list_for_each(pos, &inode->i_dentry) {
-          int dcount;
-          struct dentry *dentry = list_entry(pos, struct dentry, d_alias);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
-         dcount = atomic_read(&dentry->d_count);
-#else
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
-+         dcount = d_count(dentry);
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
-          dcount = dentry->d_count;
-+#else
-+         dcount = atomic_read(&dentry->d_count);
- #endif
-          if (dcount) {
-             LOG(4, ("Found %s %d \n", (dentry)->d_name.name, dcount));
--- a/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
+++ b/app-emulation/virtualbox-modules/files/virtualbox-modules-3.17.patch
@ -1,49 +0,0 @@
-diff -rupN work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c
--- work/vboxdrv/r0drv/linux/alloc-r0drv-linux.c	2014-01-14 04:27:06.000000000 -0600
-+++ work.new/vboxdrv/r0drv/linux/alloc-r0drv-linux.c	2014-09-03 11:12:28.247795756 -0500
-@@ -191,7 +191,7 @@ static PRTMEMHDR rtR0MemAllocExecVmArea(
-         struct page **papPagesIterator = papPages;
-         pVmArea->nr_pages = cPages;
-         pVmArea->pages    = papPages;
-        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, &papPagesIterator))
-+        if (!map_vm_area(pVmArea, PAGE_KERNEL_EXEC, papPagesIterator))
-         {
-             PRTMEMLNXHDREX pHdrEx = (PRTMEMLNXHDREX)pVmArea->addr;
-             pHdrEx->pVmArea     = pVmArea;
-diff -rupN work/vboxnetadp/linux/VBoxNetAdp-linux.c work.new/vboxnetadp/linux/VBoxNetAdp-linux.c
--- work/vboxnetadp/linux/VBoxNetAdp-linux.c	2013-10-09 06:02:09.000000000 -0500
-+++ work.new/vboxnetadp/linux/VBoxNetAdp-linux.c	2014-09-03 11:13:55.999687819 -0500
-@@ -52,6 +52,25 @@
- 
- #define VBOXNETADP_FROM_IFACE(iface) ((PVBOXNETADP) ifnet_softc(iface))
- 
-+/*******************************
-+source for the 4th parameter alloc_netdev fix for kernel 3.17-rc1 is:
-+https://github.com/proski/madwifi/commit/c5246021b7b8580c2aeb0a145903acc07d246ac1
-+*/
-+#ifndef NET_NAME_UNKNOWN
-+#undef alloc_netdev
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+  alloc_netdev(sizeof_priv, name, setup)
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+  alloc_netdev_mq(sizeof_priv, name, setup, 1)
-+#else
-+#define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \
-+  alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1)
-+#endif
-+#endif
-+/*******************************/
-+
- /*******************************************************************************
- *   Internal Functions                                                         *
- *******************************************************************************/
-@@ -183,6 +202,7 @@ int vboxNetAdpOsCreate(PVBOXNETADP pThis
-     /* No need for private data. */
-     pNetDev = alloc_netdev(sizeof(VBOXNETADPPRIV),
-                            pThis->szName[0] ? pThis->szName : VBOXNETADP_LINUX_NAME,
-+			   NET_NAME_UNKNOWN,
-                            vboxNetAdpNetDevInit);
-     if (pNetDev)
-     {
--- a/app-emulation/vmware-player/files/list-bundle-components.xsl
+++ b/app-emulation/vmware-player/files/list-bundle-components.xsl
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output omit-xml-declaration="yes"/>
-
-	<xsl:template match="text()"/>
-
-	<xsl:template match="/bundle/components/component">
-		<xsl:value-of select="@offset"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@size"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@name"/>
-		<xsl:text>&#10;</xsl:text>
-	</xsl:template>
-
-</xsl:stylesheet>
--- a/app-emulation/vmware-player/files/list-component-files.xsl
+++ b/app-emulation/vmware-player/files/list-component-files.xsl
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output omit-xml-declaration="yes"/>
-
-	<xsl:template match="text()"/>
-
-	<xsl:template match="/component/fileset/file">
-		<xsl:value-of select="@offset"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@compressedSize"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@uncompressedSize"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@path"/>
-		<xsl:text>&#10;</xsl:text>
-	</xsl:template>
-
-</xsl:stylesheet>
--- a/app-emulation/vmware-workstation/files/list-bundle-components.xsl
+++ b/app-emulation/vmware-workstation/files/list-bundle-components.xsl
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output omit-xml-declaration="yes"/>
-
-	<xsl:template match="text()"/>
-
-	<xsl:template match="/bundle/components/component">
-		<xsl:value-of select="@offset"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@size"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@name"/>
-		<xsl:text>&#10;</xsl:text>
-	</xsl:template>
-
-</xsl:stylesheet>
--- a/app-emulation/vmware-workstation/files/list-component-files.xsl
+++ b/app-emulation/vmware-workstation/files/list-component-files.xsl
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output omit-xml-declaration="yes"/>
-
-	<xsl:template match="text()"/>
-
-	<xsl:template match="/component/fileset/file">
-		<xsl:value-of select="@offset"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@compressedSize"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@uncompressedSize"/>
-		<xsl:text> </xsl:text>
-		<xsl:value-of select="@path"/>
-		<xsl:text>&#10;</xsl:text>
-	</xsl:template>
-
-</xsl:stylesheet>
--- a/app-emulation/vmware-workstation/files/vmware-11.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-11.0.rc
@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin Starting VMware USB Arbitrator
-	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-	@@BINDIR@@/vmware-usbarbitrator 
-	eend $?
-	ebegin Starting VMware services
-	
-	# quiet for vmci because it may not be there
-	modprobe -vq vmci || modprobe -v vmw_vmci
-	eend $?
-	
-	# vmci or vmw_vmci was loaded by the previous modprobe 
-	# no need to do it here
-	modprobe -av vmmon vsock vmblock vmnet 
-	eend $?
-	@@BINDIR@@/vmware-networks --start
-	eend $?
-}
-
-stop() {
-	ebegin Stopping VMware USB Arbitrator
-	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-	killall --wait @@BINDIR@@/vmware-usbarbitrator 
-	eend $?
-	@@BINDIR@@/vmware-networks --stop 
-	eend $?
-	ebegin Stopping VMware services
-	modprobe -rv vsock vmmon vmblock vmnet
-	eend $?
-	
-	# quiet for vmci because it may not be there
-	modprobe -rvq vmci || modprobe -rv vmw_vmci
-	eend $?
-}
--- a/app-emulation/vmware-workstation/files/vmware-11.2.rc
+++ b/app-emulation/vmware-workstation/files/vmware-11.2.rc
@ -1,44 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin Starting VMware USB Arbitrator
-	#start-stop-daemon --start --exec @@BINDIR@@/vmware-usbarbitrator
-	@@BINDIR@@/vmware-usbarbitrator 
-	eend $?
-	ebegin Starting VMware services
-	
-	# quiet for vmci because it may not be there
-	modprobe -vq vmci || modprobe -v vmw_vmci
-	eend $?
-	
-	# vmci or vmw_vmci was loaded by the previous modprobe 
-	# no need to do it here
-	modprobe -av vmmon vsock vmblock vmnet 
-	eend $?
-	@@BINDIR@@/vmware-networks --start
-	eend $?
-}
-
-stop() {
-	ebegin Stopping VMware USB Arbitrator
-	#start-stop-daemon --stop --exec @@BINDIR@@/vmware-usbarbitrator
-	killall --wait @@BINDIR@@/vmware-usbarbitrator 
-	eend $?
-	@@BINDIR@@/vmware-networks --stop 
-	eend $?
-	ebegin Stopping VMware services
-	modprobe -rv vsock vmmon vmblock vmnet
-	eend $?
-	
-	# quiet for vmci because it may not be there
-	modprobe -rvq vmci || modprobe -rv vmw_vmci
-	eend $?
-}
--- a/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
+++ b/app-emulation/vmware-workstation/files/vmware-server-11.0.rc
@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need localmount vmware
-	use net
-}
-
-checkconfig() {
-	# Check if certificates exist.  If not, we need to generate them, ala sshd.
-	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
-		mkdir -p @@ETCDIR@@/ssl
-		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
-		chmod -R 600 @@ETCDIR@@/ssl
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin Starting VMware Authentication Daemon
-	start-stop-daemon --start \
-	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd \
-	  -- -a -d @@ETCDIR@@/hostd/config.xml
-
-	eend $?
-}
-
-stop() {
-	ebegin "Shutdown VMs in the AutoStart Sequence"
-	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
-
-	if [ "x" != "x${HOHO_ADMIN}" ]; then
-		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
-	fi
-	eend $?
-
-	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd 
-	eend $?
-	ebegin Stopping VMware Authentication Daemon
-	#start-stop-daemon --stop \
-	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	killall @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-}
--- a/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
+++ b/app-emulation/vmware-workstation/files/vmware-server-11.2.rc
@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-depend() {
-	need localmount vmware
-	use net
-}
-
-checkconfig() {
-	# Check if certificates exist.  If not, we need to generate them, ala sshd.
-	if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then
-		mkdir -p @@ETCDIR@@/ssl
-		openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config
-		chmod -R 600 @@ETCDIR@@/ssl
-	fi
-}
-
-start() {
-	checkconfig
-
-	ebegin Starting VMware Authentication Daemon
-	start-stop-daemon --start \
-	  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-	ebegin Starting VMware Workstation Server
-	start-stop-daemon --start \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd \
-	  -- -a -d @@ETCDIR@@/hostd/config.xml
-
-	eend $?
-}
-
-stop() {
-	ebegin "Shutdown VMs in the AutoStart Sequence"
-	local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)"
-
-	if [ "x" != "x${HOHO_ADMIN}" ]; then
-		@@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop
-	fi
-	eend $?
-
-	ebegin Stopping VMware Workstation Server
-	start-stop-daemon --stop \
-	  --pidfile /var/run/vmware/vmware-hostd.PID \
-	  --exec @@BINDIR@@/vmware-hostd 
-	eend $?
-	ebegin Stopping VMware Authentication Daemon
-	#start-stop-daemon --stop \
-	#  --exec @@PREFIX@@/sbin/vmware-authdlauncher
-	killall @@PREFIX@@/sbin/vmware-authdlauncher
-	eend $?
-}
--- a/app-forensics/rkhunter/files/rkhunter-1.4.0.conf.patch
+++ b/app-forensics/rkhunter/files/rkhunter-1.4.0.conf.patch
@ -1,31 +0,0 @@
--- rkhunter.conf.old	2009-01-07 17:33:11.000000000 +0100
-+++ rkhunter.conf	2009-01-07 17:36:58.000000000 +0100
-@@ -19,6 +19,7 @@
- # describing the option will say if this is so.
- #
- 
-+INSTALLDIR=/usr
- 
- #
- # If this option is set to 1, it specifies that the mirrors file
-@@ -84,17 +85,17 @@ MAIL_CMD=mail -s "[rkhunter] Warnings fo
- # important files will be written to this directory, so be
- # sure that the directory permissions are tight.
- #
-#TMPDIR=/var/lib/rkhunter/tmp
-+TMPDIR=/var/lib/rkhunter/tmp
- 
- #
- # Specify the database directory to use.
- #
-#DBDIR=/var/lib/rkhunter/db
-+DBDIR=/var/lib/rkhunter/db
- 
- #
- # Specify the script directory to use.
- #
-#SCRIPTDIR=/usr/local/lib/rkhunter/scripts
-+SCRIPTDIR=/usr/lib/rkhunter/scripts
- 
- #
- # Specify the root directory to use.
--- a/app-i18n/canna/files/canna.confd
+++ b/app-i18n/canna/files/canna.confd
@ -1,8 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Config file for /etc/init.d/canna
-
-# Specify user to run as
-CANNASERVER_OPTS=""
--- a/app-i18n/canna/files/canna.initd
+++ b/app-i18n/canna/files/canna.initd
@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# CANNASERVER_OPTS is defined in /etc/conf.d/canna
-
-depend() {
-	after logger
-}
-
-start() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		/usr/sbin/cannakill >/dev/null 2>&1
-	fi
-	rm -f /tmp/.iroha_unix/IROHA
-
-	if [ "${CANNASERVER_OPTS}" = "${CANNASERVER_OPTS/-syslog/}" ] ; then
-		if [ ! -f /var/log/canna/CANNA0msgs ] ; then
-			touch /var/log/canna/CANNA0msgs
-		fi
-		if [ "${CANNASERVER_OPTS}" != "${CANNASERVER_OPTS/-u/}" ] ; then
-			chown `echo ${CANNASERVER_OPTS} | sed -e 's/.*-u *\(\w*\).*/\1/'` /var/log/canna/CANNA0msgs
-		fi
-		chmod u+w /var/log/canna/CANNA0msgs
-	fi
-
-	ebegin "Starting canna"
-	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
-	eend $? "Failed to start canna"
-}
-
-stop() {
-	ebegin "Stopping canna"
-	/usr/sbin/cannakill
-	eend $? "Failed to stop canna"
-}
--- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-as-needed.patch
+++ b/app-i18n/freewnn/files/freewnn-1.1.1_alpha21-as-needed.patch
@ -1,11 +0,0 @@
--- FreeWnn-1.1.1-a021.orig/Wnn/jlib/Makefile.in	2004-09-12 18:56:55.000000000 +0200
-+++ FreeWnn-1.1.1-a021/Wnn/jlib/Makefile.in	2009-12-29 20:29:18.086539501 +0100
-@@ -101,7 +101,7 @@
- all:: libwnn.la
- 
- libwnn.la: $(OBJS) $(EXTRALIBRARYDEPS)
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) @LIBS@ -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION)
- 
- lintlib:: llib-lwnn.ln
- 
--- a/app-i18n/librime/files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch
+++ b/app-i18n/librime/files/librime-1.1-BOOST_NO_SCOPED_ENUMS.patch
@ -1,224 +0,0 @@
-Index: librime-1.1git20140306/include/rime/lever/customizer.h
-===================================================================
--- librime-1.1git20140306.orig/include/rime/lever/customizer.h
-+++ librime-1.1git20140306/include/rime/lever/customizer.h
-@@ -8,6 +8,9 @@
- #define RIME_CUSTOMIZER_H_
- 
- #include <string>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #define BOOST_NO_CXX11_SCOPED_ENUMS
- #include <boost/filesystem.hpp>;
- 
-Index: librime-1.1git20140306/include/rime/lever/switcher_settings.h
-===================================================================
--- librime-1.1git20140306.orig/include/rime/lever/switcher_settings.h
-+++ librime-1.1git20140306/include/rime/lever/switcher_settings.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include "custom_settings.h"
- 
-Index: librime-1.1git20140306/include/rime/lever/user_dict_manager.h
-===================================================================
--- librime-1.1git20140306.orig/include/rime/lever/user_dict_manager.h
-+++ librime-1.1git20140306/include/rime/lever/user_dict_manager.h
-@@ -9,6 +9,9 @@
- 
- #include <string>
- #include <vector>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- 
- namespace rime {
-Index: librime-1.1git20140306/src/core_module.cc
-===================================================================
--- librime-1.1git20140306.orig/src/core_module.cc
-+++ librime-1.1git20140306/src/core_module.cc
-@@ -5,6 +5,9 @@
- // 2013-10-17 GONG Chen <chen.sst@gmail.com>
- //
- 
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_api.h>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/dict/db.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/db.cc
-+++ librime-1.1git20140306/src/dict/db.cc
-@@ -5,6 +5,9 @@
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime_version.h>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/dict/dict_compiler.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/dict_compiler.cc
-+++ librime-1.1git20140306/src/dict/dict_compiler.cc
-@@ -7,6 +7,9 @@
- #include <fstream>
- #include <map>
- #include <set>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/algo/algebra.h>
- #include <rime/algo/utilities.h>
-Index: librime-1.1git20140306/src/dict/dictionary.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/dictionary.cc
-+++ librime-1.1git20140306/src/dict/dictionary.cc
-@@ -5,6 +5,9 @@
- // 2011-07-05 GONG Chen <chen.sst@gmail.com>
- //
- #include <utility>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/common.h>
- #include <rime/schema.h>
-Index: librime-1.1git20140306/src/dict/mapped_file.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/mapped_file.cc
-+++ librime-1.1git20140306/src/dict/mapped_file.cc
-@@ -7,6 +7,9 @@
- // 2011-06-30 GONG Chen <chen.sst@gmail.com>
- //
- #include <fstream>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/interprocess/file_mapping.hpp>
- #include <boost/interprocess/mapped_region.hpp>
-Index: librime-1.1git20140306/src/dict/preset_vocabulary.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/preset_vocabulary.cc
-+++ librime-1.1git20140306/src/dict/preset_vocabulary.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-27 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/lexical_cast.hpp>
- #include <utf8.h>
-Index: librime-1.1git20140306/src/dict/tree_db.cc
-===================================================================
--- librime-1.1git20140306.orig/src/dict/tree_db.cc
-+++ librime-1.1git20140306/src/dict/tree_db.cc
-@@ -4,6 +4,9 @@
- //
- // 2011-11-02 GONG Chen <chen.sst@gmail.com>
- //
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #if defined(_MSC_VER)
- #pragma warning(disable: 4244)
-Index: librime-1.1git20140306/src/gear/simplifier.cc
-===================================================================
--- librime-1.1git20140306.orig/src/gear/simplifier.cc
-+++ librime-1.1git20140306/src/gear/simplifier.cc
-@@ -7,6 +7,9 @@
- #include <string>
- #include <vector>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <opencc/opencc.h>
- #include <stdint.h>
-Index: librime-1.1git20140306/src/lever/custom_settings.cc
-===================================================================
--- librime-1.1git20140306.orig/src/lever/custom_settings.cc
-+++ librime-1.1git20140306/src/lever/custom_settings.cc
-@@ -5,6 +5,9 @@
- // 2012-02-26 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-Index: librime-1.1git20140306/src/lever/deployment_tasks.cc
-===================================================================
--- librime-1.1git20140306.orig/src/lever/deployment_tasks.cc
-+++ librime-1.1git20140306/src/lever/deployment_tasks.cc
-@@ -5,6 +5,9 @@
- // 2011-12-10 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #define BOOST_NO_CXX11_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/uuid/random_generator.hpp>
-Index: librime-1.1git20140306/src/lever/switcher_settings.cc
-===================================================================
--- librime-1.1git20140306.orig/src/lever/switcher_settings.cc
-+++ librime-1.1git20140306/src/lever/switcher_settings.cc
-@@ -6,6 +6,9 @@
- //
- #include <utility>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <rime/config.h>
- #include <rime/deployer.h>
-Index: librime-1.1git20140306/src/lever/user_dict_manager.cc
-===================================================================
--- librime-1.1git20140306.orig/src/lever/user_dict_manager.cc
-+++ librime-1.1git20140306/src/lever/user_dict_manager.cc
-@@ -6,6 +6,9 @@
- //
- #include <fstream>
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/common.h>
-Index: librime-1.1git20140306/src/lever/userdb_recovery_task.cc
-===================================================================
--- librime-1.1git20140306.orig/src/lever/userdb_recovery_task.cc
-+++ librime-1.1git20140306/src/lever/userdb_recovery_task.cc
-@@ -5,6 +5,9 @@
- // 2013-04-22 GONG Chen <chen.sst@gmail.com>
- //
- #include <boost/algorithm/string.hpp>
-+#ifndef BOOST_NO_SCOPED_ENUMS
-+#define BOOST_NO_SCOPED_ENUMS
-+#endif // BOOST_NO_SCOPED_ENUMS
- #include <boost/filesystem.hpp>
- #include <boost/scope_exit.hpp>
- #include <rime/deployer.h>
--- a/app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch
+++ b/app-i18n/mozc/files/mozc-1.2.809.102-gentoo.patch
@ -1,14 +0,0 @@
-diff -Naur mozc-1.2.809.102.orig/build_mozc.py mozc-1.2.809.102/build_mozc.py
--- mozc-1.2.809.102.orig/build_mozc.py	2011-08-17 10:02:41.000000000 +0900
-+++ mozc-1.2.809.102/build_mozc.py	2011-08-18 01:01:25.109704261 +0900
-@@ -654,9 +654,7 @@
-     if envvar in os.environ:
-       os.environ[envvar] = os.getenv(envvar)
- 
-  build_args = ['-j%s' % options.jobs,
-                'MAKE_JOBS=%s' % options.jobs,
-                'BUILDTYPE=%s' % options.configuration]
-+  build_args = ['BUILDTYPE=%s' % options.configuration]
-   build_args.append('builddir_name=%s' % GetBuildBaseName(options))
- 
-   RunOrDie([make_command] + build_args + target_names)
--- a/app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch
+++ b/app-i18n/mozc/files/mozc-1.3.975.102-ibus-1.4.patch
@ -1,54 +0,0 @@
-http://bugs.gentoo.org/402397
-
--- unix/ibus/mozc_engine.cc
-+++ unix/ibus/mozc_engine.cc
-@@ -620,8 +620,15 @@
- 
- #ifndef OS_CHROMEOS
-   if (prop_mozc_tool_) {
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+    while ((prop = ibus_prop_list_get(
-+        const_cast<IBusPropList*>(
-+            ibus_property_get_sub_props(prop_mozc_tool_)), i++))) {
-+      if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
-+#else
-     while ((prop = ibus_prop_list_get(prop_mozc_tool_->sub_props, i++))) {
-      if (!g_strcmp0(property_name, prop->key)) {
-+             if (!g_strcmp0(property_name, prop->key)) {
-+#endif
-         const MozcEngineToolProperty *entry =
-             reinterpret_cast<const MozcEngineToolProperty*>(
-                 g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
-@@ -640,8 +647,15 @@
-   }
- 
-   i = 0;
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+  while ((prop = ibus_prop_list_get(
-+      const_cast<IBusPropList*>(
-+          ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
-+    if (!g_strcmp0(property_name, ibus_property_get_key(prop))) {
-+#else
-   while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
-    if (!g_strcmp0(property_name, prop->key)) {
-+           if (!g_strcmp0(property_name, prop->key)) {
-+#endif
-       const MozcEngineProperty *entry =
-           reinterpret_cast<const MozcEngineProperty*>(
-               g_object_get_data(G_OBJECT(prop), kGObjectDataKey));
-@@ -1096,8 +1110,15 @@
- 
-   size_t i = 0;
-   IBusProperty *prop = NULL;
-+#if IBUS_CHECK_VERSION(1, 4, 0)
-+  while ((prop = ibus_prop_list_get(
-+      const_cast<IBusPropList*>(
-+          ibus_property_get_sub_props(prop_composition_mode_)), i++))) {
-+    if (!g_strcmp0(entry->key, ibus_property_get_key(prop))) {
-+#else
-   while ((prop = ibus_prop_list_get(prop_composition_mode_->sub_props, i++))) {
-     if (!g_strcmp0(entry->key, prop->key)) {
-+#endif
-       // Update the language panel.
-       ibus_property_set_icon(prop_composition_mode_,
-                              GetIconPath(entry->icon).c_str());
--- a/app-i18n/scim-m17n/files/scim-m17n-0.2.2-gcc43.patch
+++ b/app-i18n/scim-m17n/files/scim-m17n-0.2.2-gcc43.patch
@ -1,10 +0,0 @@
--- src/scim_m17n_imengine.cpp.orig	2008-06-27 13:57:31.000000000 +0200
-+++ src/scim_m17n_imengine.cpp	2008-06-27 13:59:02.000000000 +0200
-@@ -33,6 +33,7 @@
-   #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <scim.h>
- #include "scim_m17n_imengine.h"
- 
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@ -1,2 +1,3 @@
 DIST transifex-client-0.10.tar.gz 71817 SHA256 fb2ecba162a8ea6c52d57022c14c4016a2b6f048c9f626c1bd27c30e8ee29f1a SHA512 c8134f3fc04953d468c2e6ceb0ef90e8335709bde778c5d7d532b3ea390e71abdf8856b8eaa5acf6507c4e6fd2f918e6b0989b3913ee603cc5987b1a9d6b3964 WHIRLPOOL 34248f0b1d685024b485aa5e324f2450d6e71b72deb4c176419fe6ce768ff3ea486cc48432df569d6141371709bf2e2f853316bf6790974ab03f0ffe6277594e
 DIST transifex-client-0.11.1.beta.tar.gz 210515 SHA256 5e91632d39d257295b9c15d9f8b149452d0553d984112865e9b81ad5b91e9f48 SHA512 209bd88af0b6297f3c2d5945f98f955240addd5587679838be456c1e9a0b8b55a482d7ead395839f69500b2b41ad48b19060e2b9e12f1996d0d14780721f0f0e WHIRLPOOL 035c9759c057a6f3d0b69433e0ad84e985a610bd7182701c82df9b4a9e4186ef96e6eb22b72262978943eb4aeeab229eab72482264c9abd5eb6f5e534e1c8957
+DIST transifex-client-0.12.1.tar.gz 176606 SHA256 86809d10e0cfff4b4d81fa852d11064fe89fc7add5b6f09fec3950497efdf02d SHA512 2371039571d461975b28121f38d190c9a8c8809340a939713476410d12c5f2a2f113d2d69e05e520c2ed105f1ef26f77b34adfb597fa2b655f1556cb68b8bcca WHIRLPOOL 83cdcbb1b0f24625361441fa0f2de486a9d210b92ba3c239de812b1b0c5f4ebdf1ec300f074ff710216dd8b2dd98bb5d6df1fcaab350fdb53c74bd961d15c626
--- a/app-i18n/transifex-client/files/transifex-client-0.12.1_urllib3_six.patch
+++ b/app-i18n/transifex-client/files/transifex-client-0.12.1_urllib3_six.patch
@ -0,0 +1,24 @@
+diff -Nuar transifex-client-0.12.1.orig/txclib/commands.py transifex-client-0.12.1/txclib/commands.py
+--- transifex-client-0.12.1.orig/txclib/commands.py	2016-07-16 23:40:14.476353681 +0500
+++ transifex-client-0.12.1/txclib/commands.py	2016-07-16 23:53:28.121315176 +0500
+@@ -25,7 +25,7 @@
+ except ImportError:
+     import ConfigParser as configparser
+ 
+-from urllib3.packages.six.moves import input
+from six.moves import input
+ 
+ from txclib import utils, project
+ from txclib.utils import parse_json, compile_json, files_in_project
+diff -Nuar transifex-client-0.12.1.orig/txclib/utils.py transifex-client-0.12.1/txclib/utils.py
+--- transifex-client-0.12.1.orig/txclib/utils.py	2016-07-16 23:40:14.477353681 +0500
+++ transifex-client-0.12.1/txclib/utils.py	2016-07-16 23:40:37.376352570 +0500
+@@ -15,7 +15,7 @@
+ from email.parser import Parser
+ from urllib3.exceptions import SSLError
+ from urllib3.packages import six
+-from urllib3.packages.six.moves import input
+from six.moves import input
+ from txclib.urls import API_URLS
+ from txclib.exceptions import UnknownCommandError, HttpNotFound, HttpNotAuthorized
+ from txclib.paths import posix_path, native_path, posix_sep
--- a/app-i18n/transifex-client/files/transifex-client-0.8.0-tests.patch
+++ b/app-i18n/transifex-client/files/transifex-client-0.8.0-tests.patch
@ -1,26 +0,0 @@
-From b37da095c8e8b70d8d4300b32e787b6da88e28c0 Mon Sep 17 00:00:00 2001
-From: Apostolos Bessas <mpessas@transifex.com>
-Date: Wed, 11 Jul 2012 11:44:07 +0300
-Subject: [PATCH] Do not install the tests.
-
-Exclude the tests from the installed packages.
---
- setup.py |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index b3fa910..05bb2b4 100755
--- a/setup.py
-+++ b/setup.py
-@@ -49,7 +49,7 @@
-     ],
-     test_suite="tests",
-     zip_safe=False,
-    packages=find_packages(),
-+    packages=['txclib', ],
-     include_package_data=True,
-     package_data = package_data,
-     keywords = ('translation', 'localization', 'internationalization',),
-- 
-1.7.10
-
--- a/app-i18n/transifex-client/transifex-client-0.12.1.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.python.org/pypi/transifex-client http://www.transifex.net/"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
+
+PATCHES="${FILESDIR}/${P}_urllib3_six.patch"
--- a/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.5.make-fix.patch
@ -1,67 +0,0 @@
-diff -Nur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
--- zhcon-0.2.5.orig/doc/Makefile.am	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/doc/Makefile.am	2006-06-21 18:13:59.000000000 +0800
-@@ -3,8 +3,8 @@
- EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
- 
- install-data-local:
-	$(mkinstalldirs) $(mandir)/man1/
-	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-+	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
- 
- uninstall-local:
-	-rm -f $(mandir)/man1/zhcon.1
-+	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
-diff -Nur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
--- zhcon-0.2.5.orig/font/Makefile.am	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/font/Makefile.am	2006-06-21 18:14:30.000000000 +0800
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.bpsf
- 
- install-data-local:
-	$(mkinstalldirs) $(libdir)/zhcon/font/
-	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
-+	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
- 
- uninstall-local:
-	-rm -f $(libdir)/zhcon/font/*.bpsf
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
-diff -Nur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
--- zhcon-0.2.5.orig/input/Makefile.am	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/input/Makefile.am	2006-06-21 18:15:35.000000000 +0800
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.mb
- 
- install-data-local:
-	$(mkinstalldirs) $(libdir)/zhcon/input/
-	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
-+	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
- 
- uninstall-local:
-	-rm -f $(libdir)/zhcon/input/*.mb
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
-diff -Nur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
--- zhcon-0.2.5.orig/src/Makefile.am	2006-06-21 18:02:23.000000000 +0800
-+++ zhcon-0.2.5/src/Makefile.am	2006-06-22 08:35:42.000000000 +0800
-@@ -8,14 +8,14 @@
- SUBDIRS = display
- 
- install-exec-local:
-	chmod 4755 $(bindir)/zhcon
-+	chmod 4755 $(DESTDIR)$(bindir)/zhcon
- 
- install-data-local:
-	$(mkinstalldirs) $(prefix)/etc
-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
-+	$(mkinstalldirs) $(DESTDIR)/etc
-+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
- 
- uninstall-local:
-	-rm -f $(prefix)/etc/zhcon.conf
-+	-rm -f $(DESTDIR)/etc/zhcon.conf
- 
- # set the include path found by configure
- INCLUDES= $(all_includes)
--- a/app-laptop/pommed/files/pommed-1.21-r1.patch
+++ b/app-laptop/pommed/files/pommed-1.21-r1.patch
@ -1,75 +0,0 @@
-diff -ru pommed-1.21~/gpomme/Makefile pommed-1.21/gpomme/Makefile
--- pommed-1.21~/gpomme/Makefile	2008-12-21 13:38:27.000000000 +0100
-+++ pommed-1.21/gpomme/Makefile	2008-12-21 14:06:46.000000000 +0100
-@@ -17,8 +17,8 @@
- 
- INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-LDFLAGS = -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-+LDFLAGS += -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
- 
- SOURCES = gpomme.c theme.c conffile.c \
- 		../client-common/dbus-client.c \
-@@ -33,6 +33,7 @@
- mo: $(MOFILES)
- 
- gpomme: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
- 
-diff -ru pommed-1.21~/pommed/Makefile pommed-1.21/pommed/Makefile
--- pommed-1.21~/pommed/Makefile	2008-12-21 13:38:27.000000000 +0100
-+++ pommed-1.21/pommed/Makefile	2008-12-21 14:04:52.000000000 +0100
-@@ -16,9 +16,9 @@
- 
- INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
- 
-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
-+LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
- 
- ifneq (, $(findstring ppc, $(ARCH)))
- OFLIB ?=
-@@ -50,6 +50,7 @@
- 
- 	CFLAGS += $(LIBPCI_CFLAGS)
- 	LDFLAGS += $(LIBPCI_LIBS)
-+	LIBS = $(LIBPCI_LIBS)
- else
- 	LIBS = /usr/lib/libpci.a
- 	LDFLAGS += -lz	
-@@ -66,6 +67,7 @@
- 
- 
- pommed: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
- 
-diff -ru pommed-1.21~/wmpomme/Makefile pommed-1.21/wmpomme/Makefile
--- pommed-1.21~/wmpomme/Makefile	2008-12-21 13:38:27.000000000 +0100
-+++ pommed-1.21/wmpomme/Makefile	2008-12-21 14:07:09.000000000 +0100
-@@ -3,8 +3,8 @@
- DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
- DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS)
-LDFLAGS = -lXpm -lXext -lX11 $(DBUS_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS)
-+LDFLAGS += -lXpm -lXext -lX11 $(DBUS_LIBS)
- 
- SOURCES = wmgeneral.c wmpomme.c \
- 	../client-common/dbus-client.c \
-@@ -13,6 +13,7 @@
- OBJS = $(SOURCES:%.c=%.o)
- 
- wmpomme: $(OBJS)
-+	${CC} -o $@ ${OBJS} ${LDFLAGS}
- 
- wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
- 
--- a/app-laptop/pommed/files/pommed-1.30.patch
+++ b/app-laptop/pommed/files/pommed-1.30.patch
@ -1,75 +0,0 @@
-diff -ru pommed-1.30~/gpomme/Makefile pommed-1.30/gpomme/Makefile
--- pommed-1.30~/gpomme/Makefile	2009-10-22 21:25:30.000000000 +0200
-+++ pommed-1.30/gpomme/Makefile	2009-11-21 19:41:08.000000000 +0100
-@@ -17,8 +17,8 @@
- 
- INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-LDFLAGS = -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-+LDFLAGS += -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
- 
- SOURCES = gpomme.c theme.c conffile.c \
- 		../client-common/dbus-client.c \
-@@ -33,6 +33,7 @@
- mo: $(MOFILES)
- 
- gpomme: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
- 
-diff -ru pommed-1.30~/pommed/Makefile pommed-1.30/pommed/Makefile
--- pommed-1.30~/pommed/Makefile	2009-10-22 21:25:30.000000000 +0200
-+++ pommed-1.30/pommed/Makefile	2009-11-21 19:41:08.000000000 +0100
-@@ -18,9 +18,9 @@
- 
- TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
- 
-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
-+LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
- 
- ifneq (, $(findstring ppc, $(ARCH)))
- OFLIB ?=
-@@ -52,6 +52,7 @@
- 
- 	CFLAGS += $(LIBPCI_CFLAGS)
- 	LDFLAGS += $(LIBPCI_LIBS)
-+	LIBS = $(LIBPCI_LIBS)
- else
- 	LIBS = /usr/lib/libpci.a
- 	LDFLAGS += -lz	
-@@ -69,6 +70,7 @@
- 
- 
- pommed: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
- 
-diff -ru pommed-1.30~/wmpomme/Makefile pommed-1.30/wmpomme/Makefile
--- pommed-1.30~/wmpomme/Makefile	2009-10-22 21:25:30.000000000 +0200
-+++ pommed-1.30/wmpomme/Makefile	2009-11-21 19:41:08.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
-LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
-+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
-+LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
- 
- SOURCES = wmgeneral.c wmpomme.c \
- 	../client-common/dbus-client.c \
-@@ -15,6 +15,7 @@
- OBJS = $(SOURCES:%.c=%.o)
- 
- wmpomme: $(OBJS)
-+	${CC} -o $@ ${OBJS} ${LDFLAGS}
- 
- wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
- 
--- a/app-laptop/pommed/files/pommed-1.31.patch
+++ b/app-laptop/pommed/files/pommed-1.31.patch
@ -1,75 +0,0 @@
-diff -ru pommed-1.31~/gpomme/Makefile pommed-1.31/gpomme/Makefile
--- pommed-1.31~/gpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
-+++ pommed-1.31/gpomme/Makefile	2010-02-28 17:25:31.000000000 +0100
-@@ -17,8 +17,8 @@
- 
- INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-LDFLAGS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
-+CFLAGS += -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
-+LDFLAGS += -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
- 
- SOURCES = gpomme.c theme.c conffile.c \
- 		../client-common/dbus-client.c \
-@@ -33,6 +33,7 @@
- mo: $(MOFILES)
- 
- gpomme: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- gpomme.o: gpomme.c gpomme.h theme.h ../client-common/dbus-client.h ../client-common/video-client.h
- 
-diff -ru pommed-1.31~/pommed/Makefile pommed-1.31/pommed/Makefile
--- pommed-1.31~/pommed/Makefile	2010-02-28 17:24:31.000000000 +0100
-+++ pommed-1.31/pommed/Makefile	2010-02-28 17:26:20.000000000 +0100
-@@ -18,9 +18,9 @@
- 
- TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
-+CFLAGS += -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
- 
-LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
-+LDFLAGS += -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
- 
- ifneq (, $(findstring ppc, $(ARCH)))
- OFLIB ?=
-@@ -52,6 +52,7 @@
- 
- 	CFLAGS += $(LIBPCI_CFLAGS)
- 	LDFLAGS += $(LIBPCI_LIBS)
-+	LIBS = $(LIBPCI_LIBS)
- else
- 	LIBS = /usr/lib/libpci.a
- 	LDFLAGS += -lz	
-@@ -69,6 +70,7 @@
- 
- 
- pommed: $(OBJS) $(LIBS)
-+	${CC} -o $@ ${OBJS} ${LIBS} ${LDFLAGS}
- 
- pommed.o: pommed.c pommed.h evloop.h kbd_backlight.h lcd_backlight.h cd_eject.h evdev.h conffile.h audio.h dbus.h beep.h
- 
-diff -ru pommed-1.31~/wmpomme/Makefile pommed-1.31/wmpomme/Makefile
--- pommed-1.31~/wmpomme/Makefile	2010-02-28 17:24:31.000000000 +0100
-+++ pommed-1.31/wmpomme/Makefile	2010-02-28 17:26:42.000000000 +0100
-@@ -5,8 +5,8 @@
- 
- TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H)
- 
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
-LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
-+CFLAGS += -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
-+LDFLAGS += -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
- 
- SOURCES = wmgeneral.c wmpomme.c \
- 	../client-common/dbus-client.c \
-@@ -15,6 +15,7 @@
- OBJS = $(SOURCES:%.c=%.o)
- 
- wmpomme: $(OBJS)
-+	${CC} -o $@ ${OBJS} ${LDFLAGS}
- 
- wmpomme.o: wmpomme.c wmgeneral.h wmpomme-master.xpm ../client-common/dbus-client.h
- 
--- a/app-leechcraft/lc-bittorrent/files/boost-1.50.patch
+++ b/app-leechcraft/lc-bittorrent/files/boost-1.50.patch
@ -1,38 +0,0 @@
-diff --git a/src/plugins/bittorrent/CMakeLists.txt b/src/plugins/bittorrent/CMakeLists.txt
-index de8a2f9..45d26da 100644
--- a/src/plugins/bittorrent/CMakeLists.txt
-+++ b/src/plugins/bittorrent/CMakeLists.txt
-@@ -153,7 +153,6 @@ IF (WIN32)
- ENDIF (WIN32)
- #ADD_DEFINITIONS(-DBOOST_DYN_LINK)
- ADD_DEFINITIONS(-DTORRENT_LINKING_SHARED)
-ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2) #workaround for building with boost 1.46
- #ADD_DEFINITIONS(-D_DLL)
- IF (NOT LC_NO_MOC)
- 	QT4_WRAP_CPP (MOC_SRCS ${HEADERS})
-diff --git a/src/plugins/bittorrent/torrentmaker.cpp b/src/plugins/bittorrent/torrentmaker.cpp
-index 313a6a5..467c4d8 100644
--- a/src/plugins/bittorrent/torrentmaker.cpp
-+++ b/src/plugins/bittorrent/torrentmaker.cpp
-@@ -40,7 +40,11 @@ namespace LeechCraft
- 			{
- 				bool FileFilter (const boost::filesystem::path& filename)
- 				{
-+#if BOOST_FILESYSTEM_VERSION == 2
- 					if (filename.leaf () [0] == '.')
-+#else
-+					if (filename.leaf ().string () [0] == '.')
-+#endif
- 						return false;
- 					QFileInfo fi (QString::fromUtf8 (filename.string ().c_str ()));
- 					if ((fi.isDir () ||
-@@ -74,7 +78,9 @@ namespace LeechCraft
- 					return;
- 				}
- 
-+#if BOOST_FILESYSTEM_VERSION == 2
- 				boost::filesystem::path::default_name_check (boost::filesystem::no_check);
-+#endif
- 
- 				libtorrent::file_storage fs;
- #if LIBTORRENT_VERSION_NUM >= 1600
--- a/app-leechcraft/lc-bittorrent/files/boost-1.52.patch
+++ b/app-leechcraft/lc-bittorrent/files/boost-1.52.patch
@ -1,14 +0,0 @@
-diff --git a/src/plugins/bittorrent/torrentplugin.cpp b/src/plugins/bittorrent/torrentplugin.cpp
-index b41f0f2..c20f847 100644
--- a/src/plugins/bittorrent/torrentplugin.cpp
-+++ b/src/plugins/bittorrent/torrentplugin.cpp
-@@ -31,6 +31,9 @@
- #include <QToolBar>
- #include <QHeaderView>
- #include <QInputDialog>
-+#include <boost/preprocessor/seq/size.hpp>
-+#include <boost/preprocessor/seq/elem.hpp>
-+#include <boost/preprocessor/repetition/repeat.hpp>
- #include <libtorrent/session.hpp>
- #include <libtorrent/version.hpp>
- #include <interfaces/entitytesthandleresult.h>
--- a/app-leechcraft/lc-monocle/files/monocle-poppler.patch
+++ b/app-leechcraft/lc-monocle/files/monocle-poppler.patch
@ -1,19 +0,0 @@
-commit cbc0455a366739cf7911cf80de517aab6152da98
-Author: 0xd34df00d <0xd34df00d@gmail.com>
-Date:   Fri Jul 13 08:13:27 2012 +0400
-
-    Monocle PDF: fixed include dir.
-
-diff --git a/src/plugins/monocle/plugins/pdf/links.h b/src/plugins/monocle/plugins/pdf/links.h
-index 1ca7ee3..b7f6c1d 100644
--- a/src/plugins/monocle/plugins/pdf/links.h
-+++ b/src/plugins/monocle/plugins/pdf/links.h
-@@ -19,7 +19,7 @@
- #pragma once
- 
- #include <QObject>
-#include <poppler-link.h>
-+#include <poppler-qt4.h>
- #include <interfaces/monocle/ilink.h>
- 
- namespace LeechCraft
--- a/app-misc/beanstalkd/files/init-1.7
+++ b/app-misc/beanstalkd/files/init-1.7
@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of MIT
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting beanstalkd"
-	/sbin/start-stop-daemon --start \
-        --background \
-		--pidfile ${PIDFILE} --make-pidfile \
-		--exec ${BEANSTALKD_BINARY} \
-		-- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping beanstalkd"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY}
-	eend $?
-}
--- a/app-misc/beanstalkd/files/init-1.8
+++ b/app-misc/beanstalkd/files/init-1.8
@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of MIT
-# $Id$
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting beanstalkd"
-	/sbin/start-stop-daemon --start \
-        --background \
-		--pidfile ${PIDFILE} --make-pidfile \
-		--exec ${BEANSTALKD_BINARY} \
-		-- -b ${DATADIR} -p ${PORT} -l ${ADDR} -u ${USER}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping beanstalkd"
-	start-stop-daemon --stop --quiet \
-		--pidfile ${PIDFILE} \
-		--exec ${BEANSTALKD_BINARY}
-	eend $?
-}
--- a/app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch
+++ b/app-misc/countrycodes/files/countrycodes-1.0.5-Makefile.patch
@ -1,12 +0,0 @@
-diff -Naur countrycodes-1.0.5-orig/src/Makefile countrycodes-1.0.5/src/Makefile
--- countrycodes-1.0.5-orig/src/Makefile	2003-02-01 09:56:08.000000000 -0600
-+++ countrycodes-1.0.5/src/Makefile	2007-02-03 20:12:26.000000000 -0600
-@@ -70,7 +70,7 @@
- 	strip $(PROGRAM)
- 
- install:
-	$(INSTALL) -g root -m $(BINMODE) -o root -s ${srcdir}/$(PROGRAM) ${bindir}
-+	$(INSTALL) -g root -m $(BINMODE) -o root ${srcdir}/$(PROGRAM) ${bindir}
- 	@echo "Installing man page..."
- 	@$(SEDBIN) $(SEDCMDS) ${docdir}/iso3166.1.in > ${mandir}/iso3166.1
- 	@chown 0.0 ${mandir}/iso3166.1
--- a/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch
+++ b/app-misc/glcdprocdriver/files/glcdprocdriver-0.0.3-makefile.patch
@ -1,22 +0,0 @@
--- ./Makefile	2006-10-05 08:37:03.000000000 +0000
-+++ ./Makefile	2007-04-07 19:06:00.000000000 +0000
-@@ -11,6 +11,8 @@
- PACKAGE = $(ARCHIVE)
- TMPDIR = /tmp
- 
-+LIBS=-lglcddrivers -lglcdgraphics
-+
- 
- LIBNAME = libglcdprocdriver.so
- SONAME  = $(LIBNAME).1
-@@ -24,6 +26,9 @@
- 
- all: $(LIBNAME)
- 
-+$(OBJS): %.o: %.c
-+	$(CXX) -c -fPIC $(CXXFLAGS) $< -o $@
-+
- $(LIBNAME): $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(SONAME)" -o $@
-+	$(CXX) $(LDFLAGS) -shared $(OBJS) $(LIBS) -Wl,-soname="$(SONAME)" -o $@
- 
--- a/app-misc/glcdprocdriver/files/glcdprocdriver-gcc43.patch
+++ b/app-misc/glcdprocdriver/files/glcdprocdriver-gcc43.patch
@ -1,15 +0,0 @@
--- glcdprocdriver-0.0.4a/glcddriver.c	2007-04-17 19:05:54.000000000 -0300
-+++ glcdprocdriver-0.0.4/glcddriver.c	2009-01-17 14:49:39.000000000 -0400
-@@ -4,11 +4,11 @@
-  *
-  * (c) 2005 Lucian Muresan <lucianm AT users.sourceforge.net>
-  */
-+#include <stdlib.h>
- #include <syslog.h>
- #include "glcddriver.h"
- #include "icons.h"
- 
-
- /*
-  *
-  * The following icon IDs are taken from lcdproc/drivers/lcd.h
--- a/app-misc/glcdprocdriver/files/glcdprocdriver-gcc44.patch
+++ b/app-misc/glcdprocdriver/files/glcdprocdriver-gcc44.patch
@ -1,12 +0,0 @@
-diff --git a/glcddriver.c b/glcddriver.c
-index b337a2b..575978a 100644
--- a/glcddriver.c
-+++ b/glcddriver.c
-@@ -4,6 +4,7 @@
-  *
-  * (c) 2005-2009 Lucian Muresan <lucianm AT users.sourceforge.net>
-  */
-+#include <stdio.h>
- #include <syslog.h>
- #include <stdlib.h>
- #include "glcddriver.h"
--- a/app-misc/gnutu/files/gnutu-2.0-event.patch
+++ b/app-misc/gnutu/files/gnutu-2.0-event.patch
@ -1,11 +0,0 @@
--- src/Widgets/DateEdit.cs.old	2005-09-08 04:52:07.195144232 +0900
-+++ src/Widgets/DateEdit.cs	2005-09-08 04:53:34.173921448 +0900
-@@ -74,7 +74,7 @@
- 		}
- 		
- 		
-		private void on_CalendarWindow_focus_out (object obj, EventArgs args)
-+		private void on_CalendarWindow_focus_out (object obj, Gtk.FocusOutEventArgs args)
- 		{
- 			CalendarWindow.Hide ();
- 			SelectBtn.Active = false;
--- a/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
+++ b/app-misc/gourmet/files/gourmet-0.16.1-PIL-png.patch
@ -1,29 +0,0 @@
-From 4eb110bbbc58af97fd6994b96d9482783037058d Mon Sep 17 00:00:00 2001
-From: Bernhard Reiter <ockham@raz.or.at>
-Date: Wed, 13 Nov 2013 15:24:09 +0100
-Subject: [PATCH] Fix another PIL import.
-
-Reported at https://answers.launchpad.net/gourmet/+question/238352#comment-6
---
- gourmet/gtk_extras/thumbnail.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gourmet/gtk_extras/thumbnail.py b/gourmet/gtk_extras/thumbnail.py
-index d096126..ea7e72c 100644
--- a/gourmet/gtk_extras/thumbnail.py
-+++ b/gourmet/gtk_extras/thumbnail.py
-@@ -81,7 +81,10 @@ def create_thumbnail (path, thumbpath, uri, type="large"):
-     info['Software']='Gourmet Recipe Manager'
-     info['URI']=str(uri)
-     # now we must create our image guy
-    import PngImagePlugin
-+    try:
-+        from PIL import PngImagePlugin
-+    except ImportError:
-+        import PngImagePlugin
-     pnginfo = PngImagePlugin.PngInfo()
- 
-     for k,v in info.items():
-- 
-1.8.4
-
--- a/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
+++ b/app-misc/gourmet/files/gourmet-0.16.1-pictures-dir.patch
@ -1,13 +0,0 @@
--- gourmet/gtk_extras/dialog_extras.py	2013-10-31 09:03:08.456469166 -0500
-+++ gourmet/gtk_extras/dialog_extras.py	2013-10-31 09:04:18.175067008 -0500
-@@ -1096,7 +1096,9 @@
-                   buttons=None
-                   ):
-         FileSelectorDialog.__init__(self, title, filename, filters, action, set_filter, buttons)
-        self.fsd.set_current_folder(get_user_special_dir(USER_DIRECTORY_PICTURES))
-+        pictures_dir = get_user_special_dir(USER_DIRECTORY_PICTURES)
-+        if not pictures_dir == None:
-+            self.fsd.set_current_folder(pictures_dir)
- 
-     def post_dialog (self):
-         self.preview = gtk.Image()
--- a/app-misc/gourmet/files/no-docs.patch
+++ b/app-misc/gourmet/files/no-docs.patch
@ -1,10 +0,0 @@
--- setup.py	2013-03-16 15:26:19.760162984 -0400
-+++ setup.py	2013-03-16 15:26:26.966497095 -0400
-@@ -119,7 +119,6 @@
- 
-     files.extend(data_files)
-     files.extend([(os.path.join(base,'ui'), glob.glob(os.path.join('ui','*.ui')))])
-    files.extend([(os.path.join('share','doc','gourmet'), ['FAQ', 'LICENSE'])])
-     #print 'DATA FILES:',files
-     return files
- 
--- a/app-misc/gourmet/files/nutritional-db-fix.patch
+++ b/app-misc/gourmet/files/nutritional-db-fix.patch
@ -1,29 +0,0 @@
--- gourmet/plugins/nutritional_information/data_plugin.py	2013-08-28 19:13:38.000000000 -0400
-+++ gourmet/plugins/nutritional_information/data_plugin.py	2013-10-30 23:37:51.358616037 -0400
-@@ -20,7 +20,7 @@
-             pass
-         self.db._setup_object_for_table(self.db.usda_weights_table, UsdaWeight)
-     
-    def setup_nutrition_conversions_table (self):
-+    def setup_nutritionconversions_table (self):
-         self.db.nutritionconversions_table = Table('nutritionconversions',self.db.metadata,
-                                                 Column('id',Integer(),primary_key=True),
-                                                 Column('ingkey',String(length=255),**{}),
-@@ -58,7 +58,7 @@
-         
-         self.setup_usda_weights_table()
-         self.setup_nutritionaliases_table()
-        self.setup_nutrition_conversions_table()
-+        self.setup_nutritionconversions_table()
-         self.db.do_add_nutrition = self.do_add_nutrition
- 
-     def update_version (self, gourmet_stored, plugin_stored, gourmet_current, plugin_current):
-@@ -68,7 +68,7 @@
-             print 'RECREATE USDA WEIGHTS TABLE'
-             self.db.alter_table('usda_weights',self.setup_usda_weights_table,{},
-                              [name for lname,name,typ in parser_data.WEIGHT_FIELDS])
-            self.db.alter_table('nutritionconversions',self.setup_nutrition_conversions_table,{},
-+            self.db.alter_table('nutritionconversions',self.setup_nutritionconversions_table,{},
-                              ['ingkey','unit','factor'])
-         if plugin_stored == '1':
-             # Add choline
--- a/app-misc/grc/files/1.0.6-support-more-files.patch
+++ b/app-misc/grc/files/1.0.6-support-more-files.patch
@ -1,60 +0,0 @@
-diff -ur grc-1.0.6.orig/conf.gcc grc-1.0.6/conf.gcc
--- grc-1.0.6.orig/conf.gcc	2004-08-25 23:23:15.898638944 -0400
-+++ grc-1.0.6/conf.gcc	2004-08-25 23:26:54.297437280 -0400
-@@ -1,10 +1,10 @@
- # 
-regexp=\bgcc\b
-colours=yellow
-count=more
-+regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
-+colours=white bold
-+count=once
- .........
- # 
-regexp=^.*?:
-+regexp=^\S*:
- colours=red
- count=once
- .........
-@@ -12,6 +12,10 @@
- regexp=\`\w+\'
- colours=green
- .........
-+# compilation method modifiers
-+regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
-+colours=yellow
-+.........
- # -O
- regexp=\-O\d 
- colours=green
-@@ -24,10 +28,10 @@
- # stderr to grcat 
- #
- # warning
-regexp=warning
-+regexp=[Ww]arning[:\b]
- colours=yellow
- .........
- # error
-regexp=error
-+regexp=[Ee]rror[:\b]
- colours=red blink
- count=stop
-diff -ur grc-1.0.6.orig/grc.conf grc-1.0.6/grc.conf
--- grc-1.0.6.orig/grc.conf	2004-08-25 23:23:15.870643200 -0400
-+++ grc-1.0.6/grc.conf	2004-08-25 23:23:57.814266800 -0400
-@@ -15,9 +15,13 @@
- conf.traceroute
- 
- # gcc command
-(^|[/\w\.]+/)g?cc\s
-+(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
- conf.gcc
- 
-+# configure command
-+(^|[/\w\.]+/)configure
-+conf.configure
-+
- # make command
- (^|[/\w\.]+/)g?make\s?
- conf.gcc
--- a/app-misc/joy2key/files/1.6.1-fix-configure.diff
+++ b/app-misc/joy2key/files/1.6.1-fix-configure.diff
@ -1,27 +0,0 @@
--- configure.ac	2001-04-10 11:36:09.000000000 -0600
-+++ configure.ac	2005-03-19 08:40:56.377832328 -0700
-@@ -20,8 +20,22 @@
-               AC_DEFINE(ENABLE_CONSOLE))
- 
- AC_ARG_ENABLE(X, [  --disable-X             do not compile in X features],
-              if test $enableval != no; then AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"; fi,
-              AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11")
-+              if test $enableval != no; then AC_DEFINE(ENABLE_X) 
-+	        if test -n "$x_libraries";
-+	        then
-+	         export xstuff="-L$x_libraries -lX11"
-+	        else
-+	         export xstuff="-lX11"
-+	        fi
-+	       fi
-+	       ,
-+              AC_DEFINE(ENABLE_X) 
-+	      if test -n "$x_libraries";
-+	      then
-+	       export X_Stuff="-L$x_libraries -lX11"
-+	      else
-+	       export X_Stuff="-lX11"
-+	      fi)
- 
- AC_SUBST(X_Stuff)
- AC_SUBST(x_headers)
--- a/app-misc/joy2key/files/fix-configure.in.diff
+++ b/app-misc/joy2key/files/fix-configure.in.diff
@ -1,27 +0,0 @@
--- configure.in	2001-04-10 11:36:09.000000000 -0600
-+++ configure.in	2005-03-19 08:40:56.377832328 -0700
-@@ -20,8 +20,22 @@
-               AC_DEFINE(ENABLE_CONSOLE))
- 
- AC_ARG_ENABLE(X, [  --disable-X             do not compile in X features],
-              if test $enableval != no; then AC_DEFINE(ENABLE_X) export xstuff="-L$x_libraries -lX11"; fi,
-              AC_DEFINE(ENABLE_X) export X_Stuff="-L$x_libraries -lX11")
-+              if test $enableval != no; then AC_DEFINE(ENABLE_X) 
-+	        if test -n "$x_libraries";
-+	        then
-+	         export xstuff="-L$x_libraries -lX11"
-+	        else
-+	         export xstuff="-lX11"
-+	        fi
-+	       fi
-+	       ,
-+              AC_DEFINE(ENABLE_X) 
-+	      if test -n "$x_libraries";
-+	      then
-+	       export X_Stuff="-L$x_libraries -lX11"
-+	      else
-+	       export X_Stuff="-lX11"
-+	      fi)
- 
- AC_SUBST(X_Stuff)
- AC_SUBST(x_headers)
--- a/app-misc/realpath/files/realpath-1.15-build.patch
+++ b/app-misc/realpath/files/realpath-1.15-build.patch
@ -1,35 +0,0 @@
-diff --git a/common.mk b/common.mk
-index 18f539c..142f7e6 100644
--- a/common.mk
-+++ b/common.mk
-@@ -34,16 +34,11 @@ webcgidir	      := $(prefix)/lib/cgi-bin
- applicationsdir := $(prefix)/share/applications
- 
- PERL            := /usr/bin/perl
-CC              := gcc
-CFLAGS           = -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
-LDFLAGS         :=
-LIBS            := 
-+CC              ?= gcc
-+CFLAGS          += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
-+LDFLAGS         +=
-+LIBS            += 
- 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  CFLAGS += -O0
-else
-  CFLAGS += -O2
-endif
- 
- 
- # determine our version number
-@@ -60,9 +55,6 @@ ifndef VERSION
-   unexport CDPATH ENV
- 
-   ifdef DESTDIR
-    ifneq ($(DESTDIR),$(abspath $(DESTDIR)))
-      $(error DESTDIR "$(DESTDIR)" is not an absolute path)
-    endif
-     override ddirshort  :=  DESTDIR
-     export ddirshort
-   endif
--- a/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-darwin8.patch
@ -1,23 +0,0 @@
-Darwin8 has no backtrace functionalities yet
-
--- src/searchd.cpp
-+++ src/searchd.cpp
-@@ -1291,6 +1291,10 @@
- 	__asm __volatile__ ( "movq %%rbp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
- #endif
- 
-+#ifndef SIGRETURN_FRAME_OFFSET
-+	sphLogFatal ( "Cannot get stack frame pointer on this architecture" );
-+#else
-+
- 	if ( !pFramePointer )
- 	{
- 		sphLogFatal ( "Frame pointer is null. Unable to backtrace the stack. Did you build the searchd with -fomit-frame-pointer?" );
-@@ -1329,6 +1333,7 @@
- 	if ( !bOk )
- 		sphWarning ( "Something wrong in frame pointers. BackTrace failed (failed FP was %p)", pNewFP );
- 	else
-+#endif
- #endif // !HAVE_BACKTRACE
- 		sphInfo ( "Stack trace seems to be succesfull. Now you have to resolve the numbers above and attach resolved values to the bugreport. See the section about resolving in the documentation" );
- 
--- a/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-libsphinxclient-darwin.patch
@ -1,22 +0,0 @@
-On Darwin, the linker doesn't like it when vsnprintf is prefixed by an
-underscore.  This obviously is an error, since it's only necessary for
-Windows.  Add an extra guard, such that vsnprintf is left alone.
-
--- api/libsphinxclient/sphinxclient.c
-+++ api/libsphinxclient/sphinxclient.c
-@@ -13,6 +13,7 @@
- // did not, you can find it at http://www.gnu.org/
- //
- 
-+#if defined(_MSC_VER)
- #if _MSC_VER>=1400
- // VS 2005 and above
- #define _CRT_SECURE_NO_DEPRECATE 1
-@@ -21,6 +22,7 @@
- // VS 2003 and below
- #define vsnprintf _vsnprintf
- #endif
-+#endif
- 
- #include <stdlib.h>
- #include <stdarg.h>
--- a/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
+++ b/app-misc/sphinx/files/sphinx-1.10_beta-nosigpipe.patch
@ -1,26 +0,0 @@
-Part of upstream fix:
-http://code.google.com/p/sphinxsearch/source/detail?r=2423
-
--- api/libsphinxclient/sphinxclient.c.~1~	2010-07-15 13:05:40.000000000 +0200
-+++ api/libsphinxclient/sphinxclient.c	2010-11-09 19:55:28.964939046 +0100
-@@ -1268,7 +1268,11 @@
- static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
- {
- 	int res;
-+#if defined(_WIN32) || defined(SO_NOSIGPIPE)
- 	res = send ( fd, bytes, len, 0 );
-+#else
-+	res = send ( fd, bytes, len, MSG_NOSIGNAL );
-+#endif
- 
- 	if ( res<0 )
- 	{
-@@ -1354,7 +1358,7 @@
- 	}
- 
- 	optval = 1;
-#ifndef _WIN32
-+#if defined(SO_NOSIGPIPE)
- 	if ( setsockopt ( sock, SOL_SOCKET, SO_NOSIGPIPE, (void *)&optval, (socklen_t)sizeof(optval) ) < 0 )
- 	{
- 		set_error ( client, "setsockopt() failed: %s", sock_error() );
--- a/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
+++ b/app-misc/sphinx/files/sphinx-2.0.1_beta-solaris.patch
@ -1,35 +0,0 @@
-link against required libraries
-include sys/fcntl.h for F_[SG]ET constants
-don't try to use an undefined constant
-
--- api/libsphinxclient/configure.in
-+++ api/libsphinxclient/configure.in
-@@ -33,6 +33,9 @@
- dnl Checks for header files.
- AC_CHECK_HEADERS(string.h strings.h unistd.h stdint.h)
- 
-+AC_CHECK_LIB([nsl], gethostbyname)
-+AC_CHECK_LIB([socket], connect)
-+
- DEFAULT_INSTALL_PREFIX="/usr/local"
- 
- AC_ARG_ENABLE(debug,
--- api/libsphinxclient/sphinxclient.c
-+++ api/libsphinxclient/sphinxclient.c
-@@ -57,6 +57,7 @@
- 	#include <netdb.h>
- 	#include <errno.h>
- 	#include <sys/un.h>
-+	#include <sys/fcntl.h>
- #endif
- 
- //////////////////////////////////////////////////////////////////////////
-@@ -1280,7 +1281,7 @@
- static sphinx_bool net_write ( int fd, const char * bytes, int len, sphinx_client * client )
- {
- 	int res;
-#if defined(_WIN32) || defined(SO_NOSIGPIPE)
-+#if defined(_WIN32) || defined(SO_NOSIGPIPE) || !defined(MSG_NOSIGNAL)
- 	res = send ( fd, bytes, len, 0 );
- #else
- 	res = send ( fd, bytes, len, MSG_NOSIGNAL );
--- a/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
+++ b/app-misc/sphinx/files/sphinx-2.0.4_gcc-4.7.patch
@ -1,29 +0,0 @@
--- a/src/sphinxexpr.cpp
-+++ b/src/sphinxexpr.cpp
-@@ -1796,7 +1796,7 @@ public:
- 	/// evaluate arg, return interval id
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		ARRAY_FOREACH ( i, this->m_dValues ) // FIXME! OPTIMIZE! perform binary search here
- 			if ( val<this->m_dValues[i] )
- 				return i;
-@@ -1827,7 +1827,7 @@ public:
- 	/// evaluate arg, return interval id
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		ARRAY_FOREACH ( i, m_dTurnPoints )
- 			if ( val < Expr_ArgVsSet_c<T>::ExprEval ( m_dTurnPoints[i], tMatch ) )
- 				return i;
-@@ -1873,7 +1873,7 @@ public:
- 	/// evaluate arg, check if the value is within set
- 	virtual int IntEval ( const CSphMatch & tMatch ) const
- 	{
-		T val = ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
-+		T val = this->ExprEval ( this->m_pArg, tMatch ); // 'this' fixes gcc braindamage
- 		return this->m_dValues.BinarySearch ( val )!=NULL;
- 	}
- 
--- a/app-misc/srm/files/cflags.patch
+++ b/app-misc/srm/files/cflags.patch
@ -1,21 +0,0 @@
-diff -Naur srm-1.2.11.orig/configure.in srm-1.2.11/configure.in
--- srm-1.2.11.orig/configure.in	2010-06-06 13:22:08.000000000 -0400
-+++ srm-1.2.11/configure.in	2011-09-28 21:23:24.562682859 -0400
-@@ -6,8 +6,6 @@
- 
- dnl Checks for programs.
- AC_PROG_CC
-dnl reset CFLAGS
-CFLAGS=
- 
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -42,7 +40,7 @@
-   CFLAGS="$CFLAGS -g"
-   AC_MSG_RESULT(yes)
- else
-  CFLAGS="$CFLAGS -O2 -DNDEBUG"
-+  CFLAGS="$CFLAGS -DNDEBUG"
-   AC_MSG_RESULT(no)
- fi
- 
--- a/app-misc/srm/files/srm-1.2.8-remove-mount.patch
+++ b/app-misc/srm/files/srm-1.2.8-remove-mount.patch
@ -1,13 +0,0 @@
--- src/sunlink.c	2007-03-05 03:01:00.000000000 +0530
-+++ src/sunlink.c	2007-03-05 03:01:16.000000000 +0530
-@@ -20,9 +20,8 @@
- #include <sys/vfs.h>
- #endif
- 
-#if HAVE_SYS_PARAM_H && HAVE_SYS_MOUNT_H
-+#if HAVE_SYS_PARAM_H
- #include <sys/param.h>
-#include <sys/mount.h>
- #endif
- 
- #include "srm.h"
--- a/app-misc/symlinks/files/symlinks-1.2-fix-implicit-declaration.patch
+++ b/app-misc/symlinks/files/symlinks-1.2-fix-implicit-declaration.patch
@ -1,11 +0,0 @@
-diff -Naur symlinks-1.2-orig/symlinks.c symlinks-1.2/symlinks.c
--- symlinks-1.2-orig/symlinks.c	1996-10-15 15:02:57.000000000 -0400
-+++ symlinks-1.2/symlinks.c	2007-12-10 18:08:43.000000000 -0500
-@@ -3,6 +3,7 @@
- #define _POSIX_SOURCE
- #endif
- #include <stdio.h>
-+#include <stdlib.h>
- #include <malloc.h>
- #include <string.h>
- #include <fcntl.h>
--- a/app-misc/xmind/files/x-xmind.xml
+++ b/app-misc/xmind/files/x-xmind.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-   <mime-type type="application/x-xmind">
-     <sub-class-of type="application/zip"/>
-     <comment>XMind Workbook</comment>
-     <alias type="application/vnd.xmind.workbook"/>
-     <generic-icon name="package-x-generic"/>
-     <glob pattern="*.xmind"/>
-   </mime-type>
-</mime-info>
--- a/app-misc/xmind/files/xmind-thumbnailer
+++ b/app-misc/xmind/files/xmind-thumbnailer
@ -1,78 +0,0 @@
-#!/usr/bin/env python
-
-import gnomevfs
-import os
-import sys
-import zipfile
-from PIL import Image, ImageEnhance
-
-# Alter these varibles to change thumbnail look
-ICON_PATH = "/usr/share/icons/hicolor/32x32/apps/xmind.png" # Change this path to alter icons
-ICON_OPACITY = 0.6 #Opacity of the icon (between 0.0 and 1.0)
-THUMBNAIL_BACKGROUND_COLOR = "white" # Color of the background
-
-in_file_path = gnomevfs.get_local_path_from_uri(sys.argv[1])
-out_file_path = sys.argv[2]
-path_without_thumbs = os.getenv("HOME")+"/Templates" 
-
-def get_icon(thumbnail_size):
-	#Load icon
-	icon = Image.open(ICON_PATH).convert("RGBA")
-	#Set it's opacity
-	icon = set_icon_opacity(icon,ICON_OPACITY)
-	#And set it's position in thumbnail
-	icon_posx=thumbnail_size[0]-icon.size[0]
-	icon_posy=thumbnail_size[1]-icon.size[1]
-	icon_width=thumbnail_size[0]
-	icon_height=thumbnail_size[1]
-	return {"image":icon,"position":(icon_posx,icon_posy,icon_width,icon_height)}	
-	
-def get_basic_thumbnail():
-	#Find out if the file is not in Templates directory
-	if in_file_path.find(path_without_thumbs)!=0:
-		try:
-			#Extract thumbnail from Xmind file and save it
-			zip=zipfile.ZipFile(in_file_path,mode="r")
-			picture=zip.read("Thumbnails/thumbnail.jpg")
-			zip.close()
-			thumbnail=open(out_file_path,"w")
-			thumbnail.write(picture)
-			thumbnail.write("/n")
-			thumbnail.close()
-			#Open saved thumbnail
-			image=Image.open(out_file_path).convert("RGBA")
-			if image.size[0]>200:
-				image = image.resize((200,image.size[1]*200/image.size[0]))
-			if image.size[1]>200:
-				image = image.resize((image.size[0]*200/image.size[1],200))
-			return {"suceeded":True,"image":image,"size":(image.size[0],image.size[1])}
-		
-		except:
-			return {"suceeded":False}
-	else:
-		return {"suceeded":False}
-
-# Nicked from http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/362879
-def set_icon_opacity(icon,opacity):
-	#Returns an image with reduced opacity.
-	assert opacity >= 0 and opacity <= 1
-	if icon.mode != 'RGBA':
-		icon = icon.convert('RGBA')
-	else:
-		icon = icon.copy()
-	alpha = icon.split()[3]
-	alpha = ImageEnhance.Brightness(alpha).enhance(opacity)
-	icon.putalpha(alpha)
-	return icon
-
-thumbnail=get_basic_thumbnail()
-if thumbnail["suceeded"]:
-	background=Image.new("RGB", thumbnail["size"], THUMBNAIL_BACKGROUND_COLOR)
-	icon=get_icon(thumbnail["size"])
-	thumbnail=thumbnail["image"]
-	# Add thumbnail
-	background.paste(thumbnail, None, thumbnail)
-	# Add icon
-	background.paste(icon["image"],icon["position"],icon["image"])
-	# Save thumbnail
-	background.save(out_file_path,"PNG")
--- a/app-misc/xmind/files/xmind.schemas
+++ b/app-misc/xmind/files/xmind.schemas
@ -1,30 +0,0 @@
-<gconfschemafile>
-    <schemalist>
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-xmind/enable</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-xmind/enable</applyto>
-            <owner>xmind-thumb</owner>
-            <type>bool</type>
-            <default>true</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-
-
-        <schema>
-            <key>/schemas/desktop/gnome/thumbnailers/application@x-xmind/command</key>
-            <applyto>/desktop/gnome/thumbnailers/application@x-xmind/command</applyto>
-            <owner>xmind-thumb</owner>
-            <type>string</type>
-            <default>/usr/bin/xmind-thumbnailer %u %o</default>
-            <locale name="C">
-                <short></short>
-                <long></long>
-            </locale>
-        </schema>
-     
-    </schemalist>
-</gconfschemafile>
--- a/app-office/homebank/Manifest
+++ b/app-office/homebank/Manifest
@ -2,3 +2,4 @@ DIST homebank-4.6.3.tar.gz 1899045 SHA256 f6e31bb789d626b507c2af9d176a0bac0cbaec
 DIST homebank-5.0.6.tar.gz 2578726 SHA256 4a52ef7a20accd50f8cead0d0564042912573c7d60887ef5e4d462fb28b239e4 SHA512 48cb3c4b306804a5cc6dea3083fc84d64a8936bb9c7dfb357838abb05d3f2ce1080eba73be1bb7c37ffeb3ed10d14f15d0f7121d7e4f34c543f8807f8747f289 WHIRLPOOL 7052e27f7d9d38eae13a5ed3af0d7f284bcbdfbff9cb9282bc773f26a7fb5a0af305b81ba82cc2f21339aa3589bb5a6a4b9323f48c637d8418e4767197b4b314
 DIST homebank-5.0.7.tar.gz 2603648 SHA256 d526dc78e6f6ea01efadfb9fd27b2d10326c315cfe550c83cc29cfd8052564e7 SHA512 ffb3246a6abee6a24f4491e6f3f0857033bdc03ec81647050766e965cc156789f829c819d491f81b3d15f24710f89a432f8906b833d11e8f4d1499cb05050dee WHIRLPOOL 5602c4dec49a4478699db795581a40e3a2a31ffec3eaa5c1aeffd647055dccb59b8c5c1b973971bfe76906ca73ba93a85ff35d90e25791ded69267d96b5ffe4d
 DIST homebank-5.0.8.tar.gz 2603678 SHA256 9bdf10b0d94c92d5216462fb110bba34cd2a1b01d38d2c6b629db81a0513a310 SHA512 df4e66b0af076b20e2a2bca37186020d90ad58aec28fba79b3bb603c81e71cb4d54f45df14c250403d320a4f92489fceb84ac0191e9cfdf0f8a6ae3bd2f7a6bf WHIRLPOOL 1721f880276e148a568f809283aa9a67490a3ef68e9517d94ed84741d823ad0be397ff9dfb5db714f11e945ef95be3032f2034ca091ae4ab4260ab408d7f48bb
+DIST homebank-5.0.9.tar.gz 2734386 SHA256 d0bc763e94da0cba544495b07070e79faecf1d5de0cfb092d126482525e062b7 SHA512 832229de9812621bcce3037f1f70eb63cf96cb33468e0e76202ebe3a489544090d5b54fdc7b42feefaf7722c3f42c6d9bc45ee5fbd1b8638c2e54b65ea03357f WHIRLPOOL 4cc8d4a062e4b2f94324307e2b8a8b63caf26095708a814d8561d8818046d6c9fb1d4608fb254366c97cbe0baa8c1d3986d3f233e1a4c32e7cd53ee1380a6add
--- a/app-office/homebank/homebank-5.0.9.ebuild
+++ b/app-office/homebank/homebank-5.0.9.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit fdo-mime eutils gnome2-utils
+
+DESCRIPTION="Free, easy, personal accounting for everyone"
+HOMEPAGE="http://homebank.free.fr/index.php"
+SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+ofx"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.28
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-3.6.4:3
+	x11-libs/pango
+	ofx? ( >=dev-libs/libofx-0.8.3 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	>=dev-util/intltool-0.40.5
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_configure() {
+	econf $(use_with ofx)
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@ -1,4 +1,2 @@
-DIST TeXmacs-1.0.7.21-src.tar.gz 18712991 SHA256 0c945611cd057c4af5f7c2232d19b8129caeef0289fa43a53bab1dabb2d603d2 SHA512 7a825297b84c34aa7b097026932a99bcaf7bdddeb44ad7d141cae1b03893e2472241f4cf73f3798dfebd9b226f94bc0ef665d5defb1b133d897e0ba3c8213fee WHIRLPOOL 8d12788ac4458e3b5085d1e11e3c5b1a92de1027fed3652bc232f395e2e77bddd141d4607690990c8a8ad29624f151557bcd9b20847b95d2c164e9772c103976
-DIST TeXmacs-1.99.1-src.tar.gz 19048884 SHA256 7e8425d65b1a02f270eaa021389cb9c3f627c9064cc986bd1ec7f66e0681b2ac SHA512 4b599e020aafa5b0e832d5e4ca9d1fe2013f1880b32f4ddc63e42582ed553d1e6a8ac9a5b2189db040e7bbaef3faffae5c8f79da3657cb2356ba0700f85f7840 WHIRLPOOL 5457169699cbc4ccded02f0a3ee369910ade70f902f1a41d9c43349acb940022afdb08611681e0b20da66a09b507aaa648c147d4a57d9a7e8d12bb53795b7003
 DIST TeXmacs-1.99.2-src.tar.gz 18957858 SHA256 da017f0d5c927adc33952a6efd773165f63e1eaa509f627857f145434e7a8850 SHA512 e9d2dd0aab2e66470c4ae860e13b6fad2cc07913f14f7bca042c703d4d8b4a62fafafa711b81a0d8f8c125a3641b8bb5f38cd3adac74ec18895671423aa60be9 WHIRLPOOL b0ace20c3df61461f5fcad172b9a3acc69c43800ee600718ba20866452a938f3a5f7d61d33bb4e9f4e67f0666486f6e71387c78fd49d2ff7fb703f4baaf6a326
 DIST TeXmacs-1.99.5-src.tar.gz 25014543 SHA256 f1929f35ee6e4301667433ed2f64de7660a08066e864fcb6fffbc031f667b3a6 SHA512 a7d846fd8823e486cf724bfcbe04ae877dd64995d6131af59b49427a1178e36b52b9fcd9109783b9ae1e39c988ae9ed497b1540dce29645ebf2c4301ca7357a8 WHIRLPOOL 13809c4cbfbcc7dbdb3c84917e00f407484095cbf16863fcc9d92fa0833c6dd5d2cafb25d1f2ac9bc1cc5131aea1f273be4b2a8ff47c33014e1b1d53c4f5ec5e
--- a/app-office/texmacs/texmacs-1.0.7.21.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.21.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils fdo-mime gnome2-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm qt4 svg spell"
-KEYWORDS="~alpha amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-scheme/guile:12[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	qt4? ( dev-qt/qtgui:4 )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	epatch "${FILESDIR}"/${PN}-updates.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_with imlib imlib2) \
-		$(use_enable qt4 qt)
-}
-
-src_install() {
-	default
-	domenu "${FILESDIR}"/TeXmacs.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
--- a/app-office/texmacs/texmacs-1.99.1.ebuild
+++ b/app-office/texmacs/texmacs-1.99.1.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils fdo-mime gnome2-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm pdf qt4 svg spell"
-KEYWORDS="alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-scheme/guile:12[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	qt4? ( dev-qt/qtgui:4 )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	epatch "${FILESDIR}"/${PN}-updates.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-optimize="${CXXFLAGS}" \
-		$(use_with imlib imlib2) \
-		$(use_enable qt4 qt) \
-		$(use_enable pdf pdf-renderer)
-}
-
-src_install() {
-	default
-	domenu "${FILESDIR}"/TeXmacs.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
--- a/app-office/texmacs/texmacs-1.99.2.ebuild
+++ b/app-office/texmacs/texmacs-1.99.2.ebuild
@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools eutils fdo-mime gnome2-utils
-
-MY_P=${P/tex/TeX}-src
-
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-HOMEPAGE="http://www.texmacs.org/"
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm pdf qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-scheme/guile:12[deprecated]
-	media-libs/freetype
-	x11-apps/xmodmap
-	x11-libs/libXext
-	virtual/latex-base
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	netpbm? ( media-libs/netpbm )
-	qt4? ( dev-qt/qtgui:4 )
-	spell? ( app-text/aspell )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) )
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# respect LDFLAGS, bug #338459
-	epatch "${FILESDIR}"/${PN}-plugins-1.patch
-
-	# dont update mime and desktop databases and icon cache
-	epatch "${FILESDIR}"/${PN}-updates.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-optimize="${CXXFLAGS}" \
-		$(use_with imlib imlib2) \
-		$(use_enable qt4 qt) \
-		$(use_enable pdf pdf-renderer)
-}
-
-src_install() {
-	default
-	domenu "${FILESDIR}"/TeXmacs.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
--- a/app-office/texmacs/texmacs-1.99.5.ebuild
+++ b/app-office/texmacs/texmacs-1.99.5.ebuild
@ -19,7 +19,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"

 RDEPEND="
 	app-text/ghostscript-gpl
-	dev-scheme/guile:12[deprecated]
+	<dev-scheme/guile-1.9[deprecated]
 	media-libs/freetype
 	x11-apps/xmodmap
 	x11-libs/libXext
--- a/app-portage/metagen/metagen-0.6.5.ebuild
+++ b/app-portage/metagen/metagen-0.6.5.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ppc x86 ~amd64-linux ~x86-linux"

 IUSE=""
 DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -6,7 +6,7 @@ DIST bash-4.0.tar.gz 6230779 SHA256 9793d394f640a95030c77d5ac989724afe196921956d
 DIST bash-4.1.tar.gz 6598300 SHA256 3f627124a83c6d34db503a923e20710d370573a29dd5d11d6f116d1aee7be1da SHA512 2f2a053d98be9a31cd089e1293e3369ad05406f6543d1d1662d8b5807fdcfebc1dda79db9bf2c596a6351ea463fb9bd9c8943c1d45da9b82f2fd3bab0b8a581a WHIRLPOOL 0259149d6f0d8f8a19e4b5a88e127c55efae0df4459063295aa6a9de69450b5f4b4b579894e4410ddfc0119eeb0356865b7cc4dbc7e4a75ad98acce0dfe2d46f
 DIST bash-4.2.tar.gz 7009201 SHA256 a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8 SHA512 fdd3c230f4f7a687d36db1b8f7baab5e553cf55756e2d49a88ffaa4260c8cb949897dec9f48655e96608ef0093ac101b60c132060f06c711c0ab81aa3f148b5c WHIRLPOOL fd5f321a8a89381904b1dd1f5acb5100186ce48cccc9b248cf68b35a1c1932177df1fc2b0215131999ee6018decf3264c45e54d407bf4b74ff8e4cc8215c630a
 DIST bash-4.3.tar.gz 7955839 SHA256 afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 SHA512 a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 WHIRLPOOL d82eb296b1bdee517b20e40d2231697dc41e2040d34e2da24c4fa40755c723d732929805ebef6f6923cd8ffecfb0db7063ec1dc3ab4e695a93916f2d872e236f
-DIST bash-4.4-rc1.tar.gz 8856234 SHA256 54838ce0e9db6a8920d4c9f6563fd74dac45d3d3c14c8df4cf7ceb68a91e244b SHA512 14862599fc5cdfae00ba9e5a047bf9321e89276a1879a6334fd9c9bd43597ecb48b568f1bd17f3be8bef0a0f572fc63edddec31b106e81c0552127970a069a7b WHIRLPOOL 3623014c39333d12a61e0d32e42ef246b4869b72ad3d6bfb9dd523832a3578056376ce37c795a71bb5bb8e9999aab59773b74a109163f0e1876daf61e3d15363
+DIST bash-4.4-beta2.tar.gz 8932859 SHA256 3a8c4aa40f9ba6c311f4f6a637ae290c0148b828617b0a263a416ba923111f51 SHA512 77fbb9fbc184f178a65600532699cd61d34c923d80f4630a774ad13e1a6648a492644a3b92021722b69b42e9686580586194be7572d162bfc3f336ef4b8f8294 WHIRLPOOL 01782617960e8848c1c0486a748268a197fdf9ce9e9a431d937499b819b145e706ae34d0f2f112096353f4c0bdff3838b38f82bd2a4e8da194270cbee0bfe4b8
 DIST bash205b-001 1132 SHA256 bf7a055e0916b7899e7429e36e35d009db445b942b34520a601ea5a8fa634fdd SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071 WHIRLPOOL 90ba36843bbf2e0b7279d3bd197ddaa04e03e113be32051e5a77280cda6d43dcbf339780c57322fc0835a54c82e0095f0d3f2a13f13fec8c0b8da38e7e9b253a
 DIST bash205b-002 755 SHA256 affdd1808a6262fbfe291ebffa2133b05e4bb46067a90e3329d5741e10f0587b SHA512 46947b0229478d5c2cfeff68b8ebc00e4ef0c8b94e336ca12f72b4490ba3622c0240c01c17c1641c3b07adc2c64ec94d6d780365e8990768ec8888f3a9526883 WHIRLPOOL 7333910e98e517306077937881d4c5569ddd85552203b3ec833f0fda13822e388ce85f007d60e4ab4b1ef15abb66fa40dc4356ca01367463d179a6a23bcff8e7
 DIST bash205b-003 2356 SHA256 604972eaafe69f44413d429e0a826b0eae209ca74b14eeeccdf0d502bbabb340 SHA512 74528ca5d165b812d299f1c69b47757bd677c0b22ce4217e155cd641708b02364a93c6709fb57b546b376b36da74429a61493921c7c199563da40ddcf1c1f399 WHIRLPOOL 7ce09fb66d32f3aebda7fb2be66179daab033b4c08ea51c744148051b47e7effc2451971efeb14d6a403c48c5c46c2ac0a4585159f8115ec40b2bfa89f98317f
--- a/app-shells/bash/bash-4.4_beta2.ebuild
+++ b/app-shells/bash/bash-4.4_beta2.ebuild
@ -74,6 +74,8 @@ src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)

+	epatch "${FILESDIR}"/${PN}-4.4-assign-crash.patch
+
 	# Clean out local libs so we know we use system ones w/releases.
 	if [[ ${PV} != *_rc* ]] ; then
 		rm -rf lib/{readline,termcap}/*
@ -100,7 +102,6 @@ src_configure() {
 		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
 		-DNON_INTERACTIVE_LOGIN_SHELLS \
 		-DSSH_SOURCE_BASHRC \
-		-DUSE_MKTEMP -DUSE_MKSTEMP \
 		$(use bashlogger && echo -DSYSLOG_HISTORY)

 	# Don't even think about building this statically without
--- a/app-shells/bash/files/bash-4.4-assign-crash.patch
+++ b/app-shells/bash/files/bash-4.4-assign-crash.patch
@ -0,0 +1,36 @@
+http://lists.gnu.org/archive/html/bug-bash/2016-07/msg00066.html
+
+From: Andreas Schwab <schwab@suse.de>
+To: bug-bash@gnu.org
+Subject: a=$* -> crash
+Date: Wed, 27 Jul 2016 13:59:22 +0200
+Message-ID: <mvmbn1j2sx1.fsf@hawking.suse.de>
+
+(gdb) r
+Starting program: /bin/bash -c a=\$\*
+
+Program received signal SIGSEGV, Segmentation fault.
+quote_string (string=string@entry=0x0) at subst.c:3940
+3940      if (*string == 0)
+
+diff --git a/subst.c b/subst.c
+index 37d96f9..16ae3f0 100644
+--- a/subst.c
+++ b/subst.c
+@@ -8575,7 +8575,7 @@ param_expand (string, sindex, quoted, expanded_something,
+ 	      /* If we're not quoted but we still don't want word splitting, make
+ 		 we quote the IFS characters to protect them from splitting (e.g.,
+ 		 when $@ is in the string as well). */
+-	      else if (quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS))
+	      else if (temp != 0 && quoted == 0 && ifs_is_set && (pflags & PF_ASSIGNRHS))
+ 		{
+ 		  temp1 = quote_string (temp);
+ 		  free (temp);
+
+Andreas.
+
+-- 
+Andreas Schwab, SUSE Labs, schwab@suse.de
+GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
+"And now for something completely different."
+
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@ -1 +1,2 @@
 DIST atril-1.10.3.tar.xz 2106560 SHA256 2680279137307fe68500ed5006f70bf73a2dd15536dee0592cb77d031d6e3a90 SHA512 8b083aaced82a10cfd7b0d0e5342b23c99ef868da3b2376b547a252659cbe9e3669344515b98ecee046e3011ee7cd5028154a87bd198c92ba577953483107002 WHIRLPOOL 94b3679cedc9b57e35be963458c0f0d8c0c1865a4021c403cf03943824a278013f1b4feaf14d9cc2903768fc6247bea84e1e028be05c46c53047df37899246da
+DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226 SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec WHIRLPOOL 8eb8a0cd40c0c3d21141493a09b3dc8f2c4d902fff1ed80fe5468b1ac342c81312518c015cbd288372f228bc4bb91bb1555af8f8b5842e72e4eb895fc787988c
--- a/app-text/atril/atril-1.12.2-r3.ebuild
+++ b/app-text/atril/atril-1.12.2-r3.ebuild
@ -0,0 +1,95 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+RDEPEND=">=app-text/poppler-0.16:0=[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.0:0 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+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.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-matedesktop \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`LIBGUESTFS_PATH=/usr/share/guestfs/appliance/`