Support for XFT options; Resolves Bug #136922.

Package-Manager: portage-2.1

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 9fd460c2bbd79a7d88ac29e35d5d2c5cfe90e620..2b7d28f0df00eda632c775569d34e606cf2ee736 100644 (file)
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.45 2006/04/29 05:07:25 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.46 2006/06/17 01:50:10 mkennedy Exp $
+
+  17 Jun 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  emacs-cvs-23.0.0.ebuild:
+  Support for XFT options; Resolves Bug #136922.
 
   29 Apr 2006; Matthew Kennedy <mkennedy@gentoo.org>
   emacs-cvs-22.0.50-r2.ebuild:

diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 8f1315a0742f361db9541553b447ea5a4189341f..beef7c40d3e08a600efac0a2ae1393cb4db26763 100644 (file)
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,59 +1,59 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4 size 80
+AUX 40aspell-gentoo.el 80 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 SHA1 90ab33e0d4a61dbc8feaabdc3dd08ec059941179 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4 files/40aspell-gentoo.el 80
-AUX 50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 SHA1 8451fb9088e819c0c996df5abd692fd91366bd68 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a size 38
+AUX 50emacs-23.0.0.envd 38 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 SHA1 8451fb9088e819c0c996df5abd692fd91366bd68 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38
 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a files/50emacs-23.0.0.envd 38
-AUX emacs-22.0.50.desktop 242 RMD160 dce325fa6cb9f5f97d1cfc644b0db7cc8172cabc SHA1 ef6dc49ab21d52f8054b3d8b35181f5e9d74e1c1 SHA256 13b1ed362039617b45a15feb3eda9ff6aef49c21be71ed3423e47e81f7497ce9 size 242
+AUX emacs-22.0.50.desktop 242 RMD160 dce325fa6cb9f5f97d1cfc644b0db7cc8172cabc SHA1 ef6dc49ab21d52f8054b3d8b35181f5e9d74e1c1 SHA256 13b1ed362039617b45a15feb3eda9ff6aef49c21be71ed3423e47e81f7497ce9
 MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
 RMD160 dce325fa6cb9f5f97d1cfc644b0db7cc8172cabc files/emacs-22.0.50.desktop 242
 SHA256 13b1ed362039617b45a15feb3eda9ff6aef49c21be71ed3423e47e81f7497ce9 files/emacs-22.0.50.desktop 242
-AUX emacs-23.0.0.desktop 240 RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e SHA1 b32fb6de391e1fc8398ed57d5452f1454a279b38 SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1 size 240
+AUX emacs-23.0.0.desktop 240 RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e SHA1 b32fb6de391e1fc8398ed57d5452f1454a279b38 SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1
 MD5 5585d3da10b713e4f268c2ab75b4b2da files/emacs-23.0.0.desktop 240
 RMD160 ca1edb1c6dbb916658ee9b86130f400498f2e27e files/emacs-23.0.0.desktop 240
 SHA256 3931cd9401f587dae3bc898f39bffebe349b3597bbf7bd3199b7ec1ab01167d1 files/emacs-23.0.0.desktop 240
-AUX emacs-cvs-21.3.50-nofink.diff 1520 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 SHA1 0adbb79e61ef1a37fd7df0bd779c32ee4085d4e6 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 size 1520
+AUX emacs-cvs-21.3.50-nofink.diff 1520 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 SHA1 0adbb79e61ef1a37fd7df0bd779c32ee4085d4e6 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-cvs-21.3.50-nofink.diff 1520
 RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 files/emacs-cvs-21.3.50-nofink.diff 1520
 SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 files/emacs-cvs-21.3.50-nofink.diff 1520
-AUX emacs-subdirs-el-gentoo.diff 1580 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e SHA1 44c56f1ed16896225f85e62804b8c91bb90392ae SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e size 1580
+AUX emacs-subdirs-el-gentoo.diff 1580 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e SHA1 44c56f1ed16896225f85e62804b8c91bb90392ae SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e
 MD5 bd7222d2c80bddb9077f389897887cdf files/emacs-subdirs-el-gentoo.diff 1580
 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e files/emacs-subdirs-el-gentoo.diff 1580
 SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e files/emacs-subdirs-el-gentoo.diff 1580
-AUX xft-bgalpha.patch 690 RMD160 eb4bee1226982b1b470f0b267960fd177cbc5eb1 SHA1 43db85cdfcdd50ef1d09b8048bdbdb49e996db04 SHA256 51e1ee64d1fbfebec95e1863b476692c7291f44fb32a7f85e025b57c447d5f6f size 690
+AUX xft-bgalpha.patch 690 RMD160 eb4bee1226982b1b470f0b267960fd177cbc5eb1 SHA1 43db85cdfcdd50ef1d09b8048bdbdb49e996db04 SHA256 51e1ee64d1fbfebec95e1863b476692c7291f44fb32a7f85e025b57c447d5f6f
 MD5 91da809381cbee2642bee45da75c182b files/xft-bgalpha.patch 690
 RMD160 eb4bee1226982b1b470f0b267960fd177cbc5eb1 files/xft-bgalpha.patch 690
 SHA256 51e1ee64d1fbfebec95e1863b476692c7291f44fb32a7f85e025b57c447d5f6f files/xft-bgalpha.patch 690
