clean up

Package-Manager: portage-2.1.3.19

4 files changed, 12 insertions, 238 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 24880e1e6dae..b9897ab2df61 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # 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.220 2007/12/02 20:00:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.221 2007/12/07 11:30:47 opfer Exp $
+
+  07 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+  -emacs-21.4-r8.ebuild:
+  clean up
 
   02 Dec 2007; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r4.ebuild,
   emacs-21.4-r12.ebuild, emacs-21.4-r14.ebuild, emacs-22.1-r3.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 755b61a92759..2e5bcd62b45e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -54,18 +54,14 @@ EBUILD emacs-21.4-r4.ebuild 4598 RMD160 ca4f3078763d21b3331e7b54ef64b18d4df93f38
 MD5 c4c94ad71b79a9c5865fe1d2c7520b05 emacs-21.4-r4.ebuild 4598
 RMD160 ca4f3078763d21b3331e7b54ef64b18d4df93f38 emacs-21.4-r4.ebuild 4598
 SHA256 a6b910d89d85c84a0dd0a5953fee402aa35dc4933cf43253f9bf6e2f19e1e306 emacs-21.4-r4.ebuild 4598
-EBUILD emacs-21.4-r8.ebuild 5760 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e SHA1 f666f6168b5ad5495b5de488cd43dbc031ba0cb0 SHA256 3effad0fa79294bf0d597159991c3bd1112689674e06f0c27e6b96f112a655c5
-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-r3.ebuild 7815 RMD160 07b94c8e5d9f77c4f5a730cf0aa383ef16443488 SHA1 df8b8fcbadb609a76e501555b86601150eae2445 SHA256 fccf39358a0d9fbbd6343de46e95a1d4e19fd64d8fce240622e2fa5304924aff
 MD5 59abbd744582c96066a1db960699b5aa emacs-22.1-r3.ebuild 7815
 RMD160 07b94c8e5d9f77c4f5a730cf0aa383ef16443488 emacs-22.1-r3.ebuild 7815
 SHA256 fccf39358a0d9fbbd6343de46e95a1d4e19fd64d8fce240622e2fa5304924aff emacs-22.1-r3.ebuild 7815
-MISC ChangeLog 32492 RMD160 5a597d6c0ab1d96ba9dd44056c5ba60bf1215a8f SHA1 f06921b76fafabb88aff73f6d15bb2b47b15586f SHA256 a3159b66805951dad06f30be1a03ad0e797604f56cdcde0a979763088a85f8aa
-MD5 f3d2172767a9906bb30819511360981b ChangeLog 32492
-RMD160 5a597d6c0ab1d96ba9dd44056c5ba60bf1215a8f ChangeLog 32492
-SHA256 a3159b66805951dad06f30be1a03ad0e797604f56cdcde0a979763088a85f8aa ChangeLog 32492
+MISC ChangeLog 32586 RMD160 24cf9f5ecfd1e31d31658de7c522643e2173b31e SHA1 2d8cd756a8a8097ef35e0445c1388c64389157cc SHA256 784dce4b7d03bbb547e729392d1efe7ed72910ea41082f29360ba85969b03e67
+MD5 623606baaec5bb481b8c21540d3de11c ChangeLog 32586
+RMD160 24cf9f5ecfd1e31d31658de7c522643e2173b31e ChangeLog 32586
+SHA256 784dce4b7d03bbb547e729392d1efe7ed72910ea41082f29360ba85969b03e67 ChangeLog 32586
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -82,16 +78,13 @@ SHA256 4c8798c4118a57e1895e18f6fd9ac27fdad6ff1e93aa75147d954b8c8793dd61 files/di
 MD5 83632aac65f7a273244d059fe1078245 files/digest-emacs-21.4-r4 958
 RMD160 5978e60fdbe353bdc3e07f3568fcb0c281b4a46b files/digest-emacs-21.4-r4 958
 SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/digest-emacs-21.4-r4 958
