Stable on x86. Don't assign default to S. Removed old ebuilds.

7 files changed, 9 insertions, 146 deletions

diff --git a/app-i18n/im-ja/ChangeLog b/app-i18n/im-ja/ChangeLog
index ae0dc17ead21..116b1e218ea0 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.19 2004/04/04 15:17:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/ChangeLog,v 1.20 2004/05/05 08:44:58 usata Exp $
+
+  05 May 2004; Mamoru KOMACHI <usata@gentoo.org> im-ja-0.8.ebuild,
+  im-ja-0.9.ebuild, im-ja-1.0-r1.ebuild, im-ja-1.0-r2.ebuild:
+  Stable on x86. Don't assign default to S. Removed old ebuilds.
 
 *im-ja-1.0-r2 (05 Apr 2004)
 
diff --git a/app-i18n/im-ja/files/digest-im-ja-0.9 b/app-i18n/im-ja/files/digest-im-ja-0.9
deleted file mode 100644
index c4b327706e2a..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-0.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bde9e0d85b39591d132c700d5d87047 im-ja-0.9.tar.gz 717708
diff --git a/app-i18n/im-ja/files/digest-im-ja-1.0-r1 b/app-i18n/im-ja/files/digest-im-ja-1.0-r1
deleted file mode 100644
index 66d5a0beab8c..000000000000
--- a/app-i18n/im-ja/files/digest-im-ja-1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0adc0e09db96ba416ce6ce72a77680e6 im-ja-1.0.tar.gz 663614
diff --git a/app-i18n/im-ja/im-ja-0.8.ebuild b/app-i18n/im-ja/im-ja-0.8.ebuild
index f1e387dfce8d..7fa687940509 100644
--- a/app-i18n/im-ja/im-ja-0.8.ebuild
+++ b/app-i18n/im-ja/im-ja-0.8.ebuild
@@ -1,18 +1,16 @@
 # 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.6 2004/03/04 19:21:50 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-0.8.ebuild,v 1.7 2004/05/05 08:44:58 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/old/${P/_p/-}.tar.gz"
-PATCHES1=${FILESDIR}/${PN}-0.6-gentoo.diff
+SRC_URI="http://im-ja.sourceforge.net/old/${P}.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc"
 SLOT=0
 IUSE="gnome canna freewnn"
-S=${WORKDIR}/${P/_p*}
 
 DOCS="AUTHORS COPYING README ChangeLog TODO"
 
diff --git a/app-i18n/im-ja/im-ja-0.9.ebuild b/app-i18n/im-ja/im-ja-0.9.ebuild
deleted file mode 100644
index bed93e97f30b..000000000000
--- a/app-i18n/im-ja/im-ja-0.9.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.5 2004/04/06 03:53:42 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="A Japanese input module for GTK2 and XIM"
-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"
-SLOT="0"
-IUSE="gnome canna freewnn"
-
-S=${WORKDIR}/${P}
-
-DOCS="AUTHORS README ChangeLog TODO"
-
-DEPEND="dev-lang/perl
-	dev-perl/URI
-	${RDEPEND}"
-RDEPEND="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_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-canna-3.7-gentoo.diff
-}
-
-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
-	einfo
-	einfo "This version of im-ja comes with experimental XIM support."
-	einfo "If you'd like to try it out, run im-ja-xim-server and set"
-	einfo "environment variable XMODIFIERS to @im=im-ja-xim-server"
-	einfo "e.g.)"
-	einfo "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
-	einfo "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-	einfo
-}
-
-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-1.0-r1.ebuild b/app-i18n/im-ja/im-ja-1.0-r1.ebuild
deleted file mode 100644
index 6a782db03220..000000000000
--- a/app-i18n/im-ja/im-ja-1.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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-1.0-r1.ebuild,v 1.2 2004/04/01 12:47:04 dholm Exp $
-
-inherit gnome2
-
-IUSE="gnome canna freewnn skk anthy debug"
-
-DESCRIPTION="A Japanese input module for GTK2 and XIM"
-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 ~ppc"
-SLOT="0"
-
-S=${WORKDIR}/${P}
-
-DOCS="AUTHORS README ChangeLog TODO"
-
-DEPEND="dev-lang/perl
-	dev-perl/URI
-	${RDEPEND}"
-RDEPEND="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 )
-	skk? ( virtual/skkserv )
-	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )"
-
-use debug && RESTRICT="nostrip"
-
-src_compile() {
-	local myconf
-	# You cannot use `use_enable ...` here. im-ja's configure script
-	# doesn't distinguish --enable-canna from --disable-canna, so
-	# --enable-canna stands for --disable-canna in the script ;-(
-	use gnome || myconf="$myconf --disable-gnome"
-	use canna || myconf="$myconf --disable-canna"
-	use freewnn || myconf="$myconf --disable-wnn"
-	use anthy || myconf="$myconf --disable-anthy"
-	use skk || myconf="$myconf --disable-skk"
-	use debug && myconf="$myconf --enable-debug"
-	gnome2_src_compile --enable-xim $myconf || die
-}
-
-pkg_postinst(){
-	gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	gnome2_pkg_postinst
-	einfo
-	einfo "This version of im-ja comes with experimental XIM support."
-	einfo "If you'd like to try it out, run im-ja-xim-server and set"
-	einfo "environment variable XMODIFIERS to @im=im-ja-xim-server"
-	einfo "e.g.)"
-	einfo "\t$ export XMODIFIERS=@im=im-ja-xim-server (sh)"
-	einfo "\t> setenv XMODIFIERS @im=im-ja-xim-server (csh)"
-	einfo
-}
-
-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-1.0-r2.ebuild b/app-i18n/im-ja/im-ja-1.0-r2.ebuild
index b89c2674d15d..9a0f1d942a66 100644
--- a/app-i18n/im-ja/im-ja-1.0-r2.ebuild
+++ b/app-i18n/im-ja/im-ja-1.0-r2.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-1.0-r2.ebuild,v 1.1 2004/04/04 15:17:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/im-ja/im-ja-1.0-r2.ebuild,v 1.2 2004/05/05 08:44:58 usata Exp $
 
 inherit gnome2
 
@@ -11,11 +11,9 @@ 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 ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 SLOT="0"
 
-S=${WORKDIR}/${P}
-
 DOCS="AUTHORS README ChangeLog TODO"
 
 DEPEND="dev-lang/perl