commit:     108178be4cecf93966f89eeb997c5232a64bef4d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 17 07:05:48 2015 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 17 07:05:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108178be

app-editors/emacs-vcs: Remove old.

Package-Manager: portage-2.2.24

 app-editors/emacs-vcs/Manifest                     |   2 -
 app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild   | 372 --------------------
 .../emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild | 377 ---------------------
 .../emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild | 377 ---------------------
 4 files changed, 1128 deletions(-)

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 96b98ca..9b443da 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,4 +1,2 @@
 DIST emacs-25.0.50_pre20150523.tar.xz 25311384 SHA256 
2dd6e7adb8e3359e00a8cbc15a28ef31b631c8363602e3be7566908f2ee2b047 SHA512 
a897c4a4d7bd19c9c9a181b23240aed102295e30f1ba9a167b5c1a3231c05a4613023e6810ca0226cedea6325999a35efb0ea2a2b7e535a0338b7b688592438f
 WHIRLPOOL 
ce81ceca640c15437af427cef79090f71c8f19a78c8b2d5966f1887e88fff3bd35c00bcb266fb0d8133ee95b22cac8576f12462fa04c41feebcc7aad2f1ddb7e
-DIST emacs-25.0.50_pre20150531.tar.xz 26741144 SHA256 
ad984201fb56ca09f48a09fa2d3ae2cc151c31b724ffd7de3926780817f0e1b7 SHA512 
f9f019a9cf53a33b9c2a3374fe132d321f4e39d3d46ba83c637aaf32d02bfbb518d0b392311e47cf1eba349fcbdc6fdf3d8bbb248afed587168dd5bff110563f
 WHIRLPOOL 
b3d42367f726c0bd5e8335c4925ba3e706b7f74679c76e655db94334a761085273d2d1279d4a16867fbf462a82ad504f60a17f0c2eaaa8444b3808045acd513a
-DIST emacs-25.0.50_pre20150630.tar.xz 26793504 SHA256 
b2bac514c9f345ff8f515d8cbcfde7dacf69644bce9a1353c42d5d7940603f3c SHA512 
9bbd7afe4a8053273b06b801b70c4397d4f60365ca50cfc4677224304ca79e0acb6d709c6de2461257f61befaa21f80311f82b5ca47f739193340c7c4bfefa92
 WHIRLPOOL 
7a9badcfa89a53557f255bc6eb28e03d364dddf6343e56bcaf2dd9229054c41e9b7c5b23440322ccd32950b2c7d7dd1edb6cc1ae5c7c82543585d21de8c29937
 DIST emacs-25.0.50_pre20150731.tar.xz 26825232 SHA256 
80127a9d905918066c97df81f3e489dbd30f323e9dec2353d33f124522f91c81 SHA512 
9834d191e98e780e8ba8f2fa07b50dda6d380a3e220ad0590bdc160d9e2c9cd3c0b0acd5e8d52f3f0f44070280e3686bd7facd78f9bd4b3f6ce0723f1b3311bf
 WHIRLPOOL 
0c0ec4f99630771da61d5bc80b9001a61fa3b7f49f09b6e9a5dd402a383c4d13717c50d86da9d63ad01dd2fce5ac5d7812bcdcd3e31eefb5f0ad4b00d0cc342f

