Sync with portage [Tue Aug 15 05:57:32 MSK 2017].

7 years ago · 133fd57603
parent e9e4997473
commit 133fd57603
1626 changed files with 12703 additions and 21037 deletions
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@ -1,3 +1,3 @@
-DIST filebeat-5.2.2.tar.gz 16489808 SHA256 45c89fab339de3d3e7f9a83c7a48312ede147d5989b67b8619d9128353c891c3 SHA512 7cf54eb0b27d830e51bf97964f078874eae62e1d9642fb598cdd2f0a405db4a74e1f299c5e57e29a67cfea209b9b3c7f38bdcbe6b2e2885285b77615236971c1 WHIRLPOOL 3a708a799b3360cee12a58d858bd51f474fb86c143c6648edd451d2862ce05ae0bc9544ceef62ddbf05bc50c439a7ee041faef70214ced3e53e16e8452a9f486
 DIST filebeat-5.3.2.tar.gz 17595133 SHA256 e8c765531276e4731c5148bd99fad1efc799f3ec68e1d32a2fe116995f2b9e2f SHA512 080d079a063641e3688cc9f1563517e9a314ca834b0fa90fe12d455f984bb83282243736ecf17a7e62214034b71d373afc503d3bc5ff3d106ef5965ce00c3543 WHIRLPOOL ef6aee18d24e2b25439485121f30af2ff4d76c4ac2fe97acd1f6ec70d27c8a49ce9c3323baaa2305f56f20dea0118c970458c0cb8bfa05bc0227fdb3987f1478
 DIST filebeat-5.4.3.tar.gz 18074275 SHA256 a7714383de1a610c7318e8a2751a230b64c8ca243058abd59b1886aabcc3965b SHA512 8c193894898a5a07e622a56ef37aba77b57559bc0a66e017e22980ae1e1c5057f4629b25aaa65fb85c8b7a74759b6f6d1e1b8b9df1bfe626e58a3fdb264267b9 WHIRLPOOL 804a28cf4f664a3356c19f0a988921cb01c7a2e05566915b3020dd1884d98e014ff9adc23cd5d1e0d947e0c14c54ccdfeef67bff6454cbd4dd153b6ddcfa070c
+DIST filebeat-5.5.1.tar.gz 18075818 SHA256 b6c85901b1feb0e184dd56d9012ccda10bf62566ddfbe3d9790c771b73db3a46 SHA512 b77b241afd747298a91242a8040958ab8cfa343df9ab192c11361947d0b633bc192f45f1ae27987324ce2ea3f5b6f4f0dcb521cb684efa349db59a56f0fd6818 WHIRLPOOL 42b1eecd93f76e9fe4c4a4edfffdb5ff54b984f5b179a55f0ddec7883af90404c00695baac7c97fc69d543952eadfd5fbc1eeb3a92367bd8ce6e6b9de682fa67
--- a/app-admin/filebeat/filebeat-5.5.1.ebuild
+++ b/app-admin/filebeat/filebeat-5.5.1.ebuild
@ -9,9 +9,9 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64 ~x86"

-DEPEND=">=dev-lang/go-1.7.1"
+DEPEND=">=dev-lang/go-1.8.3"
 RDEPEND="!app-admin/filebeat-bin"

 ELASTIC="${WORKDIR}/src/github.com/elastic"
@ -46,7 +46,7 @@ src_install() {
 	doins ${PN}/{filebeat.yml,filebeat.full.yml}

 	insinto "/etc/${PN}"
-	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json}
+	doins ${PN}/{filebeat.template.json,filebeat.template-es2x.json,filebeat.template-es6x.json}

 	exeinto "/usr/share/${PN}"
 	doexe libbeat/scripts/migrate_beat_config_1_x_to_5_0.py
