| 1 |
commit: 9b17d6983e42c3cb2799184672c2c54750cfc62c |
| 2 |
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat Apr 8 21:07:48 2017 +0000 |
| 4 |
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Apr 8 21:07:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9b17d698 |
| 7 |
|
| 8 |
app-editors/emacs: add 25.2_rc2 |
| 9 |
|
| 10 |
This version actually seems to work, unlike 24.5-r3 (need to figure out why) |
| 11 |
Moved patch from emacs-vcs, and removed emacs-vcs which is out of date. |
| 12 |
|
| 13 |
app-editors/emacs-vcs/Manifest | 4 - |
| 14 |
app-editors/emacs-vcs/metadata.xml | 49 ------------ |
| 15 |
app-editors/emacs/Manifest | 5 +- |
| 16 |
.../emacs-25.2_rc2.ebuild} | 88 +++++++++------------- |
| 17 |
.../files/emacs-vcs-musl.patch | 0 |
| 18 |
app-editors/emacs/metadata.xml | 4 + |
| 19 |
6 files changed, 43 insertions(+), 107 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest |
| 22 |
deleted file mode 100644 |
| 23 |
index dea3e9e..0000000 |
| 24 |
--- a/app-editors/emacs-vcs/Manifest |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,4 +0,0 @@ |
| 27 |
-AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c |
| 28 |
-DIST emacs-25.1.50_pre20160130.tar.xz 26974200 SHA256 6ceeb4bd0eba8d6dcbec8068f65c8c9c6e9879cf7dee2e98f93c99d91ab6e75c SHA512 27622940b9b1d54385a2b8d66229d2bbdbc62548c1b6f074e6db3a702bcaeac567ec97a29b4311969a9d1fbb7d693ed353afbed898a239f7d8270530509b9cea WHIRLPOOL 760053301a6aea281ed2e9e5c8ed2c638f16118e7d2808a9b8cf018093026bddebc29eb641eb30dda4c3c6fb725cc2f58cb615f46230ba666daf183694abb7e0 |
| 29 |
-EBUILD emacs-vcs-25.1.50_pre20160130-r99.ebuild 11872 SHA256 ee4a788778c895cb152b55fa69aceeb26972147972211867b06183721a342162 SHA512 db03f4f4699467396944dcb8d3939f63332a68fcf3aa5c22c66cf06d86b400d89b664609e9cbda489c6e4f9454c070a3be2d64d30c9c27c696889dcf5e78046c WHIRLPOOL 9c6267611b88e8c3f3a9bfe52eb9317e8009acfa9ccb5bacaa368b316a3a1531bcba8691ed422bd7af85e54cc6d6c61dd33095c378242ee7f1fba36b22f789d2 |
| 30 |
-MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd |
| 31 |
|
| 32 |
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml |
| 33 |
deleted file mode 100644 |
| 34 |
index f98dc36..0000000 |
| 35 |
--- a/app-editors/emacs-vcs/metadata.xml |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,49 +0,0 @@ |
| 38 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 39 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 40 |
-<pkgmetadata> |
| 41 |
-<maintainer type="project"> |
| 42 |
- <email>gnu-emacs@g.o</email> |
| 43 |
- <name>Gentoo GNU Emacs project</name> |
| 44 |
-</maintainer> |
| 45 |
-<longdescription> |
| 46 |
- GNU Emacs is an extensible, customizable text editor - and more. At its core |
| 47 |
- is an interpreter for Emacs Lisp, a dialect of the Lisp programming language |
| 48 |
- with extensions to support text editing. The features of GNU Emacs include: |
| 49 |
- * Content-sensitive editing modes, including syntax coloring, for a variety |
| 50 |
- of file types including plain text, source code, and HTML. |
| 51 |
- * Complete built-in documentation, including a tutorial for new users. |
| 52 |
- * Full Unicode support for nearly all human languages and their scripts. |
| 53 |
- * Highly customizable, using Emacs Lisp code or a graphical interface. |
| 54 |
- * A large number of extensions that add other functionality, including a |
| 55 |
- project planner, mail and news reader, debugger interface, calendar, and |
| 56 |
- more. Many of these extensions are distributed with GNU Emacs; others are |
| 57 |
- available separately. |
| 58 |
-</longdescription> |
| 59 |
-<use> |
| 60 |
- <flag name="athena">Enable the MIT Athena widget set |
| 61 |
- (<pkg>x11-libs/libXaw</pkg>)</flag> |
| 62 |
- <flag name="games">Support shared score files for games</flag> |
| 63 |
- <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system |
| 64 |
- font name</flag> |
| 65 |
- <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file |
| 66 |
- notification</flag> |
| 67 |
- <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the |
| 68 |
- system font name</flag> |
| 69 |
- <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2 |
| 70 |
- (<pkg>x11-libs/gtk+</pkg>)</flag> |
| 71 |
- <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> |
| 72 |
- <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag> |
| 73 |
- <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image |
| 74 |
- processing</flag> |
| 75 |
- <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead |
| 76 |
- of the internal Lisp implementations</flag> |
| 77 |
- <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> |
| 78 |
- <flag name="source">Install C source files and make them available for |
| 79 |
- find-function</flag> |
| 80 |
- <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in |
| 81 |
- preference to Emacs' own scrollbars</flag> |
| 82 |
- <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). |
| 83 |
- This option has an effect only on architectures where "long" and |
| 84 |
- "long long" types have different size.</flag> |
| 85 |
-</use> |
| 86 |
-</pkgmetadata> |
| 87 |
|
| 88 |
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest |
| 89 |
index f72390d..a2d44ca 100644 |
| 90 |
--- a/app-editors/emacs/Manifest |
| 91 |
+++ b/app-editors/emacs/Manifest |
| 92 |
@@ -3,8 +3,11 @@ AUX emacs-24.3-stderr.patch 278 SHA256 ca8f431a822b0ae6e82e1600e5943a150ff18b0bf |
| 93 |
AUX emacs-24.4-configure.patch 334 SHA256 696710ea84e88a364bd89c9c66393b01b2b8782d2bd0fc08166e64b67b24b0fe SHA512 d75df3a772713e08b45759b58c92944a1719ce291069f111d296b15c7de86f7a9a89d023fa3ccd191390d8a79a671d0a60116f039cf6f57ebeeb7baa14f7af29 WHIRLPOOL 6420f6a5f8009096aa71f2e64d920dec6a1436bbb83c26c2a0d4180555b6e251ebfa92be801ddcf70bd840cb9afd56f99a84ad50be7361289baefe83e35ca52b |
| 94 |
AUX emacs-24.4-lisp.patch 421 SHA256 da45d30d4e305ba5220749d3ac884aaeac395bc896839a5e7a24fb112912cbff SHA512 7dda7632f7af4207c94bf2b4384d07bb13ef4562ade02393c668b35ff48d7b64d95a9c05d8700c2ba272abf69e8b9c38a690b10afa86b8857a2ba34cb344f3a3 WHIRLPOOL 28e3346a1b47f8421d56ec37005a806828f1f6995cd4dc213ac8a6011457a7d1d0524f8418a2801e176c5ea09cb5910cd6432a55c592d679f7752c3df23ca339 |
| 95 |
AUX emacs-24.4-preload-hack.patch 343 SHA256 289febdc960bee609514fe5291fb3d60cc9b505345853370aa94b9bd9ccb5fd2 SHA512 ee765cc9f3a84b48c00a0c8a36934af6da737fa6b9f9d993e0e5e1c8b9f05cf7b1f96c260daba10e4b4df149abcf8ea125cf8d6ebbe5e2c0d508007e381ecd6b WHIRLPOOL f5c1c6313392325949edc955d9f1b3dc74395ff18cd214f5bef6f8f77ce1975233c870101a03d5218da007a61f3107474ef461d129313b00b07da762970b749a |
| 96 |
+AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c |
| 97 |
AUX preload.c 1868 SHA256 3498abf641e809c06bf6a265d54880e93ee31f7abf81210856b6dbef7d267129 SHA512 6268255b7afa8455ad7ce63ef6f01a7d114b53fbb3dc557b187de0ee6514b33b3419d70b8d7984dc289f5eed075a30b508133147821f77c4345df5cbd62e616e WHIRLPOOL 0c72d97de94cf5e1cf6a8ee4f8f42800d63f35465ea22f8c409857620ecc37e304ff6c2c4670659a063e5f275488fcdd1b45226d9d0130c4506480df7708bff6 |
| 98 |
DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5 |
| 99 |
DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3 |
| 100 |
+DIST emacs-25.2-rc2.tar.xz 43014244 SHA256 4f405314b427f9fdfc3fe89c3a062524156b23e07396427bb16d30ba1a8bf687 SHA512 95e1b127beec5a6c8c5b54545b489e28d8c31051d82d6603ec8907b3cdfddd8a16a3b00287932bf8d69babfce44aa464236593bcb4e20864c823830f32f7be49 WHIRLPOOL 1260db4b10800e0371515637490f31c7fbd391ee642861a14dfbaad91cc95f04faee25c9a46a62efef87d7eddc629d50c7ea5c0463b761788f6c0b1b8f793eb7 |
| 101 |
EBUILD emacs-24.5-r3.ebuild 11394 SHA256 3cacb6d7d80c231fbf91672bec23459e926b11055fe060fda90d471cc3a67380 SHA512 686c87909c5f7381da890f8fd3fb89b320584ee498fbe0afdd2565d17e99fb4c7e5ec4884e0752d06befa8739434d170e894a3c4b634d5d34a3803b70778201b WHIRLPOOL a9b17e5391e6c9a03a8c912b8e7177bac316b6111b5834d77d8b79ff61e3a84e5afde3a670099169cd11413e1d7ef66bf913c282ec722d9f1776947088ed69aa |
| 102 |
-MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd |
| 103 |
+EBUILD emacs-25.2_rc2.ebuild 11529 SHA256 85922253f96a78f05bd8a812c5afc61b739059e9aa4b3f331da4765ad4f94987 SHA512 fb179118312648cbaf56cbbe6eb457d7b6e6beb55500360c3f5511bf6fba982d1707f0972638eb7dd9bc2e636e06ea7841edb1f877fb045aff9564562cbef9a2 WHIRLPOOL 381d95d3bd057da44d614780d0d823f52988e70a30c0e41468f4851cae8151b6a6535bec7919a90bdb2901516b30a07ea9556b22341faf922b2525b59dec214c |
| 104 |
+MISC metadata.xml 2759 SHA256 7f568caaf3e715c1534bd7848b60e8234b4f082b665ba6769780dccdf9939b3e SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42 WHIRLPOOL 9eec021a8c2a2a8b7d79ff1d348699f051d6e7e54586445ab691632bf26155c4ec722ef0db6984efb0510e7e49537c4c421fb896c7d861da836d3bc6bfe85de2 |
| 105 |
|
| 106 |
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild b/app-editors/emacs/emacs-25.2_rc2.ebuild |
| 107 |
similarity index 84% |
| 108 |
rename from app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild |
| 109 |
rename to app-editors/emacs/emacs-25.2_rc2.ebuild |
| 110 |
index 5239e94..5ca42d0 100644 |
| 111 |
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild |
| 112 |
+++ b/app-editors/emacs/emacs-25.2_rc2.ebuild |
| 113 |
@@ -1,38 +1,21 @@ |
| 114 |
-# Copyright 1999-2016 Gentoo Foundation |
| 115 |
+# Copyright 1999-2017 Gentoo Foundation |
| 116 |
# Distributed under the terms of the GNU General Public License v2 |
| 117 |
-# $Id$ |
| 118 |
|
| 119 |
-EAPI=5 |
| 120 |
+EAPI=6 |
| 121 |
|
| 122 |
inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 |
| 123 |
|
| 124 |
-if [[ ${PV##*.} = 9999 ]]; then |
| 125 |
- inherit git-r3 |
| 126 |
- EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" |
| 127 |
- EGIT_BRANCH="master" |
| 128 |
- EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" |
| 129 |
- S="${EGIT_CHECKOUT_DIR}" |
| 130 |
-else |
| 131 |
- SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz |
| 132 |
- mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" |
| 133 |
- KEYWORDS="~amd64 ~arm ~ppc ~x86" |
| 134 |
- # FULL_VERSION keeps the full version number, which is needed in |
| 135 |
- # order to determine some path information correctly for copy/move |
| 136 |
- # operations later on |
| 137 |
- FULL_VERSION="${PV%%_*}" |
| 138 |
- S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 139 |
- [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" |
| 140 |
-fi |
| 141 |
- |
| 142 |
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" |
| 143 |
HOMEPAGE="https://www.gnu.org/software/emacs/" |
| 144 |
+SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.tar.xz" |
| 145 |
|
| 146 |
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" |
| 147 |
SLOT="25" |
| 148 |
-IUSE="acl alsa aqua athena cairo 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" |
| 149 |
+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" |
| 150 |
+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" |
| 151 |
REQUIRED_USE="?? ( aqua X )" |
| 152 |
|
| 153 |
-RDEPEND="sys-libs/ncurses:0 |
| 154 |
+RDEPEND="sys-libs/ncurses:0= |
| 155 |
>=app-eselect/eselect-emacs-1.16 |
| 156 |
>=app-emacs/emacs-common-gentoo-1.5[games?,X?] |
| 157 |
net-libs/liblockfile |
| 158 |
@@ -59,7 +42,7 @@ RDEPEND="sys-libs/ncurses:0 |
| 159 |
svg? ( >=gnome-base/librsvg-2.0 ) |
| 160 |
tiff? ( media-libs/tiff:0 ) |
| 161 |
xpm? ( x11-libs/libXpm ) |
| 162 |
- imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) |
| 163 |
+ imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) |
| 164 |
xft? ( |
| 165 |
media-libs/fontconfig |
| 166 |
media-libs/freetype |
| 167 |
@@ -71,8 +54,14 @@ RDEPEND="sys-libs/ncurses:0 |
| 168 |
) |
| 169 |
) |
| 170 |
gtk? ( |
| 171 |
- gtk3? ( x11-libs/gtk+:3 ) |
| 172 |
- !gtk3? ( x11-libs/gtk+:2 ) |
| 173 |
+ xwidgets? ( |
| 174 |
+ x11-libs/gtk+:3 |
| 175 |
+ net-libs/webkit-gtk:3= |
| 176 |
+ ) |
| 177 |
+ !xwidgets? ( |
| 178 |
+ gtk3? ( x11-libs/gtk+:3 ) |
| 179 |
+ !gtk3? ( x11-libs/gtk+:2 ) |
| 180 |
+ ) |
| 181 |
) |
| 182 |
!gtk? ( |
| 183 |
motif? ( >=x11-libs/motif-2.3:0 ) |
| 184 |
@@ -86,32 +75,21 @@ RDEPEND="sys-libs/ncurses:0 |
| 185 |
DEPEND="${RDEPEND} |
| 186 |
virtual/pkgconfig |
| 187 |
gzip-el? ( app-arch/gzip ) |
| 188 |
- pax_kernel? ( |
| 189 |
- sys-apps/attr |
| 190 |
- sys-apps/paxctl |
| 191 |
- )" |
| 192 |
+ pax_kernel? ( sys-apps/attr )" |
| 193 |
|
| 194 |
-if [[ ${PV##*.} = 9999 ]]; then |
| 195 |
- DEPEND="${DEPEND} |
| 196 |
- sys-apps/texinfo" |
| 197 |
-fi |
| 198 |
+RDEPEND="${RDEPEND} |
| 199 |
+ !<app-editors/emacs-vcs-${PV}" |
| 200 |
|
| 201 |
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" |
| 202 |
SITEFILE="20${PN}-${SLOT}-gentoo.el" |
| 203 |
+# FULL_VERSION keeps the full version number, which is needed in |
| 204 |
+# order to determine some path information correctly for copy/move |
| 205 |
+# operations later on |
| 206 |
+FULL_VERSION="${PV%%_*}" |
| 207 |
+S="${WORKDIR}/emacs-${FULL_VERSION}" |
| 208 |
|
| 209 |
src_prepare() { |
| 210 |
- if [[ ${PV##*.} = 9999 ]]; then |
| 211 |
- FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ |
| 212 |
- configure.ac) |
| 213 |
- [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" |
| 214 |
- einfo "Emacs branch: ${EGIT_BRANCH}" |
| 215 |
- einfo "Commit: ${EGIT_VERSION}" |
| 216 |
- einfo "Emacs version number: ${FULL_VERSION}" |
| 217 |
- [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ |
| 218 |
- || die "Upstream version number changed to ${FULL_VERSION}" |
| 219 |
- fi |
| 220 |
- |
| 221 |
- epatch "${FILESDIR}"/${PN}-musl.patch |
| 222 |
+ eapply "${FILESDIR}/${PN}-vcs-musl.patch" |
| 223 |
|
| 224 |
eapply_user |
| 225 |
|
| 226 |
@@ -120,6 +98,7 @@ src_prepare() { |
| 227 |
|| die "unable to sed ctags.1" |
| 228 |
|
| 229 |
AT_M4DIR=m4 eautoreconf |
| 230 |
+ touch src/stamp-h.in || die |
| 231 |
} |
| 232 |
|
| 233 |
src_configure() { |
| 234 |
@@ -172,7 +151,7 @@ src_configure() { |
| 235 |
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set." |
| 236 |
fi |
| 237 |
|
| 238 |
- local f |
| 239 |
+ local f line |
| 240 |
if use gtk; then |
| 241 |
einfo "Configuring to build with GIMP Toolkit (GTK+)" |
| 242 |
while read line; do ewarn "${line}"; done <<-EOF |
| 243 |
@@ -184,7 +163,12 @@ src_configure() { |
| 244 |
recommended that you compile Emacs with the Athena/Lucid or the |
| 245 |
Motif toolkit instead. |
| 246 |
EOF |
| 247 |
- myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
| 248 |
+ if use xwidgets; then |
| 249 |
+ myconf+=" --with-x-toolkit=gtk3 --with-xwidgets" |
| 250 |
+ else |
| 251 |
+ myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)" |
| 252 |
+ myconf+=" --without-xwidgets" |
| 253 |
+ fi |
| 254 |
for f in motif Xaw3d athena; do |
| 255 |
use ${f} && ewarn \ |
| 256 |
"USE flag \"${f}\" has no effect if \"gtk\" is set." |
| 257 |
@@ -203,6 +187,8 @@ src_configure() { |
| 258 |
einfo "Configuring to build with no toolkit" |
| 259 |
myconf+=" --with-x-toolkit=no" |
| 260 |
fi |
| 261 |
+ ! use gtk && use xwidgets && ewarn \ |
| 262 |
+ "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." |
| 263 |
elif use aqua; then |
| 264 |
einfo "Configuring to build with Nextstep (Cocoa) support" |
| 265 |
myconf+=" --with-ns --disable-ns-self-contained" |
| 266 |
@@ -225,6 +211,7 @@ src_configure() { |
| 267 |
--with-file-notification=$(usev inotify || usev gfile || echo no) \ |
| 268 |
$(use_enable acl) \ |
| 269 |
$(use_with dbus) \ |
| 270 |
+ $(use_with dynamic-loading modules) \ |
| 271 |
$(use_with gpm) \ |
| 272 |
$(use_with hesiod) \ |
| 273 |
$(use_with kerberos) $(use_with kerberos kerberos5) \ |
| 274 |
@@ -351,11 +338,6 @@ pkg_preinst() { |
| 275 |
|
| 276 |
pkg_postinst() { |
| 277 |
elisp-site-regen |
| 278 |
- |
| 279 |
- local pvr |
| 280 |
- for pvr in ${REPLACING_VERSIONS}; do |
| 281 |
- [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1 |
| 282 |
- done |
| 283 |
readme.gentoo_print_elog |
| 284 |
|
| 285 |
if use livecd; then |
| 286 |
|
| 287 |
diff --git a/app-editors/emacs-vcs/files/emacs-vcs-musl.patch b/app-editors/emacs/files/emacs-vcs-musl.patch |
| 288 |
similarity index 100% |
| 289 |
rename from app-editors/emacs-vcs/files/emacs-vcs-musl.patch |
| 290 |
rename to app-editors/emacs/files/emacs-vcs-musl.patch |
| 291 |
|
| 292 |
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml |
| 293 |
index f98dc36..61b8821 100644 |
| 294 |
--- a/app-editors/emacs/metadata.xml |
| 295 |
+++ b/app-editors/emacs/metadata.xml |
| 296 |
@@ -22,6 +22,8 @@ |
| 297 |
<use> |
| 298 |
<flag name="athena">Enable the MIT Athena widget set |
| 299 |
(<pkg>x11-libs/libXaw</pkg>)</flag> |
| 300 |
+ <flag name="dynamic-loading">Enable loading of dynamic libraries at |
| 301 |
+ runtime</flag> |
| 302 |
<flag name="games">Support shared score files for games</flag> |
| 303 |
<flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system |
| 304 |
font name</flag> |
| 305 |
@@ -45,5 +47,7 @@ |
| 306 |
<flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). |
| 307 |
This option has an effect only on architectures where "long" and |
| 308 |
"long long" types have different size.</flag> |
| 309 |
+ <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers |
| 310 |
+ (requires GTK3)</flag> |
| 311 |
</use> |
| 312 |
</pkgmetadata> |
Archives