Remove the (commented out) XFT support in favour of the emacs-unicode-2 branch support in the emacs-cvs-23.0.0 ebuild; Support the source USE flag which would install the Emacs C source.

(Portage version: 2.1.1_pre4-r3)

3 files changed, 174 insertions, 1 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index bdecefac6999..62f52d9fa420 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.47 2006/06/26 22:21:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.48 2006/08/07 05:24:48 mkennedy Exp $
+
+*emacs-cvs-22.0.50-r3 (07 Aug 2006)
+
+  07 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  +emacs-cvs-22.0.50-r3.ebuild:
+  Remove the (commented out) XFT support in favour of the emacs-unicode-2
+  branch support in the emacs-cvs-23.0.0 ebuild; Support the source USE flag
+  which would install the Emacs C source.
 
   26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   emacs-cvs-22.0.50-r2.ebuild:
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
new file mode 100644
index 000000000000..28fa544cefb3
--- /dev/null
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r3.ebuild
@@ -0,0 +1,164 @@
+# 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-r3.ebuild,v 1.1 2006/08/07 05:24:48 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 png spell tiff 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 ) ) )
+	sys-libs/zlib
+	>=sys-apps/portage-2.0.51_rc1"
+
+PROVIDE="virtual/emacs virtual/editor"
+
+SLOT="22.0.50"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86 ~x86-fbsd"
+
+DFILE=emacs-${SLOT}.desktop
+
+src_unpack() {
+	cvs_src_unpack
+	cd ${S};
+	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
+	use ppc-macos && epatch ${FILESDIR}/emacs-cvs-21.3.50-nofink.diff
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	ALLOWED_FLAGS=" "
+	strip-flags
+	unset LDFLAGS
+	replace-flags -O[3-9] -O2
+	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
+
+	local myconf
+
+	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
+	else
+		myconf="${myconf} --without-x"
+	fi
+	if use aqua ; then
+		einfo "Configuring to build with Carbon Emacs"
+		econf \
+			--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 \
+		--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 meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.[ch]
+		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+(when (substring emacs-version 0 (length "${SLOT}"))
+  (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src"))
+EOF
+		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el
+	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
+	elisp-site-regen
+}
+
+pkg_postrm() {
+	use ppc-macos || update-alternatives
+	elisp-site-regen
+}
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3 b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/app-editors/emacs-cvs/files/digest-emacs-cvs-22.0.50-r3
@@ -0,0 +1 @@
+