-AUX xft-invertcursor.patch 1033 RMD160 5cc8d806b0fa132d4ce54b7dd93e6309c8521ef5 SHA1 df028065a7c2fab0c301f993347725edf1b651d3 SHA256 cbf87d20127afe9245611292577dda6daebc74bf31e6d8f2cbff138933ac2c9a size 1033
+AUX xft-invertcursor.patch 1033 RMD160 5cc8d806b0fa132d4ce54b7dd93e6309c8521ef5 SHA1 df028065a7c2fab0c301f993347725edf1b651d3 SHA256 cbf87d20127afe9245611292577dda6daebc74bf31e6d8f2cbff138933ac2c9a
 MD5 3a1b3ce71cc21223bd102617c38cd23e files/xft-invertcursor.patch 1033
 RMD160 5cc8d806b0fa132d4ce54b7dd93e6309c8521ef5 files/xft-invertcursor.patch 1033
 SHA256 cbf87d20127afe9245611292577dda6daebc74bf31e6d8f2cbff138933ac2c9a files/xft-invertcursor.patch 1033
-AUX xft-xfaces-fixcrash.patch 631 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 SHA1 6437094007520beb851f76bc9d34f0f687c6b027 SHA256 1924c52d328a846eaa1ef78766cbabeb5fcfe5427d42ca4de3d5d6a646e46b33 size 631
+AUX xft-xfaces-fixcrash.patch 631 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 SHA1 6437094007520beb851f76bc9d34f0f687c6b027 SHA256 1924c52d328a846eaa1ef78766cbabeb5fcfe5427d42ca4de3d5d6a646e46b33
 MD5 2e8d8757cc9ed43a0ffe56c8dbcb93df files/xft-xfaces-fixcrash.patch 631
 RMD160 1e7ab9c6e776fdcf8c995330f96c234359d8ad48 files/xft-xfaces-fixcrash.patch 631
 SHA256 1924c52d328a846eaa1ef78766cbabeb5fcfe5427d42ca4de3d5d6a646e46b33 files/xft-xfaces-fixcrash.patch 631
-EBUILD emacs-cvs-22.0.50-r1.ebuild 5902 RMD160 774ce7098425636c190ec6392e39fbd698cd25eb SHA1 fdc641ca71c93b1d803cc636591d122bf2260443 SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8 size 5902
+EBUILD emacs-cvs-22.0.50-r1.ebuild 5902 RMD160 774ce7098425636c190ec6392e39fbd698cd25eb SHA1 fdc641ca71c93b1d803cc636591d122bf2260443 SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8
 MD5 f0756af862b825d76bba1038935926b5 emacs-cvs-22.0.50-r1.ebuild 5902
 RMD160 774ce7098425636c190ec6392e39fbd698cd25eb emacs-cvs-22.0.50-r1.ebuild 5902
 SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8 emacs-cvs-22.0.50-r1.ebuild 5902
-EBUILD emacs-cvs-22.0.50-r2.ebuild 5656 RMD160 a795219a55ab8b4ae73fd8749fa5d634c9b5f23a SHA1 20294dd647ad1b523597abaa99e951aa8861e1c0 SHA256 26079b84330ffd78dcc0c8f1fdf734d8cafb119c4b735931476fb207c1a11f57 size 5656
+EBUILD emacs-cvs-22.0.50-r2.ebuild 5656 RMD160 a795219a55ab8b4ae73fd8749fa5d634c9b5f23a SHA1 20294dd647ad1b523597abaa99e951aa8861e1c0 SHA256 26079b84330ffd78dcc0c8f1fdf734d8cafb119c4b735931476fb207c1a11f57
 MD5 b2e75f505160551ef5c239168f94523f emacs-cvs-22.0.50-r2.ebuild 5656
 RMD160 a795219a55ab8b4ae73fd8749fa5d634c9b5f23a emacs-cvs-22.0.50-r2.ebuild 5656
 SHA256 26079b84330ffd78dcc0c8f1fdf734d8cafb119c4b735931476fb207c1a11f57 emacs-cvs-22.0.50-r2.ebuild 5656
