Sync with portage [Thu Jul 6 07:26:23 MSK 2017].

7 years ago · 5d18b7478c
parent f657800f0b
commit 5d18b7478c
775 changed files with 5337 additions and 12148 deletions
--- a/app-admin/lastpass-cli/Manifest
+++ b/app-admin/lastpass-cli/Manifest
@ -1,2 +1,3 @@
 DIST lastpass-cli-1.0.0.tar.gz 92311 SHA256 42096c0bd3972b0e9cc9cef32fbf141e47b04b9e2387fb3abe8b105e135fb41e SHA512 4709b3e4d6064c8c5cb593344e6417355d7df570240dce8eb77a19f3377ea38585280a9602cf8ab926c55c6afd84b297f261b0c8a40d355734d5cc542d46f610 WHIRLPOOL 394bfb597f5262dd1e47c7a3c48ef093b398f90c6dcacac6b172bb008891c76faf448ecf6be0ebfa277d18d335b166b7efadc063acc57ce88274004d1734bf21
 DIST lastpass-cli-1.1.2.tar.gz 102796 SHA256 bc737d8e6d713c8aecdfb7f34b29aa9a8ae9b1e9ba80b31059686b18591a8c39 SHA512 8115cb07cfca15ef402bdbd8ce943352e1534ddb781274e21cb0fafa4bcd9ab7abe4ddba57c4ebbce326f09cc9249f244607d16cac5597e61cf21c73417e7d9c WHIRLPOOL c7e6a4d5ac9b8c52f53e081b367289b390704fa4dfbf13a9ea0086e4ca0d49f9ef5a39f9ea854387ffb66fbd18f9b5263d17ae6573c4286fb7a36ebdce724d7f
