Remove unnecessary gif/ungif patch. Add support for gpm USE flag. Clean up.

Package-Manager: portage-2.1.2.9

9 files changed, 30 insertions, 293 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 00d2a8283d12..2f147dbc95ec 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.134 2007/06/12 22:06:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.135 2007/06/13 15:39:54 ulm Exp $
+
+  13 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -files/emacs.desktop.in,
+  -files/emacs-cvs-nofink.patch, -files/emacs-subdirs-el-gentoo.diff,
+  emacs-cvs-22.1.50.ebuild, -emacs-cvs-23.0.0-r1.ebuild,
+  emacs-cvs-23.0.0-r6.ebuild:
+  Remove unnecessary gif/ungif patch. Add support for gpm USE flag. Clean up.
 
   12 Jun 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-cvs-22.0.97.ebuild:
   Remove old version.
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index c167c1d017c6..4de46d74cefb 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -17,39 +17,23 @@ AUX emacs-cvs-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c
 MD5 33cdd958f1be433095a69bff6be18148 files/emacs-cvs-freebsd-sparc.patch 475
 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 files/emacs-cvs-freebsd-sparc.patch 475
 SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b files/emacs-cvs-freebsd-sparc.patch 475
-AUX emacs-cvs-nofink.patch 646 RMD160 5c175694de32f8582514da8de55e0aabfa36ca19 SHA1 0dac10946b8af2039579c3ad7fc6888cc035a83f SHA256 6ecd24ba7d5da8f738aed6ec6485ba08c0b96873700d997e9cf0a7e97cd5267b
-MD5 034b2b023b54541a11fcd2f8898b06ab files/emacs-cvs-nofink.patch 646
-RMD160 5c175694de32f8582514da8de55e0aabfa36ca19 files/emacs-cvs-nofink.patch 646
-SHA256 6ecd24ba7d5da8f738aed6ec6485ba08c0b96873700d997e9cf0a7e97cd5267b files/emacs-cvs-nofink.patch 646
-AUX emacs-subdirs-el-gentoo.diff 1580 RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e SHA1 44c56f1ed16896225f85e62804b8c91bb90392ae SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e
-MD5 bd7222d2c80bddb9077f389897887cdf files/emacs-subdirs-el-gentoo.diff 1580
-RMD160 fea0e4ade096977b4f77b7b0234c8097dda3650e files/emacs-subdirs-el-gentoo.diff 1580
-SHA256 d01a8119a565689a37499e6d5aedcbf7e9329e1612840d281ae5a0c183059d6e files/emacs-subdirs-el-gentoo.diff 1580
-AUX emacs.desktop.in 236 RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 SHA1 0e2fbc0f160655b187be079755317044a6868678 SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342
-MD5 97a1860f95596f13a074a96456ffeac4 files/emacs.desktop.in 236
-RMD160 47bddcb74a8bc45fba3f5f5c5656f1e40469d3c8 files/emacs.desktop.in 236
-SHA256 8bbfa1b6bb241fd3653b5b1c25ef1ecd298c63d7e0fdc87baab8b274eb627342 files/emacs.desktop.in 236
 DIST emacs-22.0.990.tar.gz 38184881 RMD160 5c86b66a429c7291a5e6d89a94c6804b36037068 SHA1 d6ccf5ae41e3d3382fd43c0524ea660a497f9053 SHA256 5621de0c29a55a6f2b57e9c2da101b4e2c69a6b30c3c7238c62b08fd7081c67c
 EBUILD emacs-cvs-22.0.990.ebuild 7426 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 SHA1 da90a70b6efed5d35b8ed09e46b4d611bb0b55d4 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e
 MD5 923a512c786c0f667600a277ddf7070e emacs-cvs-22.0.990.ebuild 7426
 RMD160 d2481b5cab9ca400c4d749f6468ab4038fd5d186 emacs-cvs-22.0.990.ebuild 7426
 SHA256 ff7bce0d62ef6e8e73de1eae048c4b9f505553b0054fe755b5736e367752df1e emacs-cvs-22.0.990.ebuild 7426
