9 files changed, 18 insertions, 146 deletions
diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index 0f6a463a7bd2..e3259a0bcb9c 100644
--- a/app-i18n/im-ja/ChangeLog
+++ b/app-i18n/im-ja/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/im-ja
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.13 2004/01/11 12:49:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.14 2004/03/04 19:21:50 usata Exp $
+
+  05 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.6.ebuild,
+  im-ja-0.7_p2.ebuild, im-ja-0.8.ebuild, im-ja-0.9-r1.ebuild, im-ja-0.9.ebuild:
+  Marked stable for x86. Removed old ebuilds.
 
 *im-ja-0.9-r1 (11 Jan 2004)
 
diff --git a/app-i18n/im-ja/Manifest b/app-i18n/im-ja/Manifest
index e19b20a6b66f..5b4b3a6b618e 100644
--- a/app-i18n/im-ja/Manifest
+++ b/app-i18n/im-ja/Manifest
@@ -1,14 +1,10 @@
-MD5 52b0f4b0c501f7a0d7695b4d2b721314 im-ja-0.9-r1.ebuild 1799
-MD5 4456b3fa972f81e7c9c776ab991530c4 im-ja-0.8.ebuild 1285
-MD5 481b8e51272ff74476353632e2100fd7 im-ja-0.7_p2.ebuild 1262
-MD5 a127bd95344756d720f91f97ed1fb987 im-ja-0.9.ebuild 1710
-MD5 d0cfe566d81b4a86332f2887ffc679d5 ChangeLog 2292
+MD5 b43c4c261140098f77e60063aaa339c1 im-ja-0.8.ebuild 1239
+MD5 89f2583dbbb08ba49358ac648d76be5d im-ja-0.9.ebuild 1710
+MD5 b942683704e57b38cceaf19cee9e72b9 ChangeLog 2486
 MD5 e6a4d014e5f606f6a37e9d2e6906a988 metadata.xml 605
-MD5 475bf8e566d1f6b647d0afd9ee4903cd im-ja-0.6.ebuild 1714
-MD5 f5fcbcecfe2f5d739d30e25f60f20c9f files/digest-im-ja-0.9-r1 61
-MD5 6f3230b84289fc2f9a9a255f604f324b files/digest-im-ja-0.7_p2 63
+MD5 ccf6a3e19c71283cbe2d85420192ab94 im-ja-0.9-r1.ebuild 1799
 MD5 131326130e94a82f0581cd5ed17c7160 files/im-ja-0.6-gentoo.diff 290
-MD5 0d70fbe4f0f67a7a474c20b9f047c60b files/digest-im-ja-0.6 61
 MD5 1a5a47abfb65885d8a267ee51b76bb91 files/digest-im-ja-0.8 61
 MD5 f5fcbcecfe2f5d739d30e25f60f20c9f files/digest-im-ja-0.9 61
 MD5 8610fb143f74a3c34b8b9c76789c786a files/im-ja-0.9-canna-3.7-gentoo.diff 350
