Version bump; fix up --disable-gui and add USE=X to disable the GUI functionalities; fix parallel-make failures; apply a patch from ChromiumOS by Peng Huang to fix issues with traditional Chinese input.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

7 files changed, 265 insertions, 5 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index 9d1d7d3f425d..d61dc9fef9c8 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/m17n-lib
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.50 2010/01/31 11:49:02 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.51 2011/04/04 01:04:40 flameeyes Exp $
+
+*m17n-lib-1.6.2 (04 Apr 2011)
+
+  04 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> +m17n-lib-1.6.2.ebuild,
+  +files/m17n-lib-1.6.2-candidates-list.patch, +files/m17n-lib-1.6.2-gui.patch,
+  +files/m17n-lib-1.6.2-parallel-make.patch, metadata.xml:
+  Version bump; fix up --disable-gui and add USE=X to disable the GUI
+  functionalities; fix parallel-make failures; apply a patch from ChromiumOS by
+  Peng Huang to fix issues with traditional Chinese input.
 
   31 Jan 2010; Raúl Porcel <armin76@gentoo.org> m17n-lib-1.5.2.ebuild:
   arm stable wrt #296159
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index c71e86c9f5a2..824194d3b4ca 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX m17n-lib-1.6.2-candidates-list.patch 2751 RMD160 f02db73892be07993e8f9b1c810daab5f9d16c33 SHA1 d6c857250bfb3ef091348383a01ada465407519d SHA256 85e656b41148127849c11973b8cf32075f7bf71982c9edddde0bac5867a8dad2
+AUX m17n-lib-1.6.2-gui.patch 572 RMD160 e43260bad2cde8c22335be0be9e8d07135cbe5e5 SHA1 0f78d58ab3e3d43494e0cc3187aec56aaf3221ae SHA256 18c26fb845662ad0c6579426b60189d47c258ab7556ac40b6df18e9a16d9ade6
+AUX m17n-lib-1.6.2-parallel-make.patch 2593 RMD160 c3c5534e44a2e98145ea3d60b7f0b7b469f79ea2 SHA1 480b76142abb5bba57c26ed085f3eb870085e4ad SHA256 ecc4b0865f6cc2778209156b928138b1034e2f94cf9c9d58a4bdf2f49a8969ae
 DIST m17n-lib-1.5.2.tar.gz 997592 RMD160 5cffe568e05db836753eab9c42c63a023ed9f6f8 SHA1 90fc951155b4dcc2b3331b78b7d516515b896014 SHA256 389cc05194e9a1f9e58b186c3fcd60d7fee2a6f627c3ea8f9c944d69983721f1
 DIST m17n-lib-1.5.3.tar.gz 998339 RMD160 40c01ca60ae9a7976edcbcfffff4c608cc402689 SHA1 80d5f10329bf7c3caf85359e568da1efa41b81b8 SHA256 8ad62dbb9643f2f3c1d85cc61a12371c364c10f0e498920491e8b54f96fe6627
 DIST m17n-lib-1.5.4.tar.gz 962454 RMD160 122c566e308df48191ebb37399110f5253623292 SHA1 d4f5bb38a0dabdaecbb6bd9e52606f57894ce1af SHA256 4cc9bf22c4a53255bccacbe90c71e54cb6aa78e394144e5ffce3aa1640ce51e7
 DIST m17n-lib-1.5.5.tar.gz 954476 RMD160 80abcd635f6ae34aba679454172e4f67f5e67489 SHA1 31cc7523f0d70a62ffe1e14f2e6e81bbc2d2d3dd SHA256 300ef0411fc306f8b409c0688c85ee9804ddc4b3ac643a84abe4aeec0a6f912f
