From: Matsuu Takuto Date: Thu, 1 Feb 2007 14:55:32 +0000 (+0000) Subject: Version bumped. Fixed #162502. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c5e0da1502713ecca8a99150a79fa1d1abf6e2c;p=gentoo.git Version bumped. Fixed #162502. Package-Manager: portage-2.1.1-r2 --- diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog index 60540b6474fe..8bf5f49a8f96 100644 --- a/app-i18n/uim/ChangeLog +++ b/app-i18n/uim/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-i18n/uim # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.155 2007/01/05 16:35:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.156 2007/02/01 14:55:32 matsuu Exp $ + +*uim-1.4.0 (01 Feb 2007) + + 01 Feb 2007; MATSUU Takuto +files/uim-1.2.1-nls.patch, + +files/uim-1.4.0-gentoo.patch, uim-1.2.1.ebuild, -uim-1.3.0.ebuild, + uim-1.3.1.ebuild, +uim-1.4.0.ebuild: + Version bumped. + Fixed USE="-nls" issue, bug #162502. 05 Jan 2007; Diego Pettenò uim-0.5.0.1.ebuild, uim-1.2.1.ebuild, uim-1.3.0.ebuild, uim-1.3.1.ebuild: diff --git a/app-i18n/uim/files/digest-uim-1.4.0 b/app-i18n/uim/files/digest-uim-1.4.0 new file mode 100644 index 000000000000..acab32c76592 --- /dev/null +++ b/app-i18n/uim/files/digest-uim-1.4.0 @@ -0,0 +1,3 @@ +MD5 3b5669a5eeee2d660dd179b3d7fec169 uim-1.4.0.tar.bz2 2684329 +RMD160 7bfa394d822b3bdc30736569b8543339d82ce10b uim-1.4.0.tar.bz2 2684329 +SHA256 0dc49075bace432a9be6116a966988e2991b8d052ed32043a9bdd60adaf92d2d uim-1.4.0.tar.bz2 2684329 diff --git a/app-i18n/uim/files/uim-1.2.1-nls.patch b/app-i18n/uim/files/uim-1.2.1-nls.patch new file mode 100644 index 000000000000..d0cdc05a0cbe --- /dev/null +++ b/app-i18n/uim/files/uim-1.2.1-nls.patch @@ -0,0 +1,14 @@ +Index: qt/qtgettext.h +=================================================================== +--- qt/qtgettext.h (revision 4453) ++++ qt/qtgettext.h (revision 4454) +@@ -57,6 +57,9 @@ + #define N_(String) (String) + #endif /* gettext_noop */ + ++#else /* ENABLE_NLS */ ++ ++#define mygettext(String) QString::fromLocal8Bit( (const char *)(String) ) + #endif /* ENABLE_NLS */ + + #endif /* Not def: _QT_GETTEXT_H_ */ diff --git a/app-i18n/uim/files/uim-1.4.0-gentoo.patch b/app-i18n/uim/files/uim-1.4.0-gentoo.patch new file mode 100644 index 000000000000..5e08cd62e102 --- /dev/null +++ b/app-i18n/uim/files/uim-1.4.0-gentoo.patch @@ -0,0 +1,43 @@ +--- intltool-update.in.orig 2007-01-26 01:43:29.000000000 +0900 ++++ intltool-update.in 2007-01-26 01:43:39.000000000 +0900 +@@ -64,7 +64,7 @@ + "ui|". # Bonobo specific - User Interface desc. files + "lang|". # ? + "glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required) +-"scm-workaround(?:\\.in)*|". # ? (Note: .in is not required) ++"scm(?:\\.in)*|". # ? (Note: .in is not required) + "oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files + "etspec|". # ? + "server(?:\\.in)+|". # Bonobo specific +@@ -248,7 +248,7 @@ + { + $gettext_type="glade"; + } +- elsif ($type =~ /scm-workaround(\.in)*$/) ++ elsif ($type =~ /scm(\.in)*$/) + { + $gettext_type="scheme"; + } +@@ -341,11 +341,11 @@ + + ## Check if we should ignore some found files, when + ## comparing with POTFILES.in +- foreach my $ignore ("$SRCDIR/POTFILES.skip", "$SRCDIR/POTFILES.ignore") ++ foreach my $ignore ("POTFILES.skip", "POTFILES.ignore") + { + (-s $ignore) or next; + +- if ("$ignore" eq "$SRCDIR/POTFILES.ignore") ++ if ("$ignore" eq "POTFILES.ignore") + { + print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n". + "content of this file to POTFILES.skip.\n"; +@@ -506,7 +506,7 @@ + foreach (@buf_potfiles_sorted) + { + chomp (my $dummy = $_); +- if ("$dummy" ne "" and ! -f "$SRCDIR/../$dummy" and ! -f "../$dummy") ++ if ("$dummy" ne "" and ! -f "$SRCDIR/../$dummy") + { + push @buf_potfiles_notexist, $_; + } diff --git a/app-i18n/uim/uim-1.2.1.ebuild b/app-i18n/uim/uim-1.2.1.ebuild index 7b225ca27b52..711d5fd5644f 100644 --- a/app-i18n/uim/uim-1.2.1.ebuild +++ b/app-i18n/uim/uim-1.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.2.1.ebuild,v 1.15 2007/01/05 16:35:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.2.1.ebuild,v 1.16 2007/02/01 14:55:32 matsuu Exp $ inherit eutils kde-functions flag-o-matic multilib elisp-common @@ -60,6 +60,12 @@ pkg_setup() { GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-nls.patch +} + src_compile() { local myconf diff --git a/app-i18n/uim/uim-1.3.1.ebuild b/app-i18n/uim/uim-1.3.1.ebuild index e16178ab9849..4fe40b2a0534 100644 --- a/app-i18n/uim/uim-1.3.1.ebuild +++ b/app-i18n/uim/uim-1.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.3.1.ebuild,v 1.2 2007/01/05 16:35:39 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.3.1.ebuild,v 1.3 2007/02/01 14:55:32 matsuu Exp $ inherit eutils kde-functions flag-o-matic multilib elisp-common @@ -58,6 +58,12 @@ pkg_setup() { GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/} } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${PN}-1.2.1-nls.patch +} + src_compile() { local myconf diff --git a/app-i18n/uim/uim-1.4.0.ebuild b/app-i18n/uim/uim-1.4.0.ebuild new file mode 100644 index 000000000000..6f8482300cc4 --- /dev/null +++ b/app-i18n/uim/uim-1.4.0.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-1.4.0.ebuild,v 1.1 2007/02/01 14:55:32 matsuu Exp $ + +inherit eutils qt3 multilib elisp-common + +DESCRIPTION="Simple, secure and flexible input method library" +HOMEPAGE="http://uim.freedesktop.org/" +SRC_URI="http://uim.freedesktop.org/releases/uim/stable/${P}.tar.bz2" + +LICENSE="BSD GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="anthy canna eb emacs gnome gtk kde libedit m17n-lib ncurses nls prime qt3 X" + +RDEPEND="X? ( || ( ( + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXrender + ) + =gnome-base/gnome-panel-2.14 ) + gtk? ( >=x11-libs/gtk+-2.4 ) + kde? ( kde-base/kdelibs ) + libedit? ( dev-libs/libedit ) + m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) + ncurses? ( sys-libs/ncurses ) + nls? ( virtual/libintl ) + prime? ( app-i18n/prime ) + qt3? ( $(qt_min_version 3.3.4) ) + !app-i18n/uim-svn + ! "${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 +}