Added partial SLOT support. Reversed Xaw3d and motif USE flag order, see bug #18518

8 files changed, 154 insertions, 112 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index bdf663773154..200396a7d8d9 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.29 2004/06/24 21:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.30 2004/07/04 14:15:47 usata Exp $
+
+*emacs-21.3-r4 (04 Jul 2004)
+
+  04 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> -emacs-21.3-r1.ebuild,
+  emacs-21.3-r2.ebuild, emacs-21.3-r3.ebuild, +emacs-21.3-r4.ebuild:
+  Added partial SLOT support. Reversed Xaw3d and motif USE flag order,
+  see bug #18518
 
   01 Jun 2004; Aron Griffis <agriffis@gentoo.org> emacs-21.3-r2.ebuild,
   emacs-21.3-r3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 65981597e90e..ae74dabade55 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,21 +1,21 @@
-MD5 7cb26182a11adc6e7705e4dc7261253d emacs-21.3-r3.ebuild 2359
 MD5 815768d41e602e71dd2e51d9f336796f emacs-21.1-r4.ebuild 2139
-MD5 054c5694432a4d830487dee949558b0e emacs-21.3-r2.ebuild 2193
-MD5 654a5dfdd1da223468f3eaa1f913cc73 emacs-18.59.ebuild 2005
+MD5 e75c29fad05c8e148565b246b1160528 emacs-21.3-r2.ebuild 2192
 MD5 2a994cbeab581cade6f48cfd07ce4230 emacs-21.2-r2.ebuild 1828
-MD5 bbc0e000bb27dfb6bbf554e47d51ff4c emacs-21.3-r1.ebuild 2115
+MD5 a1939878f2ca579fd493e27854ee4a1b emacs-21.3-r4.ebuild 2761
 MD5 22cc5192665ea62c155b22ec0530816c ChangeLog 4454
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+MD5 654a5dfdd1da223468f3eaa1f913cc73 emacs-18.59.ebuild 2005
+MD5 7cb26182a11adc6e7705e4dc7261253d emacs-21.3-r3.ebuild 2359
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 2179ae07d8caf10bdb4e36126353f0b1 files/emacs-18.59-unexelf.patch 30720
-MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
 MD5 da1e3cd3b08e0f57770ac6bb3a900a37 files/digest-emacs-21.1-r4 64
 MD5 e8ce9306bc0d26ebc1d4cd6c6c7765d8 files/digest-emacs-21.2-r2 126
-MD5 c196c1f14bc7e319f1dadb065f39bbfb files/digest-emacs-21.3-r1 323
+MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r4 126
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r2 126
+MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
+MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 2dc071ea24db58587a5e72af42addbc4 files/digest-emacs-18.59 147
 MD5 4163870348c1c0d4dc485dff749fe5cb files/digest-emacs-21.3-r3 126
 MD5 e307f213cb2015347f1c01d7828e28eb files/emacs-18.59-gcc-gentoo.patch 4240
 MD5 d9a84fa25df38b43cdce07e9ca4f53c0 files/emacs-18.59-gentoo.patch 3901
