Sync IUSE (nosendmail). More on SLOT support.

6 files changed, 65 insertions, 24 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 6affcf988e20..1ebde971c7f1 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.37 2004/09/29 15:41:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.38 2004/10/03 11:52:20 usata Exp $
+
+  03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> +files/60emacs-21.envd,
+  -files/emacs-21.1-gentoo.diff, +files/emacs-21.desktop,
+  +files/emacs-subdirs-el-gentoo.diff, emacs-21.3-r4.ebuild:
+  Sync IUSE (nosendmail). More on SLOT support.
 
   30 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> -emacs-21.1-r4.ebuild,
   -emacs-21.2-r2.ebuild, emacs-21.3-r2.ebuild, emacs-21.3-r3.ebuild,
diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild
index b3c4a4d048cc..ed0016f0da5b 100644
--- a/app-editors/emacs/emacs-21.3-r4.ebuild
+++ b/app-editors/emacs/emacs-21.3-r4.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/emacs-21.3-r4.ebuild,v 1.6 2004/09/29 15:41:09 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r4.ebuild,v 1.7 2004/10/03 11:52:20 usata Exp $
 
 inherit flag-o-matic eutils alternatives gcc
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="21"
 KEYWORDS="~x86 ~ppc ~sparc -alpha ~arm -hppa ~amd64 -ia64 ~s390 ppc64"
-IUSE="X nls motif leim gnome Xaw3d lesstif"
+IUSE="X Xaw3d gnome leim lesstif motif nls nosendmail"
 
 RDEPEND="sys-libs/ncurses
 	sys-libs/gdbm
@@ -30,14 +30,15 @@ RDEPEND="sys-libs/ncurses
 		)
 	)
 	nls? ( sys-devel/gettext )
-	!nosendmail ( virtual/mta )"
+	!nosendmail ( virtual/mta )
+	>=sys-apps/portage-2.0.51_rc1"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58"
 
 PROVIDE="virtual/emacs virtual/editor"
 SANDBOX_DISABLED="1"
 
-DFILE=emacs.desktop
+DFILE=emacs-${SLOT}.desktop
 
 src_compile() {
 
@@ -52,6 +53,7 @@ src_compile() {
 	epatch ${FILESDIR}/${P}-amd64.patch
 	epatch ${FILESDIR}/${P}-hppa.patch
 	use ppc64 && epatch ${FILESDIR}/${P}-ppc64.patch
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
 
 	export WANT_AUTOCONF=2.1
 	autoconf
@@ -87,19 +89,26 @@ src_compile() {
 src_install() {
 	einstall || die
 	for i in ${D}/usr/bin/* ; do
-		mv ${i} ${i}-${PV}
+		mv ${i} ${i}-${SLOT}
 	done
-	mv ${D}/usr/bin/emacs-${PV}{-${PV},}
+	mv ${D}/usr/bin/emacs-{${PV}-,}${SLOT}
 
 	einfo "Fixing info documentation..."
-	rm -f ${D}/usr/share/info/dir
+	mkdir ${T}/emacs-${SLOT}
+	mv ${D}/usr/share/info/dir ${T}
 	for i in ${D}/usr/share/info/*
 	do
-		mv ${i%.info} $i.info
+		mv ${i} ${T}/emacs-${SLOT}/${i##*/}.info
+		gzip -9 ${T}/emacs-${SLOT}/${i##*/}.info
 	done
+	mv ${T}/emacs-${SLOT} ${D}/usr/share/info
+	mv ${T}/dir ${D}/usr/share/info/emacs-${SLOT}
 
+	newenvd ${FILESDIR}/60emacs-${SLOT}.envd 60emacs-${SLOT}
+
+	einfo "Fixing manpages..."
 	for m in ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/-${PV}.1}
+		mv ${m} ${m/.1/-${SLOT}.1}
 	done
 
 	einfo "Fixing permissions..."
@@ -119,7 +128,7 @@ src_install() {
 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.*"
+		alternatives_auto_makesym "/usr/bin/$i" "/usr/bin/$i-21*"
 	done
 }
 
diff --git a/app-editors/emacs/files/60emacs-21.envd b/app-editors/emacs/files/60emacs-21.envd
new file mode 100644
index 000000000000..ebb2bd3a660a
--- /dev/null
+++ b/app-editors/emacs/files/60emacs-21.envd
@@ -0,0 +1 @@
+INFOPATH=/usr/share/info/emacs-21
diff --git a/app-editors/emacs/files/emacs-21.1-gentoo.diff b/app-editors/emacs/files/emacs-21.1-gentoo.diff
deleted file mode 100644
index 319a96607c17..000000000000
--- a/app-editors/emacs/files/emacs-21.1-gentoo.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- emacs-21.1/src/m/macppc.h.~1.6.~    Mon Oct  1 10:57:25 2001
-+++ emacs-21.1/src/m/macppc.h   Mon Oct 22 21:02:28 2001
-@@ -96,6 +96,10 @@
- #ifdef LINUX
- #define LINKER $(CC) -nostdlib
- #define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc
-+/* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here
-+   because prefix-args is not used.  */
-+#undef LD_SWITCH_SYSTEM_TEMACS
-+#define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc
- #endif
-     
- #if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
diff --git a/app-editors/emacs/files/emacs-21.desktop b/app-editors/emacs/files/emacs-21.desktop
new file mode 100644
index 000000000000..4d1bfd0b1b62
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=GNU Emacs 21
+Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
+Icon=gnome-emacs.png
+Terminal=0
+Type=Application
+Exec=/usr/bin/emacs-21
diff --git a/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff
new file mode 100644
index 000000000000..c76aab71b771
--- /dev/null
+++ b/app-editors/emacs/files/emacs-subdirs-el-gentoo.diff
@@ -0,0 +1,32 @@
+--- Makefile.in	2002-10-19 10:21:01.000000000 +0900
++++ Makefile.in.subdirs-el	2004-08-02 17:01:35.852417016 +0900
+@@ -387,18 +387,21 @@
+ 	then true; \
+ 	else \
+ 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
++	   echo "    (normal-top-level-add-subdirs-to-load-path))"; \
++	   echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \
++	   echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+ 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
+ 	    > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+ 	fi
+ 	chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
+-	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
+-	then true; \
+-	else \
+-	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
+-	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
+-	    > ${datadir}/emacs/site-lisp/subdirs.el; \
+-	fi
+-	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
++#	-if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
++#	then true; \
++#	else \
++#	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
++#	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
++#	    > ${datadir}/emacs/site-lisp/subdirs.el; \
++#	fi
++#	-chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
+ 	-unset CDPATH; \
+ 	if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+ 	then \