Replaced zipcode tarball. Fixed dependency. Fixed gtk.immodules, bug 366889.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x05280D69

3 files changed, 217 insertions, 4 deletions

diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index 3be8f66be4cb..feddc2d25c11 100644
--- a/app-i18n/atokx3/ChangeLog
+++ b/app-i18n/atokx3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/atokx3
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.14 2012/01/26 21:47:04 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.15 2013/02/13 10:19:11 matsuu Exp $
+
+*atokx3-3.0.0-r8 (12 Feb 2013)
+
+  12 Feb 2013; MATSUU Takuto <matsuu@gentoo.org> +atokx3-3.0.0-r8.ebuild:
+  Replaced zipcode tarball. Fixed dependency. Fixed gtk.immodules, bug 366889.
 
   26 Jan 2012; Ulrich Müller <ulm@gentoo.org> atokx3-3.0.0-r6.ebuild,
   atokx3-3.0.0-r7.ebuild:
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index b3d01fc93612..3b009ede5d2b 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -1,9 +1,11 @@
 AUX xinput-iiimf 257 SHA256 0b0f3cc4afed265d420d8ad430950f66db051231447467e607ed57aebaa7b4a1 SHA512 f586e0c09a77565efc15040ba6756e719c2c40af7752d351d193bebce7fcb8460cf8af7b4b3125a8a88aab33ba83d631779a8c6a5d2bab113bac6c41e5fb496b WHIRLPOOL 878af57e19bd0863a771ab1a21be394f78d5e4425f2166d83f01d1cd6bbecd91a0dcf09245a34c65f4bb9fca82b9ec98587cfc49c8cc7657be0c356c9561ddf7
-DIST a20y1006lx.tgz 8365634 RMD160 9b07ea828102fad0104019d563cae8dfc9da5e70 SHA1 d29b8bcf4197b3cef697ae89bcd246b816b8ba88 SHA256 3768a40facbe327a4342c3696d3d793f087086c01402a66ed5130600f96035c6
+DIST a20y1006lx.tgz 8365634 SHA256 3768a40facbe327a4342c3696d3d793f087086c01402a66ed5130600f96035c6
 DIST a20y1011lx.tgz 8369537 SHA256 d4ee3643c78bf98bcac6778beccd82a4f6f92860d0d903aae96292637bf9d097 SHA512 6ea62f7c183898f58b2bcf1183914f13f7bffe407494b8bd1ba1ceda645b73c9991ed62b4179dd101cc509bf44c4a1dca353cdf14ab932d38e6af29ba00acb7a WHIRLPOOL b6dcd6b150878f612f37a1e67f0f24a160d881c9391393786540dd3ed6375b9b95efca7c2adf6119513e90c9a205ea1c01c756f1238d52f5e0128404690ba47e
+DIST a20y1211lx.tgz 8471799 SHA256 a6ba278102c3d00363285f0be5d64c6bb35f5a5c10a845cb67bcd70cbc58e57d SHA512 339cecc25089c6c2fe6a31ce34e6c77d38cab3b55596cf9f485189adec7365051d3f236475d72f01b14d0176e6410a2ca6eb6d854498421e3fff006a54d51595 WHIRLPOOL 1e213c4632a2964f9c3622c25f1fa7e680064cf64c118c0bf50ad89278066ea8d9b1be5b15deda2b853e05bdcdabbb8b367e7e02a45a5e7d6a39eaa8083ef192
 DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
 DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
 EBUILD atokx3-3.0.0-r6.ebuild 5078 SHA256 85c2f0d2c6b278a8e3b31a921afe9349d945830fa0d3723bf9d0c04d8c7f4ddd SHA512 6c893cb8726b0e31da9f1eb01b544046d9b53915122812d4f6fbb095eec9c47c8c1b71a73685278011e0d4b89d39c42ed6e1f95744187d5c1f685307fbc284c2 WHIRLPOOL 21e6df05017048fd037eac23f85fc2164e5cfbddc919cfecf4933e7c6b4a55ceba8495d8f4dff947b013ff145ddecb4e27546c89daf8bbb80f6887d3820a9b4a
 EBUILD atokx3-3.0.0-r7.ebuild 6074 SHA256 0b1e9ad76bdd5eb69b332e5d7277284ce3bad11f397c898ede85f4edac2ca0e0 SHA512 229389c8b48f4b38c841037647c80f823824a2a222a2004beff6e5268efb7f650e2419ceda0c95bb149442dc7a56f2fa8130bb8b02cdcd9ca2909747c08f8302 WHIRLPOOL dcfee27d49eb04ca81788377d50db8607eff8b1e090dffec8386550c046f4182f1061673462ab425721f2def00b97bf1266a2a372e0cbb2d8982cb0e3821c182
