commit:     ec37723238d6e4ab1356766737616929ba92f168
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  4 18:43:48 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Apr  4 18:43:48 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=ec377232

app-editors/emacs ebuilds moved to Portage tree.

---
 app-editors/emacs/ChangeLog             |  27 ---
 app-editors/emacs/Manifest              |  12 --
 app-editors/emacs/emacs-18.59-r9.ebuild | 154 --------------
 app-editors/emacs/emacs-21.4-r24.ebuild | 195 ------------------
 app-editors/emacs/emacs-22.3-r10.ebuild | 252 -----------------------
 app-editors/emacs/emacs-23.4-r6.ebuild  | 344 -------------------------------
 app-editors/emacs/emacs-24.3-r2.ebuild  | 346 --------------------------------
 app-editors/emacs/metadata.xml          |  47 -----
 8 files changed, 1377 deletions(-)

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
deleted file mode 100644
index 9952ead..0000000
--- a/app-editors/emacs/ChangeLog
+++ /dev/null
@@ -1,27 +0,0 @@
-# ChangeLog for app-editors/emacs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  18 Mar 2014; Ulrich Müller <[email protected]> emacs-21.4-r24.ebuild,
-  emacs-22.3-r10.ebuild:
-  Further fixes to man page installation.
-
-  16 Mar 2014; Ulrich Müller <[email protected]> emacs-18.59-r9.ebuild,
-  emacs-21.4-r24.ebuild, emacs-22.3-r10.ebuild, emacs-23.4-r6.ebuild,
-  emacs-24.3-r2.ebuild:
-  Install emacs man page under the same name as the binary.
-
-  16 Mar 2014; Ulrich Müller <[email protected]> emacs-18.59-r9.ebuild:
-  Remove old compatibility code.
-
-*emacs-24.3-r2 (16 Mar 2014)
-*emacs-23.4-r6 (16 Mar 2014)
-*emacs-22.3-r10 (16 Mar 2014)
-*emacs-21.4-r24 (16 Mar 2014)
-*emacs-18.59-r9 (16 Mar 2014)
-
-  16 Mar 2014; Ulrich Müller <[email protected]> +emacs-18.59-r9.ebuild,
-  +emacs-21.4-r24.ebuild, +emacs-22.3-r10.ebuild, +emacs-23.4-r6.ebuild,
-  +emacs-24.3-r2.ebuild, +metadata.xml:
-  Copied from Portage tree.
-

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
deleted file mode 100644
index 4cc49df..0000000
--- a/app-editors/emacs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 
fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 
c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6
 WHIRLPOOL 
cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da
-DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 
637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 
a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d
 WHIRLPOOL 
6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
-DIST emacs-18.59.tar.gz 2962652 SHA256 
1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 
03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33
 WHIRLPOOL 
5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
-DIST emacs-21.4-patches-13.tar.bz2 13287 SHA256 
892764ff98f0640ca65b57099a24c76a43ebf1deb9122fbb3b324d3e72043650 SHA512 
d44181946c271cb54db7e0e14f3e15b217dceb2cc52594ed6a77adc1347180da58287a647fb5e0ddc3f2e9ec336018c0044d54587cc3c99f8149518bc47a7ecd
 WHIRLPOOL 
55f22b61fdbe137d75bdc5eaf6e5e4cfca8adc913472b2cb4c6deb37d700cef68fd49dac2a7f7a65b8907cc9a08d1249568e3ab075888605346f595df49f15bc
-DIST emacs-21.4a.tar.gz 20403483 SHA256 
1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 SHA512 
6932db498e7b6b904d90f817e335690c5c681510812332c514af1d84d91b9841ea3eff0357429c7bf866a55ab94d03193fc9cdbf403a9fe4b71d2673c23b863e
 WHIRLPOOL 
e711032d23b0e0b33bf95e006d6fc518ddfde4780d23d589fde47ccd94e60687cc9b65b85e04e7af4e8c9161fd8faebf13d28f4f43eb94e7bb7520d537f28751
-DIST emacs-22.3-patches-8.tar.bz2 5974 SHA256 
72a68bd14ce2efd52b0425c56649d735f4b3c0e630de73e0eb51ddf947d56ff7 SHA512 
b3489e57db9b7c4d9202238acd6f956b6adeaf09ec161b639ad59e0eea8e2152d5fad24e777a486310eaed68be1c7bf77e474a9aced0041820e74582f7e2e73d
 WHIRLPOOL 
