Move SANDBOX_DISABLED=1 from global scope to SANDBOX_ON=0 in src_compile(); Partially resolves Bug #76141.

(Portage version: 2.1_pre5)

6 files changed, 215 insertions, 26 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index b78cc91b4c51..485f619e4555 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.77 2006/02/09 22:26:23 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.78 2006/02/27 19:37:06 mkennedy Exp $
+
+*emacs-21.4-r2 (27 Feb 2006)
+
+  27 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> emacs-18.59.ebuild,
+  +emacs-21.4-r2.ebuild, emacs-22.0.50_pre20050225.ebuild:
+  Move SANDBOX_DISABLED=1 from global scope to SANDBOX_ON=0 in src_compile();
+  Partially resolves Bug #76141.
 
   09 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org> emacs-18.59.ebuild:
   Modular X dependencies; Resolves Bug #122215.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 9bf3001ce055..56f060937d09 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,18 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 5bcc0d5ae70207129e48f8be284a8d0e ChangeLog 11465
 RMD160 847a0201ca2cfbce33918c52901ed30b6db35824 ChangeLog 11465
 SHA256 e1b3a29ef0dd7a5d7af5200f5a64ffe1a5e2655caadeab21e81e9b7e142d0355 ChangeLog 11465
-MD5 8ff4d7bb439b39ee805f8099f80e08bb emacs-18.59.ebuild 2028
-RMD160 9bb9665392948b676642ee8612e69a9baff9338d emacs-18.59.ebuild 2028
-SHA256 bb7cd7aa3f94d031e041eca3b026dc623d06be0eb2717369ee018a00c7f459f4 emacs-18.59.ebuild 2028
+MD5 2b24c82dd357f5f8904235d3aaa064e5 emacs-18.59.ebuild 1952
+RMD160 3e04231f6d264e1cb17fc49fc6115223b171ba91 emacs-18.59.ebuild 1952
+SHA256 b8765a21636510e1e5cdd380dbf648e0de6e591e9071a6c9e5fa2b6377a730ef 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 aeb2713714510873065999d5c79747da emacs-22.0.50_pre20050225.ebuild 5632
-RMD160 ec9c209707fb7a3fbc8ab14c70606bd5f32910fd emacs-22.0.50_pre20050225.ebuild 5632
-SHA256 9ab5ed6cf77f091524f69f288d075bb1eddb221c8d74f8b1dd26869b6d8e3221 emacs-22.0.50_pre20050225.ebuild 5632
+MD5 8bb03df11d386825ea4cd96971acbb72 emacs-21.4-r2.ebuild 4692
+RMD160 2207c4cfc4aa6b60b1618259bb9550529574165e emacs-21.4-r2.ebuild 4692
+SHA256 03ae8c68dd6299c822a8b71c7350e0ff72a4c8035990eebe66095bbda895db56 emacs-21.4-r2.ebuild 4692
+MD5 cb3a4b5ac0508ee0630695470f4961d7 emacs-22.0.50_pre20050225.ebuild 5558
+RMD160 0780dee707e9f874d7f14f80dc37115cec299710 emacs-22.0.50_pre20050225.ebuild 5558
+SHA256 92e7a17563d7c00723c47f7f98757de783f42b747013c289b5fb4273096a537f emacs-22.0.50_pre20050225.ebuild 5558
 MD5 2f000567bd6037e79de677b0edd814ab files/60emacs-21.envd 34
 RMD160 d1fdf805716cdf9bcd7744b3eb6f822c4a0d45af files/60emacs-21.envd 34
 SHA256 880372bcfead2fe980498ac54949933e46f7628c53c978affc93dcd1945a3153 files/60emacs-21.envd 34
@@ -25,6 +25,9 @@ SHA256 766f5d73100b748fe6a53899007820d2ceb6c49ef219b0ee9c31623a5d517ce3 files/di
 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 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
@@ -58,10 +61,3 @@ SHA256 c407b31c785b275f12337e41e58ff8386219b1c94a1c98b69eee82a10eb54074 files/em
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD68GbyiNZaEAZA+ARAtFLAJsEwgJvNi/WZ43Bw6TA0uTMJ4SycACfUolJ
-wdH4docfUlZOOlTGsKHYJGM=
-=ddn4
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59.ebuild b/app-editors/emacs/emacs-18.59.ebuild
index 3326886cf741..22d3e79bc7ed 100644
--- a/app-editors/emacs/emacs-18.59.ebuild
+++ b/app-editors/emacs/emacs-18.59.ebuild
@@ -1,6 +1,6 @@
 # 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-18.59.ebuild,v 1.6 2006/02/09 22:26:23 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59.ebuild,v 1.7 2006/02/27 19:37:06 mkennedy Exp $
 
 inherit eutils
 
@@ -22,9 +22,6 @@ PROVIDE="virtual/editor"
 MY_BASEDIR="/usr/share/emacs/${PV}"
 MY_LOCKDIR="/var/lib/emacs/lock"
 
-# Do not use the sandbox, or the dumped Emacs will be twice as large
-SANDBOX_DISABLED="1"
-
 src_unpack() {
 	unpack ${A}
 	epatch ${P}-linux22x-elf-glibc2.diff
@@ -34,6 +31,8 @@ src_unpack() {
 }
 
 src_compile() {
+	SANDBOX_ON=0
+
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
 	case ${ARCH} in
diff --git a/app-editors/emacs/emacs-21.4-r2.ebuild b/app-editors/emacs/emacs-21.4-r2.ebuild
new file mode 100644
index 000000000000..ee678438640b
--- /dev/null
+++ b/app-editors/emacs/emacs-21.4-r2.ebuild
@@ -0,0 +1,182 @@
+# 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-r2.ebuild,v 1.1 2006/02/27 19:37:06 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 gnome 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 ) )
+		gnome? ( gnome-base/gnome-desktop )
+		)
+	)
+	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
+
+	if use gnome ; then
+		insinto /usr/share/applications
+		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}.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/emacs-22.0.50_pre20050225.ebuild b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
index b2d253cac3ff..1bf36920960c 100644
--- a/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
+++ b/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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-22.0.50_pre20050225.ebuild,v 1.5 2005/12/12 03:52:00 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.0.50_pre20050225.ebuild,v 1.6 2006/02/27 19:37:06 mkennedy Exp $
 
 inherit elisp-common alternatives flag-o-matic eutils
 
@@ -17,8 +17,6 @@ SRC_URI="mirror://gentoo/${P/_pre/-}.tar.gz
 	cjk? ( mirror://sourceforge.jp/macemacsjp/12817/${INLINE}.tar.gz )
 	multi-tty? ( http://lorentey.hu/downloads/emacs/multi-tty/${MULTI_TTY}.patch.gz )"
 
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
 RESTRICT="$RESTRICT nostrip"
 
 DEPEND=">=sys-apps/portage-2.0.51
@@ -78,12 +76,13 @@ src_unpack() {
 
 	# 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
+		   ${S}/src/s/gnu-linux.h
 
 	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile.in || die
 }
 
 src_compile() {
+	SANDBOX_ON=0
 
 	strip-flags
 
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r2 b/app-editors/emacs/files/digest-emacs-21.4-r2
new file mode 100644
index 000000000000..6898ecff2a12
--- /dev/null
+++ b/app-editors/emacs/files/digest-emacs-21.4-r2
@@ -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