Force gtk+-2.2 for <=app-i18n/uim-0.3.1 and added a patch to fix cinstallation with >=x11-libs/gtk+-2.4 for uim-0.3.2. See bug #45086

10 files changed, 54 insertions, 117 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index aae5c3f065b6..62f74da13bee 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.40 2004/03/14 19:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.41 2004/03/20 17:55:12 usata Exp $
+
+  21 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> uim-0.2.4.ebuild,
+  uim-0.2.8.ebuild, uim-0.3.0.1.ebuild, uim-0.3.1.ebuild, uim-0.3.2.ebuild,
+  files/uim-gtk-query-immodules-gentoo.diff:
+  Force gtk+-2.2 for <=app-i18n/uim-0.3.1 and added a patch to fix compile on
+  >=x11-libs/gtk+-2.4 for uim-0.3.2. See bug #45086
 
 *uim-0.3.2 (08 Mar 2004)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 6f6859123f44..7bc2eb8961ee 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,13 +1,12 @@
-MD5 249a3c66030a9dca772f1dd20e2de019 uim-0.2.8.ebuild 1866
-MD5 f889ad4807eceb4e63da03b9d0f48d07 uim-0.3.0.1.ebuild 1868
-MD5 418ae83888a083a7fa53e420a6131f0e ChangeLog 6896
+MD5 55df969dfd41f9fd1e402f77b6b76a23 uim-0.2.8.ebuild 1815
+MD5 abbabc52de543d4d295a0c09d8f3ff15 uim-0.3.0.1.ebuild 1817
+MD5 a133e5bb07115fec756eaed5179e07fe ChangeLog 7215
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 28c643e3ee439966e6090726d39b3cf2 uim-0.3.2.ebuild 2016
-MD5 b285d486fc30b8651d90276b0c318c56 uim-0.3.1.ebuild 1868
-MD5 5647e8d54d3eaf373bc9363694c147e0 uim-0.2.4.ebuild 1693
-MD5 0fdfd1869aaa7c8db627be05519051ce files/uim-gtk-query-immodules-gentoo.diff 709
+MD5 e7eb2bdecb0aeadc429a78e52035b2b6 uim-0.3.2.ebuild 2057
+MD5 5a7a9cbdab8446c7e0e73f8e2ba9520e uim-0.2.4.ebuild 1728
+MD5 36bc03f094a499fb9836d30a690f2185 files/uim-gtk-query-immodules-gentoo.diff 711
 MD5 7ad56353a9067b9ab9c5a01919ea6a70 files/digest-uim-0.3.2 61
 MD5 ac114af44de62a58cb42042c56a6d102 files/digest-uim-0.2.8 61
 MD5 1563053bea354145a8c78b8c5b464ced files/digest-uim-0.3.0.1 63
-MD5 6e146fc17c03211151e18ac2dcb9b6f3 files/digest-uim-0.3.1 61
+MD5 0951d2cfbcd7f513bf069c58c96f746b files/uim-gtk24-gentoo.diff 839
 MD5 47ef2bd1b266781c77d8daa688453409 files/digest-uim-0.2.4 61
diff --git a/app-i18n/uim/files/digest-uim-0.3.1 b/app-i18n/uim/files/digest-uim-0.3.1
deleted file mode 100644
index e771e751db51..000000000000
--- a/app-i18n/uim/files/digest-uim-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e22d733957f765c3aab421c4d26867d5 uim-0.3.1.tar.gz 812942
diff --git a/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff b/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff
index 8eac36b6dc4a..ed13953e3080 100644
--- a/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff
+++ b/app-i18n/uim/files/uim-gtk-query-immodules-gentoo.diff
@@ -6,12 +6,12 @@ diff -urN uim-0.2.1.ORIG/gtk/Makefile.in uim-0.2.1/gtk/Makefile.in
  @GTK2_TRUE@install-data-hook:
  @GTK2_TRUE@	if test -f $(GTK_IMMODULES); then \
 -@GTK2_TRUE@	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
-+@GTK2_TRUE@	gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
++@GTK2_TRUE@	#gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
  @GTK2_TRUE@	fi
  @GTK2_TRUE@uninstall-hook:
  @GTK2_TRUE@	if test -f $(GTK_IMMODULES); then \
 -@GTK2_TRUE@	gtk-query-immodules-2.0 > $(GTK_IMMODULES); \
-+@GTK2_TRUE@	gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
++@GTK2_TRUE@	#gtk-query-immodules-2.0 > ${DESTDIR}/$(GTK_IMMODULES); \
  @GTK2_TRUE@	fi
  @GTK2_FALSE@install-data-hook:
  
