zipcode version bumped. Removed old symlink, bug #343325. imsettings support. EAPI=3. better multilib handling.

(Portage version: 2.1.9.28/cvs/Linux x86_64)

6 files changed, 94 insertions, 532 deletions

diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index 25221114e015..34c3df053dd1 100644
--- a/app-i18n/atokx3/ChangeLog
+++ b/app-i18n/atokx3/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/atokx3
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.11 2010/10/26 17:22:17 matsuu Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.12 2011/01/12 12:02:29 matsuu Exp $
+
+*atokx3-3.0.0-r7 (12 Jan 2011)
+
+  12 Jan 2011; MATSUU Takuto <matsuu@gentoo.org> -atokx3-3.0.0-r2.ebuild,
+  -atokx3-3.0.0-r3.ebuild, -atokx3-3.0.0-r4.ebuild, -atokx3-3.0.0-r5.ebuild,
+  +atokx3-3.0.0-r7.ebuild, +files/xinput-iiimf:
+  zipcode version bumped. Removed old symlink, bug #343325. imsettings support.
+  EAPI=3. better multilib handling. Removed old versions.
 
 *atokx3-3.0.0-r6 (26 Oct 2010)
 
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild
deleted file mode 100644
index 9422f3928b98..000000000000
--- a/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild,v 1.2 2010/02/11 16:19:38 ulm Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${PN}up2.tar.gz"
-
-LICENSE="ATOK MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PROPERTIES="interactive"
-RESTRICT="strip mirror"
-
-RDEPEND="!app-i18n/atokx2
-	!dev-libs/libiiimcf
-	!dev-libs/csconv
-	!app-i18n/iiimgcf
-	!dev-libs/libiiimp
-	!app-i18n/iiimsf
-	!app-i18n/iiimxcf
-	dev-libs/atk
-	dev-libs/glib
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/libpng
-	sys-apps/tcp-wrappers
-	sys-libs/pam
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.4.13
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/pango
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-xlibs
-	)"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if ! cdrom_get_cds atokx3index ; then
-		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
-	fi
-	if use amd64 && [ ! -f "/$(ABI=x86 get_libdir)/libwrap.so" ] ; then
-		TCPD_PF="$(best_version sys-apps/tcp-wrappers)"
-		eerror "${PN} requires /$(ABI=x86 get_libdir)/libwrap.so to work on amd64."
-		eerror "# ABI=x86 emerge -B1 '=${TCPD_PF}'"
-		eerror "# tar xpvf ${PKGDIR}/${TCPD_PF}.tbz2 -C / ./$(ABI=x86 get_libdir) ./usr/$(ABI=x86 get_libdir)"
-		die
-	fi
-}
-
-src_unpack() {
-	local targets="
-		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
-		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
-	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
-
-	if use amd64 ; then
-		targets="${targets}
-			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
-		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
-	fi
-
-	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
-
-	unpack ${A}
-
-	for i in ${targets}
-	do
-		if [ -f "${S}"/atokx3up2/bin/${i} ] ; then
-			einfo "unpack" $(basename "${S}"/atokx3up2/bin/${i})
-			tar xzf "${S}"/atokx3up2/bin/${i} || die "Failed to unpack ${i}"
-		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
-			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
-			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
-		else
-			eerror "${i} not found."
-			die "${i} not found."
-		fi
-	done
-
-	if use amd64 ; then
-		lib32="$(ABI=x86 get_libdir)"
-		lib64="$(get_libdir)"
-		if [ "lib" != "${lib32}" ] ; then
-			mv usr/lib usr/${lib32} || die
-		fi
-		if [ "lib64" != "${lib64}" ] ; then
-			mv usr/lib64 usr/${lib64} || die
-		fi
-	fi
-}
-
-src_install() {
-	dodoc atokx3up2/README_UP2.txt
-	# atokx3up2
-	rm -rf atokx3up2
-
-	cp -dpR * "${D}" || die
-
-	# amd64 hack
-	if use amd64 ; then
-		if [ "$(ABI=x86 get_libdir)" != "$(get_libdir)" ] ; then
-			dosym /usr/$(ABI=x86 get_libdir)/iiim /usr/$(get_libdir)/iiim || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimcf.la /usr/$(get_libdir)/libiiimcf.la || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimp.la /usr/$(get_libdir)/libiiimp.la || die
-		fi
-	fi
-
-	dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
-	dohtml "${CDROM_ROOT}"/readme.html || die
-}
-
-get_gtk_confdir() {
-	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
-	elog
-	elog ". /opt/atokx3/bin/atokx3start.sh"
-	elog
-	gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-}
-
-pkg_postrm() {
-	gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r3.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r3.ebuild
deleted file mode 100644
index 670e084d2ee4..000000000000
--- a/app-i18n/atokx3/atokx3-3.0.0-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r3.ebuild,v 1.2 2010/02/11 16:19:38 ulm Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${PN}up2.tar.gz
-	http://www3.justsystem.co.jp/download/atok/up/lin/${PN}gtk216.tar.gz"
-
-LICENSE="ATOK MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PROPERTIES="interactive"
-RESTRICT="strip mirror"
-
-RDEPEND="!app-i18n/atokx2
-	!dev-libs/libiiimcf
-	!dev-libs/csconv
-	!app-i18n/iiimgcf
-	!dev-libs/libiiimp
-	!app-i18n/iiimsf
-	!app-i18n/iiimxcf
-	dev-libs/atk
-	dev-libs/glib
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/libpng
-	sys-apps/tcp-wrappers
-	sys-libs/pam
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.4.13
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/pango
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-xlibs
-	)"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if ! cdrom_get_cds atokx3index ; then
-		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
-	fi
-	if use amd64 && [ ! -f "/$(ABI=x86 get_libdir)/libwrap.so" ] ; then
-		TCPD_PF="$(best_version sys-apps/tcp-wrappers)"
-		eerror "${PN} requires /$(ABI=x86 get_libdir)/libwrap.so to work on amd64."
-		eerror "# ABI=x86 emerge -B1 '=${TCPD_PF}'"
-		eerror "# tar xpvf ${PKGDIR}/${TCPD_PF}.tbz2 -C / ./$(ABI=x86 get_libdir) ./usr/$(ABI=x86 get_libdir)"
-		die
-	fi
-}
-
-src_unpack() {
-	local targets="
-		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
-		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
-	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
-
-	if use amd64 ; then
-		targets="${targets}
-			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
-		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
-	fi
-
-	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
-
-	unpack ${PN}up2.tar.gz
-
-	for i in ${targets}
-	do
-		if [ -f "${S}"/atokx3up2/bin/${i} ] ; then
-			einfo "unpack" $(basename "${S}"/atokx3up2/bin/${i})
-			tar xzf "${S}"/atokx3up2/bin/${i} || die "Failed to unpack ${i}"
-		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
-			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
-			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
-		else
-			eerror "${i} not found."
-			die "${i} not found."
-		fi
-	done
-	unpack ${PN}gtk216.tar.gz
-
-	if use amd64 ; then
-		lib32="$(ABI=x86 get_libdir)"
-		lib64="$(get_libdir)"
-		if [ "lib" != "${lib32}" ] ; then
-			mv usr/lib usr/${lib32} || die
-		fi
-		if [ "lib64" != "${lib64}" ] ; then
-			mv usr/lib64 usr/${lib64} || die
-		fi
-	fi
-}
-
-src_install() {
-	dodoc atokx3up2/README_UP2.txt
-	# atokx3up2
-	rm -rf atokx3up2
-
-	cp -dpR * "${D}" || die
-
-	# amd64 hack
-	if use amd64 ; then
-		if [ "$(ABI=x86 get_libdir)" != "$(get_libdir)" ] ; then
-			dosym /usr/$(ABI=x86 get_libdir)/iiim /usr/$(get_libdir)/iiim || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimcf.la /usr/$(get_libdir)/libiiimcf.la || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimp.la /usr/$(get_libdir)/libiiimp.la || die
-		fi
-	fi
-
-	dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
-	dohtml "${CDROM_ROOT}"/readme.html || die
-}
-
-get_gtk_confdir() {
-	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
-	fi
-}
-
-pkg_postinst() {
-	elog
-	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
-	elog
-	elog ". /opt/atokx3/bin/atokx3start.sh"
-	elog
-	gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-}
-
-pkg_postrm() {
-	gtk-query-immodules-2.0 > "${ROOT}/$(get_gtk_confdir)/gtk.immodules"
-}
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild
deleted file mode 100644
index 2ab9d5116c1e..000000000000
--- a/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild,v 1.2 2010/02/11 16:19:38 ulm Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
-HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${PN}up2.tar.gz
-	http://www3.justsystem.co.jp/download/atok/up/lin/${PN}gtk216.tar.gz
-	http://www3.justsystem.co.jp/download/zipcode/up/lin/a20y0911lx.tgz"
-
-LICENSE="ATOK MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PROPERTIES="interactive"
-RESTRICT="strip mirror binchecks"
-#FEATURES="${FEATURES/multilib-strict}"
-
-RDEPEND="!app-i18n/atokx2
-	!dev-libs/libiiimcf
-	!dev-libs/csconv
-	!app-i18n/iiimgcf
-	!dev-libs/libiiimp
-	!app-i18n/iiimsf
-	!app-i18n/iiimxcf
-	dev-libs/atk
-	dev-libs/glib
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/libpng
-	sys-apps/tcp-wrappers
-	sys-libs/pam
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.4.13
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXxf86vm
-	x11-libs/libdrm
-	x11-libs/pango
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-		app-emulation/emul-linux-x86-xlibs
-	)"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if has_multilib_profile ; then
-		GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	fi
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	if ! cdrom_get_cds atokx3index ; then
-		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
-	fi
-	if use amd64 && [ ! -f "/$(ABI=x86 get_libdir)/libwrap.so" ] ; then
-		TCPD_PF="$(best_version sys-apps/tcp-wrappers)"
-		eerror "${PN} requires /$(ABI=x86 get_libdir)/libwrap.so to work on amd64."
-		eerror "# emerge crossdev"
-		eerror "# crossdev --target i686-pc-linux-gnu-gcc"
-		eerror "# CC=i686-pc-linux-gnu-gcc ABI=x86 emerge -B1 '=${TCPD_PF}'"
-		eerror "# tar xpvf ${PKGDIR}/${TCPD_PF}.tbz2 -C / ./$(ABI=x86 get_libdir) ./usr/$(ABI=x86 get_libdir)"
-		die
-	fi
-}
-
-src_unpack() {
-	local targets="
-		IIIMF/iiimf-client-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-gtk-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-server-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-x-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-client-lib-devel-trunk_r3104-js*.i386.tar.gz
-		IIIMF/iiimf-protocol-lib-devel-trunk_r3104-js*.i386.tar.gz
-		ATOK/atokx-20.0-*.0.0.i386.tar.gz"
-	#	IIIMF/iiimf-properties-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-docs-trunk_r3104-js*.i386.tar.gz
-	#	IIIMF/iiimf-notuse-trunk_r3104-js*.i386.tar.gz
-
-	if use amd64 ; then
-		targets="${targets}
-			IIIMF/iiimf-client-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-gtk-64-trunk_r3104-js*.x86_64.tar.gz
-			IIIMF/iiimf-protocol-lib-64-trunk_r3104-js*.x86_64.tar.gz
-			ATOK/atokx-64-20.0-*.0.0.x86_64.tar.gz"
-		#	IIIMF/iiimf-client-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-protocol-lib-devel-64-trunk_r3104-js*.x86_64.tar.gz
-		#	IIIMF/iiimf-notuse-64-trunk_r3104-js*.x86_64.tar.gz
-	fi
-
-	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
-
-	unpack ${PN}up2.tar.gz
-
-	for i in ${targets}
-	do
-		if [ -f "${S}"/atokx3up2/bin/${i} ] ; then
-			einfo "unpack" $(basename "${S}"/atokx3up2/bin/${i})
-			tar xzf "${S}"/atokx3up2/bin/${i} || die "Failed to unpack ${i}"
-		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
-			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
-			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
-		else
-			eerror "${i} not found."
-			die "${i} not found."
-		fi
-	done
-	unpack ${PN}gtk216.tar.gz
-	unpack a20y0911lx.tgz
-
-	if use amd64 ; then
-		lib32="$(ABI=x86 get_libdir)"
-		lib64="$(get_libdir)"
-		if [ "lib" != "${lib32}" ] ; then
-			mv usr/lib usr/${lib32} || die
-		fi
-		if [ "lib64" != "${lib64}" ] ; then
-			mv usr/lib64 usr/${lib64} || die
-		fi
-	fi
-}
-
-src_install() {
-	dodoc atokx3up2/README_UP2.txt
-	# atokx3up2
-	rm -rf atokx3up2
-
-	cp -dpR * "${D}" || die
-
-	# amd64 hack
-	if use amd64 ; then
-		if [ "$(ABI=x86 get_libdir)" != "$(get_libdir)" ] ; then
-			dosym /usr/$(ABI=x86 get_libdir)/iiim /usr/$(get_libdir)/iiim || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimcf.la /usr/$(get_libdir)/libiiimcf.la || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimp.la /usr/$(get_libdir)/libiiimp.la || die
-		fi
-	fi
-
-	dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
-	dohtml "${CDROM_ROOT}"/readme.html || die
-}
-
-pkg_postinst() {
-	elog
-	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
-	elog
-	elog ". /opt/atokx3/bin/atokx3start.sh"
-	elog
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
-
-pkg_postrm() {
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-}
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r5.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
index d18c476f8e82..330c51dcb530 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r5.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
@@ -1,14 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r5.ebuild,v 1.2 2010/02/11 16:19:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.1 2011/01/12 12:02:29 matsuu Exp $
 
+EAPI="3"
 inherit eutils multilib
 
+MY_UPDATE_P="${PN}up2"
+MY_UPDATE_GTK="${PN}gtk216"
+MY_ZIPCODE_P="a20y1011lx"
+
 DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
 HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
-SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${PN}up2.tar.gz
-	http://www3.justsystem.co.jp/download/atok/up/lin/${PN}gtk216.tar.gz
-	http://www3.justsystem.co.jp/download/zipcode/up/lin/a20y0911lx.tgz"
+SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+	http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+	http://www3.justsystem.co.jp/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
 
 LICENSE="ATOK MIT"
 
@@ -18,7 +23,6 @@ IUSE=""
 
 PROPERTIES="interactive"
 RESTRICT="strip mirror binchecks"
-#FEATURES="${FEATURES/multilib-strict}"
 
 RDEPEND="!app-i18n/atokx2
 	!dev-libs/libiiimcf
@@ -57,12 +61,22 @@ RDEPEND="!app-i18n/atokx2
 
 S="${WORKDIR}"
 
-pkg_setup() {
-	if has_multilib_profile ; then
-		GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+update_gtk_immodules() {
+	if use amd64 && has_multilib_profile ; then
+		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 ] ; then
+			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)/gtk.immodules"
+		fi
+		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-32 ] ; then
+			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-32 > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST x86)/gtk.immodules"
+		fi
+	else
+		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 ] ; then
+			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 > "${EPREFIX}/etc/gtk-2.0/gtk.immodules"
+		fi
 	fi
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+}
 
