1 |
commit: 9840b540f363ca57e99237d6b4734eed41268975 |
2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Sep 11 19:40:15 2017 +0000 |
4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
5 |
CommitDate: Mon Sep 11 19:40:15 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9840b540 |
7 |
|
8 |
app-editors/emacs: version bump to 24.5-r4/25.2-r1 |
9 |
|
10 |
app-editors/emacs/Manifest | 8 ++++++-- |
11 |
app-editors/emacs/emacs-24.5-r3.ebuild | 2 +- |
12 |
app-editors/emacs/{emacs-24.5-r3.ebuild => emacs-24.5-r4.ebuild} | 6 +++--- |
13 |
app-editors/emacs/{emacs-25.2.ebuild => emacs-25.2-r1.ebuild} | 7 +++++-- |
14 |
app-editors/emacs/emacs-25.2.ebuild | 2 +- |
15 |
5 files changed, 16 insertions(+), 9 deletions(-) |
16 |
|
17 |
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest |
18 |
index 0286f55..3a250b6 100644 |
19 |
--- a/app-editors/emacs/Manifest |
20 |
+++ b/app-editors/emacs/Manifest |
21 |
@@ -6,8 +6,12 @@ AUX emacs-24.4-preload-hack.patch 343 SHA256 289febdc960bee609514fe5291fb3d60cc9 |
22 |
AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c |
23 |
AUX preload.c 1868 SHA256 3498abf641e809c06bf6a265d54880e93ee31f7abf81210856b6dbef7d267129 SHA512 6268255b7afa8455ad7ce63ef6f01a7d114b53fbb3dc557b187de0ee6514b33b3419d70b8d7984dc289f5eed075a30b508133147821f77c4345df5cbd62e616e WHIRLPOOL 0c72d97de94cf5e1cf6a8ee4f8f42800d63f35465ea22f8c409857620ecc37e304ff6c2c4670659a063e5f275488fcdd1b45226d9d0130c4506480df7708bff6 |
24 |
DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5 |
25 |
+DIST emacs-24.5-patches-4.tar.xz 13632 SHA256 3b2d7c2034711d114494745780b6521150aa0c524966cbaceeb8d4d053dcbdd3 SHA512 569c3a55aaf1102c0bae4ab25ee06372763cd2de8a54e26b3eefd54e585cf90b53c8ffe1ca48eb4fd312a340380fd3f2fcdb584697814bf429129b48fa56ffb5 WHIRLPOOL 1855ac4178faafcc2d86141e023ff2626246c87e7ff2e7bfbaf9a989e9a48d2767acb9f7af99924cd7db04d34913a42764490831b7b45a34bcd131999180ff28 |
26 |
DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3 |
27 |
+DIST emacs-25.2-patches-1.tar.xz 2104 SHA256 ea0ba1cf1fb06eb76907cc034acb440af1147bdc0fa849ba8185d016fe58e4ff SHA512 45c666ba6332c8fb60a925c6af9c0da113f46055159d931feddb99ce19b2a03e0101b3a4d671fe699cd5f33fd58a25791bfb8b16e20f463e5d304902ee24854a WHIRLPOOL 97c49266b7be18f028ae939dbdcfd3933637770506f108fcd9d08fa33c63f376fbb6fe520e42ec28adb6d4527c298173bffe596af774748946a3d8a130aa90f7 |
28 |
DIST emacs-25.2.tar.xz 46900336 SHA256 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c WHIRLPOOL 98de8ad164cf65b21e5fbfdbd7fcee84da32e3de66715d2f03f3c4d03cfa68d49aff2124e5da331282bb5fd9c2b2fbac4ddfd0985e907d2354994c783dddd83f |
29 |
-EBUILD emacs-24.5-r3.ebuild 11394 SHA256 3cacb6d7d80c231fbf91672bec23459e926b11055fe060fda90d471cc3a67380 SHA512 686c87909c5f7381da890f8fd3fb89b320584ee498fbe0afdd2565d17e99fb4c7e5ec4884e0752d06befa8739434d170e894a3c4b634d5d34a3803b70778201b WHIRLPOOL a9b17e5391e6c9a03a8c912b8e7177bac316b6111b5834d77d8b79ff61e3a84e5afde3a670099169cd11413e1d7ef66bf913c282ec722d9f1776947088ed69aa |
30 |
-EBUILD emacs-25.2.ebuild 11499 SHA256 88cff642b021ebaa31341d1f4bbc8291c9ed58ef131fa5310ac561e23735c0b5 SHA512 323b98393887f19d824636dfa0dbd00d424ad8d69589b72da31b871d49ed5bfd3187769cc9509ad2c0c8e04a6ca9639dc4334ff3cc9c40f5d80162df326bfdca WHIRLPOOL 2c9212d2ab40d43e04f493f6fd198e4b5d24a229b754dcb3f719ab5a52c7f2fef6714d2db02db90af2c5d9de110f697aae900e576a6c3233a38d81ae3ae9e109 |
31 |
+EBUILD emacs-24.5-r3.ebuild 11397 SHA256 649505fc5dcc00a476978044535ab72095973a0fe728a3de9a766b2e320b6e20 SHA512 dfc2496d3c48d7b3621189ccacfea7e05f37c1e578fe804e74ea9c00ef054b2ab0b3b5961c9f494834d44a14e1b940f455ba9a2b16063e4fe5e9c35d7d19c493 WHIRLPOOL 6bc3143c0a37583b52a5bb0e6a4df41fa96e9e5f26f17ef14ea815c6f75862316dcc00f0ea42ea71d66ae87447d31cfc68c56dfba0fdea6106508bc528139d49 |
32 |
+EBUILD emacs-24.5-r4.ebuild 11406 SHA256 fc99eb8f2556a8db720fec2747d70b29cb7d3731248db95128f5b913e6fb18da SHA512 e3689ad4c30aa6d179a65c0764622017999a98ccf31ac50cd6b0674a3651354844a245a98189719f469ed3d6cf24fdf3c92501eda787d64d276a3e374fefd69e WHIRLPOOL 0ec804157c824457b0677ce029eca43b22e3d3e91fae0bd771c2a669214f78b457b8b5dacc88b34f59ce32e07645869fc79766661740e7711f65c81f68be65ad |
33 |
+EBUILD emacs-25.2-r1.ebuild 11581 SHA256 f1328ec4285512bff7165616f88b5d4c37c83a5a267430e7f7ee8f6f8bbd4806 SHA512 86462604eb0a1680a8a065019924cb967cb6831bd3002da729f45bee04af1a684fa5b524f326dc49a022c97054b78a14021c5a3e0a50a20713f57bb10064705a WHIRLPOOL 937373a8af9ce1ea7e17644afa00fe51f7833faa400aff31eb0bb09342c96fb3da2845e82f7ef377f73b96a1b9f01ef466cc24719d394f03c2fb6c6af568ff63 |
34 |
+EBUILD emacs-25.2.ebuild 11498 SHA256 8aa2b9d70378eb91f6383190ae9411b1c29455ef1a7331465a9639cf18018c62 SHA512 b957b546f4f1d72331e34cc4735de79199a4899fbbaff8c8f8693707c5cafe2f10fcacf1ab4dc0e6ddc60b2d0f294a740da5588d75f076bc2fa3c8b991d97739 WHIRLPOOL d05200688d5830ca2634aee7f16b862dba1e2673f690417f9e69a6ba26f6dfa5d20c46a14edbfb71b0b07c0e5e15e85c17f1dd7eddbe3ba14b7cf672f4849636 |
35 |
MISC metadata.xml 2759 SHA256 7f568caaf3e715c1534bd7848b60e8234b4f082b665ba6769780dccdf9939b3e SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42 WHIRLPOOL 9eec021a8c2a2a8b7d79ff1d348699f051d6e7e54586445ab691632bf26155c4ec722ef0db6984efb0510e7e49537c4c421fb896c7d861da836d3bc6bfe85de2 |
36 |
|
37 |
diff --git a/app-editors/emacs/emacs-24.5-r3.ebuild b/app-editors/emacs/emacs-24.5-r3.ebuild |
38 |
index 41e240d..d73872f 100644 |
39 |
--- a/app-editors/emacs/emacs-24.5-r3.ebuild |
40 |
+++ b/app-editors/emacs/emacs-24.5-r3.ebuild |
41 |
@@ -29,7 +29,7 @@ RDEPEND="sys-libs/ncurses:0= |
42 |
kerberos? ( virtual/krb5 ) |
43 |
libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
44 |
selinux? ( sys-libs/libselinux ) |
45 |
- ssl? ( net-libs/gnutls ) |
46 |
+ ssl? ( net-libs/gnutls:0= ) |
47 |
zlib? ( sys-libs/zlib ) |
48 |
X? ( |
49 |
x11-libs/libXmu |
50 |
|
51 |
diff --git a/app-editors/emacs/emacs-24.5-r3.ebuild b/app-editors/emacs/emacs-24.5-r4.ebuild |
52 |
similarity index 97% |
53 |
copy from app-editors/emacs/emacs-24.5-r3.ebuild |
54 |
copy to app-editors/emacs/emacs-24.5-r4.ebuild |
55 |
index 41e240d..2c870c8 100644 |
56 |
--- a/app-editors/emacs/emacs-24.5-r3.ebuild |
57 |
+++ b/app-editors/emacs/emacs-24.5-r4.ebuild |
58 |
@@ -8,11 +8,11 @@ inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1 |
59 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
60 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
61 |
SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
62 |
- https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" |
63 |
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz" |
64 |
|
65 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
66 |
SLOT="24" |
67 |
-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" |
68 |
+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" |
69 |
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" |
70 |
REQUIRED_USE="?? ( aqua X )" |
71 |
|
72 |
@@ -29,7 +29,7 @@ RDEPEND="sys-libs/ncurses:0= |
73 |
kerberos? ( virtual/krb5 ) |
74 |
libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
75 |
selinux? ( sys-libs/libselinux ) |
76 |
- ssl? ( net-libs/gnutls ) |
77 |
+ ssl? ( net-libs/gnutls:0= ) |
78 |
zlib? ( sys-libs/zlib ) |
79 |
X? ( |
80 |
x11-libs/libXmu |
81 |
|
82 |
diff --git a/app-editors/emacs/emacs-25.2.ebuild b/app-editors/emacs/emacs-25.2-r1.ebuild |
83 |
similarity index 97% |
84 |
copy from app-editors/emacs/emacs-25.2.ebuild |
85 |
copy to app-editors/emacs/emacs-25.2-r1.ebuild |
86 |
index b0b6ea7..5090974 100644 |
87 |
--- a/app-editors/emacs/emacs-25.2.ebuild |
88 |
+++ b/app-editors/emacs/emacs-25.2-r1.ebuild |
89 |
@@ -7,11 +7,12 @@ inherit elisp-common flag-o-matic multilib readme.gentoo-r1 |
90 |
|
91 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
92 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
93 |
-SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
94 |
+SRC_URI="mirror://gnu/emacs/${P}.tar.xz |
95 |
+ https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz" |
96 |
|
97 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
98 |
SLOT="25" |
99 |
-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" |
100 |
+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" |
101 |
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" |
102 |
REQUIRED_USE="?? ( aqua X )" |
103 |
|
104 |
@@ -89,6 +90,8 @@ FULL_VERSION="${PV%%_*}" |
105 |
S="${WORKDIR}/emacs-${FULL_VERSION}" |
106 |
|
107 |
src_prepare() { |
108 |
+ eapply ../patch |
109 |
+ |
110 |
eapply "${FILESDIR}/${PN}-vcs-musl.patch" |
111 |
|
112 |
eapply_user |
113 |
|
114 |
diff --git a/app-editors/emacs/emacs-25.2.ebuild b/app-editors/emacs/emacs-25.2.ebuild |
115 |
index b0b6ea7..3d86b4e 100644 |
116 |
--- a/app-editors/emacs/emacs-25.2.ebuild |
117 |
+++ b/app-editors/emacs/emacs-25.2.ebuild |
118 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
119 |
|
120 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
121 |
SLOT="25" |
122 |
-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" |
123 |
+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" |
124 |
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" |
125 |
REQUIRED_USE="?? ( aqua X )" |