--- a/app-admin/kedpm/Manifest
+++ b/app-admin/kedpm/Manifest
@ -1 +0,0 @@
-DIST kedpm-0.4.0.tar.gz 61636 SHA256 f1dfb44a990110fddf132c9841f40aa2b9848ade4be56957a8a572574dc2fc28 SHA512 f6d73d4aab2b9184774e4a109bdf7401b96d9d9417e30a30d34958b9bee709e46676d68bb82e401b10b2eb32c56b6c8b1bb3947880cafb6e11d644d7f718a0f5 WHIRLPOOL 0a531e29ab66849fc5098ea8838bf53df340135650f312d5b1dc38231cddf797f02d3c3f8e2157b909bf954af5a65115d7814ba475924432a38d2b89341cf2df
--- a/app-admin/kedpm/files/kedpm.desktop
+++ b/app-admin/kedpm/files/kedpm.desktop
@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Ked Password Manager
-GenericName=Password Manager
-GenericName[ca]=Gestor de contrasenyes
-GenericName[es]=Gestor de contraseñas
-Comment=Manage passwords and related information
-Comment[ca]=Gestioneu contrasenyes i informació relacionada
-Comment[es]=Gestiona contraseñas e información relacionada
-Exec=kedpm
-Icon=/usr/share/kedpm/glade/logo.png
-Terminal=false
-Type=Application
-Categories=GNOME;Utility;
-StartupNotify=true
-MimeType=application/xml;
--- a/app-admin/kedpm/files/setup-doc.patch
+++ b/app-admin/kedpm/files/setup-doc.patch
@ -1,12 +0,0 @@
--- setup.py	2004-02-29 12:45:48.000000000 +0100
-+++ setup.py	2004-03-29 08:47:15.886238864 +0200
-@@ -52,8 +52,7 @@
-         url="http://kedpm.sourceforge.net/",
-         packages=['kedpm', 'kedpm.plugins', 'kedpm.frontends', 'kedpm.frontends.gtk'],
-         scripts=['scripts/kedpm'],
-        data_files=[(os.path.join('share', 'kedpm'), ['AUTHORS', 'COPYING', 'INSTALL']),
-            (os.path.join('share', 'kedpm', 'glade'),
-+        data_files=[(os.path.join('share', 'kedpm', 'glade'),
-                 [os.path.join('glade', 'kedpm.glade')] +
-                 glob(os.path.join('glade', '*.png'))
-                 )],
--- a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Helps to manage large amounts of passwords and related information"
-HOMEPAGE="http://kedpm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk"
-
-DEPEND="dev-python/pycrypto[${PYTHON_USEDEP}]
-	gtk? ( >=dev-python/pygtk-2[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS CHANGES NEWS )
-
-python_prepare_all() {
-	# We want documentation to install in /usr/share/doc/kedpm
-	# not in /usr/share/kedpm as in original setup.py.
-	local PATCHES=(
-		"${FILESDIR}/setup-doc.patch"
-	)
-
-	# If we don't compiling with GTK support, let's change default
-	# frontend for kedpm to CLI.
-	use gtk || sed -i -e 's/"gtk"  # default/"cli"  # default/' scripts/kedpm
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" run_tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# menu item
-	domenu "${FILESDIR}/${PN}.desktop"
-}
--- a/app-admin/kedpm/metadata.xml
+++ b/app-admin/kedpm/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>key storing program</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">kedpm</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch
+++ b/app-arch/dump/files/dump-0.4.44-fix-pointers-aliasing.patch
@ -1,126 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3322910&group_id=1306&atid=301306
-
-=== modified file 'dump/tape.c'
--- dump/tape.c	2011-06-20 07:22:40 +0000
-+++ dump/tape.c	2011-06-20 07:57:11 +0000
-@@ -1281,9 +1281,9 @@
- 			compresult = 1;
- #ifdef HAVE_ZLIB
- 			if (zipflag == COMPRESS_ZLIB) {
-				compresult = compress2(comp_buf->buf, 
-+				compresult = compress2((Bytef *)comp_buf->buf, 
- 						       &worklen,
-						       (char *)slp->tblock[0],
-+						       (Bytef *)slp->tblock[0],
- 						       writesize, 
- 						       compressed);
- 				if (compresult == Z_OK)
-@@ -1313,8 +1313,9 @@
- #ifdef HAVE_LZO
- 			if (zipflag == COMPRESS_LZO) {
- 				lzo_uint worklen2 = worklen;
-				compresult = lzo1x_1_compress((char *)slp->tblock[0],writesize,
-                                                              comp_buf->buf,
-+				compresult = lzo1x_1_compress((lzo_bytep)slp->tblock[0],
-+                                                              writesize,
-+                                                              (lzo_bytep)comp_buf->buf,
- 							      &worklen2,
-                                                               LZO_WorkMem);
- 				worklen = worklen2;
-
-=== modified file 'dump/traverse.c'
--- dump/traverse.c	2011-06-20 07:22:40 +0000
-+++ dump/traverse.c	2011-06-20 07:57:11 +0000
-@@ -782,13 +782,13 @@
- 	for (i = p->next_block; i < blockcnt; i++) {
- 		p->buf[p->cnt++] = 0;
- 		if (p->cnt == p->max) {
-			blksout (p->buf, p->cnt, p->ino);
-+			blksout ((blk_t *)p->buf, p->cnt, p->ino);
- 			p->cnt = 0;
- 		}
- 	}
- 	p->buf[p->cnt++] = *blocknr;
- 	if (p->cnt == p->max) {
-		blksout (p->buf, p->cnt, p->ino);
-+		blksout ((blk_t *)p->buf, p->cnt, p->ino);
- 		p->cnt = 0;
- 	}
- 	p->next_block = blockcnt + 1;
-@@ -868,14 +868,15 @@
- void
- dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
- {
-+	fsizeT remaining;
-+	char buf[TP_BSIZE];
-+	struct new_bsd_inode nbi;
-+	int i;
-+#ifdef	__linux__
-+	struct block_context bc;
-+#else
- 	unsigned long cnt;
-	fsizeT size, remaining;
-	char buf[TP_BSIZE];
-	struct new_bsd_inode nbi;
-	int i;
-#ifdef	__linux__
-	struct block_context bc;
-#else
-+	fsizeT size;
- 	int ind_level;
- #endif
- 	u_quad_t i_size;
-@@ -1001,13 +1002,13 @@
- 		for (i = 0; i < (int)howmany(remaining, sblock->fs_fsize); i++) {
- 			bc.buf[bc.cnt++] = 0;
- 			if (bc.cnt == bc.max) {
-				blksout (bc.buf, bc.cnt, bc.ino);
-+				blksout ((blk_t *)bc.buf, bc.cnt, bc.ino);
- 				bc.cnt = 0;
- 			}
- 		}
- 	}
- 	if (bc.cnt > 0) {
-		blksout (bc.buf, bc.cnt, bc.ino);
-+		blksout ((blk_t *)bc.buf, bc.cnt, bc.ino);
- 	}
- 	free(bc.buf);
- 	dump_xattr(ino, dp);
-@@ -1016,7 +1017,7 @@
- 		cnt = NDADDR * sblock->fs_frag;
- 	else
- 		cnt = howmany(i_size, sblock->fs_fsize);
-	blksout(&dp->di_db[0], cnt, ino);
-+	blksout((blk_t *)&dp->di_db[0], cnt, ino);
- 	if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0) {
- 		dump_xattr(ino, dp);
- 		return;
-
-=== modified file 'restore/tape.c'
--- restore/tape.c	2011-06-20 07:22:40 +0000
-+++ restore/tape.c	2011-06-20 07:57:11 +0000
-@@ -2335,8 +2335,10 @@
- #ifndef HAVE_ZLIB
- 			errx(1,"This restore version doesn't support zlib decompression");
- #else
-			cresult = uncompress(comprbuf, &worklen, 
-					     tpbin->buf, blocklen);
-+			cresult = uncompress((Bytef *)comprbuf,
-+			                     &worklen, 
-+					     (Bytef *)tpbin->buf,
-+					     blocklen);
- 			output = comprbuf;
- 			switch (cresult) {
- 				case Z_OK:
-@@ -2397,8 +2399,8 @@
- 			errx(1,"This restore version doesn't support lzo decompression");
- #else
- 			lzo_uint worklen2 = worklen;
-			cresult = lzo1x_decompress(tpbin->buf, blocklen,
-                                                   comprbuf, &worklen2, NULL);
-+			cresult = lzo1x_decompress((lzo_bytep)tpbin->buf, blocklen,
-+                                                   (lzo_bytep)comprbuf, &worklen2, NULL);
- 			worklen = worklen2;
- 			output = comprbuf;
- 			switch (cresult) {
-
--- a/app-arch/dump/files/dump-0.4.44-rl_completion_matches-detection.patch
+++ b/app-arch/dump/files/dump-0.4.44-rl_completion_matches-detection.patch
@ -1,24 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3322906&group_id=1306&atid=301306
-
-=== modified file 'configure.in'
--- configure.in	2011-06-20 07:22:40 +0000
-+++ configure.in	2011-06-20 07:56:19 +0000
-@@ -516,7 +516,7 @@
- dnl
- dnl Check for rl_completion_matches
- dnl
-AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], "-ltermcap")
-+AC_CHECK_LIB(readline, rl_completion_matches, [rlcm=yes], [rlcm=no], [$rdllib])
- if test "$rlcm" = yes; then
- 	AC_DEFINE([HAVE_READLINE_RLCM],1,[Define this if your readline libs have the rl_completion_matches library.])
- fi
-@@ -524,7 +524,7 @@
- dnl
- dnl Check for rl_completion_append_character
- dnl
-AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], "-ltermcap")
-+AC_CHECK_LIB(readline, rl_completion_append_character, [rcac=yes], [rcac=no], [$rdllib])
- if test "$rcac" = yes; then
- 	AC_DEFINE([HAVE_READLINE_CAC],1,[Define this if your readline libs have the rl_completion_append_character variable.])
- fi
-
--- a/app-arch/dump/files/dump-0.4.44-sysmacros.patch
+++ b/app-arch/dump/files/dump-0.4.44-sysmacros.patch
@ -1,12 +0,0 @@
-https://bugs.gentoo.org/580204
-
--- a/restore/tape.c
-+++ b/restore/tape.c
-@@ -65,6 +65,7 @@
- #include <sys/un.h>
- 
- #ifdef	__linux__
-+#include <sys/sysmacros.h>
- #include <sys/time.h>
- #include <time.h>
- #ifdef HAVE_EXT2FS_EXT2_FS_H
--- a/app-arch/dump/files/dump-0.4.44-underlinking.patch
+++ b/app-arch/dump/files/dump-0.4.44-underlinking.patch
@ -1,31 +0,0 @@
-diff --git a/MCONFIG.in b/MCONFIG.in
-index 64cb016..f5d1012 100644
--- a/MCONFIG.in
-+++ b/MCONFIG.in
-@@ -40,7 +40,7 @@ GINC+=		@EXT2FS_CFLAGS@
- # indicate where the ext2fs library can be found (this is not needed if you
- # have run `make install-libs' in the e2fsprogs source directory).
- #GLIBDIR=	-L/usr/src/e2fsprogs-0.5c/lib
-GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@
-+GLIBS=		$(GLIBDIR) -L../compat/lib -lcompat @EXT2FS_LIBS@ @COM_ERR_LIBS@
- 
- #
- # Definitions (don't change them unless you know what you are doing)
-diff --git a/configure.in b/configure.in
-index 2d69157..c8a9e04 100644
--- a/configure.in
-+++ b/configure.in
-@@ -414,11 +414,12 @@ fi
- if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
- 	AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
- fi
-+PKG_CHECK_MODULES(COM_ERR, [com_err])
- 
- dnl
- dnl Check for ext2fs_read_inode_full
- dnl
-AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [-lcom_err])
-+AC_CHECK_LIB(ext2fs, ext2fs_read_inode_full, [rif=yes], [rif=no], [$COM_ERR_LIBS])
- if test "$rif" = yes; then
- 	AC_DEFINE([HAVE_EXT2FS_READ_INODE_FULL],1,[Define this if your ext2fs libs have the ext2fs_read_inode_full function.])
- fi
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@ -1,9 +1,12 @@
 DIST rarlinux-5.5.0_beta4_p20170628.tar.gz 544409 SHA256 08c76882c42352ce36dd7cc78ce629a875889dbed41c713af078dbc4fe721073 SHA512 41c1da62995fab00421f788cb65dda3c5e1eb265fe1f4cd6a3bf4f9c28c63c39e4a0aa654f93ae444833c5c17397ee0beb98a6e02a515371ae245ac215d618b6 WHIRLPOOL e7c9c3a47deb1524aad46063fae486adadfd36850c42929494a83c05c86108e0c7da496da13114f72cbe32ca7791545cb43c1bff53b0fcd789357eda901e2511
 DIST rarlinux-5.5.0_beta5_p20170706.tar.gz 546152 SHA256 d94cfc792b3bf7ad90c428d3a2749f9f267a7809a5de33de11a99386631089d5 SHA512 6440c0bf17e11370216114c8fab3994779930b10a813fe3c4195cee9d23bce239cb4575ccfee319842059688c744e91496b7e9de98eae98d98beb4884e8e84ad WHIRLPOOL 668de3befd4fac0f2be6a307c7161a57cff3bc7915d4bb796bf32c24c9278ed1eb4734e645d2668555bdb566f5ec60c11eb1cd7cbcafdd36d94651a6e19611b3
 DIST rarlinux-5.5.0_beta6_p20170725.tar.gz 547172 SHA256 dae91da11e75aa592bf0332fad9e8df437a079fbd2b9727eb385b89c634ea9ae SHA512 7f74d55027313b2315c911e064af1bc0934d64b63db7d483c9373a2777a53b2116e44625403f99a91b33154accf31c57fdb6acfcb7a7e4960dbb89b605dd0c8a WHIRLPOOL 1efc0dea28ac9975028899208d647efbd7e8c32cd91b0c48478a3c497a2404f68b913a853fa36db8d1dea9fbbc13658e918214912b45751203df5bb3ad0c3060
+DIST rarlinux-5.5.0_p20170811.tar.gz 546839 SHA256 09af93f7d8c39baf8200fddfe507ca416a9f11cbe30a41b8d1346fa1cf3fdb0e SHA512 c437d0be55ea90ae1dd9d657517d17d9edbba07cd77325785d8d503883847edeece2cc3993d3beec3a5b36b6830383b7026fbfc53b18f490288395994bc532cb WHIRLPOOL 6f06d00a3e4908366fe3f7f68f45f0ad59c9f2d50f77a096dfadb671bf6653141e1f3e99be1afd3f6336a4fcc56a99e2ef3827cc9cb55bbfdd24e6aff16543a1
 DIST rarlinux-x64-5.5.0_beta4_p20170628.tar.gz 534501 SHA256 5efa3b24b9f4b5aff2538f13c4d6ecae766a54badeb06d12387cbbcc1ca85608 SHA512 630033f9a5201d53ecb8796651b89caf7351b09e37087e071fc14c4c683fd32404322e80a71f6f1e6e449f264c0209d8ce7ad554c37420dfb764f091188ced2e WHIRLPOOL 17904bffb07da1670d2fc0359c0dfc116330ce938cb6dd150e6d9608e89723875d05322e26f2a803946da2a7eaae0ae8c693750964b908061be405d1da3a68a3
 DIST rarlinux-x64-5.5.0_beta5_p20170706.tar.gz 535846 SHA256 68f2dbae2b0fd714a5c9a73369af26c8a186f910c4c7d094e39c456543eabe3c SHA512 09ce316774b6a0a4a54cd2db5fd87f266d203cc97a893ba88ed9573df3a0e068408e0715267121a9434bea4be9c6187bfe51d114b086d4bb792f26644ae8ec86 WHIRLPOOL 751926132a81fba209898d197146ef57afd7d6e698af02fb755c8f5fc191ac02de2fe6a90e0c298413e6e0610a3c1579276115bab5762010488a650b2e374ea2
 DIST rarlinux-x64-5.5.0_beta6_p20170725.tar.gz 536054 SHA256 01e8146063319439df6efbda06b9a31e9bb8c9cebd3c1b61bada95d708f065f3 SHA512 9f6adaabe0e1f05778fa3d5265692c3b0af4216c08eea23b637d69dd24fbbb113aaa213105a9be26d7c4e4de43df60a45cbc630f78c520699d82807559b20671 WHIRLPOOL 6064181a986c8c695a8fe7aedd3104750556f67716c6b9d1a6a54bbe33188a2700af57659560307e63ff94e4006d5f77bbc65be23ad0a8ca1e883710f2182fbe
+DIST rarlinux-x64-5.5.0_p20170811.tar.gz 536028 SHA256 798fa2815f62062eb2e7ca3750fcf30a9af212998f29738a33f12d819e866c4f SHA512 1ca8cf7fbe526b43bdc9aeeccb6a0d86efd3bbaeee554e807d58ab62857294abc89662bb42b17b2cfe7e6739876c6345455cd027abbc4cb84312c58314278a66 WHIRLPOOL 590d482caa7c50ff9b5ba99d06a2f34930327ed39a3ddb24d88c4b949e9be4caa95f6131758c63b4cdf0b02bb63ecce36e26597b5c30c7817c4ed45a204d9c0e
 DIST winrar-x64-5.5.0_beta4_p20170628.exe 2212800 SHA256 bf4dcf7c42ecb9028a2106297ebd6739fb75194c262e1f0ea7823ceaceccc8c8 SHA512 5a452d5a4f96dc240b1a04d690ced1ed6395857e1eafce8bcb91a3fe1feb60a54376b36c1d4117e6660556947bda6cf550e9a495842bdba4d6029ddeb17116c1 WHIRLPOOL 5f91b1b9eb8a0563c969b09027ad7197cc0d5586f8cddae0b0ce44a1d45489ba3461792f639a86c7829f7437b0dc9f0e14019cb5029f854ac65ff51f111eb79a
 DIST winrar-x64-5.5.0_beta5_p20170706.exe 2215544 SHA256 3e566c006b4941318597f9e47c3b5161ee4e944cd12b4ec9a38622f96e1af0a8 SHA512 c64ca0b992245ab402872b44b037ba499e00d452dae695ad6b49bf6cb497b24154171b1b2bd8978c32c740d59c0da89fe0c1e56bb95714afe7ac529264371ab8 WHIRLPOOL 610acf4ebb67100a335bc7a70be2c69cf8a828df84a0ac90392451efd760e2e0f701a795993b43520763c5d1c9e0556426feabdebfb7841b589604b95256fa3b
 DIST winrar-x64-5.5.0_beta6_p20170725.exe 2217944 SHA256 49cfd01faf509a874d2d3a4c14bd1c0a27670e918a2eb00b6b75c5a35f37f5a9 SHA512 d0a777491018300e417da4acc0dd3998c7a7009c9f6b51f34d26d5cdb4b8dde09c06e3231ba44942deae4aeec5d8425b67bc93960fb65bcc41dfbdc02f41c88e WHIRLPOOL 81aeb87a24d366dede805baecf18ad37b7aa93fab05bcff51d6966e088e4f02b87b370f045e7eecdba3c79ed8bd91947b393cc79061d5e9a18d630a7f69cf475
+DIST winrar-x64-5.5.0_p20170811.exe 2220872 SHA256 367d47ad48822caeedf73ce9f26a3a92db6f9f2eb18ee6d650806959b6d7d0a2 SHA512 f2aa40bb875be7f88cd618b1f5e02cfe0c5fb584f4e27d06531aaee018e613a70be7b7d3e8b92448381dc83605db6bf044cbecc52f63b6045193fef07601be66 WHIRLPOOL d3a54d02d9218220705b1789f7cde0de455e1f5fb67c576ebfce72da9d08106ab47b4d60af7bd3ea3de394ebe20112a111edd4847e84e606b5d0c4a40d5d9124
--- a/app-arch/rar/rar-5.5.0_p20170811.ebuild
+++ b/app-arch/rar/rar-5.5.0_p20170811.ebuild
@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="http://www.rarsoft.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar || die
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar || die
+	dosym ../rar/unrar /opt/bin/unrar || die
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+	else
+		doins default.sfx || die
+	fi
+	doins rarfiles.lst || die
+	dodoc *.txt
+}
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -1,4 +1,5 @@
 DIST unrar-5.5.5.tar.gz 220377 SHA256 a4553839cb2f025d0d9c5633816a83a723e3938209f17620c8c15da06ed061ef SHA512 b0979641737e3ef18f6708cc19e335c312ac5c6e2a13206d5fed9a5564ac99042c45a842da95163e53c6415131a39a91e901aeb186016da2e3781164679a07ff WHIRLPOOL e22399e866fabeb6f0c1617ca6b8852cf1bd406c0e95e5480692fe33bed9a130dd678f93dde6401015928437b99949865a80b21774788fdb1c7a12e3175560f4
 DIST unrar-5.5.6.tar.gz 221099 SHA256 68a9d8f40c709b883bb15b21a9811907e56a07411d90aeaa992622ed9cf128c0 SHA512 591575ba573e7f1b658041595b8439c7f1f60d354bc2b0a6aa9d3be6340d4892b2752e8ce94a928cf0270a0e1c491ce3ee59b3c36167174c53cfd657b9c85837 WHIRLPOOL 5c43856c418fffccc1fe1202441b628a1491dc94873643044c9791947ebfeb21e281231c6ccacaa80df512d6f62cb9d0d1f555d53c1b7e2cae280e65ad8558d0
 DIST unrar-5.5.7.tar.gz 222293 SHA256 8aef0a0d91bf9c9ac48fab8a26049ac7ac49907e75a2dcbd511a4ba375322d8f SHA512 7dfad639df1f64db662a24b79fe77c7085096ad1d63de8f3e6ed01082334ac83e7bdf0572d2137e5fc11e261491da55b579b6fc50933a4cb3569c7fe972be5db WHIRLPOOL 94208650cc3e63fa5b121f3c2fe2d1c985a1d94589e4b57c13e2112b81c1ad959c4e5d149d4193b61cef98805ae1fecd88e80093ac0affd1b7769fc1e0121f99
+DIST unrar-5.5.8.tar.gz 222285 SHA256 9b66e4353a9944bc140eb2a919ff99482dd548f858f5e296d809e8f7cdb2fcf4 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa WHIRLPOOL 3e96f6073c93b28089b53f2b39016a98d0ffe243c7cb6262bf6bc0bac95daba005279f0c0d8a7fd717443891e932a4c0d31c19a02b9a5438ddc570f3812e2687
 DIST unrarsrc-5.4.5.tar.gz 226320 SHA256 e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c SHA512 ba2abf11638b5ee026cb9e0c3576c94376a01ab3c5411b9bd0e8116d64879c81e76df16f98d850f0f0f5387dda046f38be64ddfb4fe57431cc4d97066d6e3c2f WHIRLPOOL c8e035ec183f41d8faf8345b49d2a4d20e21f9c6e27f14d7794389942df4954cd66ab4a5be2fdff6d369b514ae99d5d015f35a36143d686563b2a8efdfc77dce
--- a/app-arch/unrar/unrar-5.5.8.ebuild
+++ b/app-arch/unrar/unrar-5.5.8.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="unRAR"
+# subslot = soname version
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.5.5-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
--- a/app-backup/snapback2/Manifest
+++ b/app-backup/snapback2/Manifest
@ -1 +0,0 @@
-DIST Snapback2-1.001.tar.gz 31099 SHA256 64512b0aae7df5bf80a74cc9e89c15fbe7c09aa435ea85d38f4b9f582aabecd2 SHA512 11d4a02fffd668f852e93554afbf7c76d1b06fd2cf88e3681489f206e8b1f8a21ae2b3718730f547660c4bcf3bef7eb358c4c809382199c864483ec9d4ab3983 WHIRLPOOL 790e847c2d5586ac104a6719f66b023ff28151b126e332a6d7bce7eda5c659e9f75675dc90c31fb1a4336099b40a1bcd4a00a0429afefeed0bdaa548a29e0072
--- a/app-backup/snapback2/metadata.xml
+++ b/app-backup/snapback2/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="cpan">Snapback2</remote-id>
-		<remote-id type="cpan-module">Backup::Snapback</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-backup/snapback2/snapback2-1.1.0-r1.ebuild
+++ b/app-backup/snapback2/snapback2-1.1.0-r1.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN=Snapback2
-MODULE_AUTHOR=MIKEH
-MODULE_VERSION=1.001
-inherit perl-module
-
-DESCRIPTION="Routines for support of rsync-based snapshot backup"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Config-ApacheFormat"
-
-#SRC_TEST=do
--- a/app-crypt/signing-party/signing-party-2.5.ebuild
+++ b/app-crypt/signing-party/signing-party-2.5.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"

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

 DEPEND="
--- a/app-crypt/yubikey-manager/metadata.xml
+++ b/app-crypt/yubikey-manager/metadata.xml
@ -8,6 +8,6 @@
  <longdescription>
    Yubikey Manager is a python library and command line tool for
    configuring any YubiKey over all USB transports. It's a CLI
-    successor of <pkg>app-crypt/yubikey-neo-manager</pkg>.
+    successor of yubikey-neo-manager.
  </longdescription>
 </pkgmetadata>
--- a/app-crypt/yubikey-neo-manager/Manifest
+++ b/app-crypt/yubikey-neo-manager/Manifest
@ -1,4 +0,0 @@
-DIST yubikey-neo-manager-1.1.0.tar.gz 119986 SHA256 eb8cc90bf4818feffe360d6330ebafa47452a1ce9c14900e13fcdd4cb921c837 SHA512 ee1bff88946be85cd3127a92deceb826b8bd35da76d3356993e1a369cb9119d6267a708a0023afeb185adcb1e4cdbaaa1c8983fd0cac32c51a4ece81840e8553 WHIRLPOOL a7123760c51333af30343b5dcff56398754aa4c214afdba75473d7555983aff9988d1ba0db5c12314170b0a810ed5d609cd3736258101198ab3b417133cd9957
-DIST yubikey-neo-manager-1.2.1.tar.gz 120802 SHA256 b09e59576dd6cb664966e4848854f728b8162ae74d35f87825d9a8bff07f018a SHA512 37b4807419803bb303b88b185293b49d5475c51d564614636ca1ead0c06efdb0ec867dac8de8b0030ab1ea85a726676bb63abdcc352428cb5a18068556a3b1b8 WHIRLPOOL e4a4e32d2d94dae0cf02abaff4bc9c2d281bc6bdf21d9dea76c2d6c05052a6a6bffc2955ee912bc5adb6ae070af3b10216691bfd9764b6895df7a3dedadb780b
-DIST yubikey-neo-manager-1.3.0.tar.gz 121242 SHA256 d8dba9ec6ee885af17b6c6b6b88fdd5df7b994cbee64946253a43713b12075c6 SHA512 fc5690d73fdc8cd1119c1c693bf31fd0b0f7145fa04af437d84e2f0f513798a88d44e80179d6b02f7641f61a9a1fd27d909518dfa1d881cc9ffb19cd5ad7c398 WHIRLPOOL 9c09bf133bb04926453ca05f41ca4d0825874b7320f2990743caa110330775cceb3049f7181788f1bbf2fae996e6c98df50760b9e8a5e7714a6c965bfb0013bd
-DIST yubikey-neo-manager-1.4.0.tar.gz 128002 SHA256 2fb8fc72982a8158379d2ac46802d26eb288bed09e33fe78df0a4c7844df5dc7 SHA512 a20d8168e38a1f55c140da9bd4c6c001a70f4f977edf8625475497aedd55d082a8ef0bfedb5c61350ac5658a3d0a086edf42743be9e960b2b5898d6925b416dc WHIRLPOOL f9caf73499f95f989e20e2b9e1525ca7f18ac28275b27a555e3839e238ace1cc26ee1bcf4d970b00b2ab6e814885ee42399b93bbf840f320578b66be3e7b1a92
--- a/app-crypt/yubikey-neo-manager/files/yubikey-neo-manager-fix-pyside-requirement.patch
+++ b/app-crypt/yubikey-neo-manager/files/yubikey-neo-manager-fix-pyside-requirement.patch
@ -1,17 +0,0 @@
-Description: Remove PySide requirement, since python-pyside does not register itself correctly
-Author: Dain Nilsson <dain@yubico.com>
-Forwarded: no
--- a/setup.py
-+++ b/setup.py
-@@ -44,8 +44,9 @@
-     entry_points={
-         'gui_scripts': ['neoman=neoman.__main__:main']
-     },
-    install_requires=['PySide', 'pycrypto'],
-    yc_requires=['ctypes', 'qt'],
-+    install_requires=['pycrypto'],
-+    yc_requires=['ctypes'],
-+    packages=['neoman', 'neoman.model', 'neoman.view', 'neoman.yubicommon', 'neoman.yubicommon.setup', 'neoman.yubicommon.ctypes', 'neoman.yubicommon.qt'],
-     cmdclass={'executable': executable, 'qt_resources': qt_resources('neoman')},
-     classifiers=[
-         'License :: OSI Approved :: BSD License',
--- a/app-crypt/yubikey-neo-manager/metadata.xml
+++ b/app-crypt/yubikey-neo-manager/metadata.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">Yubico/yubikey-neo-manager</remote-id>
-    <remote-id type="pypi">yubikey-neo-manager</remote-id>
-    <bugs-to>https://github.com/Yubico/yubikey-neo-manager/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0-r1.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.1.0.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1-r1.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1-r1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.2.1.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.3.0-r1.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.3.0-r1.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.3.0.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.3.0.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.0[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-DOCS=( NEWS README )
-
-python_test() {
-	nosetests || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman scripts/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/neoman-large.png neoman.png
-}
--- a/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.4.0.ebuild
+++ b/app-crypt/yubikey-neo-manager/yubikey-neo-manager-1.4.0.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Cross platform personalization tool for the YubiKey NEO"
-HOMEPAGE="https://developers.yubico.com/yubikey-neo-manager/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-CDEPEND="
-	dev-python/pyside[webkit,${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	app-crypt/libu2f-host
-	app-crypt/libykneomgr
-	sys-auth/ykpers"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-PATCHES=(
-	# PySide does not distribute egg-info, so remove it from deps
-	"${FILESDIR}"/${PN}-fix-pyside-requirement.patch
-)
-
-DOCS=( NEWS README )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/neoman.1
-	domenu resources/neoman.desktop
-	doicon resources/neoman.xpm
-	newicon -s 128 resources/yubikey-neo-manager.png neoman.png
-}
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5
@ -12,7 +12,7 @@ SRC_URI="http://prime.sourceforge.jp/src/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
 IUSE=""

 each_ruby_configure() {
--- a/app-editors/XML-XSH2/Manifest
+++ b/app-editors/XML-XSH2/Manifest
@ -1,2 +0,0 @@
-DIST XML-XSH2-2.1.26.tar.gz 353149 SHA256 cf2f070505ddc350b67c4522b43bc233e8468b36670890b672c8e01e7551f56e SHA512 2c4213e296aa786bc1b43ebc3656c4a0f750904884fd77721c540ad9e326d9081a18e4f30d75a89aacc28e8b672e3eff702080fc5c36ffcc8ea621dff49c07e4 WHIRLPOOL d132dde18cdd37f468fde7c7d8f62504a9d45aa790033230c2a2e85dfe27e26473001eac8edc7f1162602d839f43b4fe328a923c6023ee3ac4e029036aa1ce1f
-DIST XML-XSH2-2.1.6.tar.gz 322506 SHA256 6bd3d520db9b192e9d04b2fdb43ac54ebd945148e03d1e93dc4b9f39fa5dd551 SHA512 2ee992a50378a6f79327938cbd301eb49954d4dbf7c2815bc40f9f74d77eed4060a234f0369215375f34a495871c29ef17f60919f31fc9b192558945a9303b7b WHIRLPOOL 155137cb11204638b3aeedc46444797a0065e341fa29adaac3864b648206e3506561a9175838a61eb28c7b29262db6f6669694be660e2b4348d21e5b68b80f01
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.26.ebuild
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.26.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=CHOROBA
-inherit perl-module
-
-DESCRIPTION="Powerful scripting language/shell for XPath-based editing of XML"
-HOMEPAGE="http://xsh.sourceforge.net/"
-
-LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-perl/IO-stringy
-	>=dev-perl/Parse-RecDescent-1.940.0
-	virtual/perl-Term-ReadLine
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/URI
-	>=dev-perl/XML-Filter-DOMFilter-LibXML-0.30.0
-	>=dev-perl/XML-LibXML-1.600.0
-	dev-perl/XML-LibXML-Iterator
-	>=dev-perl/XML-LibXSLT-1.600.0
-	>=dev-perl/XML-SAX-Writer-0.440.0
-	>=dev-perl/XML-XUpdate-LibXML-0.6.0
-"
-DEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
--- a/app-editors/XML-XSH2/XML-XSH2-2.1.6-r1.ebuild
+++ b/app-editors/XML-XSH2/XML-XSH2-2.1.6-r1.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MODULE_AUTHOR=PAJAS
-MODULE_VERSION=2.1.6
-inherit perl-module
-
-DESCRIPTION="XML Editing Shell"
-HOMEPAGE="http://xsh.sourceforge.net/"
-
-LICENSE="|| ( Artistic GPL-2 )" # Artistic or GPL-2
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-perl/XML-LibXML-1.61
-	>=dev-perl/Parse-RecDescent-1.94
-	>=dev-perl/XML-LibXSLT-1.53
-	dev-perl/IO-stringy
-	dev-perl/XML-SAX-Writer
-	dev-perl/Term-ReadLine-Perl
-	dev-perl/URI
-	dev-perl/XML-Filter-DOMFilter-LibXML
-	>=dev-perl/XML-XUpdate-LibXML-0.4.0
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=do
--- a/app-editors/XML-XSH2/files/XML-XSH2-2.1.26-perl526.patch
+++ b/app-editors/XML-XSH2/files/XML-XSH2-2.1.26-perl526.patch
@ -1,12 +0,0 @@
-diff -ruN XML-XSH2-2.1.26.orig/Makefile.PL XML-XSH2-2.1.26/Makefile.PL
--- XML-XSH2-2.1.26.orig/Makefile.PL	2016-07-09 09:01:59.000000000 +0200
-+++ XML-XSH2-2.1.26/Makefile.PL	2017-07-08 23:26:00.426453212 +0200
-@@ -4,6 +4,8 @@
- 
- use ExtUtils::MakeMaker;
- 
-+use lib q[.];
-+
- $| = 1;
- 
- WriteMakefile(
--- a/app-editors/XML-XSH2/metadata.xml
+++ b/app-editors/XML-XSH2/metadata.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <!-- maintainer-needed -->
-    <upstream>
-        <remote-id type="cpan">XML-XSH2</remote-id>
-        <remote-id type="cpan-module">Parse::RecDescent::XML::XSH2::Parser</remote-id>
-        <remote-id type="cpan-module">XML::LibXML::Literal</remote-id>
-        <remote-id type="cpan-module">XML::LibXML::Namespace</remote-id>
-        <remote-id type="cpan-module">XML::LibXML::NodeList</remote-id>
-        <remote-id type="cpan-module">XML::LibXML::Number</remote-id>
-        <remote-id type="cpan-module">XML::LibXML::SubTreeIterator</remote-id>
-        <remote-id type="cpan-module">XML::SAX::Writer::XMLEnc</remote-id>
-        <remote-id type="cpan-module">XML::XSH2</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Compile</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Completion</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::CompletionList</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::DummyXPathContext</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::FilteredIterator</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Functions</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Grammar</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Help</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Inline</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Internal::Exception</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Internal::LoopTerminatingException</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Internal::SubTerminatingException</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Internal::UncatchableException</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Iterators</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::LibXMLCompat</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Map</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::Parser</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::VarAlias</remote-id>
-        <remote-id type="cpan-module">XML::XSH2::XPathToXML</remote-id>
-        <remote-id type="sourceforge">xsh</remote-id>
-    </upstream>
-</pkgmetadata>
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@ -1 +1,2 @@
 DIST gedit-3.22.0.tar.xz 2957520 SHA256 063b5a0b5dcc8f540f6e8c3ea1c22cf8a3a19edffc25315a1b6bc51d462b3f45 SHA512 7137fe96cca072c294dea545cb7fafee7ca2da84d8b7756e03a5f5dde6cdca8a3eec6f58136cec0aeeb49c294acd000f01bf3a44447411924aff107dbab26efb WHIRLPOOL 621a9ef89bdaafc490e6b05ac00d91978f175953c37c3d6c141b0513a99bc77b05907dab665d48022f56d0c6a8b9ad8e935c2279d58356d691490b16e533135e
+DIST gedit-3.22.1.tar.xz 2948048 SHA256 aa7bc3618fffa92fdb7daf2f57152e1eb7962e68561a9c92813d7bbb7fc9492b SHA512 7251732f353b1d9dab0fe447fe90b2259df34ff0694d8731ce3be531c21ac82ab6e7f4a07090aeef364640154f4ba6103539a253bc7942952dcf1e331418f0eb WHIRLPOOL 5bb12a567693107ae8b3fc625ae546b0d56e781fe4aa009f3a26ace56ab603bd1d4de80386584837563f8d77b173adf39e5850010a50d4eb3add82bbefb85445
--- a/app-editors/gedit/gedit-3.22.1.ebuild
+++ b/app-editors/gedit/gedit-3.22.1.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+GNOME2_LA_PUNT="yes" # plugins are dlopened
+PYTHON_COMPAT=( python3_{4,5} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 multilib python-single-r1 vala virtualx
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+introspection +python spell vala"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# X libs are not needed for OSX (aqua)
+COMMON_DEPEND="
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/glib-2.44:2[dbus]
+	>=x11-libs/gtk+-3.21.3:3[introspection?]
+	>=x11-libs/gtksourceview-3.21.2:3.0[introspection?]
+	>=dev-libs/libpeas-1.14.1[gtk]
+
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+
+	x11-libs/libX11
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
+	spell? ( >=app-text/gspell-0.2.5:0= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${COMMON_DEPEND}
+	${vala_depend}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+# yelp-tools, gnome-common needed to eautoreconf
+
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+	gnome2_src_configure \
+		--disable-deprecations \
+		--disable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable vala)
+}
+
+src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
+}
+
+src_install() {
+	local args=()
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
+}
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@ -1,2 +1,4 @@
 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
+DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e62f8841a7df33f436d1986dd7332fb5d07c60 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b WHIRLPOOL 8521b344426b5d2b246ddab7768eae45e0ee54ef58085099f9e15575e7854eb461fbcf0093caee1326e29d2425c2d451de36812cda24fa767709fc5d6046236c
+DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
--- a/app-editors/gvim/gvim-8.0.0938.ebuild
+++ b/app-editors/gvim/gvim-8.0.0938.ebuild
@ -0,0 +1,388 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk3? (
+			x11-libs/gtk+:3
+			x11-libs/libXft
+		)
+		!gtk3? (
+			gtk? (
+				>=x11-libs/gtk+-2.6:2
+				x11-libs/libXft
+				gnome? ( >=gnome-base/libgnomeui-2.6 )
+			)
+			!gtk? (
+				motif? ( >=x11-libs/motif-2.3:0 )
+				!motif? (
+					neXt? ( x11-libs/neXtaw )
+					!neXt? ( x11-libs/libXaw )
+				)
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl:0= )
+"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf=(
+		--with-features=huge
+		--disable-gpm
+		--enable-multibyte
+		$(use_enable acl)
+		$(use_enable cscope)
+		$(use_enable lua luainterp)
+		$(use_with luajit)
+		$(use_enable netbeans)
+		$(use_enable nls)
+		$(use_enable perl perlinterp)
+		$(use_enable python pythoninterp)
+		$(use_enable python python3interp)
+		$(use_enable racket mzschemeinterp)
+		$(use_enable ruby rubyinterp)
+		$(use_enable selinux)
+		$(use_enable session xsmp)
+		$(use_enable tcl tclinterp)
+	)
+
+	# --with-features=huge forces on cscope even if we --disable it. We need
+	# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+	if ! use cscope ; then
+		sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+			die "couldn't disable cscope"
+	fi
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk3                    GTK3
+	# -aqua -gtk3 gnome             GNOME2
+	# -aqua -gtk3 -gnome gtk        GTK2
+	# -aqua -gtk -gtk3 motif        MOTIF
+	# -aqua -gtk -gtk3 -motif neXt  NEXTAW
+	# -aqua -gtk -gtk3 -motif -neXt ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=(
+			--enable-darwin
+			--enable-gui=carbon
+		)
+	elif use gtk3 ; then
+		myconf+=( --enable-gtk3-check )
+		einfo "Building gvim with the gtk+-3 GUI"
+		myconf+=( --enable-gui=gtk3 )
+	elif use gtk ; then
+		myconf+=( --enable-gtk2-check )
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=( --enable-gui=gnome2 )
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=( --enable-gui=gtk2 )
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=( --enable-gui=motif )
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=( --enable-gui=nextaw )
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=( --enable-gui=athena )
+	fi
+	echo ; echo
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim \
+		--with-x \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
+	# this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim || die
+
+	# Make sure our VIMPROG is used.
+	sed -i 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
+
+	# Don't do additional GUI tests.
+	emake -j1 VIMPROG=../testvim -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	doicon -s scalable "${FILESDIR}"/gvim.svg
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# don't install vim desktop file
+	rm "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	xdg_desktop_database_update
+
+	# Update icon cache
+	gnome2_icon_cache_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@ -5,7 +5,7 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime gnome2-utils versionator bash-completion-r1 prefix python-single-r1
+inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 fi

@ -364,7 +364,7 @@ pkg_postinst() {
 	update_vim_helptags

 	# Update fdo mime stuff, bug #78394
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	# Update icon cache
 	gnome2_icon_cache_update
@ -378,7 +378,7 @@ pkg_postrm() {
 	update_vim_helptags

 	# Update fdo mime stuff, bug #78394
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update

 	# Update icon cache
 	gnome2_icon_cache_update
--- a/app-editors/mp/Manifest
+++ b/app-editors/mp/Manifest
@ -1 +0,0 @@
-DIST mp-5.2.2.tar.gz 583918 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f SHA512 44c9b7ded38c294ffc90240ac73848a799294584f20bb981d95f8dde4f281ea9242b6ff8aefdb490e9e02effaab6cbc5bdf94ea489af838a89038113c43da131 WHIRLPOOL 0feba9d14b0f0a5addf153e0ce4d4186b90392c78d2154200cea665880861cef07fdcbfc7d841ef736a3852d8523290d2f5fdbad87f1ab20894e2a32e9df78d7
--- a/app-editors/mp/files/mp-5.2.1-prll.patch
+++ b/app-editors/mp/files/mp-5.2.1-prll.patch
@ -1,46 +0,0 @@
--- mp-5.2.1/makefile.in
-+++ mp-5.2.1/makefile.in
-@@ -4,7 +4,7 @@ all: $(APPNAME) docs build-mo
- 
- PROJ=mp
- 
-ADD_DOCS=AUTHORS README COPYING RELEASE_NOTES \
-+ADD_DOCS=AUTHORS README RELEASE_NOTES \
- 	mp_templates.sample doc/mp_function_reference.html
- GRUTATXT_DOCS=doc/mp_index.html doc/mp_cookbook.html doc/mp_internals.html \
- 	doc/mp_configuration.html doc/mp_data_model.html \
-@@ -26,10 +26,10 @@ version:
- 	$(CC) $(CFLAGS) -I. `cat config.cflags` -c $<
- 
- $(MPDM)/libmpdm.a:
-	( cd $(MPDM); $(MAKE) )
-+	$(MAKE) -C $(MPDM)
- 
- $(MPSL)/libmpsl.a: $(MPDM)/libmpdm.a
-	( cd $(MPSL); $(MAKE) )
-+	$(MAKE) -C $(MPSL)
- 
- dep:
- 	gcc -MM *.c `cat config.cflags` > makefile.depend
-@@ -88,8 +88,8 @@ $(APPNAME).1: doc/mp_man.txt
- 	grutatxt -m man -t "Minimum Profit" < doc/mp_man.txt > $(APPNAME).1
- 
- docs: $(DOCS)
-	(cd $(MPDM); $(MAKE) docs)
-	(cd $(MPSL); $(MAKE) docs)
-+	$(MAKE) -C $(MPDM) docs
-+	$(MAKE) -C $(MPSL) docs
- 
- distcopy: distclean docs
- 	mkdir -p $(DIST_TARGET) ; \
-@@ -134,8 +134,8 @@ install: $(INSTALL_MSG) installdoc install-mo
- 
- installdoc:
- 	./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME)
-	( cd $(MPDM); $(MAKE) installdoc )
-	( cd $(MPSL); $(MAKE) installdoc )
-+	$(MAKE) -C $(MPDM) installdoc
-+	$(MAKE) -C $(MPSL) installdoc
- 	install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME)
- 	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME)
- 	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/$(APPNAME)/index.html || true
--- a/app-editors/mp/files/mp-5.2.2-gtk+.patch
+++ b/app-editors/mp/files/mp-5.2.2-gtk+.patch
@ -1,40 +0,0 @@
- mpv_gtk.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/mpv_gtk.c b/mpv_gtk.c
-index 3abba24..ea99144 100644
--- a/mpv_gtk.c
-+++ b/mpv_gtk.c
-@@ -2499,12 +2499,12 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
- #endif
-     gtk_notebook_set_scrollable(GTK_NOTEBOOK(file_tabs), 1);
- 
-    vbox = gtk_vbox_new(FALSE, 2);
-+    vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
-     gtk_container_add(GTK_CONTAINER(window), vbox);
- 
-     build_menu();
- 
-    hbox = gtk_hbox_new(FALSE, 0);
-+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-     gtk_box_pack_start(GTK_BOX(hbox), menu_bar, FALSE, FALSE, 0);
-     gtk_box_pack_start(GTK_BOX(hbox), file_tabs, TRUE, TRUE, 0);
-@@ -2512,7 +2512,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
-     gtk_notebook_popup_enable(GTK_NOTEBOOK(file_tabs));
- 
-     /* horizontal box holding the text and the scrollbar */
-    hbox = gtk_hbox_new(FALSE, 2);
-+    hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
-     gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
- 
-     /* the Minimum Profit area */
-@@ -2578,7 +2578,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
-                      G_CALLBACK(switch_page), NULL);
- 
-     /* the scrollbar */
-    scrollbar = gtk_vscrollbar_new(NULL);
-+    scrollbar = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, NULL);
-     gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0);
- 
-     g_signal_connect(G_OBJECT
--- a/app-editors/mp/metadata.xml
+++ b/app-editors/mp/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-editors/mp/mp-5.2.2.ebuild
+++ b/app-editors/mp/mp-5.2.2.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Minimum Profit: A text editor for programmers"
-HOMEPAGE="http://www.triptico.com/software/mp.html"
-SRC_URI="http://www.triptico.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="gtk iconv kde ncurses nls pcre qt4"
-
-MP_LINGUAS="de es it nl ru sv"
-for mp_lingua in ${MP_LINGUAS}; do
-	IUSE+=" linguas_${mp_lingua}"
-done
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses )
-	gtk? (
-		|| ( x11-libs/gtk+:3 x11-libs/gtk+:2 )
-		>=x11-libs/pango-1.8.0
-		dev-libs/atk
-		dev-libs/glib
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/cairo
-	)
-	!gtk? ( sys-libs/ncurses )
-	app-text/grutatxt
-	iconv? ( virtual/libiconv )
-	nls? ( sys-devel/gettext )
-	pcre? ( dev-libs/libpcre )
-"
-DEPEND="
-	${RDEPEND}
-	app-text/grutatxt
-	virtual/pkgconfig
-	dev-lang/perl
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gtk+.patch \
-		"${FILESDIR}"/${PN}-5.2.1-prll.patch
-	local mp_lingua
-	for mp_lingua in ${MP_LINGUAS}; do
-		if ! use linguas_${mp_lingua}; then
-			rm po/${mp_lingua/linguas_/}.[mp]o || die
-		fi
-	done
-	[[ $(ls po 2> /dev/null) ]] || \
-		sed \
-			-e '/^all/s:$(BUILDMO)::g' \
-			-e '/^install/s:$(INSTALLMO)::g' \
-			-i makefile.in || die
-}
-
-src_configure() {
-	local myconf="--prefix=${EPREFIX}/usr --without-win32"
-
-	if use gtk; then
-		! use ncurses && myconf="${myconf} --without-curses"
-	else
-		myconf="${myconf} --without-gtk2"
-	fi
-
-	use iconv || myconf="${myconf} --without-iconv"
-
-	use kde || myconf="${myconf} --without-kde4"
-
-	use nls || myconfig="${myconf} --without-gettext"
-
-	myconf="${myconf} $(use_with pcre)"
-	use pcre || myconf="${myconf} --with-included-regex"
-
-	use qt4 || myconf="${myconf} --without-qt4"
-
-	tc-export AR CC
-	sh config.sh ${myconf} || die "Configure failed"
-
-	for i in "${S}" "${S}"/mpsl "${S}"/mpdm;do
-		echo ${CFLAGS} >> $i/config.cflags
-		echo ${CFLAGS} >> $i/config.ldflags
-		echo ${LDFLAGS} >> $i/config.ldflags
-	done
-}
-
-src_compile() {
-	emake CPP="$(tc-getCXX)" CCLINK="$(tc-getCXX)"
-}
-
-src_install() {
-	dodir /usr/bin
-	sh config.sh --prefix="${EPREFIX}/usr"
-	emake DESTDIR="${D}" install
-}
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@ -1,2 +1,4 @@
 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
+DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e62f8841a7df33f436d1986dd7332fb5d07c60 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b WHIRLPOOL 8521b344426b5d2b246ddab7768eae45e0ee54ef58085099f9e15575e7854eb461fbcf0093caee1326e29d2425c2d451de36812cda24fa767709fc5d6046236c
+DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
--- a/app-editors/vim-core/vim-core-8.0.0938.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.0938.ebuild
@ -0,0 +1,217 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim and gvim shared files"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="nls acl minimal"
+
+DEPEND="sys-devel/autoconf"
+PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
+
+S=${WORKDIR}/vim-${PV}
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i -e \
+			'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	# Let Portage do the stripping. Some people like that.
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# Keep Gentoo Prefix env contained within the EPREFIX
+	use prefix && myconf+=" --without-local-dir"
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--enable-gui=no \
+		--without-x \
+		--disable-darwin \
+		--disable-perlinterp \
+		--disable-pythoninterp \
+		--disable-rubyinterp \
+		--disable-gpm \
+		--disable-selinux \
+		$(use_enable nls) \
+		$(use_enable acl) \
+		${myconf}
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake tools
+}
+
+src_test() { :; }
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	dodir /usr/{bin,share/{man/man1,vim}}
+	emake -C src \
+		installruntime \
+		installmanlinks \
+		installmacros \
+		installtutor \
+		installtutorbin \
+		installtools \
+		install-languages \
+		DESTDIR="${D}" \
+		BINDIR="${EPREFIX}"/usr/bin \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		DATADIR="${EPREFIX}"/usr/share
+
+	keepdir ${vimfiles}/keymap
+
+	# default vimrc is installed by vim-core since it applies to
+	# both vim and gvim
+	insinto /etc/vim/
+	newins "${FILESDIR}"/vimrc-r5 vimrc
+	eprefixify "${ED}"/etc/vim/vimrc
+
+	if use minimal ; then
+		# To save space, install only a subset of the files.
+		# Helps minimalize the livecd, bug 65144.
+		eshopts_push -s extglob
+
+		rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent}
+		rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor}
+		rm "${ED}"/usr/bin/vimtutor
+
+		local keep_colors="default"
+		ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
+
+		local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
+		# tinkering with the next line might make bad things happen ...
+		keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
+		ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
+
+		eshopts_pop
+	fi
+
+	# These files might have slight security issues, so we won't
+	# install them. See bug #77841. We don't mind if these don't
+	# exist.
+	rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
+
+	newbashcomp "${FILESDIR}"/xxd-completion xxd
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+}
--- a/app-editors/vim-core/vim-core-9999.ebuild
+++ b/app-editors/vim-core/vim-core-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=6
 VIM_VERSION="8.0"
-inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix
+inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
@ -11,8 +11,8 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@ -1,2 +1,4 @@
 DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 SHA256 9823a91b050eb4b001cc50f508d2ad03c7c256ed49183c1af7582318667f48d4 SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a WHIRLPOOL d6d01e3944d56762a2a999ee631f89e212360aa030ddd16ea96e32d518ec171e04d8565dcb89e804248d53e4c6e06b19be239ad2316ea88bb57364815b85d26b
 DIST vim-8.0.0386.tar.gz 13000882 SHA256 25b28f6ef55a8d0b3f255f0fbed90ad1450bde7f7b231cc09d86c5119adc95bc SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 WHIRLPOOL 99a5582e0db0dc53fd8385cddf1fbf13d2fe1dd5c8e33c9959288c19d4b85f50139791269edd4ec3d5cbed6548cc3d9c7962ec1706eb422a4ef83c207aac009b
+DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 SHA256 851418dbbbac25e581eeb44a24e62f8841a7df33f436d1986dd7332fb5d07c60 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b WHIRLPOOL 8521b344426b5d2b246ddab7768eae45e0ee54ef58085099f9e15575e7854eb461fbcf0093caee1326e29d2425c2d451de36812cda24fa767709fc5d6046236c
+DIST vim-8.0.0938.tar.gz 13287289 SHA256 7a07fb164069ce82e5c90ff3831b6f3249e09193800f76d9c576867a63828071 SHA512 be4b6a29ace6a708cd7d0d3a3585cd3b88056e49f3869e18c6b895272e4ec01a8a7a68695ec2f885dd1fc139ae022a3f1b2d2d11e8b883362b9683cf5a8b0cd3 WHIRLPOOL 5098cf73f8b294686888c8b5a31199044ec1f409cc9c3de39e96911f688374282716a3137827e260c97e688bb42e79a77c53a29fa7d3364ce2c3375c2257b309
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/metadata.xml
@ -8,9 +8,10 @@
  <use>
    <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
    <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
+    <flag name="terminal">Enable terminal emulation support</flag>
    <flag name="vim-pager">Install vimpager and vimmanpager links</flag>
    <flag name="X">Link console vim against X11 libraries to enable title and
-	  clipboard features in xterm</flag>
+      clipboard features in xterm</flag>
  </use>
  <upstream>
    <remote-id type="cpe">cpe:/a:vim:vim</remote-id>
