Remove dysfunctional ebuild for Emacs 22 branch.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686

4 files changed, 10 insertions, 353 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 526c9e8c2ff0..b6252c2c8c87 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.217 2008/09/05 17:21:26 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.218 2008/09/06 04:44:19 ulm Exp $
+
+  06 Sep 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-cvs-Xaw3d-headers.patch, -emacs-cvs-22.2.9999.ebuild:
+  Remove dysfunctional ebuild for Emacs 22 branch.
 
   05 Sep 2008; Christian Faulhammer <opfer@gentoo.org>
   -emacs-cvs-22.2.90.ebuild, -emacs-cvs-22.2.91.ebuild,
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 5bd022ce24a2..ca9eda410716 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX emacs-cvs-Xaw3d-headers.patch 2045 RMD160 96b8ce942b83a5177c965a9a3a485496eb672c67 SHA1 a04c98c22ed9608ac6d81db0b9031da9a5b115db SHA256 ed1ad532e6476a0c2311e2c76db82035455948ace4dffb17b3e6493ec22af59c
 AUX emacs-cvs-freebsd-sparc-1.patch 448 RMD160 4f131b630ec09e1d9170374fc60a1620f0f718e9 SHA1 5bc71be91bb8008cec2473479184e250e5284c68 SHA256 e2c2e53e2995d4a505c480d17e0a7e5abff61ea96c4d3451a1e019c985a59cd8
-EBUILD emacs-cvs-22.2.9999.ebuild 8440 RMD160 c81da806261ae1fe17a19f1e96ba5dd01cee6f92 SHA1 affe3964fc603691dcb2f99a44bf407912604bad SHA256 4dcf68a58d295146dd6d9393fc032952f6ae105dece2ea6c65ad3e71077256f7
 EBUILD emacs-cvs-23.0.9999.ebuild 8822 RMD160 c0383e5c47d11113483d1dc4a1b2ce47a43bb413 SHA1 9d6c2148ed4c50f5c9734e8e68395020bb0f9716 SHA256 d82a395ee2ba8d63d3f7e68ae6aeecc94bba3239b8a9392c3be6a302ee87179b
-MISC ChangeLog 41092 RMD160 144f1b21b7696b52a90727c48ef481e321826f46 SHA1 7a78b60c36d2a687ae717267c2b7a23d705216d0 SHA256 50c79db73f8166ca6ed922f2f87427c729f7ff4442409147cdd1c0a3bf08b74b
+MISC ChangeLog 41258 RMD160 ae88840f02a550aa5cc9d600149d9674d05f6363 SHA1 0772ebe6a8447954eb83849b57af10d7e8c6e2bb SHA256 4dfb67fc93777a5ff42c24c2400b96e474d6736d612107a307b837de6aef6f73
 MISC metadata.xml 1606 RMD160 f898da13dfc3bdb1636e9ff7bc241997d235498b SHA1 2dea9901bc80a1d91f38628707395d9b4ef0df70 SHA256 f4df95b7db6f7b3375bdd658024520a03a763e75f4ca846ab494609f6094c9bd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkjBapsACgkQNQqtfCuFnePtyACfWJSC+HvKtur210Li4A8h4ZZO
