| 1 |
commit: 04e9aaafee354204a452a01f13e9242d80c76e77 |
| 2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Mon Jun 19 02:24:57 2017 +0000 |
| 4 |
Commit: Felix Janda <felix.janda <AT> posteo <DOT> de> |
| 5 |
CommitDate: Mon Jun 19 02:24:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=04e9aaaf |
| 7 |
|
| 8 |
app-editors/emacs-25.2: sync with the main tree |
| 9 |
|
| 10 |
app-editors/emacs/Manifest | 2 +- |
| 11 |
app-editors/emacs/emacs-25.2.ebuild | 10 +++++----- |
| 12 |
2 files changed, 6 insertions(+), 6 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest |
| 15 |
index 6141c88..0286f55 100644 |
| 16 |
--- a/app-editors/emacs/Manifest |
| 17 |
+++ b/app-editors/emacs/Manifest |
| 18 |
@@ -9,5 +9,5 @@ DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140f |
| 19 |
DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3 |
| 20 |
DIST emacs-25.2.tar.xz 46900336 SHA256 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa SHA512 2485d5ccd58ecc953cbd2458bdfa45e3c9a6ddfdb1b93c72b957a0da2460d4e42092905e039e8f5bac337ea1ecb9ac404b28702a363323ee5813b30032ebf00c WHIRLPOOL 98de8ad164cf65b21e5fbfdbd7fcee84da32e3de66715d2f03f3c4d03cfa68d49aff2124e5da331282bb5fd9c2b2fbac4ddfd0985e907d2354994c783dddd83f |
| 21 |
EBUILD emacs-24.5-r3.ebuild 11394 SHA256 3cacb6d7d80c231fbf91672bec23459e926b11055fe060fda90d471cc3a67380 SHA512 686c87909c5f7381da890f8fd3fb89b320584ee498fbe0afdd2565d17e99fb4c7e5ec4884e0752d06befa8739434d170e894a3c4b634d5d34a3803b70778201b WHIRLPOOL a9b17e5391e6c9a03a8c912b8e7177bac316b6111b5834d77d8b79ff61e3a84e5afde3a670099169cd11413e1d7ef66bf913c282ec722d9f1776947088ed69aa |
| 22 |
-EBUILD emacs-25.2.ebuild 11504 SHA256 81cc9edf2cee21f9a04b79e62400b43297a17527e4888edd50dea0752d41a1be SHA512 6a150f5314868b3c88beb187761c449b63f59886b533794addf0d10f9054d5fa281b813d2a1fbd7a3b1039c417d0fbec98f74ddf84e248dd2de7bfd5a8595bc8 WHIRLPOOL 5af8f4375a08174d3b58535335395ee084a62cd262488e267a503b87306efd682046b76fc4a60eba3085c892a7f24db4945cbf2e6751ddcc9fa91eb1b893e8a2 |
| 23 |
+EBUILD emacs-25.2.ebuild 11499 SHA256 88cff642b021ebaa31341d1f4bbc8291c9ed58ef131fa5310ac561e23735c0b5 SHA512 323b98393887f19d824636dfa0dbd00d424ad8d69589b72da31b871d49ed5bfd3187769cc9509ad2c0c8e04a6ca9639dc4334ff3cc9c40f5d80162df326bfdca WHIRLPOOL 2c9212d2ab40d43e04f493f6fd198e4b5d24a229b754dcb3f719ab5a52c7f2fef6714d2db02db90af2c5d9de110f697aae900e576a6c3233a38d81ae3ae9e109 |
| 24 |
MISC metadata.xml 2759 SHA256 7f568caaf3e715c1534bd7848b60e8234b4f082b665ba6769780dccdf9939b3e SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42 WHIRLPOOL 9eec021a8c2a2a8b7d79ff1d348699f051d6e7e54586445ab691632bf26155c4ec722ef0db6984efb0510e7e49537c4c421fb896c7d861da836d3bc6bfe85de2 |
| 25 |
|
| 26 |
diff --git a/app-editors/emacs/emacs-25.2.ebuild b/app-editors/emacs/emacs-25.2.ebuild |
| 27 |
index 7d1d51e..b0b6ea7 100644 |
| 28 |
--- a/app-editors/emacs/emacs-25.2.ebuild |
| 29 |
+++ b/app-editors/emacs/emacs-25.2.ebuild |
| 30 |
@@ -3,7 +3,7 @@ |
| 31 |
|
| 32 |
EAPI=6 |
| 33 |
|
| 34 |
-inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
| 35 |
+inherit elisp-common flag-o-matic multilib readme.gentoo-r1 |
| 36 |
|
| 37 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 38 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 39 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" |
| 40 |
|
| 41 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 42 |
SLOT="25" |
| 43 |
-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" |
| 44 |
+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" |
| 45 |
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" |
| 46 |
REQUIRED_USE="?? ( aqua X )" |
| 47 |
|
| 48 |
@@ -28,7 +28,7 @@ RDEPEND="sys-libs/ncurses:0= |
| 49 |
kerberos? ( virtual/krb5 ) |
| 50 |
libxml2? ( >=dev-libs/libxml2-2.2.0 ) |
| 51 |
selinux? ( sys-libs/libselinux ) |
| 52 |
- ssl? ( net-libs/gnutls ) |
| 53 |
+ ssl? ( net-libs/gnutls:0= ) |
| 54 |
zlib? ( sys-libs/zlib ) |
| 55 |
X? ( |
| 56 |
x11-libs/libXmu |
| 57 |
@@ -97,8 +97,8 @@ src_prepare() { |
| 58 |
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ |
| 59 |
|| die "unable to sed ctags.1" |
| 60 |
|
| 61 |
- AT_M4DIR=m4 eautoreconf |
| 62 |
- touch src/stamp-h.in || die |
| 63 |
+ #AT_M4DIR=m4 eautoreconf |
| 64 |
+ #touch src/stamp-h.in || die |
| 65 |
} |
| 66 |
|
| 67 |
src_configure() { |
Archives