summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog6
-rw-r--r--app-editors/emacs/emacs-23.4-r6.ebuild9
-rw-r--r--app-editors/emacs/emacs-24.3-r2.ebuild9
3 files changed, 17 insertions, 7 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 4b81536955f3..187158d6d404 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.602 2013/12/26 16:19:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.603 2013/12/31 00:08:13 ulm Exp $
+
+ 30 Dec 2013; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r6.ebuild,
+ emacs-24.3-r2.ebuild:
+ Fix build failure on hardened kernel with XATTR_PAX_FLAGS, bug 456970.
26 Dec 2013; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r6.ebuild,
emacs-24.2-r1.ebuild, emacs-24.3-r2.ebuild:
diff --git a/app-editors/emacs/emacs-23.4-r6.ebuild b/app-editors/emacs/emacs-23.4-r6.ebuild
index 54f09cd4f610..f11700cd53a9 100644
--- a/app-editors/emacs/emacs-23.4-r6.ebuild
+++ b/app-editors/emacs/emacs-23.4-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 1.4 2013/12/26 16:14:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 1.5 2013/12/31 00:08:13 ulm Exp $
EAPI=5
WANT_AUTOMAKE="none"
@@ -10,7 +10,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
- mirror://gentoo/${P}-patches-8.tar.bz2"
+ http://dev.gentoo.org/~ulm/emacs/${P}-patches-9.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
@@ -62,7 +62,10 @@ DEPEND="${RDEPEND}
dbus? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
RDEPEND="${RDEPEND}
!<app-editors/emacs-vcs-${PV}"
diff --git a/app-editors/emacs/emacs-24.3-r2.ebuild b/app-editors/emacs/emacs-24.3-r2.ebuild
index 5d6d2a100b53..c558f5d90aa6 100644
--- a/app-editors/emacs/emacs-24.3-r2.ebuild
+++ b/app-editors/emacs/emacs-24.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 1.16 2013/12/26 16:14:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 1.17 2013/12/31 00:08:13 ulm Exp $
EAPI=5
@@ -9,7 +9,7 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
HOMEPAGE="http://www.gnu.org/software/emacs/"
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
- mirror://gentoo/${P}-patches-3.tar.xz"
+ http://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
@@ -72,7 +72,10 @@ DEPEND="${RDEPEND}
libxml2? ( virtual/pkgconfig )
X? ( virtual/pkgconfig )
gzip-el? ( app-arch/gzip )
- pax_kernel? ( sys-apps/paxctl )"
+ pax_kernel? (
+ sys-apps/attr
+ sys-apps/paxctl
+ )"
RDEPEND="${RDEPEND}
!<app-editors/emacs-vcs-${PV}"