Add a patch to deal with newer fribidi. Bug #389121

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

4 files changed, 47 insertions, 10 deletions

diff --git a/dev-libs/m17n-lib/ChangeLog b/dev-libs/m17n-lib/ChangeLog
index 3fc8176d7017..903fd7083550 100644
--- a/dev-libs/m17n-lib/ChangeLog
+++ b/dev-libs/m17n-lib/ChangeLog
@@ -1,6 +1,10 @@
 # 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.53 2011/11/10 16:27:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/ChangeLog,v 1.54 2011/11/20 14:26:45 naota Exp $
+
+  20 Nov 2011; Naohiro Aota <naota@gentoo.org> m17n-lib-1.5.2.ebuild,
+  +files/m17n-lib-1.5.2-fribidi.patch:
+  Add a patch to deal with newer fribidi. Bug #389121
 
 *m17n-lib-1.6.3 (10 Nov 2011)
 
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index bbdc504b1a2b..07e303c6bdfd 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX m17n-lib-1.5.2-fribidi.patch 379 RMD160 a22882ef845506c67749c15975d5d5b089adb45b SHA1 f5db923f58f8a8d78888aa3cf8438b16407da1e0 SHA256 30dead6ce68a07679d28b61876d8a768626b18df94ef61778825f924aa5198e4
 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
@@ -11,18 +12,28 @@ DIST m17n-lib-1.5.4.tar.gz 962454 RMD160 122c566e308df48191ebb37399110f525362329
 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.2.ebuild 1455 RMD160 b028c171060d3d9c3099b851d93f8e5cebce0d9b SHA1 de389dfac60d48b32268ebf94a184d51c92bf88c SHA256 c953c147e8dfdb3f6f2d7db79b28eaaf7edd73b64355e4b25fad9ad3aff30ce9
 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
 EBUILD m17n-lib-1.6.3.ebuild 1359 RMD160 422da91c325341bdef49a8d27d9b7da4164f8a9c SHA1 b2113078c7cd1ef87a62344dc97066969057906a SHA256 02d2269d83042fb2e0119bd179afa6abf56bcae3635170d0e3531658f8b5b144
-MISC ChangeLog 6691 RMD160 745effc180f250a75a53f94278f9ffede1af2ee3 SHA1 0f3804e3269c3757cde312b1a9b218efd10a52e3 SHA256 6c689f59c2dc708add9c20b782a3e48bd23e4ef71357f74e346558c35739b83b
+MISC ChangeLog 6855 RMD160 341f641b8590bbd12cde6b58295dab3c4bb74ef8 SHA1 d05392fd36a4bacc4a1f4c77c78bca1b82f9730d SHA256 d78132faa08f4e50c11f61c05d6de5e696ea91514a1f9d0dc80eb0f26078004b
 MISC metadata.xml 458 RMD160 f237e0ef14015f6ddd309814e5622be786dac5f1 SHA1 14094744a539d39b3b8755f4e0deadfbf2ec20f2 SHA256 918c16fe3a7ec4c207a8b2ae8b9ccf3dd82e3c62e776625dd0a497637fbe1cf0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk67+38ACgkQGpDnPLSHuMBjnwCfcjBpJQUiKB9cGFC2AGwr0J6X
-veQAn0jkuewgo8/zfX9araD3cV6eEYaS
-=qfGs
+iQIcBAEBCAAGBQJOyQ4nAAoJEDYO1FT4VRUU2fAP/jEM0B84seyzFRYqj/Aya20A
+HUVUslvsO34xBKFvBL+SLIzfOUY/gDcG7NVkMqTMPvKGoZhTlhWFWWPz3ifOG3U2
+3XoUIzHLzuTnhEbQAJYhaJl1dX18nkkovJ/PFyb5Z2CLkOrQhASmEgRz9W0/GCtw
+5CkqlXAFdG4HUhdpsPonRiqpxpLKG8eMBFB6BoFMmi6cwB6C+MtA3lI2yU2eb852
+bijf22xCYaMjTaS0WkO3Vn+s2i0pqIwv+ZdbE//TL/HFo8Ps+iX055dwBlS1/uBb
+8Jj6sFxJTJzIwHgxTHyrnmyXIBEOp0iszsyaLOjhEWm+56i5ST9VCngfVNvwaxUy
+U9U82qz20cFx7Bs17pXj4NhLaKVmVjU2+Ijd/rzOvvXJckM2JkSWFxDtqCwyR/y4
+lwfY0ICLUDIn99JZPI+EecmzAKI9TP1AIF/iNsK4BxoPGvIg+HVqadyShUoHhkCR
+0Fzqr5LLQV3N+LsT95goUGxkenUkA1HUo3wlWRreUtOyf/+PxNqpbdoxC/jA7Xfk
+XxCQtD1DWY8RVRNABSR4xJOfaFKNY24ZGJf4EteeeG8Cha3Ap8qyagdlWvO5BZw6
+/AfO7r7tqeTBRoW83AiciKIoz67C/5krzvFb1KG0206qrbqhiTU4z/UXEHT2eofE
+Luq/rRnyAzqUG6wBpofX
+=JOXR
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch b/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch
new file mode 100644
index 000000000000..cfc298e320e7
--- /dev/null
+++ b/dev-libs/m17n-lib/files/m17n-lib-1.5.2-fribidi.patch
@@ -0,0 +1,16 @@
+diff --git a/src/draw.c b/src/draw.c
+index f9667d0..1ba6cf6 100644
+--- a/src/draw.c
++++ b/src/draw.c
+@@ -1750,7 +1750,11 @@ mdraw__init ()
+   MbidiS = msymbol ("S");
+   MbidiNSM = msymbol ("NSM");
+ #ifdef HAVE_FRIBIDI
++#if FRIBIDI_INTERFACE_VERSION < 3
+   fribidi_set_mirroring (TRUE);
++#else
++  fribidi_set_mirroring (1);
++#endif
+ #endif
+ 
+   M_break_at_space = msymbol ("bs");
diff --git a/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild b/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild
index 63d04057407f..e4f9eccd4a2f 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5.2.ebuild,v 1.8 2010/01/31 11:49:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.5.2.ebuild,v 1.9 2011/11/20 14:26:45 naota Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 DESCRIPTION="Multilingual Library for Unix/Linux"
 HOMEPAGE="http://www.m17n.org/m17n-lib/"
@@ -41,6 +41,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fribidi.patch
+}
+
 src_compile() {
 	append-flags -fPIC
 	econf $(use_with gd) || die