summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé María Alonso <nimiux@gentoo.org>2014-12-07 23:50:07 +0000
committerJosé María Alonso <nimiux@gentoo.org>2014-12-07 23:50:07 +0000
commitd4527778f04d5aaaf0eb7b497a7ff518df54a5da (patch)
treefcb48561248290a18fb070323170346dc6281b42 /app-editors
parentBump atomic-primops to 0.6.1 (diff)
downloadgentoo-2-d4527778f04d5aaaf0eb7b497a7ff518df54a5da.tar.gz
gentoo-2-d4527778f04d5aaaf0eb7b497a7ff518df54a5da.tar.bz2
gentoo-2-d4527778f04d5aaaf0eb7b497a7ff518df54a5da.zip
Stable for amd64 wrt bug #531806
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key F253DB15)
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/emacs-24.4-r1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index f5d8fcd37e23..b38935895200 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.647 2014/12/06 14:16:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.648 2014/12/07 23:50:07 nimiux Exp $
+
+ 07 Dec 2014; Chema Alonso <nimiux@gentoo.org> emacs-24.4-r1.ebuild:
+ Stable for amd64 wrt bug #531806
06 Dec 2014; Ulrich Müller <ulm@gentoo.org> -emacs-24.4.ebuild:
Remove old.
diff --git a/app-editors/emacs/emacs-24.4-r1.ebuild b/app-editors/emacs/emacs-24.4-r1.ebuild
index f6be2e67133c..7c90c0900936 100644
--- a/app-editors/emacs/emacs-24.4-r1.ebuild
+++ b/app-editors/emacs/emacs-24.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.2 2014/11/10 19:15:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.3 2014/12/07 23:50:07 nimiux Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND 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"
+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"
IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"