diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2008-02-02 14:18:11 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2008-02-02 14:18:11 +0000 |
| commit | 586c62680f4ed30d5daabb04646af5d593e61b3f (patch) | |
| tree | cbf504d453eb8a6358bc9d160834bc5e58fdbda5 /app-editors | |
| parent | Stable on amd64/x86 for 2.6.24 compatibility. (diff) | |
| download | historical-586c62680f4ed30d5daabb04646af5d593e61b3f.tar.gz historical-586c62680f4ed30d5daabb04646af5d593e61b3f.tar.bz2 historical-586c62680f4ed30d5daabb04646af5d593e61b3f.zip | |
Fix logic of libotf flag.
Package-Manager: portage-2.1.4.1
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-cvs/Manifest | 8 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest index 3812de440620..f4442bb868e2 100644 --- a/app-editors/emacs-cvs/Manifest +++ b/app-editors/emacs-cvs/Manifest @@ -8,13 +8,13 @@ DIST emacs-cvs-23.0.50_pre20080201.tar.bz2 21883295 RMD160 fa6f3b46fd642d4168018 EBUILD emacs-cvs-22.1.90.ebuild 7557 RMD160 bf933a84ea5136261157734042b46938d10ae256 SHA1 a56181e252a0af4b04b02b76bdcdd53b92ea49d6 SHA256 3ac27d22d660b125ccff0f1c6da5d6cf1f8edaf2215f85d5640a626e6c2d7aa6 EBUILD emacs-cvs-22.1.9999.ebuild 8090 RMD160 d57a0f5fdc2ed6cb5fa7aa6b0b0ed33c255b4b29 SHA1 ddb53706964e156268f97e2b30b5c4bd5a97e52a SHA256 754a71ccf62e410a430958056de8689e7176a492c89562fa341448b79ca4eeed EBUILD emacs-cvs-23.0.50_pre20080201.ebuild 7636 RMD160 b390c2bf47ee72e66584ba395ff6ca6b6869b1f4 SHA1 5c9a29c460de9c864b2ddd7c885652e51eec2c0e SHA256 5e651025b62411b942dd3091efad6dda14e8bb280a5dd99d2accaf23c979ce14 -EBUILD emacs-cvs-23.0.60-r2.ebuild 8381 RMD160 8d0fc726a2f8ad46a73c356b30410d91e52e8050 SHA1 c8364e7b5871e493fd35a7f52ead4a27be71b660 SHA256 df7107fe8288c45ff332c6b1604cb15069f728aa6386be3e49ae1acc262bfcc4 +EBUILD emacs-cvs-23.0.60-r2.ebuild 8484 RMD160 9d858db660117f8643bb78f8b5df1e4bee410283 SHA1 326de385132e883252e1ceebc0fec728de703c2e SHA256 58b7884dcb42c6ffd10edf7e3bf56556234cd2ea4bf33d80e999b68c1d22eef5 MISC ChangeLog 37472 RMD160 79488f246df88ba4c89680c1e8c25ac46bee6f3b SHA1 1fd5cd22ecf38e67aca053486b59ee6c37480877 SHA256 6ff8adf6e89b6c0ee843de27c390f04a58ee8395313bb34d2997bdaecef4f505 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) -iEYEARECAAYFAkekNHUACgkQOeoy/oIi7uwhCgCgmF60O+e4D3Wgl4pOtJ2l7bbS -F8gAoLzqHxZe16svhu/zQ/032qC6dV7E -=+/Jz +iEYEARECAAYFAkeke6MACgkQOeoy/oIi7uydLwCgybv7Twc1gPi8ugGhm5A36Lwy +iR0AnAk9NR+ujIg2JrCy733pfDM86K7S +=Uctw -----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 4e2783604a90..d05650e1c198 100644 --- 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.3 2008/02/02 09:14:26 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.4 2008/02/02 14:18:11 ulm Exp $ ECVS_AUTH="pserver" ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs" @@ -46,6 +46,7 @@ RDEPEND="sys-libs/ncurses xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig + media-libs/freetype virtual/xft libotf? ( >=dev-libs/libotf-0.9.4 ) ) @@ -129,8 +130,12 @@ src_compile() { myconf="${myconf} --with-x" myconf="${myconf} $(use_with toolkit-scroll-bars)" myconf="${myconf} $(use_enable xft font-backend)" - myconf="${myconf} $(use_with xft freetype)" - myconf="${myconf} $(use_with xft) $(use_with libotf)" + myconf="${myconf} $(use_with xft freetype) $(use_with xft)" + if use xft && use libotf; then + myconf="${myconf} --with-libotf" + else + myconf="${myconf} --without-libotf" + fi myconf="${myconf} $(use_with jpeg) $(use_with tiff)" myconf="${myconf} $(use_with gif) $(use_with png)" myconf="${myconf} $(use_with xpm) $(use_with svg rsvg)" |