Fixed installation issue on amd64. Added new postal code dictionaries.

Package-Manager: portage-2.1.7.5/cvs/Linux x86_64

3 files changed, 177 insertions, 2 deletions

diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index ab47dab62fdb..abb8d1ce4837 100644
--- a/app-i18n/atokx3/ChangeLog
+++ b/app-i18n/atokx3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/atokx3
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.7 2009/06/04 16:07:25 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.8 2009/11/24 14:46:46 matsuu Exp $
+
+*atokx3-3.0.0-r4 (24 Nov 2009)
+
+  24 Nov 2009; MATSUU Takuto <matsuu@gentoo.org> +atokx3-3.0.0-r4.ebuild:
+  Fixed installation issue on amd64. Added new postal code dictionaries.
 
 *atokx3-3.0.0-r3 (04 Jun 2009)
 
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index a4b6b8c754fa..36a16aa257cc 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -1,6 +1,8 @@
+DIST a20y0911lx.tgz 8362422 RMD160 63459ccc7b7f413179fe17c9ca91c0c434e39024 SHA1 84d86ed92b2bd6b236c7a86d05d6a5276d3475dc SHA256 36e8f8f2374053b097680476a5891850eace47563e7bdaf7f18f786b3d70240c
 DIST atokx3gtk216.tar.gz 69246 RMD160 a40e50a7c4be478b2eab6dd3b286355fdf85cc12 SHA1 378514fc67fb4f74f0e4f8b46802f32b878f8d60 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2
 DIST atokx3up2.tar.gz 8427265 RMD160 9420645a25a53d9023a2350d2c5169a60c508209 SHA1 717a25d4829e934f710c907ebb2037bcdc7235cf SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e
 EBUILD atokx3-3.0.0-r2.ebuild 4643 RMD160 39248f4ba988f2df7fccbc54c1710e10bee9c6e5 SHA1 7209e8050639dcb9b54c88ba2af14cf372ee77a9 SHA256 d22655a66e79e3f21ce22b5015c8aff9436778e2d436640bcca7914a3db0e4e6
 EBUILD atokx3-3.0.0-r3.ebuild 4751 RMD160 30d5847d24791fde8335c30cd8869010fefe646e SHA1 522a0057ef0b4cb1331e58fd977999e60dddf6a6 SHA256 20e0d699979efa464885a506924415645fbbc087423328623f8e06f35d2fb24a
-MISC ChangeLog 1260 RMD160 dd4976dd16a96e98754141f5f25031eac3aac898 SHA1 b77f7b1ce762d831c501d5f45b2a6b6c506667ba SHA256 6b7b6c3cff17f4db2f9bf53deb6cb3987f890a9933a807fe5a5be0d9eb248471
+EBUILD atokx3-3.0.0-r4.ebuild 5004 RMD160 384d15a6bdc22f5979129d03b3f646597dded531 SHA1 6097e848c4eb29bc397c3755c235e1a03c96ef04 SHA256 cab9c232d54a9c2313a43db205c48f9765db68264a203f92f49c45b434d5b454
+MISC ChangeLog 1440 RMD160 4167b7b3063e7293cd910df2d78bd0bad0168b5b SHA1 ff08f5c9dece785120366bf10bafeee9fd6ce767 SHA256 8bbd4b456979d7c2f421c66bc68abe0509f9ab7400fd626bfaef70a734a04115
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild
new file mode 100644
index 000000000000..9e9ba658e007
--- /dev/null
+++ b/app-i18n/atokx3/atokx3-3.0.0-r4.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2009 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.1 2009/11/24 14:46:46 matsuu 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 X11"
+
+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"
+}