+pkg_setup() {
 	if ! cdrom_get_cds atokx3index ; then
 		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
 	fi
@@ -95,13 +109,12 @@ src_unpack() {
 
 	targets="${targets} ATOK/atokxup-20.0-*.0.0.i386.tar.gz"
 
-	unpack ${PN}up2.tar.gz
+	unpack ${MY_UPDATE_P}.tar.gz
 
-	for i in ${targets}
-	do
-		if [ -f "${S}"/atokx3up2/bin/${i} ] ; then
-			einfo "unpack" $(basename "${S}"/atokx3up2/bin/${i})
-			tar xzf "${S}"/atokx3up2/bin/${i} || die "Failed to unpack ${i}"
+	for i in ${targets} ; do
+		if [ -f "${S}"/${MY_UPDATE_P}/bin/${i} ] ; then
+			einfo "unpack" $(basename "${S}"/${MY_UPDATE_P}/bin/${i})
+			tar xzf "${S}"/${MY_UPDATE_P}/bin/${i} || die "Failed to unpack ${i}"
 		elif [ -f "${CDROM_ROOT}"/bin/tarball/${i} ] ; then
 			einfo "unpack" $(basename "${CDROM_ROOT}"/bin/tarball/${i})
 			tar xzf "${CDROM_ROOT}"/bin/tarball/${i} || die "Failed to unpack ${i}"
@@ -110,50 +123,78 @@ src_unpack() {
 			die "${i} not found."
 		fi
 	done
-	unpack ${PN}gtk216.tar.gz
-	unpack a20y0911lx.tgz
+	unpack ${MY_UPDATE_GTK}.tar.gz
+	unpack ${MY_ZIPCODE_P}.tgz
+}
 
+src_prepare() {
 	if use amd64 ; then
-		lib32="$(ABI=x86 get_libdir)"
-		lib64="$(get_libdir)"
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
 		if [ "lib" != "${lib32}" ] ; then
-			mv usr/lib usr/${lib32} || die
+			mv usr/lib "usr/${lib32}" || die
 		fi
 		if [ "lib64" != "${lib64}" ] ; then
-			mv usr/lib64 usr/${lib64} || die
+			mv usr/lib64 "usr/${lib64}" || die
 		fi
+		mkdir -p "usr/${lib64}/iiim/le/atokx3" || die
+		mv "usr/${lib32}/iiim/le/atokx3/64" "usr/${lib64}/iiim/le/atokx3/64" || die
+		rm "usr/${lib32}/iiim/le/atokx3/amd64" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" \
+			"usr/${lib32}/libiiimcf.la" > "usr/${lib64}/libiiimcf.la" || die
+		sed -e "s:/usr/lib:/usr/${lib64}:" \
+			"usr/${lib32}/libiiimp.la" > "usr/${lib64}/libiiimp.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimcf.la" || die
+		sed -i -e "s:/usr/lib:/usr/${lib32}:" "usr/${lib32}/libiiimp.la" || die
 	fi
 }
 
 src_install() {
-	dodoc atokx3up2/README_UP2.txt
-	# atokx3up2
-	rm -rf atokx3up2
+	dodoc "${MY_UPDATE_P}/README_UP2.txt" || die
+	rm -rf "${MY_UPDATE_P}"
 
-	cp -dpR * "${D}" || die
+	cp -dpR * "${ED}" || die
 
 	# amd64 hack
 	if use amd64 ; then
-		if [ "$(ABI=x86 get_libdir)" != "$(get_libdir)" ] ; then
-			dosym /usr/$(ABI=x86 get_libdir)/iiim /usr/$(get_libdir)/iiim || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimcf.la /usr/$(get_libdir)/libiiimcf.la || die
-			dosym /usr/$(ABI=x86 get_libdir)/libiiimp.la /usr/$(get_libdir)/libiiimp.la || die
+		local lib32="$(ABI=x86 get_libdir)"
+		local lib64="$(get_libdir)"
+		if [ "${lib32}" != "${lib64}" ] ; then
+			for f in /usr/"${lib32}"/iiim/*iiim* ; do
+				dosym "${f}" /usr/"${lib64}"/iiim/ || die
+			done
+			for f in /usr/"${lib32}"/iiim/le/atokx3/atokx3*.so ; do
+				dosym "${f}" /usr/"${lib64}"/iiim/le/atokx3/ || die
+			done
+			dosym /usr/"${lib64}"/iiim/le/atokx3/64 /usr/"${lib32}"/iiim/le/atokx3/64 || die
+			dosym /usr/"${lib64}"/iiim/le/atokx3/64 /usr/"${lib32}"/iiim/le/atokx3/amd64 || die
 		fi
 	fi
 
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-iiimf" > "${T}/iiimf.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/iiimf.conf" || die
+
 	dodoc "${CDROM_ROOT}"/doc/atok.pdf || die
 	dohtml "${CDROM_ROOT}"/readme.html || die
 }
 
+pkg_preinst() {
+	# bug #343325
+	if use amd64 && has_multilib_profile && [ -L "${EPREFIX}/usr/$(get_libdir)/iiim" ] ; then
+		rm -f "${EPREFIX}/usr/$(get_libdir)/iiim"
+	fi
+}
+
 pkg_postinst() {
 	elog
 	elog "To use ATOK for Linux, you need to add following to .xinitrc or .xprofile:"
 	elog
 	elog ". /opt/atokx3/bin/atokx3start.sh"
 	elog
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	update_gtk_immodules
 }
 
 pkg_postrm() {
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	update_gtk_immodules
 }
diff --git a/app-i18n/atokx3/files/xinput-iiimf b/app-i18n/atokx3/files/xinput-iiimf
new file mode 100644
index 000000000000..2131b29b9533
--- /dev/null
+++ b/app-i18n/atokx3/files/xinput-iiimf
@@ -0,0 +1,11 @@
+XIM=iiimx
+XIM_PROGRAM=@EPREFIX@/usr/bin/iiimx
+XIM_ARGS=-iiimd
+GTK_IM_MODULE=iiim
+QT_IM_MODULE=xim
+
+export HTT_DISABLE_STATUS_WINDOW=t
+export HTT_GENERATES_KANAKEY=t
+export HTT_USES_LINUX_XKEYSYM=t
+export HTT_IGNORES_LOCK_MASK=t
+export JS_FEEDBACK_CONVERT=t