Remove the GNOME USE flag; Install the .desktop file unconditionally; Resolves Bug #112449.

(Portage version: 2.1_pre5-r1)

4 files changed, 240 insertions, 1 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 1f6285eed3ab..95f97a8e2535 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.82 2006/03/05 22:11:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.83 2006/03/06 06:44:12 mkennedy Exp $
+
+*emacs-21.4-r3 (06 Mar 2006)
+
+  06 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org> +emacs-21.4-r3.ebuild:
+  Remove the GNOME USE flag; Install the .desktop file unconditionally;
+  Resolves Bug #112449.
 
   05 Mar 2006; Joseph Jezak <josejx@gentoo.org> emacs-21.4-r2.ebuild:
   Marked ppc stable for bug #76141.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ccf71e6e44cb..f2967664f0d8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,21 +1,69 @@
 MD5 66b310d891430079e986b17dcb03d2b2 ChangeLog 12138
+RMD160 7f85a6ab932ad50880f547278964efa469cc70ad ChangeLog 12138
+SHA256 e823d3bab5c7ce64dff149f6786a5ad07095ec0a07c34c0ef8a7458690fc363e ChangeLog 12138
 MD5 e256337ccf7d47ff464ed060f29383b2 emacs-18.59.ebuild 1952
+RMD160 6416a30158a3eecc8d458d3e4858cea2354f3c45 emacs-18.59.ebuild 1952
+SHA256 9f833b5b6ecefd5b402b7002b699fef4f35f361610a7f67578c91771c7cfb06b emacs-18.59.ebuild 1952
 MD5 5c875ab13297dfc0030f9cf2b9cb714b emacs-21.4-r1.ebuild 4684
+RMD160 bac6fef1d36f03e9941e1bde5660ece2afadb729 emacs-21.4-r1.ebuild 4684
+SHA256 3964d2511a262b9f908b0b4af7d5143e9ba3b627922d045be3ab89b975f9c4aa emacs-21.4-r1.ebuild 4684
 MD5 9fb84012af2dd7ac7cae86c2619ed8d0 emacs-21.4-r2.ebuild 4684
+RMD160 51c191441229cd0eec392290576bdcd4b0978217 emacs-21.4-r2.ebuild 4684
+SHA256 611f6ddb08720c94d8b095305a016f19dce92fcacd622a3e66f6ac9b6370bcf4 emacs-21.4-r2.ebuild 4684
+MD5 c360cf133090556b0985767df8906148 emacs-21.4-r3.ebuild 4617
+RMD160 ce1780775e51ebbca4d072994bb8eb4dbe077dc7 emacs-21.4-r3.ebuild 4617
+SHA256 b0e4f1788ad028fcfd5004138b68243aa3c30ada9a93332a9cfc7d270462e7fe emacs-21.4-r3.ebuild 4617
 MD5 7e17815f1e5c1a8a92e12ce8a4a20951 emacs-22.0.50_pre20050225.ebuild 5557
+RMD160 11e3ea0cc9bdad886ce7ecb4946925dfda0d83ed emacs-22.0.50_pre20050225.ebuild 5557
+SHA256 12629d258f388c211c18ed21bb65cb6479b3375913a921e85305fab8ae9bbd39 emacs-22.0.50_pre20050225.ebuild 5557
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
+RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
+SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153 files/60emacs-21.envd 34
 MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/60emacs-22.0.50.envd 39
+RMD160 6264f1faa5b99e98251be427fd8ef60b52ca1370 files/60emacs-22.0.50.envd 39
+SHA256 5501f5818b4b88a34e93440e5fc6e2a44d2a1c83080358849b811b1d17234f43 files/60emacs-22.0.50.envd 39
 MD5 cdf1056b9a063a480aa3cea60c81e7ca files/digest-emacs-18.59 786
+RMD160 2401442cd6d4c3de31a9f5c6aeaa10381cb19fda files/digest-emacs-18.59 786
+SHA256 766f5d73100b748fe6a53899007820d2ceb6c49ef219b0ee9c31623a5d517ce3 files/digest-emacs-18.59 786
 MD5 77362e2a2494f71a2869096cc89ca8f2 files/digest-emacs-21.4-r1 127
