Remove old.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 20 insertions, 107 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a640197e35bd..440b520488ae 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.453 2012/01/04 17:30:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.454 2012/01/04 19:50:48 ulm Exp $
+
+  04 Jan 2012; Ulrich Mueller <ulm@gentoo.org> -emacs-18.59-r6.ebuild:
+  Remove old.
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> emacs-18.59-r8.ebuild:
   x86 stable wrt bug #396139
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index ae891899dd89..e35129303cc0 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,8 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 RMD160 4fab87eead1a66d767d2334d31507695dcf7b4a8 SHA1 075f1c9cf86e9a10fb686ebd04a2f95d6e4c3972 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd
-DIST emacs-18.59-patches-5.tar.bz2 17964 RMD160 55c561bf455fc101a65c4ec29956b6cecaa8f632 SHA1 7e9532ff07aa8141856382ef11344221453269fd SHA256 ab41883691956d705a9306f2a2bc803aff1ceea43da7e9539ff0ed51d2ae0953
 DIST emacs-18.59-patches-7.tar.bz2 19400 RMD160 72588ffa6b625a775b42d5898eccb43932ff67f9 SHA1 d7d0e16ea7896f5fcde877b68dcd6be032b00beb SHA256 e96d63ae61bbded28b25d1bff6ec9a7e732f870f9f71152200bcb35658ef2f21
 DIST emacs-18.59.tar.gz 2962652 RMD160 4976d0f0f34b6d54db6774d24a528f74a3bb20dc SHA1 15b25bf130e3eeb91f3eea8c01a3dec9aabf23cc SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e
 DIST emacs-21.4-patches-12.tar.bz2 13207 RMD160 1a35ce8b479ab783b3bf2d827bbae98c0b5185e1 SHA1 35c72d283f72eb479860766ce792b93b8af6cab6 SHA256 849ba3d3e75d759fcc8157057a9872338f4a99c3f776dbdce48036317b0f1125
@@ -14,19 +13,28 @@ DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e99
 DIST emacs-23.3-patches-3.tar.bz2 14783 RMD160 5a609bfded363d63f6146c482881d63ea6fe8b08 SHA1 da25e5ab9e5c10d36fdffe17ee3825822f8618b7 SHA256 1c8b404d52a5f66861e1533c785642c5c0a371d55287b5df7d9c2587a24d1bbd
 DIST emacs-23.3a.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-18.59-r8.ebuild 4321 RMD160 5e3dd95eb27eb8751c77584f63b940b33f100213 SHA1 381fa77d88b5aa067c217cb75abf39a54666dce6 SHA256 1ca45281d2027bca0ca64300534f0713b80b98af2f504dd5810aa7608ed60f48
 EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5a SHA1 04e1932afc02456234eb46ffc0baa35681162a7e SHA256 263a626ed20b87ae8f19b136ce75f90d9f188e4a69d8bcfdbef540b419f9b693
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
 EBUILD emacs-23.3-r3.ebuild 10418 RMD160 614088e8d707016d832304080cc8a18c767c85c1 SHA1 78086accf5e921d31de5da9cdc848e100776a058 SHA256 dad8aef6845189bdaa6456b046a70824041f3a24ff5d02905a3db042d309ce45
-MISC ChangeLog 64800 RMD160 9af01c5727f4698f2da676ba5de7eccbd09aaa48 SHA1 3823ee148a41a20b42f352e1f6c71bf9c69884ff SHA256 b4aa40ccf6797d6bdb5b657d565f1551b0258dd1dc971207b330e1044f2799ff
+MISC ChangeLog 64879 RMD160 43ceef2b966b3e31a0f628f553c14df4a4f47edf SHA1 05a479952c1344e54157787dedb9673cdf621e01 SHA256 87e217b9bb44c9ce968a43768b9fb19ee0036170d206c326aa4e72d9eacb0a21
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8EjLoACgkQuUQtlDBCeQI2/QCdEKqoqpD0fKifw6gXWLWc7cWg
-Gi0An10U5E7x9DcHkx8CI2Vz20oYUArV
-=piBV
+iQIcBAEBAgAGBQJPBLAfAAoJEDxpGckxwJCBoj8P/i42i0Cai3vBZXRg3KdhxzIh
+V+ThhNU1N8eZDWiUOyy0aBEp/YHY02BzrGfszDzxsHfIWEbkBsrZruD6A3ye3jfY
+GPFiT3BHfE/KQDhJgz95xvSx8hB2RFoj+5MpgpW7FrZiMsiFEbcD6cHlWBLSRjmg
+0zup9O6Z905v9qFCBsa1NDwem/M+ha7bMBO0go4eHzBXzo9BYeXeNhXSwS7rQDFC
+QStOzpPLYWYJGNJGXFZuqLIdjtddPAUWzY33YJaAS2DJkiWhNd+gIYcbD3gN84Nu
+2nvbL3quWMEst3oHhUvnipaz/Lfppk/HcLYFo5SMYp/xd9/rgFnJvdlSHDe1AyOa
+ATU4vaqoRd88X9oyRuxKU1EPweiE7bSKW/0btzQ+uWqeAdk0fDWNCVxjAbS6DpV5
+/l8Zui6R53Pk77qptC7PZjrGZSHNQPmjK/r1HkhFsuZ/zDnmJiTZS6W+ZxdcOTOH
+HNA/AYoS2iKuJutBiwUaQJSvhnHqeUN3r1wag1yEgXxESXBqmT5vsecTBz/AKOxr
+VdI5U1FDOeKi16yjKHuSf4h37cdmHo5GM5OQjK5x1Dgj33DRRBoAZBiUxufKPNiM
+UOcModgakVQ+PCevP03JQdfns0gH5gh4h6JuzVJSxlEgcX07p+7a1IBKdBbN0Qg4
+KuZCLZTC0izhUsVZXgow
+=Rbdc
 -----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
index 643ca2768e26..000000000000
--- a/app-editors/emacs/emacs-18.59-r6.ebuild
+++ /dev/null
@@ -1,98 +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-18.59-r6.ebuild,v 1.10 2010/03/11 08:50:36 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-5.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
-}