Add support for usage of m17n-lib for text shaping.

Package-Manager: portage-2.1.4.4

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 848a31dbf559c5d9bdb1082f0e04a378e954e920..dee477c88ccb5467f016c0d7ca16ce99e136619e 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.195 2008/02/20 06:20:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.196 2008/02/20 20:13:21 ulm Exp $
+
+  20 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.60-r2.ebuild:
+  Add support for usage of m17n-lib for text shaping.
 
 *emacs-cvs-22.1.91 (20 Feb 2008)
 

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index c93b5426229c722d2fb2a97ca5b4c7ef0cd8cecd..8af806ca58ea17fe6726dd66468d87e60759a85b 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -10,13 +10,13 @@ EBUILD emacs-cvs-22.1.90.ebuild 7558 RMD160 fc12481eb57581cb2e34fa0db7f25fc0397a
 EBUILD emacs-cvs-22.1.91.ebuild 7558 RMD160 5a15003c0dd5a5adb044568922306a209611934d SHA1 d57ffbb1d56a3dca209c9547c463f641002250e5 SHA256 b70fcf55fba845e4c20271e29cec65d4ee4df547391fd8ad1c565c874a123f30
 EBUILD emacs-cvs-22.1.9999.ebuild 8091 RMD160 e68f6aaaa1e47de36ca2219a2f39c3c326b132b2 SHA1 c7708341cc18babe65d7070ab25c40493348aec5 SHA256 5d70b4648831f84d9211cf2bc31dfb6210a3ced0595fa8b68c92ca6d61d741e0
 EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7643 RMD160 49de7263d4f7f4ad3da1a071a55f1e695b2fcc4e SHA1 bbf43e1b7cbda19a81084dcb3191f6bf93294c26 SHA256 f7883f7b2a508595bf9a276c4562d2024307213eda951744bf9242aa1a3cdae1
-EBUILD emacs-cvs-23.0.60-r2.ebuild 8469 RMD160 ba151d4c60ddbf4c7d928d8c8c3a05d2827d0508 SHA1 20c7ea023672bc0aef4915f16619ef5d1e7cf170 SHA256 3950b1cc358775569b6dd8a307630480aa12f83a45f301f4758a214dafdc49f8
-MISC ChangeLog 38107 RMD160 795769e7a6851d202bb9fa9cdfeadbf2f8f66add SHA1 d5bc51d04ca81c28ecdc8e49395d3a6956fff54e SHA256 59e38e57bec97d2ea32f728fcbf8217bfcba87edda1a530b90040ebf264c2f0a
+EBUILD emacs-cvs-23.0.60-r2.ebuild 8679 RMD160 3da52c4deb150a02c2ab301e51cb56a6a541a926 SHA1 0425acbf126bafe91c9172f82d5cd67fd56adb4f SHA256 91b1c59a6341cccc1dcf7a8e0ab3011e05fd5846facd978b3729f9eb097ebd02
+MISC ChangeLog 38238 RMD160 00b262de3819878d0e84c6edaa801d58012c3da3 SHA1 aefb0cdd64eacbc6f81eab54314880401ac10217 SHA256 b5f059ea8a5a54eceabd0a9d36734dce89252465b488b6a43f0e83206a2678d2
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAke7xrkACgkQOeoy/oIi7uwBrwCfXqxUwr5YDCtICkIWZ5c7dMf8
-VhQAoLT+wRmFy0kjnNTiEjF/O60ZaAmy
-=4ms3
+iEYEARECAAYFAke8ieUACgkQOeoy/oIi7uw4WQCfRCeyFB/EBV6C4aYH2JyyX624
+kXMAn1AeI4N4JLG/wn8MeCl8+/BxWSIn
+=/9K/
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild
index 8278ea222db24d838a92f2adc24bf21e10770b36..02c8b889e319dae43e5a42f34c58458758cba446 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.8 2008/02/11 20:36:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.9 2008/02/20 20:13:21 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -21,7 +21,7 @@ LICENSE="GPL-3 FDL-1.2 BSD"
 SLOT="23"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
-IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos libotf motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
+IUSE="alsa dbus gif gpm gtk gzip-el hesiod jpeg kerberos libotf m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm"
 RESTRICT="strip"
 
 RDEPEND="sys-libs/ncurses
@@ -48,7 +48,10 @@ RDEPEND="sys-libs/ncurses
                        media-libs/fontconfig
                        media-libs/freetype
                        virtual/xft
-                       libotf? ( >=dev-libs/libotf-0.9.4 )
+                       libotf? (
+                               >=dev-libs/libotf-0.9.4
+                               m17n-lib? ( >=dev-libs/m17n-lib-1.5.1 )
+                       )
                )
                gtk? ( =x11-libs/gtk+-2* )
                !gtk? (
@@ -136,10 +139,13 @@ src_compile() {
                myconf="${myconf} $(use_enable xft font-backend)"
                myconf="${myconf} $(use_with xft freetype) $(use_with xft)"
                if use xft && use libotf; then
-                       # disable m17n-flt since m17n-lib-1.3.4 doesn't support it
-                       myconf="${myconf} --with-libotf --without-m17n-flt"
+                       myconf="${myconf} --with-libotf $(use_with m17n-lib m17n-flt)"
                else
                        myconf="${myconf} --without-libotf --without-m17n-flt"
+                       use libotf && einfo \
+                               "USE flag \"libotf\" has no effect because xft is not set."
+                       use m17n-lib && einfo "USE flag \"m17n-lib\" has no effect" \
+                               "because xft and libotf are not both set."
                fi
 
                # GTK+ is the default toolkit if USE=gtk is chosen with other