Fixed --with-gtk2 option (uim-pref-gtk was not properly built)

Package-Manager: portage-2.0.51.22-r1

5 files changed, 153 insertions, 18 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index 4721b4ba6de3..66c0d4388458 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.93 2005/05/30 19:31:29 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.94 2005/05/30 21:51:00 usata Exp $
+
+*uim-0.4.6-r2 (30 May 2005)
+
+  30 May 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/uim-0.4.6-gtk2_4-gentoo.diff, +uim-0.4.6-r2.ebuild:
+  Fixed --with-gtk2 option (uim-pref-gtk was not properly built)
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> uim-0.4.6-r1.ebuild:
   Stable on sparc
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 2b6c1af0d20a..1b2e5ca004f8 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,22 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d71547ceed595cb950c831969ca8b32b ChangeLog 13901
-MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
-MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
+MD5 bcc120fa635bfe9da08e78cd41511bd8 ChangeLog 14103
+MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 9ae8c34bd7e46587513962d2fbc49e5b uim-0.4.6.ebuild 2859
+MD5 0a7f6e8c2794c929409fb1ca0875f4a2 uim-0.4.6-r2.ebuild 3464
+MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
 MD5 e736fcc88b38fe12c061fc18c436d8e2 uim-0.4.6-r1.ebuild 3316
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
-MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r1 192
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
-MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
 MD5 2e727a4087d5b9811a6d153a375faa2f files/digest-uim-0.4.6 139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCm2onKRy60XGEcJIRAgpdAKCc04tRuVOrGIjSFiLr1EyM/Js/RwCgjS3/
-Dl9xdVvWeRbQNaNVMF+y2xg=
-=DJ9L
------END PGP SIGNATURE-----
+MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
+MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
+MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r1 192
+MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
+MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
+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
new file mode 100644
index 000000000000..508954e86b6c
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.4.6-r2
@@ -0,0 +1,3 @@
+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/uim-0.4.6-gtk2_4-gentoo.diff b/app-i18n/uim/files/uim-0.4.6-gtk2_4-gentoo.diff
new file mode 100644
index 000000000000..429b0fbdd9b9
--- /dev/null
+++ b/app-i18n/uim/files/uim-0.4.6-gtk2_4-gentoo.diff
@@ -0,0 +1,11 @@
+--- 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/uim-0.4.6-r2.ebuild b/app-i18n/uim/uim-0.4.6-r2.ebuild
new file mode 100644
index 000000000000..5f44529fb211
--- /dev/null
+++ b/app-i18n/uim/uim-0.4.6-r2.ebuild
@@ -0,0 +1,122 @@
+# 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.1 2005/05/30 21:51:00 usata 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://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"
+
+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"
+
+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/uim-kdehelper )
+	!<app-i18n/prime-0.9.4"
+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}
+	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()
+	# 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
+	cd uim; epatch "${WORKDIR}"/skk-dic-serv.diff2.gz
+	cd "${S}"; epatch "${FILESDIR}"/${P}-gtk2_4-gentoo.diff
+}
+
+src_compile() {
+	local myconf
+	if use immqt || use immqt-bc ; then
+		myconf="${myconf} --enable-qt-immodule"
+		export CPPFLAGS="${CPPFLAGS} -I${S}/qt"
+	fi
+	use qt && set-qtdir 3
+
+	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
+
+	econf ${myconf} || die "econf failed"
+	emake -j1 || die "emake failed"
+
+	cd ${WORKDIR}/prime-1.0.0.1
+	econf || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	cd ${WORKDIR}/prime-1.0.0.1
+	make DESTDIR="${D}" install-uim || die "make install-uim failed"
+	cd -
+
+	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
+}