Disable Xaw3d even when installed if USE="-Xaw3d". Bug 35300

4 files changed, 96 insertions, 3 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 7315762e5042..af572f656657 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.16 2003/12/01 06:24:23 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.17 2003/12/08 05:18:46 usata Exp $
+
+*emacs-21.3-r2 (08 Dec 2003)
+
+  08 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r2.ebuild:
+  Disable Xaw3d if USE="-Xaw3d" even when it is installed, bug 35300
 
   01 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> emacs-21.3-r1.ebuild:
   Filter -fstack-protector that causes internal compiler error at xterm.c
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f05de65830f4..6981b42125cf 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,9 +1,9 @@
-MD5 58921185e34ed5c28deed4dd8e7b89ec ChangeLog 2352
+MD5 fd20a4b7b5b069c0aa3e21aa2d60c486 ChangeLog 2523
 MD5 67cf7c0e0c11a91a851438ca6bc338ed emacs-21.1-r4.ebuild 2206
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 4ae3960b78145e7aa8799fbf5b0dd8af emacs-21.2-r2.ebuild 1895
 MD5 34ccf078929416d842ed532f0d5833af emacs-21.3.ebuild 2048
-MD5 c255de6b2cba39764be0a7c67f8db797 emacs-21.3-r2.ebuild 2057
+MD5 974d19edcebb5ee47f6d78aedf86ce87 emacs-21.3-r2.ebuild 2061
 MD5 225ebbe74357ca0f11899a14a90834ce emacs-21.3-r1.ebuild 2174
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
diff --git a/app-editors/emacs/emacs-21.3-r2.ebuild b/app-editors/emacs/emacs-21.3-r2.ebuild
new file mode 100644
index 000000000000..2c157f287d2b
--- /dev/null
+++ b/app-editors/emacs/emacs-21.3-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.1 2003/12/08 05:18:46 usata Exp $
+
+IUSE="X nls motif leim gnome Xaw3d"
+
+inherit flag-o-matic
+
+S=${WORKDIR}/${P}
+DESCRIPTION="An incredibly powerful, extensible text editor"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/gdbm
+	X? ( virtual/x11
+		>=media-libs/libungif-4.1.0.1b
+		>=media-libs/jpeg-6b-r2
+		>=media-libs/tiff-3.5.5-r3
+		>=media-libs/libpng-1.2.1
+		Xaw3d? ( x11-libs/Xaw3d )
+		motif? ( >=x11-libs/openmotif-2.1.30 )
+	)
+	nls? ( sys-devel/gettext )
+	gnome? ( gnome-base/gnome-desktop )"
+
+PROVIDE="virtual/emacs virtual/editor"
+SANDBOX_DISABLED="1"
+
+DFILE=emacs.desktop
+
+# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+filter-flags -fstack-protector
+
+src_compile() {
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	if [ "`use X`" ] ; then
+		myconf="${myconf}
+			--with-x
+			--with-xpm
+			--with-jpeg
+			--with-tiff
+			--with-gif
+			--with-png"
+		if [ "`use motif`" ] ; then
+			myconf="${myconf} --with-x-toolkit=motif"
+		elif [ "`use Xaw3d`" ] ; then
+			myconf="${myconf} --with-x-toolkit=athena"
+		else
+			# do not build emacs with any toolkit, bug 35300
+			myconf="${myconf} --with-x-toolkit=no"
+		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install () {
+	einstall || die
+	einfo "Fixing info documentation..."
+	rm -f ${D}/usr/share/info/dir
+	for i in ${D}/usr/share/info/*
+	do
+		mv ${i%.info} $i.info
+	done
+
+	einfo "Fixing permissions..."
+	find ${D} -perm 664 |xargs chmod 644
+	find ${D} -type d |xargs chmod 755
+
+	dodoc BUGS ChangeLog README
+
+	keepdir /usr/share/emacs/${PV}/leim
+
+	if [ "`use gnome`" ] ; then
+		insinto /usr/share/gnome/apps/Application
+		doins ${FILESDIR}/${DFILE}
+	fi
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r2 b/app-editors/emacs/files/digest-emacs-21.3-r2
new file mode 100644
index 000000000000..7aafc8e2fda1
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.3-r2
@@ -0,0 +1,2 @@
+MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
+MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224