--- a/app-editors/vim/vim-8.0.0938.ebuild
+++ b/app-editors/vim/vim-8.0.0938.ebuild
@ -0,0 +1,330 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VIM_VERSION="8.0"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE=threads
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1
+
+if [[ ${PV} == 9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vim/vim.git"
+else
+	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Vim, an improved vi-style text editor"
+HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
+REQUIRED_USE="
+	luajit? ( lua )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=app-eselect/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2:0=
+	nls? ( virtual/libintl )
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	cscope? ( dev-util/cscope )
+	gpm? ( >=sys-libs/gpm-1.19.3 )
+	lua? (
+		luajit? ( dev-lang/luajit:2= )
+		!luajit? ( dev-lang/lua:0[deprecated] )
+	)
+	!minimal? (
+		~app-editors/vim-core-${PV}
+		dev-util/ctags
+	)
+	perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )
+	racket? ( dev-scheme/racket )
+	ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.1 ) )
+	selinux? ( sys-libs/libselinux )
+	tcl? ( dev-lang/tcl:0= )
+	X? ( x11-libs/libXt )
+"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	# people with broken alphabets run into trouble. bug 82186.
+	unset LANG LC_ALL
+	export LC_COLLATE="C"
+
+	# Gnome sandbox silliness. bug #114475.
+	mkdir -p "${T}"/home
+	export HOME="${T}"/home
+
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if [[ ${PV} != 9999* ]] ; then
+		# Gentoo patches to fix runtime issues, cross-compile errors, etc
+		eapply "${WORKDIR}"/patches/
+	fi
+
+	# Fixup a script to use awk instead of nawk
+	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
+		|| die "mve.awk sed failed"
+
+	# Read vimrc and gvimrc from /etc/vim
+	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
+	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
+
+	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
+	# Hopefully this pattern won't break for a while at least.
+	# This fixes bug 29398 (27 Sep 2003 agriffis)
+	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
+		"${S}"/runtime/doc/syntax.txt \
+		"${S}"/runtime/doc/tagsrch.txt \
+		"${S}"/runtime/doc/usr_29.txt \
+		"${S}"/runtime/menu.vim \
+		"${S}"/src/configure.ac || die 'sed failed'
+
+	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
+	# this is NeXT, but it's actually just a file in dev-libs/9libs
+	# This fixes bug 43885 (20 Mar 2004 agriffis)
+	sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
+
+	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
+	# correctly. To avoid some really entertaining error messages about stuff
+	# which isn't even in the source file being invalid, we'll do some trickery
+	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
+	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
+
+	# conditionally make the manpager.sh script
+	if use vim-pager ; then
+		cat <<-END > "${S}"/runtime/macros/manpager.sh
+			#!/bin/sh
+			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
+					vim \\
+						-c 'let no_plugin_maps = 1' \\
+						-c 'set nolist nomod ft=man ts=8' \\
+						-c 'let g:showmarks_enable=0' \\
+						-c 'runtime! macros/less.vim' -
+			END
+	fi
+
+	# Try to avoid sandbox problems. Bug #114475.
+	if [[ -d "${S}"/src/po ]] ; then
+		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
+			"${S}"/src/po/Makefile
+	fi
+
+	if version_is_at_least 7.3.122 ; then
+		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
+	fi
+
+	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
+	if version_is_at_least 7.3 ; then
+		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
+			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf=()
+
+	# Fix bug 37354: Disallow -funroll-all-loops on amd64
+	# Bug 57859 suggests that we want to do this for all archs
+	filter-flags -funroll-all-loops
+
+	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
+	# everyone since previous flag filtering bugs have turned out to affect
+	# multiple archs...
+	replace-flags -O3 -O2
+
+	# Fix bug 18245: Prevent "make" from the following chain:
+	# (1) Notice configure.ac is newer than auto/configure
+	# (2) Rebuild auto/configure
+	# (3) Notice auto/configure is newer than auto/config.mk
+	# (4) Run ./configure (with wrong args) to remake auto/config.mk
+	sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
+	rm -f src/auto/configure
+	emake -j1 -C src autoconf
+
+	# This should fix a sandbox violation (see bug 24447). The hvc
+	# things are for ppc64, see bug 86433.
+	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
+		[[ -e ${file} ]] && addwrite $file
+	done
+
+	if use minimal ; then
+		myconf=(
+			--with-features=tiny
+			--disable-nls
+			--disable-multibyte
+			--disable-acl
+			--enable-gui=no
+			--without-x
+			--disable-darwin
+			--disable-luainterp
+			--disable-perlinterp
+			--disable-pythoninterp
+			--disable-mzschemeinterp
+			--disable-rubyinterp
+			--disable-selinux
+			--disable-tclinterp
+			--disable-gpm
+		)
+	else
+		use debug && append-flags "-DDEBUG"
+
+		myconf=(
+			--with-features=huge
+			--enable-multibyte
+			$(use_enable acl)
+			$(use_enable cscope)
+			$(use_enable gpm)
+			$(use_enable lua luainterp)
+			$(usex lua "--with-lua-prefix=${EPREFIX}/usr" "")
+			$(use_with luajit)
+			$(use_enable nls)
+			$(use_enable perl perlinterp)
+			$(use_enable python pythoninterp)
+			$(use_enable python python3interp)
+			$(use_enable racket mzschemeinterp)
+			$(use_enable ruby rubyinterp)
+			$(use_enable selinux)
+			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
+		)
+
+		# --with-features=huge forces on cscope even if we --disable it. We need
+		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
+		if ! use cscope ; then
+			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
+				die "couldn't disable cscope"
+		fi
+
+		# don't test USE=X here ... see bug #19115
+		# but need to provide a way to link against X ... see bug #20093
+		myconf+=(
+			--enable-gui=no
+			--disable-darwin
+			$(use_with X x)
+		)
+	fi
+
+	# let package manager strip binaries
+	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
+
+	# keep prefix env contained within the EPREFIX
+	use prefix && myconf+=( --without-local-dir )
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	# The following allows emake to be used
+	emake -j1 -C src auto/osdef.h objects
+
+	emake
+}
+
+src_test() {
+	echo
+	einfo "Starting vim tests. Several error messages will be shown"
+	einfo "while the tests run. This is normal behaviour and does not"
+	einfo "indicate a fault."
+	echo
+	ewarn "If the tests fail, your terminal may be left in a strange"
+	ewarn "state. Usually, running 'reset' will fix this."
+	echo
+
+	# Don't let vim talk to X
+	unset DISPLAY
+
+	emake -j1 -C src/testdir nongui
+}
+
+# Make convenience symlinks, hopefully without stepping on toes.  Some
+# of these links are "owned" by the vim ebuild when it is installed,
+# but they might be good for gvim as well (see bug 45828)
+update_vim_symlinks() {
+	local f syms
+	syms="vimdiff rvim rview"
+	einfo "Calling eselect vi update..."
+	# Call this with --if-unset to respect user's choice (bug 187449)
+	eselect vi update --if-unset
+
+	# Make or remove convenience symlink, vim -> gvim
+	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
+		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
+	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
+		rm "${EROOT}"/usr/bin/vim
+	fi
+
+	# Make or remove convenience symlinks to vim
+	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
+		for f in ${syms}; do
+			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
+		done
+	else
+		for f in ${syms}; do
+			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
+				rm -f "${EROOT}"/usr/bin/${f}
+			fi
+		done
+	fi
+
+	# This will still break if you merge then remove the vi package,
+	# but there's only so much you can do, eh?  Unfortunately we don't
+	# have triggers like are done in rpm-land.
+}
+
+src_install() {
+	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
+
+	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
+	#       managed by eselect-vi
+	dobin src/vim
+	dosym vim /usr/bin/vimdiff
+	dosym vim /usr/bin/rvim
+	dosym vim /usr/bin/rview
+	if use vim-pager ; then
+		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
+		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
+		insinto ${vimfiles}/macros
+		doins runtime/macros/manpager.sh
+		fperms a+x ${vimfiles}/macros/manpager.sh
+	fi
+
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+	# keep in sync with 'complete ... -F' list
+	bashcomp_alias vim ex vi view rvim rview vimdiff
+
+	# We shouldn't be installing the ex or view man page symlinks, as they
+	# are managed by eselect-vi
+	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
+}
+
+pkg_postinst() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
--- a/app-editors/vim/vim-9999.ebuild
+++ b/app-editors/vim/vim-9999.ebuild
@ -5,15 +5,15 @@ EAPI=6
 VIM_VERSION="8.0"
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
+inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1

 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/vim/vim.git"
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
@ -21,7 +21,7 @@ HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim"

 SLOT="0"
 LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
+IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager"
 REQUIRED_USE="
 	luajit? ( lua )
 	python? ( ${PYTHON_REQUIRED_USE} )
@ -199,6 +199,7 @@ src_configure() {
 			$(use_enable ruby rubyinterp)
 			$(use_enable selinux)
 			$(use_enable tcl tclinterp)
+			$(use_enable terminal)
 		)

 		# --with-features=huge forces on cscope even if we --disable it. We need
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@ -5,6 +5,14 @@
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>hsoft@hardcoded.net</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		By combining the speed and density of containers with
 		the security of traditional virtual machines, LXD is
--- a/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
+++ b/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
@ -1,22 +0,0 @@
--- a/vgauth/service/Makefile.am
-+++ b/vgauth/service/Makefile.am
-@@ -78,7 +78,7 @@
-                             $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-                             $(LDFLAGS) -o $@
- else
-   VGAuthService_LINK = $(LINK)
-+   VGAuthService_LINK = $(CXXLINK)
- endif
- 
- # Message catalogs.
--- a/vgauth/service/Makefile.in
-+++ b/vgauth/service/Makefile.in
-@@ -322,7 +322,7 @@
- 	../lib/libvgauth.la @XERCES_LIBS@ @XMLSECURITY_LIBS@ \
- 	@SSL_LIBS@ -lxerces-c -lxml-security-c -lssl -lcrypto \
- 	$(am__append_1)
-@HAVE_ICU_FALSE@VGAuthService_LINK = $(LINK)
-+@HAVE_ICU_FALSE@VGAuthService_LINK = $(CXXLINK)
- @HAVE_ICU_TRUE@VGAuthService_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)     \
- @HAVE_ICU_TRUE@                            $(LIBTOOLFLAGS) --mode=link $(CXX)       \
- @HAVE_ICU_TRUE@                            $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
--- a/app-emulation/open-vm-tools/files/network
+++ b/app-emulation/open-vm-tools/files/network
@ -1,22 +0,0 @@
-#!/bin/sh
-
-#
-# net.eth0, net.eth1, network, wicd, NetworkManager
-service="net.eth0"
-
-if ! rc-service -e ${service}
-then
-	service="network"
-fi
-
-case "$1" in
-	suspend-vm)
-		rc-service ${service} stop
-		;;
-	resume-vm)
-		rc-service ${service} start
-		;;
-	*)
-		;;
-esac
-
--- a/app-emulation/open-vm-tools/files/open-vm-tools.desktop
+++ b/app-emulation/open-vm-tools/files/open-vm-tools.desktop
@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=vmware-user-suid-wrapper
-Name=VMware User Agent
-X-KDE-autostart-phase=1
-NoDisplay=true
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@ -1,3 +1,3 @@
-DIST a20y1311lx.tgz 8463681 SHA256 6f63b0402c01f29fb9a508a022945fc8ed26bfc4101f3613ea2814063dc1ed9f SHA512 e295ba03a3ef8266f07e9feb1b208accf76923ab215dd022836550cc93c5e8eed70c21dd4ad264e9be25b906ac8996f3d1f90d1865daf2790ddf268e7797c39d WHIRLPOOL 11cfc180d07b15cc32eb156b0b7b12ed50f7487da38a1728ff714ebfa687461339bd242ee5d7329bb36055682062b38570dd5f8a901aaaf567137f7292fd58e1
+DIST a20y1406lx.tgz 8491493 SHA256 df19a3fc57c2a3cd09d5de8694f68b1e05826a67103d970815249ac5e5a8de73 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273 WHIRLPOOL 747cbed162028853ab9f19f66eb039ab09827aa7665daa92814d2af3ae49865f749b0fe3f098e2a4780b69bbaddc4f1af594bd7b975062e9a056bb87e2c1feab
 DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
 DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
--- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild
@ -1,36 +1,28 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI="6"
+MULTILIB_COMPAT=( abi_x86_{32,64} )

-inherit cdrom eutils gnome2-utils multilib
+inherit cdrom eutils gnome2-utils multilib-build

 MY_UPDATE_P="${PN}up2"
 MY_UPDATE_GTK="${PN}gtk216"
-MY_ZIPCODE_P="a20y1311lx"
+MY_ZIPCODE_P="a20y1406lx"

 DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
 HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
-	http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
-	http://www3.justsystem.co.jp/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
+SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+	https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+	https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"

 LICENSE="ATOK MIT"
-
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="multilib"
-
+IUSE=""
 RESTRICT="strip mirror"

-RDEPEND="!app-i18n/atokx2
-	!dev-libs/libiiimcf
-	!dev-libs/csconv
-	!app-i18n/iiimgcf
-	!dev-libs/libiiimp
-	!app-i18n/iiimsf
-	!app-i18n/iiimxcf
-	dev-libs/atk
+RDEPEND="dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2:2
 	media-libs/fontconfig
@ -52,16 +44,16 @@ RDEPEND="!app-i18n/atokx2
 	x11-libs/libXxf86vm
 	x11-libs/libdrm
 	x11-libs/pangox-compat
-	multilib? (
-		>=dev-libs/atk-2.10.0[abi_x86_32]
+	amd64? (
+		>=dev-libs/atk-2.10.0[abi_x86_32(-)]
 		>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
 		>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)]
 		>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
 		>=media-libs/libpng-1.2.51[abi_x86_32(-)]
 		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
 		>=virtual/pam-0-r1[abi_x86_32(-)]
-		>=x11-libs/cairo-1.12.14-r4[abi_x86_32]
-		>=x11-libs/gtk+-2.24.23:2[abi_x86_32]
+		>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
+		>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
 		>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
 		>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
 		>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
@ -75,31 +67,30 @@ RDEPEND="!app-i18n/atokx2
 		>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
 		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
 		>=x11-libs/libdrm-2.4.46[abi_x86_32(-)]
-		>=x11-libs/pangox-compat-0.0.2[abi_x86_32]
+		>=x11-libs/pangox-compat-0.0.2[abi_x86_32(-)]
 	)"
