clean up

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 16 insertions, 190 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 8fed3e7393d1..c5696e7c5161 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.330 2009/08/31 18:07:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.331 2009/08/31 18:17:58 fauli Exp $
+
+  31 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
+  -emacs-21.4-r18.ebuild:
+  clean up
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> emacs-21.4-r19.ebuild:
   stable ppc64, bug 277194
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f99d3604ff75..56f0a6ab5e6e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,8 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-23.0.94-handle-xz-suffix.patch 751 RMD160 6380952113ef9652c58f82de6b6a4254281721a6 SHA1 2666b767674a1b57853d8802e3243ce9b5f5b0cd SHA256 167b019518b147f737c7e69281a76d0e5651db44c82dff0834d6e2a964870bfc
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
 DIST emacs-18.59-patches-4.tar.bz2 17690 RMD160 72d71f47616b51d3a82afd375585f614c0a188fb SHA1 c53d978d09e1ac326d0cdc094ff2b80ba102be48 SHA256 2172a28e5f7550e23f9aaa93281b1243e0c314dfe118e83864e09ec02aaef712
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
-DIST emacs-21.4-patches-6.tar.bz2 11785 RMD160 01edee136f6cd88611fa632227f685c1b93ed7a9 SHA1 042fddfc02dbd958219382fd42de0f6e20cff6c3 SHA256 495dbcb7bfb4a0dbff57e3d5873adb9eb9a4219dec3136df864ce38a6dc21937
 DIST emacs-21.4-patches-8.tar.bz2 12260 RMD160 7e8acfe340becf4d2b3ee282e47098052eaf6b51 SHA1 c292b57ffa618b04a8c85d5feb412a6e4f3e166d SHA256 51815b4f13177474e2e8f30c829e12fc936f8b4b21b0aa0274d56601aef6bb21
 DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-1.tar.bz2 2622 RMD160 43d68a7dba5e57676a587ca1bbc97b41c8dae2c1 SHA1 2af958f1d0f7e653db5597abdce307bb70626069 SHA256 4f10bd62440dde10747e262d68a5af779fc787b68ccb1891ddbb4fba2be74ae6
@@ -10,9 +12,15 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST emacs-23.1.tar.bz2 34382732 RMD160 e9b30bce2c174dde4dcfefb6068ae8648d59b251 SHA1 5f2d5dfcc17e7627ea752f675c605fe37c9c145c SHA256 2b35f4457c7a0ee9f9185579cc2890b43f129a112cf22500233489db7a24cb1c
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2517 RMD160 e4b5cfb9d6710a7ff31f9d77bb2738753fab36fc SHA1 0adec98b539e5165fbee402a1924281d83400aa0 SHA256 e57897cbd150b96fedb234f24ca33fadba5bef18ee9059b9a59f456e3768a565
-EBUILD emacs-21.4-r18.ebuild 5288 RMD160 081a0162e5c6e62c771b2697e47fe53677f98d1f SHA1 92faa1924ca6c12be31b3e2a33901cf98b762358 SHA256 f70b9923f1a81c7989c212456c2528e63f42ab324ef319ef71ede1b14bf8f5b7
 EBUILD emacs-21.4-r19.ebuild 5314 RMD160 163ffd52b686ad7fe4aa2126e34250d9c4e33950 SHA1 3a6ebd946d73a0cf86f19633a189bf8ea9069d31 SHA256 9c93d672f72648fb383c5bdb8bc305db9609d5e88e2b0e856fbc3ac621e53cc8
 EBUILD emacs-22.3-r2.ebuild 7624 RMD160 5938d8f514e63a7c2a939025751ba2bc5ea0b59b SHA1 9a0a8bdf8119bbf5a943651ea3ec6d37210b4b1a SHA256 3c899850399efdbab28b3dcfd1128ba645ce4698d605eb3c8c029ba370927448
 EBUILD emacs-23.1.ebuild 9374 RMD160 3c892cd2f2a8e24c57c4eb8770e2eb001dcac3f0 SHA1 b246e3042b5c700ef415cafa4f8e27163ee1b8ec SHA256 36ae69008874a620ce5ccb026308f28e95aeae95b969487e239549542a292140
