summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-08-21 10:00:45 +0000
committerJohannes Huber <johu@gentoo.org>2012-08-21 10:00:45 +0000
commitbe53614b97f39209064f987f01730ff86d3f2079 (patch)
treeee20f217d2560ee52a5a5cd7df4158a4490055fb /app-editors
parentStable for x86, wrt bug #422227 (diff)
downloadgentoo-2-be53614b97f39209064f987f01730ff86d3f2079.tar.gz
gentoo-2-be53614b97f39209064f987f01730ff86d3f2079.tar.bz2
gentoo-2-be53614b97f39209064f987f01730ff86d3f2079.zip
Stable for x86, wrt bug #431178
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-23.4-r4.ebuild4
-rw-r--r--app-editors/emacs/emacs-24.1-r1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 16792cba2212..69ca41a277e9 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.517 2012/08/15 19:07:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.518 2012/08/21 10:00:45 johu Exp $
+
+ 21 Aug 2012; Johannes Huber <johu@gentoo.org> emacs-23.4-r4.ebuild,
+ emacs-24.1-r1.ebuild:
+ Stable for x86, wrt bug #431178
*emacs-24.2_rc1 (15 Aug 2012)
diff --git a/app-editors/emacs/emacs-23.4-r4.ebuild b/app-editors/emacs/emacs-23.4-r4.ebuild
index 64a96010ea4e..4b1287a8cd3c 100644
--- a/app-editors/emacs/emacs-23.4-r4.ebuild
+++ b/app-editors/emacs/emacs-23.4-r4.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/emacs-23.4-r4.ebuild,v 1.3 2012/08/15 00:33:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.4 2012/08/21 10:00:45 johu Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="23"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"
diff --git a/app-editors/emacs/emacs-24.1-r1.ebuild b/app-editors/emacs/emacs-24.1-r1.ebuild
index dbad6653dc4f..e26ebade905f 100644
--- a/app-editors/emacs/emacs-24.1-r1.ebuild
+++ b/app-editors/emacs/emacs-24.1-r1.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/emacs-24.1-r1.ebuild,v 1.3 2012/08/15 00:33:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.4 2012/08/21 10:00:45 johu Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
REQUIRED_USE="aqua? ( !X )"