85d127fb9b367d73d8f2674e21096a23b474faf54fa21f178ea0e0dadbb285d1d7c627b7609b7c92ba27590340cf76afc4df4a5c991c252a7ce80b2f6569cf06
-DIST emacs-22.3.tar.gz 39587396 SHA256 
7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16 SHA512 
6cba24921ba9bd27458334b92c6f8fcacc4d5af0f70a067d57ab068eb8d0925143f109847515548584f80c9439d96a9d05158d10a73dda917187bd16a6758584
 WHIRLPOOL 
74c612213b8f6fc1fc6e243adc27b5a5ff5528100f3c319925519e23477fe2c642d2cf7b382d7b70c8b2b9d7be508773193c95bbf14cb7c55046f76bf4b81225
-DIST emacs-23.4-patches-10.tar.xz 4920 SHA256 
0b8e8cf31b013995d4e4cab12636aeaf6f49d2c879eb929fa7fd8774d86a5a00 SHA512 
552568fe9264c6e1fe57ec0b48adade34d15b1c768534d0f3e036849c938b18720121dad5ce2c83a4f4c61911d9f386a96f49cab10b641feb265e7eff8d2553e
 WHIRLPOOL 
17dac888cf9120f66f1940eac6e99d34fa447702cb64e391a433829c61b4bc24017125d44bad2108f1bace14c9ae7b40d6aa39245feb9ea2fe215c287da6b100
-DIST emacs-23.4.tar.bz2 38646508 SHA256 
26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 
def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296
 WHIRLPOOL 
2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
-DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 
ed9928b23a8b73b3ad265ba6866f609cdf61524602dea3b9f57d397d13a6fcb6 SHA512 
c5989a9920c5b8cf1935f2d1bea228262c7953516cf93f75dbf6b305fc7c66f0d22c4038931972c441b8c0508acc04a83c7a160e20bf18b2c2e25c10d20f6a5a
 WHIRLPOOL 
facb1dd20830a87c8ed0480168127822cfb961cc6592d5c51c9057dfba944adfd4d3211ac7af07873b46fd78580704325f56ab4a5dfb6f78790005b718f19364
-DIST emacs-24.3.tar.xz 35565352 SHA256 
70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 
a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9
 WHIRLPOOL 
687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
-DIST leim-21.4.tar.gz 3291433 SHA256 
db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 
c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c
 WHIRLPOOL 
d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1