+RMD160 367d3baff638ed901d3635d41c4edfbfaa218219 files/digest-emacs-21.4-r1 127
+SHA256 c870001d3693d105f247fc9fe1a56c2acb2a9d2622dc3f4ad8c7bfec853ebca7 files/digest-emacs-21.4-r1 127
 MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r2 473
+RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r2 473
+SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r2 473
+MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r3 473
+RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r3 473
+SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r3 473
 MD5 f6a4a0f9d36297f686ca56fae7bcef68 files/digest-emacs-22.0.50_pre20050225 242
+RMD160 754f23b2d76b356d6d3295b747d415fec4344d70 files/digest-emacs-22.0.50_pre20050225 242
+SHA256 ccdbabf2c3afa3172733d1514930c57583e1a5ad8dd9b5a06f32b485da9de7ce files/digest-emacs-22.0.50_pre20050225 242
 MD5 2f1bf0e4f91897570110704adbaf48dc files/emacs-21.2-sh.patch 5782
+RMD160 4e9f7369d9655a2bdb9cc017ba62e60ef18976a7 files/emacs-21.2-sh.patch 5782
+SHA256 c06d2f9e435e8059608bea7314ffee7cbbd0b066bb9b1c96598988f2f96fd9e5 files/emacs-21.2-sh.patch 5782
 MD5 bb29381a50b72e88d869fb09a2c0a34e files/emacs-21.3-amd64.patch 7938
+RMD160 46def3808034e262f611934413f1db0b8b7c1ae5 files/emacs-21.3-amd64.patch 7938
+SHA256 538ca1af43ecd94a58a2cca69dc232c26f130c27aee4c7a70a191bd352d36606 files/emacs-21.3-amd64.patch 7938
 MD5 3763ec7eaed9e5bb4da2f3f7c3795594 files/emacs-21.3-hppa.patch 2493
+RMD160 8079f22901f6bc7d69ddb03241e519184d8fac56 files/emacs-21.3-hppa.patch 2493
+SHA256 519a341e6dbe96f7d4b5ff50ee5f3b3a28879d4e1f24b8f270d4397ec1c302b2 files/emacs-21.3-hppa.patch 2493
 MD5 2aaf4fc4c9513f13c4edb24327247f83 files/emacs-21.3-ppc64.patch 1622
+RMD160 3d2139ff24c475d229184bbe27316c17e4c7ad59 files/emacs-21.3-ppc64.patch 1622
+SHA256 4d4aadd8704d4e61d357ba4523ec71bab566342ba414190c91190fc608fc75bf files/emacs-21.3-ppc64.patch 1622
 MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
+RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 files/emacs-21.3-xorg.patch 394
+SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622 files/emacs-21.3-xorg.patch 394
 MD5 ab4757cbbda4ac6f848021b947d1f2b2 files/emacs-21.desktop 238
+RMD160 57336e2584a671f642fa1cd5c458b33dbb1e44cc files/emacs-21.desktop 238
+SHA256 3d40581e18f1f633d0f1c822b00a8d2fb2de8ea95660fe0815ac837616f6db58 files/emacs-21.desktop 238
 MD5 3a0ce8880fff1be2f5e8281633532546 files/emacs-22.0.50.desktop 242
+RMD160 dce325fa6cb9f5f97d1cfc644b0db7cc8172cabc files/emacs-22.0.50.desktop 242
+SHA256 13b1ed362039617b45a15feb3eda9ff6aef49c21be71ed3423e47e81f7497ce9 files/emacs-22.0.50.desktop 242
 MD5 277b238c9263aabcc2ef92de1d6d68bb files/emacs-nofink-gentoo.diff 1520