+MD5 f5fcbcecfe2f5d739d30e25f60f20c9f files/digest-im-ja-0.9-r1 61
diff --git a/app-i18n/im-ja/files/digest-im-ja-0.6 b/app-i18n/im-ja/files/digest-im-ja-0.6
deleted file mode 100644
index 94218d082ba0..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aeb6e5454587fd7e7a3f41629d26b914 im-ja-0.6.tar.gz 385248
diff --git a/app-i18n/im-ja/files/digest-im-ja-0.7_p2 b/app-i18n/im-ja/files/digest-im-ja-0.7_p2
deleted file mode 100644
index 3941e325b479..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-0.7_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b443120d1b61dc43d7553a13470365ff im-ja-0.7-2.tar.gz 436137
diff --git a/app-i18n/im-ja/im-ja-0.6.ebuild b/app-i18n/im-ja/im-ja-0.6.ebuild
deleted file mode 100644
index 7737ea6be4b0..000000000000
--- a/app-i18n/im-ja/im-ja-0.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.6.ebuild,v 1.3 2003/09/05 02:52:23 usata Exp $
-
-inherit eutils
-
-DESCRIPTION="A Japanese input module for GTK2"
-HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz
-	${HOMEPAGE}old/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc"
-SLOT=0
-
-IUSE="canna freewnn"
-
-DEPEND="virtual/glibc
-	>=dev-libs/glib-2.2.1
-	>=dev-libs/atk-1.2.2
-	>=x11-libs/gtk+-2.2.1
-	>=x11-libs/pango-1.2.1
-	>=gnome-base/gconf-2.2
-	freewnn? ( app-i18n/freewnn )
-	canna? ( app-i18n/canna )"
-
-GCONFDIR=$(gconftool-2 --get-default-source | sed -e "s|^xml::/|${D}|")
-
-src_unpack() {
-
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-
-	cd ${S}/data
-	# work around
-	sed -i -e "s:\(GCONF_CONFIG_SOURCE=\)\$(GCONF_CONFIG_SOURCE):\1\$(GCONF_SCHEMA_CONFIG_SOURCE):" Makefile.in
-}
-
-src_compile() {
-
-	local myconf
-
-	if [ -n "`use canna`" ] ; then
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/canna"
-	else
-		myconf="${myconf} --disable-canna"
-	fi
-	if [ -n "`use freewnn`" ] ; then
-		export CPPFLAGS="${CPPFLAGS} -I/usr/include/wnn"
-	else
-		myconf="${myconf} --disable-wnn"
-	fi
-
-	econf --with-gconf-source=xml::${GCONFDIR} \
-		${myconf} || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install () {
-
-	einstall || die
-
-	# /etc/gconf should be world readable
-	find ${GCONFDIR} -type d | xargs chmod -R +rx
-	find ${GCONFDIR} -type f | xargs chmod -R +r
-
-	dodoc AUTHORS README ChangeLog TODO NEWS
-}
-
-pkg_postinst(){
-
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm(){
-
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
diff --git a/app-i18n/im-ja/im-ja-0.7_p2.ebuild b/app-i18n/im-ja/im-ja-0.7_p2.ebuild
deleted file mode 100644
index 77718b3d621a..000000000000
--- a/app-i18n/im-ja/im-ja-0.7_p2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.7_p2.ebuild,v 1.3 2003/12/13 15:26:07 usata Exp $
-
-inherit base gnome2
-
-DESCRIPTION="A Japanese input module for GTK2"
-HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="${HOMEPAGE}${P/_p/-}.tar.gz
-	${HOMEPAGE}old/${P/_p/-}.tar.gz"
-PATCHES1=${FILESDIR}/${PN}-0.6-gentoo.diff
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-SLOT=0
-IUSE="gnome canna freewnn"
-S=${WORKDIR}/${P/_p*}
-
-DOCS="AUTHORS COPYING README ChangeLog TODO"
-
-DEPEND="virtual/glibc
-		>=dev-libs/glib-2.2.1
-		>=dev-libs/atk-1.2.2
-		>=x11-libs/gtk+-2.2.1
-		>=x11-libs/pango-1.2.1
-		>=gnome-base/gconf-2.2
-		>=gnome-base/libglade-2.0
-		gnome? ( >=gnome-base/gnome-panel-2.0 )
-		freewnn? ( app-i18n/freewnn )
-		canna? ( app-i18n/canna )"
-
-src_compile() {
-	local myconf
-	use gnome || myconf="$myconf --disable-gnome"
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	gnome2_src_compile $myconf
-}
-
-pkg_postinst(){
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	gnome2_pkg_postinst
-}
-
-pkg_postrm(){
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	gnome2_pkg_postrm
-}
diff --git a/app-i18n/im-ja/im-ja-0.8.ebuild b/app-i18n/im-ja/im-ja-0.8.ebuild
index 155a755c94ea..f1e387dfce8d 100644
--- a/app-i18n/im-ja/im-ja-0.8.ebuild
+++ b/app-i18n/im-ja/im-ja-0.8.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.8.ebuild,v 1.5 2004/02/29 16:55:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.8.ebuild,v 1.6 2004/03/04 19:21:50 usata Exp $
 
 inherit base gnome2
 
 DESCRIPTION="A Japanese input module for GTK2"
 HOMEPAGE="http://im-ja.sourceforge.net/"
-SRC_URI="http://im-ja.sourceforge.net/${P/_p/-}.tar.gz
-	http://im-ja.sourceforge.net/old/${P/_p/-}.tar.gz"
+SRC_URI="http://im-ja.sourceforge.net/old/${P/_p/-}.tar.gz"
 PATCHES1=${FILESDIR}/${PN}-0.6-gentoo.diff
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
diff --git a/app-i18n/im-ja/im-ja-0.9-r1.ebuild b/app-i18n/im-ja/im-ja-0.9-r1.ebuild
index d09fcc8d1749..8b6ca6c1824b 100644
--- a/app-i18n/im-ja/im-ja-0.9-r1.ebuild
+++ b/app-i18n/im-ja/im-ja-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9-r1.ebuild,v 1.2 2004/02/29 16:55:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9-r1.ebuild,v 1.3 2004/03/04 19:21:50 usata Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 	http://im-ja.sourceforge.net/old/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 SLOT="0"
 
 S=${WORKDIR}/${P}
diff --git a/app-i18n/im-ja/im-ja-0.9.ebuild b/app-i18n/im-ja/im-ja-0.9.ebuild
index 06d53fde5a55..4415262d1230 100644
--- a/app-i18n/im-ja/im-ja-0.9.ebuild
+++ b/app-i18n/im-ja/im-ja-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9.ebuild,v 1.3 2004/02/29 16:55:52 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.9.ebuild,v 1.4 2004/03/04 19:21:50 usata Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://im-ja.sourceforge.net/"
 SRC_URI="http://im-ja.sourceforge.net/${P}.tar.gz
 	http://im-ja.sourceforge.net/old/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 SLOT="0"
 IUSE="gnome canna freewnn"