Sync with portage [Tue Apr 21 12:50:55 MSK 2015].

9 years ago · 21ffd9990c
parent 90b0e6fee1
commit 21ffd9990c
723 changed files with 5437 additions and 15351 deletions
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,3 +1,2 @@
-DIST ansible-1.6.8.tar.gz 1177319 SHA256 9d9b42ec2fa1d0aeac5472cc0f00ad75930d3b15d4ae8a9c44ed877c3d4fc190 SHA512 494f9831b1620c88f45584be9be02e873b80b09e1a2030be22d0e9bd02fb6b8618f5c713b9a4f87c671d418d9e73119d84e6da0eb5c8a1cc061e7eee80380720 WHIRLPOOL 0869c29d27bddad8994d04926b7d0bef3e6732a645c33c742a568382797b774cc01623a365a60204b28c0f495c54059a132167753e1d2a0e21dcfa1f801642b0
 DIST ansible-1.8.4.tar.gz 758916 SHA256 d37c04b3abce9b036a6c8311fccb360c5cbc3ec895445f805243b0448d239ec1 SHA512 abba45df12144a6b32447404ffda57a08f43a20e8875c8cb052435d8447271b1c1895c5cb8cf584b10ba8bac7e24ee242e99494b7b9a21c8df40cea54b48b3e0 WHIRLPOOL c7de6a99c5bcce2aa987e5cc551bca939f78562f91e5a48484aa776fbc1bee9ca9f61e446ab5f179aef2da81fa8e2685f116f3f10505240956f40530c90964f5
 DIST ansible-1.9.0.1.tar.gz 916591 SHA256 b2193fd9a4061ab624fa67311796419a759de06b4f321d37169b22ba3831331c SHA512 4548847f7644ced6ec099ac80871da4c113145b541d0a1cf32f3fc00898c86cd6e494ee08fca81cbdf0f96ff9f714c6b5d7eff29e37a9f76f460cb5bcbc5cf30 WHIRLPOOL ae06e315191c61847b3f3779299c6591c8456525aaf70aa94e9c655bf18e441197104bd48d14d8aafc5ced747a5429fdcc094c059eaba3d18edeb8339c0b29b7
--- a/app-admin/ansible/ansible-1.6.8.ebuild
+++ b/app-admin/ansible/ansible-1.6.8.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ansible/ansible-1.6.8.ebuild,v 1.4 2014/07/31 06:04:14 pinkbyte Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 readme.gentoo
-
-DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
-HOMEPAGE="http://ansible.com/"
-SRC_URI="https://github.com/ansible/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-DEPEND="test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-RDEPEND="
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-
-DOC_CONTENTS="You can define parameters through shell variables OR use config files
-Examples of config files installed in /usr/share/doc/${PF}/examples\n\n
-You have to create ansible hosts file!\n
-More info on http://docs.ansible.com/intro_getting_started.html
-
-Some optional dependencies, you might want to install:\n
-dev-python/keyczar - needed to support accelerated mode\n
-dev-python/paramiko - alternative SSH backend"\
-
-python_test() {
-	make tests || die "tests failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-	docompress -x /usr/share/doc/${PF}/examples
-	# Hint: do not install example config files into /etc
-	# let this choice to user
-
-	newenvd "${FILESDIR}"/${PN}.env 95ansible
-}
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -1,4 +1,4 @@
-DIST rsyslog-8.4.2.tar.gz 1938563 SHA256 71c3c6dac74fba2692f9fefb092cd3d22e2bd71eb702e0da06648de51b8b7b9a SHA512 f3a8af9c859fac4f490d8836f2083125c2daddf0647df06318628ad92cb63538612ecdc78f725bd3e3725a3c79f0c06a67fafe6a2fd5c9194fa18020de6d3847 WHIRLPOOL b4a17389215202158721739b216f43602668c62d52f169362a548f8db0fdc2c8e8114eb8b12727f638ede3077f1172d5077eb9dc64c5f29e28282cee145e098e
 DIST rsyslog-8.7.0.tar.gz 2003365 SHA256 c77125b67a623569c9bdca8136b9aac013f1c6fd82fb8595e3ea267e61800f9c SHA512 53feac42c14134d76f5592ee491bb56fb2c4c33822a7a5609a5267b6911a5c5c4e73c5d66a913a666967d8826ee3077b91d8d2a1d1b60bcb3d425b35ec4677b0 WHIRLPOOL c74c401de68bb59310e307a0d9859d2f58bcbf8126d637d23d4f3979a0d6c69bce8ca850c2942b43f311ea83f47c9554f34e5dc10623d32324da1b18023d357d
-DIST rsyslog-doc-8.4.2.tar.gz 4066598 SHA256 21862b046b3504f136f9b8961466f2b248ac315c67de8742bd4a35c599f3dd48 SHA512 cbb46e219af5a7b9c60e3a60a75713f88405f7a4036f9d308f17a06ae8e8db0bdff9eae5807a067b9347a0aad264ef9ed73e6587502df2de412569f6d13b7ff6 WHIRLPOOL 97f4de085bf388523df8fa245607c965b0bfdeb13f28c6659f4a267fccaa9f6f7a898cc2f68822796ad69266e5593297db572a9679c8e20e5bc5fd6d26d067f5
+DIST rsyslog-8.9.0.tar.gz 2022294 SHA256 eab00e8e758cd9dd33b3e2cf6af80297d1951dc7db37bd723a6488a35d577adc SHA512 942cccc2cbe147572cc2d346ac330d80c86915757b2b7a380829f0b40294d7e4afd4887d5066821af1e059cd78cdb38520fc9d28b55daa7afcd0e5b2e6bd9a5d WHIRLPOOL cc072a64364f38d98187e7102e5be0277011071ce90a510a641aea6a5b3573a436e6539c5688b24d12a9654786892070c1518093e0176e5a40bea57f7dded133
 DIST rsyslog-doc-8.7.0.tar.gz 4105507 SHA256 f131bfb963eed4fe74d7336ee5261876b436004b78994d47523a82c0f7d666a8 SHA512 9b5b6f28a55b58c956ca614301fc9667243d02c321f8b4071264e4040dd8fe79ba7eb5a08912e2a229bdcf12f68eec24f1c65ba7b82ccd60c8e70d34267b8405 WHIRLPOOL 386ad5164768a5a4919ba5acda29f3ef670b78cc9d6845e3c8ee252b43d6622c19c7f8ec1edd7d0f1d111bf2c06d29fb5dbf9af6b46c426932ae6caa0e63c30c
+DIST rsyslog-doc-8.9.0.tar.gz 4100654 SHA256 d3c6747439fabbfa976922ca26ffa695778668e757261e00103f2444cf153afa SHA512 dbc6dfc43f3a75ba671969d2fd59080d96e411a62a2ac91444d076acba548b2c87000f9822fa0af82f22b4f5c098273d407c1e665ce4b24a52dbddfdc9ab981f WHIRLPOOL 550d499ec556a75344d25331aa1df1855f6f70e2e702c086a8ecbf1817eb1f4bc3b94224b77491f3bc1f6c758a22475c248f8afdfc25816132dfedd81c6dfee0
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@ -21,7 +21,6 @@
 		<flag name="mysql">Build the MySQL databse output module (requires <pkg>virtual/mysql</pkg>)</flag>
 		<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
 		<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
-		<flag name="oracle">Build the Oracle database output module (requires <pkg>dev-db/oracle-instantclient-basic</pkg>)</flag>
 		<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql-base</pkg>)</flag>
 		<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
 		<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
--- a/app-admin/rsyslog/rsyslog-8.9.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.9.0.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.4.2.ebuild,v 1.6 2014/12/28 14:45:28 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/rsyslog/rsyslog-8.9.0.ebuild,v 1.1 2015/04/20 13:06:49 ultrabug Exp $

 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@ -9,15 +9,36 @@ inherit autotools-utils eutils systemd

 DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
 HOMEPAGE="http://www.rsyslog.com/"
-SRC_URI="
-	http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
-	doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
-"
+
+BRANCH="8-stable"
+
+PATCHES=(
+	"${FILESDIR}"/${BRANCH}/10-respect_CFLAGS-r1.patch
+)
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="
+		git://github.com/rsyslog/${PN}.git
+		https://github.com/rsyslog/${PN}.git
+	"
+
+	DOC_REPO_URI="
+		git://github.com/rsyslog/${PN}-doc.git
+		https://github.com/rsyslog/${PN}-doc.git
+	"
+
+	inherit git-r3
+else
+	SRC_URI="
+		http://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( http://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+	KEYWORDS="~amd64 ~arm ~hppa ~x86"
+fi

 LICENSE="GPL-3 LGPL-3 Apache-2.0"
-KEYWORDS="amd64 ~arm hppa x86"
 SLOT="0"
-IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof oracle postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd usertools zeromq"
+IUSE="dbi debug doc elasticsearch +gcrypt jemalloc kerberos mongodb mysql normalize omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools zeromq"

 RDEPEND="
 	>=dev-libs/json-c-0.11:=
@ -33,16 +54,15 @@ RDEPEND="
 	mysql? ( virtual/mysql )
 	normalize? (
 		>=dev-libs/libee-0.4.0
-		>=dev-libs/liblognorm-1.0.0:=
+		>=dev-libs/liblognorm-1.1.0:=
 	)
 	omudpspoof? ( >=net-libs/libnet-1.1.6 )
-	oracle? ( >=dev-db/oracle-instantclient-basic-10.2 )
-	postgres? ( >=dev-db/postgresql-8.4.20 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
 	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0 )
 	redis? ( >=dev-libs/hiredis-0.11.0 )
 	relp? ( >=dev-libs/librelp-1.2.5 )
 	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
-	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y )
+	rfc5424hmac? ( >=dev-libs/openssl-0.9.8y:= )
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	ssl? ( >=net-libs/gnutls-2.12.23 )
 	systemd? ( >=sys-apps/systemd-208 )
@ -50,10 +70,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"

-BRANCH="8-stable"
-
-# Test suite requires a special setup or will always fail
-RESTRICT="test"
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+fi

 # Maitainer note : open a bug to upstream
 # showing that building in a separate dir fails
@ -67,18 +86,38 @@ DOCS=(
 	"${FILESDIR}"/${BRANCH}/README.gentoo
 )

-PATCHES=( "${FILESDIR}"/${BRANCH}/10-respect_CFLAGS.patch )
-
 src_unpack() {
-	unpack ${P}.tar.gz
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi

 	if use doc; then
-		local doc_tarball="${PN}-doc-${PV}.tar.gz"
-
-		cd "${S}" || die "Cannot change dir into '$S'"
-		mkdir docs || die "Failed to create docs directory"
-		cd docs || die "Failed to change dir into '${S}/docs'"
-		unpack ${doc_tarball}
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [ -n "${EGIT_BRANCH}" ]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [ -n "${_EGIT_BRANCH}" ]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			local doc_tarball="${PN}-doc-${PV}.tar.gz"
+
+			cd "${S}" || die "Cannot change dir into '$S'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${doc_tarball}
+		fi
 	fi
 }

