Removed dependency to pexpect and gdbm; bug #74368.

7 files changed, 16 insertions, 173 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index eda36d68d755..cca90755814e 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.24 2004/11/25 03:26:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.25 2004/12/16 04:52:27 usata Exp $
+
+  16 Dec 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -emacs-cvs-21.3.50-r1.ebuild, emacs-cvs-21.3.50-r2.ebuild,
+  emacs-cvs-21.3.50.ebuild, emacs-cvs-22.0.0.ebuild:
+  Removed dependency to pexpect and gdbm; bug #74368.
 
 *emacs-cvs-21.3.50-r2 (25 Nov 2004)
 
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 8dfa2aae5563..2668e81a002e 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9183fca02022a42cf5cff2c945f8cba0 ChangeLog 3699
-MD5 97677808a8ae395fffcc37956fc72e8e emacs-cvs-21.3.50.ebuild 3069
+MD5 bf0685ac93f7b36f521cf94f3bea780c ChangeLog 3917
+MD5 bbf9b8c90b76f49b1df6388d4d063eee emacs-cvs-21.3.50.ebuild 3034
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 a8d348e474de5733613ac943aed4811e emacs-cvs-21.3.50-r1.ebuild 4424
-MD5 652795f625e600f3e86a47073ba70021 emacs-cvs-22.0.0.ebuild 3038
-MD5 7267c877f46c2557fece3efe02fa2e9d emacs-cvs-21.3.50-r2.ebuild 4542
+MD5 025d45708ede9730163d4b2400903a7e emacs-cvs-22.0.0.ebuild 3003
+MD5 36998eaa8a547ee9468ac908fa1ab046 emacs-cvs-21.3.50-r2.ebuild 4507
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50 0
 MD5 0e5a4a35651f5365c6191636a2c26eb7 files/emacs.desktop 190
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-22.0.0 0
 MD5 5f423550e3d32b7c0511eccd93a94750 files/emacs-subdirs-el-gentoo.diff 1369
 MD5 39e2f957cdbcb0ae028bb9b94312d85b files/emacs-21.3.50.desktop 206
