Remove vulnerable revision wrt bug #197958.

Package-Manager: portage-2.1.3.18

4 files changed, 12 insertions, 263 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 32c27704ebb3..5f0096100acb 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.204 2007/11/06 23:14:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.205 2007/11/06 23:52:17 ulm Exp $
+
+  06 Nov 2007; Ulrich Mueller <ulm@gentoo.org> -emacs-22.1-r1.ebuild:
+  Remove vulnerable revision wrt bug #197958.
 
   06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org> emacs-22.1-r2.ebuild:
   Stable on amd64 wrt bug #197958.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ca35081d7e09..c237c49ae477 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -54,18 +54,14 @@ EBUILD emacs-21.4-r8.ebuild 5760 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e
 MD5 3a3e7463c54cf97632b5cd1ae7c93d02 emacs-21.4-r8.ebuild 5760
 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e emacs-21.4-r8.ebuild 5760
 SHA256 3effad0fa79294bf0d597159991c3bd1112689674e06f0c27e6b96f112a655c5 emacs-21.4-r8.ebuild 5760
-EBUILD emacs-22.1-r1.ebuild 7626 RMD160 8438f6f79d8e53c8a4409e2bbbc9075d5cb8194b SHA1 63b7ccc9b7de6d34729f64117017b85c2ee42b0e SHA256 9247a96147b0cab056b80707ff501bb5f793952cbef6d9c0a5e33ad878a46d84
-MD5 2e2b60f2fb5e241a5da2a8bbe4dcd2ad emacs-22.1-r1.ebuild 7626
-RMD160 8438f6f79d8e53c8a4409e2bbbc9075d5cb8194b emacs-22.1-r1.ebuild 7626
-SHA256 9247a96147b0cab056b80707ff501bb5f793952cbef6d9c0a5e33ad878a46d84 emacs-22.1-r1.ebuild 7626
 EBUILD emacs-22.1-r2.ebuild 7684 RMD160 d7321e70eceeb0d58fa20ea07f25fc0da601cb4d SHA1 e04e0f91e0f13c56dcc6575279e49f21f45bab73 SHA256 29f903a58f0952919e180c629799e66fa631943564f5df6059ab48a6e4685035
 MD5 a2eb88183a641367c234b6351765de5f emacs-22.1-r2.ebuild 7684
 RMD160 d7321e70eceeb0d58fa20ea07f25fc0da601cb4d emacs-22.1-r2.ebuild 7684
 SHA256 29f903a58f0952919e180c629799e66fa631943564f5df6059ab48a6e4685035 emacs-22.1-r2.ebuild 7684
-MISC ChangeLog 30364 RMD160 6efe3db2c77461de952254f82d6b05bfafd51938 SHA1 9a9b3f898dc7dc0d7a925b6fee74be1ef249dd05 SHA256 92f9c7975907317d3d29ce834cd4856ccc0d5f375a7ec7ec8108ab1a118647c0
-MD5 b1bf3b83f326583ea60386b73bb800db ChangeLog 30364
-RMD160 6efe3db2c77461de952254f82d6b05bfafd51938 ChangeLog 30364
-SHA256 92f9c7975907317d3d29ce834cd4856ccc0d5f375a7ec7ec8108ab1a118647c0 ChangeLog 30364
+MISC ChangeLog 30476 RMD160 a1685eadbcb8e1f615305c9c506968b8178d827e SHA1 b3739107f0a7b14b31e130aa73db2e511141b3eb SHA256 aec85867abbe77187885192d281b488b06bea15a70c3e8813302791a2bcbfcbd
+MD5 35f3adf4ec83631f0a49958e70ff0305 ChangeLog 30476
+RMD160 a1685eadbcb8e1f615305c9c506968b8178d827e ChangeLog 30476
+SHA256 aec85867abbe77187885192d281b488b06bea15a70c3e8813302791a2bcbfcbd ChangeLog 30476
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -85,16 +81,13 @@ SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/di
 MD5 83632aac65f7a273244d059fe1078245 files/digest-emacs-21.4-r8 958
 RMD160 5978e60fdbe353bdc3e07f3568fcb0c281b4a46b files/digest-emacs-21.4-r8 958
 SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/digest-emacs-21.4-r8 958
-MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1-r1 238
-RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r1 238
-SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r1 238
 MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1-r2 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r2 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHMPU9kT4lNIS36YERAnl3AKCIGbcu8xCbn+8vg9seu4lTHsY5BgCgnC9q
-9usyBU89/kyZiaTruJBjrfQ=
-=NhJT
+iD8DBQFHMP5KOeoy/oIi7uwRAg+bAKCif7G5bMOX4WwbiWiF/lyS1YwQegCdHTDa
+v7+KUgFODwHJudmzDGA4Mhk=
+=rwOa
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
deleted file mode 100644
index 2c811ca44ca0..000000000000
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ /dev/null
@@ -1,244 +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/emacs-22.1-r1.ebuild,v 1.16 2007/11/02 09:37:33 ulm Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="latest"
-
-inherit autotools 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="mirror://gnu/emacs/${P}.tar.gz"
-
-LICENSE="GPL-2 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 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"
-
-RDEPEND="!<app-editors/emacs-cvs-22.1
-	sys-libs/ncurses
-	>=app-admin/eselect-emacs-0.7-r1
-	sys-libs/zlib
-	hesiod? ( net-dns/hesiod )
-	spell? ( || ( app-text/ispell app-text/aspell ) )
-	alsa? ( media-sound/alsa-headers )
-	X? (
-		$X_DEPEND
-		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? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	gzip-el? ( app-arch/gzip )"
-
-# 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="${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	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 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
-
-	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
-	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
-	epatch "${FILESDIR}/${P}-backup-buffer.patch"
-	# ALSA is detected and used even if not requested by the USE=alsa flag.
-	# So remove the automagic check
-	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
-
-	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
-			echo
-			einfo "Configuring to build with GTK support, disabling all other toolkits"
-			echo
-			myconf="${myconf} --with-x-toolkit=gtk"
-		elif use Xaw3d; then
-			einfo "Configuring to build with Xaw3d(athena) support"
-			myconf="${myconf} --with-x-toolkit=athena"
-			myconf="${myconf} --without-gtk"
-		elif use motif; then
-			einfo "Configuring to build with motif toolkit support"
-			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
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-
-	econf \
-		--program-suffix=-emacs-${SLOT} \
-		--infodir=/usr/share/info/emacs-${SLOT} \
-		--without-carbon \
-		${myconf} || die "econf emacs failed"
-
-	emake CC="$(tc-getCC)" || die "emake failed"
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die "emake recompile failed"
-	(cd src; emake versionclean)
-	emake CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm "${D}"/usr/bin/emacs-${FULL_VERSION}-emacs-${SLOT} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${D}"/usr/bin/emacs-emacs-${SLOT} "${D}"/usr/bin/emacs-${SLOT} \
-		|| die "moving Emacs executable failed"
-
-	# move info documentation to the correct place
-	einfo "Fixing info documentation ..."
-	for i in "${D}"/usr/share/info/emacs-${SLOT}/*; 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-${SLOT}.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 /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//' >00${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 00${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-${SLOT} 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
-	echo
-}
-
-pkg_postinst() {
-	test -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
-		test -e ${f} || touch ${f}
-	done
-
-	elisp-site-regen
-	emacs-infodir-rebuild
-
-	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
-		# transition from pre-eselect revision
-		eselect emacs set emacs-${SLOT}
-	else
-		eselect emacs update --if-unset
-	fi
-
-	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 "Therefore, several Emacs versions can be installed at the same time."
-	elog "\"man emacs.eselect\" for details."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	emacs-infodir-rebuild
-	eselect emacs update --if-unset
-}
diff --git a/app-editors/emacs/files/digest-emacs-22.1-r1 b/app-editors/emacs/files/digest-emacs-22.1-r1
deleted file mode 100644
index 44943fdbcd94..000000000000
--- a/app-editors/emacs/files/digest-emacs-22.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6949df37caec2d7a2e0eee3f1b422726 emacs-22.1.tar.gz 38172226
-RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 emacs-22.1.tar.gz 38172226
-SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0 emacs-22.1.tar.gz 38172226