From 35b577069593fea462f451a6a7132bee2e8ac6d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Mon, 9 Jan 2012 12:59:24 +0000 Subject: [PATCH] Fix security flaw in EDE, bug 398227. Unchanged revbump for emacs-23 live ebuild, so that users will pick up the fix. The bzr trunk doesn't contain the bugfix yet, so its ebuild will follow later. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- app-editors/emacs-vcs/ChangeLog | 12 +- app-editors/emacs-vcs/Manifest | 35 +- ...9.ebuild => emacs-vcs-23.3.9999-r1.ebuild} | 2 +- ....91.ebuild => emacs-vcs-24.0.92-r1.ebuild} | 8 +- .../emacs-vcs/emacs-vcs-24.0.92.ebuild | 351 ------------------ 5 files changed, 35 insertions(+), 373 deletions(-) rename app-editors/emacs-vcs/{emacs-vcs-23.3.9999.ebuild => emacs-vcs-23.3.9999-r1.ebuild} (99%) rename app-editors/emacs-vcs/{emacs-vcs-24.0.91.ebuild => emacs-vcs-24.0.92-r1.ebuild} (97%) delete mode 100644 app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog index 0bf70bdd48b0..a9e03407224d 100644 --- a/app-editors/emacs-vcs/ChangeLog +++ b/app-editors/emacs-vcs/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-editors/emacs-vcs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.74 2012/01/08 21:29:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.75 2012/01/09 12:59:24 ulm Exp $ + +*emacs-vcs-24.0.92-r1 (09 Jan 2012) +*emacs-vcs-23.3.9999-r1 (09 Jan 2012) + + 09 Jan 2012; Ulrich Mueller -emacs-vcs-23.3.9999.ebuild, + +emacs-vcs-23.3.9999-r1.ebuild, -emacs-vcs-24.0.91.ebuild, + -emacs-vcs-24.0.92.ebuild, +emacs-vcs-24.0.92-r1.ebuild: + Fix security flaw in EDE, bug 398227. Unchanged revbump for emacs-23 live + ebuild, so that users will pick up the fix. The bzr trunk doesn't contain + the bugfix yet, so its ebuild will follow later. 08 Jan 2012; Ulrich Müller emacs-vcs-23.3.9999.ebuild, emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild, diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index abe3a64937a1..6a0529c3c14a 100644 --- a/app-editors/emacs-vcs/Manifest +++ b/app-editors/emacs-vcs/Manifest @@ -1,28 +1,27 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -DIST emacs-24.0.91.tar.gz 50973768 RMD160 6479b85929c98f18d7ffeb4d288677ee8d744a72 SHA1 7eda9e9861638cfc328582e27831ece799ba9929 SHA256 1850909dccde9a331b4585bdc3d26a30b90a81a7d2469536fddd6ba61d246bbe +DIST emacs-23.3-patches-4.tar.bz2 19275 RMD160 9a5d61bcf60422efd44efc5f206d9baf8e742bd6 SHA1 695d786f1d43ddbc0c269c780a43cfed9aeb35f0 SHA256 0d4393e221b78bd97c39a10f6e4206d2dbbcee7062e9626d37a3a45c72b34636 DIST emacs-24.0.92.tar.gz 50996706 RMD160 4530f9208765ef168bfb55831371cecc089e2433 SHA1 6d876d3f187be67c210242e8106e8f38c314f77d SHA256 861369d3006e59837bd2daac9931b17148d60cc16d074fb532b51ef9c5d1975f -EBUILD emacs-vcs-23.3.9999.ebuild 11116 RMD160 d4f7cd8356737a5c46e371cb8674868e186d4d04 SHA1 0fadef60e83367020763324d993288b6a1a429f1 SHA256 0364eb960acfbafcb125fe18440fc93b36822ed77660b28e91bc191cac9c684b -EBUILD emacs-vcs-24.0.91.ebuild 11308 RMD160 e41075102e1437a8beb7581cd6b2a93554ecc6b8 SHA1 99942948f61c0322d21d9ba78e5c66918d0b1f4c SHA256 8cbd55760c3a0367997863f5f281c89c092bc4bea4d2c58acc8b5f98a14e1c86 -EBUILD emacs-vcs-24.0.92.ebuild 11308 RMD160 1222d455d2ca58ccc1ad89954fde96bd04f160cc SHA1 f99c4cb48ad452e04fc0eebc15ed24aee5ba88b5 SHA256 4a86e573e9cac5aacb02d17d92df53fab8c9e59f71d827cc944a5dea70d7e956 +EBUILD emacs-vcs-23.3.9999-r1.ebuild 11118 RMD160 662ff612b3ea9a590d58dabee34deb001675bb5b SHA1 6b593b32fba2c4c50853b13a218230940175b3fe SHA256 0b497de535594a16ee6e6dcebc00295dd9104daa94366ef9626f8f22747dd04b +EBUILD emacs-vcs-24.0.92-r1.ebuild 11483 RMD160 3af9f27f668b3b921499cfe00a718dc1277be4f7 SHA1 1c7e08cc9c39c4db9f5dd155343f940f720e38d1 SHA256 3884e1a38da0c27fb6274a2989626a70100592dfa72ae2c36c0338ff6e20eeec EBUILD emacs-vcs-24.0.9999-r2.ebuild 11313 RMD160 414f80889d67e8ce1ac231ad7d9b16fb56ebd02f SHA1 82657b77cd5d245463694738672b0efdafa0e31d SHA256 c5b50094ad4cbaab866342737d92f0df3b828be387f3fd7c01a4e0c67e464040 -MISC ChangeLog 62283 RMD160 82ed8bf5ce26ccbc5c5c5c69fbddaea0c4848a4b SHA1 9b9e02d30b69ede9400155dd01b6fae7b127daf5 SHA256 0f1324fdec6987848a4dae699e3477d1e72fe6c8504a7796336d9b1eef86acc7 +MISC ChangeLog 62758 RMD160 cd87a2670eb570ad4fb5ed12a91150e6efab92ff SHA1 d07b0204ab9fcc42ed21e59daa957d6575c006a2 SHA256 7911eac4f07b27d032689f0c48f7ea9ce35aaa4334ef178865c0fc9999045aba MISC metadata.xml 2159 RMD160 c0ec88f19a4e19271ea414b5e4429d0ca3ec4548 SHA1 3f8c32f164afe13baf231c60a2b64ca9912e5bfb SHA256 b1008bb18ce3aacd84175d61ac8254d017a4a9ba67d5b376f21a39e5699be3ba -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJPCgrGAAoJEDxpGckxwJCBWOAP+gJ+xAKpqCTlDkBHHemm42bx -fm9g121Mjg5t1S1Cfahk+MWgS0SNoBW33jUu7b9g3PAUeU3jUyrBoDNHR2s5xCCC -2DwDIZsjpLltutu1DuCricUqfLffrvM+TGi0cJONqpbcPSnuUyWdjkVw8jejMaTi -8YUIC7KoZxNxP8HcSWwtBxEDW760PsFMBtPusV935RpwJZddYgRAuiNctZiURz3P -hHI61C0xzoH/0M+SxghhVKMiPVNukn+HC9GWEkmShNJcQpiNGxK94V2XT3bhOEKP -f1vfy8lEypF57qhPY5vFLkyciGRzlfYGqy3R4Ppyue7LAnGB1y/c9/uAcpusgyqv -5BVh5wayy1KkUOi+0uagmWcHnDfjOdPUEPED7oy5Yaz+3NoVn1s2uXoDP4NLRiwV -xbqDl8yYEC6wmv424rwP/ziVkYlgAguO6187Ji75C8KG2TCbB5tzh5PCnV+3P4IJ -BYeh4siHfo08fp5NkLPzrFuf4he64B5IB+H5F7lBvNwcnYlh99CFKmVygmvEjQY4 -H+z3ba6hlKXwk3I2jAweANk5WyuQICf3M4mz+MqDRtM04ZWMewMIN3GKMU2jRszG -0Op7cx2TU1b+nRV2DCpesI/9QcHphdHvRJt9UqFGMhapUW/dZljGes9qZKdTJlj2 -4n3rPoOsbXCx4tm3OLTd -=KajQ +iQIcBAEBAgAGBQJPCuS3AAoJEDxpGckxwJCBKYAP/AhbHlx6/0422DNLbWbNWRga +jy+3BhB82EgiHQrQujjKEKgV3wIN7ctaTzmAyRoQ3weSu9cxIsoIahgGQNCYCqGf +2AbpxMrZHIqKEH0QX5WEQjdDsh/c187zul53lNFBTp+k3GI8zidsZFbUd0vXWoR2 +qsMCJ2KsY8fgZttlHfGtkMK/G1AD4JwRbuQiorqSsq04RhfwsBXCzx1RIHVu7/Jg +i6P519MumD6BaSn+8jeMLwUlNWR0IHh2h69LIJqoonTSrM7XgJE/jGhVX8AyMXG8 +BVyD2wB24CjOemgVrKU8lp4+v/ryn17yQJM2XIBhEuXH5RnYkI3BlAj85HbyhbuM +FffwKzt8TpvDc4pVGwItYfxff289dh9QYpZYinPp0wlPcLNpT5VbWeRTdf6K3FIy +xhNfX/YUJo9CYJtD7nbwV07YkX/3ylTL+Jz/eSsWy+DYR67H6t4s7FahL9B4jKSd +uDIFjSxWf8NEvsTNcdb1S1EMFaIcOi1Ld++tK6JLBz/FMq8/JhYRtbByzRONNk48 +qoj3zRxxfOyzmsk6hYs8NlMc6WEMT7IM9v3xNhO5BWSKhOU3GcBikyA+1M0yOmXC +oLszQof4kSjwxIaza4wyCVsyZ2Z+Dif5Y8YuXwQ+j3q5QG/zfrvQhpp37jbhKAy5 +FkbBIy6fm53ahxIoD+gN +=yg5T -----END PGP SIGNATURE----- diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999-r1.ebuild similarity index 99% rename from app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild rename to app-editors/emacs-vcs/emacs-vcs-23.3.9999-r1.ebuild index 82e52ce47782..910a35601035 100644 --- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.19 2012/01/08 21:29:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999-r1.ebuild,v 1.1 2012/01/09 12:59:24 ulm Exp $ EAPI=4 WANT_AUTOMAKE="none" diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.92-r1.ebuild similarity index 97% rename from app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild rename to app-editors/emacs-vcs/emacs-vcs-24.0.92-r1.ebuild index c434cd35e30b..a28ea95a623d 100644 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild +++ b/app-editors/emacs-vcs/emacs-vcs-24.0.92-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.8 2012/01/08 21:29:32 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92-r1.ebuild,v 1.1 2012/01/09 12:59:24 ulm Exp $ EAPI=4 @@ -15,8 +15,10 @@ if [[ ${PV##*.} = 9999 ]]; then inherit bzr SRC_URI="" else + # emacs-23.3 patchball added for EDE security fix #398227 SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz - ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" + ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz + mirror://gentoo/emacs-23.3-patches-4.tar.bz2" # FULL_VERSION keeps the full version number, which is needed in # order to determine some path information correctly for copy/move # operations later on @@ -104,6 +106,8 @@ src_prepare() { || die "Upstream version number changed to ${FULL_VERSION}" fi + epatch "${WORKDIR}"/patch/08_all_ede_security_fix.patch #398227 + if ! use alsa; then # ALSA is detected even if not requested by its USE flag. # Suppress it by supplying pkg-config with a wrong library name. diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild deleted file mode 100644 index 0919d899510b..000000000000 --- a/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild +++ /dev/null @@ -1,351 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.6 2012/01/08 21:29:32 ulm Exp $ - -EAPI=4 - -inherit autotools elisp-common eutils flag-o-matic multilib - -if [[ ${PV##*.} = 9999 ]]; then - EBZR_PROJECT="emacs" - EBZR_BRANCH="trunk" - EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/" - # "Nosmart" is much faster for initial branching. - EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}" - inherit bzr - SRC_URI="" -else - SRC_URI="mirror://gentoo/emacs-${PV}.tar.gz - ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-${PV}.tar.gz" - # 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}" -fi - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="http://www.gnu.org/software/emacs/" - -LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2" -SLOT="24" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa athena dbus gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 m17n-lib motif png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm" - -RDEPEND="sys-libs/ncurses - >=app-admin/eselect-emacs-1.2 - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - dbus? ( sys-apps/dbus ) - gnutls? ( net-libs/gnutls ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - 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 ) - 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? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( - athena? ( x11-libs/libXaw ) - !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( dev-util/pkgconfig ) - dbus? ( dev-util/pkgconfig ) - gnutls? ( dev-util/pkgconfig ) - libxml2? ( dev-util/pkgconfig ) - X? ( dev-util/pkgconfig ) - gzip-el? ( app-arch/gzip )" - -RDEPEND="${RDEPEND} - >=app-emacs/emacs-common-gentoo-1.3[X?]" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${PN}-${SLOT}-gentoo.el" - -src_prepare() { - if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \ - configure.in) - [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" - einfo "Emacs branch: ${EBZR_BRANCH}" - einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}" - einfo "Emacs version number: ${FULL_VERSION}" - [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ - || die "Upstream version number changed to ${FULL_VERSION}" - fi - - if ! use alsa; then - # ALSA is detected even if not requested by its USE flag. - # Suppress it by supplying pkg-config with a wrong library name. - sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ - || die "unable to sed configure.in" - fi - if ! use gzip-el; then - # Emacs' build system automatically detects the gzip binary and - # compresses el files. We don't want that so confuse it with a - # wrong binary name - sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ - || die "unable to sed configure.in" - fi - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - ALLOWED_FLAGS="" - strip-flags - - if use sh; then - replace-flags -O[1-9] -O0 #262359 - elif use ia64; then - replace-flags -O[2-9] -O1 #325373 - else - replace-flags -O[3-9] -O2 - fi - - local myconf - - if use alsa && ! use sound; then - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf="${myconf} --with-sound" - else - myconf="${myconf} $(use_with sound)" - fi - - if use X; then - myconf="${myconf} --with-x" - myconf="${myconf} $(use_with gconf)" - myconf="${myconf} $(use_with gsettings)" - myconf="${myconf} $(use_with toolkit-scroll-bars)" - myconf="${myconf} $(use_with wide-int)" - myconf="${myconf} $(use_with gif) $(use_with jpeg)" - myconf="${myconf} $(use_with png) $(use_with svg rsvg)" - myconf="${myconf} $(use_with tiff) $(use_with xpm)" - myconf="${myconf} $(use_with imagemagick)" - - if use xft; then - myconf="${myconf} --with-xft" - myconf="${myconf} $(use_with m17n-lib libotf)" - myconf="${myconf} $(use_with m17n-lib m17n-flt)" - else - myconf="${myconf} --without-xft" - myconf="${myconf} --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf="${myconf} --with-x-toolkit=$(usev gtk3 || echo gtk)" - elif use Xaw3d || use athena; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf="${myconf} --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf="${myconf} --with-x-toolkit=motif" - else - einfo "Configuring to build with no toolkit" - myconf="${myconf} --with-x-toolkit=no" - fi - - local f tk= - for f in gtk Xaw3d athena motif; do - use ${f} || continue - [[ ${tk} ]] \ - && ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")" - tk="${tk}${tk:+ }${f}" - done - else - myconf="${myconf} --without-x" - fi - - if [[ ${PV##*.} = 9999 ]]; then - # These variables are not needed for building. We add them to - # configure options because they are stored in the Emacs binary - # and available in variable "system-configuration-options". - myconf="${myconf} EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}" - fi - - # According to configure, this option is only used for GNU/Linux - # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell - # out the location because $(get_libdir) does not necessarily return - # something that matches the host OS's libdir naming (e.g. RHEL). - local crtdir=$($(tc-getCC) -print-file-name=crt1.o) - crtdir=${crtdir%/*} - - econf \ - --program-suffix=-${EMACS_SUFFIX} \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-crt-dir="${crtdir}" \ - --with-gameuser="${GAMES_USER_DED:-games}" \ - --without-compress-info \ - --disable-maintainer-mode \ - $(use_with hesiod) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with gpm) \ - $(use_with dbus) \ - $(use_with gnutls) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - ${myconf} -} - -src_compile() { - export SANDBOX_ON=0 # for the unbelievers, see Bug #131505 - if [[ ${PV##*.} = 9999 ]]; then - emake CC="$(tc-getCC)" bootstrap - # cleanup, otherwise emacs will be dumped again in src_install - (cd src; emake versionclean) - fi - # set last component of emacs-version to (package revision + 1) - touch src/emacs-${FULL_VERSION}.${PR#r} - emake CC="$(tc-getCC)" -} - -src_install () { - local i m - - emake install DESTDIR="${D}" - - rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving Emacs executable failed" - - # move man pages to the correct place - for m in "${ED}"/usr/share/man/man1/* ; do - mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed" - done - - # 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/{applications,icons} - rm "${ED}"/var/lib/games/emacs/{snake,tetris}-scores - keepdir /var/lib/games/emacs - - # remove unused /site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - local c=";;" - if use source; then - insinto /usr/share/emacs/${FULL_VERSION}/src - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README - c="" - fi - - sed 's/^X//' >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - X ${c}(setq find-function-C-source-directory - X ${c} "${EPREFIX}/usr/share/emacs/${FULL_VERSION}/src") - 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 -} - -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" - else - # 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() { - local f - for f in "${EROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do - [[ -e ${f} ]] || touch "${f}" - done - chown "${GAMES_USER_DED:-games}" "${EROOT}"/var/lib/games/emacs - - elisp-site-regen - eselect emacs update ifunset - - if use X; then - elog "You need to install some fonts for Emacs." - elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's" - elog "machine would satisfy basic Emacs requirements under X11." - elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml" - elog "for how to enable anti-aliased fonts." - elog - fi - - elog "You can set the version to be started by /usr/bin/emacs through" - elog "the Emacs eselect module, which also redirects man and info pages." - elog "Therefore, several Emacs versions can be installed at the same time." - elog "\"man emacs.eselect\" for details." - elog - elog "If you upgrade from a previous major version of Emacs, then it is" - elog "strongly recommended that you use app-admin/emacs-updater to rebuild" - elog "all byte-compiled elisp files of the installed Emacs packages." -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} -- 2.26.2