@ -100,11 +139,13 @@ src_configure() {

 	local myeconfargs=(
 		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
 		# Input Plugins without depedencies
+		--enable-imdiag
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		--enable-imttcp
 		# Message Modificiation Plugins without depedencies
 		--enable-mmanon
 		--enable-mmaudit
@ -124,19 +165,16 @@ src_configure() {
 		--enable-pmciscoios
 		--enable-pmcisconames
 		--enable-pmlastmsg
-		--enable-pmrfc3164sd
 		--enable-pmsnare
 		# DB
 		$(use_enable dbi libdbi)
 		$(use_enable mongodb ommongodb)
 		$(use_enable mysql)
-		$(use_enable oracle)
 		$(use_enable postgres pgsql)
 		$(use_enable redis omhiredis)
 		# Debug
 		$(use_enable debug)
 		$(use_enable debug diagtools)
-		$(use_enable debug imdiag)
 		$(use_enable debug memcheck)
 		$(use_enable debug rtinst)
 		$(use_enable debug valgrind)
@ -165,6 +203,39 @@ src_configure() {
 	autotools-utils_src_configure
 }

+src_compile() {
+	autotools-utils_src_compile
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [ -z "${_has_increased_ulimit}" ]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv $FEATURES; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
 src_install() {
 	use doc && HTML_DOCS=( "${S}/docs/build/" )
 	autotools-utils_src_install
@ -188,7 +259,7 @@ src_install() {

 	if use mysql; then
 		insinto /usr/share/doc/${PF}/scripts/mysql
-		doins plugins/ommysql/{createDB.sql,contrib/delete_mysql}
+		doins plugins/ommysql/createDB.sql
 	fi

 	if use postgres; then
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@ -1,3 +1,4 @@
 DIST testdisk-6.12.tar.bz2 554633 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16 SHA512 5cd17d1ad851515dcd1f3ef5dfb7435aff2f89e2b0467e84552809d203688a47731e23a602dc10355861414eb2d8c6b9edd48225ccc6229ab59810803a59da4c WHIRLPOOL f667fa6e61990cd6c6532301e461fc1cdcd9303a96566cc501dc1945fd9328b234b8c3f5a760a839a9d4b026da29d03c3189fa9afc58b7f7efa6e96b15008a49
 DIST testdisk-6.13.tar.bz2 560696 SHA256 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220 SHA512 30889b8afed5b0fac93ce028e8c95bfa3e14b72d39cc4f86659edcce0b8820c5ce0c2b7e1d09f23f0da977b5d1cb275551069a87b109d05538e63e9b76200442 WHIRLPOOL b9bcf93df5b42a26b4206969ee968122f194338a28c6a500e540e3cafec2ae84d0734624c58b3581fc9ac71f2ea1038f2997e3f91278d6eed18abf786cd31200
 DIST testdisk-6.14.tar.bz2 620077 SHA256 a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c SHA512 f479c7863e1a39bf747a0b73b37eba1016e4762373b9b68747fed6141aa8faa7703c89dddc975df18904759292cd7d333ca0619eacb3c1eea76790a917e95774 WHIRLPOOL def7c9506747c68e5fb786ab0725c8ca2e15ccd53fc7f336d77f72067a6a6094c716c57ec3652a8386bf176b40e2fb1504925c6734bc3037799a4bbef3c8e67d
+DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1
--- a/app-admin/testdisk/files/install-gentoo.patch
+++ b/app-admin/testdisk/files/install-gentoo.patch
@ -0,0 +1,25 @@
+--- Makefile.am-original	2015-04-20 11:31:03.000000000 -0600
+++ Makefile.am	2015-04-20 13:27:01.000000000 -0600
+@@ -1,9 +1,8 @@
+ SUBDIRS = icons man src
+ 
+-EXTRA_DIST = AUTHORS COPYING ChangeLog INFO INSTALL NEWS README THANKS compile.sh \
+EXTRA_DIST = compile.sh \
+ 	progsreiserfs-journal.patch progsreiserfs-file-read.patch \
+ 	darwin/readme_mac_powerpc.txt darwin/readme_mac_intel.txt \
+-	documentation.html \
+ 	dos/readme.txt \
+ 	linux/testdisk.spec.in \
+ 	linux/qphotorec.desktop \
+@@ -24,9 +23,9 @@
+ 
+ AUTOMAKE_OPTIONS = gnits
+ 
+dist_doc_DATA =  AUTHORS COPYING ChangeLog NEWS INFO INSTALL README THANKS documentation.html
+
+ install-data-hook:
+-	$(mkinstalldirs) $(DESTDIR)$(docdir)
+-	$(INSTALL_DATA) $(top_srcdir)/AUTHORS $(top_srcdir)/ChangeLog $(top_srcdir)/NEWS $(top_srcdir)/README $(top_srcdir)/THANKS $(top_srcdir)/documentation.html $(DESTDIR)$(docdir)
+ if USEQT
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/applications
+ 	$(INSTALL_DATA) $(top_srcdir)/linux/qphotorec.desktop $(DESTDIR)$(datadir)/applications
--- a/app-admin/testdisk/testdisk-6.14.ebuild
+++ b/app-admin/testdisk/testdisk-6.14.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.2 2014/12/30 19:51:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14.ebuild,v 1.3 2015/04/20 19:59:01 nicolasbock Exp $

 EAPI=5

@ -20,7 +20,7 @@ IUSE="jpeg ntfs reiserfs static"
 DEPEND="
 		sys-apps/util-linux
 		>=sys-libs/ncurses-5.2
-		jpeg? ( virtual/jpeg )
+		jpeg? ( virtual/jpeg:* )
 		ntfs? ( sys-fs/ntfs3g )
 		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
 		>=sys-fs/e2fsprogs-1.35
--- a/app-admin/testdisk/testdisk-7.0-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r1.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r1.ebuild,v 1.1 2015/04/20 21:21:56 nicolasbock Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="jpeg ntfs reiserfs static"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+		static? (
+			sys-apps/util-linux[static-libs]
+			>=sys-libs/ncurses-5.2[static-libs]
+			jpeg? ( virtual/jpeg:*[static-libs] )
+			ntfs? ( <=sys-fs/ntfs3g-2013.1.13[static-libs] )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+			>=sys-fs/e2fsprogs-1.35[static-libs]
+			sys-libs/zlib[static-libs]
+			)
+		!static? (
+			sys-apps/util-linux
+			>=sys-libs/ncurses-5.2
+			jpeg? ( virtual/jpeg:* )
+			ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+			>=sys-fs/e2fsprogs-1.35
+			sys-libs/zlib
+			)"
+RDEPEND="!static? ( ${DEPEND} )"
+
+PATCHES=( "${FILESDIR}/install-gentoo.patch" )
+DOCS=( )
+AUTOTOOLS_AUTORECONF=1
+BUILD_DIR="${S}"
+
+src_configure() {
+	local myconf
+
+	# this is static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	# --with-foo are broken, any use of --with/--without disable the
+	# functionality.
+	# The following variation must be used.
+	use reiserfs || myconf+=" --without-reiserfs"
+	use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
+	use jpeg || myconf+=" --without-jpeg"
+
+	econf \
+		--docdir "${ROOT}/usr/share/doc/${P}" \
+		--disable-qt \
+		--without-ewf \
+		--enable-sudo \
+		${myconf}
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
--- a/app-admin/testdisk/testdisk-7.0-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r2.ebuild
@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild,v 1.1 2015/04/21 03:04:22 nicolasbock Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="jpeg ntfs reiserfs static"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+		static? (
+			sys-apps/util-linux[static-libs]
+			>=sys-libs/ncurses-5.2[static-libs]
+			jpeg? ( virtual/jpeg:*[static-libs] )
+			ntfs? ( sys-fs/ntfs3g[static-libs] )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+			>=sys-fs/e2fsprogs-1.35[static-libs]
+			sys-libs/zlib[static-libs]
+			)
+		!static? (
+			sys-apps/util-linux
+			>=sys-libs/ncurses-5.2
+			jpeg? ( virtual/jpeg:* )
+			ntfs? ( sys-fs/ntfs3g )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+			>=sys-fs/e2fsprogs-1.35
+			sys-libs/zlib
+			)"
+RDEPEND="!static? ( ${DEPEND} )"
+
+PATCHES=( "${FILESDIR}/install-gentoo.patch" )
+DOCS=( )
+AUTOTOOLS_AUTORECONF=1
+BUILD_DIR="${S}"
+
+src_configure() {
+	local myconf
+
+	# this is static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	# --with-foo are broken, any use of --with/--without disable the
+	# functionality.
+	# The following variation must be used.
+	use reiserfs || myconf+=" --without-reiserfs"
+	use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
+	use jpeg || myconf+=" --without-jpeg"
+
+	econf \
+		--docdir "${ROOT}/usr/share/doc/${P}" \
+		--disable-qt \
+		--without-ewf \
+		--enable-sudo \
+		${myconf}
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
--- a/app-admin/testdisk/testdisk-7.0.ebuild
+++ b/app-admin/testdisk/testdisk-7.0.ebuild
@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0.ebuild,v 1.4 2015/04/20 19:59:01 nicolasbock Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils flag-o-matic
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="jpeg ntfs reiserfs static"
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+DEPEND="
+		static? (
+			sys-apps/util-linux[static-libs]
+			>=sys-libs/ncurses-5.2[static-libs]
+			jpeg? ( virtual/jpeg:*[static-libs] )
+			ntfs? ( <=sys-fs/ntfs3g-2013.1.13[static-libs] )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+			>=sys-fs/e2fsprogs-1.35[static-libs]
+			sys-libs/zlib[static-libs]
+			)
+		!static? (
+			sys-apps/util-linux
+			>=sys-libs/ncurses-5.2
+			jpeg? ( virtual/jpeg:* )
+			ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
+			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+			>=sys-fs/e2fsprogs-1.35
+			sys-libs/zlib
+			)"
+RDEPEND="!static? ( ${DEPEND} )"
+
+PATCHES=( "${FILESDIR}/install-gentoo.patch" )
+DOCS=( )
+AUTOTOOLS_AUTORECONF=1
+BUILD_DIR="${S}"
+
+src_configure() {
+	local myconf
+
+	# this is static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	# --with-foo are broken, any use of --with/--without disable the
+	# functionality.
+	# The following variation must be used.
+	use reiserfs || myconf+=" --without-reiserfs"
+	use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
+	use jpeg || myconf+=" --without-jpeg"
+
+	econf \
+		--disable-qt \
+		--without-ewf \
+		--enable-sudo \
+		${myconf}
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
--- a/app-arch/tar/files/tar-1.28-concat-listed.patch
+++ b/app-arch/tar/files/tar-1.28-concat-listed.patch
@ -0,0 +1,117 @@
+https://bugs.gentoo.org/546294
+https://lists.gnu.org/archive/html/bug-tar/2015-04/msg00006.html
+
+From 15c02c2b9d383446b3ea35dbea5a048e136b020d Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org.ua>
+Date: Thu, 16 Apr 2015 13:02:10 +0300
+Subject: [PATCH] Fix extraction from concatenated incremental archives.
+
+* src/common.h (remove_delayed_set_stat): New proto.
+* src/extract.c (free_delayed_set_stat)
+(remove_delayed_set_stat): New function.
+(apply_nonancestor_delayed_set_stat): Use free_delayed_set_stat.
+* src/misc.c (safer_rmdir): Remove delayed_set_stat entry
+corresponding to the removed directory.
+* tests/incr10.at: New test case.
+* tests/Makefile.am: Add new test.
+* tests/testsuite.at: Likewise.
+---
+ src/common.h       |  2 ++
+ src/extract.c      | 38 +++++++++++++++++++++++++++-----
+ src/misc.c         |  7 +++++-
+ tests/Makefile.am  |  1 +
+ tests/incr10.at    | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ tests/testsuite.at |  1 +
+ 6 files changed, 107 insertions(+), 6 deletions(-)
+ create mode 100644 tests/incr10.at
+
+diff --git a/src/common.h b/src/common.h
+index 20cbb64..2904183 100644
+--- a/src/common.h
+++ b/src/common.h
+@@ -523,6 +523,8 @@ void extract_archive (void);
+ void extract_finish (void);
+ bool rename_directory (char *src, char *dst);
+ 
+void remove_delayed_set_stat (const char *fname);
+
+ /* Module delete.c.  */
+ 
+ void delete_archive_members (void);
+diff --git a/src/extract.c b/src/extract.c
+index ca25603..5aaeb1b 100644
+--- a/src/extract.c
+++ b/src/extract.c
+@@ -537,6 +537,38 @@ repair_delayed_set_stat (char const *dir,
+ 	  quotearg_colon (dir)));
+ }
+ 
+static void
+free_delayed_set_stat (struct delayed_set_stat *data)
+{
+  xheader_xattr_free (data->xattr_map, data->xattr_map_size);
+  free (data->cntx_name);
+  free (data->acls_a_ptr);
+  free (data->acls_d_ptr);
+  free (data);
+}
+
+void
+remove_delayed_set_stat (const char *fname)
+{
+  struct delayed_set_stat *data, *next, *prev = NULL;
+  for (data = delayed_set_stat_head; data; data = next)
+    {
+      next = data->next;
+      if (chdir_current == data->change_dir
+	  && strcmp (data->file_name, fname) == 0)
+	{
+	  free_delayed_set_stat (data);
+	  if (prev)
+	    prev->next = next;
+	  else
+	    delayed_set_stat_head = next;
+	  return;
+	}
+      else
+	prev = data;
+    }
+}
+
+ /* After a file/link/directory creation has failed, see if
+    it's because some required directory was not present, and if so,
+    create all required directories.  Return zero if all the required
+@@ -846,11 +878,7 @@ apply_nonancestor_delayed_set_stat (char const *file_name, bool after_links)
+ 	}
+ 
+       delayed_set_stat_head = data->next;
+-      xheader_xattr_free (data->xattr_map, data->xattr_map_size);
+-      free (data->cntx_name);
+-      free (data->acls_a_ptr);
+-      free (data->acls_d_ptr);
+-      free (data);
+      free_delayed_set_stat (data);
+     }
+ }
+ 
+diff --git a/src/misc.c b/src/misc.c
+index 8e66643..d263c07 100644
+--- a/src/misc.c
+++ b/src/misc.c
+@@ -586,7 +586,12 @@ safer_rmdir (const char *file_name)
+       return -1;
+     }
+ 
+-  return unlinkat (chdir_fd, file_name, AT_REMOVEDIR);
+  if (unlinkat (chdir_fd, file_name, AT_REMOVEDIR) == 0)
+    {
+      remove_delayed_set_stat (file_name);
+      return 0;
+    }
+  return -1;
+ }
+ 
+ /* Remove FILE_NAME, returning 1 on success.  If FILE_NAME is a directory,
+-- 
+2.3.5
+
--- a/app-arch/tar/tar-1.28-r1.ebuild
+++ b/app-arch/tar/tar-1.28-r1.ebuild
@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.28-r1.ebuild,v 1.1 2015/04/20 16:49:46 vapier Exp $
+
+EAPI=4
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="mirror://gnu/tar/${P}.tar.bz2
+	mirror://gnu-alpha/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="acl minimal nls selinux static userland_GNU xattr"
+
+RDEPEND="acl? ( virtual/acl )
+	selinux? ( sys-libs/libselinux )"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )
+	xattr? ( sys-apps/attr )"
+
+src_prepare() {
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+	epatch "${FILESDIR}"/${P}-concat-listed.patch #546294
+}
+
+src_configure() {
+	use static && append-ldflags -static
+	FORCE_UNSAFE_CONFIGURE=1 \
+	econf \
+		--enable-backup-scripts \
+		--bindir="${EPREFIX}"/bin \
+		--libexecdir="${EPREFIX}"/usr/sbin \
+		$(usex userland_GNU "" "--program-prefix=g") \
+		$(use_with acl posix-acls) \
+		$(use_enable nls) \
+		$(use_with selinux) \
+		$(use_with xattr xattrs)
+}
+
+src_install() {
+	default
+
+	local p=$(usex userland_GNU "" "g")
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt
+	fi
+
+	# autoconf looks for gtar before tar (in configure scripts), hence
+	# in Prefix it is important that it is there, otherwise, a gtar from
+	# the host system (FreeBSD, Solaris, Darwin) will be found instead
+	# of the Prefix provided (GNU) tar
+	if use prefix ; then
+		dosym tar /bin/gtar
+	fi
+
+	mv "${ED}"/usr/sbin/${p}backup{,-tar} || die
+	mv "${ED}"/usr/sbin/${p}restore{,-tar} || die
+
+	if use minimal ; then
+		find "${ED}"/etc "${ED}"/*bin/ "${ED}"/usr/*bin/ \
+			-type f -a '!' '(' -name tar -o -name ${p}tar ')' \
+			-delete || die
+	fi
+}
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -3,3 +3,4 @@ DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aa
 DIST unrarsrc-5.2.1.tar.gz 217272 SHA256 a075a8943412abb2ff5600038330a3d5a8f5a39cbe8e92543cc2c45b6247d05d SHA512 bd89acbed0377f48c88e5b9f6c3701dff1d0a5a65e74e9668690daf0ce0188c74914ed7edb093c0139b0507cf0785790fd8505be7d54204d16bcfced64b4dc29 WHIRLPOOL 6e21e981663eaa14e5d94553cb8fb93db601fe1058f73fc32d3f9a30f399210e71c657d342495d1be18b0e011a5677084242e01b5dff8aa476379bcbae1f7857
 DIST unrarsrc-5.2.2.tar.gz 217481 SHA256 4c134a739467dd0a18bd8aaa48f32750335c842d8a27e11b955ccc33a73ac834 SHA512 ae1d9c3009b9e632bffff54553c0ccc347e59a77236b0a76d9fe603285e17229ce295e718ca6e7658fb050a3145a03dcb2daa6e704cd459d2b7a6eb1a101daa3 WHIRLPOOL 6e3e98be8df13729b89a0c64e775c148ac560c31bb2ff8d61c7ba3ba75421da698e702336604944787eee5e3edc774ee09df62395610c4af0f6262f5870134be
 DIST unrarsrc-5.2.3.tar.gz 217841 SHA256 d249d34541dba39234cdf661ccec80e44334efe50c3ca1d7c51186cd5d26e072 SHA512 94ff765c2aa4ede7d5f2f35c3c35c634b7691559ac9bc978a4f760e22e005422a3a0d36ab09e4c492cea456161cc13dbf256eb2ead23a7976e79bf3cc89903ed WHIRLPOOL dbb7408444078a0ad507fba2d2a483c91a9519193635b25a04c076b92c27c7af9e53481cd89927ca040e03422b5a36e1192f906043706bf9ad2a80f867c27b0f
+DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
--- a/app-arch/unrar/unrar-5.2.7.ebuild
+++ b/app-arch/unrar/unrar-5.2.7.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-5.2.7.ebuild,v 1.1 2015/04/20 20:47:32 vapier Exp $
+
+EAPI=5
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=${PN}src
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="http://www.rarlab.com/rar_add.htm"
+SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="unRAR"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
+
+S=${WORKDIR}/unrar
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-5.0.2-build.patch
+	epatch "${FILESDIR}"/${PN}-5.2.2-no-auto-clean.patch #528218
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin}
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+}
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@ -1 +1,2 @@
 DIST xarchiver-0.5.3.tar.bz2 778871 SHA256 c5899cb495e83a63f89b5eea002d2dd1c691db8d7b6343b3c182ce6e00c16d81 SHA512 b8719a1b7f71c999952390fca999a66baf709e1058f307b40a6b0500d5d268f3923bded742b2fbc0d8c760c43f33b7d5d4971f36a6dc4659310ad41ca7a045d6 WHIRLPOOL 97aac076be74e84c5379294a9a049b6aa727b8cdc5f9788d126795fd221e59415223eb62af931a4920f5f25779d842f0942ae001aa5f49cc05e22fb140f1bc7f
+DIST xarchiver-0.5.4.tar.bz2 1003045 SHA256 e63fa73979fcc56efe8cca9095fd915d31a1714ce9676246b8626f164e452ef4 SHA512 3b767c2601d94104e2fc72aa8d168afa5a154b5747a9b0518d1c348417e56e4c19d872a0029fb78decc897e0f3bc9573e17d0317b85f584e7275b0e519f5f30d WHIRLPOOL 3f5a277b05147daf29db0be26718ed51fa0bb6d2416ee41cdd8ce6c54bc66064fc5f313af39a32b428997f906c9fd4d1a0b8d60fe5d2d867b1137960b0cbe4d1
--- a/app-arch/xarchiver/xarchiver-0.5.4.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xarchiver/xarchiver-0.5.4.ebuild,v 1.1 2015/04/21 04:04:46 calchan Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="a GTK+ based and advanced archive manager that can be used with Thunar"
+HOMEPAGE="http://xarchiver.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/glib-2
+	>=x11-libs/gtk+-2.24:2"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${PN}-0.5.3-add-mime-types.patch
+		"${FILESDIR}"/${PN}-0.5.3-fix-password-protected.patch
+		"${FILESDIR}"/${PN}-0.5.3-fix-rpm-support.patch
+		)
+
+	XFCONF=(
+		$(xfconf_use_debug)
+		)
+
+	DOCS=( AUTHORS ChangeLog README TODO )
+}
+
+src_prepare() {
+	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.in || die
+	xfconf_src_prepare
+}
+
+src_install() {
+	xfconf_src_install DOCDIR="${ED}/usr/share/doc/${PF}"
+}
+
+pkg_postinst() {
+	xfconf_pkg_postinst
+	elog "You need external programs for some formats, including:"
+	elog "7zip - app-arch/p7zip"
+	elog "arj - app-arch/unarj app-arch/arj"
+	elog "lha - app-arch/lha"
+	elog "lzop - app-arch/lzop"
+	elog "rar - app-arch/unrar app-arch/rar"
+	elog "zip - app-arch/unzip app-arch/zip"
+}
--- a/app-backup/duply/Manifest
+++ b/app-backup/duply/Manifest
@ -1,5 +1 @@
-DIST duply_1.7.3.tgz 34684 SHA256 e0ae298b06125bb6665a3f4822828d36e9f56c93755b45e2240fd1643e7f05d3 SHA512 e71d4bd03828a47cb7b5af164d9f49c911a837c1a016efe8832a56f9ec9913a5237bee0c89cd4a1aece6db454873e8c39e70224ab4c725e7a5ce5eae73e556ff WHIRLPOOL 6881a80c62537ed77e877fbe9c6700aa16e4efe14d4d851c12c31411f2c332ef7d79f85a6815aafbc57e27e6a397d9fa54360e7783bd12435e961b1f4f211bde
-DIST duply_1.7.4.tgz 34887 SHA256 2bbcd6e55fcaa7ae2c416a6ce2d3ae0bc219dd05049d8708ff0e79a3349599e7 SHA512 82b722af95d48e231c6540254fe659fc2ed2cdee5ebde3b1f7b192feac0b88ae44c834dde34417324ae0113bf5f8d621602f9587d1356347d606892da7b46405 WHIRLPOOL 6fbe7e1524feb482b796b2db5d39d7276f291f7107ea26db735716f3cbfedd9613b450dd2f06907a54b156d82140584ece2e58a850bca82fe2a7831cac90cc8b
-DIST duply_1.8.0.tgz 35252 SHA256 6642d812a741186d2e995289a682ba5f45149127f957da4c8ebd54fb5ac1f5e5 SHA512 8bb10fc98c44ce325f738fea8b46fd7c03132b681d1e98f8efc2e0b985b895a255a884ce5c99fcb9d1591fb37b5a7f2994ec309ef5ca9b9d2116816641d05d9b WHIRLPOOL 5281b624261aa586a8fc156ea498c3ab3579ccf47588af47d0c0678610b960cb29390359e5870e9817a7ac459e47eebc1fa555d1f1aae29d0cb4ad96914310e0
-DIST duply_1.9.0.tgz 35692 SHA256 28dd73f7987507a11abdec4f89698f059d7165e8519b9c26f542fec43060b492 SHA512 fa78661992822fc4639bba1e3f86f1542366d07d7aa08b8bff1b5b18b3e3cba3f97b9344792db4cc3ca06881fdb215f934cecfea774d8394dc2451f23aa8e19a WHIRLPOOL 28c5cccdff1488e2e02a08a1b6380e93d7d1b9091b4fe62a58aba4dbd04af132e93a26c67520700c37040baeb729d2d612b8cc8fb70e13bd8422b3794123fbc0
 DIST duply_1.9.1.tgz 35883 SHA256 e5f11c5a31a55de24cc5101a6429ea3eac14c0d3f0d6dec344b687089845efc5 SHA512 8f1e1cfc505d4fcaa0701c3953b86c70bcc02aa89b4f783d5aae8999eb6d33f9f9994f406347c5345350047f8a6b1a4893ef8fc03399ff5d433f2ec3bf87d93f WHIRLPOOL 9abddc6e61b796671b24083c2b07c39f5f8fc99bb3dbf2e0e522fc650652a1bf525c09dde6b842fbb3435fdd59678180fb5ebb19827bb97481969cc93aa80dfd
--- a/app-backup/duply/duply-1.7.3-r1.ebuild
+++ b/app-backup/duply/duply-1.7.3-r1.ebuild
@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.7.3-r1.ebuild,v 1.1 2014/06/05 12:54:24 jlec Exp $
-
-EAPI="5"
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOC_CONTENTS="
-If you use ${PN} at the first time please have a
-look at the the usage help text \"${PN} usage\"
-for further information."
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1
-	doman ${PN}.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/app-backup/duply/duply-1.7.3.ebuild
+++ b/app-backup/duply/duply-1.7.3.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.7.3.ebuild,v 1.1 2014/04/13 10:19:51 hwoarang Exp $
-
-EAPI="5"
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOC_CONTENTS="
-If you use ${PN} at the first time please have a
-look at the the usage help text \"${PN} --help\"
-for further information."
-
-src_install() {
-	dobin ${PN}
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/app-backup/duply/duply-1.7.4.ebuild
+++ b/app-backup/duply/duply-1.7.4.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.7.4.ebuild,v 1.1 2014/06/27 13:35:39 jlec Exp $
-
-EAPI="5"
-
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOC_CONTENTS="
-If you use ${PN} at the first time please have a
-look at the the usage help text \"${PN} usage\"
-for further information."
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1
-	doman ${PN}.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/app-backup/duply/duply-1.8.0.ebuild
+++ b/app-backup/duply/duply-1.8.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.8.0.ebuild,v 1.1 2014/07/13 16:02:43 jlec Exp $
-
-EAPI="5"
-
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOC_CONTENTS="
-If you use ${PN} at the first time please have a
-look at the the usage help text \"${PN} usage\"
-for further information."
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1
-	doman ${PN}.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/app-backup/duply/duply-1.9.0.ebuild
+++ b/app-backup/duply/duply-1.9.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duply/duply-1.9.0.ebuild,v 1.1 2014/09/15 18:39:41 jlec Exp $
-
-EAPI=5
-
-inherit readme.gentoo
-
-DESCRIPTION="A shell frontend for duplicity"
-HOMEPAGE="http://duply.net"
-SRC_URI="mirror://sourceforge/ftplicity/${PN}_${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/txt2man"
-RDEPEND="app-backup/duplicity"
-
-S=${WORKDIR}/${PN}_${PV}
-
-DOC_CONTENTS="
-If you use ${PN} at the first time please have a
-look at the the usage help text \"${PN} usage\"
-for further information."
-
-src_install() {
-	dobin ${PN}
-	./${PN} txt2man > ${PN}.1
-	doman ${PN}.1
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@ -1,3 +1,2 @@
-DIST ReText-4.0.1.tar.gz 92892 SHA256 547f4d4cd6ca826963799a55e124ee22bbd2c1dc33fd11dc0d891cb66af8b77e SHA512 7055df357573ea87227bb169d9016e6d94fa7a299461019b12e56f8f1f15738f239dd6a1fbd2b37a84ea66abac4f85af6ae5d0b41e85323fbe10bbe8a6db4a81 WHIRLPOOL bf47d53870c3d3d913d09c3094a6451aa3b11f51126dd26c21e4f0d814fa876dbaba38adeb36c5660ad849742beb024bc567d49825c8f244941b761ff7eef471
 DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c6660853668b350f3369e76d155edd6c SHA512 d2b3fa901afa9870f6cecc7ab3126b91f1420ca1b14ddd4f609c2ada7121388840b5be679914694664f3bbf876ee8522aa6b0c82a23f837844f788fa10a46323 WHIRLPOOL 3be71e5d7ec612ae4e4fec17ca544f6d0e7cb7421fcdeb517d3c13156ed07f5e5e7c3e352cf604bfb5f2287964fdc173a1bac0eeab41ee1cda8b265ad0f57686
 DIST ReText-5.0.1.tar.gz 140814 SHA256 a62f784f18bfcdad13969b8b15a8e92f57e930f23e93bfce1ab714e5ac77e939 SHA512 fd68f95f93639f6e80b93ed928753d12fea0ac0af11729f93fc4083a8422ad563319c198597b9180bafb3f1c6a03205a06c64f0ba2743872a5ded289b788cfb3 WHIRLPOOL d410a4a8289e19abd6c015981dfb9bcca8ce1821d574f8ecbad10f71b8e7ff5f7f846e6e21874676ae6d091b3918b9a81bb43def59ec2a645aca23fd0922f9cf
--- a/app-editors/retext/retext-4.0.1-r2.ebuild
+++ b/app-editors/retext/retext-4.0.1-r2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/retext/retext-4.0.1-r2.ebuild,v 1.5 2015/04/08 07:30:33 mgorny Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-PLOCALES="ca cs cy da de es et eu fr it ja pl pt pt_BR ru sk uk zh_CN zh_TW"
-
-inherit distutils-r1 l10n
-
-MY_PN="ReText"
-MY_P="${MY_PN}-${PV/_/~}"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-2
-	EGIT_REPO_URI="git://git.code.sf.net/p/retext/git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A Qt-based text editor for Markdown and reStructuredText"
-HOMEPAGE="http://sourceforge.net/p/retext/home/ReText/"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+spell"
-
-RDEPEND+="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/markups[${PYTHON_USEDEP}]
-	dev-python/PyQt4[webkit,${PYTHON_USEDEP}]
-	spell? ( dev-python/pyenchant )
-"
-
-S="${WORKDIR}"/${MY_P}
-
-src_install() {
-	distutils-r1_src_install
-
-	newicon {icons/,}${PN}.png
-	newicon {icons/,}${PN}.svg
-
-	l10n_for_each_disabled_locale_do remove_locale
-
-	make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
-
-	dosym /usr/bin/${PN}{.py,}
-}
-
-remove_locale() {
-	find "${D}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
-}
--- a/app-emacs/bison-mode/bison-mode-0.3.ebuild
+++ b/app-emacs/bison-mode/bison-mode-0.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/bison-mode/bison-mode-0.3.ebuild,v 1.2 2015/04/13 19:32:43 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/bison-mode/bison-mode-0.3.ebuild,v 1.3 2015/04/20 05:09:03 ulm Exp $

 EAPI=5

@ -10,12 +10,9 @@ DESCRIPTION="Emacs major mode for Bison, Yacc and Lex grammars"
 HOMEPAGE="https://github.com/Wilfred/bison-mode"
 SRC_URI="http://dev.gentoo.org/~nicolasbock/${P}.tar.bz2"

-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"

 SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/metadata.xml
@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>nicolasbock@gentoo.org</email>
-		<name>Nicolas Bock</name>
-	</maintainer>
-	<longdescription lang="en">
-	</longdescription>
+<herd>emacs</herd>
+<maintainer>
+  <email>nicolasbock@gentoo.org</email>
+  <name>Nicolas Bock</name>
+</maintainer>
 </pkgmetadata>
--- a/app-i18n/anthy/anthy-9100h.ebuild
+++ b/app-i18n/anthy/anthy-9100h.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-9100h.ebuild,v 1.9 2009/09/27 12:29:39 ranger Exp $
-
-inherit elisp-common eutils
-
-IUSE="emacs"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/37536/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-SLOT="0"
-
-DEPEND="!app-i18n/anthy-ss
-	emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		sed -i \
-			-e "/set_input_encoding eucjp/aread /var/lib/canna/dic/canna/nichan.ctd" \
-			mkworddic/dict.args.in || die
-	fi
-
-}
-
-src_compile() {
-
-	local myconf
-
-	use emacs || myconf="EMACS=no"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/50anthy-gentoo.el
-
-	dodoc AUTHORS DIARY NEWS README ChangeLog
-
-	docinto doc
-	rm doc/Makefile*
-	dodoc doc/*
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	use emacs && elisp-site-regen
-
-}
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@ -1,2 +1 @@
-DIST Canna37p2.tar.bz2 1263325 SHA256 ab163cb90acb33ce2c3a2293329ac3cd1ce2a25e0a8e337518e7fab5b28b52c3 SHA512 f2eecd590007d386d6742672c233c8820e033e2cf799c8eaf40021b4cfaadbf6f24116b83d745bc4d63f9f3c7c4e6483be82b5adee2a885479199af64d48b05f WHIRLPOOL 583367ee19c7674dd3cc760b8a8c201483dacf8ff79584cba501e6e16782ce098ef5a30b2e086e7a9b2ac9fa6ab3dbe0ae066659e1dd2ada468b7e8c9e7f45ac
 DIST Canna37p3.tar.bz2 1263065 SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7 SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158 WHIRLPOOL 14433083257ab705bc55b0be5972b9dcce2476209a5c48cdfc53d1f4af6bc739fac2d5fd2f42e7a6e94951a35e1a3e6ca21dd0ec7db6ef307f7d285dc881fbc5
--- a/app-i18n/canna/canna-3.7_p2.ebuild
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@ -1,137 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.23 2012/07/12 08:46:22 naota Exp $
-
-inherit cannadic eutils multilib
-
-MY_P="Canna${PV//./}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9558/${MY_P/_/}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P/_/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${P/_*/}-gentoo.diff.in > "${T}/${PF}-gentoo.diff"
-	epatch "${T}"/${PF}-gentoo.diff
-	cd dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
-	cd "${S}"
-	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp
-}
-
-src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
-	make canna || die
-
-	#if use doc ; then
-	#	einfo "Compiling DVI, PS (and PDF) document"
-	#	cd doc/man/guide/tex
-	#	xmkmf || die
-	#	make JLATEXCMD=platex \
-	#		DVI2PSCMD="dvips -f" \
-	#		canna.dvi canna.ps || die
-	#	if has_version 'app-text/dvipdfmx' && \
-	#		( has_version 'app-text/acroread' \
-	#		|| has_version 'app-text/xpdf-japanese' ); then
-	#		make JLATEXCMD=platex \
-	#			DVI2PSCMD="dvips -f" \
-	#			canna.pdf || die
-	#	fi
-	#fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	make DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
-
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
-
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
-	for man in cannaserver cannakill ; do
-		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
-			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
-		done
-	done
-
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-
-	#if use doc ; then
-	#	insinto /usr/share/doc/${PF}
-	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	#fi
-
-	newinitd "${FILESDIR}"/canna.initd canna || die
-	newconfd "${FILESDIR}"/canna.confd canna || die
-	insinto /etc/		; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
-
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
-}
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}
-
-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
-	fi
-}
--- a/app-i18n/canna/canna-3.7_p3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3.ebuild
@ -1,139 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3.ebuild,v 1.10 2012/07/12 08:46:22 naota Exp $
-
-inherit cannadic eutils multilib
-
-MY_P="Canna${PV//./}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P/_/}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
-	x11-misc/imake
-	doc? ( >=dev-texlive/texlive-langcjk-2010 )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P/_/}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g'
-	sed -e "s%@cannapkgver@%${PF}%" \
-		"${FILESDIR}"/${P/_*/}-gentoo.diff.in > "${T}/${PF}-gentoo.diff"
-	epatch "${T}"/${PF}-gentoo.diff
-	cd dic/phono
-	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
-
-	cd "${S}"
-	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
-	# fix deprecated sort syntax
-	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
-		-i cmd/mkbindic/mkbindic.cpp
-}
-
-src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
-	# bug #279706
-	emake -j1 canna || die
-
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
-		cd doc/man/guide/tex
-		xmkmf || die
-		make JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" \
-			canna.dvi canna.ps || die
-		if has_version 'app-text/dvipdfmx' && \
-			( has_version 'app-text/acroread' \
-			|| has_version 'app-text/xpdf-japanese' ); then
-			make JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" \
-				canna.pdf || die
-		fi
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	make DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
-
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
-
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
-	for man in cannaserver cannakill ; do
-		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
-			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
-		done
-	done
-
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	fi
-
-	newinitd "${FILESDIR}"/canna.initd canna || die
-	newconfd "${FILESDIR}"/canna.confd canna || die
-	insinto /etc/		; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
-
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-	elog
-	elog "Canna dictionary format has been changed."
-	elog "You should rebuild app-dict/canna-* after emerge."
-	elog
-}
-
-pkg_prerm() {
-	if [ -S /tmp/.iroha_unix/IROHA ] ; then
-		# make sure cannaserver get stopped because otherwise
-		# we cannot stop it with /etc/init.d after emerge -C canna
-		einfo
-		einfo "Stopping Canna for safe unmerge"
-		einfo
-		/etc/init.d/canna stop
-		touch "${T}"/canna.cookie
-	fi
-}
-
-pkg_postrm() {
-	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
-		#update-cannadic-dir
-		einfo
-		einfo "Restarting Canna"
-		einfo
-		/etc/init.d/canna start
-		rm -f "${T}"/canna.cookie
-	fi
-}
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@ -1,5 +1,3 @@
 DIST anthy.i 3170 SHA256 3615639f5cd9bf2adcbc2bac8d3ae968646df1d9d2ba987d80442d5ad99ecdf9 SHA512 400d67c2f0ffbdb3eab241646922d549ec4a42ae5b33714a91b864f4b5dfdf0d9a0d28cb6dcdffa55eb9633651ceae034bb547d7a5c41d9b8d352e955773e069 WHIRLPOOL 9be409df613530658c68bc7491e1dd258f5f1ef1d09895a3557a9e63c3ced5083c1ecd9e274536c9afbc98031c353c05c73304bb4354aaf8e21a1c15de39b8b6