+DIST lastpass-cli-1.2.1.tar.gz 108780 SHA256 1a49a37a67a973296e218306e6d36c9383347b1833e5a878ebc08355b1c77456 SHA512 c7c9f20dbc083873b815834320828a30a1c488571efbfc5aea47c3bd2073819d713810c785855d4c0c208e1b95aa0e5fc550a0b6b5c0f787eca1f54589e18e62 WHIRLPOOL c74988f37c96d065c0fea58c946c3aa3f4925d889247247b89ffe25012077d8eb3c694a3d539a40cf3f2be1fdd195b6ef6c1ef2d429587cc18fb8a8db8fb8a93
--- a/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.2.1.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils bash-completion-r1
+
+DESCRIPTION="Interfaces with LastPass.com from the command line."
+HOMEPAGE="https://github.com/lastpass/lastpass-cli"
+SRC_URI="https://github.com/lastpass/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl X +pinentry test"
+
+RDEPEND="
+	X? ( || ( x11-misc/xclip x11-misc/xsel ) )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-misc/curl
+	dev-libs/libxml2
+	pinentry? ( app-crypt/pinentry )
+"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBASH_COMPLETION_COMPLETIONSDIR="$(get_bashcompdir)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile all doc-man $(usex test lpass-test '')
+}
+
+src_install() {
+	cmake-utils_src_install install install-doc
+}
+
+src_test() {
+	local myctestargs=(
+		-j1 # Parallel tests fail
+	)
+
+	# The path to lpass-test is hardcoded to "${S}"/build/lpass-test
+	# which is incorrect for our out-of-source build
+	sed -e "s|TEST_LPASS=.*|TEST_LPASS=\"${BUILD_DIR}/lpass-test\"|" \
+		-i "${S}"/test/include.sh
+
+	cmake-utils_src_test
+}
--- a/app-backup/boxbackup/Manifest
+++ b/app-backup/boxbackup/Manifest
@ -1 +0,0 @@
-DIST boxbackup-0.11.1.tgz 1863270 SHA256 1328b010477259c4767276dbfebab6580e883336cc9d25696c39991b09cc6d32 SHA512 15ceceae3659f14254f422136805a8b3ed3c39d14f8a1ffd0c96efb05b7acb5be310e13144ed86fe4afd24a3c0b86ec771b7d3a9f08b2789bb98e18468ca97f8 WHIRLPOOL 9abcae4e907d526e6df0ebfee813cd374e8f981e5f25e0a2cbc2e958e0bf4d0ce10a455d71e036dc13aa31c01c422349cdbb1f1a36a0ea8ae16cf2b14f0f97fc
--- a/app-backup/boxbackup/boxbackup-0.11.1-r2.ebuild
+++ b/app-backup/boxbackup/boxbackup-0.11.1-r2.ebuild
@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="A completely automatic on-line backup system"
-HOMEPAGE="http://boxbackup.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-SRC_URI="http://boxbackup.org/svn/box/packages/${P/_/}.tgz"
-
-# GPL-2 is included for the init script, bug 425884.
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x86-macos"
-IUSE="client-only libressl"
-DEPEND="sys-libs/zlib
-	sys-libs/db:=
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-lang/perl-5.6"
-RDEPEND="${DEPEND}
-	virtual/mta"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.11_rc8-testbbackupd.patch"
-	"${FILESDIR}/${PN}-0.11.1-fix-Wformat-security.patch"
-	"${FILESDIR}/${PN}-0.11.1-fix-mandir.patch"
-)
-
-src_compile() {
-	# Bug 299411.
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	emake -j1 DESTDIR="${D}" install-backup-client
-
-	dodoc BUGS.txt CONTACT.txt DOCUMENTATION.txt ExceptionCodes.txt THANKS.txt
-	newinitd "${FILESDIR}"/bbackupd.rc bbackupd
-
-	if ! use client-only ; then
-		emake -j1 DESTDIR="${D}" install-backup-server
-		newinitd "${FILESDIR}"/bbstored.rc bbstored
-	fi
-
-	keepdir /etc/boxbackup
-}
-
-pkg_preinst() {
-	if ! use client-only ; then
-		enewgroup bbstored
-		enewuser bbstored -1 -1 -1 bbstored
-	fi
-}
-
-pkg_postinst() {
-	while read line; do elog "${line}"; done <<EOF
-After configuring the Box Backup client and/or server, you can start
-the daemon using the init scripts /etc/init.d/bbackupd and
-/etc/init.d/bbstored.
-The configuration files can be found in /etc/boxbackup
-
-More information about configuring the client can be found at
-${HOMEPAGE}client.html,
-and more information about configuring the server can be found at
-${HOMEPAGE}server.html.
-EOF
-	echo
-}
--- a/app-backup/boxbackup/files/bbackupd.rc
+++ b/app-backup/boxbackup/files/bbackupd.rc
@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin "Starting box backup daemon"
-	start-stop-daemon --start --exec /usr/sbin/bbackupd > /dev/null
-	eend $?
-}
- 
-stop() {
-	ebegin "Stopping box backup daemon"
-	start-stop-daemon --stop --exec /usr/sbin/bbackupd
-	eend $?
-}
--- a/app-backup/boxbackup/files/bbstored.rc
+++ b/app-backup/boxbackup/files/bbstored.rc
@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	use net
-}
-
-start() {
-	ebegin "Starting box backup store daemon"
-	start-stop-daemon --start --exec /usr/sbin/bbstored > /dev/null
-	eend $?
-}
- 
-stop() {
-	ebegin "Stopping box backup store daemon"
-	start-stop-daemon --stop --exec /usr/sbin/bbstored
-	eend $?
-}
--- a/app-backup/boxbackup/files/boxbackup-0.11.1-fix-Wformat-security.patch
+++ b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-Wformat-security.patch
@ -1,27 +0,0 @@
-From 53e968624b5540bf0c97bb69636f1bc908f9b00a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Wed, 3 Aug 2016 16:38:23 -0400
-Subject: [PATCH 1/1] bin/bbackupquery/BackupQueries.cpp: fix trivial
- -Wformat-security warning.
-
-Gentoo-Bug: 520978
---
- bin/bbackupquery/BackupQueries.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/bbackupquery/BackupQueries.cpp b/bin/bbackupquery/BackupQueries.cpp
-index 0418ec9..b377218 100644
--- a/bin/bbackupquery/BackupQueries.cpp
-+++ b/bin/bbackupquery/BackupQueries.cpp
-@@ -613,7 +613,7 @@ void BackupQueries::List(int64_t DirID, const std::string &rListRoot, const bool
- 			// terminate
- 			*(f++) = ' ';
- 			*(f++) = '\0';
-			printf(displayflags);
-+			printf("%s", displayflags);
- 			
- 			if(en_flags != 0)
- 			{
-- 
-2.7.3
-
--- a/app-backup/boxbackup/files/boxbackup-0.11.1-fix-mandir.patch
+++ b/app-backup/boxbackup/files/boxbackup-0.11.1-fix-mandir.patch
@ -1,14 +0,0 @@
-Install man pages into /usr/share/man instead of /usr/man. This patch
-was provided by a Gentoo user in bug 515422.
-
--- a/infrastructure/makeparcels.pl.in	2015-04-30 15:28:26.790570655 +0200
-+++ b/infrastructure/makeparcels.pl.in	2015-04-30 15:35:40.795699542 +0200
-@@ -304,7 +304,7 @@
- 		if ($type eq 'man')
- 		{
- 			$name =~ /([0-9])$/;
-			$dest = "man/man$1";
-+			$dest = "share/man/man$1";
- 			$name =~ s/$/\.gz/;
- 		}
- 
--- a/app-backup/boxbackup/files/boxbackup-0.11_rc8-testbbackupd.patch
+++ b/app-backup/boxbackup/files/boxbackup-0.11_rc8-testbbackupd.patch
@ -1,11 +0,0 @@
--- a/test/bbackupd/testbbackupd.cpp	2010-05-01 15:52:27.000000000 +0200
-+++ b/test/bbackupd/testbbackupd.cpp	2010-05-07 07:12:42.000000000 +0200
-@@ -1176,7 +1176,7 @@
- 		std::string touchfile = 
- 			"testfiles/TestDir1/spacetest/d1/touch-me";
- 
-		fd = open(touchfile.c_str(), O_CREAT | O_WRONLY);
-+		fd = open(touchfile.c_str(), O_CREAT | O_WRONLY, 700);
- 		TEST_THAT(fd > 0);
- 		// write again, to update the file's timestamp
- 		TEST_EQUAL_LINE(sizeof(buffer),
--- a/app-backup/boxbackup/metadata.xml
+++ b/app-backup/boxbackup/metadata.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>An open source, completely automatic on-line backup
-		system for UNIX.</longdescription>
-	<use>
-		<flag name="client-only">Disable server support, and just build a
-			client</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">boxbackup</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/ajaiantilal/i7z"
 SRC_URI="https://github.com/ajaiantilal/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="qt5"

 RDEPEND="
--- a/app-cdr/cdrkit/Manifest
+++ b/app-cdr/cdrkit/Manifest
@ -1,2 +0,0 @@
-DIST cdrkit-1.1.11-libcdio-paranoia.tar.xz 18664 SHA256 366727c6806f689fbb79b4bc64fe216c54428823f56f8375ff95529529231a8b SHA512 aa1e1a7a750872f80a363789573c7ccb7a30702e7770456a15abb7d2d7d2fc5f705fa8a006e022ac006d88ce985a848c2a7a33e52f1c1e91f13cac0349d8ac6e WHIRLPOOL 95610295a693bdd96c4b6f1c336b9cc2e24df38f07272691b437976228b355f6170c185c0fcc28739618147c7a2dce831765ef1598694f37c2afb60de114bac1
-DIST cdrkit_1.1.11.orig.tar.gz 1445133 SHA256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da SHA512 e5afcd2cb68d39aeff680a0d5b0a7877f94cf6de111b3cb7388261c665fbd3209ce98a20a01911875af7d6b832a156801b1fa46a4481f7c8ba60b22eac0a5b05 WHIRLPOOL e836af6a8786e38965e7238fddef3b4746234a2d96afaa18b5a23baa36c13506f78c1ec50d97b4bc7374daf5db78e9b7775184ec16f8513c10dc3b9b18a2d395
--- a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="http://cdrkit.org"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
-	https://dev.gentoo.org/~ssuominen/${P}-libcdio-paranoia.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug hfs unicode"
-
-RDEPEND="app-arch/bzip2
-	!app-cdr/cdrtools
-	dev-libs/libcdio-paranoia
-	sys-apps/file
-	sys-libs/zlib
-	unicode? ( virtual/libiconv )
-	kernel_linux? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	hfs? ( sys-apps/file )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-cmakewarn.patch \
-		"${WORKDIR}"/patches/${P}-paranoiacdda.patch \
-		"${WORKDIR}"/patches/${P}-paranoiacdio.patch
-
-	echo '.so wodim.1' > ${T}/cdrecord.1
-	echo '.so genisoimage.1' > ${T}/mkisofs.1
-	echo '.so icedax.1' > ${T}/cdda2wav.1
-	echo '.so readom.1' > ${T}/readcd.1
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dosym wodim /usr/bin/cdrecord
-	dosym genisoimage /usr/bin/mkisofs
-	dosym icedax /usr/bin/cdda2wav
-	dosym readom /usr/bin/readcd
-
-	dodoc ABOUT Changelog FAQ FORK TODO doc/{PORTABILITY,WHY}
-
-	local x
-	for x in genisoimage plattforms wodim icedax; do
-		docinto ${x}
-		dodoc doc/${x}/*
-	done
-
-	insinto /etc
-	newins wodim/wodim.dfl wodim.conf
-	newins netscsid/netscsid.dfl netscsid.conf
-
-	insinto /usr/include/scsilib
-	doins include/*.h
-	insinto /usr/include/scsilib/usal
-	doins include/usal/*.h
-	dosym usal /usr/include/scsilib/scg
-
-	doman "${T}"/*.1
-}
--- a/app-cdr/cdrkit/files/cdrkit-1.1.11-cmakewarn.patch
+++ b/app-cdr/cdrkit/files/cdrkit-1.1.11-cmakewarn.patch
@ -1,10 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/cdrkit.git/tree/cdrkit-1.1.11-cmakewarn.patch
-
--- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -1,3 +1,5 @@
-+cmake_minimum_required(VERSION 2.8)
-+cmake_policy(SET CMP0015 OLD)
- PROJECT (cdrkit C)
- SUBDIRS(include genisoimage wodim libedc libhfs_iso icedax libusal librols libunls readom netscsid 3rd-party/dirsplit)
- 
--- a/app-cdr/cdrkit/metadata.xml
+++ b/app-cdr/cdrkit/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 -->
-<use>
-	<flag name="hfs">Provide building of HFS (Apple) CD-images</flag>
-</use>
-</pkgmetadata>
--- a/app-dicts/gjiten/Manifest
+++ b/app-dicts/gjiten/Manifest
@ -1 +0,0 @@
-DIST gjiten-2.6.tar.gz 564845 SHA256 f6c0cc69e1e59ed8c3a946a1ee3e4a5e2e1deb16890bfc5f67c055adb10a71dd SHA512 ef56ad2fdcbe9c1b2df59dbb0cb4036ab2cf90e0fa290275b5dbfb0cfe66521231da48dc710a2837bd1d4402cf2bfb219b952a85e0a482062eade316c04e0bfa WHIRLPOOL 857a38294bc8860f9e8be2dd856ed111385a911c872d39f9c64e6c3cf953dd6662c043ef4679e5f956e6ddaed16f4fd3d02d0d5fd45ac1d318ef68a802aee9eb
--- a/app-dicts/gjiten/files/gjiten-2.6-desktop.patch
+++ b/app-dicts/gjiten/files/gjiten-2.6-desktop.patch
@ -1,13 +0,0 @@
--- gnome/gjiten.desktop.in.old	2014-07-08 13:04:35.418149539 +0200
-+++ gnome/gjiten.desktop.in	2014-07-08 13:04:55.390544064 +0200
-@@ -3,8 +3,8 @@
- _Name=Gjiten
- _Comment=Japanese dictionary
- Exec=gjiten
-Icon=jiten.png
-+Icon=jiten
- StartupNotify=true
- Terminal=false
- Type=Application
-Categories=GNOME;Application;Utility;
-+Categories=GNOME;Utility;
--- a/app-dicts/gjiten/files/gjiten-2.6-drop-gnome.patch
+++ b/app-dicts/gjiten/files/gjiten-2.6-drop-gnome.patch
@ -1,20 +0,0 @@
-diff --git a/configure.in b/configure.in
-index aec96d4..733eee6 100644
--- a/configure.in
-+++ b/configure.in
-@@ -18,7 +18,6 @@ AC_PROG_MAKE_SET
- AC_PROG_INTLTOOL([0.22])
- AC_PATH_PROG([GCONFTOOL], [gconftool-2])
- 
-GNOME_COMMON_INIT
- dnl GNOME_PLATFORM_GNOME_2(yes, force)
- PKG_CHECK_MODULES(GJITEN, libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 libglade-2.0 gconf-2.0)
- AM_GCONF_SOURCE_2
-@@ -36,7 +35,6 @@ AC_FUNC_MMAP
- AC_FUNC_STAT
- AC_CHECK_FUNCS([getcwd putenv setlocale strerror strrchr strstr munmap])
- 
-GNOME_COMPILE_WARNINGS(maximum)
- 
- # Gettext stuff
- GETTEXT_PACKAGE=gjiten
--- a/app-dicts/gjiten/files/gjiten-2.6-pref.patch
+++ b/app-dicts/gjiten/files/gjiten-2.6-pref.patch
@ -1,13 +0,0 @@
-diff --git a/src/pref.c b/src/pref.c
-index 9c5e07d..6c0e13d 100644
--- a/src/pref.c
-+++ b/src/pref.c
-@@ -271,7 +271,7 @@ static void up_dict(GtkWidget *button) {
- 			gtk_list_store_swap(GTK_LIST_STORE(model), &iter, &tmpiter);
- 		}
- 	}
-	g_free(treepath);
-+	gtk_tree_path_free(treepath);
- }
- 
- 
--- a/app-dicts/gjiten/gjiten-2.6-r3.ebuild
+++ b/app-dicts/gjiten/gjiten-2.6-r3.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 readme.gentoo
-
-DESCRIPTION="A Japanese dictionary program for Gnome"
-HOMEPAGE="http://gjiten.sourceforge.net/"
-SRC_URI="http://gjiten.sourceforge.net/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.2
-	>=gnome-base/libglade-2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.1.2
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Dictionary files are necessary in order for
-Gjiten to function.
-
-Download dictionary files from:
-http://ftp.cc.monash.edu.au/pub/nihongo/00INDEX.html#dic_fil
-
-You need kanjidic and edict at a minimum.  Dictionary files
-must be converted to UTF-8 format - check the Gjiten help
-and README files for details.
-
-A shell script is available from
-the Gjiten homepage(${HOMEPAGE}) to
-download and convert the dictionary files, but you need
-to put the files in /usr/share/gjiten after running the script."
-
-src_prepare() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-	epatch "${FILESDIR}"/${P}-pref.patch
-	epatch "${FILESDIR}"/${P}-drop-gnome.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-
-	AM_OPTS="--foreign" eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
--- a/app-dicts/gjiten/metadata.xml
+++ b/app-dicts/gjiten/metadata.xml
@ -1,16 +0,0 @@
-<?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>
-	<longdescription>
-		Gjiten is a Japanese dictionary program for GNOME. Gjiten also has a
-		kanji dictionary. Any combination of stroke count, radicals and search
-		key can be used for kanji lookups.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gjiten</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-emulation/bochs/Manifest
+++ b/app-emulation/bochs/Manifest
@ -1 +1,2 @@
 DIST bochs-2.6.8.tar.gz 5075617 SHA256 79700ef0914a0973f62d9908ff700ef7def62d4a28ed5de418ef61f3576585ce SHA512 5e7438a6a09417cbc0b311810a485374bb9b10be452edd9daff0afacd487ada66f37b8189d4868d3420dae82ef6c38fe279d541d24f8a41bf1ca59359572e7bd WHIRLPOOL 798a40aafad7269e4708b443d6511d86236289b7b19b14d2ed33f2c80618b5b3251a7294c70433cfd0f63ebdbcf8d34fc4aa407f70c9874ff1ce2f226d72c4a0
+DIST bochs-2.6.9.tar.gz 5169187 SHA256 ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c SHA512 dfecf3a1bad07f06c2f7bb989d146e4a8eaeca493b598d415f5a4aec2a85eb5524ba417422157608c8b0828832611df487c6923c8f4ad98a147ac089fc514c46 WHIRLPOOL 9bd7c7c171d93ad2ca517bc4d02f77a617541583818c77f29eb6b4f80ec92d53a5e7126d7287f148ac501a49a5358e5a18f2a7592949acf21291182e0049adf4
--- a/app-emulation/bochs/bochs-2.6.9.ebuild
+++ b/app-emulation/bochs/bochs-2.6.9.ebuild
@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="LGPL-ed pc emulator"
+HOMEPAGE="http://bochs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bochs/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="3dnow avx debugger doc gdb ncurses readline svga sdl +smp vnc X +x86-64"
+REQUIRED_USE="
+	avx? ( x86-64 )
+	gdb? ( !debugger !smp )
+	debugger? ( !gdb )
+"
+
+RDEPEND="
+	X? ( x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXpm )
+	sdl? ( media-libs/libsdl )
+	svga? ( media-libs/svgalib )
+	readline? ( sys-libs/readline:= )
+	ncurses? ( sys-libs/ncurses:= )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook-sgml-utils )
+	X? ( x11-proto/xproto )
+	sys-apps/sed
+	>=app-text/opensp-1.5
+"
+
+src_prepare() {
+	default
+	sed -i "s:^docdir.*:docdir = ${EPREFIX}/usr/share/doc/${PF}:" \
+		Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		--enable-all-optimizations \
+		--enable-idle-hack \
+		--enable-cdrom \
+		--enable-clgd54xx \
+		--enable-cpu-level=6 \
+		--enable-disasm \
+		--enable-e1000 \
+		--enable-gameport \
+		--enable-iodebug \
+		--enable-monitor-mwait \
+		--enable-ne2000 \
+		--enable-plugins \
+		--enable-pci \
+		--enable-pnic \
+		--enable-raw-serial \
+		--enable-sb16=linux \
+		--enable-usb \
+		--enable-usb-ohci \
+		--enable-usb-xhci \
+		--prefix=/usr \
+		--with-nogui \
+		--without-wx \
+		$(use_enable 3dnow) \
+		$(use_enable avx) \
+		$(use_enable debugger) \
+		$(use_enable doc docbook) \
+		$(use_enable gdb gdb-stub) \
+		$(use_enable readline) \
+		$(use_enable smp) \
+		$(use_enable x86-64) \
+		$(use_with ncurses term) \
+		$(use_with sdl) \
+		$(use_with svga) \
+		$(use_with vnc rfb) \
+		$(use_with X x) \
+		$(use_with X x11) \
+		${myconf}
+}
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r4.ebuild
@ -0,0 +1,103 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils flag-o-matic pax-utils toolchain-funcs
+
+P_FD="dosemu-freedos-1.0-bin"
+COMMIT="15cfb41ff20a052769d753c3262c57ecb050ad71"
+
+DESCRIPTION="DOS Emulator"
+HOMEPAGE="http://www.dosemu.org/"
+SRC_URI="mirror://sourceforge/dosemu/${P_FD}.tgz
+	https://sourceforge.net/code-snapshots/git/d/do/dosemu/code.git/dosemu-code-${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="X svga gpm debug alsa sndfile fluidsynth"
+
+RDEPEND="X? ( x11-libs/libX11
+		x11-libs/libXxf86vm
+		x11-libs/libXau
+		x11-libs/libXext
+		x11-libs/libXdmcp
+		x11-apps/xset
+		x11-apps/xlsfonts
+		x11-apps/bdftopcf
+		x11-apps/mkfontdir )
+	svga? ( media-libs/svgalib )
+	gpm? ( sys-libs/gpm )
+	alsa? ( media-libs/alsa-lib )
+	sndfile? ( media-libs/libsndfile )
+	fluidsynth? ( media-sound/fluidsynth
+		media-sound/fluid-soundfont )
+	media-libs/libsdl
+	>=sys-libs/slang-1.4"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xf86dgaproto )
+	>=sys-devel/autoconf-2.57"
+
+S="${WORKDIR}/${PN}-code-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fortify.patch
+	"${FILESDIR}"/${PN}-1.4.1_pre20091009-dash.patch
+	"${FILESDIR}"/${P}-no-glibc.patch
+	"${FILESDIR}"/${P}-flex-2.6.3.patch
+	"${FILESDIR}"/${P}-ia16-ldflags.patch
+	"${FILESDIR}"/${P}-fix-inline.patch
+)
+
+src_prepare() {
+	default
+
+	# Has problems with -O3 on some systems
+	replace-flags -O[3-9] -O2
+
+	# This one is from media-sound/fluid-soundfont (bug #479534)
+	sed "s,/usr/share/soundfonts/default.sf2,${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2,"\
+		-i src/plugin/fluidsynth/mid_o_flus.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# workaround binutils ld.gold bug #618366
+	local nopie_flag=
+	if tc-enables-pie; then
+		if gcc-specs-pie; then
+			# before gcc got upstream support for '-no-pie'
+			nopie_flag=-nopie
+		else
+			nopie_flag=-no-pie
+		fi
+	fi
+
+	econf $(use_with X x) \
+		$(use_with svga svgalib) \
+		$(use_enable debug) \
+		$(use_with gpm) \
+		$(use_with alsa) \
+		$(use_with sndfile) \
+		$(use_with fluidsynth) \
+		--with-fdtarball="${DISTDIR}"/${P_FD}.tgz \
+		--sysconfdir="${EPREFIX}"/etc/dosemu/ \
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		IA16_LDFLAGS_EXTRA=${nopie_flag}
+}
+
+src_compile() {
+	emake AR=$(tc-getAR)
+}
+
+src_install() {
+	default
+
+	# r - randmmap: dosemu tries to get address mapping
+	#     exactly where asked, loops otherwise.
+	# m - allow RWX mapping: as it's an emulator / code loader
+	pax-mark -mr "${ED}/usr/bin/dosemu.bin"
+}
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fix-inline.patch
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-fix-inline.patch
@ -0,0 +1,14 @@
+diff --git a/src/dosext/sound/sound.c b/src/dosext/sound/sound.c
+index f33f78f..f429362 100644
+--- a/src/dosext/sound/sound.c
+++ b/src/dosext/sound/sound.c
+@@ -173,3 +173,3 @@ void sb_cms_write (ioport_t port, Bit8u value);
+ 
+-inline void sb_mixer_register_write (Bit8u value);
+static inline void sb_mixer_register_write (Bit8u value);
+ void sb_mixer_data_write (Bit8u value);
+@@ -840,3 +840,3 @@ void sb_cms_write (ioport_t port, Bit8u value)
+ 
+-inline void sb_mixer_register_write (Bit8u value)
+static inline void sb_mixer_register_write (Bit8u value)
+ {
--- a/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
+++ b/app-emulation/dosemu/files/dosemu-1.4.1_pre20130107-ia16-ldflags.patch
@ -0,0 +1,45 @@
+Add a @IA16_LDFLAGS_EXTRA@ environment variable
+to be able to pass through -no-pie.
+
+It's a workaround for binutils ld.gold bug:
+https://bugs.gentoo.org/618366
+diff --git a/Makefile.conf.in b/Makefile.conf.in
+index cd4b34d..cc29931 100644
+--- a/Makefile.conf.in
+++ b/Makefile.conf.in
+@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
+ DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@
+# flags to "link" 16-bit .com files
+IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@
+ LIBS:=@LIBS@
+diff --git a/configure.ac b/configure.ac
+index 0f06f57..a86208e 100644
+--- a/configure.ac
+++ b/configure.ac
+@@ -604,2 +604,3 @@ AC_SUBST(X_LIBS)
+ AC_SUBST(X_CFLAGS)
+AC_SUBST(IA16_LDFLAGS_EXTRA)
+ 
+diff --git a/src/commands/Makefile b/src/commands/Makefile
+index 3139b85..c5c4607 100644
+--- a/src/commands/Makefile
+++ b/src/commands/Makefile
+@@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS)
+ $(D)/%.sys: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@ 
+@@ -60,3 +60,3 @@ $(D)/%.sys: %.o
+ $(D)/%.com: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@
+diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile
+index 48f49d5..d3a5667 100644
+--- a/src/plugin/commands/Makefile
+++ b/src/plugin/commands/Makefile
+@@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub
+ $(D)/%.com: %.o
+-	$(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+	$(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ 	chmod -x $@
--- a/app-i18n/ibus-kkc/Manifest
+++ b/app-i18n/ibus-kkc/Manifest
@ -0,0 +1 @@
+DIST ibus-kkc-1.5.22.tar.gz 518844 SHA256 22fe2552f08a34a751cef7d1ea3c088e8dc0f0af26fd7bba9cdd27ff132347ce SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4 WHIRLPOOL 2b157203a4956e396e096b86be1b84d47df61eccec9a20eada6ebae14f27e30873389fb465a7d435f11f160bea24d0042ba9f20eb5555f1fb76d912b2200e82c
--- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
+++ b/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit vala
+
+DESCRIPTION="Japanese Kana Kanji conversion engine for IBus"
+HOMEPAGE="https://github.com/ueno/ibus-kkc"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+CDEPEND="app-i18n/ibus
+	app-i18n/libkkc
+	x11-libs/gtk+:3
+	nls? ( virtual/libintl )"
+RDEPEND="${CDEPEND}
+	app-i18n/skk-jisyo"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
--- a/perl-core/ExtUtils-Command/metadata.xml
+++ b/perl-core/ExtUtils-Command/metadata.xml
@ -2,11 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-    <email>perl@gentoo.org</email>
-    <name>Gentoo Perl Project</name>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
  </maintainer>
  <upstream>
-    <remote-id type="cpan">ExtUtils-Command</remote-id>
-    <remote-id type="cpan-module">ExtUtils::Command</remote-id>
+    <remote-id type="github">ueno/ibus-kkc</remote-id>
  </upstream>
 </pkgmetadata>
--- a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
@ -3,7 +3,7 @@

 EAPI="5"

-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
+DESCRIPTION="Japanese SKK engine for IBus"
 HOMEPAGE="https://github.com/ueno/ibus-skk"
 SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"

--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
@ -5,7 +5,7 @@ EAPI="6"

 inherit vala

-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
+DESCRIPTION="Japanese SKK engine for IBus"
 HOMEPAGE="https://github.com/ueno/ibus-skk"
 SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"

--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@ -1 +0,0 @@
-DIST im-ja-1.5.tar.gz 905539 SHA256 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780 SHA512 97c75aa5437b3f887d7004d87f4dd7e444fb2ad393af0117dab64fdef87c0a92b1a97c1934a8e1e67e6c1753ad78f1c9a67f5aca10710115a8b331aae4f17864 WHIRLPOOL c9d3cd722ce3b31cedfc75667d752a0df22fd3eda6e6f3421c5d381c86735e047c80db5c14b0b59a71d524b617276850fddc8b0378e18bbda825208381fa7700
--- a/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch
+++ b/app-i18n/im-ja/files/im-ja-1.5-gentoo.patch
@ -1,30 +0,0 @@
-diff -Naur im-ja-1.5.orig/configure.in im-ja-1.5/configure.in
--- im-ja-1.5.orig/configure.in	2006-04-18 19:52:25.000000000 +0900
-+++ im-ja-1.5/configure.in	2009-10-19 08:19:22.000000000 +0900
-@@ -28,6 +28,7 @@
- PKG_CHECK_MODULES([GTK], gtk+-2.0 >= 2.4.0)
- PKG_CHECK_MODULES([GCONF], gconf-2.0)
- PKG_CHECK_MODULES([LIBGLADE], libglade-2.0 >= 2.4.0)
-+PKG_CHECK_MODULES([LIBGNOMEUI], libgnomeui-2.0 >= 2.4.0)
- 
- AM_GCONF_SOURCE_2
- 
-diff -Naur im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am im-ja-1.5/src/gnome-panel-applet/Makefile.am
--- im-ja-1.5.orig/src/gnome-panel-applet/Makefile.am	2006-04-18 19:52:24.000000000 +0900
-+++ im-ja-1.5/src/gnome-panel-applet/Makefile.am	2009-10-19 08:21:24.000000000 +0900
-@@ -26,13 +26,14 @@
-        -DIM_JA_LIBPROGDIR=\"$(libprogdir)\"    \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-        $(LIBPANELAPPLET_CFLAGS) \
-+       $(LIBGNOMEUI_CFLAGS)     \
-        @DEBUG_FLAGS@            \
-        @DISABLE_CANNA_FLAG@     \
-        @DISABLE_ANTHY_FLAG@     \
-        @DISABLE_SKK_FLAG@       \
-        @DISABLE_WNN_FLAG@ 
- 
-im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS)
-+im_ja_applet_LDADD = $(LIBPANELAPPLET_LIBS) $(LIBGNOMEUI_LIBS)
- 
- uidir = $(datadir)/gnome-2.0/ui
- ui_DATA = GNOME_ImJaApplet.xml
--- a/app-i18n/im-ja/files/im-ja-1.5-pofiles.patch
+++ b/app-i18n/im-ja/files/im-ja-1.5-pofiles.patch
@ -1,17 +0,0 @@
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index a52fa9a..7fac135 100644
--- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -3,10 +3,12 @@ gnome/im-ja.desktop.in
- src/actionmenu.c
- src/candwin.c
- src/conf.c
-+src/eggtrayicon/eggtrayicon.c
- src/gnome-panel-applet/GNOME_ImJaApplet.server.in.in
- src/gnome-panel-applet/GNOME_ImJaApplet.xml
- src/gnome-panel-applet/im-ja-applet.c
- src/gtk/im-ja-gtk.c
-+src/helper/im-ja-helper.c
- src/im-ja-conf/im-ja-conf.c
- src/im-ja-conf/im-ja-conf.glade
- src/im-ja.c
--- a/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch
+++ b/app-i18n/im-ja/files/im-ja-1.5-underlinking.patch
@ -1,18 +0,0 @@
--- src/xim/Makefile.am.old	2014-06-01 20:06:19.209885674 +0200
-+++ src/xim/Makefile.am	2014-06-01 20:06:27.020040088 +0200
-@@ -88,4 +88,4 @@
-     @DISABLE_SKK_FLAG@       \
-     @X_CFLAGS@
- im_ja_xim_server_LDADD = IMdkit/libXimd.a
-im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@
-+im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 -lm @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@
--- src/helper/Makefile.am.old	2014-06-01 20:09:11.592293279 +0200
-+++ src/helper/Makefile.am	2014-06-01 20:09:24.454547489 +0200
-@@ -23,6 +23,6 @@
-     @DISABLE_SKK_FLAG@       		\
-     @DISABLE_WNN_FLAG@ 
- 
-im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@
-+im_ja_helper_LDADD = @GTK_LIBS@ @GCONF_LIBS@ -lX11
- 
- 
--- a/app-i18n/im-ja/files/xinput-im-ja
+++ b/app-i18n/im-ja/files/xinput-im-ja
@ -1,7 +0,0 @@
-XIM=im-ja-xim-server
-XIM_PROGRAM="@EPREFIX@/usr/bin/im-ja-xim-server"
-PREFERENCE_PROGRAM="@EPREFIX@/usr/bin/im-ja-conf"
-ICON=im-ja-capplet
-SHORT_DESC="im-ja"
-GTK_IM_MODULE=im-ja
-#QT_IM_MODULE=im-ja
--- a/app-i18n/im-ja/im-ja-1.5-r3.ebuild
+++ b/app-i18n/im-ja/im-ja-1.5-r3.ebuild
@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 eutils multilib readme.gentoo
-
-DESCRIPTION="A Japanese input module for GTK2 and XIM"
-HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
-	http://im-ja.sourceforge.net/old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="canna freewnn skk anthy"
-# --enable-debug causes build failure with gtk+-2.4
-#IUSE="${IUSE} debug"
-
-RDEPEND="
-	>=dev-libs/glib-2.4:2
-	>=dev-libs/atk-1.6
-	>=x11-libs/gtk+-2.4:2
-	>=x11-libs/pango-1.2.1
-	>=gnome-base/gconf-2.4:2
-	>=gnome-base/libglade-2.4:2.0
-	>=gnome-base/libgnomeui-2.4
-	freewnn? ( app-i18n/freewnn )
-	canna? ( app-i18n/canna )
-	skk? ( virtual/skkserv )
-	anthy? ( app-i18n/anthy )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	dev-perl/URI
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="This version of im-ja comes with experimental XIM support.
-If you'd like to try it out, run im-ja-xim-server and set
-environment variable XMODIFIERS to @im=im-ja-xim-server
-e.g.)
-$ export XMODIFIERS=@im=im-ja-xim-server (sh)
-> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}"/${P}-pofiles.patch \
-		"${FILESDIR}/${P}-underlinking.patch"
-
-	sed -ie 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# You cannot use `use_enable ...` here. im-ja's configure script
-	# doesn't distinguish --enable-canna from --disable-canna, so
-	# --enable-canna stands for --disable-canna in the script ;-(
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	use anthy || myconf="$myconf --disable-anthy"
-	use skk || myconf="$myconf --disable-skk"
-	#use debug && myconf="$myconf --enable-debug"
-
-	gnome2_src_configure \
-		--disable-gnome \
-		$myconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_query_immodules_gtk2
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_query_immodules_gtk2
-	gnome2_pkg_postrm
-}
--- a/app-i18n/im-ja/metadata.xml
+++ b/app-i18n/im-ja/metadata.xml
@ -1,22 +0,0 @@
-<?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>
-  <longdescription>
-  IM-JA is a Japanese input module for GTK+2. It supports kanji
-  conversion using either the Canna or the (Free)Wnn kanji conversion
-  engine. IM-JA can also do kanji character recognition, you can draw
-  kanji into a widget using the mouse. This feature is based on the
-  KanjiPad application which has been enhanced in IM-JA.
-  </longdescription>
-  <use>
-    <flag name="anthy">Support for Anthy input method</flag>
-    <flag name="skk">Support for SKK input method</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">im-ja</remote-id>
-  </upstream>
-</pkgmetadata>
--- a/app-i18n/libkkc/Manifest
+++ b/app-i18n/libkkc/Manifest
@ -0,0 +1 @@
+DIST libkkc-0.3.5.tar.gz 1424282 SHA256 89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef SHA512 f611c3104a22ad38af29746870849d8937b6af2a7fee0952cc25f36ef845b5617a192df7ca63ff2a507384f7a6a13c9c1b4fa3b9a34f3f041bee8793d04b9236 WHIRLPOOL 4f759c9b08c4706c2244e253bad6c347dac2ad1a9ceb5a1b5b96161a7222e6fd1f607cc7dd4f49a01757e28742d75f2764d66c10435266e22a973f5e4e70cc72
--- a/app-i18n/libkkc/libkkc-0.3.5.ebuild
+++ b/app-i18n/libkkc/libkkc-0.3.5.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ltprune python-any-r1 vala
+
+DESCRIPTION="Japanese Kana Kanji conversion input method library"
+HOMEPAGE="https://github.com/ueno/libkkc"
+SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection nls static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	dev-libs/marisa[python(+)]
+	introspection? ( dev-libs/gobject-introspection )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	vala_src_prepare
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
--- a/sci-chemistry/gamessq/metadata.xml
+++ b/sci-chemistry/gamessq/metadata.xml
@ -2,7 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
  </maintainer>
+  <upstream>
+    <remote-id type="github">ueno/libkkc</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
@ -9,48 +9,46 @@ DESCRIPTION="Azoth, the modular IM client for LeechCraft"

 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc astrality +acetamide +adiumstyles +autoidler +autopaste +birthdaynotifier
-		+chathistory +crypt +depester +embedmedia +herbicide +hili +isterique
-		+juick +keeso +lastseen	+metacontacts media +murm +latex +nativeemoticons
-		+otroid +spell sarin shx +standardstyles +vader velvetbird +woodpecker +xmpp +xtazy"
+IUSE="debug doc +acetamide +adiumstyles astrality +autoidler +autopaste +birthdaynotifier
+	+chathistory +crypt +depester +embedmedia +herbicide +hili +isterique +juick
+	+keeso +lastseen +latex media +metacontacts +murm +nativeemoticons +otroid sarin
+	shx +spell +standardstyles +vader velvetbird +woodpecker +xmpp +xtazy"
+
+REQUIRED_USE="|| ( standardstyles adiumstyles )"

 COMMON_DEPEND="
 	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtdbus:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtxml:5
-	dev-qt/qtdbus:5
+	astrality? ( net-libs/telepathy-qt[qt5] )
+	autoidler? (
+		dev-qt/qtx11extras:5
+		x11-libs/libXScrnSaver
+	)
 	crypt? ( app-crypt/qca:2[qt5] )
-	media? (
-		dev-qt/qtmultimedia:5
+	lastseen? ( dev-qt/qtconcurrent:5 )
+	media? ( dev-qt/qtmultimedia:5 )
+	otroid? (
+		dev-qt/qtconcurrent:5
+		net-libs/libotr
 	)
 	sarin? (
 		dev-qt/qtconcurrent:5
 		net-libs/tox
 	)
-	lastseen? (
-		dev-qt/qtconcurrent:5
-	)
-	otroid? (
-		dev-qt/qtconcurrent:5
-	)
-	autoidler? (
-		dev-qt/qtx11extras:5
-		x11-libs/libXScrnSaver
-	)
-	astrality? ( net-libs/telepathy-qt[qt5] )
-	otroid? ( net-libs/libotr )
 	woodpecker? ( dev-libs/kqoauth )
 	xmpp? (
-		>=net-libs/qxmpp-0.9.3[qt5]
-		media? ( >=net-libs/qxmpp-0.9.3[qt5,speex] )
+		>=net-libs/qxmpp-0.9.3-r1
+		media? ( net-libs/qxmpp[speex] )
 	)
-	xtazy? (
-		~app-leechcraft/lc-xtazy-${PV}
-	)"
+	xtazy? ( ~app-leechcraft/lc-xtazy-${PV} )
+"
 DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen[dot] )"
+	doc? ( app-doc/doxygen[dot] )
+"
 RDEPEND="${COMMON_DEPEND}
 	astrality? (
 		net-im/telepathy-mission-control
@ -61,11 +59,8 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/imagemagick-tools
 		virtual/latex-base
 	)
-	spell? (
-		~app-leechcraft/lc-rosenthal-${PV}
-	)"
-
-REQUIRED_USE="|| ( standardstyles adiumstyles )"
+	spell? ( ~app-leechcraft/lc-rosenthal-${PV} )
+"

 src_configure() {
 	local mycmakeargs=(
@ -86,15 +81,15 @@ src_configure() {
 		-DENABLE_AZOTH_JUICK=$(usex juick)
 		-DENABLE_AZOTH_KEESO=$(usex keeso)
 		-DENABLE_AZOTH_LASTSEEN=$(usex lastseen)
+		-DENABLE_AZOTH_MODNOK=$(usex latex)
 		-DENABLE_AZOTH_METACONTACTS=$(usex metacontacts)
 		-DENABLE_MEDIACALLS=$(usex media)
-		-DENABLE_AZOTH_MODNOK=$(usex latex)
 		-DENABLE_AZOTH_MURM=$(usex murm)
 		-DENABLE_AZOTH_NATIVEEMOTICONS=$(usex nativeemoticons)
 		-DENABLE_AZOTH_OTROID=$(usex otroid)
 		-DENABLE_AZOTH_SARIN=$(usex sarin)
-		-DENABLE_AZOTH_ROSENTHAL=$(usex spell)
 		-DENABLE_AZOTH_SHX=$(usex shx)
+		-DENABLE_AZOTH_ROSENTHAL=$(usex spell)
 		-DENABLE_AZOTH_STANDARDSTYLES=$(usex standardstyles)
 		-DENABLE_AZOTH_VADER=$(usex vader)
 		-DENABLE_AZOTH_VELVETBIRD=$(usex velvetbird)
--- a/app-leechcraft/lc-azoth/metadata.xml
+++ b/app-leechcraft/lc-azoth/metadata.xml
@ -10,9 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
-		<flag name="astrality">Build Astrality, support for protocols provided by Telepathy</flag>
 		<flag name="acetamide">Build Acetamide, the IRC protocol support</flag>
 		<flag name="adiumstyles">Build support for Adium styles</flag>
+		<flag name="astrality">Build Astrality, support for protocols provided by Telepathy</flag>
 		<flag name="autoidler">Build support for automatic status changing according to user idle time</flag>
 		<flag name="autopaste">Build Autopaste for pasting long texts to pastebins</flag>
 		<flag name="birthdaynotifier">Build Birthday Notifier for you to not forget about birthdays of your contacts.</flag>
@ -25,8 +25,8 @@
 		<flag name="juick">Build plugin for the Juick.com microblogging service</flag>
 		<flag name="keeso">Build plugin for changing text into SoMEtHInG lIKe THiS</flag>
 		<flag name="lastseen">Build plugin for client-side recording of the last online/available time</flag>
-		<flag name="metacontacts">Build plugin for metacontacts support</flag>
 		<flag name="media">Enable media calls</flag>
+		<flag name="metacontacts">Build plugin for metacontacts support</flag>
 		<flag name="murm">Build Murm, the VKontakte messaging support via their native API (instead of XMPP)</flag>
 		<flag name="nativeemoticons">Build support for native Azoth's emoticons packs</flag>
 		<flag name="otroid">Build OTRoid, plugin for the Off-the-Record deniable encryption system</flag>
--- a/app-mobilephone/bitpim/Manifest
+++ b/app-mobilephone/bitpim/Manifest
@ -1 +0,0 @@
-DIST bitpim-1.0.6.tar.bz2 4595216 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d SHA512 6ef4f56e1afa360b60a4522e6c0dc3526bf30e43d8ad783c247724c7cc212056cdb2664da09b0b5883e0eb38ed68d046f259043bf9b34ad0aa51773119c49c74 WHIRLPOOL 3cd092067d5fd11d325208f0e670135e28aa5aa2de769ffca7eaee7d8d339c55c036d4dbc2b0c34601fee11f78f0d0466c749f17ae02c5dd033935cd8dc5572f
--- a/app-mobilephone/bitpim/bitpim-1.0.6-r2.ebuild
+++ b/app-mobilephone/bitpim/bitpim-1.0.6-r2.ebuild
@ -1,149 +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 fdo-mime multilib
-
-DESCRIPTION="View and manipulate data on LG VX4400/VX6000 and Sanyo Sprint mobile phones"
-HOMEPAGE="http://www.bitpim.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# this needs fixing
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="crypt evo usb"
-
-COMMON_DEPEND="dev-python/apsw[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/python-dsv[${PYTHON_USEDEP}]
-	dev-python/wxpython:2.8[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/paramiko-1.7.1[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-	usb? ( virtual/libusb:0 )"
-DEPEND="${COMMON_DEPEND}
-	usb? ( dev-lang/swig )"
-RDEPEND="${COMMON_DEPEND}
-	media-libs/netpbm
-	virtual/ffmpeg"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" "${FILESDIR}/${P}-ffmpeg_quality.patch" "${FILESDIR}/${P}-gcc43.patch" )
-
-src_prepare() {
-	distutils-r1_src_prepare
-	python_setup
-	sed -i -e "s/^PYTHONVER=.*/PYTHONVER=\$PYTHON/" \
-		src/native/usb/build.sh || die "sed failed"
-	sed -i "s/\$(EXTRADEFINES)\ -O2/\$(CXXFLAGS) \$(LDFLAGS)/" \
-		src/native/av/bmp2avi/Makefile || die "sed failed"
-}
-
-src_compile() {
-	# USB stuff
-	if use usb; then
-	    cd "${S}/src/native/usb"
-	    sh ./build.sh || die "compilation of native/usb failed"
-	fi
-
-	# strings
-	cd "${S}/src/native/strings"
-	distutils-r1_src_compile
-
-	# bmp2avi
-	cd "${S}/src/native/av/bmp2avi"
-	PLATFORM=linux emake CXX="$(tc-getCXX)"
-}
-
-src_install() {
-
-	# Install files into right place
-	#
-	# BitPim is a self-contained app, so jamming it into
-	# Python's site-packages might not be worthwhile.  We'll
-	# Put it in its own home, and add the PYTHONPATH in the
-	# wrapper executables below.
-	local RLOC=/usr/$(get_libdir)/${P}
-
-	# Main Python source
-	insinto ${RLOC}
-	doins src/*.py
-
-	# Phone specifics
-	insinto ${RLOC}/phones
-	doins src/phones/*.py
-
-	# Native products
-	insinto ${RLOC}/native
-	doins src/native/*.py
-	insinto ${RLOC}/native/qtopiadesktop
-	doins src/native/qtopiadesktop/*.py
-	insinto ${RLOC}/native/outlook
-	doins src/native/outlook/*.py
-	insinto ${RLOC}/native/egroupware
-	doins src/native/egroupware/*.py
-	if use evo ; then
-		insinto ${RLOC}/native/evolution
-		doins src/native/evolution/*.py
-	fi
-
-	# strings
-	cd "${S}/src/native/strings"
-	distutils-r1_src_install
-
-	cd "${S}"
-	insinto $RLOC/native/strings
-	doins src/native/strings/__init__.py src/native/strings/jarowpy.py
-
-	# usb
-	if use usb; then
-		insinto ${RLOC}/native/usb
-		doins src/native/usb/*.py
-		doins src/native/usb/*.so
-	fi
-
-	# Helpers and resources
-	dobin src/native/av/bmp2avi/bmp2avi
-	insinto ${RLOC}/resources
-	doins resources/*
-
-	# Bitfling
-	if use crypt; then
-		FLINGDIR="${RLOC}/bitfling"
-		insinto $FLINGDIR
-		cd "${S}/src/bitfling"
-		doins *.py
-		cd "${S}"
-	fi
-
-	# Creating scripts
-	echo '#!/bin/sh' > "${T}/bitpim"
-	echo "exec $PYTHON ${RLOC}/bp.py \"\$@\"" >> "${T}/bitpim"
-	dobin "${T}/bitpim"
-	if use crypt; then
-		echo '#!/bin/sh' > "${T}/bitfling"
-		echo "exec $PYTHON ${RLOC}/bp.py \"\$@\" bitfling" >> "${T}/bitfling"
-		dobin "${T}/bitfling"
-	fi
-
-	# Desktop file
-	sed -i \
-		-e "s|%%INSTALLBINDIR%%|/usr/bin|" \
-		-e "s|%%INSTALLLIBDIR%%|${RLOC}|" \
-		-e "s|Terminal=0|Terminal=true|" \
-		-e "s|Application;Calendar;ContactManagement;Utility;|Calendar;ContactManagement;Utility;|" \
-		packaging/bitpim.desktop || die "sed failed"
-	domenu packaging/bitpim.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
--- a/app-mobilephone/bitpim/files/bitpim-1.0.6-ffmpeg_quality.patch
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.6-ffmpeg_quality.patch
@ -1,12 +0,0 @@
-diff -Nru bitpim-1.0.6.orig/src/conversions.py bitpim-1.0.6/src/conversions.py
--- bitpim-1.0.6.orig/src/conversions.py	2008-11-02 13:51:31.000000000 +0000
-+++ bitpim-1.0.6/src/conversions.py	2008-11-02 13:52:21.000000000 +0000
-@@ -239,7 +239,7 @@
-     ffmpeg=gethelperbinary("ffmpeg")
-     with common.usetempfile('mp3') as mp3file:
-         try:
-            run(ffmpeg, "-i", shortfilename(inputfilename), "-hq", "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file))
-+            run(ffmpeg, "-i", shortfilename(inputfilename), "-sameq", "-ab", `bitrate`, "-ar", `samplerate`, "-ac", `channels`, shortfilename(mp3file))
-         except common.CommandExecutionFailed, e:
-             # we get this exception on bad parameters, or any other
-             # issue so we assume bad parameters for the moment.
--- a/app-mobilephone/bitpim/files/bitpim-1.0.6-gcc43.patch
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.6-gcc43.patch
@ -1,22 +0,0 @@
-diff -Nru bitpim-1.0.6.orig/src/native/av/bmp2avi/avi_file.cxx bitpim-1.0.6/src/native/av/bmp2avi/avi_file.cxx
--- bitpim-1.0.6.orig/src/native/av/bmp2avi/avi_file.cxx	2005-02-18 06:55:03.000000000 +0000
-+++ bitpim-1.0.6/src/native/av/bmp2avi/avi_file.cxx	2008-11-02 13:54:15.000000000 +0000
-@@ -9,6 +9,7 @@
- 
- #include "avi_file.h"
- #include "byte_order.h"
-+#include <cstring>
- 
- // endian conversion routines
- 
-diff -Nru bitpim-1.0.6.orig/src/native/av/bmp2avi/bmp_file.cxx bitpim-1.0.6/src/native/av/bmp2avi/bmp_file.cxx
--- bitpim-1.0.6.orig/src/native/av/bmp2avi/bmp_file.cxx	2005-02-18 06:55:03.000000000 +0000
-+++ bitpim-1.0.6/src/native/av/bmp2avi/bmp_file.cxx	2008-11-02 13:54:15.000000000 +0000
-@@ -11,6 +11,7 @@
- #include <string>
- #include "bmp_file.h"
- #include "byte_order.h"
-+#include <cstring>
- 
- using namespace std;
- 
--- a/app-mobilephone/bitpim/files/bitpim-1.0.6-gentoo.patch
+++ b/app-mobilephone/bitpim/files/bitpim-1.0.6-gentoo.patch
@ -1,90 +0,0 @@
-diff -Nru bitpim-1.0.6.orig/src/common.py bitpim-1.0.6/src/common.py
--- bitpim-1.0.6.orig/src/common.py	2007-08-29 00:19:51.000000000 +0000
-+++ bitpim-1.0.6/src/common.py	2008-11-02 13:50:39.000000000 +0000
-@@ -860,7 +860,7 @@
-         # windows running from exe, return as is
-         return os.path.abspath(os.path.dirname(sys.executable))
-     # running from src, up one
-    return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]
-+    return os.path.abspath(os.path.dirname(sys.argv[0]))
- 
- if sys.platform=='win32':
-     # From Tim Golden's Win32 How Do I ...?
-diff -Nru bitpim-1.0.6.orig/src/conversions.py bitpim-1.0.6/src/conversions.py
--- bitpim-1.0.6.orig/src/conversions.py	2007-08-29 00:19:51.000000000 +0000
-+++ bitpim-1.0.6/src/conversions.py	2008-11-02 13:50:39.000000000 +0000
-@@ -23,11 +23,11 @@
- 
- class ConversionFailed(Exception): pass
- 
-helperdir=os.path.join(common.get_main_dir(), "helpers")
-+helperdir="/usr/bin"
- 
- osext={'win32': '.exe',
-        'darwin': '.mbin',
-       'linux2': '.lbin'} \
-+       'linux2': ''} \
-        [sys.platform]
- 
- # This shortname crap is needed because Windows programs (including ffmpeg)
-@@ -128,14 +128,14 @@
-     p=sys.path[0]
-     if os.path.isfile(p):
-         p=os.path.dirname(p)
-    helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))
-+    helpersdirectory="/usr/bin"
-     print "Helper Directory: "+helpersdirectory
-     if sys.platform=='win32':
-         osext=".exe"
-     if sys.platform=='darwin':
-         osext=".mbin"
-     if sys.platform=='linux2':
-        osext=".lbin"
-+        osext=""
-         
-     pngtopnmbin=gethelperbinary('pngtopnm')
-     ppmquantbin=gethelperbinary('ppmquant')
-diff -Nru bitpim-1.0.6.orig/src/importexport.py bitpim-1.0.6/src/importexport.py
--- bitpim-1.0.6.orig/src/importexport.py	2007-08-27 04:58:33.000000000 +0000
-+++ bitpim-1.0.6/src/importexport.py	2008-11-02 13:50:39.000000000 +0000
-@@ -23,7 +23,7 @@
- import wx.html
- 
- # Others
-from thirdparty import DSV
-+import DSV
- 
- # My modules
- import common
-diff -Nru bitpim-1.0.6.orig/src/native/av/bmp2avi/Makefile bitpim-1.0.6/src/native/av/bmp2avi/Makefile
--- bitpim-1.0.6.orig/src/native/av/bmp2avi/Makefile	2006-05-05 07:10:08.000000000 +0000
-+++ bitpim-1.0.6/src/native/av/bmp2avi/Makefile	2008-11-02 13:50:39.000000000 +0000
-@@ -13,6 +13,6 @@
- 
- SRC=avi_file.cxx bmp_file.cxx b2a.cxx
- 
-bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC)
-+bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC)
- 	$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)
- 
-diff -Nru bitpim-1.0.6.orig/src/native/usb/build.sh bitpim-1.0.6/src/native/usb/build.sh
--- bitpim-1.0.6.orig/src/native/usb/build.sh	2007-08-10 21:53:59.000000000 +0000
-+++ bitpim-1.0.6/src/native/usb/build.sh	2008-11-02 13:50:39.000000000 +0000
-@@ -4,4 +4,4 @@
- swig -python -I/usr/include libusb.i
- 
- gcc -fPIC -Wall -fno-strict-aliasing -O2 -g  -shared  -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb 
-strip _libusb.so
-+#strip _libusb.so
-diff -Nru bitpim-1.0.6.orig/src/phones/com_samsung.py bitpim-1.0.6/src/phones/com_samsung.py
--- bitpim-1.0.6.orig/src/phones/com_samsung.py	2007-08-17 21:11:59.000000000 +0000
-+++ bitpim-1.0.6/src/phones/com_samsung.py	2008-11-02 13:50:39.000000000 +0000
-@@ -16,7 +16,7 @@
- import time
- 
- # site-packages
-from thirdparty import DSV
-+import DSV
- 
- # BitPim modules
- import bpcalendar
--- a/app-mobilephone/bitpim/files/maketarball
+++ b/app-mobilephone/bitpim/files/maketarball
@ -1,30 +0,0 @@
-# For building the tarball. To be used only by ebuild maintainers
-DISTDIR=/usr/portage/distfiles
-PN=bitpim
-PV=$1
-P=$PN-$PV
-
-if [ -z "$PV" ]; then
-	echo "usage: $0 version"
-else
-	svnrev=$(svn log -q --limit 1 https://${PN}.svn.sourceforge.net/svnroot/${PN}/releases/${PV} | sed -r '/^[^r]/d;s/^r([0-9]+) .*$/\1/')
-	[ $? = 0 ] || return 1
-
-	#Fetch the source (only those directories that are needed)
-	cd "${DISTDIR}" && mkdir -p ${P} || return 1
-	for x in resources packaging src ; do
-		svn export https://${PN}.svn.sourceforge.net/svnroot/${PN}/releases/${PV}/${x} ${P}/${x} || return 1
-	done
-
-	#Remove unneeded stuff
-	rm ${P}/resources/*.chm ${P}/src/package.py
-
-	#Freeze version and set vendor name to Gentoo
-	sed -i -e 's/\(^__FROZEN__="[$]Id: \).*\( $"\)/\1'${svnrev}'\2/' \
-		-e 's/^vendor=".*"/vendor="Gentoo"/' \
-		${P}/src/version.py || return 1
-
-	#Make the tarball
-	tar -cjf ${P}.tar.bz2 ${P}
-	rm -r ${P}
-fi
--- a/app-mobilephone/bitpim/metadata.xml
+++ b/app-mobilephone/bitpim/metadata.xml
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
-		BitPim is a program that allows you to view and manipulate data on LG
-		VX4400/VX6000 and many Sanyo Sprint cell phones. This includes the
-		PhoneBook, Calendar, WallPapers, RingTones (functionality varies by
-		phone) and the Filesystem for most Qualcomm CDMA chipset based phones.
-	</longdescription>
-</pkgmetadata>
--- a/app-office/skrooge/skrooge-2.8.1.ebuild
+++ b/app-office/skrooge/skrooge-2.8.1.ebuild
@ -15,7 +15,7 @@ HOMEPAGE="http://www.skrooge.org/"
 [[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"

 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="activities designer kde ofx"

 COMMON_DEPEND="
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@ -1 +1,2 @@
 DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
+DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@ -90,7 +90,6 @@ RDEPEND="${CDEPEND}
 DOCS=( AUTHORS ChangeLog NEWS README.md )

 PATCHES=(
-	"${FILESDIR}/${PN}-3.05.00-libtiff.patch"
 	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
 	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
 )
--- a/dev-ada/asis/asis-2017.ebuild
+++ b/dev-ada/asis/asis-2017.ebuild
@ -23,7 +23,7 @@ DEPEND="dev-ada/gnat_util[gnat_2016=,gnat_2017=]
 	gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )"
 RDEPEND="${RDEPEND}"
-REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
+REQUIRED_USE="!gnat_2016 gnat_2017"

 S="${WORKDIR}"/${MYP}

--- a/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
+++ b/dev-ada/gnatcoll/files/gnatcoll-2016-gentoo.patch
@ -23,27 +23,6 @@
 
 #######################################################################
 #  install
-@@ -53,7 +53,7 @@
- #######################################################################
- #  install
- 
-GPRINST_OPTS=-p -f --prefix=${prefix} --install-name=gnatcoll \
-+GPRINST_OPTS=-p -f --prefix=$(DESTDIR)${prefix} --install-name=gnatcoll \
- 	--exec-subdir=${bindir} --project-subdir=lib/gnat \
- 	--build-var=LIBRARY_TYPE --build-name=$(@F) -XLIBRARY_TYPE=$(@F)
- 
-@@ -73,9 +73,9 @@
- 	${GPRINSTALL} --mode=usage ${GPRINST_OPTS} -Psrc/gnatcoll_tools
- 
- install_gps_plugin: force
-	mkdir -p $(prefix)/share/gps/plug-ins
-+	mkdir -p $(DESTDIR)$(prefix)/share/gps/plug-ins
- 	(cd distrib/ ; tar cf - gnatcoll) | \
-          (cd $(prefix)/share/gps/plug-ins ; tar xf -)
-+          (cd $(DESTDIR)$(prefix)/share/gps/plug-ins ; tar xf -)
- 
- # Regenerate part of the sources. Unfortunately, this can be run only after
- # we have build GNATCOLL, and then its tools, even though GNATCOLL itself
 --- gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in.old	2017-01-07 08:52:14.921110195 +0100
 +++ gnatcoll-gpl-2015-src/src/gnatcoll_gmp.gpr.in	2017-01-07 08:55:35.718946607 +0100
@@ -24,6 +24,7 @@
--- a/dev-ada/gnatcoll/gnatcoll-2016.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2016.ebuild
@ -16,7 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
-	+shared sqlite static syslog"
+	+shared sqlite static syslog tools"

 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@ -101,17 +101,24 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
+	if use tools; then
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+			build_tools/static
+	fi
 	python_fix_shebang .
 }

 src_install() {
 	if use shared; then
-		emake DESTDIR="${D}" install_library_type/relocatable
+		emake prefix="${D}usr" install_library_type/relocatable
 	fi
 	if use static; then
-		emake DESTDIR="${D}" install_library_type/static
+		emake prefix="${D}usr" install_library_type/static
+	fi
+	if use tools; then
+		emake prefix="${D}usr" install_tools/static
 	fi
-	emake DESTDIR="${D}" install_gps_plugin
+	emake prefix="${D}usr" install_gps_plugin
 	einstalldocs
 	dodoc -r features-* known-problems-*
 	mv "${D}"/usr/share/doc/${PN}/GNATColl.pdf "${D}"/usr/share/doc/${PF}/
--- a/dev-ada/gnatcoll/gnatcoll-2017.ebuild
+++ b/dev-ada/gnatcoll/gnatcoll-2017.ebuild
@ -16,7 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="gmp gnat_2016 gnat_2017 gtk iconv postgresql pygobject projects readline
-	+shared sqlite static syslog"
+	+shared sqlite static syslog tools"

 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
 	gnat_2017? ( dev-lang/gnat-gpl:6.3.0 )
@ -101,6 +101,10 @@ src_compile() {
 		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
 			build_library_type/static
 	fi
+	if use tools; then
+		emake PROCESSORS=$(makeopts_jobs) GPRBUILD_OPTIONS=-v GCC=${GCC} \
+			build_tools/static
+	fi
 	python_fix_shebang .
 }

@ -111,6 +115,9 @@ src_install() {
 	if use static; then
 		emake prefix="${D}usr" install_library_type/static
 	fi
+	if use tools; then
+		emake prefix="${D}usr" install_tools/static
+	fi
 	emake prefix="${D}usr" install_gps_plugin
 	einstalldocs
 }
--- a/dev-ada/gnatcoll/metadata.xml
+++ b/dev-ada/gnatcoll/metadata.xml
@ -13,10 +13,20 @@
 		<flag name="pygobject">Adds support for pygobject</flag>
 		<flag name="shared">Build shared library</flag>
 		<flag name="static">Build static library</flag>
+		<flag name="tools">Build associated tools</flag>
 	</use>
 	<longdescription lang="en">
-		The reusable library known as the GNAT Component Collection (GNATColl) is based on one main principle: general-purpose packages that are part of the GNAT technology should also be available to GNAT user application code. The compiler front end, the GNAT Programming Studio (GPS) Interactive Development Environment, and the GNAT Tracker web-based interface all served as sources for the components.
+		The reusable library known as the GNAT Component Collection (GNATColl)
+		is based on one main principle: general-purpose packages that are part
+		of the GNAT technology should also be available to GNAT user
+		application code. The compiler front end, the GNAT Programming Studio
+		(GPS) Interactive Development Environment, and the GNAT Tracker
+		web-based interface all served as sources for the components.

-		The GNATColl components complement the predefined Ada and GNAT libraries and deal with a range of common programming issues including string and text processing, memory management, and file handling. Several of the components are especially useful in enterprise applications.
+		The GNATColl components complement the predefined Ada and GNAT
+		libraries and deal with a range of common programming issues including
+		string and text processing, memory management, and file handling.
+		Several of the components are especially useful in enterprise
+		applications.
 	</longdescription>
 </pkgmetadata>
--- a/dev-cpp/libgnomeuimm/Manifest
+++ b/dev-cpp/libgnomeuimm/Manifest
@ -1 +0,0 @@
-DIST libgnomeuimm-2.28.0.tar.bz2 382428 SHA256 6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3 SHA512 f02ee119bff2d42bd7fc61719988de45e497c7a5cc151a438ad3601c2bf55d6ecfeb001b22032a47f15dc6f7eb4cf4c5412c3246969a24ff0579a9b89d5dab15 WHIRLPOOL a41b02886f17ed79c36c090a212ac19504e5c9be803d6666cc7babe8726bc7050a11576a0ce65b8e4de25354ad948b46047562257b24e3cdd9660bd230145da2
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GNOME_TARBALL_SUFFIX="bz2"
-GCONF_DEBUG="no"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="C++ bindings for libgnomeui"
-HOMEPAGE="https://www.gtkmm.org"
-
-LICENSE="LGPL-2.1"
-SLOT="2.6"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/libgnomeui-2.7.1
-	dev-cpp/glibmm
-	>=dev-cpp/libgnomemm-2.16.0
-	>=dev-cpp/libgnomecanvasmm-2.6
-	>=dev-cpp/gconfmm-2.6
-	>=dev-cpp/libglademm-2.4
-	>=dev-cpp/gnome-vfsmm-2.16
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	append-cxxflags -std=c++11
-	gnome2_src_prepare
-}
--- a/dev-cpp/libgnomeuimm/metadata.xml
+++ b/dev-cpp/libgnomeuimm/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 type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
--- a/dev-db/ctdb/Manifest
+++ b/dev-db/ctdb/Manifest
@ -1 +0,0 @@
-DIST ctdb-1.13.tar.xz 736004 SHA256 c43693877cbc7d047d8b11b01a101bee69df6a871ab397214cc68d8f6f8c98c7 SHA512 653e1d5c29962810353d6b8c5867d07bef17dd5bf431f7304793f13712bb92379fb1b05b6e461279b08e0a1c9d87951f57fb1e2c35f85392b99baadf7d232ece WHIRLPOOL 9323de35b038a920ed6d5ed3be379c7c2ec93814f0f8c4f304de36e2512f58f7a62578ecd257d4fbe4e856c6d0b196fae88e7fbf673e47bbfd2acf0f2ac13b6b
--- a/dev-db/ctdb/ctdb-1.13-r1.ebuild
+++ b/dev-db/ctdb/ctdb-1.13-r1.ebuild
@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-# upstream is too sexy for releases, grab tags from:
-#    http://git.samba.org/?p=ctdb.git;a=summary
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/popt-1.16-r2[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# custom, broken Makefile
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir="${EPREFIX}/var/lib" \
-		--with-logdir="${EPREFIX}/var/log/${PN}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml web/* doc/*.html
-}
--- a/dev-db/ctdb/ctdb-9999.ebuild
+++ b/dev-db/ctdb/ctdb-9999.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.samba.org/ctdb.git"
-inherit autotools eutils git-2 multilib-minimal
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=">=dev-libs/popt-1.16-r2[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	AT_M4DIR="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
-	AT_M4DIR+=" -I lib/talloc -I talloc -I ../talloc"
-	AT_M4DIR+=" -I lib/tdb -I tdb -I ../tdb"
-	AT_M4DIR+=" -I lib/popt -I popt -I ../popt"
-	AT_M4DIR+=" -I lib/tevent"
-
-	rm -rf autom4te.cache
-	rm -f configure config.h.in
-
-	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
-	eautoconf ${AT_M4DIR}
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	epatch_user
-
-	# custom, broken Makefile
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir="${EPREFIX}/var/lib" \
-		--with-logdir="${EPREFIX}/var/log/${PN}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dohtml web/* doc/*.html
-}
--- a/dev-db/ctdb/files/ctdb-1.13-ldflags.patch
+++ b/dev-db/ctdb/files/ctdb-1.13-ldflags.patch
@ -1,21 +0,0 @@
-diff -urN ctdb-1.13.old/Makefile.in ctdb-1.13/Makefile.in
--- ctdb-1.13.old/Makefile.in	2012-03-23 11:30:03.321735210 +0100
-+++ ctdb-1.13/Makefile.in	2012-03-23 11:37:03.131704144 +0100
-@@ -151,7 +151,7 @@
- 
- bin/ltdbtool: tools/ltdbtool.o @TDB_OBJ@
- 	@echo Linking $@
-	@$(CC) $(CFLAGS) -o $@ $+
-+	@$(CC) $(CFLAGS) -o $@ $+ $(LIB_FLAGS)
- 
- bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
- 	@echo Linking $@
-@@ -173,7 +173,7 @@
- 
- bin/ping_pong: utils/ping_pong/ping_pong.o
- 	@echo Linking $@
-	@$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o
-+	@$(CC) $(CFLAGS) -o $@ utils/ping_pong/ping_pong.o $(LIB_FLAGS)
- 
- bin/pmdactdb: $(CTDB_CLIENT_OBJ) utils/pmda/pmda_ctdb.o
- 	@echo Linking $@
--- a/dev-db/ctdb/metadata.xml
+++ b/dev-db/ctdb/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 type="project">
-	<email>samba@gentoo.org</email>
-	<name>Samba</name>
-</maintainer>
-</pkgmetadata>
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.13.ebuild
+++ b/dev-db/m17n-contrib/m17n-contrib-1.1.13.ebuild
@ -1,31 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
+EAPI="6"

 DESCRIPTION="Contribution database for the m17n library"
 HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

-DEPEND=""
-# Strict version to avoid collision
-RDEPEND=">=dev-db/m17n-db-1.6.3"
-
-src_configure() {
-	# force the script not to test for m17n presence, trust Portage
-	# dependency handling.
-	export HAVE_M17N_DB=yes
-
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
+RDEPEND="~dev-db/m17n-db-1.6.3"
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.14.ebuild
+++ b/dev-db/m17n-contrib/m17n-contrib-1.1.14.ebuild
@ -1,31 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
+EAPI="6"

 DESCRIPTION="Contribution database for the m17n library"
 HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""

-DEPEND=""
-# Strict version to avoid collision
-RDEPEND=">=dev-db/m17n-db-1.6.4"
-
-src_configure() {
-	# force the script not to test for m17n presence, trust Portage
-	# dependency handling.
-	export HAVE_M17N_DB=yes
-
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
+RDEPEND="~dev-db/m17n-db-1.6.4"
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@ -1,5 +1,3 @@
-DIST m17n-db-1.5.2.tar.gz 1284002 SHA256 d05ecb11faafffbb7f07c6620a75d612bf27009e06da0e71a2163b2292bdd448 SHA512 d24acc5a067d1fefce438c1af4a1a2245f5ec609206226f03cdd3a2af2d32e602c0bec197207fbe89f90748626f2ff064d8dfcdc7690f6801f060ce15f3d0903 WHIRLPOOL bbe70a28ab4cb3ffa7a139d70caadc708c76510b1d5a4803736fbc6cb3025bd7497de32fea1bcb45beafdb55292a242ea6a0256bb3aab0ab38a9eb368a815700
-DIST m17n-db-1.5.5.tar.gz 1322255 SHA256 4f5bb75e3a0252a47b2628a09adf1ff16c4f160a38aea7ac394b74878ceed14f SHA512 40ad61d9843d0ae37744d63dc8835084e4eba55ac41a307cb10d79e0cbeed849fd53cb3ddeab0d234f5c783e04205cb84a75ec093beb2a2eba11c45f0b57b1f7 WHIRLPOOL b3a06c7808e0b98b369308639a01b0f1c16e00b091eaf72d835350d6def3b4dd45f2ffa4fb3db389032babe588d24b4ec30c5f1678dfffc771d7f304d557e892
-DIST m17n-db-1.6.2.tar.gz 1385431 SHA256 757ce99b852cb08867b2027223c5324248f3fab0b81fb71f478f8dfdfb3cfb24 SHA512 89c51eba7d30f284c4e226eff95984f7b736bfb45ef69bf98fbb419c26f8b7bb2d41adf01c6f108c12ffaf2d7d84492edf33c10763dfe4f068e36586b9ac88cf WHIRLPOOL da58f44d3a423c38956bb267c90e8661f00e1fdec94f5234836be758577c72b5404571dea4694f724bd75a124501bbb26a31cc44c7e088057513d721ff70629c
 DIST m17n-db-1.6.3.tar.gz 1384587 SHA256 5f1d11b43efa4c1fcc9681d0c0e13f8d241450625f34351a9deb2a7194cac211 SHA512 4a808b7f8298b9c15c479e7e2dbe26dfe39b0756da5f7a5f968700950d5e41527ce935bc6ced6e65d5e0d57c5f8402dba7f6001144f805129def8237d272625f WHIRLPOOL 55657e6fdc47da30de6ec9094b27b861d37b74a65a5d25b5dcd3ccc94a1057692442cdc40f68b0e67e893688aa5eb6fffa8f118d158d3518ae188638c3a26fdc
 DIST m17n-db-1.6.4.tar.gz 1390344 SHA256 530ecb1615a9a64d4caca9ffc59c0dd1c551d34e0c19e39694d083db0506d017 SHA512 54016284335630fca5403e540863aaff5f135429c5716c35404fc38d40544c03a213ad26af5ea7eb82567b11f4645608f66cde95036187e6e23ce0dae17e2324 WHIRLPOOL 9eb0d78319b46864f8d7bec05d30299c798153416ac912119f487990fe26540554d41b89cb06ec427161102b8b312a48ff224adcf6e8c2c5268cef00796d1767
+DIST m17n-db-1.7.0.tar.gz 1939608 SHA256 a2ba9f80161433d5c06e57915a9cd51f26c6df4a8909723f952cdbb9b48508f0 SHA512 02c3cb347e9f5c840a723de9ed85be84fc9fb5f86d4963f0d1c6b669045d37d10e5efcf5ac0e0c3cb7249fb391b0dd32bd50fbc3332455aaf0b49d96fc09b2f2 WHIRLPOOL 821071ea60a947526cd92661b9246732379cc924cae0a0a21e141a0cb3e59834633bec20e0ae01a9c66529f09bf9353696f96f2dde4120b2742fdf6ed338e4f8
--- a/dev-db/m17n-db/files/do-not-commit-extra-space.patch
+++ b/dev-db/m17n-db/files/do-not-commit-extra-space.patch
@ -1,16 +0,0 @@
-Index: MIM/zh-util.mim
-===================================================================
-RCS file: /cvs/m17n/m17n-db/MIM/zh-util.mim,v
-retrieving revision 1.3
-diff -u -r1.3 zh-util.mim
--- MIM/zh-util.mim	11 Jul 2008 01:28:53 -0000	1.3
-+++ MIM/zh-util.mim	5 Nov 2010 07:07:48 -0000
-@@ -65,7 +65,7 @@
-   ((BackSpace)))
- 
-  (commit-preedit
-  ((S-\ ))))
-+  ((\ ))))
- 
- (state
-  (check-undo
--- a/dev-db/m17n-db/m17n-db-1.5.2.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.5.2.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
-}
--- a/dev-db/m17n-db/m17n-db-1.5.5.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.5.5.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-	docinto FORMATS; dodoc FORMATS/* || die
-	docinto UNIDATA; dodoc UNIDATA/* || die
-}
--- a/dev-db/m17n-db/m17n-db-1.6.2-r1.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.2-r1.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_prepare() {
-	epatch "${FILESDIR}"/do-not-commit-extra-space.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
-}
--- a/dev-db/m17n-db/m17n-db-1.6.3.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.3.ebuild
@ -1,13 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
-
-inherit eutils
+EAPI="6"

 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
@ -18,9 +16,11 @@ DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"

 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+
+	docinto FORMATS
+	dodoc FORMATS/*

-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
+	docinto UNIDATA
+	dodoc UNIDATA/*
 }
--- a/dev-db/m17n-db/m17n-db-1.6.4.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.6.4.ebuild
@ -1,13 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=4
-
-inherit eutils
+EAPI="6"

 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://download.savannah.gnu.org/releases/m17n/${P}.tar.gz"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"

 LICENSE="LGPL-2.1"
 SLOT="0"
@ -18,9 +16,11 @@ DEPEND="sys-devel/gettext"
 RDEPEND="virtual/libintl"

 src_install() {
-	emake DESTDIR="${D}" install || die
+	default
+
+	docinto FORMATS
+	dodoc FORMATS/*

-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
+	docinto UNIDATA
+	dodoc UNIDATA/*
 }
--- a/dev-db/m17n-db/m17n-db-1.7.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Database for the m17n library"
+HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
+SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND="virtual/libintl"
+
+src_install() {
+	default
+
+	docinto FORMATS
+	dodoc FORMATS/*
+
+	docinto UNIDATA
+	dodoc UNIDATA/*
+}
--- a/dev-db/mariadb/mariadb-10.1.24.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24.ebuild
@ -21,7 +21,7 @@ RESTRICT="!bindist? ( bindist )"
 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) jdbc? ( extraengine server !static )"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"

--- a/dev-db/mycli/Manifest
+++ b/dev-db/mycli/Manifest
@ -1 +1,2 @@
+DIST mycli-1.10.0.tar.gz 272722 SHA256 b0a4b7950783ecca7a129280b4f5ce9bc38b26311ea21199515e47677838451c SHA512 d66866fd23ee2be3f1bb47d1414b8151c2b50e8844a2553e139f753ae55dd010d1c23aae7c5863891ea4f347b124145405dc7894efc27fc8fcb74127c14261f8 WHIRLPOOL f12339070ec884f0ed37eaec0f0b448bb3f518805f5976172860c01d34a05ce0ce220986e9f5d4742e832b529e5d783abb799c69dc5d8386d1873ecf19478964
 DIST mycli-1.7.1.tar.gz 266597 SHA256 27c1bbaa100b1a3fe4adaaf09eab3a372c14a9c27d07fe41b3d6dad6c800bbe6 SHA512 5c61fe67f3205dd1123ed8d38441cda0574db04dd46b7e075d216f7aa8cd856a2f06a1b4bf7dbe9fd0b07f3e91c151fe3f885d10d3db488b6c306e0ce9ac9e7c WHIRLPOOL 265aa82c9c2306576abdb4a90e81baeea74b74c8ab31e430051f9b7de6125c568366efdec76a95d75e1d0bce2fbf4c3bb57e85e69a09a4632dfa56fba3546d5d
--- a/dev-db/mycli/mycli-1.10.0.ebuild
+++ b/dev-db/mycli/mycli-1.10.0.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=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
+
+HOMEPAGE="http://mycli.net"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=6

-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 inherit distutils-r1 git-r3

@ -17,16 +17,12 @@ KEYWORDS=""
 IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
+	>=dev-python/cli_helpers-0.1.0[${PYTHON_USEDEP}]
 	>=dev-python/click-4.1[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	=dev-python/prompt_toolkit-0.57[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-1.0.10[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/python-sqlparse-0.1.16[${PYTHON_USEDEP}]
+	>=dev-python/pymysql-0.6.7[${PYTHON_USEDEP}]
+	>=dev-python/python-sqlparse-0.2.2[${PYTHON_USEDEP}]
 "
-
-src_prepare() {
-	rm mycli/packages/counter.py || die "Could not remove python 2.6 counter.py"
-	distutils-r1_src_prepare
-}
--- a/dev-dotnet/art-sharp/Manifest
+++ b/dev-dotnet/art-sharp/Manifest
@ -1 +0,0 @@
-DIST gnome-sharp-2.24.2.tar.bz2 421281 SHA256 122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0 SHA512 1bf786d6febfb1d7fe29b2b94000ac56a61233dd842d173d028814b2c8f2360df060d781af16db509e9a0a445bdcbef9ed99af5793630192f50440cd0536e571 WHIRLPOOL 07fb7efd8c98e70dae0d2e9c6a2db7a09b551bf16187eb8c20b877218e0c85fb6164baff8eac9c84b1624ce69c81da61a0dbbf41918b75f3267f839b247f9ec8
--- a/dev-dotnet/art-sharp/art-sharp-2.24.2.ebuild
+++ b/dev-dotnet/art-sharp/art-sharp-2.24.2.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-GTK_SHARP_REQUIRED_VERSION="2.12"
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RESTRICT="test"
--- a/dev-dotnet/art-sharp/metadata.xml
+++ b/dev-dotnet/art-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-dotnet/atk-sharp/Manifest
+++ b/dev-dotnet/atk-sharp/Manifest
@ -1,2 +0,0 @@
-DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
-DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74
--- a/dev-dotnet/atk-sharp/atk-sharp-2.12.10.ebuild
+++ b/dev-dotnet/atk-sharp/atk-sharp-2.12.10.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
--- a/dev-dotnet/atk-sharp/metadata.xml
+++ b/dev-dotnet/atk-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-dotnet/gconf-sharp/Manifest
+++ b/dev-dotnet/gconf-sharp/Manifest
@ -1 +0,0 @@
-DIST gnome-sharp-2.24.2.tar.bz2 421281 SHA256 122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0 SHA512 1bf786d6febfb1d7fe29b2b94000ac56a61233dd842d173d028814b2c8f2360df060d781af16db509e9a0a445bdcbef9ed99af5793630192f50440cd0536e571 WHIRLPOOL 07fb7efd8c98e70dae0d2e9c6a2db7a09b551bf16187eb8c20b877218e0c85fb6164baff8eac9c84b1624ce69c81da61a0dbbf41918b75f3267f839b247f9ec8
--- a/dev-dotnet/gconf-sharp/gconf-sharp-2.24.2.ebuild
+++ b/dev-dotnet/gconf-sharp/gconf-sharp-2.24.2.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-GTK_SHARP_REQUIRED_VERSION="2.12"
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
--- a/dev-dotnet/gconf-sharp/metadata.xml
+++ b/dev-dotnet/gconf-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-dotnet/gdk-sharp/Manifest
+++ b/dev-dotnet/gdk-sharp/Manifest
@ -1,2 +0,0 @@
-DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
-DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74
--- a/dev-dotnet/gdk-sharp/gdk-sharp-2.12.10.ebuild
+++ b/dev-dotnet/gdk-sharp/gdk-sharp-2.12.10.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
--- a/dev-dotnet/gdk-sharp/metadata.xml
+++ b/dev-dotnet/gdk-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-dotnet/glade-sharp/Manifest
+++ b/dev-dotnet/glade-sharp/Manifest
@ -1,2 +0,0 @@
-DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
-DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74
--- a/dev-dotnet/glade-sharp/glade-sharp-2.12.10.ebuild
+++ b/dev-dotnet/glade-sharp/glade-sharp-2.12.10.ebuild
@ -1,12 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
--- a/dev-dotnet/glade-sharp/metadata.xml
+++ b/dev-dotnet/glade-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/dev-dotnet/glib-sharp/Manifest
+++ b/dev-dotnet/glib-sharp/Manifest
@ -1,2 +0,0 @@
-DIST gtk-sharp-2.12.10.tar.bz2 1638263 SHA256 aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770 SHA512 232137dfef327f664a941e96edb8e87a18e7def8bccf64e352e846fbd14fe4b93a0725f43b1167c05d597de10ce50c546935810e28681457d5eaba172fc457e0 WHIRLPOOL 3a8a12744ba09ba5b30da8b51b35a9d9cfccfa52e0493bafd71935a7cb6af855bf5860477569a5c17a6416a495e9a9cd4f74c61b8d25b7aedeaab1119fb16cc1
-DIST gtk-sharp-2.12.7.patch.bz2 1069 SHA256 f9db539471450d7cd17406573db117584d10c76bdbc36e11147335e93d6d10c8 SHA512 900a0c63308881b09d51bbd319c917f79ee638e82d2bbc3f7ffad6c15ad21fa22593895907caf76330511c0aa232e44ab6540bb417a2fc1963ea449b2339e427 WHIRLPOOL d3ffbe7e7189516862f64cbb7119484cf8f0d2bd6fd92e3afc839091c525a9cc4e1f8b8981b6cf9bfc52af46156e3f43940536d812d4b68ffcf01559bd3dfb74
--- a/dev-dotnet/glib-sharp/files/glib-sharp-2.12.10-glib-header.patch
+++ b/dev-dotnet/glib-sharp/files/glib-sharp-2.12.10-glib-header.patch
@ -1,36 +0,0 @@
-diff -urN 1/glib/glue/list.c 2/glib/glue/list.c
--- 1/glib/glue/list.c	2009-01-07 10:54:06.000000000 -0600
-+++ 2/glib/glue/list.c	2012-02-14 20:50:32.116877699 -0600
-@@ -20,7 +20,7 @@
-  */
- 
- 
-#include <glib/glist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_list_get_data (GList *l);
-diff -urN 1/glib/glue/slist.c 2/glib/glue/slist.c
--- 1/glib/glue/slist.c	2009-01-07 10:54:06.000000000 -0600
-+++ 2/glib/glue/slist.c	2012-02-14 20:50:43.721718553 -0600
-@@ -20,7 +20,7 @@
-  */
- 
- 
-#include <glib/gslist.h>
-+#include <glib.h>
- 
- /* Forward declarations */
- gpointer gtksharp_slist_get_data (GSList *l);
-diff -urN 1/glib/glue/thread.c 2/glib/glue/thread.c
--- 1/glib/glue/thread.c	2009-01-07 10:54:06.000000000 -0600
-+++ 2/glib/glue/thread.c	2012-02-14 20:50:51.922605985 -0600
-@@ -20,7 +20,7 @@
-  */
- 
- 
-#include <glib/gthread.h>
-+#include <glib.h>
- 
- gboolean glibsharp_g_thread_supported (void);
- 
--- a/dev-dotnet/glib-sharp/glib-sharp-2.12.10.ebuild
+++ b/dev-dotnet/glib-sharp/glib-sharp-2.12.10.ebuild
@ -1,14 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit gtk-sharp-module
-
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.12.10-glib-header.patch" )
--- a/dev-dotnet/glib-sharp/metadata.xml
+++ b/dev-dotnet/glib-sharp/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 type="project">
-		<email>dotnet@gentoo.org</email>
-		<name>Gentoo Dotnet Project</name>
-	</maintainer>
-</pkgmetadata>
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST boxbackup-0.11.1.tgz 1863270 SHA256 1328b010477259c4767276dbfebab6580e883336cc9d25696c39991b09cc6d32 SHA512 15ceceae3659f14254f422136805a8b3ed3c39d14f8a1ffd0c96efb05b7acb5be310e13144ed86fe4afd24a3c0b86ec771b7d3a9f08b2789bb98e18468ca97f8 WHIRLPOOL 9abcae4e907d526e6df0ebfee813cd374e8f981e5f25e0a2cbc2e958e0bf4d0ce10a455d71e036dc13aa31c01c422349cdbb1f1a36a0ea8ae16cf2b14f0f97fc`
				`@ -1 +0,0 @@`
				`DIST gjiten-2.6.tar.gz 564845 SHA256 f6c0cc69e1e59ed8c3a946a1ee3e4a5e2e1deb16890bfc5f67c055adb10a71dd SHA512 ef56ad2fdcbe9c1b2df59dbb0cb4036ab2cf90e0fa290275b5dbfb0cfe66521231da48dc710a2837bd1d4402cf2bfb219b952a85e0a482062eade316c04e0bfa WHIRLPOOL 857a38294bc8860f9e8be2dd856ed111385a911c872d39f9c64e6c3cf953dd6662c043ef4679e5f956e6ddaed16f4fd3d02d0d5fd45ac1d318ef68a802aee9eb`
				`@ -0,0 +1 @@`
				`DIST ibus-kkc-1.5.22.tar.gz 518844 SHA256 22fe2552f08a34a751cef7d1ea3c088e8dc0f0af26fd7bba9cdd27ff132347ce SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4 WHIRLPOOL 2b157203a4956e396e096b86be1b84d47df61eccec9a20eada6ebae14f27e30873389fb465a7d435f11f160bea24d0042ba9f20eb5555f1fb76d912b2200e82c`
				`@ -1 +0,0 @@`
				`DIST im-ja-1.5.tar.gz 905539 SHA256 96f4ed82706a873bdade99a934a1a66431f146758837ed0f007e3c145649f780 SHA512 97c75aa5437b3f887d7004d87f4dd7e444fb2ad393af0117dab64fdef87c0a92b1a97c1934a8e1e67e6c1753ad78f1c9a67f5aca10710115a8b331aae4f17864 WHIRLPOOL c9d3cd722ce3b31cedfc75667d752a0df22fd3eda6e6f3421c5d381c86735e047c80db5c14b0b59a71d524b617276850fddc8b0378e18bbda825208381fa7700`
				`@ -0,0 +1 @@`
				`DIST libkkc-0.3.5.tar.gz 1424282 SHA256 89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef SHA512 f611c3104a22ad38af29746870849d8937b6af2a7fee0952cc25f36ef845b5617a192df7ca63ff2a507384f7a6a13c9c1b4fa3b9a34f3f041bee8793d04b9236 WHIRLPOOL 4f759c9b08c4706c2244e253bad6c347dac2ad1a9ceb5a1b5b96161a7222e6fd1f607cc7dd4f49a01757e28742d75f2764d66c10435266e22a973f5e4e70cc72`
				`@ -1 +0,0 @@`
				`DIST bitpim-1.0.6.tar.bz2 4595216 SHA256 9a46b965e505d5a25bb613cef887bf23871f7b1c20493786cd0b880e3ef6855d SHA512 6ef4f56e1afa360b60a4522e6c0dc3526bf30e43d8ad783c247724c7cc212056cdb2664da09b0b5883e0eb38ed68d046f259043bf9b34ad0aa51773119c49c74 WHIRLPOOL 3cd092067d5fd11d325208f0e670135e28aa5aa2de769ffca7eaee7d8d339c55c036d4dbc2b0c34601fee11f78f0d0466c749f17ae02c5dd033935cd8dc5572f`
				`@ -1 +0,0 @@`
				`DIST libgnomeuimm-2.28.0.tar.bz2 382428 SHA256 6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3 SHA512 f02ee119bff2d42bd7fc61719988de45e497c7a5cc151a438ad3601c2bf55d6ecfeb001b22032a47f15dc6f7eb4cf4c5412c3246969a24ff0579a9b89d5dab15 WHIRLPOOL a41b02886f17ed79c36c090a212ac19504e5c9be803d6666cc7babe8726bc7050a11576a0ce65b8e4de25354ad948b46047562257b24e3cdd9660bd230145da2`
				`@ -1 +0,0 @@`
				`DIST ctdb-1.13.tar.xz 736004 SHA256 c43693877cbc7d047d8b11b01a101bee69df6a871ab397214cc68d8f6f8c98c7 SHA512 653e1d5c29962810353d6b8c5867d07bef17dd5bf431f7304793f13712bb92379fb1b05b6e461279b08e0a1c9d87951f57fb1e2c35f85392b99baadf7d232ece WHIRLPOOL 9323de35b038a920ed6d5ed3be379c7c2ec93814f0f8c4f304de36e2512f58f7a62578ecd257d4fbe4e856c6d0b196fae88e7fbf673e47bbfd2acf0f2ac13b6b`
				`@ -1 +0,0 @@`
				`DIST gnome-sharp-2.24.2.tar.bz2 421281 SHA256 122b1e03966d63ec3389decf5440fb94285907d1b6be48352dcf6aca292cf7b0 SHA512 1bf786d6febfb1d7fe29b2b94000ac56a61233dd842d173d028814b2c8f2360df060d781af16db509e9a0a445bdcbef9ed99af5793630192f50440cd0536e571 WHIRLPOOL 07fb7efd8c98e70dae0d2e9c6a2db7a09b551bf16187eb8c20b877218e0c85fb6164baff8eac9c84b1624ce69c81da61a0dbbf41918b75f3267f839b247f9ec8`