diff --git a/app-editors/emacs/emacs-18.59-r9.ebuild 
b/app-editors/emacs/emacs-18.59-r9.ebuild
deleted file mode 100644
index 7befe84..0000000
--- a/app-editors/emacs/emacs-18.59-r9.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 
1.4 2014/03/12 05:27:57 phajdan.jr Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/";
-SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
-       
ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-       http://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.bz2";
-
-LICENSE="GPL-1+ GPL-2+ BSD" #HPND
-SLOT="18"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi_x86_32 abi_x86_x32"
-REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )"
-
-RDEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.2
-       amd64? (
-               sys-libs/ncurses[abi_x86_x32(-)?]
-               !abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] )
-       )"
-#      X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}
-       virtual/pkgconfig"
-
-src_prepare() {
-       epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
-       EPATCH_SUFFIX=patch epatch
-       epatch_user
-}
-
-src_configure() {
-       # autoconf? What's autoconf? We are living in 1992. ;-)
-       local arch
-       case ${ARCH} in
-               amd64)
-                       if use abi_x86_x32; then
-                               arch=x86-x32
-                               multilib_toolchain_setup x32
-                       elif use abi_x86_32; then
-                               arch=intel386
-                               multilib_toolchain_setup x86
-                       else
-                               die "Need 32 bit ABI on amd64"
-                       fi
-                       ;;
-               x86) arch=intel386 ;;
-               *) die "Architecture ${ARCH} not yet supported" ;;
-       esac
-       local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-       #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-       sed -e "${cmd}" src/config.h-dist >src/config.h || die
-
-       cat <<-END >src/paths.h
-               #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-               #define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-               #define PATH_LOCK "/var/lib/emacs/lock/"
-               #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-       END
-
-       sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-               -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-               src/s-linux.h || die
-
-       # -O3 and -finline-functions cause segmentation faults at run time.
-       filter-flags -finline-functions
-       replace-flags -O[3-9] -O2
-       strip-flags
-}
-
-src_compile() {
-       # Do not use the sandbox, or the dumped Emacs will be twice as large
-       export SANDBOX_ON=0
-       emake --jobs=1 \
-               CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
-               LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-       local basedir="/usr/share/emacs/${PV}" i
-
-       dodir ${basedir}
-       dodir /usr/share/man/man1
-       emake --jobs=1 \
-               LIBDIR="${D}"${basedir} \
-               BINDIR="${D}"/usr/bin \
-               MANDIR="${D}"/usr/share/man/man1 \
-               install
-
-       rmdir "${D}"${basedir}/lock || die
-       find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-               -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || 
die
-       fperms -R go-w ${basedir}
-
-       # remove duplicate DOC file
-       rm "${D}"${basedir}/etc/DOC || die
-
-       # move executables to the correct place
-       mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-       for i in etags ctags emacsclient; do
-               mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-               rm "${D}"${basedir}/etc/${i} || die
-       done
-
-       dodir /usr/libexec/emacs/${PV}
-       for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-               yow env server
-       do
-               mv "${D}"${basedir}/etc/${i} 
"${D}"/usr/libexec/emacs/${PV}/${i} || die
-               dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-       done
-       for i in test-distrib make-docfile; do
-               rm "${D}"${basedir}/etc/${i} || die
-       done
-
-       # move man page
-       mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die
-
-       # move Info files
-       dodir /usr/share/info
-       mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-       dosym ../../info/emacs-${SLOT} "${basedir}"/info
-       docompress -x /usr/share/info
-
-       # move Info dir to avoid collisions with the dir file generated by 
portage
-       mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-       touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-       dodir /var/lib/emacs
-       diropts -m0777
-       keepdir /var/lib/emacs/lock
-
-       dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-       # move Info dir file to correct name
-       if [[ -d "${D}"/usr/share/info ]]; then
-               mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-       fi
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-}
-
-pkg_postrm() {
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-21.4-r24.ebuild 
b/app-editors/emacs/emacs-21.4-r24.ebuild
deleted file mode 100644
index c548550..0000000
--- a/app-editors/emacs/emacs-21.4-r24.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 
1.10 2013/08/02 16:14:53 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit elisp-common flag-o-matic eutils multilib toolchain-funcs autotools
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/";
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-       mirror://gentoo/${P}-patches-13.tar.bz2
-       leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2+ FDL-1.1+ BSD HPND MIT"
-SLOT="21"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd"
-IUSE="X Xaw3d leim motif sendmail"
-
-DEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.2
-       X? (
-               x11-libs/libXext
-               x11-libs/libICE
-               x11-libs/libSM
-               x11-libs/libXmu
-               x11-libs/libXpm
-               x11-misc/xbitmaps
-               >=media-libs/giflib-4.1.0.1b
-               virtual/jpeg:0=
-               >=media-libs/tiff-3.5.5-r3
-               >=media-libs/libpng-1.4:0=
-               Xaw3d? ( x11-libs/libXaw3d )
-               !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) )
-       )"
-
-RDEPEND="${DEPEND}
-       >=app-emacs/emacs-common-gentoo-1.3[X?]
-       sendmail? ( virtual/mta )"
-
-src_prepare() {
-       EPATCH_SUFFIX=patch epatch
-
-       sed -i \
-               -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` 
-print-file-name=crtbegin.o):g" \
-               -e "s:/usr/lib/crtend.o:$(`tc-getCC` 
-print-file-name=crtend.o):g" \
-               "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
-       # This will need to be updated for X-Compilation
-       sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-               "${S}/src/s/gnu-linux.h" || die
-
-       sed -i -e "/^\\.so/s/etags/&-emacs-${SLOT}/" etc/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       # custom aclocal.m4 was only needed for autoconf 2.13 and earlier
-       rm aclocal.m4
-       eaclocal
-       eautoconf
-}
-
-src_configure() {
-       # -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-       filter-flags -fstack-protector -fstack-protector-all
-
-       # emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-       unset LDFLAGS
-
-       # ever since GCC 3.2
-       replace-flags "-O[3-9]" -O2
-
-       # -march is known to cause signal 6 on some environment
-       filter-flags "-march=*"
-
-       local myconf
-       if use X ; then
-               myconf="${myconf}
-                       --with-x
-                       --with-xpm
-                       --with-jpeg
-                       --with-tiff
-                       --with-gif
-                       --with-png"
-
-               if use Xaw3d ; then
-                       einfo "Configuring to build with Xaw3d (Athena/Lucid) 
toolkit"
-                       myconf="${myconf} --with-x-toolkit=athena"
-                       use motif \
-                               && ewarn "USE flag \"motif\" ignored 
(superseded by \"Xaw3d\")"
-               elif use motif ; then
-                       einfo "Configuring to build with Motif toolkit"
-                       myconf="${myconf} --with-x-toolkit=motif"
-               else
-                       # do not build emacs with any toolkit, bug 35300
-                       einfo "Configuring to build with no toolkit"
-                       myconf="${myconf} --with-x-toolkit=no"
-               fi
-       else
-               myconf="${myconf} --without-x"
-       fi
-
-       econf ${myconf}
-
-       # leave this in src_configure
-       emake \
-               
locallisppath="/etc/emacs:${SITELISP}:/usr/share/emacs/${PV}/leim" \
-               epaths-force
-}
-
-src_compile() {
-       export SANDBOX_ON=0
-       emake CC="$(tc-getCC)"
-
-       einfo "Recompiling patched lisp files..."
-       (cd lisp; emake recompile)
-       (cd src; emake versionclean)
-       emake CC="$(tc-getCC)"
-}
-
-src_install() {
-       local i m
-
-       einstall infodir="${D}/usr/share/info/emacs-${SLOT}"
-
-       for i in "${D}"/usr/bin/* ; do
-               mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
-       done
-       mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
-       rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
-
-       # move man pages to the correct place
-       for m in "${D}"/usr/share/man/man1/* ; do
-               mv "${m}" "${m%.1}-emacs-${SLOT}.1" || die "mv ${m} failed"
-       done
-       mv "${D}"/usr/share/man/man1/emacs{-emacs,}-${SLOT}.1 \
-               || die "moving emacs man page failed"
-
-       # move info dir to avoid collisions with the dir file generated by 
portage
-       mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} \
-               || die "moving info dir failed"
-       touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-       docompress -x /usr/share/info/emacs-${SLOT}/dir.orig
-
-       # avoid collision between slots
-       rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${D}"/usr/share/emacs/${PV}/site-lisp
-
-       # fix permissions
-       find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-       find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-       keepdir /usr/share/emacs/${PV}/leim
-
-       dodoc BUGS ChangeLog README
-}
-
-pkg_preinst() {
-       # move Info dir file to correct name
-       local infodir=/usr/share/info/emacs-${SLOT} f
-       if [ -f "${D}"${infodir}/dir.orig ]; then
-               mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-       elif [[ -d "${D}"${infodir} ]]; then
-               # this should not happen in EAPI 4
-               ewarn "Regenerating Info directory index in ${infodir} ..."
-               rm -f "${D}"${infodir}/dir{,.*}
-               for f in "${D}"${infodir}/*; do
-                       if [[ ${f##*/} != *[0-9].info* && -e ${f} ]]; then
-                               install-info --info-dir="${D}"${infodir} "${f}" 
\
-                                       || die "install-info failed"
-                       fi
-               done
-       fi
-}
-
-pkg_postinst() {
-       eselect emacs update ifunset
-
-       if ! use sendmail && ! has_version "virtual/mta"; then
-               elog "You disabled sendmail support for Emacs. If you later 
install"
-               elog "a MTA then you will need to recompile Emacs. See Bug 
#11104."
-       fi
-
-       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."
-       fi
-}
-
-pkg_postrm() {
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-22.3-r10.ebuild 
b/app-editors/emacs/emacs-22.3-r10.ebuild
deleted file mode 100644
index bb86749..0000000
--- a/app-editors/emacs/emacs-22.3-r10.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r10.ebuild,v 
1.8 2013/08/02 16:14:53 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit autotools elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display 
editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/";
-SRC_URI="mirror://gnu/emacs/${P}.tar.gz
-       mirror://gentoo/${P}-patches-8.tar.bz2"
-
-LICENSE="GPL-3+ FDL-1.2+ BSD HPND MIT"
-SLOT="22"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd"
-IUSE="alsa games gif gtk gzip-el hesiod jpeg kerberos motif png sound source 
tiff toolkit-scroll-bars X Xaw3d +xpm"
-
-RDEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.2
-       >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-       net-libs/liblockfile
-       hesiod? ( net-dns/hesiod )
-       kerberos? ( virtual/krb5 )
-       alsa? ( media-libs/alsa-lib )
-       X? (
-               x11-libs/libXmu
-               x11-libs/libXt
-               x11-misc/xbitmaps
-               gif? ( media-libs/giflib )
-               jpeg? ( virtual/jpeg:0= )
-               png? ( >=media-libs/libpng-1.4:0= )
-               tiff? ( media-libs/tiff )
-               xpm? ( x11-libs/libXpm )
-               gtk? ( x11-libs/gtk+:2 )
-               !gtk? (
-                       Xaw3d? ( x11-libs/libXaw3d )
-                       !Xaw3d? ( motif? ( >=x11-libs/motif-2.3:0 ) )
-               )
-       )"
-
-DEPEND="${RDEPEND}
-       alsa? ( virtual/pkgconfig )
-       X? ( gtk? ( virtual/pkgconfig ) )
-       gzip-el? ( app-arch/gzip )"
-
-# 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}"
-EMACS_SUFFIX="emacs-${SLOT}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-       EPATCH_SUFFIX=patch epatch
-
-       sed -i \
-               -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` 
-print-file-name=crtbegin.o):g" \
-               -e "s:/usr/lib/crtend.o:$(`tc-getCC` 
-print-file-name=crtend.o):g" \
-               "${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" etc/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       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
-
-       eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -fstack-protector -fstack-protector-all    #285778
-       replace-flags "-O[3-9]" -O2
-       sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
-
-       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 toolkit-scroll-bars)"
-               myconf="${myconf} $(use_with gif) $(use_with jpeg)"
-               myconf="${myconf} $(use_with png) $(use_with tiff)"
-               myconf="${myconf} $(use_with xpm)"
-
-               # GTK+ is the default toolkit if USE=gtk is chosen with other
-               # possibilities. Emacs upstream thinks this should be standard
-               # policy on all distributions
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       myconf="${myconf} --with-x-toolkit=gtk"
-               elif use Xaw3d; then
-                       einfo "Configuring to build with Xaw3d (Athena/Lucid) 
toolkit"
-                       myconf="${myconf} --with-x-toolkit=athena"
-                       myconf="${myconf} --without-gtk"
-               elif use motif; then
-                       einfo "Configuring to build with Motif toolkit"
-                       myconf="${myconf} --with-x-toolkit=motif"
-                       myconf="${myconf} --without-gtk"
-               else
-                       einfo "Configuring to build with no toolkit"
-                       myconf="${myconf} --with-x-toolkit=no"
-                       myconf="${myconf} --without-gtk"
-               fi
-
-               local f tk=
-               for f in gtk Xaw3d 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
-
-       econf \
-               --program-suffix=-${EMACS_SUFFIX} \
-               --infodir=/usr/share/info/${EMACS_SUFFIX} \
-               --enable-locallisppath="/etc/emacs:${SITELISP}" \
-               --without-carbon \
-               --with-gameuser="${GAMES_USER_DED:-games}" \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
-       emake CC="$(tc-getCC)"
-}
-
-src_install () {
-       emake DESTDIR="${D}" install
-
-       rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-               || die "removing duplicate emacs executable failed"
-       mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-               || die "moving emacs executable failed"
-
-       # move man pages to the correct place
-       local m
-       mv "${D}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-               || die "moving emacs man page failed"
-       for m in ctags emacsclient etags; do
-               mv "${D}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-                       || die "moving ${m} man page failed"
-       done
-
-       # move info dir to avoid collisions with the dir file generated by 
portage
-       mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-               || die "moving info dir failed"
-       touch "${D}"/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 "${D}"/usr/share/emacs/site-lisp/subdirs.el
-       rm -rf "${D}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${D}"/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/*.[ch]
-               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}      "/usr/share/emacs/${FULL_VERSION}/src")
-       X  (let ((path (getenv "INFOPATH"))
-       X       (dir "/usr/share/info/${EMACS_SUFFIX}")
-       X       (re "\\\\\`/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 AUTHORS BUGS CONTRIBUTE README
-}
-
-pkg_preinst() {
-       # move Info dir file to correct name
-       local infodir=/usr/share/info/${EMACS_SUFFIX} f
-       if [ -f "${D}"${infodir}/dir.orig ]; then
-               mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
-       elif [[ -d "${D}"${infodir} ]]; then
-               # this should not happen in EAPI 4
-               ewarn "Regenerating Info directory index in ${infodir} ..."
-               rm -f "${D}"${infodir}/dir{,.*}
-               for f in "${D}"${infodir}/*; do
-                       if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-                               install-info --info-dir="${D}"${infodir} "${f}" 
\
-                                       || die "install-info failed"
-                       fi
-               done
-       fi
-}
-
-pkg_postinst() {
-       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
-       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."
-}
-
-pkg_postrm() {
-       elisp-site-regen
-       eselect emacs update ifunset
-}

diff --git a/app-editors/emacs/emacs-23.4-r6.ebuild 
b/app-editors/emacs/emacs-23.4-r6.ebuild
deleted file mode 100644
index 2ea9b5f..0000000
--- a/app-editors/emacs/emacs-23.4-r6.ebuild
+++ /dev/null
@@ -1,344 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r6.ebuild,v 
1.8 2014/02/17 08:18:21 ulm Exp $
-
-EAPI=5
-WANT_AUTOMAKE="none"
-
-inherit autotools 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.bz2
-       http://dev.gentoo.org/~ulm/emacs/${P}-patches-10.tar.xz";
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="23"
-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 
~x86-macos"
-IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg 
kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff 
toolkit-scroll-bars X Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.2
-       >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-       net-libs/liblockfile
-       hesiod? ( net-dns/hesiod )
-       kerberos? ( virtual/krb5 )
-       alsa? ( media-libs/alsa-lib )
-       gpm? ( sys-libs/gpm )
-       dbus? ( sys-apps/dbus )
-       X? (
-               x11-libs/libXmu
-               x11-libs/libXt
-               x11-misc/xbitmaps
-               gconf? ( >=gnome-base/gconf-2.26.2 )
-               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 )
-               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? ( x11-libs/gtk+:2 )
-               !gtk? (
-                       motif? ( >=x11-libs/motif-2.3:0 )
-                       !motif? (
-                               Xaw3d? ( x11-libs/libXaw3d )
-                               !Xaw3d? ( athena? ( x11-libs/libXaw ) )
-                       )
-               )
-       )"
-
-DEPEND="${RDEPEND}
-       alsa? ( virtual/pkgconfig )
-       dbus? ( virtual/pkgconfig )
-       X? ( virtual/pkgconfig )
-       gzip-el? ( app-arch/gzip )
-       pax_kernel? (
-               sys-apps/attr
-               sys-apps/paxctl
-       )"
-
-RDEPEND="${RDEPEND}
-       !<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-       EPATCH_SUFFIX=patch epatch
-       epatch_user
-
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       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
-
-       eautoreconf
-}
-
-src_configure() {
-       strip-flags
-       filter-flags -fstrict-aliasing
-       append-flags $(test-flags -fno-strict-aliasing)
-
-       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+=" --with-sound"
-       else
-               myconf+=" $(use_with sound)"
-       fi
-
-       if use X; then
-               myconf+=" --with-x --without-ns"
-               myconf+=" $(use_with gconf)"
-               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)"
-
-               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
-
-               # GTK+ is the default toolkit if USE=gtk is chosen with other
-               # possibilities. Emacs upstream thinks this should be standard
-               # policy on all distributions
-               local f
-               if use gtk; then
-                       einfo "Configuring to build with GIMP Toolkit (GTK+)"
-                       myconf+=" --with-x-toolkit=gtk"
-                       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}"
-
-       # 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}" \
-               $(use_with hesiod) \
-               $(use_with kerberos) $(use_with kerberos kerberos5) \
-               $(use_with gpm) \
-               $(use_with dbus) \
-               ${myconf}
-}
-
-src_compile() {
-       export SANDBOX_ON=0                     # for the unbelievers, see Bug 
#131505
-       emake CC="$(tc-getCC)" \
-               AR="$(tc-getAR) cq" \
-               RANLIB="$(tc-getRANLIB)"
-}
-
-src_install () {
-       emake DESTDIR="${D}" install
-
-       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
-       local m
-       mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
-               || die "moving emacs man page failed"
-       for m in b2m ctags ebrowse emacsclient etags grep-changelog 
rcs-checkin; do
-               mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
-                       || die "moving ${m} man page 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 -rf "${ED}"/var
-
-       # remove unused <version>/site-lisp dir
-       rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-       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}
-               doins -r src/{m,s}
-               rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
-               rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
-       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 a previous major version of Emacs, 
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/Project:Emacs/Xft_support
-               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
-}

diff --git a/app-editors/emacs/emacs-24.3-r2.ebuild 
b/app-editors/emacs/emacs-24.3-r2.ebuild
deleted file mode 100644
index 9990036..0000000
--- a/app-editors/emacs/emacs-24.3-r2.ebuild
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r2.ebuild,v 
1.20 2014/02/17 08:18:21 ulm Exp $
-
-EAPI=5
-
-inherit autotools 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-5.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="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk +gtk3 
gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif 
pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X 
Xaw3d xft +xpm"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-       >=app-admin/eselect-emacs-1.2
-       >=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
-       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: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}
-       app-arch/xz-utils
-       alsa? ( virtual/pkgconfig )
-       dbus? ( virtual/pkgconfig )
-       gnutls? ( virtual/pkgconfig )
-       libxml2? ( virtual/pkgconfig )
-       X? ( virtual/pkgconfig )
-       gzip-el? ( app-arch/gzip )
-       pax_kernel? (
-               sys-apps/attr
-               sys-apps/paxctl
-       )"
-
-RDEPEND="${RDEPEND}
-       !<app-editors/emacs-vcs-${PV}"
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-# FULL_VERSION keeps the full version number, which is needed in
-# order to determine some path information correctly for copy/move
-# operations later on
-FULL_VERSION="${PV%%_*}"
-S="${WORKDIR}/emacs-${FULL_VERSION}"
-
-src_prepare() {
-       EPATCH_SUFFIX=patch epatch
-       epatch_user
-
-       sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-               || die "unable to sed ctags.1"
-
-       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.ac \
-                       || die "unable to sed configure.ac"
-       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 "/AC_PATH_PROG/s/gzip/PrEvEnTcOmPrEsSiOn/" 
configure.ac \
-                       || die "unable to sed configure.ac"
-       fi
-
-       AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-       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+=" --with-sound"
-       else
-               myconf+=" $(use_with sound)"
-       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+)"
-                       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}"
-
-       # 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 \
-               $(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) \
-               $(use_with wide-int) \
-               ${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
-
-       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/Project:Emacs/Xft_support
-               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/metadata.xml b/app-editors/emacs/metadata.xml
deleted file mode 100644
index 4981aad..0000000
--- a/app-editors/emacs/metadata.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>emacs</herd>
-<longdescription>
-  GNU Emacs is an extensible, customizable text editor - and more. At its core
-  is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
-  with extensions to support text editing. The features of GNU Emacs include:
-   * Content-sensitive editing modes, including syntax coloring, for a variety
-     of file types including plain text, source code, and HTML.
-   * Complete built-in documentation, including a tutorial for new users.
-   * Full Unicode support for nearly all human languages and their scripts.
-   * Highly customizable, using Emacs Lisp code or a graphical interface.
-   * A large number of extensions that add other functionality, including a
-     project planner, mail and news reader, debugger interface, calendar, and
-     more. Many of these extensions are distributed with GNU Emacs; others are
-     available separately.
-</longdescription>
-<use>
-  <flag name='athena'>Enable the MIT Athena widget set
-    (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name='games'>Support shared score files for games</flag>
-  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
-    font name</flag>
-  <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
-    system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
-    version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
-  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
-    processing</flag>
-  <flag name='leim'>Add support for Emacs input methods</flag>
-  <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
-    of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel
-    (<pkg>sys-apps/paxctl</pkg>)</flag>
-  <flag name='sendmail'>Build Emacs with MTA support</flag>
-  <flag name='source'>Install C source files and make them available for
-    find-function</flag>
-  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
-    preference to Emacs' own scrollbars</flag>
-  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
-    This option has an effect only on architectures where "long" and
-    "long long" types have different size.</flag>
-</use>
-</pkgmetadata>

Reply via email to