Fixed dependency, bug #261250.

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

3 files changed, 172 insertions, 2 deletions

diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index e40d45b7e46b..32ee542b1b93 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.5 2009/03/04 17:56:51 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.6 2009/03/09 17:02:49 matsuu Exp $
+
+*atokx3-3.0.0-r2 (09 Mar 2009)
+
+  09 Mar 2009; MATSUU Takuto <matsuu@gentoo.org> +atokx3-3.0.0-r2.ebuild:
+  Fixed dependency, bug #261250.
 
 *atokx3-3.0.0-r1 (04 Mar 2009)
 
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index 796f19353beb..e1539c83529e 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -3,6 +3,7 @@ DIST atokx3up2.tar.gz 8427265 RMD160 9420645a25a53d9023a2350d2c5169a60c508209 SH
 EBUILD atokx3-1.0.0.ebuild 3588 RMD160 276a04fde8a486313cbe775f4fb73fd14889d8f7 SHA1 bdbd118e496f88ff1c847d63b24faffa5846b0c1 SHA256 60812216024d059ffa8194dc170a9ffa3e79dd719d7413d8e12f0954a56a1e58
 EBUILD atokx3-2.0.0.ebuild 3862 RMD160 82e188918c42c16f1bcc3bb29ae07b5d124fe441 SHA1 150f72ac33514ddc2b791598dc0ec52ff6aacc1b SHA256 e6635182548ae10124be7465534ea14a8f9c663a15f8fef9ec3d8f0265d25730
 EBUILD atokx3-3.0.0-r1.ebuild 4606 RMD160 3a03382c21f93bd4e5d16d93eacceb4908899850 SHA1 bae08ca10eb7b55e01b0f0eca561c5cb8e071243 SHA256 79f392369ef82846334c149a041bb1b9b40568fa6f82ea48c60560887c437502
+EBUILD atokx3-3.0.0-r2.ebuild 4643 RMD160 39248f4ba988f2df7fccbc54c1710e10bee9c6e5 SHA1 7209e8050639dcb9b54c88ba2af14cf372ee77a9 SHA256 d22655a66e79e3f21ce22b5015c8aff9436778e2d436640bcca7914a3db0e4e6
 EBUILD atokx3-3.0.0.ebuild 4431 RMD160 91531f52daa5e18a441404a96804c03addbf9b27 SHA1 635e10328f60781d212e67572d4fba078691f963 SHA256 cd008ec071c55f002e80989bf8cfd1a4603a0950f8f00c4b919eb092b25c6c30
-MISC ChangeLog 859 RMD160 00bec9752b7ddbf4757375311e0e103e081e2cbc SHA1 16fedcacde1384e6f7a7182a056b0099930a6c29 SHA256 a32a3ed98c6427ce01f63bbec6f20047cf6b0f26c0928248969541c50d194b52
+MISC ChangeLog 999 RMD160 f2859169c7587ae12dabeda7a9421af3225b383f SHA1 560280f1c3250980fe3804ff7b8d24c6789bb2eb SHA256 a9f76fba37d7df7ed93cbb228696cea5ae953a9d0735147b0be1c8995e49955a
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild
new file mode 100644
index 000000000000..b3e3838cb8d0
--- /dev/null
+++ b/app-i18n/atokx3/atokx3-3.0.0-r2.ebuild
@@ -0,0 +1,164 @@
+# 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-r2.ebuild,v 1.1 2009/03/09 17:02:49 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"
+
+LICENSE="ATOK X11"
+
+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"
+}