-MISC ChangeLog 47316 RMD160 ef517a5aab3ce7185494cd750fdcc2e35653c967 SHA1 d4f4db739801620992fd2bde752a5f26f85e68c3 SHA256 07ef64c2c5715ef5b726a7ed467acc2faf40fcb8890aa478fe3801a3a68f9925
+MISC ChangeLog 47408 RMD160 7eb136c5adeb3d820253850f608f6b268b77143a SHA1 e387163d074a6261b8bb0ffc75cf2d682c4cfff9 SHA256 c483120ac9980d82da92961d4f670c076f072960521e693bf5d510cfe3f4ae9d
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqcE94ACgkQNQqtfCuFneOhDgCfUl2+lyu8BIFOKsKlSTe4xPLx
+AqMAnjBUJHFE+z6Wj2+vINbP4zKmP0gp
+=FLHS
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r18.ebuild b/app-editors/emacs/emacs-21.4-r18.ebuild
deleted file mode 100644
index 223cc84f2eba..000000000000
--- a/app-editors/emacs/emacs-21.4-r18.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r18.ebuild,v 1.9 2009/04/14 16:29:57 jer Exp $
-
-EAPI=2
-WANT_AUTOCONF="2.1"
-
-inherit flag-o-matic eutils toolchain-funcs autotools
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
-	mirror://gentoo/${P}-patches-6.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD as-is X11"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif nls sendmail"
-
-DEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	X? (
-		x11-libs/libXext
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-misc/xbitmaps
-		>=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
-		Xaw3d? ( x11-libs/Xaw3d )
-		!Xaw3d? ( motif? ( x11-libs/openmotif ) )
-	)"
-
-RDEPEND="${DEPEND}
-	>=app-emacs/emacs-common-gentoo-1[X?]
-	sendmail? ( virtual/mta )"
-
-src_prepare() {
-	EPATCH_SUFFIX=patch epatch
-
-	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"
-
-	# install emacsclient.1 man page (bug 165466)
-	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
-
-	# 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" || die
-
-	eautoconf
-}
-
-src_configure() {
-	# -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
-
-	# -march is known to cause signal 6 on some environment
-	filter-flags "-march=*"
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	if use X ; then
-		myconf="${myconf}
-			--with-x
-			--with-xpm
-			--with-jpeg
-			--with-tiff
-			--with-gif
-			--with-png"
-
-		if use Xaw3d ; then
-			einfo "Configuring to build with Xaw3d (Athena/Lucid) toolkit"
-			myconf="${myconf} --with-x-toolkit=athena"
-			use motif \
-				&& ewarn "USE flag \"motif\" ignored (superseded by \"Xaw3d\")"
-		elif use motif ; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf="${myconf} --with-x-toolkit=motif"
-		else
-			# do not build emacs with any toolkit, bug 35300
-			einfo "Configuring to build with no toolkit"
-			myconf="${myconf} --with-x-toolkit=no"
-		fi
-	else
-		myconf="${myconf} --without-x"
-	fi
-	econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	export SANDBOX_ON=0
-	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
-
-	einstall || die "einstall failed"
-	for i in "${D}"/usr/bin/* ; do
-		mv "${i}" "${i}-emacs-${SLOT}" || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{-emacs,}-${SLOT} || die "mv emacs failed"
-	rm "${D}"/usr/bin/emacs-${PV}-emacs-${SLOT}
-
-	# move info documentation to the correct place
-	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}"
-
-	# move man pages to the correct place
-	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
-
-	# fix 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
-
-	dodoc BUGS ChangeLog README
-}
-
-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
-	[ -d "${ROOT}"${infodir} ] || return	# may occur with FEATURES=noinfo
-	einfo "Regenerating Info directory index in ${infodir} ..."
-	rm -f "${ROOT}"${infodir}/dir{,.*}
-	for f in "${ROOT}"${infodir}/*.info*; do
-		[[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
-			&& 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() {
-	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 sendmail && ! has_version "virtual/mta"; then
-		elog "You disabled sendmail support for Emacs. If you later install"
-		elog "a MTA then you will need to recompile Emacs. See Bug #11104."
-	fi
-}
-
-pkg_postrm() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}