commit: 8a916ee941937b7808c9e9dc3a2064280b6a7183
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Mar 19 18:19:15 2018 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Mar 19 18:19:15 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8a916ee9
app-editors/emacs: version bump to 24.5-r5/25.3-r3
sync with upstream
.../{emacs-24.5-r4.ebuild => emacs-24.5-r5.ebuild} | 49 ++++++++++++++--------
app-editors/emacs/emacs-25.3-r1.ebuild | 8 ++--
.../{emacs-25.3-r1.ebuild => emacs-25.3-r3.ebuild} | 14 +++----
app-editors/emacs/metadata.xml | 1 -
4 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild
b/app-editors/emacs/emacs-24.5-r5.ebuild
similarity index 92%
rename from app-editors/emacs/emacs-24.5-r4.ebuild
rename to app-editors/emacs/emacs-24.5-r5.ebuild
index 46b7444..0de8807 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,8 +12,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~amd64 ~arm ia64 ~mips ~ppc ~sh ~sparc ~x86"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3
gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif
pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X
Xaw3d xft +xpm zlib"
+KEYWORDS="amd64 arm ia64 ~mips ppc ~sh ~sparc x86"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3
gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif
pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X
Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0=
@@ -24,7 +24,6 @@ RDEPEND="sys-libs/ncurses:0=
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -32,8 +31,12 @@ RDEPEND="sys-libs/ncurses:0=
ssl? ( net-libs/gnutls:0= )
zlib? ( sys-libs/zlib )
X? (
- x11-libs/libXmu
- x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
@@ -48,6 +51,7 @@ RDEPEND="sys-libs/ncurses:0=
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+ x11-libs/libXrender
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
@@ -58,10 +62,23 @@ RDEPEND="sys-libs/ncurses:0=
!gtk3? ( x11-libs/gtk+:2 )
)
!gtk? (
- motif? ( >=x11-libs/motif-2.3:0 )
+ motif? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libXpm
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
!motif? (
- Xaw3d? ( x11-libs/libXaw3d )
- !Xaw3d? ( athena? ( x11-libs/libXaw ) )
+ Xaw3d? (
+ x11-libs/libXaw3d
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ !Xaw3d? ( athena? (
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ ) )
)
)
)"
@@ -104,6 +121,7 @@ src_prepare() {
src_configure() {
strip-flags
filter-flags -pie #526948
+ append-ldflags $(test-flags -no-pie) #639570
if use sh; then
replace-flags "-O[1-9]" -O0 #262359
@@ -197,11 +215,11 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser=":gamestat" \
--without-compress-install \
+ --without-hesiod \
--with-file-notification=$(usev inotify || usev gfile || echo
no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with gpm) \
- $(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
@@ -215,8 +233,8 @@ src_compile() {
# compile preload hack
$(tc-getCC) -shared -fPIC -o preload.so "${FILESDIR}/preload.c" || die
- export SANDBOX_ON=0 # for the unbelievers, see Bug
#131505
- emake
+ # Disable sandbox when dumping. For the unbelievers, see bug #131505
+ emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD=preload.so ./temacs"
}
src_install () {
@@ -262,7 +280,7 @@ src_install () {
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF ||
die
X
;;; ${PN}-${SLOT} site-lisp configuration
X
@@ -329,11 +347,6 @@ pkg_preinst() {
pkg_postinst() {
elisp-site-regen
-
- local pvr
- for pvr in ${REPLACING_VERSIONS}; do
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
- done
readme.gentoo_print_elog
if use livecd; then
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild
b/app-editors/emacs/emacs-25.3-r1.ebuild
index 549c256..030e523 100644
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ b/app-editors/emacs/emacs-25.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc
x86"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos
libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2
livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0=
@@ -23,7 +23,6 @@ RDEPEND="sys-libs/ncurses:0=
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -67,7 +66,6 @@ RDEPEND="sys-libs/ncurses:0=
!gtk? (
motif? (
>=x11-libs/motif-2.3:0
- x11-libs/libXp
x11-libs/libXpm
x11-libs/libXmu
x11-libs/libXt
@@ -223,12 +221,12 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser=":gamestat" \
--without-compress-install \
+ --without-hesiod \
--with-file-notification=$(usev inotify || usev gfile || echo
no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with dynamic-loading modules) \
$(use_with gpm) \
- $(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
@@ -286,7 +284,7 @@ src_install () {
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF ||
die
X
;;; ${PN}-${SLOT} site-lisp configuration
X
diff --git a/app-editors/emacs/emacs-25.3-r1.ebuild
b/app-editors/emacs/emacs-25.3-r3.ebuild
similarity index 96%
copy from app-editors/emacs/emacs-25.3-r1.ebuild
copy to app-editors/emacs/emacs-25.3-r3.ebuild
index 549c256..8883244 100644
--- a/app-editors/emacs/emacs-25.3-r1.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@@ -11,8 +11,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc
x86"
-IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos
libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc x86"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif
gpm gsettings gtk +gtk3 gzip-el imagemagick +inotify jpeg kerberos libxml2
livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff
toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0=
@@ -23,7 +23,6 @@ RDEPEND="sys-libs/ncurses:0=
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
gpm? ( sys-libs/gpm )
- hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
@@ -67,7 +66,6 @@ RDEPEND="sys-libs/ncurses:0=
!gtk? (
motif? (
>=x11-libs/motif-2.3:0
- x11-libs/libXp
x11-libs/libXpm
x11-libs/libXmu
x11-libs/libXt
@@ -223,12 +221,12 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser=":gamestat" \
--without-compress-install \
+ --without-hesiod \
--with-file-notification=$(usev inotify || usev gfile || echo
no) \
$(use_enable acl) \
$(use_with dbus) \
$(use_with dynamic-loading modules) \
$(use_with gpm) \
- $(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
@@ -239,8 +237,8 @@ src_configure() {
}
src_compile() {
- export SANDBOX_ON=0 # for the unbelievers, see Bug
#131505
- emake
+ # Disable sandbox when dumping. For the unbelievers, see bug #131505
+ emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
}
src_install () {
@@ -286,7 +284,7 @@ src_install () {
cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
fi
- sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
+ sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF ||
die
X
;;; ${PN}-${SLOT} site-lisp configuration
X
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 64c34d3..d0265f5 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -34,7 +34,6 @@
<flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
(<pkg>x11-libs/gtk+</pkg>)</flag>
<flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
- <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag>
<flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
processing</flag>
<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