-EBUILD emacs-cvs-23.0.0.ebuild 4935 RMD160 b58ad4ab62bb252166797ea07cbc24e13a62fb7f SHA1 5150adc1d0215e9970d073e79a4d825023c53ee4 SHA256 6db2537e894870f3b3c4a30c973d9088f4981281ded86b9b82c257080287c6d7 size 4935
-MD5 956f1cefd7bbaa02c1e7de3835b86c34 emacs-cvs-23.0.0.ebuild 4935
-RMD160 b58ad4ab62bb252166797ea07cbc24e13a62fb7f emacs-cvs-23.0.0.ebuild 4935
-SHA256 6db2537e894870f3b3c4a30c973d9088f4981281ded86b9b82c257080287c6d7 emacs-cvs-23.0.0.ebuild 4935
-MISC ChangeLog 7833 RMD160 42831bb27753c95ece18cfa3dba0abdc79980bc0 SHA1 936164d477c23c9caf79051f2c39f8340743bb12 SHA256 0c6403febf0a462b4f1ad0c6fcf7d1f0b30db8ffd4d8ef5e614c9b07b0e62d29 size 7833
-MD5 46a53d48f374b68d9b6e1372baa54f75 ChangeLog 7833
-RMD160 42831bb27753c95ece18cfa3dba0abdc79980bc0 ChangeLog 7833
-SHA256 0c6403febf0a462b4f1ad0c6fcf7d1f0b30db8ffd4d8ef5e614c9b07b0e62d29 ChangeLog 7833
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab size 158
+EBUILD emacs-cvs-23.0.0.ebuild 5212 RMD160 7326b14349ccc989cc9621c3544c3b51ad9dbba4 SHA1 19d7942f6076a3bb7932495261513f4e9c76754d SHA256 d6296a96a34c99873295b6f75fc342031662e4d8a7aff8883f26798ef21446fd
+MD5 7be05f3cfe422addc9f1bcaba9722fec emacs-cvs-23.0.0.ebuild 5212
+RMD160 7326b14349ccc989cc9621c3544c3b51ad9dbba4 emacs-cvs-23.0.0.ebuild 5212
+SHA256 d6296a96a34c99873295b6f75fc342031662e4d8a7aff8883f26798ef21446fd emacs-cvs-23.0.0.ebuild 5212
+MISC ChangeLog 7963 RMD160 aa758bf71bebfc2ab561b464608f9b22f65da41a SHA1 f029489b1d43e5c2bdbb61870e846a63dfb8b229 SHA256 5646695900dfc68cdc99a4193f6ac2200738329bbfe26fbf3274962246f3aaf1
+MD5 787cc5942deeaaa94ff1857330733b62 ChangeLog 7963
+RMD160 aa758bf71bebfc2ab561b464608f9b22f65da41a ChangeLog 7963
+SHA256 5646695900dfc68cdc99a4193f6ac2200738329bbfe26fbf3274962246f3aaf1 ChangeLog 7963
+MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
@@ -69,7 +69,7 @@ SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEUvSZyiNZaEAZA+ARApMpAKCDJmES+az3ucyx98RwgRBHKBveAwCfSSb0
-3wGNA3+CGS3IOTT6JoeCe1s=
-=x3d6
+iD8DBQFEk1/XyiNZaEAZA+ARAvWAAJ4kD5rP/fiBmpgoOA+dyge6RSvbeQCfVXY5
+PCDrcRlXzjtWuW8VxPcT+xc=
+=/XFU
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index 2aba2fd245dd1d8dd72baa03fa063923eaffd6fe..c12388176223de62cf5e2d30daa8d6bbfa2f77b3 100644 (file)
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.ebuild,v 1.8 2006/02/26 21:48:47 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.9 2006/06/17 01:50:10 mkennedy Exp $
 
 ECVS_AUTH="pserver"
 export CVS_RSH="ssh"
@@ -14,7 +14,7 @@ ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwA
 
 inherit elisp-common cvs alternatives flag-o-matic eutils
 
-IUSE="X Xaw3d aqua gif gnome gtk jpeg nls png spell tiff"
+IUSE="X Xaw3d aqua gif gnome gtk jpeg nls png spell tiff xft"
 
 S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
@@ -36,7 +36,8 @@ DEPEND=">=sys-libs/ncurses-5.3
                png? ( >=media-libs/libpng-1.2.5 )
                gtk? ( =x11-libs/gtk+-2* )
                !gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
-               gnome? ( gnome-base/gnome-desktop ) )
+               gnome? ( gnome-base/gnome-desktop )
+               xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) )
        nls? ( >=sys-devel/gettext-0.11.5 )
        >=sys-apps/portage-2.0.51_rc1"
 
@@ -67,6 +68,9 @@ src_compile() {
        if use X; then
                myconf="${myconf} --with-x"
                myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
+               myconf="${myconf} $(use_enable xft font-backend)"
+               myconf="${myconf} $(use_with xft freetype)"
+               myconf="${myconf} $(use_with xft)"
                myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
                myconf="${myconf} $(use_with gif) $(use_with png)"
                if use gtk; then
@@ -89,6 +93,7 @@ src_compile() {
                        --without-x \
                        $(use_with jpeg) $(use_with tiff) \
                        $(use_with gif) $(use_with png) \
+                       $(use_enable xft font-backend) \
                         || die "econf carbon emacs failed"
                make bootstrap || die "make carbon emacs bootstrap failed"
        fi
@@ -138,7 +143,7 @@ src_install () {
                mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
        done
 
-       dodoc BUGS ChangeLog README
+       dodoc BUGS ChangeLog ChangeLog.unicode README README.unicode
 
        if use gnome; then
                insinto /usr/share/applications