Version bump.

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

4 files changed, 142 insertions, 6 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index 08f024d62f7e..3fc8176d7017 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/m17n-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.52 2011/04/12 08:16:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.53 2011/11/10 16:27:35 naota Exp $
+
+*m17n-lib-1.6.3 (10 Nov 2011)
+
+  10 Nov 2011; Naohiro Aota <naota@gentoo.org> +m17n-lib-1.6.3.ebuild,
+  +files/m17n-lib-1.6.3-parallel-make.patch:
+  Version bump
 
   12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> m17n-lib-1.6.2.ebuild:
   Workaround parallel install failures (bug #363239).
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index f1e0c28727d9..bbdc504b1a2b 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -4,22 +4,25 @@ 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
+AUX m17n-lib-1.6.3-parallel-make.patch 2637 RMD160 b241d5758673d3474642c699b0c9073be490fe0d SHA1 a23ed80ca6fe0fdd802304504896e1368276abf4 SHA256 b1b0192ab002440f57e1283cbdccdcb65136fdf0d5088cb0c7932822a16d14a6
 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
+DIST m17n-lib-1.6.3.tar.gz 1033048 RMD160 e7c4f11819de2bb7137addd97e76ff36eb8020fe SHA1 b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f SHA256 ff5ebe09572a5e6d4a376783a78d4355f0b17a71fbaf8b01978230be7eef735e
 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
 EBUILD m17n-lib-1.6.2.ebuild 1394 RMD160 874dd8cb1c529f92af97a8efeeead77a8da12595 SHA1 5a5f7bccb9f6550d2f7b9c1db2c1999dfe5fb52a SHA256 08764dcb724d1b97afb2dc29e42fcbf036b54f545dcd2b2f0d9f10f9e6cd09c0
-MISC ChangeLog 6532 RMD160 856a08eba3deef95624ca85846c04a298794be09 SHA1 58c6e5acfa3ac38fbfeb839b7511e7790fb5b84d SHA256 10038e1517cd82ef4b3d7924de58bf6c75b45b498a01328ffd41057dc86537d5
+EBUILD m17n-lib-1.6.3.ebuild 1359 RMD160 422da91c325341bdef49a8d27d9b7da4164f8a9c SHA1 b2113078c7cd1ef87a62344dc97066969057906a SHA256 02d2269d83042fb2e0119bd179afa6abf56bcae3635170d0e3531658f8b5b144
+MISC ChangeLog 6691 RMD160 745effc180f250a75a53f94278f9ffede1af2ee3 SHA1 0f3804e3269c3757cde312b1a9b218efd10a52e3 SHA256 6c689f59c2dc708add9c20b782a3e48bd23e4ef71357f74e346558c35739b83b
 MISC metadata.xml 458 RMD160 f237e0ef14015f6ddd309814e5622be786dac5f1 SHA1 14094744a539d39b3b8755f4e0deadfbf2ec20f2 SHA256 918c16fe3a7ec4c207a8b2ae8b9ccf3dd82e3c62e776625dd0a497637fbe1cf0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2kCjoACgkQAiZjviIA2XgLWwCgrs//WXTC5VfeHLyUkWilfWFy
-dhIAn3tqfZtCPMSLXRTkQHWz2u/+Dxhy
-=KQUy
+iEYEARECAAYFAk67+38ACgkQGpDnPLSHuMBjnwCfcjBpJQUiKB9cGFC2AGwr0J6X
+veQAn0jkuewgo8/zfX9araD3cV6eEYaS
+=qfGs
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch b/dev-libs/m17n-lib/files/m17n-lib-1.6.3-parallel-make.patch
new file mode 100644
index 000000000000..63da14054779
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.6.3-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@ @FONTCONFIG_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@ @FONTCONFIG_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.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.6.3.ebuild
new file mode 100644
index 000000000000..e36e30c2745f
--- /dev/null
+++ b/dev-libs/m17n-lib/m17n-lib-1.6.3.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.3.ebuild,v 1.1 2011/11/10 16:27:35 naota 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}"/${PN}-1.6.2-gui.patch \
+		"${FILESDIR}"/${PN}-1.6.3-parallel-make.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() {
+	# bug #363239
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}