Version bumped.

(Portage version: 2.0.51.22-r2)

7 files changed, 28 insertions, 75 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 316ff3032a49..4643ab237b3d 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,13 @@
 # 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.110 2005/08/03 19:57:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.111 2005/08/04 00:25:11 usata Exp $
+
+*uim-0.4.8_beta1 (04 Aug 2005)
+
+  04 Aug 2005; Mamoru KOMACHI <usata@gentoo.org>
+  -files/uim-0.4.6-gtk2_4-gentoo.diff, -files/uim-0.4.6-nls.diff,
+  -uim-0.4.6-r2.ebuild, +uim-0.4.8_beta1.ebuild:
+  Version bumped.
 
   03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> uim-0.4.7.1-r2.ebuild:
   Stable on alpha.
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 8d0c302346e4..6761958795e3 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,27 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 bd2cb4ffc99184a8ad75544aa71241bc uim-0.4.7.ebuild 3377
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 993a14a6df384a480bc43f6d87f6dec0 uim-0.4.8_alpha1.ebuild 3151
 MD5 0597a454dfb827a45464b3fac3e25612 ChangeLog 16267
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 bd2cb4ffc99184a8ad75544aa71241bc uim-0.4.7.ebuild 3377
+MD5 993a14a6df384a480bc43f6d87f6dec0 uim-0.4.8_beta1.ebuild 3151
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 5db54be209f3f243a4b2f025c6a603d0 uim-0.4.7.1-r2.ebuild 3452
-MD5 848678b8d734b4e0ce9eaf37445e122f uim-0.4.6-r2.ebuild 3645
-MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
+MD5 993a14a6df384a480bc43f6d87f6dec0 uim-0.4.8_alpha1.ebuild 3151
+MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
+MD5 4661795c7be34416dbbb12571cb9f585 files/digest-uim-0.4.7 127
 MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
-MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
 MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
 MD5 a6509a2f2fad04125aba852f561c2472 files/digest-uim-0.4.8_alpha1 68
-MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
-MD5 4661795c7be34416dbbb12571cb9f585 files/digest-uim-0.4.7 127
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC8SGwKf2g/qXtneoRAhLAAJ4saLKs1NC/4ZAQqVcawZprJxFwlQCeLvus
-Fqb7IqqVWg5U4Rra3cTGgDE=
-=ElNo
------END PGP SIGNATURE-----
+MD5 ade720d535bf6e57233075b76d26f09d files/digest-uim-0.4.8_beta1 67
+MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
diff --git a/app-i18n/uim/files/digest-uim-0.4.6-r2 b/app-i18n/uim/files/digest-uim-0.4.6-r2
deleted file mode 100644
index 508954e86b6c..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.6-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a61636b7eb4cab6c09eb3d661d1d7db4 uim-0.4.6.tar.gz 1467039
-MD5 ade5e6e9805e1aff24b51372526c04d3 skk-dic-serv.diff2.bin 2168
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/files/digest-uim-0.4.8_beta1 b/app-i18n/uim/files/digest-uim-0.4.8_beta1
new file mode 100644
index 000000000000..214cd49a6131
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.8_beta1
@@ -0,0 +1 @@
+MD5 7e5862b99a6c7a9dffc87db1050e812e uim-0.4.8beta1.tar.gz 1599625
diff --git a/app-i18n/uim/files/uim-0.4.6-gtk2_4-gentoo.diff b/app-i18n/uim/files/uim-0.4.6-gtk2_4-gentoo.diff
deleted file mode 100644
index 429b0fbdd9b9..000000000000
--- a/app-i18n/uim/files/uim-0.4.6-gtk2_4-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac-gtk2_4	2005-02-26 05:14:54.000000000 +0900
-+++ configure.ac	2005-05-31 06:32:03.959252192 +0900
-@@ -232,7 +232,7 @@
-       ;;
-       yes|*)
-         PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
--        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2.4="yes",use_gtk2.4="no")
-+        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2.4="no")
-       ;;
-     esac
-   ],
diff --git a/app-i18n/uim/files/uim-0.4.6-nls.diff b/app-i18n/uim/files/uim-0.4.6-nls.diff
deleted file mode 100644
index 21c4069f6492..000000000000
--- a/app-i18n/uim/files/uim-0.4.6-nls.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- qtgettext.h.orig	2005-02-05 13:52:02.000000000 +0900
-+++ qtgettext.h	2005-06-19 01:06:55.000000000 +0900
-@@ -34,11 +34,11 @@
- #define _QT_GETTEXT_H_
- 
- #include "uim/config.h"
-+#include "uim/gettext.h"
- 
- /* NLS can be disabled through the configure --disable-nls option.  */
- #if ENABLE_NLS
- 
--#include "uim/gettext.h"
- /* undef original _(String) macro for handling encoding */
- #ifdef _
- #undef _
diff --git a/app-i18n/uim/uim-0.4.6-r2.ebuild b/app-i18n/uim/uim-0.4.8_beta1.ebuild
index e344c40159a7..c64d7cc2c614 100644
--- a/app-i18n/uim/uim-0.4.6-r2.ebuild
+++ b/app-i18n/uim/uim-0.4.8_beta1.ebuild
@@ -1,22 +1,21 @@
 # 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.6-r2.ebuild,v 1.9 2005/07/31 09:18:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.8_beta1.ebuild,v 1.1 2005/08/04 00:25:11 usata Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions flag-o-matic
 
 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://lists.sourceforge.jp/mailman/archives/anthy-dev/attachments/20050313/47aab99c/skk-dic-serv.diff2.bin
