touch .keep in /usr/share/emacs/21.1/leim to get it installed, emacs gives a warning at start otherwise

4 files changed, 88 insertions, 2 deletions

diff --git a/app-editors/emacs/emacs-21.1-r1.ebuild b/app-editors/emacs/emacs-21.1-r1.ebuild
index f4b71a08ca05..1d9aa6a7ac60 100644
--- a/app-editors/emacs/emacs-21.1-r1.ebuild
+++ b/app-editors/emacs/emacs-21.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: System Team <system@gentoo.org>
 # Author: Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r1.ebuild,v 1.1 2002/01/18 22:06:57 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r1.ebuild,v 1.2 2002/01/19 12:50:24 hallski Exp $
 
 
 S=${WORKDIR}/${P}
@@ -13,13 +13,14 @@ HOMEPAGE="http://www.gnu.org/software/emacs"
 DEPEND=">=sys-libs/ncurses-5.2
 	sys-libs/gdbm
 	X? ( 	virtual/x11
-		>=media-libs/libungif-4.1.0 
+		>=media-libs/libungif-4.1.0
 		>=media-libs/jpeg-6b-r2 
 		>=media-libs/tiff-3.5.5-r3 
 		>=media-libs/libpng-1.0.9 ) 
 	motif? ( >=x11-libs/openmotif-2.1.30 ) 
 	nls? ( >=sys-devel/gettext-0.10.35 )"
 
+
 PROVIDE="virtual/emacs"
 
 src_compile() {
@@ -71,4 +72,8 @@ src_install () {
 	done
 
 	dodoc BUGS ChangeLog README
+
+	# Gives a warning if it doesn't exist
+	dodir /usr/share/emacs/21.1/leim
+	touch ${D}/usr/share/emacs/21.1/leim/.keep
 }
diff --git a/app-editors/emacs/emacs-21.1-r2.ebuild b/app-editors/emacs/emacs-21.1-r2.ebuild
new file mode 100644
index 000000000000..e14d3496ae35
--- /dev/null
+++ b/app-editors/emacs/emacs-21.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: System Team <system@gentoo.org>
+# Author: Mikael Hallendal <micke@hallendal.net>
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.1-r2.ebuild,v 1.1 2002/01/19 12:50:24 hallski Exp $
+
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An incredibly powerful, extensible text editor"
+SRC_URI="ftp://ftp.codefactory.se/pub/gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	sys-libs/gdbm
+	X? ( 	virtual/x11
+		>=media-libs/libungif-4.1.0
+		>=media-libs/jpeg-6b-r2 
+		>=media-libs/tiff-3.5.5-r3 
+		>=media-libs/libpng-1.0.9 ) 
+	motif? ( >=x11-libs/openmotif-2.1.30 ) 
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+
+PROVIDE="virtual/emacs"
+
+src_compile() {
+	local myconf
+
+	if [ -z "`use nls`" ] ; then
+		myconf="${myconf} --disable-nls"
+	fi 
+
+	if [ "`use X`" ] ; then
+		myconf="${myconf} \
+			--with-x \
+			--with-xpm \
+			--with-jpeg \
+			--with-tiff \
+			--with-gif \
+			--with-png"
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if [ "`use motif`" ] ; then
+		myconf="${myconf} --with-x-toolkit=motif"
+	fi
+
+	./configure	--host=${CHOST} \
+			--prefix=/usr \
+			--libexecdir=/usr/lib \
+			--mandir=/usr/share/man \
+			--infodir=/usr/share/info \
+			${myconf} || die
+
+	emake || die
+}
+
+src_install () {
+	make 	prefix=${D}/usr \
+		libexecdir=${D}/usr/lib \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die
+
+	cd ${D}/usr/share/info
+	rm dir
+
+	for i in *
+	do
+		mv ${i%.info} $i.info
+	done
+
+	dodoc BUGS ChangeLog README
+
+	# Gives a warning if it doesn't exist
+	dodir /usr/share/emacs/21.1/leim
+	touch ${D}/usr/share/emacs/21.1/leim/.keep
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.1-r1 b/app-editors/emacs/files/digest-emacs-21.1-r1
index 2f8f8c363c89..7eb30b516413 100644
--- a/app-editors/emacs/files/digest-emacs-21.1-r1
+++ b/app-editors/emacs/files/digest-emacs-21.1-r1
@@ -1 +1,2 @@
 MD5 3e0de8cf3ffe92e04c748842f7c64e62 emacs-21.1.tar.gz 20324352
+MD5 57b9d7c902f8d6a29aa28761d5edeae0 leim-21.1.tar.gz 3293184
diff --git a/app-editors/emacs/files/digest-emacs-21.1-r2 b/app-editors/emacs/files/digest-emacs-21.1-r2
new file mode 100644
index 000000000000..2f8f8c363c89
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.1-r2
@@ -0,0 +1 @@
+MD5 3e0de8cf3ffe92e04c748842f7c64e62 emacs-21.1.tar.gz 20324352