Don't use --with-x-toolkit=athena in the Xaw3d case; Disable the sandbox for src_compile() only.

Package-Manager: portage-2.1_pre6-r3

4 files changed, 221 insertions, 7 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index de04fed5560e..a159ae0450ed 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.41 2006/03/06 00:15:00 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.42 2006/03/17 04:51:56 mkennedy Exp $
+
+*emacs-cvs-22.0.50-r2 (17 Mar 2006)
+
+  17 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +emacs-cvs-22.0.50-r2.ebuild:
+  Don't use --with-x-toolkit=athena in the Xaw3d case; Disable the sandbox for
+  src_compile() only.
 
   06 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
   files/emacs-subdirs-el-gentoo.diff:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index f9623deab892..e8212568919c 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,12 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 99844f0598516e29994aa69ca903498a ChangeLog 7115
-RMD160 0b88ba00e51c3e312fa69011c5ab240cd877916e ChangeLog 7115
-SHA256 d23098680e13053aab36b776383802535bd9c170e7ae47fb3337db27d0c903df ChangeLog 7115
+MD5 0a14792cd6e527fdf98f919bd16fc662 ChangeLog 7339
+RMD160 ab7f86887738d07f59899ffd9bf721e2055a6cfd ChangeLog 7339
+SHA256 21e1874d41f6997f7c58f2d3c75dd2ffe5336c439adbaaea590138ca0facba36 ChangeLog 7339
 MD5 f0756af862b825d76bba1038935926b5 emacs-cvs-22.0.50-r1.ebuild 5902
 RMD160 774ce7098425636c190ec6392e39fbd698cd25eb emacs-cvs-22.0.50-r1.ebuild 5902
 SHA256 ee3135380e18793731460bf1e7fdfd49b51b9566dc556562592af410ae7ac0d8 emacs-cvs-22.0.50-r1.ebuild 5902
+MD5 d0ea70e14a4751090b4ac18e1755fa40 emacs-cvs-22.0.50-r2.ebuild 5736
+RMD160 f72eca1b86cfebfec5d7dcc30bab201fb658297c emacs-cvs-22.0.50-r2.ebuild 5736
+SHA256 8139337544a0fc0c49014585c102476957b52dc90420a9f1fac053728e72ea9e emacs-cvs-22.0.50-r2.ebuild 5736
 MD5 956f1cefd7bbaa02c1e7de3835b86c34 emacs-cvs-23.0.0.ebuild 4935
 RMD160 b58ad4ab62bb252166797ea07cbc24e13a62fb7f emacs-cvs-23.0.0.ebuild 4935
 SHA256 6db2537e894870f3b3c4a30c973d9088f4981281ded86b9b82c257080287c6d7 emacs-cvs-23.0.0.ebuild 4935