-DIST ibus-anthy-1.2.0.20100115.tar.gz 448717 SHA256 5c01abd9977a9594593ad27998b98441b700e57af2b2316e0633432a58b13177 SHA512 418ebdd819bf26e8b13d868b1ca5a2e3186886ef2baba7189bd4fb6ca8282cbf1818cef8134d793b625ad8cc45173589e7d7c1c608bb69e0ec4bb1efaf78771b WHIRLPOOL 1f26b97f5cae0bc3bff58f29685f96fe51296dfd3267cd2ea60559e6479b33e6640cd4c7de35bf479d0a97da060fbb1c3d1bcfc9149dca187a445d0b6d5a5f7a
-DIST ibus-anthy-1.2.6.tar.gz 519488 SHA256 e4d5eb27c35295a69c0baa308a6589c8aea19f72317d08b692437af5512dd6f6 SHA512 e7d9cca76fb7d5754304200c96fbc5002dd66e5a960ecb5275eb821c68ac3d3122932fa127ee1f993bfb5958937b153c1f35558034ed5fc49391f8f52ba9d60c WHIRLPOOL 76179ecc15e385e65a7f28a50478f6f7c57d6accba08c821f0e62383cdb49132d3e9077f20ce25cbd0aca7eecc4a3d830327aafe5ff04205816a9308c1423cfd
 DIST ibus-anthy-1.2.7.tar.gz 523139 SHA256 33c42c1612423f84fddd8c38f8b2439b8af5f0b5fc7725ae195a01b8999d85e9 SHA512 ee45759bb8303967d09d0f92ee0a97fa63611de936c61073078d795b9ba8858cc882e539611bb5ea68848d471e6d2b0e4d8f51df5335aad7942f15e63c4d159d WHIRLPOOL a27945667347d0fb121d028b23b68219df6417369d32d47a43665c828e8935cd74e04b861e0a4e04a117c08665771c22750eab2869fffd21f23b1e21f633b358
 DIST ibus-anthy-1.5.4.tar.gz 592595 SHA256 4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031 SHA512 8478e9ea14472d0153cc7a35feae4edea791476dc98cfc266b598f915376d267bd5db48ea0a676209d7a6fa680628116a30fec59afaf696477cfaa14082aad8d WHIRLPOOL f4aec300dc5cff62f81a3ae64ac2d46768e3fbaa579e14abac8bd87e0801155e8258f6f3d66d7015122e929cd2e0f48183aeb37245b3046afa3d80b8ce42d58c
