Moved to Portage tree.

svn path=/emacs-overlay/; revision=1256

4 files changed, 7 insertions, 103 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3e9fd1b..ac41d71 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for app-editors/emacs
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jan 2009; Ulrich Mueller <ulm@gentoo.org> -emacs-18.59-r5.ebuild:
+  Moved to Portage tree.
+
 *emacs-22.3-r1 (30 Dec 2008)
 
   30 Dec 2008; Ulrich Mueller <ulm@gentoo.org>
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f551cbe..1547128 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -2,11 +2,7 @@ AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1
 AUX emacs-22.2-sh.patch 761 RMD160 4a65a87cfd31d0714e9f99de91dee1c292ba5159 SHA1 1cf46bd5f2bff3e4cff2d6fb43a05dabca81c276 SHA256 743f9e3fcf0059ff68a5ba704311d8aa1ae09600eb3692de51e0b7105ea1f9b4
 AUX emacs-22.3-freebsd-sparc.patch 488 RMD160 37a5499a515a45e19858b6aaa1217ec116811d2d SHA1 47d2880c01857515d38adc9a56485e9bd695cac6 SHA256 963ea3506cbcf4797ec974e2802a11c6e9c09cddf1360dbbe6a452a2cef6efbf
 AUX emacs-22.3-linux-random-heap.patch 566 RMD160 6d0df837e04ba6cd712939092626cc067248cae5 SHA1 0313a5b34bb5b868596408af9b71b18c28b227c4 SHA256 76d049df10d1a4789a45297d8a14b2e7b41e700aefd0aec66ab47fbdfe0c0fbd
-DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59-patches-3.tar.bz2 17323 RMD160 c0a205792f80c34b599c82fe5cf957f10f80956a SHA1 d452c45756e69edf71a46518cfde809eb65955f9 SHA256 679fe1c0e4fbc2ccf44e6c7097aa093c4e575fde15b5416d944916893bd543ff
-DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
-EBUILD emacs-18.59-r5.ebuild 2513 RMD160 4d07042bb4e54ba3798cfe770c985d79a3bd14cb SHA1 99b617e5a4d35491584e57c753b068a16879aa9b SHA256 b232307324352ea9bc3151f705372a61700232f39b858925c3b2349ae5134e38
 EBUILD emacs-22.3-r1.ebuild 8044 RMD160 ecac91cfc0a9e5637a9a0fafa7d3cd6a21c1c0d9 SHA1 edca2cfeb08d880295ff49c6d5cda172b97367e7 SHA256 b9cc34000a4bd70d23762e29fe5389c79ac642e20c07b6ccaad4ccb4d668a17c
-MISC ChangeLog 646 RMD160 c79d79d13126d319269ee8baf0d66c81cf37e4d3 SHA1 952451c549f794583bdf7e6af07889c8e9adf271 SHA256 be96635970421df9e8b9e089896a51a6dce0a0cabbf889a6f6d19b380bc8aa17
-MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
+MISC ChangeLog 743 RMD160 ca6b89a8b69bd1b2444e5efba712e6a8650538f9 SHA1 0942341410db3926d2b93cdd1d1a9d66e7c810dd SHA256 7b6cf399f9a14da9364eb6e44555ef68690713a0ed292edef3cc067746486e57
+MISC metadata.xml 1529 RMD160 e40abfeff829d64e9f7d699d4e8fc5c4d6097bb5 SHA1 b2c01905cf0230739a45ad86bfbec800f8562c9f SHA256 b24dbef03ac32c182f69573275d416d664537eee2667e1e8c3199d4d34f3b20e
diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild
deleted file mode 100644
index 99ad3ad..0000000
--- a/app-editors/emacs/emacs-18.59-r5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.6 2008/11/14 09:11:43 ulm Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-3.tar.bz2"
-
-LICENSE="GPL-1 GPL-2 BSD as-is"
-SLOT="18"
-KEYWORDS="~x86"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	X? ( x11-libs/libX11[-xcb] )"
-DEPEND="${RDEPEND}"
-
-MY_BASEDIR="/usr/share/emacs/${PV}"
-MY_LOCKDIR="/var/lib/emacs/lock"
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
-	EPATCH_SUFFIX=patch epatch
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${ARCH} not 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
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "${MY_BASEDIR}/lisp"
-		#define PATH_EXEC "${MY_BASEDIR}/etc"
-		#define PATH_LOCK "${MY_LOCKDIR}/"
-		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
-	END
-
-	# -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
-	SANDBOX_ON=0
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
-}
-
-src_install() {
-	local i
-
-	dodir ${MY_BASEDIR}
-	dodir /usr/share/man/man1
-	make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \
-		MANDIR="${D}/usr/share/man/man1" || die
-	chmod -R go-w "${D}${MY_BASEDIR}"
-	rmdir "${D}${MY_BASEDIR}/lock"
-
-	dodir ${MY_LOCKDIR%/*}
-	diropts -m0777
-	keepdir ${MY_LOCKDIR}
-
-	for i in emacsclient etags ctags; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die "mv emacs failed"
-	mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
-	dosym ../emacs/${PV}/info /usr/share/info/emacs-${SLOT}
-
-	dodoc README PROBLEMS
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 7ef4be9..73f87a6 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <longdescription>
-  GNU Emacs is an extensible, customizable text editor—and more. At its core
+  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 wide
@@ -22,8 +22,6 @@
 <use>
   <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
   <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='leim'>Add support for Emacs input methods</flag>
-  <flag name='sendmail'>Build Emacs with MTA support</flag>
   <flag name='sound'>Enable sound</flag>
   <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>