Version bumped. Blocks app-i18n/uim-svn

8 files changed, 93 insertions, 78 deletions

diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fc47ce7e647e..f57bed4fa3b0 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,14 +1,11 @@
-MD5 0779881d9f871d234bf57e4aca026306 uim-0.1.7.ebuild 1396
-MD5 eeb693162a983bd0caaae9cfa7d03217 uim-0.2.7.ebuild 1765
-MD5 3a76481ae6e151c95950970a52741b0e ChangeLog 5753
+MD5 fdd3d9c424ed4e94c35dc3ac74d19684 uim-0.2.7.ebuild 1782
+MD5 0f4837bacd130e4bff6b091c86678fb9 ChangeLog 5948
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 985c03fbedc48f310a7b2aad108843a1 uim-0.1.3.ebuild 1349
-MD5 7b62967b57388a538a92deec4e4183d5 uim-0.2.4.ebuild 1675
-MD5 eeb693162a983bd0caaae9cfa7d03217 uim-0.2.5.2.ebuild 1765
+MD5 d1faaaeb72a9e66405a0f71ba4c4982d uim-0.1.3.ebuild 1368
+MD5 29f1217aa21b6f67f9624adf8e1e71f1 uim-0.2.4.ebuild 1694
+MD5 492755c98b0feaa08e804255da14fa64 uim-0.2.5.2.ebuild 1784
 MD5 0fdfd1869aaa7c8db627be05519051ce files/uim-gtk-query-immodules-gentoo.diff 709
 MD5 57f40f2a13e2ff92133d174e5b170b2f files/digest-uim-0.1.3 61
-MD5 a1bc71ee3b455fd9b36cff079d30273e files/digest-uim-0.1.7 61
-MD5 e7dc7b39f0a7d6b33a431050ac1a9dd6 files/digest-uim-0.2.6 61
 MD5 feeb16603323947cb68cf1d60307c76e files/digest-uim-0.2.7 61
 MD5 2cd8c2799e5ff3213356c12a0ed3fbf3 files/digest-uim-0.2.5.2 63
 MD5 47ef2bd1b266781c77d8daa688453409 files/digest-uim-0.2.4 61
diff --git a/app-i18n/uim/files/digest-uim-0.1.7 b/app-i18n/uim/files/digest-uim-0.1.7
deleted file mode 100644
index 30ccad8e1d58..000000000000
--- a/app-i18n/uim/files/digest-uim-0.1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fb9bfb998a47fc1d4366eb3ce6d13c87 uim-0.1.7.tar.gz 569471
diff --git a/app-i18n/uim/files/digest-uim-0.2.7 b/app-i18n/uim/files/digest-uim-0.2.7
new file mode 100644
index 000000000000..c1c808722068
--- /dev/null
+++ b/app-i18n/uim/files/digest-uim-0.2.7
@@ -0,0 +1 @@
+MD5 67fc19f5f567f2da76c79f39fc7393f0 uim-0.2.7.tar.gz 651629
diff --git a/app-i18n/uim/uim-0.1.3.ebuild b/app-i18n/uim/uim-0.1.3.ebuild
index 2f1f6fdab3a0..df0caecae657 100644
--- a/app-i18n/uim/uim-0.1.3.ebuild
+++ b/app-i18n/uim/uim-0.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.1.3.ebuild,v 1.4 2004/01/06 08:41:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.1.3.ebuild,v 1.5 2004/01/27 09:23:45 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -16,7 +16,8 @@ S="${WORKDIR}/${P}"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!app-i18n/uim-svn"
 
 # for debugging use
 use debug && RESTRICT="nostrip"