-	http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
+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"
 
 RDEPEND="X? ( virtual/x11 )
 	gtk? ( >=x11-libs/gtk+-2 )
@@ -28,8 +27,8 @@ RDEPEND="X? ( virtual/x11 )
 	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"
+	!app-i18n/uim-qt
+	!app-i18n/uim-kdehelper"
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-perl/XML-Parser
@@ -45,7 +44,6 @@ GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 
 src_unpack() {
 	unpack ${A}
-	cp "${DISTDIR}"/skk-dic-serv.diff2.bin "${WORKDIR}"/skk-dic-serv.diff2.gz
 
 	cd "${S}"
 	# we execute gtk-query-immodules-2.0 in pkg_postinst()
@@ -53,18 +51,15 @@ src_unpack() {
 	sed -i -e "/gtk-query-immodules-2.0/s/.*/	:\\\\/g" \
 		Makefile.am || die
 	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-	cd uim; epatch "${WORKDIR}"/skk-dic-serv.diff2.gz
-	cd "${S}"; epatch "${FILESDIR}"/${P}-gtk2_4-gentoo.diff
-	cd "${S}/qt"; epatch "${FILESDIR}"/${P}-nls.diff
 }
 
 src_compile() {
 	local myconf
+	use qt && set-qtdir 3
 	if use immqt || use immqt-bc ; then
 		myconf="${myconf} --with-qt-immodule"
-		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
+		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
 	fi
-	use qt && set-qtdir 3
 
 	myconf="${myconf}
 		$(use_enable nls)
@@ -77,24 +72,14 @@ src_compile() {
 	autoreconf
 	libtoolize --copy --force
 
-	econf ${myconf} || die "econf failed"
+	# --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
@@ -111,6 +96,7 @@ pkg_postinst() {
 	ewarn "New input method switcher has been introduced. You need to set"
 	ewarn
 	ewarn "% GTK_IM_MODULE=uim ; export GTK_IM_MODULE"
+	ewarn "% QT_IM_MODULE=uim ; export QT_IM_MODULE"
 	ewarn "% XMODIFIERS=@im=uim ; export XMODIFIERS"
 	ewarn
 	ewarn "If you would like to use uim-anthy as default input method, put"