-
-QA_PREBUILT="opt/atokx3/lib/server/*
-	opt/atokx3/lib/client/xaux/*
-	opt/atokx3/lib/client/*
-	opt/atokx3/bin/*
-	usr/libexec/*
-	usr/bin/*
-	usr/$(get_libdir)/*
-	usr/$(get_libdir)/gtk-2.0/immodules/*
-	usr/$(get_libdir)/iiim/le/atokx3/64/*
-	usr/$(ABI=x86 get_libdir)/*
-	usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
-	usr/$(ABI=x86 get_libdir)/iiim/*
-	usr/$(ABI=x86 get_libdir)/iiim/le/atokx3/*"
+S="${WORKDIR}"

 EMULTILIB_PKG="true"

-S="${WORKDIR}"
-
 pkg_setup() {
-	if ! cdrom_get_cds atokx3index ; then
+	if ! cdrom_get_cds ${PN}index ; then
 		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
 	fi
+
+	QA_PREBUILT="opt/${PN}/lib/server/*
+		opt/${PN}/lib/client/xaux/*
+		opt/${PN}/lib/client/*
+		opt/${PN}/bin/*
+		usr/libexec/*
+		usr/bin/*
+		usr/$(get_libdir)/*
+		usr/$(get_libdir)/gtk-2.0/immodules/*
+		usr/$(get_libdir)/iiim/le/${PN}/64/*
+		usr/$(ABI=x86 get_libdir)/*
+		usr/$(ABI=x86 get_libdir)/gtk-2.0/immodules/*
+		usr/$(ABI=x86 get_libdir)/iiim/*
+		usr/$(ABI=x86 get_libdir)/iiim/le/${PN}/*"
 }

 src_unpack() {
@ -116,8 +107,8 @@ src_unpack() {
 	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
 	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz

-	if use amd64 ; then
-		targets="${targets}
+	if use abi_x86_64 ; then
+		targets+="
 			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
 			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
 			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
@ -127,19 +118,19 @@ src_unpack() {
 		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
 	fi

-	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
+	targets+=" ATOK/atokxup-20.0-*.0.0.i386.tar.gz"

 	unpack ${MY_UPDATE_P}.tar.gz

+	local i
 	for i in ${targets} ; do
-		if [ -f "${S}"/${MY_UPDATE_P}/bin/${i} ] ; then
+		if [[ -f "${S}"/${MY_UPDATE_P}/bin/${i} ]] ; then
 			einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
 			tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
-		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
+		elif [[ -f "${CDROM_ROOT}"/bin/tarball/${i} ]] ; then
 			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
 			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
 		else
-			eerror "${i} not found."
 			die "${i} not found."
 		fi
 	done
@ -148,60 +139,58 @@ src_unpack() {
 }

 src_prepare() {
-	if use amd64 ; then
+	if use abi_x86_64 ; then
 		local lib32="$(ABI=x86 get_libdir)"
 		local lib64="$(get_libdir)"
-		if [ "lib" != "${lib32}" ] ; then
+		if [[ "lib" != "${lib32}" ]] ; then
 			mv usr/lib "usr/${lib32}" || die
 		fi
-		if [ "lib64" != "${lib64}" ] ; then
+		if [[ "lib64" != "${lib64}" ]] ; then
 			mv usr/lib64 "usr/${lib64}" || die
 		fi
-		mkdir -p "usr/${lib64}/iiim/le/atokx3" || die
-		mv "usr/${lib32}/iiim/le/atokx3/64" "usr/${lib64}/iiim/le/atokx3/64" || die
-		rm "usr/${lib32}/iiim/le/atokx3/amd64" || die
-		sed -e "s:/usr/lib:/usr/${lib64}:" \
-			"usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
-		sed -e "s:/usr/lib:/usr/${lib64}:" \
-			"usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
+		mkdir -p "usr/${lib64}/iiim/le/${PN}" || die
+		mv "usr/${lib32}/iiim/le/${PN}/64" "usr/${lib64}/iiim/le/${PN}/64" || die
+		rm "usr/${lib32}/iiim/le/${PN}/amd64" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" "usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
 		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
 		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
 	fi
 }

 src_install() {
-	dodoc "${MY_UPDATE_P}/README_UP2.txt"
-	rm -rf "${MY_UPDATE_P}"
+	DOCS=( ${MY_UPDATE_P}/README_UP2.txt "${CDROM_ROOT}"/doc/atok.pdf )
+	HTML_DOCS=( "${CDROM_ROOT}"/readme.html )
+	einstalldocs
+	rm -rf ${MY_UPDATE_P}

 	cp -dpR * "${ED}" || die

 	# amd64 hack
-	if use amd64 ; then
+	if use abi_x86_64 ; then
 		local lib32="$(ABI=x86 get_libdir)"
 		local lib64="$(get_libdir)"
-		if [ "${lib32}" != "${lib64}" ] ; then
+		if [[ "${lib32}" != "${lib64}" ]] ; then
+			local f
 			for f in xiiimp.so xiiimp.a iiim-xbe xiiimp.so.2 xiiimp.so.2.0.0 iiimd-watchdog xiiimp.la ; do
 				dosym "${EPREFIX}/usr/${lib32}/iiim/${f}" "/usr/${lib64}/iiim/${f}"
 			done
-			for f in atokx3aux.so atokx3.so ; do
-				dosym "${EPREFIX}/usr/${lib32}/iiim/le/atokx3/${f}" "/usr/${lib64}/iiim/le/atokx3/${f}"
+			for f in ${PN}aux.so ${PN}.so ; do
+				dosym "${EPREFIX}/usr/${lib32}/iiim/le/${PN}/${f}" "/usr/${lib64}/iiim/le/${PN}/${f}"
 			done
-			dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/64
-			dosym "${EPREFIX}/usr/${lib64}/iiim/le/atokx3/64" /usr/"${lib32}"/iiim/le/atokx3/amd64
+			dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/64"
+			dosym "${EPREFIX}/usr/${lib64}/iiim/le/${PN}/64" "/usr/${lib32}/iiim/le/${PN}/amd64"
 		fi
 	fi

 	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
 	insinto /etc/X11/xinit/xinput.d
 	doins "${T}/iiimf.conf"
-
-	dodoc "${CDROM_ROOT}"/doc/atok.pdf
-	dohtml "${CDROM_ROOT}"/readme.html
 }

 pkg_preinst() {
 	# bug #343325
-	if use amd64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then
+	if use abi_x86_64 && has_multilib_profile && [[ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ]] ; then
 		rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
 	fi
 }
@ -210,11 +199,11 @@ pkg_postinst() {
 	elog
 	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
 	elog
-	elog ". /opt/atokx3/bin/atokx3start.sh"
+	elog ". /opt/${PN}/bin/${PN}start.sh"
 	elog
-	gnome2_query_immodules_gtk2
+	multilib_foreach_abi gnome2_query_immodules_gtk2
 }

 pkg_postrm() {
-	gnome2_query_immodules_gtk2
+	multilib_foreach_abi gnome2_query_immodules_gtk2
 }
--- a/app-i18n/atokx3/files/xinput-iiimf
+++ b/app-i18n/atokx3/files/xinput-iiimf
@ -1,5 +1,5 @@
 XIM=iiimx
-XIM_PROGRAM=@EPREFIX@/usr/bin/iiimx
+XIM_PROGRAM="@EPREFIX@/usr/bin/iiimx"
 XIM_ARGS=-iiimd
 GTK_IM_MODULE=iiim
 QT_IM_MODULE=xim
--- a/app-i18n/atokx3/metadata.xml
+++ b/app-i18n/atokx3/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cjk@gentoo.org</email>
-	<name>Cjk</name>
-</maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@ -1,2 +1,3 @@
 DIST ibus-libpinyin-1.6.92.tar.gz 1686249 SHA256 e611cff47b84345e1f60b8e94f74811bcfdf53b6ef7436b5cb5aff47eea743a3 SHA512 b4af0083c9c1dd4273c75372acf5d74ce317effdf56d8a0de8a3e3cd24f40b1b2dba91786d0a1cd72c9d7867b9ae630c4f69b04b378529dca8be0869e91d322d WHIRLPOOL 5dd8493bbbaa0f3d189a825bd4237a56276e88b8da91e75c1e3d49c1c1b2050ee2f9aaa4524ea00418690d8ff2085d6b6f686e60752e838f2515ca9d780347ef
 DIST ibus-libpinyin-1.7.4.tar.gz 1692228 SHA256 4627eab10ded24bd1a95ee56a2f7bd6a82deb94435aea674267fc40febd66f81 SHA512 d94f495e74650830f759889112df8b749d6e28192ed866f6bd132b16e16cda59d97aabc2762596bbe337a3deeb30ccd680ad370c28c1932ab05c6a40d8e1c265 WHIRLPOOL 1227c7f96565c001a90bced8aa4f847cfbe9bfae6810641e76472c437a29cdb539d2b316add9850270fa4eb2436761375f9d436749c8f06a573206ddba02064c
+DIST ibus-libpinyin-1.9.0.tar.gz 1692442 SHA256 c8ec2450cec6f11870982b0130293dc967632631077029ca76c27ef349189e3e SHA512 cf90fd5233ca7a77d45b69efc76a211ff69895eed09998bec09b362f6b67a91687510144f55ee67e31897ee81c47e86e2e1258ee1771bae1f04d8aa398b13e1e WHIRLPOOL cb4a5cb645b2a0126f1d44452813021d3dc6b484e3f07f2a1bf5370b475103f0bf86a91576620ac038342dccf1d3f21da220a457b926c61329dc1e718e7f4c15
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.0.ebuild
@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
+HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
+SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="boost lua opencc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	>=app-i18n/libpinyin-1.9.91
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	boost? ( dev-libs/boost:= )
+	lua? ( dev-lang/lua:0 )
+	opencc? ( app-i18n/opencc )"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-english-input-mode \
+		$(use_enable boost) \
+		$(use_enable lua lua-extension) \
+		$(use_enable opencc)
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
--- a/app-i18n/ibus/ibus-1.5.12.ebuild
+++ b/app-i18n/ibus/ibus-1.5.12.ebuild
@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
-REQUIRED_USE="libnotify? ( gtk )
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
+REQUIRED_USE="gtk2? ( gtk )
+	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@ -104,6 +102,7 @@ src_configure() {
 	fi

 	econf \
+		$(use_enable X xim) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
@ -114,7 +113,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		"${python_conf[@]}"
 }

--- a/app-i18n/ibus/ibus-1.5.15.ebuild
+++ b/app-i18n/ibus/ibus-1.5.15.ebuild
@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland +X"
-REQUIRED_USE="libnotify? ( gtk )
+IUSE="+X gconf +gtk +gtk2 +introspection +libnotify nls +python test vala wayland"
+REQUIRED_USE="gtk2? ( gtk )
+	libnotify? ( gtk )
 	python? (
 		${PYTHON_REQUIRED_USE}
 		gtk
@ -29,6 +30,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@ -46,13 +51,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@ -104,6 +102,7 @@ src_configure() {
 	fi

 	econf \
+		$(use_enable X xim) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk3) \
 		$(use_enable gtk ui) \
@ -114,7 +113,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		--disable-emoji-dict \
 		"${python_conf[@]}"
 }
--- a/app-i18n/ibus/ibus-1.5.16.ebuild
+++ b/app-i18n/ibus/ibus-1.5.16.ebuild
@ -14,8 +14,9 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="+emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland +X"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test vala wayland"
 REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
 	kde? ( gtk )
 	libnotify? ( gtk )
 	python? (
@ -31,6 +32,10 @@ CDEPEND="app-text/iso-codes
 	gnome-base/dconf
 	gnome-base/librsvg:2
 	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
 	gconf? ( gnome-base/gconf:2 )
 	gtk? (
 		x11-libs/gtk+:3
@ -49,13 +54,6 @@ CDEPEND="app-text/iso-codes
 	wayland? (
 		dev-libs/wayland
 		x11-libs/libxkbcommon
-	)
-	X? (
-		|| (
-			x11-libs/gtk+:3
-			x11-libs/gtk+:2
-		)
-		x11-libs/libX11
 	)"
 RDEPEND="${CDEPEND}
 	python? (
@ -116,6 +114,7 @@ src_configure() {
 	fi

 	econf \
+		$(use_enable X xim) \
 		$(use_enable emoji emoji-dict) \
 		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
 		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
@ -130,7 +129,6 @@ src_configure() {
 		$(use_enable test tests) \
 		$(use_enable vala) \
 		$(use_enable wayland) \
-		$(use_enable X xim) \
 		"${python_conf[@]}"
 }

--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@ -1,6 +1,8 @@
 DIST libpinyin-0.8.0.tar 2682880 SHA256 42fdb08a880a8c42a25712267463704f988293e0bec20871a306022aefb08290 SHA512 762686b9e2fc95e8071832735764c54cb6252fa40bd5d3eb1e15445a267795b775288cef41f671bf4680f13c0a8b44377b12696ade832b80684300e1dd8787a0 WHIRLPOOL 0be6445e6e39c2f8f9124d0f549d11421092364d55c9345f2862f465ba78044b01df9e338acba055818a7d735e0c41e8e71b3f2f03830a14dd196a9dfe2c9107
 DIST libpinyin-1.0.0.tar 2744320 SHA256 ba72c5a71f373771086198b844470d7384cb25b293f962212b02f8f4d718e40c SHA512 577d6d3d3e647a4a5047e3fc019d0e5b7778f49a229eabbf71da9ea73f6d8b935e6ca673698ddfb7d677e1634e05fb2dd0d3811f7b64e7b1184504160af42b87 WHIRLPOOL ad0b975b17010bcb5481eb3aa7304880fe97a682c8fcd0944a9070cf5148130c90714205fb16c440476667876b9f30834eaeec0ec6ef948a5dd59a1bf8a10454
 DIST libpinyin-1.3.0.tar.gz 190686 SHA256 71a5749ff96a1ae5a71bea8d5c1394b16f9252c4e3ad5225cc66ad2a76ab6d7d SHA512 063fd114732650636aba21611042a3461eb5c0447dddef04957edfebd186b76d6eb9f29bc4d095c9b5aebcc7fc2acea345f49adae00eac1fad44822f088c7415 WHIRLPOOL c2840d0272ded79902047d46c14eb5c1ddd6ec3df322086c904f0a1d85e5150b9fdb33f97b276ed56c18039cbbb4d668f9ad014f65aadb9e703957b2e4ceea73
+DIST libpinyin-2.0.92.tar.gz 245949 SHA256 8a37f0ab6334f1d64de1d83ebe290254e07bfaf27dde7dde01b4acb2bba51ca7 SHA512 acf90ab484d6e76d5247916ded71febb0d41152aa41eb7a90ef60d7d9d9ffd11512af078387542501e03edcf6e4f75c28157ed390186ab6d25ccbe4aa1cf8777 WHIRLPOOL ca196d008f3e083f97a97db6eb80ae2922c9bbb4dc3098b62a045c9a870a8a5ec3025e55e5ea677b6855be59dab54bea9cd54373b78ae298f442bab272d84073
 DIST model.text.tar.gz 10285854 SHA256 a4924c5b5923c3ff9ce55456a417486d07d3b2f7afc194f4338a1221fe36b533 SHA512 d3f137c7de0f357950abbb1e00c0f5d62fb5b4b0ea9f3a6dff29bf6bb2e4f5293319321abf1bad88742868563f65d74f0226f433ba4bcfdfe2c23fef6fea7c74 WHIRLPOOL fd1d637cfcecbbbd7506d15fd107106e578013aa9ca4c0be1aab110fb49ebcb2dbf1493953349e7cf7b0a8a5a0c2c216d993278d8ae78b42f5c703363b4efe60
 DIST model11.text.tar.gz 17197590 SHA256 d0428e87a8c6b214036641a3317834f8352e77cbba0f040c7bd3495d13ef3f71 SHA512 21c048e7f93db9626ec1545a977abb555e12149b791ddab0b0b4fe4adf6fc082d2c2ede28fc42407e72e15f0af1cf428dc58ad955c514d1bcbc67006803e0be7 WHIRLPOOL 7549d45219912880b179c844b5398f063ab27b1db23f2b40a96ff7a29a0217ec430fbef9b2b2b031cb27d22a77eea363ee810e5c259dc7340365d2901a1a1fad
+DIST model14.text.tar.gz 19361973 SHA256 185f0f175a90bcfc55cf3cf6ceff8d447a6269492c0ca1a1fc0748ea2c181363 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9 WHIRLPOOL 5de2ed18c20cfd94a31420085d7fafa93601858279126e553b7aed2ff9a69e6efed6fd8aae3cab8c9fe0b5bd6dfad2c3002857777b6ab6f0e0d94719943f834d
 DIST model7.text.tar.gz 19666966 SHA256 c9a3c38e6439302603b5c3772ea9dae280b4ef46bd6e8762ed40452dc400af78 SHA512 74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad WHIRLPOOL 5285398bb6bd431caa3449b9540a1c08dad785456d9152fc44f6303866891de5538da4c5945eb8e8a0b64a081a58e7e6d25caacd05e2e3a7219e4335f0414986
--- a/app-i18n/libpinyin/libpinyin-2.0.92.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.0.92.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune
+
+MODELV=14
+
+DESCRIPTION="Library to deal with pinyin"
+HOMEPAGE="https://github.com/libpinyin/libpinyin"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	mirror://sourceforge/${PN}/models/model${MODELV}.text.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	sys-libs/db:*"
+
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	ln -s "${DISTDIR}"/model${MODELV}.text.tar.gz data || die
+	sed -i "/wget/d" data/Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- 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.12.2.tar.gz 177046 SHA256 5e157041c5d0063ef337d7fa89007ecd611ca5e20fb5abdb3228ff80a0aea8c1 SHA512 5cf1df26a195b85cbb20dc6b53ce9e6a39330347edee7e294f8f50bfa954bc47304dcaed1109e405794c67bef0fb62ae6eace90e69556c89ec48d14d6990fdb7 WHIRLPOOL 57f870344d22e65891be51ae14a45dd2ab6f565b44860cbce04887dabfbfdb3356cf02ffd0067d602f7ce06c7f325ba9638c44227bd3a0bb9444747320be1d17
+DIST transifex-client-0.12.4.tar.gz 179349 SHA256 3832b6a6fd5d74c79412b497ca24b701fe760a8b4dd3aef800b730499cb7945f SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e WHIRLPOOL e6271144f6e038f518b37d30bf5970d03d871c43243ab84c990e49db8c852627e55ae7ae257a3f432c71070bbaf1b39f89db3ace3ed6fb4f9f603aaad7428483
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit 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="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test
+}
--- a/app-misc/flasm/Manifest
+++ b/app-misc/flasm/Manifest
@ -1 +0,0 @@
-DIST flasm-1.63.zip 111912 SHA256 df1273a506e2479cf95775197f5b7fa94e29fe1e0aae5aa190ed5bbebc4be5c6 SHA512 af53c8902bac9bc03a4274f51280abe7e595f19d8ee367c0237868634df58a42144bb6c335a99f860c494da90d483072c66064897ef1ad467b7621c648ca322a WHIRLPOOL e69860fdfa5be54235c0a02f2b77e30e4a2735b6785aa45260a2bdb55ff8a2edd366c1c9dadc93c7ac76886bd0070c4b6220a38365b6ba3135a1ade19a7ef103
--- a/app-misc/flasm/files/flasm-1.63-makefile.patch
+++ b/app-misc/flasm/files/flasm-1.63-makefile.patch
@ -1,27 +0,0 @@
--- Makefile.o	2010-08-31 01:17:46.505000089 +0200
-+++ Makefile	2010-08-31 01:19:11.841000098 +0200
-@@ -1,6 +1,4 @@
- UNAME = $(shell uname)
-CC = gcc
-CFLAGS = -g -Wall -O2
- LIBS = -lz
- OFILES = util.o keywords.o flasm.o unflasm.o lex.yy.o assembler.tab.o
- GARBAGE = assembler.tab.* lex.yy.c memwatch.o gmon.out memwatch.log core
-@@ -9,8 +7,6 @@
- ifneq (,$(findstring debug,$(MAKECMDGOALS)))
- 	CFLAGS += -DMEMWATCH -pg -p -pedantic -W -Wcast-align -Wcast-qual -Wshadow -Wnested-externs -Wstrict-prototypes -Waggregate-return -Wmissing-prototypes -Wpointer-arith
- 	OFILES += memwatch.o
-else
-	CFLAGS += -s
- endif
- 
- # executable should not depend on cygwin.dll
-@@ -26,7 +22,7 @@
- 	-rm -f ${OFILES} ${GARBAGE}
- 
- flasm:	${OFILES}
-	${CC} $(CFLAGS) -o flasm ${OFILES} ${LIBS}
-+	${CC} $(CFLAGS) $(LDFLAGS) -o flasm ${OFILES} ${LIBS}
- 
- assembler.tab.c assembler.tab.h: assembler.y
- 	bison --defines --debug assembler.y
--- a/app-misc/flasm/flasm-1.63.ebuild
+++ b/app-misc/flasm/flasm-1.63.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator toolchain-funcs
-
-MY_PV=$(delete_all_version_separators $(get_version_component_range 1-2))
-DESCRIPTION="Command line assembler/disassembler of Flash ActionScript bytecode"
-HOMEPAGE="http://www.nowrap.de/flasm.html"
-SRC_URI="http://www.nowrap.de/download/flasm${MY_PV}src.zip -> ${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/gperf
-	sys-devel/flex
-	virtual/yacc
-"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake
-}
-
-src_install() {
-	dobin flasm
-	dodoc CHANGES.TXT
-	dohtml flasm.html classic.css
-}
--- a/app-misc/flasm/metadata.xml
+++ b/app-misc/flasm/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>Flasm disassembles your entire SWF including all the
-      timelines and events.  Looking at disassembly, you learn how the Flash
-      compiler works, which improves your ActionScript skills. You can also do
-      some optimizations on the disassembled code by hand or adjust the code as
-      you wish. Flasm then applies your changes to the original SWF, replacing
-      original actions.
-  </longdescription>
-</pkgmetadata>
--- a/app-misc/gnomecatalog/Manifest
+++ b/app-misc/gnomecatalog/Manifest
@ -1 +0,0 @@
-DIST gnomecatalog-0.3.4.2.tar.bz2 58983 SHA256 4bd0352b994b9d63be3eb465db57dee38d4f87adff8c0b901687b735cc7dfa4e SHA512 fa72e58d429d9fcf62adde848e942f83a6b6b8e0e9ad3121f1ffdb6547b9299ae2200a08aa9b1b191b5c994c09a0a33de421c3715fc96717e17ddafd9fbe55f2 WHIRLPOOL 87a64d6e2bae56c7af66d12c5f1bdb5775b9f842b6e329975fbe5625024ce5488e1843e985d36e8963b79ad43eabb866005a7aeb50e220bfd5a8eda380c92631
--- a/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch
+++ b/app-misc/gnomecatalog/files/gnomecatalog-0.3.4.2-dbus.patch
@ -1,109 +0,0 @@
-# https://sourceforge.net/tracker2/?func=detail&aid=2622610&group_id=118573&atid=681722
--- a/gnomecatalog/data.py	(revision 1)
-+++ b/gnomecatalog/data.py	(working copy)
-@@ -33,32 +33,34 @@
- 
- 	""" Leemos el disco y lo insertamos en la base de datos """
- 	def import_disk(self):
-		path = self.config.get("source")
-+		
-+		for path in utils.get_path():
-+			#~ path = self.config.get("source")
- 
-		database = storage.Sqlite(self.opened_database, self.app, True)
-+			database = storage.Sqlite(self.opened_database, self.app, True)
- 
-		if self.config.get("thumbnails") == "True":
-			if not os.path.exists(database.database + "_thumbs"):
-				os.mkdir(database.database + "_thumbs")
-+			if self.config.get("thumbnails") == "True":
-+				if not os.path.exists(database.database + "_thumbs"):
-+					os.mkdir(database.database + "_thumbs")
- 
-		"""Importamos un nuevo disco"""
-		if not utils.is_mounted(path):
-			self.__path = path
-			self.__progress = self.app.progress_bar
-			utils.mount(path, self._mount_callback)
-+			"""Importamos un nuevo disco"""
-+			if not utils.is_mounted(path):
-+				self.__path = path
-+				self.__progress = self.app.progress_bar
-+				utils.mount(path, self._mount_callback)
- 
-		disk = self.reader.read(path, self.app.progress_bar)
-+			disk = self.reader.read(path, self.app.progress_bar)
- 
-		if disk:
-			""" ahora insertamos los datos en la base de datos. """
-			disk = database.insert_disk(disk)
-			if self.config.get("eject") == "True": utils.eject(path)
-			self.app.set_guardar_state(True)
-#			self.load_data()
-#			self.treeDisk.select(disk)
-	#		self.show_files_from_selected()
-			database.close()
-			return disk
-+			if disk:
-+				""" ahora insertamos los datos en la base de datos. """
-+				disk = database.insert_disk(disk)
-+				if self.config.get("eject") == "True": utils.eject(path)
-+				self.app.set_guardar_state(True)
-+	#			self.load_data()
-+	#			self.treeDisk.select(disk)
-+		#		self.show_files_from_selected()
-+				database.close()
-+				return disk
- 
- 
- 	""" Carga los discos de a base de datos en el treeview tree """
--- a/gnomecatalog/utils.py	(revision 1)
-+++ b/gnomecatalog/utils.py	(working copy)
-@@ -1,6 +1,28 @@
- import os, commands, time
- import gnomevfs, gtk
-+import dbus, dbus.glib, sys, urllib
- 
-+
-+def get_path():
-+	path = []
-+	bus = dbus.SystemBus()
-+	hal_obj = bus.get_object ('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager')
-+	hal = dbus.Interface (hal_obj, 'org.freedesktop.Hal.Manager')
-+	udis = hal.FindDeviceByCapability ('storage')
-+	for udi in udis:
-+		dev_obj = bus.get_object ('org.freedesktop.Hal', udi)
-+		dev = dbus.Interface (dev_obj, 'org.freedesktop.Hal.Device')
-+		if (dev.GetProperty ('storage.removable')):
-+			block = dev.GetProperty ('block.device')
-+			f = open ('/etc/mtab')
-+			for line in f.readlines():
-+				if (line.find (block) == 0):
-+					mount = line.split()
-+					path.append(mount[1].replace('\\040',' '))
-+			f.close()
-+	return path
-+
-+
- def locate_file(path, type = "icons"):
- 	prefixes = ['', 'usr/', 'usr/local/']
- 	if type == "glade":
--- a/gnomecatalog/ui/app.py	(revision 1)
-+++ b/gnomecatalog/ui/app.py	(working copy)
-@@ -162,14 +162,6 @@
- 		self.import_thread.start()
- 		gobject.timeout_add(1000, self.wait_import_cb)
- 
-#		t2 = threading.Thread(target=self.wait_import_cb)
-#		t2.setDaemon(True)
-#		t2.start()
-
-#		gobject.idle_add(self.wait_import_cb, t)
-
-		#dialogs.addDisk(self.data).loadDisk()
-
- 	def wait_import_cb(self):
- 		if not self.import_thread.isAlive():
- 			self.hbox_import.hide()
-
- 	  	 
--- a/app-misc/gnomecatalog/gnomecatalog-0.3.4.2-r1.ebuild
+++ b/app-misc/gnomecatalog/gnomecatalog-0.3.4.2-r1.ebuild
@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,xml"
-
-inherit distutils-r1 eutils fdo-mime gnome2-utils
-
-DESCRIPTION="Cataloging software for CDs and DVDs"
-HOMEPAGE="http://gnomecatalog.sf.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/gconf-python:2[${PYTHON_USEDEP}]
-	dev-python/gnome-vfs-python:2[${PYTHON_USEDEP}]
-	dev-python/kaa-metadata[${PYTHON_USEDEP}]
-	dev-python/libgnome-python:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.4:2[${PYTHON_USEDEP}]
-	dev-python/pyvorbis[${PYTHON_USEDEP}]
-	>=gnome-base/libglade-2:2.0
-	>=x11-libs/gtk+-2.4:2
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix importing from a single folder in /media
-	epatch "${FILESDIR}"/${P}-dbus.patch
-
-	# Use sqlite3 instead of pysqlite2, bug #452126.
-	sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
-		gnomecatalog/storage.py || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
--- a/app-misc/gnomecatalog/metadata.xml
+++ b/app-misc/gnomecatalog/metadata.xml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-	Generate thumbnails of the video files and image files via nautilus (gnome
-	file manager), and saves it in the database files.
-
-	Save the metadata of the files, then you can search in the metatada of mp3,
-	avis, images (exif).
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gnomecatalog</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-misc/iguanaIR/files/40-iguanaIR.rules
+++ b/app-misc/iguanaIR/files/40-iguanaIR.rules
@ -1,5 +0,0 @@
-
-ACTION=="add", ATTRS{manufacturer}=="IguanaWorks", MODE="0660", RUN+="/etc/init.d/iguanaIR rescan"
-
-# DEBUGGING ADDITION:
-#RUN += "/bin/bash -c 'echo $major $minor r=$result i=$id n=$number k=$kernel p=$parent r=$root >> /tmp/udev.txt'"
--- a/app-misc/relevation/Manifest
+++ b/app-misc/relevation/Manifest
@ -1 +0,0 @@
-DIST relevation-1.3.tar.gz 28053 SHA256 aa31c2a1a5ae0aa6b836e061bc504d0164c664c819a2259bc3c08fd0039859bf SHA512 42aab7107a63b1a9e6908cd8e49c3775f41f8acd025ee633bbac09ed5648c7bbfa584ed9bbfbfee12d26ab648b457aa974d8d52753a6b4faec3bd8ab605fec05 WHIRLPOOL c713f0a7da744e73df4b21f03995ee9fdd16ffaaab6e42ddb030c1b7b2476d61deb65ee787d76cbbae3b5834ec592cbfe35cab74ac46d529df431b2d50406952
--- a/app-misc/relevation/metadata.xml
+++ b/app-misc/relevation/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-misc/relevation/relevation-1.3.ebuild
+++ b/app-misc/relevation/relevation-1.3.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="a command-line searcher for the Revelation password manager"
-HOMEPAGE="http://p.outlyer.net/relevation/"
-SRC_URI="http://p.outlyer.net/${PN}/files/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# install extra scripts in proper doc dir
-	sed -i "s#relevation/extra#${PF}/extra#" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
--- a/app-mobilephone/esms/Manifest
+++ b/app-mobilephone/esms/Manifest
@ -1 +0,0 @@
-DIST esms-0.9.5.tar.gz 33282 SHA256 47618263776ef1284812a8e44d046441bbf172c8bb66e22e31b41dab3c37e05d SHA512 27c98b1a81ec2f408bfd4caf2a225169b6b0b6a7d8c216a91e409670ed4e6af6e5184e0f64b123a5411cf257ed740b2b4a1cb3e85d25e215b6db037d75674dc0 WHIRLPOOL ee3598ed0b665901125a9a6e8ea532652a776388fb7df54399da846d038f5dd662d52c1e58477535773fcce2f446992a9922bc3a85efe7118fbf06b7304871fa
--- a/app-mobilephone/esms/esms-0.9.5.ebuild
+++ b/app-mobilephone/esms/esms-0.9.5.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="A small console program to send SMS messages to Spanish cellular phones"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://esms.sourceforge.net"
-
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-perl/libwww-perl-5.64 \
-	>=dev-perl/HTML-Parser-3.26 \
-	>=dev-perl/HTML-Tree-3.11
-	>=dev-lang/perl-5.6.1"
-RDEPEND="${DEPEND}"
-
-src_compile() { :; }
--- a/app-mobilephone/esms/metadata.xml
+++ b/app-mobilephone/esms/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>A small console program to send SMS messages to Spanish cellular phones.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">esms</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-office/texmacs/files/TeXmacs.desktop
+++ b/app-office/texmacs/files/TeXmacs.desktop
@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Exec=texmacs
-Icon=/usr/share/TeXmacs/misc/pixmaps/TeXmacs.xpm
-Name=TeXmacs
-GenericName=Scientific Word Processor
-Comment=A scientific word processing application.
-Categories=Office;WordProcessor;
--- a/app-pda/fusepod/Manifest
+++ b/app-pda/fusepod/Manifest
@ -1 +0,0 @@
-DIST fusepod-0.5.2.tar.bz2 80923 SHA256 210d77cb2ec7701d4af681e63c4f52bc4d0c8cbfa493f55d3d9580e7106b857f SHA512 a3c0c3ba1fea80656a067d61a9b274a20522d0940db9c505a5268cd2f607bf0cf8e990f02de7fb80e3e9c71ddae482e163d4d22f6b57f0867f45a86076492a33 WHIRLPOOL 5e2a065e3c6ab9abe87271cf8f8b3f1a74125f13477852d34ece683eb35684dff9964d3a466435ba50165da23d1131dbf0c70a887f69a3a3e54283aa9b1ad881
--- a/app-pda/fusepod/files/fusepod-0.5.2-missing_include.patch
+++ b/app-pda/fusepod/files/fusepod-0.5.2-missing_include.patch
@ -1,12 +0,0 @@
--- src/fusepod_util.h
-+++ src/fusepod_util.h
-@@ -15,6 +15,9 @@
- #ifndef _FUSEPOD_UTIL_H_
- #define _FUSEPOD_UTIL_H_
- 
-+#include <stdio.h> /* sprintf */
-+#include <string.h> /* strcasecmp */
-+
- #include <vector>
- #include <string>
- 
--- a/app-pda/fusepod/fusepod-0.5.2.ebuild
+++ b/app-pda/fusepod/fusepod-0.5.2.ebuild
@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A userspace filesystem which mounts your iPod into a directory"
-HOMEPAGE="https://sourceforge.net/projects/fusepod/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libgpod
-	media-libs/taglib
-	sys-fs/fuse"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS NEWS README README.fuse THANKS TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing_include.patch
-}
--- a/app-pda/fusepod/metadata.xml
+++ b/app-pda/fusepod/metadata.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">fusepod</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-text/gspell/gspell-1.4.1.ebuild
+++ b/app-text/gspell/gspell-1.4.1.ebuild
@ -26,7 +26,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.25
-	>=dev-util/intltool-0.35.0
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
 "
