Multi-tty merged.

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

6 files changed, 0 insertions, 353 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
deleted file mode 100644
index 02a29c3..0000000
--- a/app-editors/emacs-cvs/ChangeLog
+++ /dev/null
@@ -1,41 +0,0 @@
-# ChangeLog for app-editors/emacs-cvs
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-23.0.51.ebuild:
-  add BSD license because of etags binary, which initial version has been
-  licensed thereunder
-
-  21 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.51.ebuild:
-  Generate score files in pkg_postinst.
-
-  19 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.51.ebuild:
-  Update licence info to GPL-3.
-
-  06 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
-  -files/emacs-cvs-Xaw3d-headers.patch, emacs-cvs-23.0.51.ebuild:
-  Sync with Portage versions: New gpm flag; hesiod conf fixed; giflib support.
-  Remove unused patch file.
-
-  19 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.51.ebuild:
-  Depend on virtual/motif and remove lesstif USE flag.
-
-  18 Jun 2007; Christian Faulhammer <opfer@gentoo.org>
-  emacs-cvs-23.0.51.ebuild:
-  remove Xaw3d patch (added upstream)
-
-  09 Jun 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.51.ebuild,
-  -files/emacs-cvs-disable_alsa_detection.patch,
-  +files/emacs-cvs-disable_alsa_detection-r1.patch:
-  Sync ebuild with version in Portage. Fix alsa patch.
-
-  23 May 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-23.0.51.ebuild:
-  Sync ebuild with latest versions in Portage.
-
-  13 May 2007; Ulrich Mueller <ulm@gentoo.org>
-  +files/emacs-cvs-Xaw3d-headers.patch, +emacs-cvs-23.0.51.ebuild,
-  +files/emacs-cvs-disable_alsa_detection.patch,
-  +files/emacs-cvs-freebsd-sparc.patch, +metadata.xml:
-  Live CVS ebuild for the Emacs multi-tty branch.
-
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
deleted file mode 100644
index 97f4747..0000000
--- a/app-editors/emacs-cvs/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX emacs-cvs-disable_alsa_detection-r1.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
-AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
-EBUILD emacs-cvs-23.0.51.ebuild 7539 RMD160 27bc8a6762a07101f8e8490895c361960cb83536 SHA1 6e431eeaf23888619a00b11abde58aab162f63ef SHA256 d6fdfe4e39be8bc8e2868f9a73dabb1f6f11af8606f43b090303b8ccbde7b1fa
-MISC ChangeLog 1614 RMD160 d2ebbeec433433e07f5750e268ab719f8e478de4 SHA1 f3c3c3f3e728866d99a47b79c2dd372918d1cf9c SHA256 cf8528b3a8f0d54f0aaf8d9fd5ea439be545ef11b340e4e90fd93559a4b86c80
-MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.51.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.51.ebuild
deleted file mode 100644
index be35044..0000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.51.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="multi-tty"
-ECVS_LOCALNAME="emacs-multi-tty"
-
-WANT_AUTOCONF="2.61"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs 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=""
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="23-multi-tty"
-KEYWORDS="~x86"
-IUSE="alsa gif gpm gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	gpm? ( sys-libs/gpm )
-	X? (
-		$X_DEPEND
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? (
-				motif? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-PROVIDE="virtual/editor"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-EMACS_SUFFIX="emacs-${SLOT}"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# 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=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION}" = ${PV} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
-	echo
-
-	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"
-	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
-
-	epatch "${FILESDIR}/${PN}-freebsd-sparc.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch"
-
-	eautoreconf
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	ALLOWED_FLAGS=""
-	strip-flags
-	unset LDFLAGS
-	replace-flags -O[3-9] -O2
-
-	local myconf
-
-	if use alsa && ! use sound; then
-		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		echo
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		if use gtk; then
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			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
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with gpm)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	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 info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv ${i} ${i}.info || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m%.1}-${EMACS_SUFFIX}.1 || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /var/lib/games/emacs/
-
-	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]
-		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README README.multi-tty || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f ${ROOT}${infodir}/dir{,.*}
-	for f in ${ROOT}${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir=${ROOT}${infodir} ${f} &>/dev/null
-	done
-	echo
-}
-
-pkg_postinst() {
-	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
-		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	local f
-	for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
-		test -e ${f} || touch ${f}
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module. Man and info pages are automatically"
-	elog "redirected, so you are to test emacs-cvs along with the stable"
-	elog "release. \"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch b/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch
deleted file mode 100644
index d4b630f..0000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-disable_alsa_detection-r1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in	22 May 2007 15:54:32 -0000	1.448
-+++ configure.in	30 May 2007 13:19:39 -0000
-@@ -1590,39 +1590,6 @@
-   # Emulation library used on NetBSD.
-   AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
-   AC_SUBST(LIBSOUND)
--
--  ALSA_REQUIRED=1.0.0
--  ALSA_MODULES="alsa >= $ALSA_REQUIRED"
--  dnl Check if --with-pkg-config-prog has been given.
--  if test "X${with_pkg_config_prog}" != X; then
--    PKG_CONFIG="${with_pkg_config_prog}"
--  fi
--  PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
--  if test $HAVE_ALSA = yes; then
--    SAVE_CFLAGS="$CFLAGS"
--    SAVE_LDFLAGS="$LDFLAGS"
--    CFLAGS="$ALSA_CFLAGS $CFLAGS"
--    LDFLAGS="$ALSA_LIBS $LDFLAGS"
--    AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);],
--                    emacs_alsa_normal=yes,
--	            emacs_alsa_normal=no)
--    if test "$emacs_alsa_normal" != yes; then
--      AC_TRY_COMPILE([#include <alsa/asoundlib.h>],
--                     [snd_lib_error_set_handler (0);],
--                     emacs_alsa_subdir=yes,
--	             emacs_alsa_subdir=no)
--      if test "$emacs_alsa_subdir" != yes; then
--        AC_MSG_ERROR([pkg-config found alsa, but it does not compile.  See config.log for error messages.])
--      fi
--      ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE"
--    fi
--
--    CFLAGS="$SAVE_CFLAGS"
--    LDFLAGS="$SAVE_LDFLAGS"
--    LIBSOUND="$LIBSOUND $ALSA_LIBS"
--    CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS"
--    AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
--  fi
-   AC_SUBST(CFLAGS_SOUND)
- fi
- 
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch b/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch
deleted file mode 100644
index d5e0793..0000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-freebsd-sparc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: emacs/src/alloc.c
-===================================================================
---- emacs.orig/src/alloc.c
-+++ emacs/src/alloc.c
-@@ -4522,7 +4522,7 @@ mark_stack ()
-   /* Fixme: Code in the Boehm GC suggests flushing (with `flushrs') is
-      needed on ia64 too.  See mach_dep.c, where it also says inline
-      assembler doesn't work with relevant proprietary compilers.  */
--#ifdef sparc
-+#if defined(sparc) && !defined(__FreeBSD__)
-   asm ("ta 3");
- #endif
- 
diff --git a/app-editors/emacs-cvs/metadata.xml b/app-editors/emacs-cvs/metadata.xml
deleted file mode 100644
index bc306fe..0000000
--- a/app-editors/emacs-cvs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>emacs</herd>
-</pkgmetadata>