@@ -19,6 +22,9 @@ SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a files/50
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r1 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r1 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.50-r2 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.0.50-r2 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.0.50-r2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0 0
@@ -49,7 +55,7 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFEC39CyiNZaEAZA+ARAnNHAJ4kcXi84Heq+NQfQezKikAKmd19ywCfQEiI
-ILGWAUW/OHldj8+ohN9gEQg=
-=tWDr
+iD8DBQFEGkB5yiNZaEAZA+ARAry+AJ4z/sOqNTmB0ozMpPFYYXoiAYoSJgCbBLUy
+YcqxtGO+f9GeGAqucMVpXSc=
+=3325
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild
new file mode 100644
index 000000000000..41b1a317954e
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50-r2.ebuild,v 1.1 2006/03/17 04:51:56 mkennedy Exp $
+
+ECVS_AUTH="pserver"
+ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
+ECVS_MODULE="emacs"
+ECVS_BRANCH="HEAD"
+
+inherit elisp-common cvs alternatives flag-o-matic eutils
+
+IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff"
+# IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff xft source"
+
+S=${WORKDIR}/emacs
+
+DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
+SRC_URI=""
+HOMEPAGE="http://www.gnu.org/software/emacs"
+
+RESTRICT="$RESTRICT nostrip"
+
+X_DEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-misc/xbitmaps || ( media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi )"
+
+DEPEND=">=sys-libs/ncurses-5.3
+	spell? ( || ( app-text/ispell app-text/aspell ) )
+	X? ( || ( ( $X_DEPEND ) virtual/x11 ) )
+	X? ( gif? ( >=media-libs/giflib-4.1.0.1b )
+		jpeg? ( >=media-libs/jpeg-6b )
+		tiff? ( >=media-libs/tiff-3.5.7 )
+		png? ( >=media-libs/libpng-1.2.5 )
+		gtk? ( =x11-libs/gtk+-2* )
+		!gtk? ( Xaw3d? ( x11-libs/Xaw3d ) ) )
+	nls? ( >=sys-devel/gettext-0.11.5 )
+	sys-libs/zlib
+	>=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.50"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
+
+DFILE=emacs-${SLOT}.desktop
+
+# pkg_setup() {
+#	if use xft; then
+#		while read line; do ewarn "${line}"; done <<EOF
+
+# You have chosen to build Emacs using the XFT_JHD_BRANCH.	The
+# XFT_JHD_BRANCH is very early work towards supporting XFT in Emacs.
+# Emerging app-editors/emacs-cvs was risky enough, trying out the
+# XFT_JHD_BRANCH branch for XFT support even more so!
+
+# EOF
+#		ebeep
+#	fi
+# }
+
+src_unpack() {
+#	if use xft; then
+#		ECVS_BRANCH=XFT_JHD_BRANCH
+#	else
+#		ECVS_BRANCH=HEAD
+#	fi
+	cvs_src_unpack
+	cd ${S};
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+#	if use xft; then
+#		epatch ${FILESDIR}/xft-invertcursor.patch
+#		epatch ${FILESDIR}/xft-bgalpha.patch
+#		epatch ${FILESDIR}/xft-xfaces-fixcrash.patch
+#	fi
+}
+
+src_compile() {
+	export SANDBOX_ON=0
+
+	# no flag is allowed
+	ALLOWED_FLAGS=" "
+	strip-flags
+	unset LDFLAGS
+
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	if use X; then
+		myconf="${myconf} --with-x"
+		myconf="${myconf} --with-xpm --with-toolkit-scroll-bars"
+		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
+		myconf="${myconf} $(use_with gif) $(use_with png)"
+		if use gtk; then
+			einfo "Configuring to build with GTK support"
+			myconf="${myconf} --with-x-toolkit=gtk"
+		else
+			einfo "Configuring to build with lucid toolkit support"
+			myconf="${myconf} $(use_with Xaw3d toolkit-scroll-bars)"
+			myconf="${myconf} --without-gtk"
+			myconf="${myconf} --with-x-toolkit=lucid"
+		fi
+#		if use xft; then
+#			# this is only relevant when the source is patched for XFT
+#			# support, so it must remain within this if/then block
+#			myconf="${myconf} $(use_with xft)"
+#		fi
+	else
+		myconf="${myconf} --without-x"
+	fi
+
+	if use aqua ; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf --enable-debug \
+			--enable-carbon-app=/Applications/Gentoo \
+			--without-x \
+			$(use_with jpeg) $(use_with tiff) \
+			$(use_with gif) $(use_with png) \
+			 || die "econf carbon emacs failed"
+		make bootstrap || die "make carbon emacs bootstrap failed"
+	fi
+
+	econf --enable-debug \
+		--program-suffix=.emacs-${SLOT} \
+		--without-carbon \
+		${myconf} || die "econf emacs failed"
+
+	make bootstrap || die "make emacs bootstrap failed"
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	rm ${D}/usr/bin/emacs-${SLOT}.emacs-${SLOT} || die "removing duplicate emacs executable failed"
+	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT} || die
+
+	if use aqua ; then
+		einfo "Installing Carbon Emacs..."
+		dodir /Applications/Gentoo/Emacs.app
+		pushd mac/Emacs.app
+		tar -chf - . | ( cd ${D}/Applications/Gentoo/Emacs.app; tar -xf -)
+		popd
+	fi
+
+	# fix info documentation
+	einfo "Fixing info documentation..."
+	dodir /usr/share/info/emacs-${SLOT}
+	mv ${D}/usr/share/info/{,emacs-${SLOT}/}dir || die "mv dir failed"
+	for i in ${D}/usr/share/info/*
+	do
+		if [ "${i##*/}" != emacs-${SLOT} ] ; then
+			mv ${i} ${i/info/info/emacs-${SLOT}}.info
+			gzip -9 ${i/info/info/emacs-${SLOT}}.info
+		fi
+	done
+
+	if has_version 'app-text/aspell' ; then
+		# defaults to aspell if installed
+		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
+	fi
+	insinto /etc/env.d
+	cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
+	einfo "Fixing manpages..."
+	for m in  ${D}/usr/share/man/man1/* ; do
+		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
+	done
+
+#	if use source; then
+#		insinto /usr/share/emacs/${SLOT}/src
+#		# This is not mean to install all the source -- just the
+#		# source you might find via find-function
+#		doins src/*.[ch]
+# #		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+# # (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src")
+# # EOF
+# #		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el || die # need to move outside of NNfoo-gentoo.el for different versions (site-lisp is shared)
+#	fi
+
+	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() {
+	use ppc-macos || update-alternatives
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r2