From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- app-editors/emacs/Manifest | 7 +- app-editors/emacs/emacs-23.4-r17.ebuild | 6 +- app-editors/emacs/emacs-24.5-r5.ebuild | 11 +- app-editors/emacs/emacs-25.3-r1.ebuild | 2 +- app-editors/emacs/emacs-25.3-r3.ebuild | 371 ++++++++++++++++++++++++++++++++ 5 files changed, 382 insertions(+), 15 deletions(-) create mode 100644 app-editors/emacs/emacs-25.3-r3.ebuild (limited to 'app-editors/emacs') diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index bf715a63be81..dc1b0e131b6a 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -7,7 +7,8 @@ DIST emacs-24.5-patches-4.tar.xz 13632 BLAKE2B 99e70f4ee32c1ba3a66b934de692437aa DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f EBUILD emacs-18.59-r11.ebuild 4230 BLAKE2B fc6f41ecbacf7318de3db12189406d00a2a652c8c10f638a667ba83214f6d7ebf8b78e79c1bb1d04b5ea861001e57ef1d6dd29411f9f660528170c119c55e461 SHA512 686d67d281bc9e39087e2d804e9f9db578293ebb52f9730ac971fa3b938e1310923e78b488e4a97d0e6432d10ee7bcf4338ee7190763a1e03792c4105923beaf -EBUILD emacs-23.4-r17.ebuild 11553 BLAKE2B 2a547246425ca1bf5936d07a632a67e942b82163b061fd648631c3dd3cfe70c220b78cc0ffa899b28cc96c39070ce53ffa21dd872e440cae06a263fc486d4a84 SHA512 40cdfdb92d30b355e70d95dbba17f0995ac9209ed23c8a91f3b1e254c5312fa773c903487ee3be567855fcafbeb216f719086d65f90afe3b72bbddf417cb5e21 -EBUILD emacs-24.5-r5.ebuild 11382 BLAKE2B b20b12487f724d9bea33bf26fa23f8887695cd0029d8b020ad2b646d5e5f9dfceb783a631e7d6fa5a256131e08ef059b1fb1a61c2da048f740a369b52bb6c958 SHA512 3750356b1edc38009220da7d9327cf4f990ff34b84513185602baa964b9804392bb970f191a7fdc3a5bee49c81dd90b206ec31a7b53574c16e992873b317886e -EBUILD emacs-25.3-r1.ebuild 11689 BLAKE2B c663335a2f562523e8c101c4654d6acb37a1e36162d9fde3cb7cb0b9950197bf75bc480298f43b15e290aae9cde19162707399c57af8539b676cba9ca11d1262 SHA512 37b1d591b767188f01950e011347737a2480e85e620d6fd08fada9c44a50087ff5bd2a6bbb4f462b80318c378a1e12edff13f1460454066213b27f15ee65c905 +EBUILD emacs-23.4-r17.ebuild 11562 BLAKE2B c889f8c12adca89b89e2a65fbb79c52d637c69451d2d710e5e8e2723997ddf805012db34a0f4b7a9a310a65e52a926c9d22f41e02ead8856a2133bdf520b41eb SHA512 35913b26e026a5ffc4860f10c697c3d19aaf1b33a30bfab54b51541bcb260358a6d6cfebee823926d398e984bc329541c98ff4c0e4e25b21b39cdba929fd1f0f +EBUILD emacs-24.5-r5.ebuild 11281 BLAKE2B 151edad95ee162f2e1d1889f4d8c16ba7fdac2259415cc5c6a29f079b43058c3bb8537f55c9ce2265a38465bfc6c142ebedbddecae14fcc0ee9e934483ca521e SHA512 67d33ee622436ac5685273bf4a1f00502ed4dc5446498bcab0962e7004fc44fa57e617aade8d159d9d1d2153bf13870a1b8fc7d5d831123e29c8282577b77e2c +EBUILD emacs-25.3-r1.ebuild 11696 BLAKE2B f490a7b26a57fc01633a87188cbb80f50c0d0622e837796fcff2fa6b27d70df2ef5c0893f89a03d93806beea7bcf405bdabed8e7180f05553dfd14c1ce94fdda SHA512 8b11ae6a8ba18998f1ec413dc4bfb2c1090461a56be8cba5b56ac9e849df06a1b4b9cbc520ec2ffd0c62ec83320e8c3886f477e023c03aa5ce60d74e85f002be +EBUILD emacs-25.3-r3.ebuild 11763 BLAKE2B 5fe2522876709ba716b3d0f4f8444c62ee54338f4635ae957e049a1b22d4f037e59479fddb3e7ca89948712234df584ca5144326eac1a3a674c1453f9d59f86f SHA512 34d61b9fc189d1bb015317daaa93a454356c9e9fba7e24a2fe15eb23560f264d4020b66c5d5ae5bf8b947af4cec427a36bd302b08bdfac7e47694f6f7dc2b2e0 MISC metadata.xml 2764 BLAKE2B 07a117a3c5b6b04f34c4e390de8af8dcda3d4068d5139607790282740bd71dc11f06138be0cfb2871b167f9dee4320b8bff6894c10ac40d5df8fc2a3cb2a4dcf SHA512 7e115d381271b2e3a6e8de9a0590f3f5c41318ae814c71b6c85be6a24f234179d691d7eb9e9f19c148716d1090d18abe2e874b8772d3987791f9612b0f2eeb59 diff --git a/app-editors/emacs/emacs-23.4-r17.ebuild b/app-editors/emacs/emacs-23.4-r17.ebuild index 09fda80f8ed3..0a3267bc8243 100644 --- a/app-editors/emacs/emacs-23.4-r17.ebuild +++ b/app-editors/emacs/emacs-23.4-r17.ebuild @@ -27,8 +27,6 @@ RDEPEND="sys-libs/ncurses:0= gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) X? ( - media-libs/fontconfig - media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -41,6 +39,8 @@ RDEPEND="sys-libs/ncurses:0= tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) xft? ( + media-libs/fontconfig + media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( @@ -278,7 +278,7 @@ src_install () { cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" fi - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die X ;;; ${PN}-${SLOT} site-lisp configuration X diff --git a/app-editors/emacs/emacs-24.5-r5.ebuild b/app-editors/emacs/emacs-24.5-r5.ebuild index a60d29353474..4244c1f2ee53 100644 --- a/app-editors/emacs/emacs-24.5-r5.ebuild +++ b/app-editors/emacs/emacs-24.5-r5.ebuild @@ -32,8 +32,6 @@ RDEPEND="sys-libs/ncurses:0= ssl? ( net-libs/gnutls:0= ) zlib? ( sys-libs/zlib ) X? ( - media-libs/fontconfig - media-libs/freetype x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -51,6 +49,8 @@ RDEPEND="sys-libs/ncurses:0= xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( + media-libs/fontconfig + media-libs/freetype x11-libs/libXft x11-libs/libXrender m17n-lib? ( @@ -272,7 +272,7 @@ src_install () { cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" fi - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die X ;;; ${PN}-${SLOT} site-lisp configuration X @@ -339,11 +339,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/emacs-25.3-r1.ebuild b/app-editors/emacs/emacs-25.3-r1.ebuild index 0377eb678615..e7825108d036 100644 --- a/app-editors/emacs/emacs-25.3-r1.ebuild +++ b/app-editors/emacs/emacs-25.3-r1.ebuild @@ -284,7 +284,7 @@ src_install () { cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" fi - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die X ;;; ${PN}-${SLOT} site-lisp configuration X diff --git a/app-editors/emacs/emacs-25.3-r3.ebuild b/app-editors/emacs/emacs-25.3-r3.ebuild new file mode 100644 index 000000000000..8267aedfe4d4 --- /dev/null +++ b/app-editors/emacs/emacs-25.3-r3.ebuild @@ -0,0 +1,371 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +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 zlib" +REQUIRED_USE="?? ( aqua X )" + +RDEPEND="sys-libs/ncurses:0= + >=app-eselect/eselect-emacs-1.16 + >=app-emacs/emacs-common-gentoo-1.5[games?,X?] + net-libs/liblockfile + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + gpm? ( sys-libs/gpm ) + hesiod? ( net-dns/hesiod ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + kerberos? ( virtual/krb5 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + selinux? ( sys-libs/libselinux ) + ssl? ( net-libs/gnutls:0= ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gsettings? ( >=dev-libs/glib-2.28.6 ) + gif? ( media-libs/giflib:0= ) + jpeg? ( virtual/jpeg:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:0 ) + xpm? ( x11-libs/libXpm ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + x11-libs/libXrender + 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 ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXp + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + gzip-el? ( app-arch/gzip ) + pax_kernel? ( sys-apps/attr )" + +RDEPEND="${RDEPEND} + !. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + #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." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + 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" + myconf+=" --without-x" + else + myconf+=" --without-x --without-ns" + fi + + # Save version information in the Emacs binary. It will be available + # in variable "system-configuration-options". + myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}" + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --with-gameuser=":gamestat" \ + --without-compress-install \ + --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) \ + $(use_with libxml2 xml2) \ + $(use_with selinux) \ + $(use_with ssl gnutls) \ + $(use_with wide-int) \ + $(use_with zlib) \ + ${myconf} +} + +src_compile() { + # Disable sandbox when dumping. For the unbelievers, see bug #131505 + emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs" +} + +src_install () { + emake DESTDIR="${D}" NO_BIN_LINK=t install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ + || die "moving emacs executable failed" + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ + || die "moving emacs man page failed" + + # move info dir to avoid collisions with the dir file generated by portage + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ + || die "moving info dir failed" + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el + rm -rf "${ED}"/usr/share/{appdata,applications,icons} + rm -rf "${ED}"/var + + # remove unused /site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${PN}-${SLOT} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share/info + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setq Info-directory-list (prune-directory-list (cdr p))))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die + fi + + DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs + through the Emacs eselect module, which also redirects man and info + pages. Therefore, several Emacs versions can be installed at the + same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is + strongly recommended that you use app-admin/emacs-updater to rebuild + all byte-compiled elisp files of the installed Emacs packages." + use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink + it into /Applications by yourself." + readme.gentoo_create_doc +} + +pkg_preinst() { + # move Info dir file to correct name + local infodir=/usr/share/info/${EMACS_SUFFIX} f + if [[ -f ${ED}${infodir}/dir.orig ]]; then + mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" + elif [[ -d "${ED}"${infodir} ]]; then + # this should not happen in EAPI 4 + ewarn "Regenerating Info directory index in ${infodir} ..." + rm -f "${ED}"${infodir}/dir{,.*} + for f in "${ED}"${infodir}/*; do + if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then + install-info --info-dir="${ED}"${infodir} "${f}" \ + || die "install-info failed" + fi + done + fi +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then + # refresh symlinks in case any installed files have changed + eselect emacs set ${EMACS_SUFFIX} + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} -- cgit v1.2.3