commit: 9b17d6983e42c3cb2799184672c2c54750cfc62c Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Sat Apr 8 21:07:48 2017 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Sat Apr 8 21:07:48 2017 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=9b17d698
app-editors/emacs: add 25.2_rc2 This version actually seems to work, unlike 24.5-r3 (need to figure out why) Moved patch from emacs-vcs, and removed emacs-vcs which is out of date. app-editors/emacs-vcs/Manifest | 4 - app-editors/emacs-vcs/metadata.xml | 49 ------------ app-editors/emacs/Manifest | 5 +- .../emacs-25.2_rc2.ebuild} | 88 +++++++++------------- .../files/emacs-vcs-musl.patch | 0 app-editors/emacs/metadata.xml | 4 + 6 files changed, 43 insertions(+), 107 deletions(-) diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest deleted file mode 100644 index dea3e9e..0000000 --- a/app-editors/emacs-vcs/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c -DIST emacs-25.1.50_pre20160130.tar.xz 26974200 SHA256 6ceeb4bd0eba8d6dcbec8068f65c8c9c6e9879cf7dee2e98f93c99d91ab6e75c SHA512 27622940b9b1d54385a2b8d66229d2bbdbc62548c1b6f074e6db3a702bcaeac567ec97a29b4311969a9d1fbb7d693ed353afbed898a239f7d8270530509b9cea WHIRLPOOL 760053301a6aea281ed2e9e5c8ed2c638f16118e7d2808a9b8cf018093026bddebc29eb641eb30dda4c3c6fb725cc2f58cb615f46230ba666daf183694abb7e0 -EBUILD emacs-vcs-25.1.50_pre20160130-r99.ebuild 11872 SHA256 ee4a788778c895cb152b55fa69aceeb26972147972211867b06183721a342162 SHA512 db03f4f4699467396944dcb8d3939f63332a68fcf3aa5c22c66cf06d86b400d89b664609e9cbda489c6e4f9454c070a3be2d64d30c9c27c696889dcf5e78046c WHIRLPOOL 9c6267611b88e8c3f3a9bfe52eb9317e8009acfa9ccb5bacaa368b316a3a1531bcba8691ed422bd7af85e54cc6d6c61dd33095c378242ee7f1fba36b22f789d2 -MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml deleted file mode 100644 index f98dc36..0000000 --- a/app-editors/emacs-vcs/metadata.xml +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNU Emacs project</name> -</maintainer> -<longdescription> - GNU Emacs is an extensible, customizable text editor - and more. At its core - is an interpreter for Emacs Lisp, a dialect of the Lisp programming language - with extensions to support text editing. The features of GNU Emacs include: - * Content-sensitive editing modes, including syntax coloring, for a variety - of file types including plain text, source code, and HTML. - * Complete built-in documentation, including a tutorial for new users. - * Full Unicode support for nearly all human languages and their scripts. - * Highly customizable, using Emacs Lisp code or a graphical interface. - * A large number of extensions that add other functionality, including a - project planner, mail and news reader, debugger interface, calendar, and - more. Many of these extensions are distributed with GNU Emacs; others are - available separately. -</longdescription> -<use> - <flag name="athena">Enable the MIT Athena widget set - (<pkg>x11-libs/libXaw</pkg>)</flag> - <flag name="games">Support shared score files for games</flag> - <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system - font name</flag> - <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file - notification</flag> - <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the - system font name</flag> - <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 - of the internal Lisp implementations</flag> - <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag> - <flag name="source">Install C source files and make them available for - find-function</flag> - <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in - preference to Emacs' own scrollbars</flag> - <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). - This option has an effect only on architectures where "long" and - "long long" types have different size.</flag> -</use> -</pkgmetadata> diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index f72390d..a2d44ca 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -3,8 +3,11 @@ AUX emacs-24.3-stderr.patch 278 SHA256 ca8f431a822b0ae6e82e1600e5943a150ff18b0bf AUX emacs-24.4-configure.patch 334 SHA256 696710ea84e88a364bd89c9c66393b01b2b8782d2bd0fc08166e64b67b24b0fe SHA512 d75df3a772713e08b45759b58c92944a1719ce291069f111d296b15c7de86f7a9a89d023fa3ccd191390d8a79a671d0a60116f039cf6f57ebeeb7baa14f7af29 WHIRLPOOL 6420f6a5f8009096aa71f2e64d920dec6a1436bbb83c26c2a0d4180555b6e251ebfa92be801ddcf70bd840cb9afd56f99a84ad50be7361289baefe83e35ca52b AUX emacs-24.4-lisp.patch 421 SHA256 da45d30d4e305ba5220749d3ac884aaeac395bc896839a5e7a24fb112912cbff SHA512 7dda7632f7af4207c94bf2b4384d07bb13ef4562ade02393c668b35ff48d7b64d95a9c05d8700c2ba272abf69e8b9c38a690b10afa86b8857a2ba34cb344f3a3 WHIRLPOOL 28e3346a1b47f8421d56ec37005a806828f1f6995cd4dc213ac8a6011457a7d1d0524f8418a2801e176c5ea09cb5910cd6432a55c592d679f7752c3df23ca339 AUX emacs-24.4-preload-hack.patch 343 SHA256 289febdc960bee609514fe5291fb3d60cc9b505345853370aa94b9bd9ccb5fd2 SHA512 ee765cc9f3a84b48c00a0c8a36934af6da737fa6b9f9d993e0e5e1c8b9f05cf7b1f96c260daba10e4b4df149abcf8ea125cf8d6ebbe5e2c0d508007e381ecd6b WHIRLPOOL f5c1c6313392325949edc955d9f1b3dc74395ff18cd214f5bef6f8f77ce1975233c870101a03d5218da007a61f3107474ef461d129313b00b07da762970b749a +AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c AUX preload.c 1868 SHA256 3498abf641e809c06bf6a265d54880e93ee31f7abf81210856b6dbef7d267129 SHA512 6268255b7afa8455ad7ce63ef6f01a7d114b53fbb3dc557b187de0ee6514b33b3419d70b8d7984dc289f5eed075a30b508133147821f77c4345df5cbd62e616e WHIRLPOOL 0c72d97de94cf5e1cf6a8ee4f8f42800d63f35465ea22f8c409857620ecc37e304ff6c2c4670659a063e5f275488fcdd1b45226d9d0130c4506480df7708bff6 DIST emacs-24.5-patches-3.tar.xz 12500 SHA256 4927e037141c0c242d0d6d3aa7dfde140faae361aa556e6ded64b7ab26819f07 SHA512 9bddca3d4a67b57ca03c26fbca378def345592a95c40e868fc47fd9944ed0f750bc30f3a4d588a8a0b4c90daa6c9ed63b56182e8d2d87b4c8d849bf834ead1cc WHIRLPOOL c16cbfda1040b205ced4c1ed120aad6f65285fb315ce89dc936e6a357fbc8f9215fb178b696d2a914c53c6869384f0b1b56fcb6b84c5438f026101b4989de6c5 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3 +DIST emacs-25.2-rc2.tar.xz 43014244 SHA256 4f405314b427f9fdfc3fe89c3a062524156b23e07396427bb16d30ba1a8bf687 SHA512 95e1b127beec5a6c8c5b54545b489e28d8c31051d82d6603ec8907b3cdfddd8a16a3b00287932bf8d69babfce44aa464236593bcb4e20864c823830f32f7be49 WHIRLPOOL 1260db4b10800e0371515637490f31c7fbd391ee642861a14dfbaad91cc95f04faee25c9a46a62efef87d7eddc629d50c7ea5c0463b761788f6c0b1b8f793eb7 EBUILD emacs-24.5-r3.ebuild 11394 SHA256 3cacb6d7d80c231fbf91672bec23459e926b11055fe060fda90d471cc3a67380 SHA512 686c87909c5f7381da890f8fd3fb89b320584ee498fbe0afdd2565d17e99fb4c7e5ec4884e0752d06befa8739434d170e894a3c4b634d5d34a3803b70778201b WHIRLPOOL a9b17e5391e6c9a03a8c912b8e7177bac316b6111b5834d77d8b79ff61e3a84e5afde3a670099169cd11413e1d7ef66bf913c282ec722d9f1776947088ed69aa -MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd +EBUILD emacs-25.2_rc2.ebuild 11529 SHA256 85922253f96a78f05bd8a812c5afc61b739059e9aa4b3f331da4765ad4f94987 SHA512 fb179118312648cbaf56cbbe6eb457d7b6e6beb55500360c3f5511bf6fba982d1707f0972638eb7dd9bc2e636e06ea7841edb1f877fb045aff9564562cbef9a2 WHIRLPOOL 381d95d3bd057da44d614780d0d823f52988e70a30c0e41468f4851cae8151b6a6535bec7919a90bdb2901516b30a07ea9556b22341faf922b2525b59dec214c +MISC metadata.xml 2759 SHA256 7f568caaf3e715c1534bd7848b60e8234b4f082b665ba6769780dccdf9939b3e SHA512 748620c7f63f55d74bd758fbe21d3762d23e97b362aa356ea30e42efb5f297b1e1abf6b43f6ff1239db0d1732f0d514d49f354a3792d839437f7b29f5ea23b42 WHIRLPOOL 9eec021a8c2a2a8b7d79ff1d348699f051d6e7e54586445ab691632bf26155c4ec722ef0db6984efb0510e7e49537c4c421fb896c7d861da836d3bc6bfe85de2 diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild b/app-editors/emacs/emacs-25.2_rc2.ebuild similarity index 84% rename from app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild rename to app-editors/emacs/emacs-25.2_rc2.ebuild index 5239e94..5ca42d0 100644 --- a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130-r99.ebuild +++ b/app-editors/emacs/emacs-25.2_rc2.ebuild @@ -1,38 +1,21 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1 -if [[ ${PV##*.} = 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git" - EGIT_BRANCH="master" - EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" - S="${EGIT_CHECKOUT_DIR}" -else - SRC_URI="https://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz - mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz" - KEYWORDS="~amd64 ~arm ~ppc ~x86" - # FULL_VERSION keeps the full version number, which is needed in - # order to determine some path information correctly for copy/move - # operations later on - FULL_VERSION="${PV%%_*}" - S="${WORKDIR}/emacs-${FULL_VERSION}" - [[ ${FULL_VERSION} != ${PV} ]] && S="${WORKDIR}/emacs" -fi - DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="https://www.gnu.org/software/emacs/"; +SRC_URI="mirror://gnu-alpha/emacs/pretest/emacs-${PV/_/-}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" -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" +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 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 +RDEPEND="sys-libs/ncurses:0= >=app-eselect/eselect-emacs-1.16 >=app-emacs/emacs-common-gentoo-1.5[games?,X?] net-libs/liblockfile @@ -59,7 +42,7 @@ RDEPEND="sys-libs/ncurses:0 svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype @@ -71,8 +54,14 @@ RDEPEND="sys-libs/ncurses:0 ) ) 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 ) @@ -86,32 +75,21 @@ RDEPEND="sys-libs/ncurses:0 DEPEND="${RDEPEND} virtual/pkgconfig gzip-el? ( app-arch/gzip ) - pax_kernel? ( - sys-apps/attr - sys-apps/paxctl - )" + pax_kernel? ( sys-apps/attr )" -if [[ ${PV##*.} = 9999 ]]; then - DEPEND="${DEPEND} - sys-apps/texinfo" -fi +RDEPEND="${RDEPEND} + !<app-editors/emacs-vcs-${PV}" EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}" SITEFILE="20${PN}-${SLOT}-gentoo.el" +# FULL_VERSION keeps the full version number, which is needed in +# order to determine some path information correctly for copy/move +# operations later on +FULL_VERSION="${PV%%_*}" +S="${WORKDIR}/emacs-${FULL_VERSION}" src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.ac) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EGIT_BRANCH}" - einfo "Commit: ${EGIT_VERSION}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - epatch "${FILESDIR}"/${PN}-musl.patch + eapply "${FILESDIR}/${PN}-vcs-musl.patch" eapply_user @@ -120,6 +98,7 @@ src_prepare() { || die "unable to sed ctags.1" AT_M4DIR=m4 eautoreconf + touch src/stamp-h.in || die } src_configure() { @@ -172,7 +151,7 @@ src_configure() { "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." fi - local f + local f line if use gtk; then einfo "Configuring to build with GIMP Toolkit (GTK+)" while read line; do ewarn "${line}"; done <<-EOF @@ -184,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." @@ -203,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" @@ -225,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) \ @@ -351,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 diff --git a/app-editors/emacs-vcs/files/emacs-vcs-musl.patch b/app-editors/emacs/files/emacs-vcs-musl.patch similarity index 100% rename from app-editors/emacs-vcs/files/emacs-vcs-musl.patch rename to app-editors/emacs/files/emacs-vcs-musl.patch diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index f98dc36..61b8821 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -22,6 +22,8 @@ <use> <flag name="athena">Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>)</flag> + <flag name="dynamic-loading">Enable loading of dynamic libraries at + runtime</flag> <flag name="games">Support shared score files for games</flag> <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system font name</flag> @@ -45,5 +47,7 @@ <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.</flag> + <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers + (requires GTK3)</flag> </use> </pkgmetadata>