--- a/app-i18n/ibus-anthy/files/ibus-anthy-1.5.0-configure.patch
+++ b/app-i18n/ibus-anthy/files/ibus-anthy-1.5.0-configure.patch
@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7a4ca49..1ddcf16 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -210,9 +210,7 @@ dnl - check pygtk2
- AC_MSG_CHECKING([whether you enable pygtk2 anthy])
- AC_ARG_ENABLE(pygtk2-anthy,
-               AS_HELP_STRING([--enable-pygtk2-anthy=no/yes],
-                             [Install pygtk2 anthy default=no]),
-              enable_pygtk2_anthy=yes,
-              enable_pygtk2_anthy=no)
-+                             [Install pygtk2 anthy default=no]))
- AC_MSG_RESULT($enable_pygtk2_anthy)
- 
- if test x"$enable_pygtk2_anthy" = xyes; then
-@@ -287,9 +285,7 @@ dnl - check private png
- AC_MSG_CHECKING([if you install the private png file])
- AC_ARG_ENABLE(private-png,
-               AS_HELP_STRING([--enable-private-png=no/yes],
-                             [Install ibus-anthy.png default=no]),
-              enable_private_png=yes,
-              enable_private_png=no)
-+                             [Install ibus-anthy.png default=no]))
- AC_MSG_RESULT($enable_private_png)
- 
- if test x"$enable_private_png" = xyes; then
--- a/app-i18n/ibus-anthy/ibus-anthy-1.2.0.20100115.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.2.0.20100115.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.2.0.20100115.ebuild,v 1.6 2012/05/03 19:24:29 jdhore Exp $
-
-EAPI=3
-
-inherit eutils python
-
-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2.0.20090904
-	app-i18n/anthy
-	>=dev-lang/python-2.5
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	elog
-	elog "app-dicts/kasumi is not required but probably useful for you."
-	elog
-	elog "# emerge app-dicts/kasumi"
-	elog
-
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
--- a/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.2.6.ebuild,v 1.5 2013/01/09 13:05:12 naota Exp $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-inherit eutils python
-
-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2.0.20100111
-	!>=app-i18n/ibus-1.4.99
-	app-i18n/anthy
-	>=dev-python/pygtk-2.15.2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	sed -i -e "s/python/python2/" \
-		engine/ibus-engine-anthy.in setup/ibus-setup-anthy.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	elog
-	elog "app-dicts/kasumi is not required but probably useful for you."
-	elog
-	elog "# emerge app-dicts/kasumi"
-	elog
-
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
--- a/app-i18n/ibus-anthy/ibus-anthy-1.2.7.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.2.7.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-anthy/ibus-anthy-1.2.7.ebuild,v 1.6 2013/01/09 13:05:12 naota Exp $
-
-EAPI=3
-PYTHON_DEPEND="2:2.5"
-inherit eutils python
-
-DESCRIPTION="Japanese input method Anthy IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2.0.20100111
-	!>=app-i18n/ibus-1.4.99
-	app-i18n/anthy
-	>=dev-python/pygtk-2.15.2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	>py-compile #397497
-	sed -i -e "s/python/python2/" \
-		engine/ibus-engine-anthy.in setup/ibus-setup-anthy.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	elog
-	elog "app-dicts/kasumi is not required but probably useful for you."
-	elog
-	elog "# emerge app-dicts/kasumi"
-	elog
-
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
--- a/app-i18n/ibus-m17n/Manifest
+++ b/app-i18n/ibus-m17n/Manifest
@ -1,5 +1,3 @@
-DIST ibus-m17n-1.2.0.20091217.tar.gz 389820 SHA256 92b8983d99078f5918ea6fcf931231687e9dab67eef30692b495b5a7e8371cc2 SHA512 0eb63660bf01da39d220bc0b23d8f5210d97e4a7bf8dd5222e85311d11638c65d1c3c2202b3975e03f84cf5d87a71344d4d39219e192f64dc0759049571e854b WHIRLPOOL 20913845487dc28473d12e291b6e75b8013ad185110b718f5a6759e6de126d06bdb0b4b8d57487f8a74e2a6ac39b68ab9346a1c20a4c1f57a2913f41ab5d342e
-DIST ibus-m17n-1.3.1.tar.gz 404890 SHA256 65b19e5b50b8431a1faa1c48a7ca3b94cb5bc20bfaa9d71c8dd78bc8a1e88187 SHA512 40fd4c9511e57b3ed6b1adc57d4c9864fdcb1236959ec307b609911df9e47c607ce9643e78c35eec54f4daf08b271d0489b28e70ed5bd47090f6c8e065c54ab3 WHIRLPOOL cc4ce97e1890b3e8cf61926bde07013695303ed155ff2603cec1b50651c4c41281ae4cd670e602d49a435b647e7077b5526b4dec576af5fa10e1cfa062a81ecd
 DIST ibus-m17n-1.3.2.tar.gz 414324 SHA256 c1e7529c63305bc5f2ddc4832550becd16e084beaf4217549bf1dd46a9b0e370 SHA512 6cbff2bf08043eb46d5e97c9303ebbb795c69b77c14d113c22fee2111eaee04ba8bc27bbd44b6640be02dd43f4b3711aba1b02fcbb350b8bca8d90dd20b4ba54 WHIRLPOOL 5b59e39028e19f3379abebf6b4ddf835bd01d28df623c2ef03f98a8f5b53acd985ca34d3f3d12cf5258c926de47523fddb48b78ceec0efb967586437e52bdc7e
 DIST ibus-m17n-1.3.3.tar.gz 431113 SHA256 0374aef2149bcf1a337c39ab642ee39da4dbb17758ee8c095f954ca835dc10bf SHA512 1ffb659a2c6837727365760267ebbdf0329cf0b103e1fa105d895f62fc580821f8cfc097687e631cb06881986a5482ecc720df451a5b27dc494cc07d1862c98d WHIRLPOOL 437e1720efe77952d12c9eca28a95e509a3cad288573754eccab8de4fbe3a88d2efbdc9e3c4997ebbc04825d3a318c7b49c384d2459b8ddd1d0af1fd4fd45aeb
 DIST ibus-m17n-1.3.4.tar.gz 436687 SHA256 79004c696c47cd909b39f547ce118a80b672ccdab77a4a5b1824e496d649ae70 SHA512 9e9bc290b0f0d68558d408f6e69aa3bd9bb767db827a95839b576b58c7a5056dedcbd9b0bf1aab5e26ab21e601acd67a53404a5fd54b436efaf2a706489f25c4 WHIRLPOOL 0109df716a9ed71ac7f1d9544e361e38c3b8a7ae81b271d54ab1979a611fc44698649d92dfc68131f29166f60875558421b9f033632c5125c27505465c73d0a4
--- a/app-i18n/ibus-m17n/ibus-m17n-1.2.0.20091217.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.2.0.20091217.ebuild
@ -1,32 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.2.0.20091217.ebuild,v 1.5 2012/05/03 19:24:28 jdhore Exp $
-
-DESCRIPTION="The M17N engine IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2
-	dev-libs/m17n-lib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-db/m17n-db
-	dev-db/m17n-contrib
-	>=sys-devel/gettext-0.16.1"
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
--- a/app-i18n/ibus-m17n/ibus-m17n-1.3.1.ebuild
+++ b/app-i18n/ibus-m17n/ibus-m17n-1.3.1.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-m17n/ibus-m17n-1.3.1.ebuild,v 1.2 2012/05/03 19:24:28 jdhore Exp $
-
-EAPI="3"
-
-DESCRIPTION="The M17N engine IMEngine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.3
-	x11-libs/gtk+:2
-	dev-libs/m17n-lib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-db/m17n-db
-	dev-db/m17n-contrib
-	>=sys-devel/gettext-0.16.1"
-
-src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
--- a/app-i18n/ibus-table-extraphrase/Manifest
+++ b/app-i18n/ibus-table-extraphrase/Manifest
@ -1,3 +1 @@
-DIST ibus-table-extraphrase-1.1.0.20090415.tar.gz 2198888 SHA256 a86cbd91590d51fbb203b6d228736e4c18a66356e33428fdf367c2a25898fd0c SHA512 103c99dcb77d169aeb3103f0ede6d5ff2cabff1e68ad6597cd0988fa91195a6400d49cef648a28d1668e1e7f88ff31863a21f05c98959393ad139146e26fd145 WHIRLPOOL 0b47cd766e842943a096e61a579cc0a827b5bd04a67ec0b3cea2f7ee3a080086da10c447333a55e9f0e1dd30e29d53f7909fd9f055e184522c687e83f1704ef6
-DIST ibus-table-extraphrase-1.2.0.20100305.tar.gz 2199706 SHA256 84f6b4f895a51ddd91232a84ac75da01176297d4a2fb8b1d15abc272b38f09d5 SHA512 0ec8c307bfd27570383bc6fa8c1db09e9fb6970198499cbb67f516b6bceda3dea34ce6dbfbdbd9984f0628d8ab76f9dec09c5a32bbebe6fcc660b614093d5a65 WHIRLPOOL 81d1358764c4c5d3ba95f44f07737487f07c01cab926c671ff491f1930e066eaa0cf69c21505c54a1087203cc40467c1decbb11f48cfe01b75677500a6c8ec54
 DIST ibus-table-extraphrase-1.3.9.20110826.tar.gz 2200447 SHA256 4db86e1ea82398c0396a4e157dd2f50003c5445f421fda706560f9242f13c74e SHA512 5310cee7bd74455a732cd568a2a60887765588ef7fabdcd950f66fb2d5fab6dcdd059d2e460c0962117495c88656386a0c738dbd94f9ba553f3365fb3b42ce5d WHIRLPOOL 03a39e184d2bbaf47ef68aa28cd05da7d988109b9b09e70dd06ae54a41f66684d3dbace03cfdd161dc5d0eccbaf468a67c55125057af8bd82a59da1a8d453c47
--- a/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.1.0.20090415.ebuild
+++ b/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.1.0.20090415.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.1.0.20090415.ebuild,v 1.2 2012/05/03 19:24:28 jdhore Exp $
-
-DESCRIPTION="Chinese extra phrases for ibus-table based IME"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/ibus-table-1.1
-	virtual/pkgconfig"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
--- a/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.2.0.20100305.ebuild
+++ b/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.2.0.20100305.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-table-extraphrase/ibus-table-extraphrase-1.2.0.20100305.ebuild,v 1.2 2012/05/03 19:24:28 jdhore Exp $
-
-DESCRIPTION="Chinese extra phrases for ibus-table based IME"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=app-i18n/ibus-table-1.1
-	virtual/pkgconfig"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@ -1,6 +1,2 @@
-DIST imsettings-1.2.4.tar.bz2 528403 SHA256 853c996df56c70b5b4aab3c6835f672d69ddc99cd8f0b7f790af741cedb9ac75 SHA512 4389b47adc2e9b559975ed92dda64abcb02238c033fe431d501386f75fbadf1f270606486b3dc669171b0f8d034e5fe4be76e62c16bf36db59f54ee8f8d612a8 WHIRLPOOL 6586efe146829c21d2aa5bdf2c0f0d15ffde2254d1fe19dcaa206aaa9cb1dd82d08061f3a9e76c97e2a05776e7ec611ec576b35fe8abcae302e670e6d6f0dd70
-DIST imsettings-1.2.5.tar.bz2 528570 SHA256 fc6442afb3608d45d32a3611b2c7d77404c05102377bc45e083b0ad8bcf9ba54 SHA512 0cb20c878ca03180f35acef1266b8c00642021ac6853a2570a448841549efd132f8755665013408ea868ebbadcb187b3137cce2d850cdaf48eb5f7272ef6a730 WHIRLPOOL 0c6282c9fb4bb4381ddb60980084b2e00343ddaa2921231b30cef83a5a45938ff4fd9cfe667e2eb149fb3c300cafcd6c1af4fd5abb71221c94332d65459de81a
-DIST imsettings-1.2.6.tar.bz2 529105 SHA256 af98c784675c0375ef72482469e07b81c819e8827282deb93c1e66b25ce2b766 SHA512 37254f4418db27d05bb96730b27240c7e2c69957a2e1071f62d91c62fc34dcbbbebb5b988cf53654b8f98b3e12f85881e890479e77e9c5edad668e631cc154b9 WHIRLPOOL 3efd1365f729dc04190c9264da936df050e5d7fe15d134052024960a22e94ce0b6857c3dde69bbfc1876952ad19660ea5566bf7823713fb43a000a176242cecf
-DIST imsettings-1.2.8.1.tar.bz2 551710 SHA256 8d67f92252e66f12bc0264669d425604f9e32d1043e08f4aeff48744a6b6cf0c SHA512 53f0e5276cfc0fc0575302f4f0c1153339cc4b55e835a8c238c5d9d2d61633ee4192f3b471eb83224048c6e49f9d7940d59745699fff352b426916a3b8aab59b WHIRLPOOL c69924d2018374805b7ba6da33810490d100b9e3661d159513e0c8d39095e9c0ab258c83d894557be1c4d4757e7c6599fb7dcc4ef424b208dc9dbb7e23c9b023
 DIST imsettings-1.5.0.tar.bz2 567488 SHA256 06a9d82718104fb9b86ded11bc73afaf7dd858b138eb24d8264c6a4877db161e SHA512 0743264fc09c9998d93fd92195946936141f17a943783b40906d0e269db691c7559e05158217f7a3b46b18cd29004338b94ca9958d52185c630e26cd7dfca08d WHIRLPOOL 21e96e5b9aeb80189a9aa6650d86d0cf1a72287a246eb43c0e54af94d1d5dc37e47c5760e17b36c0c3f222367520f81a50150fc3e4a4449e3ed284d237e91d06
 DIST imsettings-1.6.8.tar.bz2 593942 SHA256 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba SHA512 a15a4824529b16f61653fdf3e149656c7a2ca1384579c755cec6650414499c3d24ac15178971d961f327c5fd8acd7892b9b4f9c60608166c281c11ab3f2b25b0 WHIRLPOOL c39cb54b9be8424dc1d9eceae12f793847585638f29a52282427c3c07ee1bd3e5ed9d67ff73727b055499c3963e106024eb9f164b32ebcf553b2dfccf1114a6d