+RMD160 31c8fc31a4715d26e1566d87f09b947d1664b136 files/emacs-nofink-gentoo.diff 1520
+SHA256 09f387ecc0a53f02acbe445b3e9c82cd815700c7313329e0bc5d8baa39a925a7 files/emacs-nofink-gentoo.diff 1520
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
+RMD160 142e80ab7dc4620275ec9623f646e0b2c4a1c6bf files/emacs-subdirs-el-gentoo.diff 1369
+SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
+RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
+SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
diff --git a/app-editors/emacs/emacs-21.4-r3.ebuild b/app-editors/emacs/emacs-21.4-r3.ebuild
new file mode 100644
index 000000000000..2f1384a6ff3a
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r3.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r3.ebuild,v 1.1 2006/03/06 06:44:12 mkennedy Exp $
+
+inherit flag-o-matic eutils alternatives toolchain-funcs
+
+DESCRIPTION="An incredibly powerful, extensible text editor"
+HOMEPAGE="http://www.gnu.org/software/emacs"
+SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
+	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="21"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="X Xaw3d leim lesstif motif nls nosendmail"
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/gdbm
+	X? ( || ( ( x11-libs/libXext
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libXmu
+				x11-libs/libXpm
+				|| ( media-fonts/font-adobe-100dpi
+					media-fonts/font-adobe-75dpi )
+			)
+			virtual/x11
+		)
+		>=media-libs/giflib-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 )
+		!Xaw3d? ( || ( x11-libs/libXaw virtual/x11 ) )
+		motif? (
+			lesstif? ( x11-libs/lesstif )
+			!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
+		)
+	)
+	nls? ( sys-devel/gettext )
+	!nosendmail? ( virtual/mta )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	X? ( || ( x11-misc/xbitmaps virtual/x11 ) )"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/emacs-21.3-xorg.patch
+	epatch ${FILESDIR}/emacs-21.3-amd64.patch
+	epatch ${FILESDIR}/emacs-21.3-hppa.patch
+	epatch ${FILESDIR}/emacs-21.2-sh.patch
+	use ppc64 && epatch ${FILESDIR}/emacs-21.3-ppc64.patch
+
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+
+	# This will need to be updated for X-Compilation
+	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
+		   ${S}/src/s/gnu-linux.h
+
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die
+}
+
+src_compile() {
+	export SANDBOX_ON=0
+
+	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
+	filter-flags -fstack-protector
+
+	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
+	unset LDFLAGS
+
+	# gcc 3.4 with -O3 or stronger flag spoils emacs
+	if [ "$(gcc-major-version)" -ge 3 -a "$(gcc-minor-version)" -ge 4 ] ; then
+		replace-flags -O[3-9] -O2
+	fi
+
+	# -march is known to cause signal 6 on some environment
+	filter-flags "-march=*"
+
+	export WANT_AUTOCONF=2.1
+	autoconf
+
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+	if use X ; then
+		if use motif && use lesstif; then
+			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
+			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/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 CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	einstall || die
+	for i in ${D}/usr/bin/* ; do
+		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
+	done
+	mv ${D}/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
+	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT}
+
+	einfo "Fixing info documentation..."
+	mkdir ${T}/emacs-${SLOT}
+	mv ${D}/usr/share/info/dir ${T}
+	for i in ${D}/usr/share/info/*
+	do
+		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/.emacs-${SLOT}.1} || die "mv ${m} failed"
+	done
+
+	einfo "Fixing permissions..."
+	find ${D} -perm 664 |xargs chmod 644
+	find ${D} -type d |xargs chmod 755
+
+	keepdir /usr/share/emacs/${PV}/leim
+	keepdir /usr/share/emacs/site-lisp
+
+	dodoc BUGS ChangeLog README
+
+	insinto /usr/share/applications
+	doins ${FILESDIR}/${DFILE}
+}
+
+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}.emacs-*"
+	done
+}
+
+pkg_postinst() {
+	update-alternatives
+	if use nosendmail ; then
+	ewarn
+	ewarn "You disabled sendmail support for Emacs. If you will install any MTA"
+	ewarn "you need to recompile Emacs after that. See bug #11104."
+	ewarn
+	fi
+}
+
+pkg_postrm() {
+	update-alternatives
+}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r3 b/app-editors/emacs/files/digest-emacs-21.4-r3
new file mode 100644
index 000000000000..6898ecff2a12
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r3
@@ -0,0 +1,6 @@
+MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
+RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
+SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
+MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
+RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
+SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433