diff --git a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
deleted file mode 100644
index d8152d1..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.5.9999.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="git://git.sv.gnu.org/emacs.git"
-       EGIT_BRANCH="emacs-24"
-       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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
-       # 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}"
-       S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/";
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-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:0
-       >=app-eselect/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 )
-       gnutls? ( net-libs/gnutls )
-       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 )
-       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:0 )
-               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
-       )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-       DEPEND="${DEPEND}
-       sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-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_user
-
-       # Fix filename reference in redirected man page
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -pie                                       #526948
-
-       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; then
-               use sound || ewarn \
-                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
-               myconf+=" --with-sound=alsa"
-       else
-               myconf+=" --with-sound=$(usex sound oss)"
-       fi
-
-       if use X; then
-               myconf+=" --with-x --without-ns"
-               myconf+=" $(use_with gconf)"
-               myconf+=" $(use_with gsettings)"
-               myconf+=" $(use_with toolkit-scroll-bars)"
-               myconf+=" $(use_with gif)"
-               myconf+=" $(use_with jpeg)"
-               myconf+=" $(use_with png)"
-               myconf+=" $(use_with svg rsvg)"
-               myconf+=" $(use_with tiff)"
-               myconf+=" $(use_with xpm)"
-               myconf+=" $(use_with imagemagick)"
-
-               if use xft; then
-                       myconf+=" --with-xft"
-                       myconf+=" $(use_with m17n-lib libotf)"
-                       myconf+=" $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf+=" --without-xft"
-                       myconf+=" --without-libotf --without-m17n-flt"
-                       use m17n-lib && ewarn \
-                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
-               fi
-
-               local f
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       while read line; do ewarn "${line}"; done <<-EOF
-                               Your version of GTK+ will have problems with 
closing open
-                               displays. This is no problem if you just use 
one display, but
-                               if you use more than one and close one of them 
Emacs may crash.
-                               See 
<https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-                               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
-                       myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-                       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
-       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}"
-       if [[ ${PV##*.} = 9999 ]]; then
-               myconf+=" EGIT_BRANCH=${EGIT_BRANCH} 
EGIT_VERSION=${EGIT_VERSION}"
-       fi
-
-       econf \
-               --program-suffix="-${EMACS_SUFFIX}" \
-               --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-               --localstatedir="${EPREFIX}"/var \
-               
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-               --with-gameuser="${GAMES_USER_DED:-games}" \
-               --without-compress-install \
-               --with-file-notification=$(usev inotify || usev gfile || echo 
no) \
-               $(use_enable acl) \
-               $(use_with dbus) \
-               $(use_with gnutls) \
-               $(use_with gpm) \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               $(use_with libxml2 xml2) \
-               $(use_with selinux) \
-               $(use_with wide-int) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
-       emake
-}
-
-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/{applications,icons}
-       rm -rf "${ED}"/var
-
-       # remove unused <version>/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
-}

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
deleted file mode 100644
index 638eb91..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150531.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
-       # 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}"
-       S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/";
-
-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 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: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 )
-       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:0 )
-               xpm? ( x11-libs/libXpm )
-               imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-               xft? (
-                       media-libs/fontconfig
-                       media-libs/freetype
-                       x11-libs/libXft
-                       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 )
-                       !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
-       )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-       DEPEND="${DEPEND}
-       sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-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_user
-
-       # Fix filename reference in redirected man page
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -pie                                       #526948
-
-       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; then
-               use sound || ewarn \
-                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
-               myconf+=" --with-sound=alsa"
-       else
-               myconf+=" --with-sound=$(usex sound oss)"
-       fi
-
-       if use X; then
-               myconf+=" --with-x --without-ns"
-               myconf+=" $(use_with gconf)"
-               myconf+=" $(use_with gsettings)"
-               myconf+=" $(use_with toolkit-scroll-bars)"
-               myconf+=" $(use_with gif)"
-               myconf+=" $(use_with jpeg)"
-               myconf+=" $(use_with png)"
-               myconf+=" $(use_with svg rsvg)"
-               myconf+=" $(use_with tiff)"
-               myconf+=" $(use_with xpm)"
-               myconf+=" $(use_with imagemagick)"
-
-               if use xft; then
-                       myconf+=" --with-xft"
-                       myconf+=" $(use_with cairo)"
-                       myconf+=" $(use_with m17n-lib libotf)"
-                       myconf+=" $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf+=" --without-xft"
-                       myconf+=" --without-cairo"
-                       myconf+=" --without-libotf --without-m17n-flt"
-                       use cairo && ewarn \
-                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
-                       use m17n-lib && ewarn \
-                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
-               fi
-
-               local f
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       while read line; do ewarn "${line}"; done <<-EOF
-                               Your version of GTK+ will have problems with 
closing open
-                               displays. This is no problem if you just use 
one display, but
-                               if you use more than one and close one of them 
Emacs may crash.
-                               See 
<https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-                               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
-                       myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-                       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
-       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}"
-       if [[ ${PV##*.} = 9999 ]]; then
-               myconf+=" EGIT_BRANCH=${EGIT_BRANCH} 
EGIT_VERSION=${EGIT_VERSION}"
-       fi
-
-       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 gfile || usev inotify || echo 
no) \
-               $(use_enable acl) \
-               $(use_with dbus) \
-               $(use_with gnutls) \
-               $(use_with gpm) \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               $(use_with libxml2 xml2) \
-               $(use_with selinux) \
-               $(use_with wide-int) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
-       emake
-}
-
-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 <version>/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 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
-
-       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
-}

diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild 
b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
deleted file mode 100644
index 638eb91..0000000
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20150630.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos"
-       # 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}"
-       S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="https://www.gnu.org/software/emacs/";
-
-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 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: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 )
-       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:0 )
-               xpm? ( x11-libs/libXpm )
-               imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-               xft? (
-                       media-libs/fontconfig
-                       media-libs/freetype
-                       x11-libs/libXft
-                       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 )
-                       !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
-       )"
-
-if [[ ${PV##*.} = 9999 ]]; then
-       DEPEND="${DEPEND}
-       sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-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_user
-
-       # Fix filename reference in redirected man page
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -pie                                       #526948
-
-       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; then
-               use sound || ewarn \
-                       "USE flag \"alsa\" overrides \"-sound\"; enabling sound 
support."
-               myconf+=" --with-sound=alsa"
-       else
-               myconf+=" --with-sound=$(usex sound oss)"
-       fi
-
-       if use X; then
-               myconf+=" --with-x --without-ns"
-               myconf+=" $(use_with gconf)"
-               myconf+=" $(use_with gsettings)"
-               myconf+=" $(use_with toolkit-scroll-bars)"
-               myconf+=" $(use_with gif)"
-               myconf+=" $(use_with jpeg)"
-               myconf+=" $(use_with png)"
-               myconf+=" $(use_with svg rsvg)"
-               myconf+=" $(use_with tiff)"
-               myconf+=" $(use_with xpm)"
-               myconf+=" $(use_with imagemagick)"
-
-               if use xft; then
-                       myconf+=" --with-xft"
-                       myconf+=" $(use_with cairo)"
-                       myconf+=" $(use_with m17n-lib libotf)"
-                       myconf+=" $(use_with m17n-lib m17n-flt)"
-               else
-                       myconf+=" --without-xft"
-                       myconf+=" --without-cairo"
-                       myconf+=" --without-libotf --without-m17n-flt"
-                       use cairo && ewarn \
-                               "USE flag \"cairo\" has no effect if \"xft\" is 
not set."
-                       use m17n-lib && ewarn \
-                               "USE flag \"m17n-lib\" has no effect if \"xft\" 
is not set."
-               fi
-
-               local f
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       while read line; do ewarn "${line}"; done <<-EOF
-                               Your version of GTK+ will have problems with 
closing open
-                               displays. This is no problem if you just use 
one display, but
-                               if you use more than one and close one of them 
Emacs may crash.
-                               See 
<https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
-                               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
-                       myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-                       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
-       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}"
-       if [[ ${PV##*.} = 9999 ]]; then
-               myconf+=" EGIT_BRANCH=${EGIT_BRANCH} 
EGIT_VERSION=${EGIT_VERSION}"
-       fi
-
-       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 gfile || usev inotify || echo 
no) \
-               $(use_enable acl) \
-               $(use_with dbus) \
-               $(use_with gnutls) \
-               $(use_with gpm) \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               $(use_with libxml2 xml2) \
-               $(use_with selinux) \
-               $(use_with wide-int) \
-               $(use_with zlib) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
-       emake
-}
-
-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 <version>/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 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
-
-       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
-}

Reply via email to