Added to ~ppc-macos. This closes bug #64352.

4 files changed, 86 insertions, 21 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 7fdf301db3bc..2685fe954e9e 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.22 2004/10/03 08:20:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.23 2004/10/14 03:48:44 usata Exp $
+
+  14 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/emacs-cvs-21.3.50-nofink.diff, emacs-cvs-21.3.50-r1.ebuild:
+  Added to ~ppc-macos. This closes bug #64352.
 
   03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org>
   +files/50emacs-21.3.50.envd, +files/emacs-21.3.50.desktop,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index cfd63b51986a..44d639396fa2 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -5,11 +5,13 @@ MD5 b8009f778275a4381a9ec885d9753769 ChangeLog 3334
 MD5 97677808a8ae395fffcc37956fc72e8e emacs-cvs-21.3.50.ebuild 3069
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 9e7f886b13be69cfd2306c4586baa10e emacs-cvs-21.3.50-r1.ebuild 3749
-MD5 652795f625e600f3e86a47073ba70021 emacs-cvs-22.0.0.ebuild 3038
+MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
+MD5 56ef36e51f5ae1399583055f028144b5 files/50emacs-21.3.50.envd 40
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50 0
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.0 0
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 39e2f957cdbcb0ae028bb9b94312d85b files/emacs-21.3.50.desktop 206
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
index 96bfe6d9c230..12dc0caa93a3 100644
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.2 2004/10/03 08:20:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.3 2004/10/14 03:48:44 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -15,6 +15,7 @@ ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwA
 inherit elisp-common cvs alternatives flag-o-matic eutils
 
 IUSE="X Xaw3d gif gnome gtk jpeg nls png spell tiff"
+#IUSE="${IUSE} aqua"
 
 S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
@@ -44,7 +45,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="21.3.50"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
 
 DFILE=emacs-${SLOT}.desktop
 
@@ -52,44 +53,60 @@ src_compile() {
 
 	strip-flags
 	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	use ppc-macos && epatch ${FILESDIR}/${P}-nofink.diff
 
 	local myconf
 
 	use nls || myconf="${myconf} --disable-nls"
 
-	myconf="${myconf} $(use_with X x)"
-
 	if use X; then
-		myconf="${myconf} --with-xpm"
+		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
-				--with-toolkit-scroll-bars"
+			myconf="${myconf} --with-x-toolkit=gtk"
 		elif use Xaw3d; then
 			einfo "Configuring to build with Xaw3d support"
-			myconf="${myconf} --with-x-toolkit=athena
-				--with-toolkit-scroll-bars"
+			myconf="${myconf} --with-x-toolkit=athena"
 		else
-			einfo "Configuring to build without X toolkit support"
-			myconf="${myconf} --without-gtk"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-toolkit-scroll-bars"
+			einfo "Configuring to build with lucid toolkit support"
+			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"
+#		make bootstrap || die "make carbon emacs bootstrap failed"
+#	fi
+
 	econf --enable-debug \
-		--program-suffix=-${SLOT} \
-		${myconf} || die
+		--program-suffix=-${PV} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
 
-	make bootstrap || die
+	make bootstrap || 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}
@@ -117,7 +134,7 @@ src_install () {
 
 	if use gnome; then
 		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE}
+		doins ${FILESDIR}/${DFILE} || die "install desktop file failed"
 	fi
 }
 
@@ -129,9 +146,9 @@ update-alternatives() {
 }
 
 pkg_postinst() {
-	update-alternatives
+	use ppc-macos || update-alternatives
 }
 
 pkg_postrm() {
-	update-alternatives
+	use ppc-macos || update-alternatives
 }
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.diff b/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.diff
new file mode 100644
index 000000000000..a09185303d13
--- /dev/null
+++ b/app-editors/emacs-cvs/files/emacs-cvs-21.3.50-nofink.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