--- a/app-i18n/imsettings/files/imsettings-1.2.2-gtk.patch
+++ b/app-i18n/imsettings/files/imsettings-1.2.2-gtk.patch
@ -1,25 +0,0 @@
-From 3f316f5f4da4de8591141e4949c041cc7662666b Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Thu, 28 Apr 2011 17:48:59 +0900
-Subject: [PATCH 1/3] fix a typo
-
---
- data/xinput.sh.in.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/data/xinput.sh.in.in b/data/xinput.sh.in.in
-index 2ad3f6b..39b3951 100755
--- a/data/xinput.sh.in.in
-+++ b/data/xinput.sh.in.in
-@@ -45,7 +45,7 @@ function is_gtk_supported() {
-     [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
-     case "$DESKTOP_SESSION" in
- 	*gnome|openbox)
-	    if check_imsettings_capability gconf && check_imsettings_capability gsettings; then
-+	    if check_imsettings_capability gconf || check_imsettings_capability gsettings; then
- 		return 0
- 	    fi
- 	    ;;
-- 
-1.7.5.rc3
-
--- a/app-i18n/imsettings/files/imsettings-1.2.8.1-glib32.patch
+++ b/app-i18n/imsettings/files/imsettings-1.2.8.1-glib32.patch
@ -1,12 +0,0 @@
-diff --git a/tests/rhbz_599924.c b/tests/rhbz_599924.c
-index 6741fd3..531043f 100644
--- a/tests/rhbz_599924.c
-+++ b/tests/rhbz_599924.c
-@@ -27,7 +27,6 @@
- 
- #include <unistd.h>
- #include <glib.h>
-#include <glib/gthread.h>
- #include "imsettings-info.h"
- #include "main.h"
- 
--- a/app-i18n/imsettings/imsettings-1.2.4.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.4.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.4.ebuild,v 1.5 2013/03/02 19:27:25 hwoarang Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	qt4? ( dev-qt/qtcore:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	if ! use xfconf; then
-		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
-	fi
-	if ! use qt4; then
-		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
-	fi
-	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	if [ ! -e "${EPREFIX}/etc/X11/xinit/xinputrc" ] ; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}/etc/X11/xinit/xinputrc"
-	fi
-}
--- a/app-i18n/imsettings/imsettings-1.2.5.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.5.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.5.ebuild,v 1.5 2013/03/02 19:27:25 hwoarang Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	qt4? ( dev-qt/qtcore:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	if ! use xfconf; then
-		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
-	fi
-	if ! use qt4; then
-		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
-	fi
-	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	if [ ! -e "${EPREFIX}/etc/X11/xinit/xinputrc" ] ; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}/etc/X11/xinit/xinputrc"
-	fi
-}
--- a/app-i18n/imsettings/imsettings-1.2.6.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.6.ebuild
@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.6.ebuild,v 1.5 2013/03/02 19:27:25 hwoarang Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	qt4? ( dev-qt/qtcore:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	if ! use xfconf; then
-		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
-	fi
-	if ! use qt4; then
-		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
-	fi
-	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	if [ ! -e "${EPREFIX}/etc/X11/xinit/xinputrc" ] ; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}/etc/X11/xinit/xinputrc"
-	fi
-}
--- a/app-i18n/imsettings/imsettings-1.2.8.1.ebuild
+++ b/app-i18n/imsettings/imsettings-1.2.8.1.ebuild
@ -1,69 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/imsettings/imsettings-1.2.8.1.ebuild,v 1.3 2013/03/02 19:27:25 hwoarang Exp $
-
-EAPI=3
-
-inherit eutils
-
-DESCRIPTION="Delivery framework for general Input Method configuration"
-HOMEPAGE="http://tagoh.github.com/imsettings/"
-SRC_URI="http://imsettings.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc qt4 static-libs xfconf"
-
-# X11 connections are required for test.
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/check-0.9.4
-	>=dev-libs/glib-2.26
-	sys-apps/dbus
-	>=x11-libs/gtk+-2.12:2
-	>=x11-libs/libgxim-0.3.1
-	>=x11-libs/libnotify-0.7
-	x11-libs/libX11
-	qt4? ( dev-qt/qtcore:4 )
-	xfconf? ( xfce-base/xfconf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )"
-
-MY_XINPUTSH="90-xinput"
-
-src_prepare() {
-	# Prevent automagic linking to libxfconf-0.
-	if ! use xfconf; then
-		sed -i -e 's:libxfconf-0:dIsAbLe&:' configure || die
-	fi
-	if ! use qt4; then
-		sed -i -e 's:QtCore:dIsAbLe&:' configure || die
-	fi
-	epatch "${FILESDIR}"/${PN}-1.2.8.1-glib32.patch
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--with-xinputsh="${MY_XINPUTSH}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-
-	fperms 0755 /usr/libexec/xinputinfo.sh || die
-	fperms 0755 "/etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}" || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
-
-pkg_postinst() {
-	if [ ! -e "${EPREFIX}/etc/X11/xinit/xinputrc" ] ; then
-		ln -sf xinput.d/xcompose.conf "${EPREFIX}/etc/X11/xinit/xinputrc"
-	fi
-}
--- a/app-i18n/kakasi/kakasi-2.3.4.ebuild
+++ b/app-i18n/kakasi/kakasi-2.3.4.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kakasi/kakasi-2.3.4.ebuild,v 1.16 2011/10/22 08:54:33 naota Exp $
-
-DESCRIPTION="Converts Japanese text between kanji, kana, and romaji"
-HOMEPAGE="http://kakasi.namazu.org/"
-SRC_URI="http://kakasi.namazu.org/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	doman doc/kakasi.1 || die
-	dodoc AUTHORS ChangeLog NEWS ONEWS README README-ja THANKS TODO || die
-	dodoc doc/ChangeLog.lib doc/JISYO doc/README.lib || die
-}
--- a/app-i18n/kimera/kimera-2.11.ebuild
+++ b/app-i18n/kimera/kimera-2.11.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11.ebuild,v 1.7 2013/03/02 19:27:40 hwoarang Exp $
-
-EAPI=3
-inherit qt4-r2 multilib
-
-DESCRIPTION="A Japanese input method which supports the XIM protocol"
-SRC_URI="mirror://sourceforge.jp/kimera/37271/${P}.tar.gz"
-HOMEPAGE="http://kimera.sourceforge.jp/"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="amd64 x86"
-IUSE="+anthy"
-
-DEPEND="dev-qt/qtcore:4
-	anthy? ( app-i18n/anthy )
-	!anthy? ( app-i18n/canna )"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS README*"
-
-src_configure() {
-	local myconf="target.path=/usr/$(get_libdir)/${P}"
-	use anthy || myconf="${myconf} no_anthy=1"
-	eqmake4 kimera.pro ${myconf}
-}
--- a/app-i18n/libguess/Manifest
+++ b/app-i18n/libguess/Manifest
@ -1,3 +1,2 @@
-DIST libguess-1.0.tbz2 76348 SHA256 d9c3ca9bbbdef360418df9065fae5c709b83f44d0d0774b6ac332a72abdb087f SHA512 9bcac2df2d2f58c02c6c6b12773cb67b09314348afe4d9f96988dfd0e1c698fc74e1e8064f2c0447c4d8dfa144765bd24528d32e272ece3fa827a7104b515415 WHIRLPOOL b1ba969d0433b69da25a909e048168714c023a0ba85c60d09406083d0ef510f2640d5e10a0404fb4ffa0200f3dfbb78303ec0b262804b4e6d12a79cc4f18961a
 DIST libguess-1.1.tar.bz2 79915 SHA256 733e4782817666f108d6e8fd5c117e36a006779e049866b6814a8bce9b4d5af7 SHA512 8f817da7f05ff53886395183134d3dae40b2d31bf2296f1614c08d87d68b389e18dbaf9327d9c31cf5d4fff04a89edc6af2476d3a92384c57d6d2b0147525084 WHIRLPOOL 3c2a00e8512aade473252b5a918d74e88213bfc2ff120944a306ca4cdb2b9d4af074eadfb584f82cbb41b75a7d98f1ab24468759573265b8d2f4a5e84238da69
 DIST libguess-1.2.tar.bz2 79685 SHA256 8019a16bdc7ca9d2efbdcc1429d48d033d5053d42e45fccea10abf98074f05f8 SHA512 a17269e42e12b81e0201a27e41d9e290ac7351000473ddfcb968d5fc6e09cb5753d0534277ec257d43224cb675c8d563849853ab68ab6079a35480d6c40fb053 WHIRLPOOL 13214225ce44ec8f5f717eef3dbf402a5522a4de835bffd3d12607c16f2187d14bf0f7e6cea0e94d7a4c7142422170085a268ad30538b50186e278d11264fb6a
--- a/app-i18n/libguess/libguess-1.0.ebuild
+++ b/app-i18n/libguess/libguess-1.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libguess/libguess-1.0.ebuild,v 1.17 2014/08/10 17:49:02 slyfox Exp $
-
-EAPI=2
-
-DESCRIPTION="A high-speed character set detection library"
-HOMEPAGE="http://www.atheme.org/project/libguess"
-SRC_URI="http://distfiles.atheme.org/${P}.tbz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-libs/libmowgli-0.7.0:0"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable examples) \
-		|| die "econf failed"
-}
-
-src_test() {
-	cd src/tests
-	make || die "test failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README
-}
--- a/app-i18n/libhangul/Manifest
+++ b/app-i18n/libhangul/Manifest
@ -1,3 +1,2 @@
-DIST libhangul-0.0.10.tar.gz 2828525 SHA256 af0722012632ab2afc2016aa6643bd6979e140facc56a911a5a45f97fe61d4c5 SHA512 21568946ca94beb899ad78cccfee6c4a13069d261385ba45ae452f31e7bf7c4a6540946362bb73634e59438a092963f3f357548c5fd07ed5fd8aff1d73fa74c2 WHIRLPOOL 8b6df5df7d8b40e38091f1b678e5aa3665985bb5d89bb90c16e1a0b0dc8e5fc250930096c6890142110b0b778857bbe7da8fae03c42665b432e09865030a6169
 DIST libhangul-0.0.12.tar.gz 2879381 SHA256 97b5ffbb9df2ddeb7ba5890824555236ed3db8bf7b78456ca7fe538bc63027c8 SHA512 5d7b84e5872fb89f7ad5f8c1a813aa6e650929eca821cf0e2b0ad831dac541f1108dd1290aa17b6dc738c40088f75ee1d1fb969f6c11ad09222c817ce50b8ade WHIRLPOOL 5727e578557e70647d2da08163dc9701a19e167cbe52ccde97f6721add6ee7d7843165f07d9a6a8049c77b15e7610e1e659d6428d7f71680354d99ae7a7a10cb
 DIST libhangul-0.1.0.tar.gz 2899845 SHA256 5905aa5c557d8d46e190fec1afdd75babf3bc086ef286b42007572703658295a SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534 WHIRLPOOL 898c355f587d2943dc9044ffb46a4e4215922a8e2a7c6c36853927e924efb7e47f88ad46741fbb70a1d68547872f2a3db77926cfe9c78ed6171095cd0a466f28
--- a/app-i18n/libhangul/libhangul-0.0.10.ebuild
+++ b/app-i18n/libhangul/libhangul-0.0.10.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.0.10.ebuild,v 1.8 2015/04/19 11:35:36 blueness Exp $
-
-DESCRIPTION="libhangul is a generalized and portable library for processing hangul"
-HOMEPAGE="http://kldp.net/projects/hangul/"
-SRC_URI="http://kldp.net/frs/download.php/5417/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@ -1,6 +1,3 @@
-DIST man-pages-ja-20070515.tar.gz 3415989 SHA256 1f6209d5a57e40cef754ba207500c7be41883301d980efdeac976f75c2a0d4c1 SHA512 0b60191d658d7014744a9a75ad16ceb08de6a7963e4f8859433ae84c3840ab6e43f7173c22ac0636a61e54392ce332be06adce79c68070ad59e3efe3b9359542 WHIRLPOOL 4e1b6ba87e51e5c0141873e98901ce12dd92121ef3b5106dfaa623065e27ad0f28d5b8019809c1ded88037bd68c18959802d3712f44683ba6fa8fc4582608a8b
-DIST man-pages-ja-20101110.tar.gz 3815928 SHA256 6cbcebeb10cc0bc7636c1283327660b6a642a0ace97cdd5f13d4e0796de6ace3 SHA512 92a0b73a6b55e4fa38836031f6067673929720aec99c0b547de322540af56ce30ec81c8676228ecc9c365d55d610aba6f3b2425223fbb9d645bd0c640888be3c WHIRLPOOL af28aa2ee97927f91381a1c7f4e296c347a525992688417d8f9d080a9b68d82387d6bcdf2279a30540d5e4d40363f6a73cb141eef07f703ff60c4238d5a099f4
-DIST man-pages-ja-20111020.tar.gz 3850350 SHA256 86efe95e4dd8753116fbc44602c5c88c2343fd396da7d34c576299f4f6c1130c SHA512 3f17fe0cd02f57bdcf6fcf0296c3a9b2386142c83d06b22ab7115431493673e964c539051358bec42249a3c8dbc1565544d71af1cca90897fda52bb0ea9084d6 WHIRLPOOL ec2b5b861913da067009b10e18f2e6122f32984bc6c957a384c309eccbb75e6779fd3cb4e2ed90207470a043be281f636b04bea3fd196a30acc1434304c5575e
 DIST man-pages-ja-20130215.tar.gz 4384182 SHA256 c5b859e4baa62c9ceee50e22d78c6a6c91d2f4473bc623a8e2a848e285314b1b SHA512 655e9481dfdfc619013f8cae2928d7ccd70bba31631f7b10b894b1d96ab64bae4846be68d8a633791f1c169faed6d42466bd60ee4d7f92031f596d8f23cb6138 WHIRLPOOL e2576a225fddd55f73cac7bc04f352c07a70ae6afda8ebe910e0828f9ce5fb2d3f6952e643b14efd3f23bce699744ad33450a85ea859a434f352233dc19cc4d7
 DIST man-pages-ja-20131015.tar.gz 4546129 SHA256 e21a37f307f430dd1ec9826ac9b2190d1976867292aef869cbe5951e93de0781 SHA512 afd2aa2fb227814a8de4b75baec4359e401ef055e23795719b964cba10e5018a368ba924719b017709c2bb34a5ebca58d6eb85512871515d6e7867fc4b0e4982 WHIRLPOOL c9cac54aca4eb6f67380efad4e3b7667ef4e92f4f866108379222b7e7a5d19752a33bb5342d1160eb18b85948eccfcd8123dcae384991fb82410cf32092989d6
 DIST portage-man-pages-ja-20060415.tar.gz 67347 SHA256 e847d0ab11b7cc1b5b9e8c2c11591665efe8f00d6d7a277c0b9489906d4eaf3a SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad WHIRLPOOL 4b574be2fed47e5a51fe23d52a352d87740366138385536055efb9b024461885465c095e9767aea202de86caf0b6901f1e206bd832d36c01ea9043f895e44c1c