-MISC ChangeLog 2563 SHA256 b617ad4f52fe88612815139ec54e5a2cd900e43da36ca7d33148205ccf5ae36c SHA512 b64770456e853647ce3a64725f4dfc46c588037129fa6f36c8ef2da8837f2f0bbaa933e4b68219d0ce8f79a1de782210f1d49d752b7bea8c2d8ffec7981669b8 WHIRLPOOL c62c02463c790a784fa9d94bea0d389b860a4dc2fb236142d9bbe7311645ba5aac2ddce969bbac19d21ae64b9865161d46b72d56fb976159846466923904bb5a
+EBUILD atokx3-3.0.0-r8.ebuild 6157 SHA256 51eb24bd24e4c771c4686abbe6ea77a77ff80b2072439072b5384e6865742609 SHA512 4aa325584d8bcf3e755119599fd0c1dcee0920168f3fb2b82f781937badc71e08aef41e9d3571ec762975dc8c495e45f38db2892d408eeff138c4f6a4f610bf6 WHIRLPOOL 46848c16d377ccc83a6a833c33c619a61c55d41b5473cb238162cc85cd2848cb74aeef7186baf025e84b25e7e745ed9abf7b940d85268918e9f2e1e6617ae67f
+MISC ChangeLog 2752 SHA256 a82315359889f6bf2a548b84b6b3932c5f7db93a5277106db9fed263be4f1219 SHA512 d60fa13c8e43f5d57753c104ab48c8b3e5a0127d30de68b40164c142d1402d395c7a5b0cc11396e1eed00943be0169dcfe1ccda1fdb70896d33e1def2130b5e3 WHIRLPOOL 273fa71031c893941fd315e78b3a850e809a3957bb6b0a48647334a04836621a5c68e14d4cdff813081d15dc68ad7bcdc8d9611883607329d04e79581eebde6c
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
new file mode 100644
index 000000000000..f55c79c30f63
--- /dev/null
+++ b/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2013 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-r8.ebuild,v 1.1 2013/02/13 10:19:11 matsuu Exp $
+
+EAPI="3"
+
+inherit cdrom eutils multilib
+
+MY_UPDATE_P="${PN}up2"
+MY_UPDATE_GTK="${PN}gtk216"
+MY_ZIPCODE_P="a20y1211lx"
+
+DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine"
+HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/"
+SRC_URI="http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_P}.tar.gz
+	http://www3.justsystem.co.jp/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz
+	http://www3.justsystem.co.jp/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz"
+
+LICENSE="ATOK MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="multilib"
+
+RESTRICT="strip mirror binchecks"
+
+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:2
+	dev-libs/libxml2:2
+	media-libs/fontconfig
+	media-libs/libpng
+	sys-apps/tcp-wrappers
+	virtual/pam
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.4.13:2
+	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/pangox-compat
+	multilib? (
+		>=app-emulation/emul-linux-x86-baselibs-20091226
+		app-emulation/emul-linux-x86-gtklibs
+		app-emulation/emul-linux-x86-xlibs
+	)"
+
+EMULTILIB_PKG="true"
+
+S="${WORKDIR}"
+
+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
+
+	if use amd64 && has_multilib_profile ; then
+		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
+	fi
+}
+
+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
+}
+
+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 ${MY_UPDATE_P}.tar.gz
+
+	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}"
+		else
+			eerror "${i} not found."
+			die "${i} not found."
+		fi
+	done
+	unpack ${MY_UPDATE_GTK}.tar.gz
+	unpack ${MY_ZIPCODE_P}.tgz
+}
+
+src_prepare() {
+	if use amd64 ; then
+		local lib32="$(ABI=x86 get_libdir)"
+		local 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
+		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 "${MY_UPDATE_P}/README_UP2.txt" || die
+	rm -rf "${MY_UPDATE_P}"
+
+	cp -dpR * "${ED}" || die
+
+	# amd64 hack
+	if use amd64 ; then
+		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
+	update_gtk_immodules
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+}