-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-r3 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r3 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r3 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHUw8OOeoy/oIi7uwRAl4OAKDoIBGR4Kwo9GumKIX8NSjFWOIcvgCdF74Q
-Y/3BUghOtv01NsyrD9zWAoc=
-=N5iz
+iD8DBQFHWS9zNQqtfCuFneMRAnR/AKCAmo1hf/aQJ8cSfC/Wa4g/w7eoygCeIAQx
+83Hmp0Gc6goqLPZOoKJCsDA=
+=/mNR
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r8.ebuild b/app-editors/emacs/emacs-21.4-r8.ebuild
deleted file mode 100644
index dd30ff9f3eb3..000000000000
--- a/app-editors/emacs/emacs-21.4-r8.ebuild
+++ /dev/null
@@ -1,211 +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-21.4-r8.ebuild,v 1.8 2007/10/14 08:34:43 ulm Exp $
-
-inherit flag-o-matic eutils alternatives toolchain-funcs
-
-DESCRIPTION="An incredibly powerful, extensible text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/emacs-21-patches.tar.bz2
-	mirror://gentoo/emacs-21-files.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="21"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="X Xaw3d leim lesstif motif nls sendmail"
-
-RDEPEND="sys-libs/ncurses
-	X? ( x11-libs/libXext
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXmu
-			x11-libs/libXpm
-			|| ( media-fonts/font-adobe-100dpi
-					media-fonts/font-adobe-75dpi )
-			>=media-libs/giflib-4.1.0.1b
-			>=media-libs/jpeg-6b-r2
-			>=media-libs/tiff-3.5.5-r3
-			>=media-libs/libpng-1.2.1
-			!arm? (
-				Xaw3d? ( x11-libs/Xaw3d )
-				!Xaw3d? ( x11-libs/libXaw )
-				motif? (
-					lesstif? ( x11-libs/lesstif )
-				!lesstif? ( >=x11-libs/openmotif-2.1.30 ) )
-			)
-	)
-	nls? ( sys-devel/gettext )
-	sendmail? ( virtual/mta )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58
-	X? ( x11-misc/xbitmaps )"
-
-DFILE=emacs-${SLOT}.desktop
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${WORKDIR}/emacs-21.3-xorg.patch"
-	epatch "${WORKDIR}/emacs-21.3-amd64.patch"
-	epatch "${WORKDIR}/emacs-21.3-hppa.patch"
-	epatch "${WORKDIR}/emacs-21.2-sh.patch"
-	epatch "${WORKDIR}/emacs-21.4-libungif-gif-gentoo.patch"
-
-	use ppc64 && epatch "${WORKDIR}/emacs-21.3-ppc64.patch"
-
-	epatch "${WORKDIR}/emacs-21.4-autosave-tmp.patch"
-	epatch "${WORKDIR}/emacs-21.4-blessmail-build.patch"
-
-	# This will need to be updated for X-Compilation
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		   "${S}/src/s/gnu-linux.h"
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-
-	# -fstack-protector gets internal compiler error at xterm.c (bug 33265)
-	filter-flags -fstack-protector
-
-	# emacs doesn't handle LDFLAGS properly (bug #77430 and bug #65002)
-	unset LDFLAGS
-
-	# ever since GCC 3.2
-	replace-flags -O[3-9] -O2
-
-	# this fixes bug 152006
-	use ppc64 && append-flags -mno-fp-in-toc -mno-sum-in-toc
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		if use motif && use lesstif; then
-			append-ldflags -L/usr/X11R6/lib/lesstif -R/usr/X11R6/lib/lesstif
-			export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include/lesstif"
-		fi
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-		if use Xaw3d ; then
-			myconf="${myconf} --with-x-toolkit=athena"
-		elif use motif ; then
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die
-	emake CC="$(tc-getCC)" || die
-
-	einfo "Recompiling patched lisp files..."
-	(cd lisp; emake recompile) || die
-	emake CC="$(tc-getCC)" || die
-}
-
-src_install() {
-	einstall || die
-	for i in "${D}"/usr/bin/* ; do
-		mv ${i} ${i}.emacs-${SLOT} || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{-${PV},}.emacs-${SLOT} || die "mv emacs failed"
-	dohard /usr/bin/emacs.emacs-${SLOT} /usr/bin/emacs-${SLOT}
-
-	einfo "Fixing info documentation..."
-	mkdir "${T}/emacs-${SLOT}"
-	mv "${D}/usr/share/info/dir" "${T}"
-	for i in "${D}"/usr/share/info/*
-	do
-		mv ${i} "${T}"/emacs-${SLOT}/${i##*/}.info
-	done
-	mv "${T}/emacs-${SLOT}" "${D}/usr/share/info"
-	mv "${T}/dir" "${D}/usr/share/info/emacs-${SLOT}"
-
-	newenvd "${WORKDIR}/60emacs-${SLOT}.envd" "60emacs-${SLOT}"
-
-	einfo "Fixing manpages..."
-	for m in "${D}"/usr/share/man/man1/* ; do
-		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv ${m} failed"
-	done
-
-	# avoid collision between slots
-	rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
-
-	einfo "Fixing permissions..."
-	find "${D}" -perm 664 |xargs chmod -f 644 2>/dev/null
-	find "${D}" -type d |xargs chmod -f 755 2>/dev/null
-
-	keepdir /usr/share/emacs/${PV}/leim
-	keepdir /usr/share/emacs/site-lisp
-
-	dodoc BUGS ChangeLog README
-
-	insinto /usr/share/applications
-	doins "${WORKDIR}/${DFILE}"
-}
-
-update-alternatives() {
-	# extract the suffix of the manpages to determine the correct compression program
-	local suffix=$(echo /usr/share/man/man1/emacs.emacs-*.1*|sed 's/.*\.1//')
-
-	# this creates symlinks for binaries and man pages, so the correct ones in a slotted
-	# environment can be accessed
-	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
-
-	for j in emacs etags ctags gfdl
-	do
-		alternatives_auto_makesym "/usr/share/man/man1/$j.1${suffix}" "/usr/share/man/man1/$j.emacs-*"
-	done
-}
-
-pkg_postinst() {
-	test -f "${ROOT}"/usr/share/emacs/site-lisp/subdirs.el ||
-		cp "${ROOT}"/usr/share/emacs{/${PV},}/site-lisp/subdirs.el
-
-	update-alternatives
-
-	if ! use sendmail; then
-		while read line; do einfo "${line}"; done<<'EOF'
-
-You disabled sendmail support for Emacs.  If you later install a MTA
-then you will need to recompile Emacs.	See Bug #11104.
-
-EOF
-	fi
-	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
-}
diff --git a/app-editors/emacs/files/digest-emacs-21.4-r8 b/app-editors/emacs/files/digest-emacs-21.4-r8
deleted file mode 100644
index 90b82ba60dc1..000000000000
--- a/app-editors/emacs/files/digest-emacs-21.4-r8
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 a72cc753e258ddbb9bd952016121a8bf emacs-21-files.tar.bz2 900
-RMD160 71b4a7b6d6b2f47a087fdb54381513b82fb97411 emacs-21-files.tar.bz2 900
-SHA256 3d7c5b2ca8b11d3cd2dd9ea22b90867471de34552e4d1bae11206d18031f6ab2 emacs-21-files.tar.bz2 900
-MD5 c3394d805e6ed999c4ac7d197091f1e3 emacs-21-patches.tar.bz2 8891
-RMD160 ca0a44cc0d6e81fb245eb4f6069dd49550a9c55f emacs-21-patches.tar.bz2 8891
-SHA256 456af3ed5bcfa99af3fd67c281e391ca1b67599aed0cfd470adca8b34240d914 emacs-21-patches.tar.bz2 8891
-MD5 8f9d97cbd126121bd5d97e5e31168a87 emacs-21.4a.tar.gz 20403483
-RMD160 c312e739935b56d08783bbfe97992297a363cb8a emacs-21.4a.tar.gz 20403483
-SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216 emacs-21.4a.tar.gz 20403483
-MD5 32938cb5a7505d995a1e835639d19707 leim-21.4.tar.gz 3291433
-RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca leim-21.4.tar.gz 3291433
-SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b leim-21.4.tar.gz 3291433