--- a/app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20070515.ebuild,v 1.7 2014/01/30 20:28:15 vapier Exp $
-
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://www.linux.or.jp/JM/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://www.linux.or.jp/JM/${P}.tar.gz
-	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_compile() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1
-	rm -f manual/*/man8/{vigr,vipw}.8
-
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc ChangeLog README
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
--- a/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110-r1.ebuild,v 1.4 2014/01/30 20:28:15 vapier Exp $
-
-EAPI="3"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
-	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -f manual/rpm/man8/rpm*.8 || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README || die
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP || die
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
--- a/app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild
@ -1,91 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20101110.ebuild,v 1.4 2014/01/30 20:28:15 vapier Exp $
-
-EAPI="3"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
-	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README || die
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP || die
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
--- a/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild
@ -1,93 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-ja/man-pages-ja-20111020.ebuild,v 1.16 2014/01/30 20:28:15 vapier Exp $
-
-EAPI="3"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
-	http://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -f manual/rpm/man8/rpm*.8 || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README || die
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP || die
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@ -6,9 +6,5 @@ DIST japanese-usage-dictionary-10.tar.bz2 56142 SHA256 8c22284c97fdfad854790517f
 DIST jsoncpp-src-0.6.0-rc2.tar.gz 117661 SHA256 d4d193d163f520b08b9155cba978615892ca1359d77e3fb261fce2f86d09b283 SHA512 5d44e766aa2d7657bc68cf16173130febaa6744d5fca0c6df5465617a3f306023a17cbeb07a62ad1a34c2d183d916401b4be48f37c2416c895db4ad5d9481b3d WHIRLPOOL bfa7e70e14f3ed0911c5127da0d2099ca8b9159a900a5bc5147d1e50b5a9f9d5be69a8d46a761d277ca1edabaab8d0d3b9f81417572e4664ed8239fd83c953e6
 DIST mozc-1.10.1390.102.tar.bz2 57879881 SHA256 72a8ed6657daa1c03b1efe50c262a69be2ab66d45747a47df6e54996b6d5ee39 SHA512 4482e822f8a14bffd02cb1eaa5d14ba0a213266b2f0dd6402c42b9b357bf0d8c4dd572cef79f1d400bd68b7bd6cb4367933574f8f5967f68738249a300e3cfb9 WHIRLPOOL 90518e621ef784b438fcf677e211fdb6753719f3d78d14ce866ccea22d6d87f8d64e334bc568eebe93cb2850d3d545eb0b73d6f6de820eaf1d43f16bfdef4100
 DIST mozc-1.13.1651.102.tar.bz2 31635636 SHA256 a275accc726d55d696adf235fa40822ae099f0a02d3dc9f8d0257ba191a1bc49 SHA512 caa75e60704e904a72fd06e315a219ff304a54adaeee70a8ab75d413f7801960add103b9aae1c19ee92f6d10c4c408fd840cf78c5dde0cc21c605feac59deaf4 WHIRLPOOL 72a870cc1bc5bc63227bba61c73183f69160aa5c58c9b89e75fa65bf16bbdc2c2b873b7407d0543b3847bc046866392d9bbe6d771d7b4b7eb3f6be759f1a63b4
-DIST mozc-1.3.975.102.tar.bz2 55961505 SHA256 1ee57425c159bc0066645f086472f72aa16567fe5be272f35339c41e9a52d27a SHA512 dd26382f69820fd7a662c02a157dfcb382020cf15d0bcd613e9015d6142241c46c73755f28cdd23e2c07740dbddad65714474e84759c1313d6a1ffe84f3dc176 WHIRLPOOL b786924fa2c7ad5381ce35f565b320fb63cda4d03f35ce5b6878a4193adf52c22aebe06c953de8ba8f281a08ec2bf7583c26a684f94fa5c4ba73b5bec3a7f577
-DIST mozc-1.5.1090.102.tar.bz2 54911799 SHA256 b52c1879c4749041032578ec6c591d9741f521d54993070c050d09ae35bd2107 SHA512 9901e58af10c67025dd030bd70c3b7d6be34b1e868aefcc0705a18f1b3e76394e4a4b36811df2e598ee1647ecd1f24ddcfe87db889863a5095c31a5680833fec WHIRLPOOL d503fd0c7c2871288d887d834996a53952591eb25ed57a5ef789347a8bf8e39ecc54fb408d53daa3a9018848d52b28bc77c964e202a3479d582529ffc021b598
-DIST mozc-1.6.1187.102.tar.bz2 54828375 SHA256 2a9b54275400c768e14156e7654e9b9a4ca27353573627607c70d221c0e2db65 SHA512 0f182316e80baa8c3d268a266398bd2abad4db9ed54bba351b275681d17ef6fd5348d3b66fd95201028c38f29de293f124b9c4f45a5818f20faf17b1eea495ff WHIRLPOOL fb064dd78471d2060871f905cb1c81fd9c52cc15741493aad26df49db4259709860593b65586a6c44893a6454fd7f2d27815739e1525f1c8fd0cf9eb0efff92a
 DIST mozc-2.16.2037.102.tar.bz2 41172838 SHA256 4b78769b36366f056282267935a859e587f77e9aaf17132687d0e4d0c4da5cd0 SHA512 ff114a93054b43109407c44bc7c75de79fa2b028f9dba5c2ecc1776c5cbb032f184a91155b6b31bc17f0183dd70b0150ce13e80f59e26810daf4b65ba7e52be1 WHIRLPOOL 625c5a28da164ee96cdf523af32a7101357254cea1d57cd7f272bdf86ba8344d3e39bf2b2bfb0a79640d7961fd46c183eabc4002c8d86215ecffe183e4e0d193
-DIST protobuf-2.4.1.tar.bz2 1440188 SHA256 cf8452347330834bbf9c65c2e68b5562ba10c95fa40d4f7ec0d2cb332674b0bf SHA512 52b0208c685e44126cb3915a74bde692ef91430f0407144b6c30b72a9f143b1ee4f1eea47a550184c689a1758b92582e7f26f0683c2d387205b957a69830f2f3 WHIRLPOOL e5462ff35f63413aff58640c24b9b561ac55749c489803ae009de21bf5d954a77516714361353ef02cfeb3c2d762620c89dc08a5fdee571e3a33b6f5c20edf6e
 DIST protobuf-2.5.0.tar.bz2 1866763 SHA256 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 SHA512 5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee WHIRLPOOL 7e6786e1f20bf253d0e386a95c2bbfe1b443f484d492f97552cadcea62c24461436aa88130e3ff20b4dc9f352c101458cb8c03686f1cc4e6e2133b6e78f5b70d
--- a/app-i18n/mozc/metadata.xml
+++ b/app-i18n/mozc/metadata.xml
@ -9,6 +9,5 @@ Mozc is a Japanese Input Method Editor (IME) designed for multi-platform such as
  <flag name='fcitx'>Enable support for <pkg>app-i18n/fcitx</pkg></flag>
  <flag name='ibus'>Enable support for <pkg>app-i18n/ibus</pkg></flag>
  <flag name='renderer'>Enable native candidate window.</flag>
-  <flag name='scim'>Enable support for <pkg>app-i18n/scim</pkg></flag>
 </use>
 </pkgmetadata>
--- a/app-i18n/mozc/mozc-1.3.975.102.ebuild
+++ b/app-i18n/mozc/mozc-1.3.975.102.ebuild
@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.3.975.102.ebuild,v 1.3 2013/03/02 19:28:02 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib python toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-SRC_URI="http://mozc.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="Apache-2.0 BSD Boost-1.0 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-#IUSE="emacs +ibus scim skk +qt4"
-IUSE="emacs +ibus scim +qt4"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/protobuf
-	net-misc/curl
-	sys-libs/zlib
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)"
-#	chewing? ( dev-libs/libchewing )
-DEPEND="${RDEPEND}
-	dev-cpp/gtest
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	sed -i -e "s:/usr/lib/mozc:${EPREFIX}/usr/$(get_libdir)/mozc:" base/util.cc || die
-	epatch \
-		"${FILESDIR}"/${PN}-1.2.809.102-gentoo.patch \
-		"${FILESDIR}"/${P}-ibus-1.4.patch
-}
-
-src_configure() {
-	local myconf="--channel_dev=0"
-	#use chewing && myconf="${myconf} --chewing"
-	if ! use qt4 ; then
-		myconf="${myconf} --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	#use skk && mytarget="${mytarget} chrome/skk/skk.gyp:skk"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-i18n/mozc/mozc-1.5.1090.102.ebuild
+++ b/app-i18n/mozc/mozc-1.5.1090.102.ebuild
@ -1,174 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.5.1090.102.ebuild,v 1.3 2013/03/02 19:28:02 hwoarang Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib multiprocessing python toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-
-PROTOBUF_VER="2.4.1"
-GMOCK_VER="403"
-MOZC_URL="http://mozc.googlecode.com/files/${P}.tar.bz2"
-PROTOBUF_URL="http://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL}"
-
-LICENSE="Apache-2.0 BSD Boost-1.0 ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus scim +qt4 renderer"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.4 )
-	renderer? ( x11-libs/gtk+:2 )
-	scim? ( app-i18n/scim )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack $(basename ${MOZC_URL})
-
-	cd "${S}"/protobuf
-	unpack $(basename ${PROTOBUF_URL})
-	mv protobuf-${PROTOBUF_VER} files
-}
-
-src_configure() {
-	local myconf="--channel_dev=0"
-	myconf+=" --server_dir=/usr/$(get_libdir)/mozc"
-
-	if ! use qt4 ; then
-		myconf+=" --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-
-	if ! use renderer ; then
-		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
-	fi
-
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local my_makeopts=$(makeopts_jobs)
-	# This is for a safety. -j without a number, makeopts_jobs returns 999.
-	local myjobs=-j${my_makeopts/999/1}
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use scim && \
-		mytarget="${mytarget} unix/scim/scim.gyp:scim_mozc unix/scim/scim.gyp:scim_mozc_setup"
-	use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	if use scim ; then
-		exeinto "$(pkg-config --variable=moduledir scim)/IMEngine/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc.so" mozc.so || die
-		exeinto "$(pkg-config --variable=moduledir scim)/SetupUI/" || die
-		newexe "out_linux/${BUILDTYPE}/lib.target/libscim_mozc_setup.so" mozc-setup.so || die
-		insinto "$(pkg-config --variable=icondir scim)" || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png scim-mozc.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-/scim-mozc-} || die
-			done
-		)
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-
-	if use renderer ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-i18n/mozc/mozc-1.6.1187.102.ebuild
+++ b/app-i18n/mozc/mozc-1.6.1187.102.ebuild
@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/mozc/mozc-1.6.1187.102.ebuild,v 1.3 2013/07/20 07:15:49 naota Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-inherit elisp-common eutils multilib multiprocessing python toolchain-funcs
-
-DESCRIPTION="The Mozc engine for IBus Framework"
-HOMEPAGE="http://code.google.com/p/mozc/"
-
-PROTOBUF_VER="2.4.1"
-GMOCK_VER="403"
-MOZC_URL="http://mozc.googlecode.com/files/${P}.tar.bz2"
-PROTOBUF_URL="http://protobuf.googlecode.com/files/protobuf-${PROTOBUF_VER}.tar.bz2"
-SRC_URI="${MOZC_URL} ${PROTOBUF_URL}"
-
-LICENSE="Apache-2.0 BSD ipadic public-domain unicode"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +ibus +qt4 renderer"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/openssl
-	x11-libs/libxcb
-	emacs? ( virtual/emacs )
-	ibus? ( >=app-i18n/ibus-1.4.1 )
-	renderer? ( x11-libs/gtk+:2 )
-	qt4? (
-		dev-qt/qtgui:4
-		app-i18n/zinnia
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-BUILDTYPE="${BUILDTYPE:-Release}"
-
-RESTRICT="test"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_unpack() {
-	unpack $(basename ${MOZC_URL})
-
-	cd "${S}"/protobuf
-	unpack $(basename ${PROTOBUF_URL})
-	mv protobuf-${PROTOBUF_VER} files
-}
-
-src_configure() {
-	local myconf="--channel_dev=0"
-	myconf+=" --server_dir=/usr/$(get_libdir)/mozc"
-
-	if ! use qt4 ; then
-		myconf+=" --noqt"
-		export GYP_DEFINES="use_libzinnia=0"
-	fi
-
-	if ! use renderer ; then
-		export GYP_DEFINES="${GYP_DEFINES} enable_gtk_renderer=0"
-	fi
-
-	"$(PYTHON)" build_mozc.py gyp ${myconf} || die "gyp failed"
-}
-
-src_compile() {
-	tc-export CC CXX AR AS RANLIB LD
-
-	local my_makeopts=$(makeopts_jobs)
-	# This is for a safety. -j without a number, makeopts_jobs returns 999.
-	local myjobs=-j${my_makeopts/999/1}
-
-	local mytarget="server/server.gyp:mozc_server"
-	use emacs && mytarget="${mytarget} unix/emacs/emacs.gyp:mozc_emacs_helper"
-	use ibus && mytarget="${mytarget} unix/ibus/ibus.gyp:ibus_mozc"
-	use renderer && mytarget="${mytarget} renderer/renderer.gyp:mozc_renderer"
-	if use qt4 ; then
-		export QTDIR="${EPREFIX}/usr"
-		mytarget="${mytarget} gui/gui.gyp:mozc_tool"
-	fi
-
-	"$(PYTHON)" build_mozc.py build_tools -c "${BUILDTYPE}" ${myjobs} || die
-	"$(PYTHON)" build_mozc.py build -c "${BUILDTYPE}" ${mytarget} ${myjobs} || die
-
-	if use emacs ; then
-		elisp-compile unix/emacs/*.el || die
-	fi
-}
-
-src_test() {
-	"$(PYTHON)" build_mozc.py runtests -c "${BUILDTYPE}" || die
-}
-
-src_install() {
-	if use emacs ; then
-		dobin "out_linux/${BUILDTYPE}/mozc_emacs_helper" || die
-		elisp-install ${PN} unix/emacs/*.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" ${PN} || die
-	fi
-
-	if use ibus ; then
-		exeinto /usr/libexec || die
-		newexe "out_linux/${BUILDTYPE}/ibus_mozc" ibus-engine-mozc || die
-		insinto /usr/share/ibus/component || die
-		doins "out_linux/${BUILDTYPE}/obj/gen/unix/ibus/mozc.xml" || die
-		insinto /usr/share/ibus-mozc || die
-		(
-			cd data/images/unix
-			newins ime_product_icon_opensource-32.png product_icon.png || die
-			for f in ui-*
-			do
-				newins ${f} ${f/ui-} || die
-			done
-		)
-
-	fi
-
-	exeinto "/usr/$(get_libdir)/mozc" || die
-	doexe "out_linux/${BUILDTYPE}/mozc_server" || die
-
-	if use qt4 ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_tool" || die
-	fi
-
-	if use renderer ; then
-		exeinto "/usr/$(get_libdir)/mozc" || die
-		doexe "out_linux/${BUILDTYPE}/mozc_renderer" || die
-	fi
-}
-
-pkg_postinst() {
-	if use emacs ; then
-		elisp-site-regen
-		elog "You can use mozc-mode via LEIM (Library of Emacs Input Method)."
-		elog "Write the following settings into your init file (~/.emacs.d/init.el"
-		elog "or ~/.emacs) in order to use mozc-mode by default, or you can call"
-		elog "\`set-input-method' and set \"japanese-mozc\" anytime you have loaded"
-		elog "mozc.el"
-		elog
-		elog "  (require 'mozc)"
-		elog "  (set-language-environment \"Japanese\")"
-		elog "  (setq default-input-method \"japanese-mozc\")"
-		elog
-		elog "Having the above settings, just type C-\\ which is bound to"
-		elog "\`toggle-input-method' by default."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
--- a/app-i18n/poedit/Manifest
+++ b/app-i18n/poedit/Manifest
@ -1,2 +1 @@
-DIST poedit-1.4.6.1.tar.gz 1585949 SHA256 68d9b374280b02c16a82684d247d4766c4c4a9262324381f443c1678959d8242 SHA512 c8084c80a75cc8499615d736ee6d1a1fcf5753ab610f2931c151167c5c5b2fccff5892e971a90bc53eae815074d209c9e3b5854cc05bed8d72e8f0c2f00b96ed WHIRLPOOL 86484e70aea17770d23ed7baea02626a1a00a1f443bb44cd5f1432989b867515e5ffc2c4aa2d1740289c0c8d0ec17ca08a033ab367b4918b5db70ea627b37880
 DIST poedit-1.5.5.tar.gz 2594758 SHA256 3c94c9825c11a2d1ce10e083ad246e8625469f358da4a5a2f6210170b970f949 SHA512 a3524e27681dbf97babef7bf3ec56d6b7cd736370f8ed86b53c717a5a2eb36245f9ed89fcd28b57bd4d6f5ff5fb98d6c1615baae0bf10be720dcfdafa57ad4f4 WHIRLPOOL 893795acc85183cede0313b9220179cafa17a92033e8472e48454475f4ecdf51a014dc7123e9396a38a98217c43666919e7a1dadf68ab2f401b920071cec3d23
--- a/app-i18n/poedit/poedit-1.4.6.1.ebuild
+++ b/app-i18n/poedit/poedit-1.4.6.1.ebuild
@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/poedit/poedit-1.4.6.1.ebuild,v 1.11 2014/08/10 17:51:57 slyfox Exp $
-
-EAPI=2
-WX_GTK_VER=2.8
-
-inherit wxwidgets flag-o-matic fdo-mime
-
-DESCRIPTION="Cross-platform gettext catalogs (.po files) editor"
-HOMEPAGE="http://poedit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/poedit/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc sparc x86"
-IUSE="spell"
-
-RDEPEND="x11-libs/wxGTK:2.8[X]
-	>=sys-libs/db-3.1
-	spell? ( >=app-text/gtkspell-2.0.0:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	econf $(use_enable spell spellchecking)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
--- a/app-i18n/scim-canna/Manifest
+++ b/app-i18n/scim-canna/Manifest
@ -1,2 +1 @@
-DIST scim-canna-1.0.0.tar.gz 500666 SHA256 3295879fcb312627778047cfc6a819e07ef52c71eeea388c73a39abdbdac5af5 SHA512 d82a9f5b8f17120c03aca3e11826b639363d8a31db8216e10acd4f3dff076206a0fb095fa2f781e526ae9fa1e24dd2ae9546d118c832e6593cf6315ef4977619 WHIRLPOOL ad39c436e37309f842d0b747ca1e0b68cc092864cfc13ebe7cecc1be1d5941f0ebabe835b0e2907aa8997b8b9947139c8b2857ef4ed0f2facf1d506873bc3e85
 DIST scim-canna-1.0.1.tar.gz 516186 SHA256 f26f99d04c06465cbdf3540db762eb919b22ac1b338e9b30a35712287c4851c9 SHA512 711b67211c9d1f4cb8ca09b88d455718607aa2d99e47a753fa8d71d2e1f0df8c649b64d08149785eeaa98d1399b9ca92e3df7e1be8f150ce99f28f82491b8bc1 WHIRLPOOL 27094098763df0427637acb7751dad1e36f658e7b97d25c1346d341501eb2f22bbb016951924870b9d0bf330c7db7945ff13b88a4c3691c7b7fd2b06cf7319d8
--- a/app-i18n/scim-canna/scim-canna-1.0.0.ebuild
+++ b/app-i18n/scim-canna/scim-canna-1.0.0.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-canna/scim-canna-1.0.0.ebuild,v 1.7 2012/05/03 19:24:30 jdhore Exp $
-
-DESCRIPTION="Japanese input method Canna IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMCanna"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/18849/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="|| ( >=app-i18n/scim-1.0 >=app-i18n/scim-cvs-1.0 )
-	>=app-i18n/canna-3.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS THANKS README
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export GTK_IM_MODULE=scim"
-	elog "export QT_IM_MODULE=scim"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog
-}
--- a/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild
+++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild
@ -1,48 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-pinyin/scim-pinyin-0.5.91-r2.ebuild,v 1.8 2012/05/03 19:24:31 jdhore Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-IUSE="nls"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc64"
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	nls? ( virtual/libintl )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fixconfigure.patch"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	AT_M4DIR=m4 AT_NO_RECURSIVE=yes eautoreconf
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--disable-skim-support \
-		--without-arts \
-		--disable-static \
-		--disable-depedency-tracking \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHROS NEWS README ChangeLog
-}
--- a/app-i18n/scim-skk/scim-skk-0.5.2.ebuild
+++ b/app-i18n/scim-skk/scim-skk-0.5.2.ebuild
@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-skk/scim-skk-0.5.2.ebuild,v 1.6 2012/05/03 19:24:33 jdhore Exp $
-
-DESCRIPTION="Japanese input method SKK IMEngine for SCIM"
-HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMSKK"
-SRC_URI="mirror://sourceforge.jp/scim-imengine/18121/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="|| ( >=app-i18n/scim-1.2 >=app-i18n/scim-cvs-1.2 )"
-RDEPEND="${DEPEND}
-	|| ( app-i18n/skk-jisyo virtual/skkserv )
-	nls? ( virtual/libintl )"
-DEPEND="${DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking \
-		--disable-static || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS THANKS README
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM, you should use the following in your user startup scripts"
-	elog "such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=scim"
-	elog "export QT_IM_MODULE=scim"
-	elog
-}
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@ -1,5 +1 @@
-DIST scim-tables-0.5.10.tar.gz 8101380 SHA256 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea SHA512 e58247e2ac2dd08b497ce32648d4f6c173a320cb2d69ef18cc2a24a4be6312e9920b3ac71b82de4412d383f04eaf7e7f667c46e93977638c614a374dc0d0efbb WHIRLPOOL 753dbd4119584477ce87fccbe108b0b77675c1e53f241e1ba3d29137c3c914b6d1d2af726f325a126b1ada09eb1de3228202972fff0bf00793ba19304f039b51
-DIST scim-tables-0.5.11.tar.gz 6757581 SHA256 e7ce3c3fc73eb37c00385db278050100dc4fd51437bfba828185b7b28a7ab88f SHA512 1dbd34c66c800596971dd57109c648e572de7e4956a95be73638b3ddca970aeeb948325c3f9eaddee58e6925e09849073a72873edc8b3df6d53ae10071494b0d WHIRLPOOL f15b91b6ad17dad5ef2d462709571b788cdba39047bfffae2be4abc84b49c71fe745a04f62ca714a869fafc09704b0383e8e18ff680064ba2a63ff45be73d9d0
-DIST scim-tables-0.5.12.tar.gz 6714368 SHA256 10b5f97331229c22fe76dfde093d87b04333f9d43af654a603e583901e677511 SHA512 5e624a060c29bf2ac1f349aefe5dce7ea8edfa47a753ec57589859c30759120cc3c2521038bc7de0f7e6ba25c2c91750b849ede8c1d8303cbcbfb2fff65f0730 WHIRLPOOL affb1ef264b2d679c55f4be6c9b6cc161d2a67cd301791c1c7aebefc6ec57f575463ce3c573a3b76faf7158811e45d63eec708dc7d4ae4635b921d1194632d3f
 DIST scim-tables-0.5.13.tar.gz 6716275 SHA256 4ee7577f2efb4ec01c2c1bf1433a459293653caf281d712284200a4fb828b599 SHA512 400aa99acef83b82e6422398f41bf65e51b7e703adc3e87cdef03793d84983e600f9e6201fda6f9c54e97f35c44da72a657ce15caef09ef490c44ad19c3a9e33 WHIRLPOOL 1ad84ab62824057946366ef4019574fc3f5401c7785f9104a49371937b92375945bb1fd659d37004cf333aba9a7ea2958ccc9c399d7a1266381151dbb337f5b3
-DIST scim-tables-0.5.8.tar.gz 7214866 SHA256 2710b54f92845510b9db57b46c64a716c256e36585d55d51a62fdd3113572490 SHA512 af3c83cb4116dd5b3acdd81f99cc9705385c7bce4b1911da3acbabd2c5009063d656949642ccaa14d4fedf44d69644df26cd67c4b47a726853b43704fc87943b WHIRLPOOL 10f8dd3a86b3f613fca7b2da73308e881cc2e100f39b0930538b8cf5fae7f9d3ef0f75f3e5b4ac6217e770ffe47cb76fd5d2f306af930f8a46b67b13afcceed5
--- a/app-i18n/scim-tables/scim-tables-0.5.10.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.10.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.10.ebuild,v 1.2 2012/05/03 19:24:32 jdhore Exp $
-
-inherit autotools base eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND=">=app-i18n/scim-1.4.7-r2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch" )
-
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
--- a/app-i18n/scim-tables/scim-tables-0.5.11.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.11.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.11.ebuild,v 1.1 2012/08/14 13:51:17 naota Exp $
-
-inherit autotools base eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND=">=app-i18n/scim-1.4.7-r2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch" )
-
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
--- a/app-i18n/scim-tables/scim-tables-0.5.12.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.12.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.12.ebuild,v 1.2 2013/07/18 11:22:05 naota Exp $
-
-inherit autotools base eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND=">=app-i18n/scim-1.4.7-r2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch"
-	"${FILESDIR}"/${P}-automake.patch )
-
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
--- a/app-i18n/scim-tables/scim-tables-0.5.8-r1.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.8-r1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.8-r1.ebuild,v 1.11 2012/05/03 19:24:33 jdhore Exp $
-
-inherit autotools base eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND=">=app-i18n/scim-1.4.7-r2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${P}+gcc-4.3.patch" )
-
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
-}
-
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
-	econf \
-		--disable-skim-support \
-		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
--- a/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3.ebuild
+++ b/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3.ebuild
@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-wijesekera/scim-wijesekera-0.3.3.ebuild,v 1.4 2012/10/02 02:12:59 naota Exp $
-
-EAPI=2
-
-inherit autotools
-
-DESCRIPTION="Wijesekara keyboard for Sinhala input using scim"
-HOMEPAGE="http://sinhala.sourceforge.net/"
-SRC_URI="http://sinhala.sourceforge.net/files/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-i18n/scim-0.99.8[-gtk3]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@ -1,3 +1,2 @@
 DIST scim-1.4.11.tar.gz 2741428 SHA256 061a345e885d19d3a67e6d6529f4fa55d4bcc93c52b62b26e7c53dbdcdcf8dba SHA512 849296ec4c8a66db500ffa4fcf5b7626942cdcb00baba853c24bc2e048e7fd3055898da786b725951884e146171ca585abe1cf2c084081e1807e4eb0db4c5e00 WHIRLPOOL 72f97a62b441d49f4dbd1d37def90981402ea4e26b1e069669026db6d7144bbefc0852c38c86d4f91befff24f6f0585a4b96618a2462e61bc4a4154a60e00206
 DIST scim-1.4.14.tar.gz 1519287 SHA256 e91e4cfed92f3e19d229f702eda03038b3f9a0ce6c4e625b0be51134c19b7678 SHA512 00fe7a1b40b69aae123c0a1e67eb3744ad1e6b1e66726bb011a7426bd28012c52b346c62f08c7ecf0977ac3e88ee416337c9fa89b39142d5eea338d99641f5df WHIRLPOOL cb32326b30ff17ca4815267898de715e50893e77c28a48c55cf708f818fff4aea9e2114f982302c0fd6fd4e1fc45f2ca8490603db0de49ed4159914e1edd516d
-DIST scim-1.4.9.tar.gz 2928091 SHA256 f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0 SHA512 5b8239e4274dbb896d48d4411012d755ee903f885092edd9943168e535fb78b23c7bc832f22bde1fe6ff715a55a5e2779baea9f1ac9e68257576301541906761 WHIRLPOOL b51b14205985d826ba9d7341a85546c0d1ac2290b99e6814d0f5ff064d6fa24dc07fc5fc2405eb465b45ab7255e969acca914b7989f7cde5b7c50e25cb28a288
--- a/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
+++ b/app-i18n/scim/files/scim-1.4.7-syslibltdl.patch
@ -1,61 +0,0 @@
-Index: scim-1.4.7/src/Makefile.am
-===================================================================
--- scim-1.4.7.orig/src/Makefile.am
-+++ scim-1.4.7/src/Makefile.am
-@@ -33,7 +33,7 @@ INCLUDES		= -I$(top_builddir) \
- 			  -DSCIM_MODULE_PATH=\"@SCIM_MODULE_PATH@\"
- 
- 
-noinst_HEADERS		= ltdl.h \
-+noinst_HEADERS		= \
- 			  scim_private.h \
- 			  scim_compose_key_data.h \
- 			  scim_keyboard_layout_data.h \
-@@ -84,11 +84,6 @@ libsciminclude_HEADERS 	= scim.h \
- 			  scim_utility.h
- 
- 
-noinst_LTLIBRARIES	= libltdlc.la
-
-libltdlc_la_SOURCES	= ltdl.cpp
-libltdlc_la_LIBADD	= $(LIBADD_DL)
-
- if SCIM_LD_VERSION_SCRIPT
- LD_VERSION_SCRIPT_OPTION="-Wl,--version-script=$(srcdir)/libscim.version-script"
- endif
-@@ -137,7 +132,7 @@ libscim@SCIM_EPOCH@_la_LDFLAGS= -version
- 			  @LTLIBINTL@ \
- 			  -lstdc++
- 
-libscim@SCIM_EPOCH@_la_LIBADD	= libltdlc.la
-+libscim@SCIM_EPOCH@_la_LIBADD	= -lltdl
- 
- 
- bin_PROGRAMS		= scim scim-config-agent
-Index: scim-1.4.7/src/scim_module.cpp
-===================================================================
--- scim-1.4.7.orig/src/scim_module.cpp
-+++ scim-1.4.7/src/scim_module.cpp
-@@ -27,7 +27,9 @@
- #define Uses_STL_ALGORITHM
- #include "scim_private.h"
- #include "scim.h"
-#include "ltdl.h"
-+extern "C" {
-+  #include <ltdl.h>
-+}
- #include <dirent.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: scim-1.4.7/configure.ac
-===================================================================
--- scim-1.4.7.orig/configure.ac
-+++ scim-1.4.7/configure.ac
-@@ -71,7 +71,6 @@ AM_GNU_GETTEXT
- # Init libtool
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-AC_LIB_LTDL
- AC_SUBST(LIBTOOL_DEPS)
- 
- # libtool option to control which symbols are exported
--- a/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
+++ b/app-i18n/scim/files/scim-fix-disappeared-status-icon.patch
@ -1,32 +0,0 @@
-diff --git a/extras/panel/scim_panel_gtk.cpp b/extras/panel/scim_panel_gtk.cpp
-index 613613f..b53ef75 100644
--- a/extras/panel/scim_panel_gtk.cpp
-+++ b/extras/panel/scim_panel_gtk.cpp
-@@ -1072,11 +1072,13 @@ ui_initialize (void)
- #ifdef GDK_WINDOWING_X11
-     // Add an event filter function to observe X root window's properties.
-     GdkWindow *root_window = gdk_get_default_root_window ();
-+    GdkEventMask event_mask;
- #if GDK_MULTIHEAD_SAFE
-     if (_current_screen)
-         root_window = gdk_screen_get_root_window (_current_screen);
- #endif
-    gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
-+    event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
-+    gdk_window_set_events (root_window, event_mask);
-     gdk_window_add_filter (root_window, ui_event_filter, NULL);
- #endif
- 
-@@ -1323,9 +1325,11 @@ ui_switch_screen (GdkScreen *screen)
- 
- #ifdef GDK_WINDOWING_X11
-         GdkWindow *root_window = gdk_get_default_root_window ();
-+        GdkEventMask event_mask;
-         if (_current_screen)
-             root_window = gdk_screen_get_root_window (_current_screen);
-        gdk_window_set_events (root_window, (GdkEventMask)GDK_PROPERTY_NOTIFY);
-+        event_mask = (GdkEventMask) (gdk_window_get_events (root_window) | GDK_PROPERTY_NOTIFY);
-+        gdk_window_set_events (root_window, event_mask);
-         gdk_window_add_filter (root_window, ui_event_filter, NULL);
- #endif
- 
--- a/app-i18n/scim/scim-1.4.11.ebuild
+++ b/app-i18n/scim/scim-1.4.11.ebuild
@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.11.ebuild,v 1.3 2012/06/21 14:22:36 naota Exp $
-
-EAPI="3"
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	econf \
-		$(use_with doc doxygen) \
-		--enable-ld-version-script \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf" || die
-
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=\"scim\""
-	elog "export QT_IM_MODULE=\"scim\""
-	elog
-	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
-	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
-	elog
-	elog "To use Chinese input methods:"
-	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
-	elog "To use Korean input methods:"
-	elog "	# emerge app-i18n/scim-hangul"
-	elog "To use Japanese input methods:"
-	elog "	# emerge app-i18n/scim-anthy"
-	elog "To use various input methods (more than 30 languages):"
-	elog "	# emerge app-i18n/scim-m17n"
-	elog
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	update_gtk_immodules
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-}
--- a/app-i18n/scim/scim-1.4.9-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r1.ebuild
@ -1,108 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r1.ebuild,v 1.16 2012/06/21 14:22:36 naota Exp $
-
-EAPI="2"
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-pkg_setup() {
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	fi
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
-	# bug #283317
-	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
-	# remove m4/intltool.me to update it #417563
-	rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	# bug #191696
-	## We cannot use "use_enable"
-	#if ! use gtk ; then
-	#	myconf="${myconf} --disable-panel-gtk"
-	#	myconf="${myconf} --disable-setup-ui"
-	#	myconf="${myconf} --disable-gtk2-immodule"
-	#fi
-
-	econf \
-		$(use_with doc doxygen) \
-		--enable-ld-version-script \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=\"scim\""
-	elog "export QT_IM_MODULE=\"scim\""
-	elog
-	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
-	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
-	elog
-	elog "To use Chinese input methods:"
-	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
-	elog "To use Korean input methods:"
-	elog "	# emerge app-i18n/scim-hangul"
-	elog "To use Japanese input methods:"
-	elog "	# emerge app-i18n/scim-anthy"
-	elog "To use various input methods (more than 30 languages):"
-	elog "	# emerge app-i18n/scim-m17n"
-	elog
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
--- a/app-i18n/scim/scim-1.4.9-r2.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r2.ebuild
@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r2.ebuild,v 1.4 2012/06/21 14:22:36 naota Exp $
-
-EAPI="3"
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	>=dev-libs/atk-1
-	>=x11-libs/pango-1
-	!app-i18n/scim-cvs"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen
-		>=app-text/docbook-xsl-stylesheets-1.73.1 )
-	dev-lang/perl
-	virtual/pkgconfig
-	>=dev-util/intltool-0.33
-	sys-devel/libtool"
-
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
-	# bug #283317
-	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
-	# remove m4/intltool.m4 to update it #417563
-	rm "${S}"/src/ltdl.{cpp,h} m4/intltool.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# bug #83625
-	filter-flags -fvisibility-inlines-hidden
-	filter-flags -fvisibility=hidden
-
-	econf \
-		$(use_with doc doxygen) \
-		--enable-ld-version-script \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
-	insinto /etc/X11/xinit/xinput.d
-	doins "${T}/${PN}.conf" || die
-
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
-	use doc && dohtml -r docs/html/*
-}
-
-pkg_postinst() {
-	elog
-	elog "To use SCIM with both GTK2 and XIM, you should use the following"
-	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
-	elog
-	elog "LANG='your_language' scim -d"
-	elog "export XMODIFIERS=@im=SCIM"
-	elog "export GTK_IM_MODULE=\"scim\""
-	elog "export QT_IM_MODULE=\"scim\""
-	elog
-	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
-	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
-	elog
-	elog "To use Chinese input methods:"
-	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
-	elog "To use Korean input methods:"
-	elog "	# emerge app-i18n/scim-hangul"
-	elog "To use Japanese input methods:"
-	elog "	# emerge app-i18n/scim-anthy"
-	elog "To use various input methods (more than 30 languages):"
-	elog "	# emerge app-i18n/scim-m17n"
-	elog
-	elog "Please modify ${EPREFIX}/etc/scim/global and add your UTF-8 locale to"
-	elog "/SupportedUnicodeLocales entry."
-	elog
-	ewarn
-	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
-	ewarn
-
-	update_gtk_immodules
-}
-
-pkg_postrm() {
-	update_gtk_immodules
-}
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@ -1,3 +1 @@
-DIST skk-jisyo-200705.tar.gz 8639170 SHA256 b8df8b7ad1beadc9b9d5112e679751f17492eb94955f9ece28c0420dfe93e587 SHA512 37d323c4af3583bad6b656959df60dea8d5b6d7015145e3e848da8cc68b7530081463ca749ddae052dc9285de93410bd6a5e2c54d296b1f13db4eda1eb85913a WHIRLPOOL 1c07b063aba2d74572f40347feb79c6d6b207e95b078d8f6c30613bf1c3c78ca1245c5f076897645695bed5878b2386e071acb385a7c92e9bf76e9896832a3c5
-DIST skk-jisyo-200812.tar.bz2 7853281 SHA256 f16a12f986b9a22b59bf44a2a0139b144c89bc119e801636def247114768ca63 SHA512 d864216f8fdf0c0145d8373486eac3b7f1fcaad20f7dbeadf317ee129f7a365500b6da03aba624ab0d5c37ae508974d49678ab26aaa3071bc17e108ce5632cbb WHIRLPOOL bd9ef7327abecf30f23f34dbc3dea17461245569128aea9fefff0ab219230e4c818d6e929ff1d4df025cd62067cb2141cca7c3f946f6d9dc98e5387661d32de6
 DIST skk-jisyo-201101.tar.bz2 7880875 SHA256 a57d9a39b705d13f8c90caf9ce8cf3f729852020a6e5b43bcc9e1d7383b252b4 SHA512 bbdaa6916bda9b545b4afc665fd9c7023797a2f1d2568c019b8f06515eca24f707cdcee8d85f3b0ea2793df4836a233eb131e78572229676cca909591f3e3648 WHIRLPOOL 11b4d880fb41f5fb3c704cc18c664ef0f043f6d232f34be6ba1c3737c7d9ccb0aec2361234ceea933e4ec4dbacc344de58af5d975c74412b847044df4aff89d9
--- a/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200705.ebuild,v 1.15 2013/02/12 09:36:14 naota Exp $
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain freedist"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="cdb"
-
-COMMON_DEPEND="cdb? ( dev-db/cdb )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk"
-RDEPEND="${COMMON_DEPEND}
-	!app-i18n/skk-jisyo-extra
-	!app-i18n/skk-jisyo-cdb"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm SKK-JISYO.wrong.annotated SKK-JISYO.china_taiwan.header
-	rm SKK-JISYO.noregist SKK-JISYO.not_wrong SKK-JISYO.hukugougo
-	rm SKK-JISYO.notes SKK-JISYO.requested SKK-JISYO.pubdic+
-}
-
-src_compile() {
-	# bug 184457
-	unset LANG LC_ALL LC_CTYPE
-
-	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
-		mv ${f} ${f}.annotated
-		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
-		if use cdb ; then
-			gawk '
-				/^[^;]/ {
-					s = substr($0, index($0, " ") + 1)
-					print "+" length($1) "," length(s) ":" $1 "->" s
-				}
-				END {
-					print ""
-				}
-			' $(basename ${f}) | cdbmake $(basename ${f}).cdb "${T}"/$(basename ${f}) || die
-		fi
-		rm ${f}.annotated
-	done
-}
-
-src_install() {
-	# install dictionaries
-	insinto /usr/share/skk
-	doins SKK-JISYO.* || die
-
-	dodoc ChangeLog* READMEs/committers.txt edict_doc.txt
-}
--- a/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skk-jisyo/skk-jisyo-200812.ebuild,v 1.8 2013/02/12 09:36:14 naota Exp $
-
-DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2 public-domain freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="cdb"
-
-COMMON_DEPEND="cdb? ( dev-db/cdb )"
-DEPEND="${COMMON_DEPEND}
-	sys-apps/gawk"
-RDEPEND="${COMMON_DEPEND}
-	!app-i18n/skk-jisyo-extra
-	!app-i18n/skk-jisyo-cdb"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm SKK-JISYO.wrong.annotated SKK-JISYO.china_taiwan.header
-	rm SKK-JISYO.noregist SKK-JISYO.not_wrong SKK-JISYO.hukugougo
-	rm SKK-JISYO.notes SKK-JISYO.requested SKK-JISYO.pubdic+
-}
-
-src_compile() {
-	# bug 184457
-	unset LANG LC_ALL LC_CTYPE
-
-	for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
-		mv ${f} ${f}.annotated
-		gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
-		if use cdb ; then
-			gawk '
-				/^[^;]/ {
-					s = substr($0, index($0, " ") + 1)
-					print "+" length($1) "," length(s) ":" $1 "->" s
-				}
-				END {
-					print ""
-				}
-			' $(basename ${f}) | cdbmake $(basename ${f}).cdb "${T}"/$(basename ${f}) || die
-		fi
-		rm ${f}.annotated
-	done
-}
-
-src_install() {
-	# install dictionaries
-	insinto /usr/share/skk
-	doins SKK-JISYO.* || die
-
-	dodoc ChangeLog* READMEs/committers.txt edict_doc.txt
-}
--- a/app-i18n/skkfep/Manifest
+++ b/app-i18n/skkfep/Manifest
@ -1,3 +1 @@
 DIST skkfep-0.87.tar.gz 45711 SHA256 f5eb6a23a7bf9b8a5493e8104c346ac053c2545bab1a3b82054cd1a09cef0e61 SHA512 3dc842559640b56b967679042c31bfa889e66cd6b7d0347ec17ddc606b85f2a4bb49dc995b3b38c30e71f500031714e2083bfc028ad4ff76ac4f07476a3f2469 WHIRLPOOL 32e985317e55b546e1d8822f0c2a5cf2322623282f89c73e9a7fc098c710f7b88121cf20223904e115bf7d61ec9e5fedab0053f36ff5e3789e84ae7ff1adf090
-DIST skkfep0.86c-kh1.2.10.patch.gz 30234 SHA256 d7192c12acc77f3cbccc43e068e4d43961a03fb0dffa91654e39ca073dbf22ca SHA512 d09f8e51cdad1ca68c9d8a5932a0ee31c2c5fe14644be2b8e3473f9ec2b67aa220d1601e1f33f025e813536d9577ef5a4d755685bbf5201fe35cd78177e7af7a WHIRLPOOL aa7329f78ad1c2174f3c66d211c239aa74a7f58ce970776e953cf894b71666a5db0709b7874fae20821abe8c9c20a78e3a5c2b6166f9119b061cf2e631d1e330
-DIST skkfep0.86c.tar.gz 46748 SHA256 41082f17703da4fd0a0903f6f6143cc0d393c2387b2d95705a98e761e814cf75 SHA512 f4134cda91e740ff184e8d93018fb0b53341afa7836f2bc0c88facd249ca4f0a9449e1341963b16a9fdb04176ce89dbf41215cb6818e3138506b027ac9396a57 WHIRLPOOL f562b0e896c352a205d08fbe8be80ec4349b17c00ce5ac97e30391ea25628ba76180092ea1cf4ad18341e8548ae09d2165648773dab00fd21056e1ce5b0dc76a
--- a/app-i18n/skkfep/skkfep-0.86c.ebuild
+++ b/app-i18n/skkfep/skkfep-0.86c.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.86c.ebuild,v 1.9 2013/02/12 08:43:53 naota Exp $
-
-inherit eutils
-
-MY_P=${P/-/}
-KH_PV="kh1.2.10"
-
-DESCRIPTION="A SKK-like Japanese input method for console"
-HOMEPAGE="http://homepage2.nifty.com/aito/soft.html"
-SRC_URI="http://www1.interq.or.jp/~deton/jvim-skk/${MY_P}.tar.gz
-	http://www1.interq.or.jp/~deton/jvim-skk/${MY_P}-${KH_PV}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4
-	virtual/awk
-	sys-libs/ncurses"
-RDEPEND="virtual/skkserv"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${MY_P}-${KH_PV}.patch
-}
-
-src_compile() {
-	sed -i -e 's/solaris2/linux/' \
-		-e '/^#define USE_SKKSRCH/s/^/\/* /' \
-		-e  '/^#define BOTH_SERVER_AND_SKKSRCH/s/^/\/* /' \
-		-e '/SUSPEND_FEP/s/^\/\*//' config.h
-	sed -i  -e 's/termcap/curses/' \
-		-e '/skksrch/s/skksrch\.[co]//' protoMakefile
-	make || die "make failed."
-}
-
-src_install() {
-	dobin skkfep || die
-	doman skkfep.1
-
-	dodoc README* HISTORY INSTALL TODO
-}
--- a/app-i18n/skkfep/skkfep-0.87.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkfep/skkfep-0.87.ebuild,v 1.5 2013/02/12 08:43:53 naota Exp $
-
-inherit eutils
-
-KH_P="${PN}0.86c-kh1.2.10"
-
-DESCRIPTION="A SKK-like Japanese input method for console"
-HOMEPAGE="http://homepage2.nifty.com/aito/soft.html"
-SRC_URI="http://homepage2.nifty.com/aito/skkfep/${P}.tar.gz"
-#	"http://www1.interq.or.jp/~deton/jvim-skk/${KH_P}.patch.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4
-	virtual/awk
-	sys-libs/ncurses"
-RDEPEND="virtual/skkserv"
-
-#S=${WORKDIR}/${PN}
-
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S}
-#	epatch ../${KH_P}.patch
-#}
-
-src_compile() {
-	sed -i -e 's/solaris2/linux/' \
-		-e '/^#define USE_SKKSRCH/s/^/\/* /' \
-		-e  '/^#define BOTH_SERVER_AND_SKKSRCH/s/^/\/* /' \
-		-e '/SUSPEND_FEP/s/^\/\*//' config.h
-	sed -i  -e 's/termcap/curses/' \
-		-e '/skksrch/s/skksrch\.[co]//' protoMakefile
-	make || die "make failed."
-}
-
-src_install() {
-	dobin skkfep || die
-	doman skkfep.1
-
-	dodoc README* HISTORY INSTALL TODO
-}
-
-pkg_postinst() {
-	elog "Don't forget to set SKKSERVER to your local skkserv host."
-}
--- a/app-i18n/skkserv/skkserv-9.6-r2.ebuild
+++ b/app-i18n/skkserv/skkserv-9.6-r2.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/skkserv/skkserv-9.6-r2.ebuild,v 1.16 2011/04/13 15:14:45 ulm Exp $
-
-inherit eutils
-
-MY_P="skk${PV}mu"
-
-DESCRIPTION="Dictionary server for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/"
-SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/museum/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE=""
-
-DEPEND=">=app-i18n/skk-jisyo-200210"
-
-S="${WORKDIR}/skk-${PV}mu"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/skkserv
-	epatch "${FILESDIR}"/${P}-segfault-gentoo.patch
-}
-
-src_compile() {
-	econf --libexecdir=/usr/sbin || die "econf failed"
-	cd skkserv
-	emake || die
-}
-
-src_install() {
-	cd skkserv
-	dosbin skkserv || die
-
-	# install rc script
-	newinitd "${FILESDIR}"/skkserv.initd skkserv
-}
--- a/app-i18n/tomoe/tomoe-0.6.0.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/tomoe/tomoe-0.6.0.ebuild,v 1.5 2012/05/03 19:24:32 jdhore Exp $
-
-DESCRIPTION="Japanese handwriting recognition engine"
-HOMEPAGE="http://tomoe.sourceforge.jp/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="doc hyperestraier mysql ruby subversion"
-
-RDEPEND=">=dev-libs/glib-2.4
-	ruby? ( dev-ruby/ruby-glib2 )
-	hyperestraier? ( app-text/hyperestraier )
-	subversion? (
-		>=dev-libs/apr-1
-		dev-vcs/subversion
-	)
-	mysql? ( dev-db/mysql )"
-# python? ( dev-python/pygobject )
-# unihan? ( app-dicts/unihan )
-
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-RESTRICT="test"
-
-src_compile() {
-	econf \
-		$(use_with ruby) \
-		$(use_enable doc gtk-doc) || die
-#		$(use_with python) \
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog NEWS TODO
-}
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@ -1,2 +1 @@
-DIST x-unikey-0.9.2.tar.bz2 347785 SHA256 54c810c23ed51c31e8ed44702eca38358c5864caba95d84049c782f4c241c250 SHA512 2ebbd59f894f9900c8737d7509c3463554efc7e12513cac1ef5a44785f745957f908504fadbd7f8b85cad3add99d695c87f1b6d5e704627687f43993fd13a337 WHIRLPOOL 1e7f580c852b20dbcd3119ccb7ac63464cb3847b3b79b025781a84519604a5e3c9760ae7c1290fe328b727042b5bf93505105505d1499e915cb5ddb1c7044191
 DIST x-unikey-1.0.4.tar.bz2 561391 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9 SHA512 47abe4087957c4926550a0121d5cdc7b760f39691fae91c8e0562fc0f4577c22a04192667d362c9838b87fd97d2111afef1260fc88d8234bc5656bab248b5b06 WHIRLPOOL 144788e4a43e55c5a30fbb11eba6953d147823d3229550cbec370d583fd1a74e97f68c3e14b1988074788561f4e0adb836829f06ab88b1f725051dd3840256d9
