Remove intermediate version.

Package-Manager: portage-2.1.5

3 files changed, 15 insertions, 258 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 0a2da8a3819c..bc7371c89904 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.255 2008/05/16 19:58:01 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.256 2008/05/16 20:25:23 ulm Exp $
+
+  16 May 2008; Ulrich Mueller <ulm@gentoo.org> -emacs-22.2-r1.ebuild:
+  Remove intermediate version.
 
   16 May 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   emacs-21.4-r17.ebuild, emacs-22.2-r2.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index a34ae2dd86d7..32b494ae2853 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
 AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 SHA1 0302df9678f2cc59c89da8bf47130810e08bfbbf SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b
 AUX emacs-22.1-format-int.patch 3078 RMD160 525a4fbac24e2d97c6267655c36c06438f941a87 SHA1 397220a5b57f25a0271c1a4cc45c10f25d5f6703 SHA256 4632460b86af84ee0a826fa1dd228dcc9e763cfde9a8615e8c03655241e2a8fd
@@ -23,7 +26,13 @@ EBUILD emacs-18.59-r5.ebuild 2491 RMD160 67930a5bdc3dbf106f62e75847552d65f11c2d0
 EBUILD emacs-21.4-r15.ebuild 5610 RMD160 fe29223f7e215bbb6dd583e380203d46bad2763b SHA1 97d2512d1b128a2a38d95047dd2712c3bf941d33 SHA256 bbf623f7d8793ceb4c665078e411f915bc3ccacf1501f78542acf9d9bd5fac3c
 EBUILD emacs-21.4-r17.ebuild 5623 RMD160 b496634abdaf26a4c2c465eee03867950bd1d15d SHA1 71da99aee152ab6a82ef148007d1b1a5929df312 SHA256 e44d19cef37dcdb77e6874bd7eddcb0499fc931a7a84c8f3ce33dc12d928d392
 EBUILD emacs-22.1-r4.ebuild 8112 RMD160 43b5252e54649807630f0989b6ba6c1e71892230 SHA1 f9de872a9e14b6f62fb44b816473943abbf57d5f SHA256 8a33993a7bed688a69d74a752ea14322b0ae57cebb9a624cdaf1f5e77ca7007a
-EBUILD emacs-22.2-r1.ebuild 8005 RMD160 7dd0ec2ddfa323483d23fe4e99b9bda6a4834f04 SHA1 54bbaa8572d336dd7eb70ba26a17392dbffcb7f2 SHA256 8c8cca5b3f5319d964f7afd25adbc71beb5a563abb5fad8b28e5472493b85543
 EBUILD emacs-22.2-r2.ebuild 8217 RMD160 8f63924bfe8ceaf2217b13da93705d9ba38cd3c8 SHA1 a599de38705a05895eb8e765924d225867561f36 SHA256 09559e2fc1670a24071ad42b1b2e4c1dfc65dc4ebc145a2c7a69c04424e05f63
-MISC ChangeLog 36886 RMD160 13c89a291ea0f375407058c9ac1b23bf21daba61 SHA1 994e98ccc6063fe75586e0376d1c1d1a8d8e842a SHA256 3b4ca422ed95e17370100ddcc4b97cef36bb7f263e8eb2ffc2b8c00852434524
+MISC ChangeLog 36981 RMD160 2b490be0b59471ee654f8881f86d6c2bc79a5ba0 SHA1 fd797e7910b56d27208e75db6caf9fe9672b50a9 SHA256 9c93148a66af350349e4516bb2cd7dbbaa2b0f4f785450a7cf0a88d7fef8de5c
 MISC metadata.xml 1213 RMD160 7df0bb43f41ecf811a37b60ee3cbefc7f798e840 SHA1 e545b177be5578569de6410bfea01cffe6003611 SHA256 1e71985b81478302fb03a9af91293f7dfad07aa7b31c4cc226170b45d573ce13
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkgt7d4ACgkQOeoy/oIi7uyyqACeNNMCsotX6tjZhQz2uSMsZOxZ
+f+wAoJYvVnkmoychTWFWyaP4W4JBQRNg
+=Qsza
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.2-r1.ebuild b/app-editors/emacs/emacs-22.2-r1.ebuild
deleted file mode 100644
index edf9df178559..000000000000
--- a/app-editors/emacs/emacs-22.2-r1.ebuild
+++ /dev/null
@@ -1,255 +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/emacs-22.2-r1.ebuild,v 1.7 2008/05/06 20:37:32 jer Exp $
-
-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-3 FDL-1.2 BSD"
-SLOT="22"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh 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-cvs-22.1
-	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? ( virtual/motif )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	alsa? ( dev-util/pkgconfig )
-	X? ( gtk? ( dev-util/pkgconfig ) )
-	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}"
-
-	epatch "${FILESDIR}/emacs-22.1-Xaw3d-headers.patch"
-	epatch "${FILESDIR}/emacs-22.1-freebsd-sparc.patch"
-	epatch "${FILESDIR}/emacs-22.1-vcdiff-tmp-race.patch"
-	epatch "${FILESDIR}/${P}-heimdal-gentoo.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
-	if use hppa; then # bug #193703
-		replace-flags -O[2-9] -O
-	else
-		replace-flags -O[3-9] -O2
-	fi
-	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
-	else
-		myconf="${myconf} --without-x"
-	fi
-
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-
-	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 () {
-	local i m
-
-	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 /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-${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
-	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
-
-	if [[ $(readlink "${ROOT}"/usr/bin/emacs) == emacs.emacs-${SLOT}* ]]; then
-		# transition from pre-eselect revision
-		eselect emacs set emacs-${SLOT}
-	else
-		eselect emacs update ifunset
-	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 ifunset
-}