Stable on x86 and amd64.

Package-Manager: portage-2.0.51.22-r2

5 files changed, 8 insertions, 135 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index e690852d8f8a..9d2a8053c4f2 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.118 2005/09/23 03:41:36 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.119 2005/09/28 21:31:14 matsuu Exp $
+
+  28 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> uim-0.4.8.ebuild:
+  Stable on x86 and amd64.
 
   23 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> uim-0.4.7.1-r2.ebuild:
   Stable on amd64.
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index b4b94c82dda2..e6fda5e1b436 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,13 +1,11 @@
-MD5 bd2cb4ffc99184a8ad75544aa71241bc uim-0.4.7.ebuild 3377
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 f35d23551f66bfc54919377d7cfd9987 uim-0.4.7.1-r2.ebuild 3448
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 ad79d9275c84b7eab4e5a115ad489327 uim-0.4.8.ebuild 3172
-MD5 9dc5f9d18f955659e1e4c5f5ab09f7cb ChangeLog 17130
+MD5 959e1f32c2ada60a5829f0a8a031a5f7 uim-0.4.8.ebuild 3171
+MD5 0a716a51ac45ea8ca560e80b606816c2 ChangeLog 17225
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
-MD5 4661795c7be34416dbbb12571cb9f585 files/digest-uim-0.4.7 127
 MD5 6c83b1813a452bc4802de9e5a1bd349f files/digest-uim-0.4.8 62
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
 MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
diff --git a/app-i18n/uim/files/digest-uim-0.4.7 b/app-i18n/uim/files/digest-uim-0.4.7
deleted file mode 100644
index a0f2ee3295ef..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1ba750aa3ab7b5d1aedd26340ca83b82 uim-0.4.7.tar.gz 1545941
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/uim-0.4.7.ebuild b/app-i18n/uim/uim-0.4.7.ebuild
deleted file mode 100644
index 18f99675bbf1..000000000000
--- a/app-i18n/uim/uim-0.4.7.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.ebuild,v 1.7 2005/07/31 21:02:09 dertobi123 Exp $
-
-inherit eutils kde-functions
-
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz
-	http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 sparc x86"
-IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
-#IUSE="${IUSE} scim"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep
-	canna? ( app-i18n/canna )
-	immqt? ( $(qt_min_version 3.3.4) )
-	immqt-bc? ( $(qt_min_version 3.3.4) )
-	qt? ( $(qt_min_version 3.3.4) )
-	!<app-i18n/prime-0.9.4
-	!app-i18n/uim-kdehelper
-	!app-i18n/uim-qt"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	sys-devel/autoconf
-	sys-devel/automake
-	sys-devel/libtool
-	nls? ( sys-devel/gettext )"
-
-# An arch specific config directory is used on multilib systems
-has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# we execute gtk-query-immodules-2.0 in pkg_postinst()
-	# to not violate sandbox.
-	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
-		Makefile.am || die
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	local myconf
-	if use immqt || use immqt-bc ; then
-		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
-	fi
-	use qt && set-qtdir 3
-
-	myconf="${myconf}
-		$(use_enable nls)
-		$(use_with X x)
-		$(use_with gtk gtk2)
-		$(use_with m17n-lib m17nlib)
-		$(use_with canna)
-		$(use_with qt)"
-
-	autoreconf
-	libtoolize --copy --force
-
-	# --with-scim is not stable enough
-	econf ${myconf} --without-scim || die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if has_version '>=app-i18n/prime-1.0' ; then
-		cd ${WORKDIR}/prime-1.0.0.1
-		econf || die
-	fi
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if has_version '>=app-i18n/prime-1.0' ; then
-		cd ${WORKDIR}/prime-1.0.0.1
-		make DESTDIR="${D}" install-uim || die "make install-uim failed"
-		cd -
-	fi
-
-	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
-	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
-	use X && dodoc doc/XIM-SERVER
-}
-
-pkg_postinst() {
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
-	ewarn
-	ewarn "New input method switcher has been introduced. You need to set"
-	ewarn
-	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
-	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
-	ewarn
-	ewarn "If you would like to use uim-anthy as default input method, put"
-	ewarn "(define default-im-name 'anthy)"
-	ewarn "to your ~/.uim."
-	ewarn
-	ewarn "All input methods can be found by running uim-im-switcher-gtk"
-	ewarn "or uim-im-switcher-qt."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-0.4.8.ebuild b/app-i18n/uim/uim-0.4.8.ebuild
index 86425e1729aa..d3590a9fcb76 100644
--- a/app-i18n/uim/uim-0.4.8.ebuild
+++ b/app-i18n/uim/uim-0.4.8.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/uim/uim-0.4.8.ebuild,v 1.2 2005/08/16 18:51:38 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.8.ebuild,v 1.3 2005/09/28 21:31:14 matsuu Exp $
 
 inherit eutils kde-functions flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://uim.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
 #IUSE="${IUSE} scim"