--- a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.11 2012/10/09 13:31:13 naota Exp $
-
-EAPI="1"
-
-inherit eutils gnome2-utils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://unikey.sourceforge.net/linux.php"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="nls gtk"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	nls? ( sys-devel/gettext )
-	gtk? ( >=x11-libs/gtk+-2.2:2 )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${D}/etc/gtk-2.0"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir etc/gtk-2.0
-		emake DESTDIR="${D}" install -C src/unikey-gtk
-	fi
-	dobin src/xim/ukxim src/gui/unikey
-	doenvd "${FILESDIR}"/01x-unikey
-	dodoc doc/manual doc/ukmacro doc/unikeyrc
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog ""
-	if use gtk; then
-		gnome2_query_immodules_gtk2
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	use gkt && gnome2_query_immodules_gtk2
-}
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild,v 1.2 2015/04/21 02:22:53 patrick Exp $
+
+EAPI=5
+
+inherit autotools eutils multilib gnome2-utils
+
+DESCRIPTION="Vietnamese X Input Method"
+HOMEPAGE="http://www.unikey.org/"
+SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls gtk"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	gtk? ( >=x11-libs/gtk+-2.2:2 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	dev-libs/glib
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	# An arch specific config directory is used on multilib systems
+	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	# --with-gtk-sysconfdir to prevent sandbox violation only
+	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
+	econf ${myconf}
+}
+
+src_install() {
+	if use gtk;then
+		dodir "${GTK2_CONFDIR}"
+#		emake DESTDIR="${D}" install -C src/unikey-gtk || die
+	fi
+#	dobin src/xim/ukxim src/gui/unikey
+	emake DESTDIR="${D}" install
+	doenvd "${FILESDIR}/01x-unikey"
+
+	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
+	cd doc
+	dodoc README1ST keymap-syntax manual options ukmacro \
+		unikey-manual-0.9.pdf unikey.png unikeyrc
+}
+
+pkg_postinst() {
+	elog
+	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
+	elog "to enable x-unikey"
+	elog
+	if use gtk; then
+		gnome2_query_immodules_gtk2
+		elog "If you want to use x-unikey as the default gtk+ input method,"
+		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
+		elog
+	fi
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk2
+}
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@ -1,2 +1 @@
-DIST mime-types-8.tar.bz2 11969 SHA256 1aa86f1be3c8daff96aefb2ddf6c8750105c46cc6f85a549c8506434798f7e2b SHA512 3df326f32f596067bca81678b6b31896cc443eec34da4ee442f80431eb4da014c1f0a049021e8f2f7645f1affc95d532306073268c89d0d9f76de0a9c545d7c1 WHIRLPOOL 1985db42615bc420d12d073d90cdab470f4d9c46f0f863e84df28ada48aa91c7f0bbe7e94a84fd24c37d4957a978a30e815eb0abdf0eb9db75249c7fc15f112e
 DIST mime-types-9.tar.bz2 15524 SHA256 b4638a734f121be30a546ed092aec16bf74e9b88ed7921fba89cf7e2c0462b5e SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6 WHIRLPOOL 61c7fe4879caf0d732f2667f784955d40f6645e257fcca0a29180dc4462437a864fd8ea55bf37be94ac2bb572a6c8e906494c57d6c8275938d52defc0b766cde
