Added ext-iiimf USE flag to use the system IIIMF instead of bundled version. Marked 17.0 stable.

Package-Manager: portage-2.0.51.19

5 files changed, 118 insertions, 6 deletions

diff --git a/app-i18n/atokx2/ChangeLog b/app-i18n/atokx2/ChangeLog
index c8a2ee2be14d..0ecc646ae3f7 100644
--- a/app-i18n/atokx2/ChangeLog
+++ b/app-i18n/atokx2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/atokx2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/ChangeLog,v 1.1 2005/02/10 11:54:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/ChangeLog,v 1.2 2005/04/05 14:00:58 usata Exp $
+
+*atokx2-17.0-r1 (05 Apr 2005)
+
+  05 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> atokx2-17.0.ebuild,
+  +atokx2-17.0-r1.ebuild:
+  Added ext-iiimf USE flag to use the system IIIMF instead of bundled version.
+  Marked 17.0 stable.
 
 *atokx2-17.0 (10 Feb 2005)
 
diff --git a/app-i18n/atokx2/Manifest b/app-i18n/atokx2/Manifest
index 9058f2f3c136..897b0731ed05 100644
--- a/app-i18n/atokx2/Manifest
+++ b/app-i18n/atokx2/Manifest
@@ -1,7 +1,9 @@
-MD5 023fb3ace4fdd27b4a75894f70ffe117 atokx2-17.0.ebuild 2335
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 30fc28fb219c8ab8c71f78e185880f6a ChangeLog 397
+MD5 5c2c77799149cb87a78c3b3c0c029873 ChangeLog 625
+MD5 dcf1a68d5951270300e165941d2f8025 atokx2-17.0-r1.ebuild 2621
+MD5 39bd54bb15c3f9329dccac3617ae86f9 atokx2-17.0.ebuild 2337
 MD5 54e6bb5d7cd0c16a3d3b8de59a4d1bd1 files/atokx2.initd 504
 MD5 df456cffb84006bf140b6b3ddd71aa75 files/iiim.initd 471
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-atokx2-17.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-atokx2-17.0-r1 0
 MD5 4bef8b03876dc0db3946de6c73aa755e files/iiim.confd 353
diff --git a/app-i18n/atokx2/atokx2-17.0-r1.ebuild b/app-i18n/atokx2/atokx2-17.0-r1.ebuild
new file mode 100644
index 000000000000..4dda6f676578
--- /dev/null
+++ b/app-i18n/atokx2/atokx2-17.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0-r1.ebuild,v 1.1 2005/04/05 14:00:58 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="ATOK for Linux - The most famous Japanese Input Method Engine"
+HOMEPAGE="http://www.justsystem.co.jp/linux/atok.html"
+IIIMF_V="trunk_r2059-js1"
+SRC_URI=""
+
+LICENSE="ATOK X11"
+
+SLOT="0"
+KEYWORDS="-* ~x86"
+IUSE="ext-iiimf"
+
+RESTRICT="nostrip"
+
+DEPEND=">=x11-libs/gtk+-2.2
+	ext-iiimf?
+	(
+		>=dev-libs/libiiimcf-12.1
+		>=dev-libs/csconv-12.1
+		>=app-i18n/iiimgcf-12.1
+		>=dev-libs/libiiimp-12.1
+		>=app-i18n/iiimsf-12.1
+		>=app-i18n/iiimxcf-12.1
+	)
+	!ext-iiimf?
+	(
+		!dev-libs/libiiimcf
+		!dev-libs/csconv
+		!app-i18n/iiimgcf
+		!dev-libs/libiiimp
+		!app-i18n/iiimsf
+		!app-i18n/iiimxcf
+	)"
+
+src_unpack() {
+	cdrom_get_cds doc/license.html || die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK for Linux."
+}
+
+src_install() {
+	cd ${D}
+
+	if ! use ext-iiimf ; then
+		local iiimgcf
+		if has_version '>=x11-libs/gtk+-2.4' ; then
+			iiimgcf=iiimf-gtk24-${IIIMF_V}.i386.tar.gz
+		else
+			iiimgcf=iiimf-gtk22-${IIIMF_V}.i386.tar.gz
+		fi
+
+		for i in ${iiimgcf} \
+			iiimf-client-lib-${IIIMF_V}.i386.tar.gz \
+			iiimf-csconv-${IIIMF_V}.i386.tar.gz \
+			iiimf-protocol-lib-${IIIMF_V}.i386.tar.gz \
+			iiimf-rc-${IIIMF_V}.i386.tar.gz \
+			iiimf-server-${IIIMF_V}.i386.tar.gz \
+			iiimf-x-${IIIMF_V}.i386.tar.gz
+		do
+			echo ${CDROM_ROOT}
+			tar xzf ${CDROM_ROOT}/bin/IIIMF/${i} \
+			|| die "Failed to unpack ${i}"
+		done
+
+		# /etc files
+		newinitd ${FILESDIR}/iiim.initd iiim || die
+		newconfd ${FILESDIR}/iiim.confd iiim || die
+	fi
+
+	tar xzf ${CDROM_ROOT}/bin/ATOK/atokx-${PV}-2.0.i386.tar.gz || die "Failed to unpack atokx-${PV}-2.0.i386.tar.gz"
+
+	newinitd ${FILESDIR}/atokx2.initd atokx2 || die
+
+	dohtml -r ${CDROM_ROOT}/doc/* || die
+	insinto /usr/share/doc/${PF}
+	doins ${CDROM_ROOT}/{install_guide.pdf,doc/ATOK/atok.pdf} || 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() {
+	einfo
+	einfo "To use ATOK for Linux, you need to add atokx2 and iiim to"
+	einfo "the default runlevel:"
+	einfo "# /sbin/rc-update add atokx2 default"
+	einfo "# /sbin/rc-update add iiim default"
+	einfo "Also, call /opt/atokx2/bin/atokx2_client.sh from appropriate file."
+	einfo
+	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/atokx2/atokx2-17.0.ebuild b/app-i18n/atokx2/atokx2-17.0.ebuild
index a75fb9d88410..10abd639f72c 100644
--- a/app-i18n/atokx2/atokx2-17.0.ebuild
+++ b/app-i18n/atokx2/atokx2-17.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.1 2005/02/10 11:54:47 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx2/atokx2-17.0.ebuild,v 1.2 2005/04/05 14:00:58 usata Exp $
 
 inherit eutils
 
@@ -12,14 +12,14 @@ SRC_URI=""
 LICENSE="ATOK X11"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-* x86"
 IUSE=""
 
 RESTRICT="nostrip"
 
 DEPEND=">=x11-libs/gtk+-2.2
 	!dev-libs/libiiimcf
-	!app-text/csconv
+	!dev-libs/csconv
 	!app-i18n/iiimgcf
 	!dev-libs/libiiimp
 	!app-i18n/iiimsf
diff --git a/app-i18n/atokx2/files/digest-atokx2-17.0-r1 b/app-i18n/atokx2/files/digest-atokx2-17.0-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-i18n/atokx2/files/digest-atokx2-17.0-r1