diff --git a/app-i18n/uim/files/uim-gtk24-gentoo.diff b/app-i18n/uim/files/uim-gtk24-gentoo.diff
new file mode 100644
index 000000000000..0011ffc7cdde
--- /dev/null
+++ b/app-i18n/uim/files/uim-gtk24-gentoo.diff
@@ -0,0 +1,25 @@
+Index: gtk/Makefile.am
+===================================================================
+--- gtk/Makefile.am	(revision 612)
++++ gtk/Makefile.am	(revision 613)
+@@ -1,6 +1,6 @@
+ 
+ 
+-moduledir = $(libdir)/gtk-2.0/2.2.0/immodules
++moduledir = $(libdir)/gtk-2.0/@GTK_BINARY_VERSION@/immodules
+ GTK_IMMODULES= $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
+ 
+ INCLUDES = -I$(top_srcdir)
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 612)
++++ configure.ac	(revision 613)
+@@ -179,6 +179,8 @@
+ XFCE4_PANEL_PLUGINSDIR=`pkg-config xfce4-panel-1.0 --variable=pluginsdir`
+ AC_SUBST(XFCE4_PANEL_PLUGINSDIR)
+ 
++GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
++AC_SUBST(GTK_BINARY_VERSION)
+ 
+ if test x$use_gtk2 = xyes ; then
+ AC_DEFINE(USE_GTK2, 1, [use gtk2])
diff --git a/app-i18n/uim/uim-0.2.4.ebuild b/app-i18n/uim/uim-0.2.4.ebuild
index 4c93d9201305..4c227a392acd 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.5 2004/03/14 19:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.4.ebuild,v 1.6 2004/03/20 17:55:12 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -19,7 +19,7 @@ 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.2* )
 	!app-i18n/uim-svn"
 
 # for debugging use
@@ -51,10 +51,6 @@ src_compile() {
 
 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*
@@ -62,6 +58,9 @@ src_install () {
 
 pkg_postinst() {
 
+	if [ "`use gtk`" ] ; then
+		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+	fi
 	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."
diff --git a/app-i18n/uim/uim-0.2.8.ebuild b/app-i18n/uim/uim-0.2.8.ebuild
index 3391a8e5168b..ee2b5700320c 100644
--- a/app-i18n/uim/uim-0.2.8.ebuild
+++ b/app-i18n/uim/uim-0.2.8.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.8.ebuild,v 1.3 2004/03/14 19:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.2.8.ebuild,v 1.4 2004/03/20 17:55:12 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -19,7 +19,7 @@ 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.2* )
 	!app-i18n/uim-svn"
 
 # for debugging use
@@ -51,10 +51,6 @@ src_compile() {
 
 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*
diff --git a/app-i18n/uim/uim-0.3.0.1.ebuild b/app-i18n/uim/uim-0.3.0.1.ebuild
index 8380fb861db8..839ac749756e 100644
--- a/app-i18n/uim/uim-0.3.0.1.ebuild
+++ b/app-i18n/uim/uim-0.3.0.1.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.3.0.1.ebuild,v 1.3 2004/03/14 19:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.0.1.ebuild,v 1.4 2004/03/20 17:55:12 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -19,7 +19,7 @@ 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.2* )
 	!app-i18n/uim-svn"
 
 # for debugging use
@@ -51,10 +51,6 @@ src_compile() {
 
 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*
diff --git a/app-i18n/uim/uim-0.3.1.ebuild b/app-i18n/uim/uim-0.3.1.ebuild
deleted file mode 100644
index d069e84e49f1..000000000000
--- a/app-i18n/uim/uim-0.3.1.ebuild
+++ /dev/null
@@ -1,82 +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.3.1.ebuild,v 1.2 2004/03/14 19:32:51 usata Exp $
-
-IUSE="gtk nls debug"
-
-DESCRIPTION="UIM is a simple, secure and flexible input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
-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
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
-}
-
-pkg_postrm() {
-
-	if [ "`use gtk`" ] ; then
-		gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-	fi
-}
diff --git a/app-i18n/uim/uim-0.3.2.ebuild b/app-i18n/uim/uim-0.3.2.ebuild
index 10ece5123036..5032ea60784d 100644
--- a/app-i18n/uim/uim-0.3.2.ebuild
+++ b/app-i18n/uim/uim-0.3.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.3.2.ebuild,v 1.2 2004/03/14 19:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.3.2.ebuild,v 1.3 2004/03/20 17:55:12 usata Exp $
 
 IUSE="gtk nls debug"
 
@@ -31,6 +31,9 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gtk-query-immodules-gentoo.diff
+	if has_version '>=x11-libs/gtk+-2.4' ; then
+		epatch ${FILESDIR}/${PN}-gtk24-gentoo.diff
+	fi
 }
 
 src_compile() {
@@ -51,10 +54,6 @@ src_compile() {
 
 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*