-MD5 0c27886961e8f16d3889fbd36b4da14d files/emacs-21.1-gentoo.diff 532
-MD5 2dc071ea24db58587a5e72af42addbc4 files/digest-emacs-18.59 147
-MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+MD5 2179ae07d8caf10bdb4e36126353f0b1 files/emacs-18.59-unexelf.patch 30720
diff --git a/app-editors/emacs/emacs-21.3-r1.ebuild b/app-editors/emacs/emacs-21.3-r1.ebuild
deleted file mode 100644
index 37d5d6813039..000000000000
--- a/app-editors/emacs/emacs-21.3-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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-r1.ebuild,v 1.10 2004/06/24 21:53:36 agriffis Exp $
-
-IUSE="X nls motif leim gnome Xaw3d"
-
-inherit flag-o-matic
-
-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 )
-		gnome? ( gnome-base/gnome-desktop )
-	)
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/emacs virtual/editor"
-SANDBOX_DISABLED="1"
-
-DFILE=emacs.desktop
-
-src_compile() {
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use X && myconf="${myconf} \
-			--with-x \
-			--with-xpm \
-			--with-jpeg \
-			--with-tiff \
-			--with-gif \
-			--with-png" \
-		|| myconf="${myconf} --without-x"
-	use motif && myconf="${myconf} --with-x-toolkit=motif"
-	use Xaw3d && myconf="${myconf} --with-x-toolkit=athena"
-	./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
-	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/emacs-21.3-r2.ebuild b/app-editors/emacs/emacs-21.3-r2.ebuild
index c9540501ced9..e3ae04c0d53c 100644
--- a/app-editors/emacs/emacs-21.3-r2.ebuild
+++ b/app-editors/emacs/emacs-21.3-r2.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-r2.ebuild,v 1.15 2004/06/24 21:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r2.ebuild,v 1.16 2004/07/04 14:15:47 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha amd64 hppa ia64 s390"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 s390"
 IUSE="X nls motif leim gnome Xaw3d"
 
 RDEPEND="sys-libs/ncurses
@@ -55,10 +55,10 @@ src_compile() {
 			--with-tiff
 			--with-gif
 			--with-png"
-		if use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		elif use Xaw3d ; then
+		if use Xaw3d ; then
 			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif ; then
+			myconf="${myconf} --with-x-toolkit=motif"
 		else
 			# do not build emacs with any toolkit, bug 35300
 			myconf="${myconf} --with-x-toolkit=no"
diff --git a/app-editors/emacs/emacs-21.3-r3.ebuild b/app-editors/emacs/emacs-21.3-r3.ebuild
index 641299ca94f7..f6d19c3eb9b4 100644
--- a/app-editors/emacs/emacs-21.3-r3.ebuild
+++ b/app-editors/emacs/emacs-21.3-r3.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-r3.ebuild,v 1.6 2004/06/24 21:53:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.3-r3.ebuild,v 1.7 2004/07/04 14:15:47 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -62,10 +62,10 @@ src_compile() {
 			--with-tiff
 			--with-gif
 			--with-png"
-		if use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		elif use Xaw3d ; then
+		if use Xaw3d ; then
 			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif ; then
+			myconf="${myconf} --with-x-toolkit=motif"
 		else
 			# do not build emacs with any toolkit, bug 35300
 			myconf="${myconf} --with-x-toolkit=no"
diff --git a/app-editors/emacs/emacs-21.3-r4.ebuild b/app-editors/emacs/emacs-21.3-r4.ebuild
new file mode 100644
index 000000000000..cd856d83d665
--- /dev/null
+++ b/app-editors/emacs/emacs-21.3-r4.ebuild
@@ -0,0 +1,125 @@
+# 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.1 2004/07/04 14:15:47 usata Exp $
+
+inherit flag-o-matic eutils alternatives
+
+DESCRIPTION="An incredibly powerful, extensible text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+SRC_URI="mirror://gnu/emacs/${P}.tar.gz
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="${PV}"
+KEYWORDS="~x86 ~ppc ~sparc -alpha ~arm -hppa ~amd64 -ia64 ~s390"
+IUSE="X nls motif leim gnome Xaw3d lesstif"
+
+RDEPEND="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
+		!arm? (
+		Xaw3d? ( x11-libs/Xaw3d )
+		motif? (
+			lesstif? ( x11-libs/lesstif )
+			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+		gnome? ( gnome-base/gnome-desktop )
+		)
+	)
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+PROVIDE="virtual/emacs virtual/editor"
+SANDBOX_DISABLED="1"
+
+DFILE=emacs.desktop
+
+src_compile() {
+
+	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+	filter-flags -fstack-protector
+
+	epatch ${FILESDIR}/${P}-amd64.patch
+	epatch ${FILESDIR}/${P}-hppa.patch
+
+	export WANT_AUTOCONF=2.1
+	autoconf
+
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	if use X ; then
+		if use motif && use lesstif; then
+			export LIBS="-L/usr/X11R6/lib/lesstif/"
+		fi
+		myconf="${myconf}
+			--with-x
+			--with-xpm
+			--with-jpeg
+			--with-tiff
+			--with-gif
+			--with-png"
+		if use Xaw3d ; then
+			myconf="${myconf} --with-x-toolkit=athena"
+		elif use motif ; then
+			myconf="${myconf} --with-x-toolkit=motif"
+		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
+	for i in ${D}/usr/bin/* ; do
+		mv ${i} ${i}-${PV}
+	done
+	mv ${D}/usr/bin/emacs-${PV}{-${PV},}
+
+	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
+
+	for m in ${D}/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/-${PV}.1}
+	done
+
+	einfo "Fixing permissions..."
+	find ${D} -perm 664 |xargs chmod 644
+	find ${D} -type d |xargs chmod 755
+
+	keepdir /usr/share/emacs/${PV}/leim
+
+	dodoc BUGS ChangeLog README
+
+	if use gnome ; then
+		insinto /usr/share/gnome/apps/Application
+		doins ${FILESDIR}/${DFILE}
+	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() {
+	update-alternatives
+}
+
+pkg_postrm() {
+	update-alternatives
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r1 b/app-editors/emacs/files/digest-emacs-21.3-r1
deleted file mode 100644
index 7268dc8e7fdc..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.3-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 0e5a4a35651f5365c6191636a2c26eb7 /files/emacs.desktop 190
-MD5 0c27886961e8f16d3889fbd36b4da14d /files/emacs-21.1-gentoo.diff 532
-MD5 bb72cca0ddcc55e6c13b4987299499f8 /emacs-21.3-r1.ebuild 2105
-MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
-MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224
diff --git a/app-editors/emacs/files/digest-emacs-21.3-r4 b/app-editors/emacs/files/digest-emacs-21.3-r4
new file mode 100644
index 000000000000..7aafc8e2fda1
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.3-r4
@@ -0,0 +1,2 @@
+MD5 a0bab457cbf5b4f8eb99d1d0a3ada420 emacs-21.3.tar.gz 20399831
+MD5 1c968c37e22be0f0d8f8cd57cebe5a5e leim-21.3.tar.gz 3291224