Added qt_min_version; bug #100235.

Package-Manager: portage-2.0.51.22-r2

8 files changed, 31 insertions, 144 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index f8510e082df2..2ec5b1bc572b 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,11 @@
 # 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.106 2005/07/28 15:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.107 2005/07/31 09:18:09 usata Exp $
+
+  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> uim-0.4.6-r2.ebuild,
+  uim-0.4.7.ebuild, -uim-0.4.7.1-r1.ebuild, uim-0.4.7.1-r2.ebuild,
+  uim-0.4.8_alpha1.ebuild:
+  Added qt_min_version; bug #100235.
 
 *uim-0.4.8_alpha1 (28 Jul 2005)
 *uim-0.4.7.1-r2 (28 Jul 2005)
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 694b3fc6b00f..acec5d33fe9f 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ab3df0062870b2681c0978b5eb4ffb98 ChangeLog 15784
+MD5 667e7ac4b577876dab77fc26f9703f47 ChangeLog 15986
 MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 aba2854f37eeb7084c9d7321b84e187c uim-0.4.7.ebuild 3372
+MD5 824e8307fe70fd9198d78a162d123212 uim-0.4.7.ebuild 3373
 MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
-MD5 d42280271b897d4f0cbcb86bc3bc748d uim-0.4.6-r2.ebuild 3642
-MD5 b0ac027285e862cdd202d9c262da8115 uim-0.4.7.1-r1.ebuild 3146
-MD5 70988ca8d1a595fbcada65846415d200 uim-0.4.8_alpha1.ebuild 3148
-MD5 0d9e61f583154c2564683c511cd9ac01 uim-0.4.7.1-r2.ebuild 3451
+MD5 848678b8d734b4e0ce9eaf37445e122f uim-0.4.6-r2.ebuild 3645
+MD5 993a14a6df384a480bc43f6d87f6dec0 uim-0.4.8_alpha1.ebuild 3151
+MD5 92265afb7c7813c1afa2a5f686fe0fbc uim-0.4.7.1-r2.ebuild 3453
 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
@@ -19,11 +18,10 @@ MD5 7cadb3ed63d5414354b4c5aec5fefc04 files/digest-uim-0.4.7.1-r2 129
 MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r2 192
 MD5 cc10c5d38fe1cce5a6e17fad95da53d7 files/uim-0.4.6-gtk2_4-gentoo.diff 441
 MD5 faf7d637e9266fbc6613cdf8ee56e427 files/uim-0.4.6-nls.diff 404
-MD5 a9eb508109eca1b8de35c91baad214ab files/digest-uim-0.4.7.1-r1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC7E+2VWNWqTUmv+0RAhj4AJ9se6qjmZNuTynuWFsuTvE/QHaPxQCgsr31
-lkuYwn7D+wsZ/ufoo/AaSMI=
-=Hf7U
+iD8DBQFC7JQfVWNWqTUmv+0RAiuzAKCYqqEvkmMwHvcKy0WoOkH6XuKvqgCgqJwy
+dNCvqjfJOBhlX5jXcb+JQwE=
+=XcNc
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/uim/files/digest-uim-0.4.7.1-r1 b/app-i18n/uim/files/digest-uim-0.4.7.1-r1
deleted file mode 100644
index f2ca98e0ac90..000000000000
--- a/app-i18n/uim/files/digest-uim-0.4.7.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88c18b8fffa3a67401c932ac925a6d30 uim-0.4.7.1.tar.gz 1544242
diff --git a/app-i18n/uim/uim-0.4.6-r2.ebuild b/app-i18n/uim/uim-0.4.6-r2.ebuild
index 6e58b73b2035..e344c40159a7 100644
--- a/app-i18n/uim/uim-0.4.6-r2.ebuild
+++ b/app-i18n/uim/uim-0.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2005/07/22 12:08:38 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r2.ebuild,v 1.9 2005/07/31 09:18:09 usata Exp $
 
 inherit eutils kde-functions
 
@@ -24,9 +24,9 @@ RDEPEND="X? ( virtual/x11 )
 	!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 )
+	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-kdehelper
 	!app-i18n/uim-qt"
diff --git a/app-i18n/uim/uim-0.4.7.1-r1.ebuild b/app-i18n/uim/uim-0.4.7.1-r1.ebuild
deleted file mode 100644
index ddb8d227275a..000000000000
--- a/app-i18n/uim/uim-0.4.7.1-r1.ebuild
+++ /dev/null
@@ -1,115 +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.7.1-r1.ebuild,v 1.1 2005/07/21 14:30:17 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"
-
-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"
-}
-
-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-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-r2.ebuild b/app-i18n/uim/uim-0.4.7.1-r2.ebuild
index 7c78577026ff..c93e47f14f96 100644
--- a/app-i18n/uim/uim-0.4.7.1-r2.ebuild
+++ b/app-i18n/uim/uim-0.4.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.1-r2.ebuild,v 1.2 2005/07/31 09:18:09 usata Exp $
 
 inherit eutils kde-functions flag-o-matic
 
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="gtk qt immqt immqt-bc nls X m17n-lib canna"
 #IUSE="${IUSE} scim"
 
@@ -24,9 +24,9 @@ RDEPEND="X? ( virtual/x11 )
 	!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 )
+	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"
diff --git a/app-i18n/uim/uim-0.4.7.ebuild b/app-i18n/uim/uim-0.4.7.ebuild
index 193b3a6835dc..e18f94e5a326 100644
--- a/app-i18n/uim/uim-0.4.7.ebuild
+++ b/app-i18n/uim/uim-0.4.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.5 2005/07/24 14:13:52 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.7.ebuild,v 1.6 2005/07/31 09:18:09 usata Exp $
 
 inherit eutils kde-functions
 
@@ -24,9 +24,9 @@ RDEPEND="X? ( virtual/x11 )
 	!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 )
+	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-kdehelper
 	!app-i18n/uim-qt"
diff --git a/app-i18n/uim/uim-0.4.8_alpha1.ebuild b/app-i18n/uim/uim-0.4.8_alpha1.ebuild
index af0553054b43..672a8bc0c1bb 100644
--- a/app-i18n/uim/uim-0.4.8_alpha1.ebuild
+++ b/app-i18n/uim/uim-0.4.8_alpha1.ebuild
@@ -1,6 +1,6 @@
 # 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.8_alpha1.ebuild,v 1.1 2005/07/28 15:32:51 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.8_alpha1.ebuild,v 1.2 2005/07/31 09:18:09 usata Exp $
 
 inherit eutils kde-functions flag-o-matic
 
@@ -23,9 +23,9 @@ RDEPEND="X? ( virtual/x11 )
 	!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 )
+	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"