Version bumped. Fixed obsolete prime.scm problem with uim-0.4.7.1.

(Portage version: 2.0.51.22-r2)

7 files changed, 152 insertions, 11 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index be0bc7b95880..f8510e082df2 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.105 2005/07/24 14:13:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.106 2005/07/28 15:32:51 usata Exp $
+
+*uim-0.4.8_alpha1 (28 Jul 2005)
+*uim-0.4.7.1-r2 (28 Jul 2005)
+
+  28 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> -uim-0.4.7.1.ebuild,
+  +uim-0.4.7.1-r2.ebuild, +uim-0.4.8_alpha1.ebuild:
+  Version bumped. Fixed obsolete prime.scm problem with uim-0.4.7.1.
 
   24 Jul 2005; Markus Rothe <corsair@gentoo.org> uim-0.4.7.ebuild:
   Stable on ppc64
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 157b6b1d05a4..1fcb729dc506 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,17 +1,21 @@
 MD5 bddb6cbcb20715b2fc047e964699b958 ChangeLog 15531
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
+MD5 aba2854f37eeb7084c9d7321b84e187c uim-0.4.7.ebuild 3372
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
+MD5 221e33deb3e1e1959d0db0c86f6f98bc uim-0.4.7.1.ebuild 3070
 MD5 d42280271b897d4f0cbcb86bc3bc748d uim-0.4.6-r2.ebuild 3642
-MD5 aba2854f37eeb7084c9d7321b84e187c uim-0.4.7.ebuild 3372
 MD5 b0ac027285e862cdd202d9c262da8115 uim-0.4.7.1-r1.ebuild 3146
-MD5 221e33deb3e1e1959d0db0c86f6f98bc uim-0.4.7.1.ebuild 3070
+MD5 b0ac027285e862cdd202d9c262da8115 uim-0.4.8_alpha1.ebuild 3146
+MD5 41cf9740a013c25637de2fdc9ad3178e uim-0.4.7.1-r2.ebuild 3451
+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 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
+MD5 a6509a2f2fad04125aba852f561c2472 files/digest-uim-0.4.8_alpha1 68
+MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
 MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
-MD5 4661795c7be34416dbbb12571cb9f585 files/digest-uim-0.4.7 127
 MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
-MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
-MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 a9eb508109eca1b8de35c91baad214ab files/digest-uim-0.4.7.1 64
+MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
 MD5 a9eb508109eca1b8de35c91baad214ab files/digest-uim-0.4.7.1-r1 64
diff --git a/app-i18n/uim/files/digest-uim-0.4.7.1 b/app-i18n/uim/files/digest-uim-0.4.7.1
deleted file mode 100644
index f2ca98e0ac90..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.7.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz 1544242
diff --git a/app-i18n/uim/files/digest-uim-0.4.7.1-r2 b/app-i18n/uim/files/digest-uim-0.4.7.1-r2
new file mode 100644
index 000000000000..f130072068a3
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.7.1-r2
@@ -0,0 +1,2 @@
+MD5 88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz 1544242
+MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim/files/digest-uim-0.4.8_alpha1 b/app-i18n/uim/files/digest-uim-0.4.8_alpha1
new file mode 100644
index 000000000000..c96ad6dac533
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.8_alpha1
@@ -0,0 +1 @@
+MD5 74d5d127f874a31e46b7a7b2136a126f uim-0.4.8alpha1.tar.gz 1596660
diff --git a/app-i18n/uim/uim-0.4.7.1-r2.ebuild b/app-i18n/uim/uim-0.4.7.1-r2.ebuild
new file mode 100644
index 000000000000..7c78577026ff
--- /dev/null
+++ b/app-i18n/uim/uim-0.4.7.1-r2.ebuild
@@ -0,0 +1,127 @@
+# 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.1-r2.ebuild,v 1.1 2005/07/28 15:32:51 usata Exp $
+
+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://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? ( >=x11-libs/qt-3.3.3-r1 )
+	immqt-bc? ( >=x11-libs/qt-3.3.3-r1 )
+	qt? ( >=x11-libs/qt-3.3.3-r1 )
+	!<app-i18n/prime-0.9.4
+	!app-i18n/uim-qt
+	!app-i18n/uim-kdehelper"
+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
+	use qt && set-qtdir 3
+	if use immqt || use immqt-bc ; then
+		myconf="${myconf} --with-qt-immodule"
+		export CPPFLAGS="${CPPFLAGS} -DQT_THREAD_SUPPORT"
+	fi
+
+	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 "% 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"
+	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.7.1.ebuild b/app-i18n/uim/uim-0.4.8_alpha1.ebuild
index 0c337f7d38ba..af0553054b43 100644
--- a/app-i18n/uim/uim-0.4.7.1.ebuild
+++ b/app-i18n/uim/uim-0.4.8_alpha1.ebuild
@@ -1,8 +1,8 @@
 # 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.1.ebuild,v 1.1 2005/07/18 10:30:16 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.8_alpha1.ebuild,v 1.1 2005/07/28 15:32:51 usata Exp $
 
-inherit eutils kde-functions
+inherit eutils kde-functions flag-o-matic
 
 MY_P="${P/_/}"
 S="${WORKDIR}/${MY_P}"
@@ -55,11 +55,11 @@ src_unpack() {
 
 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)
@@ -96,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"