-EBUILD emacs-cvs-22.1.50.ebuild 7767 RMD160 92c4486a5d315396ada258afbc24e33c8a6ea857 SHA1 88e6b172f4558fec5c8b9fd788f7ede1c25a20a5 SHA256 8100cbe37b87efbce412988db397739d6a3a59607dce33ad8ed1b4728d11f839
-MD5 9cd7903c6e5102e7495425af842f2ea9 emacs-cvs-22.1.50.ebuild 7767
-RMD160 92c4486a5d315396ada258afbc24e33c8a6ea857 emacs-cvs-22.1.50.ebuild 7767
-SHA256 8100cbe37b87efbce412988db397739d6a3a59607dce33ad8ed1b4728d11f839 emacs-cvs-22.1.50.ebuild 7767
-EBUILD emacs-cvs-23.0.0-r1.ebuild 5865 RMD160 6f5916fb4654aa6dd482c07461da99d31d7b9983 SHA1 f161716912accd7e75d928a55a92a831ae065f77 SHA256 018e3b6744b2f73aef422d883000491d6dbb787a74476d77b549b7f777783dbf
-MD5 26c953c88391c8489e6f15cae3d7f422 emacs-cvs-23.0.0-r1.ebuild 5865
-RMD160 6f5916fb4654aa6dd482c07461da99d31d7b9983 emacs-cvs-23.0.0-r1.ebuild 5865
-SHA256 018e3b6744b2f73aef422d883000491d6dbb787a74476d77b549b7f777783dbf emacs-cvs-23.0.0-r1.ebuild 5865
-EBUILD emacs-cvs-23.0.0-r6.ebuild 7865 RMD160 c30119b2624b7be4260cc04d5b3d557ef420a1cf SHA1 ab3250301d264611e1e50c0b82f3e06d407fb664 SHA256 e50edf390dc6bc54d1676586729bf81628eeb09388251e0f5367db3048d25dce
-MD5 fea95fc60d0ddbd7ea8088a7c85ea68e emacs-cvs-23.0.0-r6.ebuild 7865
-RMD160 c30119b2624b7be4260cc04d5b3d557ef420a1cf emacs-cvs-23.0.0-r6.ebuild 7865
-SHA256 e50edf390dc6bc54d1676586729bf81628eeb09388251e0f5367db3048d25dce emacs-cvs-23.0.0-r6.ebuild 7865
-MISC ChangeLog 25769 RMD160 ce34048f6088b3cf99c80ca90ed134b14f886d7f SHA1 30c4e15359e0b6ba0f76c5165db848dec47da892 SHA256 adfd43179b5255abd53e0fd4cc78e17d49b20294e609aeaeeb67434a0748f5f5
-MD5 5c7ed487bc17470a46a29edcbc74a57b ChangeLog 25769
-RMD160 ce34048f6088b3cf99c80ca90ed134b14f886d7f ChangeLog 25769
-SHA256 adfd43179b5255abd53e0fd4cc78e17d49b20294e609aeaeeb67434a0748f5f5 ChangeLog 25769
+EBUILD emacs-cvs-22.1.50.ebuild 7761 RMD160 242d0f9ea512626d5038ce8694068675ccb29a3d SHA1 15ba0f6b5ccd109b0d8b5849a097c6d861287fc5 SHA256 a8708be3a8da4b2ea85e2a881e249c1db3b3d668a8652e17f72c6c73b012e88a
+MD5 51d409c062ad7507667415516bcea871 emacs-cvs-22.1.50.ebuild 7761
+RMD160 242d0f9ea512626d5038ce8694068675ccb29a3d emacs-cvs-22.1.50.ebuild 7761
+SHA256 a8708be3a8da4b2ea85e2a881e249c1db3b3d668a8652e17f72c6c73b012e88a emacs-cvs-22.1.50.ebuild 7761
+EBUILD emacs-cvs-23.0.0-r6.ebuild 7928 RMD160 6a8b3aad65453b309757170b1530c94f0e3043e2 SHA1 5caa28836bd20a53fab53c84b06be45d79f9945c SHA256 626925aa5e9841db9c5fbc31aed269f31992ef620a2914a64778981cc8329e30
+MD5 bcbc4358e5d55e6934b4b854a8fb1477 emacs-cvs-23.0.0-r6.ebuild 7928
+RMD160 6a8b3aad65453b309757170b1530c94f0e3043e2 emacs-cvs-23.0.0-r6.ebuild 7928
+SHA256 626925aa5e9841db9c5fbc31aed269f31992ef620a2914a64778981cc8329e30 emacs-cvs-23.0.0-r6.ebuild 7928
+MISC ChangeLog 26077 RMD160 74aabb80acab72aecec810c6695f49b408450a26 SHA1 0fb4189519547ad169785c36636419b105aafb22 SHA256 f618cae0f66cd3a9dce372a9ddfe06a34d60503fce7b0d0978a0c20909323f2e
+MD5 5a5480b4efbe106e74d0f18dc0db8365 ChangeLog 26077
+RMD160 74aabb80acab72aecec810c6695f49b408450a26 ChangeLog 26077
+SHA256 f618cae0f66cd3a9dce372a9ddfe06a34d60503fce7b0d0978a0c20909323f2e ChangeLog 26077
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -60,16 +44,13 @@ SHA256 00f87abb7a35a8ee4f7f6624fb1ac8e567fe7977dcd7405d603e754122ddb5c4 files/di
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.1.50 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-22.1.50 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-22.1.50 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-23.0.0-r6 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-emacs-cvs-23.0.0-r6 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-emacs-cvs-23.0.0-r6 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGbxj5Oeoy/oIi7uwRAge7AJ9Far8pvBktsSTFM8tYDZJZ5BEscwCg2fub
-FVn4iA+hoglM4faDKCuaoYM=
-=yVYe
+iD8DBQFGcA/ROeoy/oIi7uwRAh+OAJ9aFYPptgirktoC3qOsAdOBITJp1gCfRamX
++fFGgFZ9DdeGvXnXepbnGYo=
+=xEog
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
index 56908b163e65..6cc19b365b04 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.50.ebuild,v 1.16 2007/06/12 21:46:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50.ebuild,v 1.17 2007/06/13 15:39:54 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -20,7 +20,7 @@ SRC_URI=""
 LICENSE="GPL-2 FDL-1.2"
 SLOT="22"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
