dev-libs/m17n-lib: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1

10 files changed, 38 insertions, 193 deletions

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
deleted file mode 100644
index 40cd85d49c2b..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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
deleted file mode 100644
index 2c37246a6e5d..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 4402188aa887..000000000000
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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/files/m17n-lib-1.6.3-configure.patch b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
index 024dea6fea42..00ba09493f3d 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-configure.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-configure.patch
@@ -1,5 +1,3 @@
-diff --git a/configure.ac b/configure.ac
-index 2e58d68..49b812a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -125,7 +125,9 @@ if test "x$no_x" != "xyes"; then
diff --git a/dev-libs/m17n-lib/files/m17n-lib-gui.patch b/dev-libs/m17n-lib/files/m17n-lib-gui.patch
new file mode 100644
index 000000000000..b60d81bbc221
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-gui.patch
@@ -0,0 +1,13 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -97,8 +97,8 @@
+ 
+ dnl Checks which levels of APIs should be compiled.
+ 
+-AC_ARG_ENABLE(gui,
+-	      AS_HELP_STRING([--enable-gui],[enable GUI level APIs (default is YES)]))
++AC_ARG_WITH(gui,
++	      AS_HELP_STRING([--with-gui],[enable GUI level APIs (default is YES)]))
+ 
+ AM_CONDITIONAL(WITH_GUI, test x$with_gui != xno)
+ 
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-ispell.patch b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch
index d548bdf20486..c9f87fb1c6d0 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-ispell.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-ispell.patch
@@ -1,5 +1,3 @@
-diff --git a/example/mimx-ispell.c b/example/mimx-ispell.c
-index daa244f..7507de8 100644
 --- a/example/mimx-ispell.c
 +++ b/example/mimx-ispell.c
 @@ -166,7 +166,7 @@ ispell_word (MPlist *args)
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch
index 63da14054779..a035921d055c 100644
--- a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch
+++ b/dev-libs/m17n-lib/files/m17n-lib-parallel-make.patch
@@ -1,8 +1,6 @@
-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 = \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -53,7 +53,7 @@
  	language.h language.c \
  	mlocale.h locale.c \
  	m17n.h m17n.c
@@ -11,7 +9,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
  libm17n_la_LDFLAGS = -export-dynamic ${VINFO}
  
  FLT_SOURCES = \
-@@ -61,7 +61,7 @@ FLT_SOURCES = \
+@@ -61,7 +61,7 @@
  	m17n-flt.h m17n-flt.c
  
  libm17n_flt_la_SOURCES = ${FLT_SOURCES}
@@ -20,7 +18,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
  libm17n_flt_la_LDFLAGS = -export-dynamic ${VINFO}
  
  GUI_SOURCES = \
-@@ -80,7 +80,7 @@ OPTIONAL_LD_FLAGS = \
+@@ -80,7 +80,7 @@
  	@FONTCONFIG_LD_FLAGS@
  
  libm17n_gui_la_SOURCES = ${GUI_SOURCES}
@@ -29,7 +27,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
  libm17n_gui_la_LDFLAGS = -export-dynamic ${VINFO}
  
  if WITH_GUI
-@@ -90,11 +90,11 @@ module_LTLIBRARIES = libm17n-X.la libm17
+@@ -90,11 +90,11 @@
  X_LD_FLAGS = ${X_PRE_LIBS} ${X_LIBS} @X11_LD_FLAGS@ ${X_EXTRA_LIBS}
  
  libm17n_X_la_SOURCES = m17n-X.h m17n-X.c
@@ -43,7 +41,7 @@ Index: m17n-lib-1.6.2/src/Makefile.am
  libm17n_gd_la_LDFLAGS = -avoid-version -module
  
  endif
-@@ -121,14 +121,14 @@ if MAINTAINER_MODE
+@@ -121,14 +121,14 @@
  noinst_PROGRAMS = linkcore linkshell linkgui
  
  linkcore_SOURCES = linkcore.c
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
index a8e19cb778ec..3115d8bcdcb7 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -41,10 +41,10 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.6.2-gui.patch \
-		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
-		"${FILESDIR}"/${PN}-1.6.3-configure.patch \
-		"${FILESDIR}"/${PN}-1.6.3-ispell.patch
+		"${FILESDIR}"/${PN}-gui.patch \
+		"${FILESDIR}"/${PN}-parallel-make.patch \
+		"${FILESDIR}"/${PN}-configure.patch \
+		"${FILESDIR}"/${PN}-ispell.patch
 
 	eautoreconf
 }
@@ -53,11 +53,11 @@ src_configure() {
 	local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
 
 	if use X; then
-		myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+		myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
 $(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
 $(use_with xft)"
 	else
-		myconf+=" --without-x --disable-gui --without-athena --without-fribidi
+		myconf+=" --without-x --without-gui --without-athena --without-fribidi
 --without-fontconfig --without-freetype --without-gd --without-libotf
 --without-xft"
 	fi
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
index aec9881e7827..3ef131f92f82 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -37,8 +37,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.6.2-gui.patch \
-		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch
+		"${FILESDIR}"/${PN}-gui.patch \
+		"${FILESDIR}"/${PN}-parallel-make.patch
 
 	eautoreconf
 }
@@ -47,9 +47,9 @@ src_configure() {
 	local myconf=
 
 	if use X; then
-		myconf+=" --enable-gui $(use_with gd)"
+		myconf+=" --with-gui $(use_with gd)"
 	else
-		myconf+=" --disable-gui --without-gd"
+		myconf+=" --without-gui --without-gd"
 	fi
 
 	econf ${myconf} || die
diff --git a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
index 1641b70b5c80..4e09dc7686df 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.4.ebuild
@@ -41,10 +41,10 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.6.2-gui.patch \
-		"${FILESDIR}"/${PN}-1.6.3-parallel-make.patch \
-		"${FILESDIR}"/${PN}-1.6.3-configure.patch \
-		"${FILESDIR}"/${PN}-1.6.3-ispell.patch
+		"${FILESDIR}"/${PN}-gui.patch \
+		"${FILESDIR}"/${PN}-parallel-make.patch \
+		"${FILESDIR}"/${PN}-configure.patch \
+		"${FILESDIR}"/${PN}-ispell.patch
 
 	eautoreconf
 }
@@ -53,11 +53,11 @@ src_configure() {
 	local myconf="$(use_with anthy) $(use_with spell ispell) $(use_with libxml2)"
 
 	if use X; then
-		myconf+=" --with-x --enable-gui $(use_with athena) $(use_with bidi fribidi)
+		myconf+=" --with-x --with-gui $(use_with athena) $(use_with bidi fribidi)
 $(use_with fontconfig) $(use_with xft freetype) $(use_with gd) $(use_with libotf)
 $(use_with xft)"
 	else
-		myconf+=" --without-x --disable-gui --without-athena --without-fribidi
+		myconf+=" --without-x --without-gui --without-athena --without-fribidi
 --without-fontconfig --without-freetype --without-gd --without-libotf
 --without-xft"
 	fi