diff options
author | Ulrich Müller <ulm@gentoo.org> | 2008-02-28 05:51:56 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2008-02-28 05:51:56 +0000 |
commit | 530167a2a9910870ebc183aba2e290d60a10a781 (patch) | |
tree | b2b133d35c87b99fcfe1ebead0f17966cc71a6c0 /app-editors | |
parent | amd64 stable, bug 209148 (diff) | |
download | gentoo-2-530167a2a9910870ebc183aba2e290d60a10a781.tar.gz gentoo-2-530167a2a9910870ebc183aba2e290d60a10a781.tar.bz2 gentoo-2-530167a2a9910870ebc183aba2e290d60a10a781.zip |
Drop libotf USE flag.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 5 | ||||
-rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index ded911b90f32..d3ec144561c7 100644 --- 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.198 2008/02/26 13:27:34 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.199 2008/02/28 05:51:56 ulm Exp $ + + 28 Feb 2008; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.60-r2.ebuild: + Drop libotf USE flag; Upstream says that libotf without m17n-flt is useless. 21 Feb 2008; Christian Faulhammer <opfer@gentoo.org> emacs-cvs-23.0.60-r2.ebuild: 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 ff1369729a5d..d4b2c4328b96 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.10 2008/02/21 10:57:05 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.60-r2.ebuild,v 1.11 2008/02/28 05:51:56 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 m17n-lib 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 m17n-lib motif png spell sound source svg tiff toolkit-scroll-bars X Xaw3d xft xpm" RESTRICT="strip" RDEPEND="sys-libs/ncurses @@ -48,9 +48,9 @@ RDEPEND="sys-libs/ncurses media-libs/fontconfig media-libs/freetype virtual/xft - libotf? ( + m17n-lib? ( >=dev-libs/libotf-0.9.4 - m17n-lib? ( >=dev-libs/m17n-lib-1.5.1 ) + >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( =x11-libs/gtk+-2* ) @@ -138,14 +138,14 @@ src_compile() { myconf="${myconf} $(use_enable xft font-backend)" myconf="${myconf} $(use_with xft freetype) $(use_with xft)" - if use xft && use libotf; then - myconf="${myconf} --with-libotf $(use_with m17n-lib m17n-flt)" + + if use xft; then + myconf="${myconf} $(use-with m17n-lib libotf)" + myconf="${myconf} $(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." + use m17n-lib && einfo \ + "USE flag \"m17n-lib\" has no effect because xft is not set." fi # GTK+ is the default toolkit if USE=gtk is chosen with other |