+IUSE="alsa gif gpm gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -31,6 +31,7 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
+	gpm? ( sys-libs/gpm )
 	X? (
 		$X_DEPEND
 		x11-misc/emacs-desktop
@@ -103,7 +104,6 @@ src_compile() {
 	strip-flags
 	unset LDFLAGS
 	replace-flags -O[3-9] -O2
-	sed -i -e "s/-lungif/-lgif/g" configure* src/Makefile* || die
 
 	local myconf
 
@@ -151,6 +151,7 @@ src_compile() {
 	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
 	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
+	myconf="${myconf} $(use_with gpm)"
 
 	econf \
 		--program-suffix=-${EMACS_SUFFIX} \
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
deleted file mode 100644
index 57d245b8f9f3..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r1.ebuild,v 1.13 2007/05/31 12:48:58 flameeyes Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="emacs-unicode-2"
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff source gzip-el toolkit-scroll-bars xft"
-
-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 )
-	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 ) )
-		xft? ( media-libs/fontconfig virtual/xft >=dev-libs/libotf-0.9.4 ) )
-	sys-libs/zlib"
-
-PROVIDE="virtual/editor"
-
-SLOT="23"
-OLD_SLOT="23.0.0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-
-DFILE=emacs-${OLD_SLOT}.desktop
-
-src_unpack() {
-	cvs_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/emacs-subdirs-el-gentoo.diff
-	epatch "${FILESDIR}"/emacs-cvs-nofink.patch
-	#epatch "${FILESDIR}"/emacs-cvs-darwin-fsf-gcc.patch
-	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-		-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
-		"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
-	epatch "${FILESDIR}"/${PN}-freebsd-sparc.patch
-}
-
-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"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_enable xft font-backend)"
-		myconf="${myconf} $(use_with xft freetype)"
-		myconf="${myconf} $(use_with xft)"
-		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-debug \
-			--enable-carbon-app=/Applications/Gentoo \
-			--program-suffix=.emacs-${OLD_SLOT} \
-			--without-x \
-			$(use_with jpeg) $(use_with tiff) \
-			$(use_with gif) $(use_with png) \
-			$(use_enable xft font-backend) \
-			 || die "econf carbon emacs failed"
-		make bootstrap || die "make carbon emacs bootstrap failed"
-	else
-		econf --enable-debug \
-			--program-suffix=.emacs-${OLD_SLOT} \
-			--without-carbon \
-			${myconf} || die "econf emacs failed"
-		make bootstrap || die "make emacs bootstrap failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	rm ${D}/usr/bin/emacs-${OLD_SLOT}.emacs-${OLD_SLOT} || die "removing duplicate emacs executable failed"
-	dohard /usr/bin/emacs.emacs-${OLD_SLOT} /usr/bin/emacs-${OLD_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-${OLD_SLOT}
-	mv ${D}/usr/share/info/{,emacs-${OLD_SLOT}/}dir || die "mv dir failed"
-	for i in ${D}/usr/share/info/*
-	do
-		if [ "${i##*/}" != emacs-${OLD_SLOT} ] ; then
-			mv ${i} ${i/info/info/emacs-${OLD_SLOT}}.info
-		fi
-	done
-
-	insinto /etc/env.d
-	cat >${D}/etc/env.d/50emacs-cvs-${OLD_SLOT} <<EOF
-INFOPATH=/usr/share/info/emacs-${OLD_SLOT}
-EOF
-	einfo "Fixing manpages..."
-	for m in  ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${OLD_SLOT}.1} || die "mv man failed"
-	done
-
-	if use source; then
-		insinto /usr/share/emacs/${OLD_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-${OLD_SLOT}-gentoo.el <<EOF
-(when (substring emacs-version 0 (length "${OLD_SLOT}"))
-  (setq find-function-C-source-directory "/usr/share/emacs/${OLD_SLOT}/src"))
-EOF
-		elisp-site-file-install 00emacs-cvs-${OLD_SLOT}-gentoo.el
-	fi
-
-
-	if ! use gzip-el; then
-		find ${D} -type f -name \*.el.gz -print0 |xargs -0 gunzip
-	fi
-	dodoc BUGS ChangeLog ChangeLog.unicode README README.unicode
-	insinto /usr/share/applications
-	cp ${FILESDIR}/emacs.desktop.in ${DFILE}
-	sed -i -e "s,@PV@,${OLD_SLOT},g" ${DFILE}
-	doins ${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
-	elisp-site-regen
-	if use X; then
-		while read line; do einfo "${line}"; done<<'EOF'
-
-You need to install some fonts for Emacs.  Under monolithic
-XFree86/Xorg you typically had such fonts installed by default.	 With
-modular Xorg, you will have to perform this step yourself.
-
-Installing media-fonts/font-adobe-{75,100}dpi would satisfy basic
-Emacs requirements under X11.
-
-EOF
-	fi
-}
-
-pkg_postrm() {
-	update-alternatives
-	elisp-site-regen
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
index 2dbe38f8e0b7..05acb301a012 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.20 2007/06/05 07:43:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r6.ebuild,v 1.21 2007/06/13 15:39:54 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -20,7 +20,7 @@ SRC_URI=""
 LICENSE="GPL-2 FDL-1.2"
 SLOT="23"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
+IUSE="alsa gif gpm gtk gzip-el hesiod jpeg lesstif motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xft xpm"
 RESTRICT="strip"
 
 X_DEPEND="x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps"
@@ -31,6 +31,7 @@ RDEPEND="sys-libs/ncurses
 	hesiod? ( net-dns/hesiod )
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	alsa? ( media-sound/alsa-headers )
+	gpm? ( sys-libs/gpm )
 	X? (
 		$X_DEPEND
 		x11-misc/emacs-desktop
@@ -151,6 +152,7 @@ src_compile() {
 	# $(use_with hesiod) is not possible, as "--without-hesiod" breaks
 	# the build system (has been reported upstream)
 	use hesiod && myconf="${myconf} --with-hesiod"
+	myconf="${myconf} $(use_with gpm)"
 
 	econf \
 		--program-suffix=-emacs-${SLOT} \
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-23.0.0-r1
+++ /dev/null
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch b/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch
deleted file mode 100644
index d2fe92486b02..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-nofink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-* Fabian Groffen <grobian@gentoo.org>
-  We don't want Fink stuff, we only want our own stuff.  No need to
-  patch configure.in, as upstream doesn't like this patch, as they put
-  it in on purpose.
-
---- configure
-+++ configure
-@@ -2384,12 +2384,6 @@
-     opsys=darwin
-     # Define CPP as follows to make autoconf work correctly.
-     CPP="${CC-cc} -E -no-cpp-precomp"
--    # Use fink packages if available.
--    if test -d /sw/include && test -d /sw/lib; then
--      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
--      CPP="${CPP} ${GCC_TEST_OPTIONS}"
--      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
--    fi
-   ;;
- 
-   ## AT&T 3b2, 3b5, 3b15, 3b20
diff --git a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff b/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff
deleted file mode 100644
index 3ca46deaa796..000000000000
--- a/app-editors/emacs-cvs/files/emacs-subdirs-el-gentoo.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur emacs.orig/Makefile.in emacs/Makefile.in
---- emacs.orig/Makefile.in	2006-03-05 17:38:35.000000000 -0600
-+++ emacs/Makefile.in	2006-03-05 18:04:23.000000000 -0600
-@@ -445,18 +445,21 @@
- 	then true; \
- 	else \
- 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+           echo "    (normal-top-level-add-subdirs-to-load-path))"; \
-+           echo "(setq default-directory \"/usr/share/emacs/site-lisp\")"; \
-+           echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
- 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
- 	    > $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
- 	fi
- 	chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
--	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
--	then true; \
--	else \
--	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
--	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
--	    > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
--	fi
--	-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
-+# 	-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
-+# 	then true; \
-+# 	else \
-+# 	  (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
-+# 	   echo "    (normal-top-level-add-subdirs-to-load-path))") \
-+# 	    > $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
-+# 	fi
-+# 	-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
- 	-unset CDPATH; \
- 	if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
- 	then \
-Only in emacs: Makefile.in.~1.311.~
diff --git a/app-editors/emacs-cvs/files/emacs.desktop.in b/app-editors/emacs-cvs/files/emacs.desktop.in
deleted file mode 100644
index fae10e12554b..000000000000
--- a/app-editors/emacs-cvs/files/emacs.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=GNU Emacs @PV@
-Comment=Emacs is the extensible, customizable, self-documenting real-time display editor.
-Icon=gnome-emacs.png
-Terminal=0
-Type=Application
-Categories=Application;Development;
-Exec=/usr/bin/emacs-@PV@