+DIST m17n-lib-1.6.2.tar.gz 1031508 RMD160 ea274641d61b506f517a6205f767ac9163a38a5d SHA1 9b9ada79357dd56c90c64cd36845c5537c363d79 SHA256 f15039a310e94d6b462c46c409a393e1b16d95f13fd0376361f07bbfc6adb5a3
 EBUILD m17n-lib-1.5.2.ebuild 1367 RMD160 ff511f4aa28b07434d9365115dce4eb1cad4f878 SHA1 49c56c051e4f0909b4a9b45461a07b0d66185baa SHA256 a7d52e2243af9134253c88a6e27d322fe3135a7f706d933b42fe296a97b07b1d
 EBUILD m17n-lib-1.5.3.ebuild 1161 RMD160 4e48efca5dc72ee5cc6320ed356515b05c682a8d SHA1 6496653a87f7c35f4627733cba9f54eb569e0696 SHA256 70531889bde42bdeabcdf837cdbe0ea500b8c1978d6166a43ab73c865c5d63ff
 EBUILD m17n-lib-1.5.4.ebuild 1160 RMD160 5744128ee1722bad265564eac1383b5527c40f55 SHA1 9abe4021148524b1fedea6d35b6372bc92bfb84c SHA256 8e6628f7f649d49110ad5ddd12dc8a2f2d557f0a8a6bc3290f98fbda73885c19
 EBUILD m17n-lib-1.5.5.ebuild 1167 RMD160 b022691c874869d6c73e57fb6f6ed399d8c6decc SHA1 0d28da575190b2287e841fb7d6596ac7bc43301f SHA256 3e57bc8d62bd7826c1d26fa641a8f995bbad9686e24d47bbb8d48c701e8a2621
