# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2010-02-25 10:25:42
# Node ID 37ba9d32b1434e6a8a467b88084a080c24ade367
# Parent  cb92219dc12f0f5a054276e41707a4be567034ae

Workaround to stop emacs's buildsystem from trying to access /usr/lib/crt0.o, et cetera for bug 306831. Remove old emacs versions.
(Portage version: 2.2_rc63-r1/hg/Linux x86_64, RepoMan options: --force)
 (Unsigned Manifest commit)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,26 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-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-9.tar.bz2 12452 RMD160 6060f5a2a342e1187c32a5a591b1523b02592d55 SHA1 221b6725b729f1c31816489a95ae94c9819f62df SHA256 b2acb9576b043e555714230f8e609b03c70b0a6e3a585db9b39dbf499e71d355
-DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a SHA1 cdb33731180fe4a912838af805dd35e3f55394d4 SHA256 1d50ddae117c48d689a3d772e390569edccfdc22168be0112d2093bd2d7c3216
 DIST emacs-22.3-patches-3.tar.bz2 4257 RMD160 54be56231a1089de414419adbb25fec570b30bc8 SHA1 5d1b725d20b4cd6af51dc5475d5b254c771006bd SHA256 a437aab14692384f9d4cddf434971051ade4f87047dcfa56ec2563127d946ba9
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST emacs-23.1-patches-5.tar.bz2 3414 RMD160 2ec70b92fcb77d357edcd9e2da54fa33cfb527ac SHA1 a1d851fcd490118f6e2f16a67b94dd89de5cc2f1 SHA256 f81df36a8e69010bd81ddfda36393d9ca0da205a9717ffd8721dff47320b14b1
 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 2735 RMD160 1ed61abdb26747a06d675c0206fc713f9ad2a3e6 SHA1 f10bf46ae1a76d3e540505a3573e6580dc1e4609 SHA256 dd4f132c0fe076172fc5426a937697d966c36ffd9266f88ac353c81babd88e55
-EBUILD emacs-21.4-r19.ebuild 5249 RMD160 37948b5917237c6ca7b148e6d36c5f10c9c6b205 SHA1 2f04b39e2e332b0b701beaeddfb941972b2e4e88 SHA256 8527a478c88151caf7b95fd799034c3f9d8f163bf55998c6d5a57ef7b14be59d
-EBUILD emacs-22.3-r3.ebuild 7833 RMD160 c9f82bfcff4c7408ee5f579f43ab9a3f7d56bdec SHA1 0f7e8ed4eae680ef56306ce6eb372113a3d8cb27 SHA256 c193c8947ba893368dbf06c9781d8d466b434854c42f37e0028c3577734c2bcb
-EBUILD emacs-23.1-r2.ebuild 9712 RMD160 be850522adf821e720b9539012b2fe0987d11170 SHA1 93e835258d58542e9f9e3610a2c1cab623d7477a SHA256 7d5a09f53e1f3dfee51885e9feb32235421df5bac033528b24f1339a3faa44a3
+EBUILD emacs-22.3-r3.ebuild 8129 RMD160 15bfec54abdb6d36cbca167c590e0a73fa9035e4 SHA1 f0b06ab576477b6f8c215cc1f4130303ec291804 SHA256 610eb07869acf80da5e9fb569295eb2608c72c57d34715f582405a12ffba3f54
+EBUILD emacs-23.1-r2.ebuild 10008 RMD160 2f7177f285dc89220be8e4ed44832af991d45329 SHA1 21ddce2b867682506bdfe49d2815c2f90475f262 SHA256 6022c2f0daeae0f8a7ac90c34dab9f4e9257b6b77ac05f4f4824abc128d601d0
 MISC ChangeLog 52069 RMD160 94aafac9c7207d6300dcb6218cb8d906ddb0729b SHA1 d41f35d711437d2746b24a40c4d960464fc0ea5c SHA256 6495fc6dc6f57290981b39667fb68032ec932c38fbe1e15d4151215747768681
 MISC metadata.xml 1652 RMD160 d5b841ffd970ae6338f01b56bc354004a78a13e8 SHA1 3f19193ed03a37bc67644966c839ea738b21c976 SHA256 fa53ed0bd63c3dd37877f11aa0ac7e3811da9db6c90437176ab60d76329f0cd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuBa28ACgkQOeoy/oIi7uzn+QCgx/Tu4O0WneAqrA5n1N8Miev1
