diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2012-09-13 08:41:29 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2012-09-13 08:41:29 +0000 |
| commit | fd51839a7bfdbfea78a70d12d6ce612483b0066a (patch) | |
| tree | 9af1a01b92051b6db00a680cf76586abc461f337 /app-editors/emacs-vcs | |
| parent | x86 stable wrt bug #339295 (diff) | |
| download | gentoo-2-fd51839a7bfdbfea78a70d12d6ce612483b0066a.tar.gz gentoo-2-fd51839a7bfdbfea78a70d12d6ce612483b0066a.tar.bz2 gentoo-2-fd51839a7bfdbfea78a70d12d6ce612483b0066a.zip | |
Upstream has changed the configure option for toolkit selection,
gtk defaults to GTK+3 now. Enable gtk3 per IUSE default and explicitly
pass --with-x-toolkit=gtk2 for USE="gtk -gtk3".
(Portage version: 2.1.11.14/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/emacs-vcs')
| -rw-r--r-- | app-editors/emacs-vcs/ChangeLog | 7 | ||||
| -rw-r--r-- | app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 60bafb92f696..2ac6a47c9874 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.113 2012/09/09 12:38:35 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.114 2012/09/13 08:41:29 ulm Exp $ + + 13 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: + Upstream has changed the configure option for toolkit selection, gtk + defaults to GTK+3 now. Enable gtk3 per IUSE default and explicitly pass + --with-x-toolkit=gtk2 for USE="gtk -gtk3". 09 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild: Remove sed for freebsd crt*.o files. This has been applied upstream. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild index 23f111e02761..ce876e40b011 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.4 2012/09/09 12:38:35 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.5 2012/09/13 08:41:29 ulm Exp $ EAPI=4 @@ -30,7 +30,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/" LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" SLOT="24" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" +IUSE="alsa athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" RDEPEND="sys-libs/ncurses >=app-admin/eselect-emacs-1.2 @@ -166,7 +166,7 @@ src_configure() { if use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)" + myconf="${myconf} --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" local f for f in athena Xaw3d motif; do use ${f} && ewarn "USE flag \"${f}\" ignored" \ @@ -184,9 +184,6 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf="${myconf} --with-x-toolkit=no" fi - - ! use gtk && use gtk3 \ - && ewarn "USE flag \"gtk3\" has no effect if \"gtk\" is not set." else myconf="${myconf} --without-x --without-ns" fi |