Added Carbon Emacs (aqua USE flag). See bug #64362. Also added multi-tty patch.

5 files changed, 247 insertions, 22 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b66a09a3d393..f365a007302f 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.43 2004/10/19 17:39:34 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.44 2004/11/06 16:06:15 usata Exp $
+
+*emacs-21.3.50_pre20041027 (07 Nov 2004)
+
+  07 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/emacs-nofink-gentoo.diff, +emacs-21.3.50_pre20041027.ebuild:
+  Added Carbon Emacs (aqua USE flag). See bug #64362.
+  Also added multi-tty patch.
 
   19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> emacs-21.3-r4.ebuild:
   ~alpha keyword.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 01590fdf07db..61e72d485d71 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,27 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cd950ca660715c0324588702db8b152c emacs-21.3-r3.ebuild 2606
-MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
-MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 7c1bb3b83cc8d65547925c15dd605a71 emacs-21.3-r2.ebuild 2190
+MD5 cd950ca660715c0324588702db8b152c emacs-21.3-r3.ebuild 2606
 MD5 8749d387dde406327092a725cfce898c emacs-21.3-r4.ebuild 3683
 MD5 17d963f93fecbc6634de7f7c5bd89627 ChangeLog 6597
-MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
-MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
-MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
-MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 4ff8a8c4e69f80929f2c1f7aac9a7dd3 emacs-18.59.ebuild 2002
+MD5 6405e8792e0f4b0528d813db2b546f37 emacs-21.3.50_pre20041027.ebuild 5088
 MD5 0d7a5eba9d25e527c53da9a73c3bb767 files/digest-emacs-18.59 216
-MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
-MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
-MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBdVFhugEuf3OQ0akRAiasAJ9spRhyaXXSWQKw7J8sPiQxpZ54KgCdGIef
-kjZbPYzZcJOeVZf/AaBjxu4=
-=MVcq
------END PGP SIGNATURE-----
+MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
+MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
+MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+MD5 6aafc439ab1c05f97db2bfefc707bdcc files/emacs-21.desktop 196
+MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
+MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+MD5 6ad048aba58fdae6c516ed18ad728d95 files/digest-emacs-21.3.50_pre20041027 242
diff --git a/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild b/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
new file mode 100644
index 000000000000..94de16e3f246
--- /dev/null
+++ b/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3.50_pre20041027.ebuild,v 1.1 2004/11/06 16:06:15 usata Exp $
+
+inherit elisp-common alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua cjk gif gnome gtk jpeg multi-tty nls png spell tiff"
+
+INLINE="inline_patch-20041015"
+MULTI_TTY="emacs--multi-tty--0--patch-261.2004-10-19"
+
+DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+HOMEPAGE="http://www.gnu.org/software/emacs/
+	http://macemacsjp.sourceforge.jp/
+	http://lorentey.hu/project/emacs.html.en"
+SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz
+	cjk? ( mirror://sourceforge.jp/macemacsjp/11918/${INLINE}.tar.gz )
+	multi-tty? ( http://lorentey.hu/downloads/emacs/multi-tty/${MULTI_TTY}.patch.gz )"
+
+# Never use the sandbox, it causes Emacs to segfault on startup
+SANDBOX_DISABLED="1"
+RESTRICT="$RESTRICT nostrip"
+
+DEPEND=">=sys-apps/portage-2.0.51
+	>=sys-libs/ncurses-5.3
+	sys-libs/gdbm
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( virtual/x11
+		gif? ( >=media-libs/libungif-4.1.0.1b )
+		jpeg? ( >=media-libs/jpeg-6b )
+		tiff? ( >=media-libs/tiff-3.5.7 )
+		png? ( >=media-libs/libpng-1.2.5 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) )
+		gnome? ( gnome-base/gnome-desktop ) )
+	nls? ( >=sys-devel/gettext-0.11.5 )
+	!=app-editors/emacs-cvs-21.3.50*"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="21.3.50"
+LICENSE="GPL-2"
+# should run on other arches, but the ebuild is intended for ppc-macos
+KEYWORDS="-* ~ppc-macos"
+
+DFILE=emacs-${SLOT}.desktop
+
+S=${WORKDIR}/${P%_*}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	if use ppc-macos ; then
+		use cjk && epatch ${WORKDIR}/${INLINE}/emacs-inline.patch
+		epatch ${FILESDIR}/emacs-nofink-gentoo.diff
+	fi
+	if use multi-tty ; then
+		if use aqua ; then
+			ewarn "Carbon Emacs will not compile with multi-tty patch; disabling multi-tty."
+			ewarn "If you want to use multi-tty, please trun off aqua USE flag."
+			epause; ebeep; epause
+		else
+			epatch ../${MULTI_TTY}.patch
+		fi
+	fi
+
+}
+
+src_compile() {
+
+	strip-flags
+
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			einfo "Configuring to build with GTK support"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		elif use Xaw3d; then
+			einfo "Configuring to build with Xaw3d support"
+			myconf="${myconf} --with-x-toolkit=athena"
+		else
+			einfo "Configuring to build with lucid toolkit support"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		fi
+	fi
+
+	if use aqua ; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf --enable-debug \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			|| die "econf carbon emacs failed"
+		emake -j1 || die "make carbon emacs bootstrap failed"
+	fi
+
+	econf --enable-debug \
+		--program-suffix=-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	emake -j1 || die "make emacs bootstrap failed"
+}
+
+src_install () {
+	einstall || die
+	rm ${D}/usr/bin/emacs-${SLOT}-${SLOT}
+
+	if use aqua ; then
+		einfo "Installing Carbon Emacs..."
+		dodir /Applications/Gentoo/Emacs.app
+		pushd mac/Emacs.app
+		tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
+		popd
+	fi
+
+	# fix info documentation
+	einfo "Fixing info documentation..."
+	dodir /usr/share/info/emacs-${SLOT}
+	mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+	for i in ${D}/usr/share/info/*
+	do
+		if [ "${i##*/}" != emacs-${SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${SLOT}}.info
+			gzip -9 ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+	fi
+	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
+	dosed "s:%%SLOT%%:${SLOT}:g" /etc/env.d/50emacs-${SLOT}
+
+	einfo "Fixing manpages..."
+	for m in  ${D}/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-${SLOT}.1} || die "mv man failed"
+	done
+
+	dodoc BUGS ChangeLog README*
+
+	if use gnome; then
+		insinto /usr/share/gnome/apps/Application
+		doins ${FILESDIR}/${DFILE} || die "install desktop file faild"
+	fi
+}
+
+update-alternatives() {
+	for i in emacs emacsclient etags ctags b2m ebrowse \
+		rcs-checkin grep-changelog ; do
+		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i-21.*"
+	done
+}
+
+pkg_postinst() {
+	use ppc-macos || update-alternatives
+	if use aqua && use cjk ; then
+		einfo
+		einfo "If you are going to use Japanese input method on Carbon Emacs,"
+		einfo "put the following lines to your ~/.emacs.el"
+		einfo "(if (eq window-system 'mac)"
+		einfo "	(set-keyboard-coding-system 'sjis)"
+		einfo
+	fi
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027 b/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027
new file mode 100644
index 000000000000..a9a0fb47be4f
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.3.50_pre20041027
@@ -0,0 +1,3 @@
+MD5 c11d878942c3a91052b915e7f267ab91 emacs-21.3.50-20041027.tar.gz 32678279
+MD5 5f82ee1b33a1915e917192fee5c8b59c inline_patch-20041015.tar.gz 6077
+MD5 97888226c80f142143bf108a1290c53f emacs--multi-tty--0--patch-261.2004-10-19.patch.gz 148316
diff --git a/app-editors/emacs/files/emacs-nofink-gentoo.diff b/app-editors/emacs/files/emacs-nofink-gentoo.diff
new file mode 100644
index 000000000000..a09185303d13
--- /dev/null
+++ b/app-editors/emacs/files/emacs-nofink-gentoo.diff
@@ -0,0 +1,42 @@
+--- configure.in.orig	Wed Sep 22 02:03:18 2004
++++ configure.in	Wed Sep 22 02:11:16 2004
+@@ -1126,12 +1126,12 @@
+     machine=powermac opsys=darwin
+     # Define CPP as follows to make autoconf work correctly.
+     CPP="${CC-cc} -E -no-cpp-precomp"
+-    # Use fink packages if available.
+-    if test -d /sw/include && test -d /sw/lib; then
+-	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+-        CPP="${CPP} ${GCC_TEST_OPTIONS}"
+-	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+-    fi
++#    # Use fink packages if available.
++#    if test -d /sw/include && test -d /sw/lib; then
++#	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
++#        CPP="${CPP} ${GCC_TEST_OPTIONS}"
++#	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
++#    fi
+   ;;
+ 
+   ## AMD x86-64 Linux-based GNU system
+--- configure.orig	Wed Sep 22 02:18:49 2004
++++ configure	Wed Sep 22 02:20:03 2004
+@@ -2601,12 +2601,12 @@
+     machine=powermac opsys=darwin
+     # Define CPP as follows to make autoconf work correctly.
+     CPP="${CC-cc} -E -no-cpp-precomp"
+-    # Use fink packages if available.
+-    if test -d /sw/include && test -d /sw/lib; then
+-	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+-        CPP="${CPP} ${GCC_TEST_OPTIONS}"
+-	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+-    fi
++#    # Use fink packages if available.
++#    if test -d /sw/include && test -d /sw/lib; then
++#	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
++#        CPP="${CPP} ${GCC_TEST_OPTIONS}"
++#	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
++#    fi
+   ;;
+ 
+   ## AMD x86-64 Linux-based GNU system