-U8MAn1RdCJEpVGMB7VckbaZXcFu6Qetn
-=I/6T
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r6.ebuild b/app-editors/emacs/emacs-18.59-r6.ebuild
deleted file mode 100644
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ /dev/null
@@ -1,98 +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-18.59-r6.ebuild,v 1.9 2009/12/30 16:19:12 ulm Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-DESCRIPTION="The extensible self-documenting text editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
-	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
-	mirror://gentoo/${P}-patches-4.tar.bz2"
-
-LICENSE="GPL-1 GPL-2 BSD" #as-is
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	amd64? ( app-emulation/emul-linux-x86-baselibs )"
-#	X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}"
-
-MY_BASEDIR="/usr/share/emacs/${PV}"
-MY_LOCKDIR="/var/lib/emacs/lock"
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
-	EPATCH_SUFFIX=patch epatch
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64) arch=intel386; multilib_toolchain_setup x86 ;;
-		x86)   arch=intel386 ;;
-		*)	   die "Architecture ${arch} not supported" ;;
-	esac
-	local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/"
-	#use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/"
-	sed -e "${cmd}" src/config.h-dist >src/config.h
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "${MY_BASEDIR}/lisp"
-		#define PATH_EXEC "${MY_BASEDIR}/etc"
-		#define PATH_LOCK "${MY_LOCKDIR}/"
-		#define PATH_SUPERLOCK "${MY_LOCKDIR}/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		src/s-linux.h || die
-
-	# -O3 and -finline-functions cause segmentation faults at run time.
-	filter-flags -finline-functions
-	replace-flags -O[3-9] -O2
-	strip-flags
-}
-
-src_compile() {
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
-	emake --jobs=1 CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" || die
-}
-
-src_install() {
-	local i
-
-	dodir ${MY_BASEDIR}
-	dodir /usr/share/man/man1
-	make install LIBDIR="${D}${MY_BASEDIR}" BINDIR="${D}/usr/bin" \
-		MANDIR="${D}/usr/share/man/man1" || die
-	chmod -R go-w "${D}${MY_BASEDIR}"
-	rmdir "${D}${MY_BASEDIR}/lock"
-
-	dodir ${MY_LOCKDIR%/*}
-	diropts -m0777
-	keepdir ${MY_LOCKDIR}
-
-	for i in emacsclient etags ctags; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die "mv ${i} failed"
-	done
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die "mv emacs failed"
-	mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
-	dosym ../emacs/${PV}/info /usr/share/info/emacs-${SLOT}
-
-	dodoc README PROBLEMS
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-21.4-r19.ebuild b/app-editors/emacs/emacs-21.4-r19.ebuild
deleted file mode 100644
--- a/app-editors/emacs/emacs-21.4-r19.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r19.ebuild,v 1.15 2010/01/22 17:50:19 ulm Exp $
-
-EAPI=2
-
-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-9.tar.bz2
-	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
-
-LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
-SLOT="21"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="X Xaw3d leim motif 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:0
-		>=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"
-
-	# 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
-
-	# custom aclocal.m4 was only needed for autoconf 2.13 and earlier
-	rm aclocal.m4
-	eaclocal
-	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
-	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
-}
-
-pkg_postinst() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-
-	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
-
-	if use X; then
-		echo
-		elog "You need to install some fonts for Emacs."
-		elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
-		elog "machine would satisfy basic Emacs requirements under X11."
-	fi
-}
-
-pkg_postrm() {
-	emacs-infodir-rebuild
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs/emacs-22.3-r3.ebuild b/app-editors/emacs/emacs-22.3-r3.ebuild
--- a/app-editors/emacs/emacs-22.3-r3.ebuild
+++ b/app-editors/emacs/emacs-22.3-r3.ebuild
@@ -56,9 +56,12 @@ SITEFILE="20${PN}-${SLOT}-gentoo.el"
 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"
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtend.o):g" \
+		-e "s:/usr/lib/crtn.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtn.o):g" \
+		-e "s:/usr/lib/crti.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crti.o):g" \
+		-e "s:/usr/lib/crt1.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crt1.o):g" \
+		src/m/amdx86-64.h src/s/gnu-linux.h src/s/freebsd.h || die "unable to fix amdx86-64.h and freebsd.h settings"
 
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.
diff --git a/app-editors/emacs/emacs-23.1-r2.ebuild b/app-editors/emacs/emacs-23.1-r2.ebuild
--- a/app-editors/emacs/emacs-23.1-r2.ebuild
+++ b/app-editors/emacs/emacs-23.1-r2.ebuild
@@ -95,9 +95,12 @@ src_prepare() {
 		EPATCH_SUFFIX=patch epatch
 	fi
 
-	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"
+	sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtbegin.o):g" \
+		-e "s:/usr/lib/crtend.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtend.o):g" \
+		-e "s:/usr/lib/crtn.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crtn.o):g" \
+		-e "s:/usr/lib/crti.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crti.o):g" \
+		-e "s:/usr/lib/crt1.o:$(`tc-getCC` ${CFLAGS} -print-file-name=crt1.o):g" \
+		src/m/amdx86-64.h src/s/gnu-linux.h src/s/freebsd.h || die "unable to fix amdx86-64.h and freebsd.h settings"
 
 	if ! use alsa; then
 		# ALSA is detected even if not requested by its USE flag.