--- a/app-text/mbtpdfasm/Manifest
+++ b/app-text/mbtpdfasm/Manifest
@ -1,2 +0,0 @@
-DIST mbtPdfAsm-1.0.28.tar.gz 253032 SHA256 e416aab7d805308f82f3cbe91f964eab6be5da8a232bd52e13a048740194048f SHA512 78cd744e1ffbf7db1b3fb27d8edf369382ff0e9c48634b85f13734561dceef1a22bae7e001ad01567e924d41465bb03f16480f3e588b060bcd5e2c50b14dc016 WHIRLPOOL ae1db87ddc46ec4814ffe5d5442d0171537e7b9af69ba41bee81c2926edc097fd2e30b4247cd1098e6170946571d11e60e5e20ce49a891f15212eeecafed8ecc
-DIST mbtpdfasm-1.0.28-manual.pdf.bz2 6581 SHA256 648a21a665098815dc0ae9ec1b2faa8f24a0e99ab64af1dbadf54515959cff89 SHA512 cc9660427cfe33c3b070b31676d94d8ac64940a5625c7441cb1401d09e828be077fa7d67d0496fa71ef1c50a077c8882a89f63f76f8531cae00aff5edf6e1fa2 WHIRLPOOL f70a5cc91ecc4f27c2e38a7316debf0be7134cacd5e17ad00334394aed246d8111409a8fcf6179350be4e9e73778345cd67b3125348f7a6ebe332c64daf45104
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-64bit.diff
@ -1,37 +0,0 @@
--- pdfFile.hpp.orig	2007-07-26 16:32:50.000000000 +0200
-+++ pdfFile.hpp	2007-10-05 22:40:50.000000000 +0200
-@@ -161,7 +161,7 @@
- 
-       //int findInheritRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
-       int makeRes(C_pdfFile *org, char *fBuf, int lg, char **pcRes);
-      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, char *add, int lgAdd);
-+      int makeAttrib(C_pdfFile *org, char *fBuf, int lgOrgBuf, char **pcRes, int add, int lgAdd);
- 
-       bool fast; // version rapide, on ne gère pas les options
-       bool closed; //protection plus rien n'est possible aprés l'appel à la fonction close
--- pdfFile.cpp.orig	2007-08-22 20:44:31.000000000 +0200
-+++ pdfFile.cpp	2007-10-05 22:42:39.000000000 +0200
-@@ -934,7 +934,7 @@
- /* ********************************************** */
- #pragma warning(disable : 4100)
- 
-int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, char *add, int lgAdd) {
-+int C_pdfFile::makeAttrib(C_pdfFile *org, char *buf, int lgOrgBuf, char **pcRes, int add, int lgAdd) {
- char *pc;
- int lgRes, lgBuf, j, nObj, r;
- 
-@@ -973,12 +973,12 @@
-    }
- 
-    if ( (lgAdd != 0) && (add != 0) ) {
-      switch ( (int)add ) {
-+      switch ( add ) {
-       case _Resources:
- 
-          break;
-       default:
-         memcpy(pc + lgRes, add + sizeof(int), lgAdd);
-+         memcpy(pc + lgRes, (char *)add + sizeof(int), lgAdd);
-          lgRes += lgAdd;
-       }
-    }
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-main.diff
@ -1,11 +0,0 @@
--- main.cpp.orig	2007-07-30 15:25:27.000000000 +0200
-+++ main.cpp	2007-10-05 22:49:29.000000000 +0200
-@@ -52,7 +52,7 @@
- char tc[1000];
- int i;
- 
-   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s", strVersion, strMPAURL);
-+   fprintf(output, "mbtPdfAsm %s\r\nusing PCRE 4.4 (http://www.pcre.org)\r\nsee at %s\n", strVersion, strMPAURL);
- 
-    return 0;
- }
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-makefile.diff
@ -1,101 +0,0 @@
--- makefile.orig	2007-07-26 19:33:54.000000000 +0200
-+++ makefile	2007-10-05 22:54:31.000000000 +0200
-@@ -10,66 +10,66 @@
- ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
- #
- $(EXENAME): $(LF) $(ZLIB)
-	$(CC) $(LF) $(ZLIB) -o $@
-+	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
- $(O)/main.o: main.cpp
-	$(CC) -c main.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
- $(O)/pdfFile.o: pdfFile.cpp
-	$(CC) -c pdfFile.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfFile.cpp -o $*.o
- $(O)/pdfObject.o: pdfObject.cpp
-	$(CC) -c pdfObject.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfObject.cpp -o $*.o
- $(O)/pdfEncrypt.o: pdfEncrypt.cpp
-	$(CC) -c pdfEncrypt.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfEncrypt.cpp -o $*.o
- $(O)/pdfNames.o: pdfNames.cpp
-	$(CC) -c pdfNames.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfNames.cpp -o $*.o
- $(O)/pdfFileOutline.o: pdfFileOutline.cpp
-	$(CC) -c pdfFileOutline.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfFileOutline.cpp -o $*.o
- $(O)/pdfXrefTable.o: pdfXrefTable.cpp
-	$(CC) -c pdfXrefTable.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfXrefTable.cpp -o $*.o
- $(O)/string.o: string.cpp
-	$(CC) -c string.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c string.cpp -o $*.o
- $(O)/pdfString.o: pdfString.cpp
-	$(CC) -c pdfString.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c pdfString.cpp -o $*.o
- $(O)/rc4.o: rc4.cpp
-	$(CC) -c rc4.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c rc4.cpp -o $*.o
- $(O)/md5.o: md5.c
-	$(CC) -c md5.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c md5.c -o $*.o
- $(O)/listeFichiers_linux.o: listeFichiers_linux.cpp
-	$(CC) -c listeFichiers_linux.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c listeFichiers_linux.cpp -o $*.o
- $(O)/diversPdf.o: diversPdf.cpp
-	$(CC) -c diversPdf.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c diversPdf.cpp -o $*.o
- $(O)/strMatcher.o: strMatcher.cpp
-	$(CC)  -c strMatcher.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c strMatcher.cpp -o $*.o
- $(O)/pcre.o: pcre.c
-	$(CC) -c pcre.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c pcre.c -o $*.o
- $(O)/study.o: study.c
-	$(CC) -c study.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c study.c -o $*.o
- $(O)/get.o: get.c
-	$(CC) -c get.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c get.c -o $*.o
- $(O)/maketables.o: maketables.c
-	$(CC) -c maketables.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c maketables.c -o $*.o
- $(O)/calc.o: calc.cpp
-	$(CC) -c calc.cpp -o $*.o
-+	$(CC) $(CXXFLAGS) -c calc.cpp -o $*.o
- $(O)/adler32.o: adler32.c zlib.h zconf.h
-	$(CC) -c adler32.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c adler32.c -o $*.o
- $(O)/compress.o: compress.c zlib.h zconf.h
-	$(CC) -c compress.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c compress.c -o $*.o
- $(O)/crc32.o: crc32.c zlib.h zconf.h crc32.h
-	$(CC) -c crc32.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c crc32.c -o $*.o
- $(O)/deflate.o: deflate.c deflate.h zutil.h zlib.h zconf.h
-	$(CC) -c deflate.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c deflate.c -o $*.o
- $(O)/gzio.o: gzio.c zutil.h zlib.h zconf.h
-	$(CC) -c gzio.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c gzio.c -o $*.o
- $(O)/infback.o: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-	$(CC) -c infback.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c infback.c -o $*.o
- $(O)/inffast.o: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
-	$(CC) -c inffast.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c inffast.c -o $*.o
- $(O)/inflate.o: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
-	$(CC) -c inflate.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c inflate.c -o $*.o
- $(O)/inftrees.o: inftrees.c zutil.h zlib.h zconf.h inftrees.h
-	$(CC) -c inftrees.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c inftrees.c -o $*.o
- $(O)/trees.o: trees.c zutil.h zlib.h zconf.h deflate.h trees.h
-	$(CC) -c trees.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c trees.c -o $*.o
- $(O)/uncompr.o: uncompr.c zlib.h zconf.h
-	$(CC) -c uncompr.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c uncompr.c -o $*.o
- $(O)/zutil.o: zutil.c zutil.h zlib.h zconf.h
-	$(CC) -c zutil.c -o $*.o
-+	$(CC) $(CXXFLAGS) -c zutil.c -o $*.o
--- a/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
+++ b/app-text/mbtpdfasm/files/mbtpdfasm-1.0.28-zlib.diff
@ -1,26 +0,0 @@
-diff -Naur work.orig/makefile work/makefile
--- work.orig/makefile	2010-07-21 01:11:54.390456452 +0200
-+++ work/makefile	2010-07-21 01:12:22.843456093 +0200
-@@ -9,8 +9,8 @@
- LF = $(O)/main.o $(O)/pdfFile.o $(O)/pdfXrefTable.o $(O)/string.o $(O)/rc4.o $(O)/md5.o $(O)/pdfString.o $(O)/listeFichiers_linux.o $(O)/diversPdf.o $(O)/strMatcher.o $(O)/pcre.o $(O)/study.o $(O)/get.o $(O)/maketables.o $(O)/pdfEncrypt.o $(O)/pdfFileOutline.o $(O)/pdfNames.o $(O)/pdfObject.o $(O)/calc.o
- ZLIB = $(O)/adler32.o $(O)/compress.o $(O)/crc32.o $(O)/deflate.o $(O)/gzio.o $(O)/infback.o $(O)/inffast.o $(O)/inflate.o $(O)/inftrees.o $(O)/trees.o $(O)/uncompr.o $(O)/zutil.o
- #
-$(EXENAME): $(LF) $(ZLIB)
-	$(CC) $(LDFLAGS) $(LF) $(ZLIB) -o $@
-+$(EXENAME): $(LF)
-+	$(CC) $(LDFLAGS) $(LF) -lz -o $@
- $(O)/main.o: main.cpp
- 	$(CC) $(CXXFLAGS) -c main.cpp -o $*.o
- $(O)/pdfFile.o: pdfFile.cpp
-diff -Naur work.orig/pdfObject.cpp work/pdfObject.cpp
--- work.orig/pdfObject.cpp	2007-08-22 20:13:56.000000000 +0200
-+++ work/pdfObject.cpp	2010-07-21 01:11:54.486455713 +0200
-@@ -1,7 +1,7 @@
- #include "pdfObject.hpp"
- #include "pdfXrefTable.hpp"
- #include "diversPdf.hpp"
-#include "zlib.h"
-+#include <zlib.h>
- #include <stdlib.h>
- 
- #ifdef DEBUG_MEM_LEAK
--- a/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
+++ b/app-text/mbtpdfasm/mbtpdfasm-1.0.28-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P="mbtPdfAsm-${PV}"
-
-DESCRIPTION="Tool to assemble/merge, extract information from, and update the metadata in PDF"
-HOMEPAGE="http://thierry.schmit.free.fr/dev/mbtPdfAsm/mbtPdfAsm2.html"
-SRC_URI="http://thierry.schmit.free.fr/spip/IMG/gz/${MY_P}.tar.gz
-	http://sbriesen.de/gentoo/distfiles/${P}-manual.pdf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.diff"
-	epatch "${FILESDIR}/${P}-64bit.diff"
-	epatch "${FILESDIR}/${P}-main.diff"
-
-	# use system zlib
-	epatch "${FILESDIR}/${P}-zlib.diff"
-	mv -f "zlib.h" "zlib.h.disabled"
-}
-
-src_compile() {
-	emake CC="$(tc-getCXX)" || die "emake failed"
-}
-
-src_install() {
-	dobin mbtPdfAsm || die "install failed"
-	insinto "/usr/share/doc/${PF}"
-	newins ${P}-manual.pdf mbtPdfAsm.pdf
-}
--- a/app-text/mbtpdfasm/metadata.xml
+++ b/app-text/mbtpdfasm/metadata.xml
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		This program can be used to assemble/merge PDF files, extract
-		information from PDF files, and update the metadata in PDF files.
-	</longdescription>
-</pkgmetadata>
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"

 IUSE=""

