diff --git a/sdk_container/src/third_party/portage-stable/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild new file mode 100644 index 0000000000..e775b8d6ce --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild,v 1.1 2011/04/04 01:12:21 flameeyes Exp $ + +EAPI=4 + +DESCRIPTION="Contribution database for the m17n library" +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="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="dev-db/m17n-db" + +src_configure() { + # force the script not to test for m17n presence, trust Portage + # dependency handling. + export HAVE_M17N_DB=yes + + econf +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/files/do-not-commit-extra-space.patch b/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/files/do-not-commit-extra-space.patch new file mode 100644 index 0000000000..465078a201 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/files/do-not-commit-extra-space.patch @@ -0,0 +1,16 @@ +Index: MIM/zh-util.mim +=================================================================== +RCS file: /cvs/m17n/m17n-db/MIM/zh-util.mim,v +retrieving revision 1.3 +diff -u -r1.3 zh-util.mim +--- MIM/zh-util.mim 11 Jul 2008 01:28:53 -0000 1.3 ++++ MIM/zh-util.mim 5 Nov 2010 07:07:48 -0000 +@@ -65,7 +65,7 @@ + ((BackSpace))) + + (commit-preedit +- ((S-\ )))) ++ ((\ )))) + + (state + (check-undo diff --git a/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/m17n-db-1.6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/m17n-db-1.6.2.ebuild new file mode 100644 index 0000000000..4218d7380b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/m17n-db/m17n-db-1.6.2.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.6.2.ebuild,v 1.1 2011/04/04 00:59:04 flameeyes Exp $ + +EAPI=4 + +DESCRIPTION="Database for the m17n library" +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="" + +DEPEND="sys-devel/gettext" +RDEPEND="virtual/libintl" + +src_prepare() { + epatch "${FILESDIR}"/do-not-commit-extra-space.patch +} + +src_install() { + emake DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog NEWS README + docinto FORMATS; dodoc FORMATS/* + docinto UNIDATA; dodoc UNIDATA/* +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch b/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-candidates-list.patch new file mode 100644 index 0000000000..40cd85d49c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch b/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-gui.patch new file mode 100644 index 0000000000..2c37246a6e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch b/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/files/m17n-lib-1.6.2-parallel-make.patch new file mode 100644 index 0000000000..4402188aa8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/m17n-lib/m17n-lib-1.6.2.ebuild new file mode 100644 index 0000000000..238c83786c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 +}