-MISC ChangeLog 5936 RMD160 bc94d0415f9d68f00076da2b8a6e9fa5db2161d7 SHA1 c8f4c49b423686805a8418623d95f8631b6f1e95 SHA256 c57ea6abf123bda56d8de219b4d222b829cdb49b94ea356ae27028cac69e2bf6
-MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+EBUILD m17n-lib-1.6.2.ebuild 1375 RMD160 9af5213cd3156230eed7f990bf7b186b107091b2 SHA1 d1eab95c5185ce1fa6e6fbd2dd27721c7a938b41 SHA256 c21192449ee4107100c1fc90adc411f4a73fc9d70f739f27a7621390848f2b10
+MISC ChangeLog 6398 RMD160 9faaeb6c45a2eac4be2426f438ec899d57fa2506 SHA1 a5070f8e62fd9510c3fb03b42fcff8cd4e04241a SHA256 f2db4e7f289046a5b01cd22816c785155653128b5debc2b83cea242750035b77
+MISC metadata.xml 458 RMD160 f237e0ef14015f6ddd309814e5622be786dac5f1 SHA1 14094744a539d39b3b8755f4e0deadfbf2ec20f2 SHA256 918c16fe3a7ec4c207a8b2ae8b9ccf3dd82e3c62e776625dd0a497637fbe1cf0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2ZGScACgkQAiZjviIA2XgYWQCgnaerE47JmXVANdmDArYqxcI5
+xrwAmgJJ5hMwacZxAayYAux1ve980q6A
+=tZf5
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
new file mode 100644
index 000000000000..40cd85d49c2b
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
@@ -0,0 +1,83 @@
+--- src/input.c	2011/02/14 04:59:22	1.154
++++ src/input.c	2011/03/09 05:45:49	1.155
+@@ -3004,9 +3004,6 @@
+ take_action_list (MInputContext *ic, MPlist *action_list)
+ {
+   MInputContextInfo *ic_info = (MInputContextInfo *) ic->info;
+-  MPlist *candidate_list = ic->candidate_list;
+-  int candidate_index = ic->candidate_index;
+-  int candidate_show = ic->candidate_show;
+   MTextProperty *prop;
+ 
+   MPLIST_DO (action_list, action_list)
+@@ -3480,31 +3477,6 @@
+ 	    };
+ 	}
+     }
+-
+-  if (ic->candidate_list)
+-    {
+-      M17N_OBJECT_UNREF (ic->candidate_list);
+-      ic->candidate_list = NULL;
+-    }
+-  if (ic->cursor_pos > 0
+-      && (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
+-				     Mcandidate_list)))
+-    {
+-      ic->candidate_list = mtext_property_value (prop);
+-      M17N_OBJECT_REF (ic->candidate_list);
+-      ic->candidate_index
+-	= (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
+-				Mcandidate_index);
+-      ic->candidate_from = mtext_property_start (prop);
+-      ic->candidate_to = mtext_property_end (prop);
+-    }
+-
+-  if (candidate_list != ic->candidate_list)
+-    ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
+-  if (candidate_index != ic->candidate_index)
+-    ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
+-  if (candidate_show != ic->candidate_show)
+-    ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;    
+   return 0;
+ }
+ 
+@@ -3914,7 +3886,37 @@
+   ic_info->key_unhandled = 0;
+ 
+   do {
+-    if (handle_key (ic) < 0)
++    MPlist *candidate_list = ic->candidate_list;
++    int candidate_index = ic->candidate_index;
++    int candidate_show = ic->candidate_show;
++    MTextProperty *prop;
++    int result = handle_key (ic);
++
++    if (ic->candidate_list)
++      {
++	M17N_OBJECT_UNREF (ic->candidate_list);
++	ic->candidate_list = NULL;
++      }
++    if (ic->cursor_pos > 0
++	&& (prop = mtext_get_property (ic->preedit, ic->cursor_pos - 1,
++				       Mcandidate_list)))
++      {
++	ic->candidate_list = mtext_property_value (prop);
++	M17N_OBJECT_REF (ic->candidate_list);
++	ic->candidate_index
++	  = (int) mtext_get_prop (ic->preedit, ic->cursor_pos - 1,
++				  Mcandidate_index);
++	ic->candidate_from = mtext_property_start (prop);
++	ic->candidate_to = mtext_property_end (prop);
++      }
++    if (candidate_list != ic->candidate_list)
++      ic->candidates_changed |= MINPUT_CANDIDATES_LIST_CHANGED;
++    if (candidate_index != ic->candidate_index)
++      ic->candidates_changed |= MINPUT_CANDIDATES_INDEX_CHANGED;
++    if (candidate_show != ic->candidate_show)
++      ic->candidates_changed |= MINPUT_CANDIDATES_SHOW_CHANGED;    
++
++    if (result < 0)
+       {
+ 	/* KEY was not handled.  Delete it from the current key sequence.  */
+ 	if (ic_info->used > 0)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
new file mode 100644
index 000000000000..2c37246a6e5d
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
@@ -0,0 +1,16 @@
+Index: m17n-lib-1.6.2/configure.ac
+===================================================================
+--- m17n-lib-1.6.2.orig/configure.ac
++++ m17n-lib-1.6.2/configure.ac
+@@ -100,9 +100,9 @@ dnl Checks which levels of APIs should b
+ AC_ARG_ENABLE(gui,
+ 	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
+ 
+-AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
++AM_CONDITIONAL(WITH_GUI, test x$enable_gui != xno)
+ 
+-if test x$with_gui != xno; then
++if test x$enable_gui != xno; then
+ 
+ dnl Checks if dlopen exists, and if it's in libc or libdl.
+ 
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
new file mode 100644
index 000000000000..4402188aa887
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
@@ -0,0 +1,63 @@
+Index: m17n-lib-1.6.2/src/Makefile.am
+===================================================================
+--- m17n-lib-1.6.2.orig/src/Makefile.am
++++ m17n-lib-1.6.2/src/Makefile.am
+@@ -53,7 +53,7 @@ libm17n_la_SOURCES = \
+ 	language.h language.c \
+ 	mlocale.h locale.c \
+ 	m17n.h m17n.c
+-libm17n_la_LIBADD = ${top_builddir}/src/libm17n-core.la -ldl
++libm17n_la_LIBADD = libm17n-core.la -ldl
+ libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
+ 
+ FLT_SOURCES = \
+@@ -61,7 +61,7 @@ FLT_SOURCES = \
+ 	m17n-flt.h m17n-flt.c
+ 
+ libm17n_flt_la_SOURCES = ${FLT_SOURCES}
+-libm17n_flt_la_LIBADD = ${top_builddir}/src/libm17n-core.la
++libm17n_flt_la_LIBADD = libm17n-core.la
+ libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
+ 
+ GUI_SOURCES = \
+@@ -80,7 +80,7 @@ OPTIONAL_LD_FLAGS = \
+ 	@FONTCONFIG_LD_FLAGS@
+ 
+ libm17n_gui_la_SOURCES = ${GUI_SOURCES}
+-libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la
++libm17n_gui_la_LIBADD = ${OPTIONAL_LD_FLAGS} libm17n-core.la libm17n.la libm17n-flt.la
+ libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
+ 
+ if WITH_GUI
+@@ -90,11 +90,11 @@ module_LTLIBRARIES = libm17n-X.la libm17
+ X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
+ 
+ libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
+-libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
++libm17n_X_la_LIBADD = ${X_LD_FLAGS} @XFT2_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la
+ libm17n_X_la_LDFLAGS = -avoid-version -module
+ 
+ libm17n_gd_la_SOURCES = m17n-gd.c
+-libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ ${top_builddir}/src/libm17n-core.la ${top_builddir}/src/libm17n.la ${top_builddir}/src/libm17n-flt.la ${top_builddir}/src/libm17n-gui.la
++libm17n_gd_la_LIBADD = @GD_LD_FLAGS@ @FREETYPE_LD_FLAGS@ libm17n-core.la libm17n.la libm17n-flt.la libm17n-gui.la
+ libm17n_gd_la_LDFLAGS = -avoid-version -module
+ 
+ endif
+@@ -121,14 +121,14 @@ if MAINTAINER_MODE
+ noinst_PROGRAMS = linkcore linkshell linkgui
+ 
+ linkcore_SOURCES = linkcore.c
+-linkcore_LDADD = ${top_builddir}/src/libm17n-core.la
++linkcore_LDADD = libm17n-core.la
+ linkcore_LDFLAGS = -static
+ 
+ linkshell_SOURCES = linkshell.c
+-linkshell_LDADD = ${top_builddir}/src/libm17n.la
++linkshell_LDADD = libm17n.la
+ linkshell_LDFLAGS = -static
+ 
+ linkgui_SOURCES = linkgui.c
+-linkgui_LDADD = ${top_builddir}/src/libm17n-gui.la
++linkgui_LDADD = libm17n-gui.la
+ linkgui_LDFLAGS = -static
+ endif
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild
new file mode 100644
index 000000000000..238c83786c35
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild,v 1.1 2011/04/04 01:04:40 flameeyes Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="Multilingual Library for Unix/Linux"
+HOMEPAGE="http://www.m17n.org/m17n-lib/"
+SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+#IUSE="anthy gd ispell"
+IUSE="gd X"
+
+RDEPEND="
+	X? (
+		x11-libs/libXaw
+		x11-libs/libXft
+		x11-libs/libX11
+		gd? ( media-libs/gd[png] )
+		dev-libs/fribidi
+		>=media-libs/freetype-2.1
+		media-libs/fontconfig
+		>=dev-libs/libotf-0.9.4
+	)
+	dev-libs/libxml2
+	~dev-db/m17n-db-${PV}"
+# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
+# anthy? ( app-i18n/anthy )
+# ispell? ( app-text/ispell )
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gui.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-candidates-list.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=
+
+	if use X; then
+		myconf+=" --enable-gui $(use_with gd)"
+	else
+		myconf+=" --disable-gui --without-gd"
+	fi
+
+	econf ${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 2d5852c16c60..aedfbc44e579 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>cjk</herd>
+  <herd>cjk</herd>
+  <use>
+    <flag name='X'>
+      Builds the Graphical User Interface API and utilities for the
+      package.
+    </flag>
+    <flag name='gd'>
+      Build API and utilities based on <pkg>media-libs/gd</pkg>. This
+      flag is only meaningful if the X USE flag is also enabled.
+    </flag>
+  </use>
 </pkgmetadata>