-hW0An2dmBJvmxDCdAXt368CtmRyN8VKj
-=0jIG
+iEYEARECAAYFAkjCCqgACgkQOeoy/oIi7uy1GgCfU/v/O3N9KhHOPiNi1GurU9ll
+yWUAnRNRmmqx0eu39rmIPJuiIat4wJ9b
+=d8Mf
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
deleted file mode 100644
index 0d908ce4f6cc..000000000000
--- a/app-editors/emacs-cvs/emacs-cvs-22.2.9999.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2008 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.2.9999.ebuild,v 1.9 2008/09/03 18:35:03 ulm Exp $
-
-ECVS_AUTH="pserver"
-ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
-ECVS_MODULE="emacs"
-ECVS_BRANCH="EMACS_22_BASE"
-ECVS_LOCALNAME="emacs-22"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit autotools cvs elisp-common eutils flag-o-matic
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI=""
-
-LICENSE="GPL-3 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
-RESTRICT="strip"
-
-RDEPEND="!~app-editors/emacs-22.2.92
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	net-libs/liblockfile
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-libs/alsa-lib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		x11-misc/emacs-desktop
-		gif? ( media-libs/giflib )
-		jpeg? ( media-libs/jpeg )
-		tiff? ( media-libs/tiff )
-		png? ( media-libs/libpng )
-		xpm? ( x11-libs/libXpm )
-		gtk? ( =x11-libs/gtk+-2* )
-		!gtk? (
-			Xaw3d? ( x11-libs/Xaw3d )
-			!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( dev-util/pkgconfig )
-	X? ( gtk? ( dev-util/pkgconfig ) )
-	gzip-el? ( app-arch/gzip )"
-
-S="${WORKDIR}/${ECVS_LOCALNAME}"
-
-EMACS_SUFFIX="emacs-${SLOT}-cvs"
-
-src_unpack() {
-	cvs_src_unpack
-
-	cd "${S}"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION=$(grep 'defconst[	 ]*emacs-version' lisp/version.el \
-		| sed -e 's/^[^"]*"\([^"]*\)".*$/\1/')
-	[ "${FULL_VERSION}" ] || die "Cannot determine current Emacs version"
-	echo
-	einfo "Emacs CVS branch: ${ECVS_BRANCH}"
-	einfo "Emacs version number: ${FULL_VERSION}"
-	[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
-		|| die "Upstream version number changed to ${FULL_VERSION}"
-	echo
-
-	epatch "${FILESDIR}/${PN}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${PN}-freebsd-sparc-1.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"
-
-	if ! use alsa; then
-		# ALSA is detected even if not requested by its USE flag.
-		# Suppress it by supplying pkg-config with a wrong library name.
-		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-	if ! use gzip-el; then
-		# Emacs' build system automatically detects the gzip binary and
-		# compresses el files. We don't want that so confuse it with a
-		# wrong binary name
-		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
-			|| die "unable to sed configure.in"
-	fi
-
-	eautoreconf
-}
-
-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 alsa && ! use sound; then
-		echo
-		einfo "Although sound USE flag is disabled you chose to have alsa,"
-		einfo "so sound is switched on anyway."
-		echo
-		myconf="${myconf} --with-sound"
-	else
-		myconf="${myconf} $(use_with sound)"
-	fi
-
-	if use X; then
-		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with toolkit-scroll-bars)"
-		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
-		myconf="${myconf} $(use_with gif) $(use_with png)"
-		myconf="${myconf} $(use_with xpm)"
-
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d (Athena) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-			myconf="${myconf} --without-gtk"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-			myconf="${myconf} --without-gtk"
-		fi
-
-		local f tk=
-		for f in gtk Xaw3d motif; do
-			use ${f} || continue
-			[ "${tk}" ] \
-				&& ewarn "USE flag \"${f}\" ignored (superseded by \"${tk}\")"
-			tk="${tk}${tk:+ }${f}"
-		done
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-
-	econf \
-		--program-suffix=-${EMACS_SUFFIX} \
-		--infodir=/usr/share/info/${EMACS_SUFFIX} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" bootstrap || die "make bootstrap failed"
-	# cleanup, otherwise emacs will be dumped again in src_install
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	local i m
-
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
-		mv "${i}" "${i}.info" || die "mv info failed"
-	done
-
-	# move man pages to the correct place
-	einfo "Fixing manpages ..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
-	done
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-	rm "${D}"/var/lib/games/emacs/{snake,tetris}-scores
-	keepdir /usr/share/emacs/site-lisp
-	keepdir /var/lib/games/emacs
-
-	if use source; then
-		insinto /usr/share/emacs/${FULL_VERSION}/src
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.[ch]
-		sed 's/^X//' >10${PN}-${SLOT}-gentoo.el <<-EOF
-
-		;;; ${PN}-${SLOT} site-lisp configuration
-
-		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-		X    (setq find-function-C-source-directory
-		X	  "/usr/share/emacs/${FULL_VERSION}/src"))
-		EOF
-		elisp-site-file-install 10${PN}-${SLOT}-gentoo.el
-	fi
-
-	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
-}
-
-emacs-infodir-rebuild() {
-	# Depending on the Portage version, the Info dir file is compressed
-	# or removed. It is only rebuilt by Portage if our directory is in
-	# INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} == *[0-9].info* ]] \
-			|| install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
-	done
-	rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
-	echo
-}
-
-pkg_postinst() {
-	[ -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ] \
-		|| cp "${ROOT}"/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
-
-	local f
-	for f in "${ROOT}"/var/lib/games/emacs/{snake,tetris}-scores; do
-		[ -e "${f}" ] || touch "${f}"
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	if use X; then
-		elog "You need to install some fonts for Emacs. Under monolithic"
-		elog "XFree86/Xorg you typically had such fonts installed by default."
-		elog "With modular Xorg, you will have to perform this step yourself."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-
-	echo
-	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module, which also redirects man and info pages."
-	elog "You can therefore test emacs-cvs along with the stable release."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch b/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
deleted file mode 100644
index 0e6be8910334..000000000000
--- a/app-editors/emacs-cvs/files/emacs-cvs-Xaw3d-headers.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-*** emacs/src/xfns.c.~1.681.~	2007-03-24 11:49:48.000000000 -0400
---- emacs/src/xfns.c	2007-04-18 01:18:52.000000000 -0400
-***************
-*** 72,79 ****
---- 72,84 ----
-  #include <X11/Shell.h>
-  
-  #ifndef USE_MOTIF
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #include <X11/Xaw3d/Label.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-  #include <X11/Xaw/Label.h>
-+ #endif /* HAVE_XAW3D */
-  #endif /* USE_MOTIF */
-  
-  #ifdef USG
-*** emacs/src/xmenu.c.~1.317.~	2007-01-20 23:18:14.000000000 -0500
---- emacs/src/xmenu.c	2007-04-18 01:15:43.000000000 -0400
-***************
-*** 82,88 ****
---- 82,92 ----
-  #include <X11/StringDefs.h>
-  #include <X11/Shell.h>
-  #ifdef USE_LUCID
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-+ #endif /* HAVE_XAW3D */
-  #endif /* USE_LUCID */
-  #include "../lwlib/lwlib.h"
-  #else /* not USE_X_TOOLKIT */
-*** emacs/lwlib/lwlib.c.~1.55.~	2007-02-27 23:25:05.000000000 -0500
---- emacs/lwlib/lwlib.c	2007-04-18 01:21:44.000000000 -0400
-***************
-*** 48,54 ****
---- 48,58 ----
-  #endif /* not USE_MOTIF && USE_LUCID */
-  #endif
-  #if defined (USE_XAW)
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Paned.h>
-+ #else  /* !HAVE_XAW3D */
-  #include <X11/Xaw/Paned.h>
-+ #endif /* HAVE_XAW3D */
-  #include "lwlib-Xaw.h"
-  #endif
-  
-*** emacs/lwlib/lwlib-Xaw.c.~1.25.~	2007-02-26 22:07:08.000000000 -0500
---- emacs/lwlib/lwlib-Xaw.c	2007-04-18 01:22:33.000000000 -0400
-***************
-*** 35,46 ****
---- 35,55 ----
-  #include <X11/CoreP.h>
-  #include <X11/Shell.h>
-  
-+ #ifdef HAVE_XAW3D
-+ #include <X11/Xaw3d/Scrollbar.h>
-+ #include <X11/Xaw3d/Paned.h>
-+ #include <X11/Xaw3d/Dialog.h>
-+ #include <X11/Xaw3d/Form.h>
-+ #include <X11/Xaw3d/Command.h>
-+ #include <X11/Xaw3d/Label.h>
-+ #else /* !HAVE_XAW3D */
-  #include <X11/Xaw/Scrollbar.h>
-  #include <X11/Xaw/Paned.h>
-  #include <X11/Xaw/Dialog.h>
-  #include <X11/Xaw/Form.h>
-  #include <X11/Xaw/Command.h>
-  #include <X11/Xaw/Label.h>
-+ #endif /* HAVE_XAW3D */
-  
-  #include <X11/Xatom.h>
-