--- a/app-misc/mime-types/mime-types-8.ebuild
+++ b/app-misc/mime-types/mime-types-8.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/mime-types/mime-types-8.ebuild,v 1.9 2012/04/26 12:16:46 aballier Exp $
-
-DESCRIPTION="Provides /etc/mime.types file"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_install() {
-	insinto /etc
-	doins mime.types || die
-}
--- a/app-misc/slashtime/Manifest
+++ b/app-misc/slashtime/Manifest
@ -1,2 +1 @@
-DIST slashtime-0.5.11.tar.bz2 50529 SHA256 9e61d3b98bdfdc5a13c17aa560e94bd3f65dbb152df6202eda537eeb9cbf8b75 SHA512 5bfcfbc5f76549b71ab6b4deb3a802904e7639b460c4ca7c88ceddb74ae5985479bb132cc86d976c917746027fbfca2a51a05cfcbbd107fd5da2feabbe8a3767 WHIRLPOOL 0c25319d6206772b205deeb640ade4b837698c2a9d78a889aeb69c7f49fac19f4b1ab512f6925447a8056dce7fdc2fe7c8372fdb12f82b74763849f771aa0a82
 DIST slashtime-0.5.13.tar.bz2 51154 SHA256 19b1d589142258d70d72eba043545667a305360ca9ff5ee78109a17a3076804d SHA512 bb80965882c8078aa7830d0d0bffa48c84ad455f7882500f68c100e65ff0978d5825dff9b8feb1daa0b3557a68c8d6162b0761bdb424f36a94e934ee1b616f59 WHIRLPOOL d88f0f8f6536102122bfcd570bb820e6b23eec8a09a5599e21d066109c6f43ddfe09a97773e904502b7e1d4c50cc00fe8642df1f038a06de5d1349b72ecce570
--- a/app-misc/slashtime/slashtime-0.5.11.ebuild
+++ b/app-misc/slashtime/slashtime-0.5.11.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/slashtime/slashtime-0.5.11.ebuild,v 1.3 2010/04/16 16:50:42 hwoarang Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2
-
-DESCRIPTION="View the time at locations around the world"
-HOMEPAGE="http://research.operationaldynamics.com/projects/slashtime/"
-SRC_URI="http://research.operationaldynamics.com/projects/${PN}/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP=">=dev-java/java-gnome-4.0.14_rc2:4.0"
-
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-
-src_configure() {
-	# Handwritten in perl so not using econf
-	./configure prefix=/usr jardir=/usr/share/${PN}/lib || die
-}
-
-src_compile() {
-	emake || die "emake failed."
-}
-
-src_install() {
-	#this is needed to generate the slashtime jar
-	emake -j1 DESTDIR="${D}" install || die "emake install failed."
-
-	java-pkg_register-dependency java-gnome-4.0 gtk.jar
-	java-pkg_regjar /usr/share/${PN}/lib/${PN}.jar
-
-	#Replace slashtime launcher with our own.
-	rm "${D}"/usr/bin/slashtime || die
-	java-pkg_dolauncher ${PN} --main slashtime.client.Master \
-		--pwd /usr
-
-	dodoc AUTHORS HACKING PLACES README TODO || die "dodoc failed."
-
-	use source && java-pkg_dosrc src/java/slashtime
-}
--- a/app-mobilephone/smstools/Manifest
+++ b/app-mobilephone/smstools/Manifest
@ -1,2 +1 @@
-DIST smstools-2.2.20.tar.gz 172234 SHA256 8eee958946332580bbe314f2e839734e633db487deb43bbb5d9bbc94b8f506bb SHA512 a0646cb343d710f4031328e4686c01716f21061f65edc171ec3e5ab14bf5c67bbb94cf1eee0c9d483b0b0cad12a8fda3b3bf52a863a9e51f44b1f3492d5e85d9 WHIRLPOOL 7b36b58a37d449f7f7454630e45e44e22fe28210da491d232057ce235889cb2fc23009c7fde928cf6e9b4ef59df85eb65fdad105394e3586d06284aff9721102
 DIST smstools3-3.1.15.tar.gz 300088 SHA256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 SHA512 6a4cc852327fac27b00fc58def4bbc8caa395552586fe1b84f0f4a9f7f6b00008943b85c86de0821036629c58cf04840a189d711b4ac96f7ddaafd6b340b11fa WHIRLPOOL b394c4c620622dcfdf1d0b098a51f589ee59869fbd58c0b778e51f76335a396c3d4972423374f2ee191263cf7c350cf2432e0b120f594f77f17cdbbcc4b4e974
--- a/app-mobilephone/smstools/smstools-2.2.20.ebuild
+++ b/app-mobilephone/smstools/smstools-2.2.20.ebuild
@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/smstools/smstools-2.2.20.ebuild,v 1.4 2012/06/02 05:02:33 zmedico Exp $
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="Send and receive short messages through GSM modems"
-HOMEPAGE="http://smstools.meinemullemaus.de/"
-SRC_URI="http://www.meinemullemaus.de/${PN}/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="stats"
-
-RDEPEND="sys-process/procps
-	 stats? ( >=dev-libs/mm-1.4.0 )"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	enewgroup sms
-	enewuser smsd -1 -1 /var/spool/sms sms
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/2.2.1-skip-dirlock.patch
-	epatch "${FILESDIR}"/2.2.13-sendsms-chmod.patch
-	if use stats; then
-		sed -i -e "s:CFLAGS += -D NOSTATS:#CFLAGS += -D NOSTATS:" src/Makefile
-	fi
-}
-
-src_compile() {
-	cd src
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	dobin src/smsd
-	cd "${S}"/scripts
-	dobin sendsms sms2html sms2unicode unicode2sms
-	dobin hex2bin hex2dec email2sms
-	dodoc mysmsd smsevent smsresend sms2xml sql_demo
-
-	keepdir /var/spool/sms/incoming
-	keepdir /var/spool/sms/outgoing
-	keepdir /var/spool/sms/checked
-	chown -R smsd:sms "${D}"/var/spool/sms
-	chmod g+s "${D}"/var/spool/sms/incoming
-
-	newinitd "${FILESDIR}"/smsd.initd smsd
-	insopts -o smsd -g sms -m0644
-	insinto /etc
-	newins "${S}"/examples/smsd.conf.easy smsd.conf
-
-	dohtml "${S}"/doc/*
-}
-
-pkg_postinst() {
-	touch "${ROOT}"/var/log/smsd.log
-	chown -f smsd:sms "${ROOT}"/var/log/smsd.log
-}
--- a/Show More
+++ b/Show More