Version bumped.

Package-Manager: portage-2.0.52-r1

7 files changed, 151 insertions, 100 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 271fa8a31357..39e8a0a6f9d9 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # 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.128 2005/10/01 20:29:37 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.129 2005/12/17 16:54:34 usata Exp $
+
+*uim-1.0.0_beta (17 Dec 2005)
+
+  17 Dec 2005; Mamoru KOMACHI <usata@gentoo.org> +files/50uim-el-gentoo.el,
+  -uim-0.4.5.1.ebuild, +uim-1.0.0_beta.ebuild:
+  Version bumped.
 
   01 Oct 2005; Mark Loeser <halcy0n@gentoo.org> uim-0.5.0.1.ebuild:
   Stable on x86; bug #107748
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 29859db7bac5..66c97d714306 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,25 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ad19be8b58d33511845f5c9df5a7b302 ChangeLog 18317
+MD5 3e2c804caa2ba9b8cbfaefab74c25b94 ChangeLog 18488
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
-MD5 f35d23551f66bfc54919377d7cfd9987 uim-0.4.7.1-r2.ebuild 3448
 MD5 858be48526cabf6940b8e3f7c851477b uim-0.4.8.ebuild 3172
+MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
 MD5 fb1dd1eda2839248766d1a7b8135275b uim-0.4.9.1.ebuild 3173
 MD5 e2cdb33a2408bf9f1a757f7f57b305df uim-0.5.0.1.ebuild 3255
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
-MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
+MD5 fd3371280677df01bd1964fd3f934a91 uim-1.0.0_beta.ebuild 3455
+MD5 f35d23551f66bfc54919377d7cfd9987 uim-0.4.7.1-r2.ebuild 3448
 MD5 6c83b1813a452bc4802de9e5a1bd349f files/digest-uim-0.4.8 62
+MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
+MD5 63af18b52d0150f105ffc738fabc44ee files/digest-uim-1.0.0_beta 67
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 258e2affd49ed5b6a54039de8e47d560 files/digest-uim-0.4.9.1 64
 MD5 bfda49a91f0fad04a3319739d29d59a1 files/digest-uim-0.5.0.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDPvHRCRZPokWLroQRAv4aAJ4wTGjQwp41fQsFSi8qCXbK88z+vACeJU1a
-73OWnJ4Kb+prVGR2QByQWao=
-=obZK
------END PGP SIGNATURE-----
+MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
+MD5 258e2affd49ed5b6a54039de8e47d560 files/digest-uim-0.4.9.1 64
+MD5 f2d1f1632eaf89b416b29ee2001c7987 files/50uim-el-gentoo.el 296
diff --git a/app-i18n/uim/files/50uim-el-gentoo.el b/app-i18n/uim/files/50uim-el-gentoo.el
new file mode 100644
index 000000000000..f15456841494
--- /dev/null
+++ b/app-i18n/uim/files/50uim-el-gentoo.el
@@ -0,0 +1,11 @@
+
+;;; uim-el site-lisp configuration
+
+(require 'uim)
+
+;; assign C-o to uim-mode-switch
+(global-set-key "\C-o" 'uim-mode-switch)
+(define-key uim-mode-map "\C-o" 'uim-mode-switch)
+
+;; please set this to nil if you prefer candidate display in minibuffer
+(setq uim-candidate-display-inline-default t)
diff --git a/app-i18n/uim/files/digest-uim-0.4.5.1 b/app-i18n/uim/files/digest-uim-0.4.5.1
deleted file mode 100644
index 968119d8ac2d..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10d48b4a5db1f19b8cf9f5099265aa4c uim-0.4.5.1.tar.gz 1113356
diff --git a/app-i18n/uim/files/digest-uim-1.0.0_beta b/app-i18n/uim/files/digest-uim-1.0.0_beta
new file mode 100644
index 000000000000..48d2e29dbed6
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-1.0.0_beta
@@ -0,0 +1 @@
+MD5 c68b7a8544551bd5b65df03dcb46d9e3 uim-1.0.0-beta.tar.gz 1955754
diff --git a/app-i18n/uim/uim-0.4.5.1.ebuild b/app-i18n/uim/uim-0.4.5.1.ebuild
deleted file mode 100644
index 84dff7f261d2..000000000000
--- a/app-i18n/uim/uim-0.4.5.1.ebuild
+++ /dev/null
@@ -1,80 +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.5.1.ebuild,v 1.7 2005/02/27 12:43:50 kloeri Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="gtk nls X m17n-lib"
-
-RDEPEND="X? ( virtual/x11 )
-	gtk? ( >=x11-libs/gtk+-2 )
-	m17n-lib? ( dev-libs/m17n-lib )
-	!app-i18n/uim-svn
-	!app-i18n/uim-fep"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/XML-Parser
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-gtk-query-immodules-gentoo.diff
-	use X || sed -i -e '/^SUBDIRS/s/xim//' Makefile.in || die
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		$(use_with X x) \
-		$(use_with gtk gtk2) \
-		$(use_with m17n-lib m17nlib) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	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-canna you should emerge app-i18n/canna."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo (uim doesn't support skkserv)."
-	einfo "To use uim-prime you should emerge >=app-i18n/prime-0.8."
-	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 "Available input methods can be found by running uim-im-switcher."
-	ewarn
-
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
-
-pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-}
diff --git a/app-i18n/uim/uim-1.0.0_beta.ebuild b/app-i18n/uim/uim-1.0.0_beta.ebuild
new file mode 100644
index 000000000000..f70e5d6f2c93
--- /dev/null
+++ b/app-i18n/uim/uim-1.0.0_beta.ebuild
@@ -0,0 +1,123 @@
+# 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-1.0.0_beta.ebuild,v 1.1 2005/12/17 16:54:34 usata Exp $
+
+inherit eutils kde-functions flag-o-matic multilib elisp-common
+
+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"
+
+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 emacs"
+#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-qt
+	!app-i18n/uim-kdehelper
+	!app-emacs/uim-el"
+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 )"
+
+pkg_setup() {
+	# 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)
+		$(use_enable emacs)"
+
+	autoreconf
+	libtoolize --copy --force
+
+	# --with-scim is not stable enough
+	# --with-libedit should be fixed in SVN trunk, but not well tested
+	econf ${myconf} --without-scim --without-libedit || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog INSTALL* NEWS README*
+	dodoc doc/{HELPER-CANDWIN,KEY,UIM-SH}
+	use X && dodoc doc/XIM-SERVER
+	use emacs && elisp-site-file-install ${FILESDIR}/50uim-el-gentoo.el
+}
+
+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
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
+	use emacs && elisp-site-regen
+}