--- a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/602166
+
+diff -Naur a/mainwindow.cpp b/mainwindow.cpp
+--- a/mainwindow.cpp	2017-07-31 18:06:33.206668001 -0400
+++ b/mainwindow.cpp	2017-07-31 18:07:09.685940997 -0400
+@@ -781,7 +781,7 @@
+  ******************************************************************************/
+ void MainWindow::find  () throw() {
+ 
+-	auto autoSettingsReset asr(sui);  // dtor calls sui->reset()
+	autoSettingsReset asr(sui);  // dtor calls sui->reset()
+ 
+ 	bool modeAdvanced = ui->actionAdvanced->isChecked();
+ 	qDebug() << "modeAdvanced-" << modeAdvanced;
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST kedpm-0.4.0.tar.gz 61636 SHA256 f1dfb44a990110fddf132c9841f40aa2b9848ade4be56957a8a572574dc2fc28 SHA512 f6d73d4aab2b9184774e4a109bdf7401b96d9d9417e30a30d34958b9bee709e46676d68bb82e401b10b2eb32c56b6c8b1bb3947880cafb6e11d644d7f718a0f5 WHIRLPOOL 0a531e29ab66849fc5098ea8838bf53df340135650f312d5b1dc38231cddf797f02d3c3f8e2157b909bf954af5a65115d7814ba475924432a38d2b89341cf2df`
				`@ -1 +0,0 @@`
				`DIST Snapback2-1.001.tar.gz 31099 SHA256 64512b0aae7df5bf80a74cc9e89c15fbe7c09aa435ea85d38f4b9f582aabecd2 SHA512 11d4a02fffd668f852e93554afbf7c76d1b06fd2cf88e3681489f206e8b1f8a21ae2b3718730f547660c4bcf3bef7eb358c4c809382199c864483ec9d4ab3983 WHIRLPOOL 790e847c2d5586ac104a6719f66b023ff28151b126e332a6d7bce7eda5c659e9f75675dc90c31fb1a4336099b40a1bcd4a00a0429afefeed0bdaa548a29e0072`
				`@ -1 +0,0 @@`
				`DIST mp-5.2.2.tar.gz 583918 SHA256 f4c04315e6a0a3b831f218f73904afd3c227aa18b67ab21b39dffbb54edfea1f SHA512 44c9b7ded38c294ffc90240ac73848a799294584f20bb981d95f8dde4f281ea9242b6ff8aefdb490e9e02effaab6cbc5bdf94ea489af838a89038113c43da131 WHIRLPOOL 0feba9d14b0f0a5addf153e0ce4d4186b90392c78d2154200cea665880861cef07fdcbfc7d841ef736a3852d8523290d2f5fdbad87f1ab20894e2a32e9df78d7`
				`@ -1 +0,0 @@`
				`DIST flasm-1.63.zip 111912 SHA256 df1273a506e2479cf95775197f5b7fa94e29fe1e0aae5aa190ed5bbebc4be5c6 SHA512 af53c8902bac9bc03a4274f51280abe7e595f19d8ee367c0237868634df58a42144bb6c335a99f860c494da90d483072c66064897ef1ad467b7621c648ca322a WHIRLPOOL e69860fdfa5be54235c0a02f2b77e30e4a2735b6785aa45260a2bdb55ff8a2edd366c1c9dadc93c7ac76886bd0070c4b6220a38365b6ba3135a1ade19a7ef103`
				`@ -1 +0,0 @@`
				`DIST gnomecatalog-0.3.4.2.tar.bz2 58983 SHA256 4bd0352b994b9d63be3eb465db57dee38d4f87adff8c0b901687b735cc7dfa4e SHA512 fa72e58d429d9fcf62adde848e942f83a6b6b8e0e9ad3121f1ffdb6547b9299ae2200a08aa9b1b191b5c994c09a0a33de421c3715fc96717e17ddafd9fbe55f2 WHIRLPOOL 87a64d6e2bae56c7af66d12c5f1bdb5775b9f842b6e329975fbe5625024ce5488e1843e985d36e8963b79ad43eabb866005a7aeb50e220bfd5a8eda380c92631`
				`@ -1 +0,0 @@`
				`DIST relevation-1.3.tar.gz 28053 SHA256 aa31c2a1a5ae0aa6b836e061bc504d0164c664c819a2259bc3c08fd0039859bf SHA512 42aab7107a63b1a9e6908cd8e49c3775f41f8acd025ee633bbac09ed5648c7bbfa584ed9bbfbfee12d26ab648b457aa974d8d52753a6b4faec3bd8ab605fec05 WHIRLPOOL c713f0a7da744e73df4b21f03995ee9fdd16ffaaab6e42ddb030c1b7b2476d61deb65ee787d76cbbae3b5834ec592cbfe35cab74ac46d529df431b2d50406952`
				`@ -1 +0,0 @@`
				`DIST esms-0.9.5.tar.gz 33282 SHA256 47618263776ef1284812a8e44d046441bbf172c8bb66e22e31b41dab3c37e05d SHA512 27c98b1a81ec2f408bfd4caf2a225169b6b0b6a7d8c216a91e409670ed4e6af6e5184e0f64b123a5411cf257ed740b2b4a1cb3e85d25e215b6db037d75674dc0 WHIRLPOOL ee3598ed0b665901125a9a6e8ea532652a776388fb7df54399da846d038f5dd662d52c1e58477535773fcce2f446992a9922bc3a85efe7118fbf06b7304871fa`
				`@ -1 +0,0 @@`
				`DIST fusepod-0.5.2.tar.bz2 80923 SHA256 210d77cb2ec7701d4af681e63c4f52bc4d0c8cbfa493f55d3d9580e7106b857f SHA512 a3c0c3ba1fea80656a067d61a9b274a20522d0940db9c505a5268cd2f607bf0cf8e990f02de7fb80e3e9c71ddae482e163d4d22f6b57f0867f45a86076492a33 WHIRLPOOL 5e2a065e3c6ab9abe87271cf8f8b3f1a74125f13477852d34ece683eb35684dff9964d3a466435ba50165da23d1131dbf0c70a887f69a3a3e54283aa9b1ad881`