commit: a246aabb1c3381587601a573d6519dda0558e467
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Sep 12 19:11:03 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Sep 12 19:11:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a246aabb
app-editors/emacs: version bump to 25.3
app-editors/emacs/Manifest | 4 +-
app-editors/emacs/emacs-24.5-r4.ebuild | 2 +-
.../{emacs-24.5-r4.ebuild => emacs-25.3.ebuild} | 60 ++++++++++++----------
3 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 3a250b6..6c40b58 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -10,8 +10,10 @@ DIST emacs-24.5-patches-4.tar.xz 13632 SHA256
3b2d7c2034711d114494745780b6521150
DIST emacs-24.5.tar.xz 39759804 SHA256
dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512
89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677
WHIRLPOOL
3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
DIST emacs-25.2-patches-1.tar.xz 2104 SHA256
ea0ba1cf1fb06eb76907cc034acb440af1147bdc0fa849ba8185d016fe58e4ff SHA512
45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a
WHIRLPOOL
97c49266b7be18f028ae939dbdcfd3933637770506f108fcd9d08fa33c63f376fbb6fe520e42ec28adb6d4527c298173bffe596af774748946a3d8a130aa90f7
DIST emacs-25.2.tar.xz 46900336 SHA256
59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa SHA512
2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c
WHIRLPOOL
98de8ad164cf65b21e5fbfdbd7fcee84da32e3de66715d2f03f3c4d03cfa68d49aff2124e5da331282bb5fd9c2b2fbac4ddfd0985e907d2354994c783dddd83f
+DIST emacs-25.3.tar.xz 42854740 SHA256
253ac5e7075e594549b83fd9ec116a9dc37294d415e2f21f8ee109829307c00b SHA512
1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f
WHIRLPOOL
603ec6b203523a22556e48616b4a5ab227c32d3653ac4b713e6cb0357e3556964bc92a1818b417bbf9037cca7dac55935da9458dc3d29b3bb24d66157e74c8df
EBUILD emacs-24.5-r3.ebuild 11397 SHA256
649505fc5dcc00a476978044535ab72095973a0fe728a3de9a766b2e320b6e20 SHA512
dfc2496d3c48d7b3621189ccacfea7e05f37c1e578fe804e74ea9c00ef054b2ab0b3b5961c9f494834d44a14e1b940f455ba9a2b16063e4fe5e9c35d7d19c493
WHIRLPOOL
6bc3143c0a37583b52a5bb0e6a4df41fa96e9e5f26f17ef14ea815c6f75862316dcc00f0ea42ea71d66ae87447d31cfc68c56dfba0fdea6106508bc528139d49
-EBUILD emacs-24.5-r4.ebuild 11406 SHA256
fc99eb8f2556a8db720fec2747d70b29cb7d3731248db95128f5b913e6fb18da SHA512
e3689ad4c30aa6d179a65c0764622017999a98ccf31ac50cd6b0674a3651354844a245a98189719f469ed3d6cf24fdf3c92501eda787d64d276a3e374fefd69e
WHIRLPOOL
0ec804157c824457b0677ce029eca43b22e3d3e91fae0bd771c2a669214f78b457b8b5dacc88b34f59ce32e07645869fc79766661740e7711f65c81f68be65ad
+EBUILD emacs-24.5-r4.ebuild 11405 SHA256
86a61891bdee5c0325cc9181258f21e6d951d7078ecdefca52a2d64bd6d71102 SHA512
eaff16a585e48c1b357e2b0c72f10db9e2a78b8d6a6474b9ce401137d4414982769e466f94d1bdf8dafcf09b531f11776f003d92f0623010547cbefbd463a4dd
WHIRLPOOL
2a852199d3dbb2344e197d51feb7329a8e0a3b7606757d603cebe77b67c10116749d09724a9777eaee7c48927b9f3505d5bd07f3e8f556d18d6e25c7fd7d5b8c
EBUILD emacs-25.2-r1.ebuild 11581 SHA256
f1328ec4285512bff7165616f88b5d4c37c83a5a267430e7f7ee8f6f8bbd4806 SHA512
86462604eb0a1680a8a065019924cb967cb6831bd3002da729f45bee04af1a684fa5b524f326dc49a022c97054b78a14021c5a3e0a50a20713f57bb10064705a
WHIRLPOOL
937373a8af9ce1ea7e17644afa00fe51f7833faa400aff31eb0bb09342c96fb3da2845e82f7ef377f73b96a1b9f01ef466cc24719d394f03c2fb6c6af568ff63
EBUILD emacs-25.2.ebuild 11498 SHA256
8aa2b9d70378eb91f6383190ae9411b1c29455ef1a7331465a9639cf18018c62 SHA512
b957b546f4f1d72331e34cc4735de79199a4899fbbaff8c8f8693707c5cafe2f10fcacf1ab4dc0e6ddc60b2d0f294a740da5588d75f076bc2fa3c8b991d97739
WHIRLPOOL
d05200688d5830ca2634aee7f16b862dba1e2673f690417f9e69a6ba26f6dfa5d20c46a14edbfb71b0b07c0e5e15e85c17f1dd7eddbe3ba14b7cf672f4849636
+EBUILD emacs-25.3.ebuild 11506 SHA256
5851debd12627a26b83056f39a95bdb44599b9bc176092e0b92724529f17de41 SHA512
adc107c6bbe4e08a60a6bdefee1975b276aa0401f23c33f750129cc66500fe28014dd98b05926e8954743d528accaaae50714faaf7110e53d9b54bede61c6ed3
WHIRLPOOL
67235516fbf445a7c0a884ec9d92b7d8fcbb50fdd2b59cc36f19bb9ffd8b7c0a4d81b937530ff322a5347a157e6f12937cf50c5e312a730e6705c8250aedbe76
MISC metadata.xml 2759 SHA256
7f568caaf3e715c1534bd7848b60e8234b4f082b665ba6769780dccdf9939b3e SHA512
748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42
WHIRLPOOL
9eec021a8c2a2a8b7d79ff1d348699f051d6e7e54586445ab691632bf26155c4ec722ef0db6984efb0510e7e49537c4c421fb896c7d861da836d3bc6bfe85de2
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild
b/app-editors/emacs/emacs-24.5-r4.ebuild
index 2c870c8..bd4b9ed 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-24.5-r4.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="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
~x86 ~amd64-fbsd ~x86-fbsd ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
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"
REQUIRED_USE="?? ( aqua X )"
diff --git a/app-editors/emacs/emacs-24.5-r4.ebuild
b/app-editors/emacs/emacs-25.3.ebuild
similarity index 87%
copy from app-editors/emacs/emacs-24.5-r4.ebuild
copy to app-editors/emacs/emacs-25.3.ebuild
index 2c870c8..14a1bb2 100644
--- a/app-editors/emacs/emacs-24.5-r4.ebuild
+++ b/app-editors/emacs/emacs-25.3.ebuild
@@ -3,17 +3,16 @@
EAPI=6
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
+inherit elisp-common flag-o-matic multilib readme.gentoo-r1
DESCRIPTION="The extensible, customizable, self-documenting real-time display
editor"
HOMEPAGE="https://www.gnu.org/software/emacs/";
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz";
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
-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"
+SLOT="25"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos"
+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 xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0=
@@ -48,14 +47,21 @@ RDEPEND="sys-libs/ncurses:0=
media-libs/fontconfig
media-libs/freetype
x11-libs/libXft
+ cairo? ( >=x11-libs/cairo-1.12.18 )
m17n-lib? (
>=dev-libs/libotf-0.9.4
>=dev-libs/m17n-lib-1.5.1
)
)
gtk? (
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( x11-libs/gtk+:2 )
+ xwidgets? (
+ x11-libs/gtk+:3
+ net-libs/webkit-gtk:3=
+ )
+ !xwidgets? (
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( x11-libs/gtk+:2 )
+ )
)
!gtk? (
motif? ( >=x11-libs/motif-2.3:0 )
@@ -83,13 +89,7 @@ FULL_VERSION="${PV%%_*}"
S="${WORKDIR}/emacs-${FULL_VERSION}"
src_prepare() {
- eapply ../patch
-
- eapply "${FILESDIR}/${PN}-24.3-stderr.patch"
- eapply "${FILESDIR}/${PN}-24.3-alloc-invalid-frees.patch"
- eapply "${FILESDIR}/${PN}-24.4-configure.patch"
- eapply "${FILESDIR}/${PN}-24.4-preload-hack.patch"
- eapply "${FILESDIR}/${PN}-24.4-lisp.patch"
+ eapply "${FILESDIR}/${PN}-vcs-musl.patch"
eapply_user
@@ -97,8 +97,8 @@ src_prepare() {
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|| die "unable to sed ctags.1"
- AT_M4DIR=m4 eautoreconf
- touch src/stamp-h.in || die
+ #AT_M4DIR=m4 eautoreconf
+ #touch src/stamp-h.in || die
}
src_configure() {
@@ -138,11 +138,15 @@ src_configure() {
if use xft; then
myconf+=" --with-xft"
+ myconf+=" $(use_with cairo)"
myconf+=" $(use_with m17n-lib libotf)"
myconf+=" $(use_with m17n-lib m17n-flt)"
else
myconf+=" --without-xft"
+ myconf+=" --without-cairo"
myconf+=" --without-libotf --without-m17n-flt"
+ use cairo && ewarn \
+ "USE flag \"cairo\" has no effect if \"xft\" is
not set."
use m17n-lib && ewarn \
"USE flag \"m17n-lib\" has no effect if \"xft\"
is not set."
fi
@@ -159,7 +163,12 @@ src_configure() {
recommended that you compile Emacs with the
Athena/Lucid or the
Motif toolkit instead.
EOF
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
+ if use xwidgets; then
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets"
+ else
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3
gtk2)"
+ myconf+=" --without-xwidgets"
+ fi
for f in motif Xaw3d athena; do
use ${f} && ewarn \
"USE flag \"${f}\" has no effect if
\"gtk\" is set."
@@ -178,6 +187,8 @@ src_configure() {
einfo "Configuring to build with no toolkit"
myconf+=" --with-x-toolkit=no"
fi
+ ! use gtk && use xwidgets && ewarn \
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not
set."
elif use aqua; then
einfo "Configuring to build with Nextstep (Cocoa) support"
myconf+=" --with-ns --disable-ns-self-contained"
@@ -200,6 +211,7 @@ src_configure() {
--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) \
@@ -212,9 +224,6 @@ src_configure() {
}
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
}
@@ -235,7 +244,7 @@ src_install () {
# avoid collision between slots, see bug #169033 e.g.
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
- rm -rf "${ED}"/usr/share/{applications,icons}
+ rm -rf "${ED}"/usr/share/{appdata,applications,icons}
rm -rf "${ED}"/var
# remove unused <version>/site-lisp dir
@@ -282,7 +291,7 @@ src_install () {
EOF
elisp-site-file-install "${T}/${SITEFILE}" || die
- dodoc README BUGS
+ dodoc README BUGS CONTRIBUTE
if use aqua; then
dodir /Applications/Gentoo
@@ -329,11 +338,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