@@ -20,7 +18,7 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-emacs-cvs-21.3.50-r2 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBpU9GVWNWqTUmv+0RAuaPAKCHWU5uoZLT1yMaBs8jzXgSP09FFgCdG6gy
-TornF1wivJNOZTswwh3WHzM=
-=AuKk
+iD8DBQFBwRLRVWNWqTUmv+0RAkXcAJ9ImkLF7o8gy+wUN2pzEj3oDhqWOwCdG1/3
+mcjhJP/Xi5N7yT3XOiYiRiM=
+=rnZO
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
deleted file mode 100644
index 18a90c7bf4aa..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r1.ebuild,v 1.4 2004/10/14 03:53:23 usata Exp $
-
-ECVS_AUTH="ext"
-export CVS_RSH="ssh"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="HEAD"
-ECVS_USER="anoncvs"
-#ECVS_PASS=""
-ECVS_CVS_OPTIONS="-dP"
-ECVS_SSH_HOST_KEY="savannah.gnu.org,199.232.41.3 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAzFQovi+67xa+wymRz9u3plx0ntQnELBoNU4SCl3RkwSFZkrZsRTC0fTpOKatQNs1r/BLFoVt21oVFwIXVevGQwB+Lf0Z+5w9qwVAQNu/YUAFHBPTqBze4wYK/gSWqQOLoj7rOhZk0xtAS6USqcfKdzMdRWgeuZ550P6gSzEHfv0="
-
-inherit elisp-common cvs alternatives flag-o-matic eutils
-
-IUSE="X Xaw3d gif gnome gtk jpeg nls png spell tiff"
-#IUSE="${IUSE} aqua"
-
-S=${WORKDIR}/${ECVS_MODULE}
-DESCRIPTION="Emacs is the extensible, customizable, self-documenting real-time display editor."
-SRC_URI=""
-HOMEPAGE="http://www.gnu.org/software/emacs"
-
-# Never use the sandbox, it causes Emacs to segfault on startup
-SANDBOX_DISABLED="1"
-RESTRICT="$RESTRICT nostrip"
-
-DEPEND=">=sys-libs/ncurses-5.3
-	sys-libs/gdbm
-	dev-python/pexpect
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	X? ( virtual/x11
-		gif? ( >=media-libs/libungif-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 ) )
-		gnome? ( gnome-base/gnome-desktop ) )
-	nls? ( >=sys-devel/gettext-0.11.5 )
-	>=sys-apps/portage-2.0.51_rc1"
-
-PROVIDE="virtual/emacs virtual/editor"
-
-SLOT="21.3.50"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_compile() {
-
-	strip-flags
-	epatch ${FILESDIR}/emacs-subdirs-el-gentoo.diff
-	use ppc-macos && epatch ${FILESDIR}/${P}-nofink.diff
-
-	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"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d support"
-			myconf="${myconf} --with-x-toolkit=athena"
-		else
-			einfo "Configuring to build with lucid toolkit support"
-			myconf="${myconf} --with-x-toolkit=lucid"
-		fi
-	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=-${PV} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	make bootstrap || die "make emacs bootstrap failed"
-}
-
-src_install () {
-	einstall || die
-	rm ${D}/usr/bin/emacs-${SLOT}-${SLOT}
-
-#	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
-	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
-
-	einfo "Fixing manpages..."
-	for m in  ${D}/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/-${SLOT}.1} || die "mv man failed"
-	done
-
-	dodoc BUGS ChangeLog README
-
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Application
-		doins ${FILESDIR}/${DFILE} || die "install desktop file failed"
-	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-21.3.50" "/usr/bin/$i-21"
-	done
-}
-
-pkg_postinst() {
-	use ppc-macos || update-alternatives
-}
-
-pkg_postrm() {
-	use ppc-macos || update-alternatives
-}
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild
index 4aa011bdce7f..aec716babe4c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild,v 1.1 2004/11/25 03:26:17 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50-r2.ebuild,v 1.2 2004/12/16 04:52:27 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -26,8 +26,6 @@ SANDBOX_DISABLED="1"
 RESTRICT="$RESTRICT nostrip"
 
 DEPEND=">=sys-libs/ncurses-5.3
-	sys-libs/gdbm
-	dev-python/pexpect
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	X? ( virtual/x11
 		gif? ( >=media-libs/libungif-4.1.0.1b )
diff --git a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
index b33b052eba61..b3ac29a10ab4 100644
--- a/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.25 2004/10/03 08:20:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-21.3.50.ebuild,v 1.26 2004/12/16 04:52:27 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -25,8 +25,6 @@ SANDBOX_DISABLED="1"
 RESTRICT="$RESTRICT nostrip"
 
 DEPEND=">=sys-libs/ncurses-5.3
-	sys-libs/gdbm
-	dev-python/pexpect
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	X? ( virtual/x11
 		gif? ( >=media-libs/libungif-4.1.0.1b )
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
index 112501bc0a12..285218a7e32e 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0.ebuild,v 1.1 2004/07/01 18:07:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.0.ebuild,v 1.2 2004/12/16 04:52:27 usata Exp $
 
 ECVS_AUTH="ext"
 export CVS_RSH="ssh"
@@ -26,8 +26,6 @@ SANDBOX_DISABLED="1"
 RESTRICT="$RESTRICT nostrip"
 
 DEPEND=">=sys-libs/ncurses-5.3
-	sys-libs/gdbm
-	dev-python/pexpect
 	spell? ( || ( app-text/ispell app-text/aspell ) )
 	X? ( virtual/x11
 		gif? ( >=media-libs/libungif-4.1.0.1b )
diff --git a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r1 b/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-editors/emacs-cvs/files/digest-emacs-cvs-21.3.50-r1
+++ /dev/null