diff --git a/app-i18n/uim/uim-0.1.7.ebuild b/app-i18n/uim/uim-0.1.7.ebuild
deleted file mode 100644
index 5201683c79a7..000000000000
--- a/app-i18n/uim/uim-0.1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.1.7.ebuild,v 1.3 2004/01/06 08:41:36 usata Exp $
-
-IUSE="gtk nls debug"
-
-DESCRIPTION="UIM is a simple, secure and flexible input method library"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="http://freedesktop.org/Software/uim/${P}.tar.gz"
-
-LICENSE="GPL-2 | BSD"
-SLOT="0"
-KEYWORDS="x86 alpha"
-
-S="${WORKDIR}/${P}"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )"
-
-# for debugging use
-use debug && RESTRICT="nostrip"
-
-src_compile() {
-
-	if [ -n "`use gtk`" ] ; then
-		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
-			Makefile.in `echo */Makefile.in`
-	else
-		sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \
-			Makefile.in `echo */Makefile.in`
-		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
-	fi
-
-	use debug && export CFLAGS="${CFLAGS} -g"
-	econf `use_enable nls` || die
-	emake || die
-}
-
-src_install () {
-
-	einstall || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
-}
-
-pkg_postinst() {
-
-	local GTK_IMMODULES=/etc/gtk-2.0/gtk.immodules
-
-	if [ -f ${GTK_IMMODULES} ] ; then
-		gtk-query-immodules-2.0 > ${GTK_IMMODULES}
-	fi
-}
-
-pkg_postrm() {
-
-	local GTK_IMMODULES=/etc/gtk-2.0/gtk.immodules
-
-	if [ -f ${GTK_IMMODULES} ] ; then
-		gtk-query-immodules-2.0 > ${GTK_IMMODULES}
-	fi
-}
diff --git a/app-i18n/uim/uim-0.2.4.ebuild b/app-i18n/uim/uim-0.2.4.ebuild
index 37154172329f..363829bf96ed 100644
--- a/app-i18n/uim/uim-0.2.4.ebuild
+++ b/app-i18n/uim/uim-0.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.4.ebuild,v 1.3 2004/01/24 19:29:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.4.ebuild,v 1.4 2004/01/27 09:23:46 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -19,7 +19,8 @@ DEPEND="${RDEPEND}
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!app-i18n/uim-svn"
 
 # for debugging use
 use debug && RESTRICT="nostrip"
diff --git a/app-i18n/uim/uim-0.2.5.2.ebuild b/app-i18n/uim/uim-0.2.5.2.ebuild
index 47c20dd46349..5e196949ce99 100644
--- a/app-i18n/uim/uim-0.2.5.2.ebuild
+++ b/app-i18n/uim/uim-0.2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.5.2.ebuild,v 1.2 2004/01/25 11:30:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.5.2.ebuild,v 1.3 2004/01/27 09:23:46 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -19,7 +19,8 @@ DEPEND="${RDEPEND}
 	dev-perl/XML-Parser
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
-RDEPEND="gtk? ( >=x11-libs/gtk+-2 )"
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!app-i18n/uim-svn"
 
 # for debugging use
 use debug && RESTRICT="nostrip"
diff --git a/app-i18n/uim/uim-0.2.7.ebuild b/app-i18n/uim/uim-0.2.7.ebuild
new file mode 100644
index 000000000000..263dc41c479b
--- /dev/null
+++ b/app-i18n/uim/uim-0.2.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.7.ebuild,v 1.1 2004/01/27 09:23:46 usata Exp $
+
+IUSE="gtk nls debug"
+
+DESCRIPTION="UIM is a simple, secure and flexible input method library"
+HOMEPAGE="http://anthy.sourceforge.jp/"
+SRC_URI="http://freedesktop.org/Software/UimDownload/${P}.tar.gz"
+
+LICENSE="GPL-2 | BSD"
+SLOT="0"
+KEYWORDS="~x86 ~alpha"
+
+S="${WORKDIR}/${P}"
+
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-perl/XML-Parser
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )"
+RDEPEND="gtk? ( >=x11-libs/gtk+-2 )
+	!app-i18n/uim-svn"
+
+# for debugging use
+use debug && RESTRICT="nostrip"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
+}
+
+src_compile() {
+
+	if [ -n "`use gtk`" ] ; then
+		sed -i -e "s:@GTK2_TRUE@::g" -e "s:@GTK2_FALSE@:#:g" \
+			Makefile.in `echo */Makefile.in`
+	else
+		sed -i -e "s:@GTK2_TRUE@:#:g" -e "s:@GTK2_FALSE@::g" \
+			Makefile.in `echo */Makefile.in`
+		sed -i -e "/^SUBDIRS/s/gtk//" Makefile.in
+	fi
+
+	use debug && export CFLAGS="${CFLAGS} -g"
+	econf `use_enable nls` || die
+	emake || die
+}
+
+src_install () {
+
+	if [ "`use gtk`" ] ; then
+		dodir /etc/gtk-2.0
+	fi
+
+	make DESTDIR=${D} install || die
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog INSTALL* NEWS README*
+}
+
+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 (uim doesn't support skkserv)."
+	einfo "To use uim-prime you should emerge app-i18n/prime and make sure you have"
+	einfo ">=dev-libs/suikyo-1.3.0."
+	einfo
+}
+
+pkg_postrm() {
+
+	if [ "`use gtk`" ] ; then
+		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	fi
+}