From: Ulrich Müller Date: Fri, 23 Jan 2015 20:38:58 +0000 (+0000) Subject: Don't shadow load-path in gnus, bug 537156. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e43783fd77954337598fa916d97b1089a74cab7a;p=gentoo.git Don't shadow load-path in gnus, bug 537156. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8! --- diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog index 699087a6532e..ac9bf812e40b 100644 --- a/app-editors/emacs/ChangeLog +++ b/app-editors/emacs/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-editors/emacs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.651 2015/01/02 17:02:55 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.652 2015/01/23 20:38:44 ulm Exp $ + +*emacs-24.4-r2 (23 Jan 2015) + + 23 Jan 2015; Ulrich Müller +emacs-24.4-r2.ebuild: + Don't shadow load-path in gnus, bug 537156. 02 Jan 2015; Mikle Kolyada emacs-24.4-r1.ebuild: x86 stable wrt bug #531806 diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 7213bc70cafd..a09be35c68b2 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -9,19 +9,26 @@ DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd0929692519884 DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8 DIST emacs-24.4-patches-2.tar.xz 1316 SHA256 e67954091f565668b921d32c14f9f31800e09249248fe03fd4369480a17a26f5 SHA512 c52910391ca58fc9a4b99147f62f2f1d9432c08889bd756cb3b5bf21028ef205a5d285fdbd495c5f1608180b834682ee8b4877e2d02359afb3596078fea5533b WHIRLPOOL a571557a3e86c69dde864cb1aac34b12bc6b8b2d97b8a73293337c1c971143fcf807be30c61c0bf6ecec3d5174f46afdece7395f1012d366dca45b4560c825c7 +DIST emacs-24.4-patches-3.tar.xz 3780 SHA256 2dd1ba1e9cca9121731d14da30ecf3eb720c07e9644a7b9d75e3f02ebc2089d7 SHA512 dde60b26a7dffca1f80937af406ec8a7b4dd8c2563f57c290629acc4767ef38075fcc42ca62c5f172c972fc3cb6c2c0539d3db641386edc68a842bc6cf81237c WHIRLPOOL 3da7034ac9ce495f57ad5bd82f6f8a4d8a4baddd4126b6753423f5cf58aa01873838e22b2908b8c2e4cd48590dd7fb7ea3a520e1bf43be7d0eaf02583bdc9f6f DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b EBUILD emacs-18.59-r10.ebuild 4297 SHA256 74c5d7927ea976e02680e0a24a90a270a067787e45cbb74602c8e7e513eec166 SHA512 d19f66368ed77bd4caeb260b098e79077a8e87328522d75092297c2cf15b39deb267518242f4939405a99365682653506374c0b6942be267816ddf9419a0ae4a WHIRLPOOL f8fe6dd1b04e838b0e5acc2d199a2d356dbf5ae61152a3ec9df156eceb04a9120743f8f98b04b27ae620b7c30ec5e1841df65b86a572be0746044969c42699a5 EBUILD emacs-23.4-r11.ebuild 11318 SHA256 bc55e5fa7d3c4638c0162e3812537fb8b029cb0bbbdebf80bef04f3577554b69 SHA512 6090d1f42006ab20c991817da95694759ee8468a0ebb41c679f5fdb515f252ed8792f9b06d3a42ed1b424a847a31013a7895d17ae889cd548499dae6ded31489 WHIRLPOOL 6121ee3880a3fc990f54a50257c6472936afb5b3086844e625333747d30b6f048d745d9f330cef0d4634505ea5c1b31b8efa1c728b5ff75e77ffb2983a890b54 EBUILD emacs-24.3-r6.ebuild 11208 SHA256 1ded9fecbbdc1c4c0d29690e6880bfe800525647bbd7597a21610762c48332eb SHA512 f6a29ada07419957579adac3ec587ea762064aa13c33677317a497de7b5a35e768d9270e57cefde66033b1b09ea3c8ce15ffac7ff1ab7b5e98adad92e4bc2ebf WHIRLPOOL 91258009fee9fb428c4b6d987bb5b4ef15035183f9084eb421fc0b7382f205252b051e017a214c7c3ee018f612f60792c9c2dde1a72ee15744f54c9e336408c6 EBUILD emacs-24.4-r1.ebuild 10676 SHA256 db03de8671b255c4971edee92b7018fe6aed879afa98dbb6dd3a8a4afd91d182 SHA512 6ef50390ff27885edb1ac061205aef3f0ca846730de9e78f5467d38355971777c9f68cca234641adcbbc1f43b37a50d76cf5f8f385976b042aaa36a4ee3c71d7 WHIRLPOOL 19681800a6c61650eac2aa5072eadc0ad38bc5c529736787a32b1bf066e256605fd190c6b4998e6d35b799dde9eed1d395d65051d8288f6007d1936d3847a3da -MISC ChangeLog 89081 SHA256 4377245e42b8efcfe9d58f224255163a2daa772b3c0b0bd5dba593345252ff46 SHA512 f83ea0510a939586e977866d17f0fa7cab0c24fd9bb42708be2db796889d82ed2d76e413546a5fe44ee57118e9e0fc14b4508b31f9c04e3b7871d59983974d9d WHIRLPOOL 4c77d31f9f88493877745b9523d04e853919caa1204b0fc7a1b959ca75be3188468fed1ca3fd399103f64fd835b2cc01ac237c634bcd0c8396685b011ba3cadd +EBUILD emacs-24.4-r2.ebuild 10676 SHA256 f7dcabe41c840ff4bf08a20fc2824b992315d16ccdb9000174ce0b5743c0e56b SHA512 87ae797db5f1a55fffb0b8b1611698609b49bd7f8802a58c55e8e55a675864ed0ce4fa36527d5d1bb72615769cb3c31098e8742a4227560a3c74b8365d792208 WHIRLPOOL 63395637b2b8eadc1b4939ef9164ee44703ce866d01870bb7f80b9c467503b1c25908c5ac5c70b18ceb32b0b5b9588ca544538f4b35e1f1b53ff51e4148bc905 +MISC ChangeLog 89224 SHA256 eef42b893326b7f0b16df584ce67ea74a4ae6fa478d38d9ea7e4e12ef4deb0fb SHA512 66b0550199ab3874fa4184feb169e5bd977ebe4478f968f783dc61933fe5c4650bb25b3cd7a58a99de95b6b9b173f849cc3aa5a47131fdc9dcaa11a154357080 WHIRLPOOL e1eadffd45cbb54b65c17801fd077a20bb374bf8811a7bad2ac6e6fcb6b6dd4796e5cc7d261d50657560eb34e35101aca667f2de1de5e94874ee6a9d4c5ed57f MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iJwEAQEIAAYFAlSmzuIACgkQG9wOWsQutdb+CQP/XzJ3XAa8s83w2Xg7uUS0JZic -JhLUNwVYPN1Rd7pPuf57uhh/vdKFP0VhjmkJ+TJ4XWD7EESNwiMWJqK+mpkcRAYb -WpfD0Ffkl/ueo/Ph7zodtBrkpi5h2kpk12ZkHarQLLgss8VUZPNwkuBPSJZR/zkb -giH9mC6Drai6CIm4hZE= -=isCG +iQGcBAEBCAAGBQJUwrLGAAoJEJQzkH1pP7W4VjEMAK+DuHiQrbI5j3GuwhbHN50N +vMr5927SLygfEcx6NYJ6/W63TGfCWqFjmHdB9CAt9+HyKk7l1ME5MyPTzFFu0RgD +ef6HPzdSbq4SusSUaTWXRUhwSemEN9dedlBHOktnZM6r2tb3elHsOvg/lYE5/pym +rTM6DVFK/5zmyx5H+PRaqbsWF9JmQTik8iqsLvTpfB0ACTNBGhBaSnCJ1U2R9S03 +ZuwX6S+J21TD3P0e0r54yl3jGipE4uxsondc1sYZgpvyxUEyuRKsMKezLiO7c1cl +HqIm1UM4LdCCUlvZWbd7Z3A7IgwX5j28Xj1R1yRDq6QjRvoJdakxfmU73stPbvJs +L6LBLTAmPVh+CI/8FzdYhps/HDZtObjuviDDpr1Edy1qYrAJYOTcJiIoDV+AeZRP +WI993utc0oSWYilZGiRp65XaPlZjl+XEFSWICXMb3McblYqHho8GstMwY8Mi//+u +fXaSA3gSHcHHahIh+en+szKkKxYmEBiAK/nt0sp0pQ== +=ZeD/ -----END PGP SIGNATURE----- diff --git a/app-editors/emacs/emacs-24.4-r2.ebuild b/app-editors/emacs/emacs-24.4-r2.ebuild new file mode 100644 index 000000000000..a58b45e21253 --- /dev/null +++ b/app-editors/emacs/emacs-24.4-r2.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.1 2015/01/23 20:38:44 ulm Exp $ + +EAPI=5 + +inherit elisp-common eutils flag-o-matic multilib readme.gentoo + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="http://www.gnu.org/software/emacs/" +SRC_URI="mirror://gnu/emacs/${P}.tar.xz + http://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +SLOT="24" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" +REQUIRED_USE="?? ( aqua X )" + +RDEPEND="sys-libs/ncurses + >=app-admin/eselect-emacs-1.16 + >=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?] + net-libs/liblockfile + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + gfile? ( >=dev-libs/glib-2.28.6 ) + gnutls? ( net-libs/gnutls ) + gpm? ( sys-libs/gpm ) + hesiod? ( net-dns/hesiod ) + kerberos? ( virtual/krb5 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + selinux? ( sys-libs/libselinux ) + zlib? ( sys-libs/zlib ) + X? ( + x11-libs/libXmu + x11-libs/libXt + x11-misc/xbitmaps + gconf? ( >=gnome-base/gconf-2.26.2 ) + gsettings? ( >=dev-libs/glib-2.28.6 ) + gif? ( media-libs/giflib ) + jpeg? ( virtual/jpeg:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff ) + xpm? ( x11-libs/libXpm ) + imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXft + 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 ) + !motif? ( + Xaw3d? ( x11-libs/libXaw3d ) + !Xaw3d? ( athena? ( x11-libs/libXaw ) ) + ) + ) + )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + gzip-el? ( app-arch/gzip ) + pax_kernel? ( + sys-apps/attr + sys-apps/paxctl + )" + +RDEPEND="${RDEPEND} + !/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 + 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 + + 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 + + local pvr + for pvr in ${REPLACING_VERSIONS}; do + [[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1 + done + 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 +}