Remove old.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 15 insertions, 173 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 30862862c5ee..2317061574cc 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.612 2014/04/23 08:47:24 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.613 2014/04/23 11:38:37 ulm Exp $
+
+  23 Apr 2014; Ulrich Müller <ulm@gentoo.org> -emacs-18.59-r8.ebuild:
+  Remove old.
 
   23 Apr 2014; Chema Alonso <nimiux@gentoo.org> emacs-18.59-r9.ebuild:
   Stable for amd64 wrt bug #502262
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 5eee4dd78c6a..0e7b27e7150d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,7 +16,6 @@ DIST emacs-24.3-patches-5.tar.xz 3260 SHA256 ed9928b23a8b73b3ad265ba6866f609cdf6
 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
 DIST leim-21.4.tar.gz 3291433 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b SHA512 c361996f7a3fcc550e7af30a7df3f692071ded2c9dce998e72f537b0e8011f319cfae1742d0be463608a86852046cba23037a29c3ecdcbaf5976807e1d1a1e2c WHIRLPOOL d7f25d5d491f323b80609567ce5cbcb5f20109cdd4671e9972c79279a3ca5338bbf67d35ae8f0bc627bc06917f545d71ab1f66a09c647f47ddaea26772bfc5c1
 EBUILD emacs-18.59-r10.ebuild 4309 SHA256 04fbd004ef5f1470000355ca89e461a3d5009b9e63b4fb8e464736471e1cc580 SHA512 b529cb8ed4751b52a68a17acbbe24d7bf7da23a7cd5df81e1fd914e584b8cafbf8e342bb6f2e1f1755c3285b8ee52af1c02cf81a93656c1ae4d3fa4e84958e1f WHIRLPOOL 26917436e6e2a5fccc59d35ea12f6fecf5bfa052cbe0cad7e66757bc537459e368553439f040500f6b7b422771ebd81721986477d91978a7b58e864a4f9e2eca
-EBUILD emacs-18.59-r8.ebuild 4610 SHA256 b741cf210345fbbcf2f088e98c867e00d4603a26e7897d572b25753a5b07a8a0 SHA512 b53064f7addb20b5aff8990c1efc23e930940725a46759853781eeb2392ef9557139a3b31bbad7ad0928badf9f5623825c15a041e280089eff711c7f10f255cd WHIRLPOOL 550f9c25817349d6196da5c6ad631a1005acaca95120c47a9ef3cdf22a4caea32b452a717f46a7219878fc15a2896e28e95ca0434d01efa413d647187d7b2689
 EBUILD emacs-18.59-r9.ebuild 4846 SHA256 aebfe7d9cec4f4d70d859dacdc1092b5e7bd76b78f331accd3e440cc3f6528c0 SHA512 e47f460fcb123c5fc4a59cfcb02fb7e8182ff45fd2e5e09e3fff387028b5ed50c0ec54012257e0f993cd59623ed5a8aa0985c8ce8467cf41b4d45ddaeb2589ec WHIRLPOOL 8ecd973c46362f6fd35a4306170f3ba72381bbf1493ed067573b493f1e00a30f9f4610c79d418876f707e5642b7cd95e145e5278b1a5fc33312b40eab558308d
 EBUILD emacs-21.4-r25.ebuild 5477 SHA256 130d6f9974e47bef70995dfa3b7e1ade026a4015d106c3008c481bfd9cb2403f SHA512 fb271e84cd7f871e59031a988671c0ff6dcf9c14f6f21151f20bdaae73dee5b9f31cb558f723754450a2fe51b835e687b20d7e21fda24026fd2f9dbb10239ebd WHIRLPOOL 8a0f499f08358a1c9bb139b7d71d84a9e5f58ce1feabee65a6484beda810898d4954dad073dd62d2dbbd00af5bdc53c751f8e5de36f8b14ec0ca77fc5c3c997c
 EBUILD emacs-22.3-r11.ebuild 7964 SHA256 b1f79b32df1ef7a61806dcc9519db27118d0ea636a2d91c5fb20321c861e05a4 SHA512 fd782d43552cbabf115e83b3f713f73a326110358affa28b2963e338023459922ad388623065fb32d0990f8e0d8880e34538644f23a173b73d4ef1138d68d24c WHIRLPOOL 448db7d9cad5ef7f8451c2c1db06f2ecdca47c6de5b210617ba079e411d413544e5a402196f7aadf054a66df84865c399653253523d242b1423c843bfa5d0737
@@ -25,16 +24,19 @@ EBUILD emacs-23.4-r7.ebuild 11152 SHA256 5540d97dc261b7c7afb286696a148516b7d4f17
 EBUILD emacs-24.2-r1.ebuild 11004 SHA256 e0b04d9da0ec883437134abd0253ea6ededef096bebe5c76a64883489eb9b89e SHA512 d3a40b1c261d0b0c217d6fa1b4874781b78c0c27e6f8662f4ce0f279d20dec5e1b32ba566cf56df25cb8f7b1bf72b54a7c4af478dc95cf948edb77ffab3682bd WHIRLPOOL 22e196214a7bc2ab00b40711d6d51bbac08cfadc2e6c9d5778be02b22c406d3601238870172ef28ae2dc47fdef5f86d35ff83aea6d88ee23112b06f2c0fa2dc3
 EBUILD emacs-24.3-r2.ebuild 10786 SHA256 24ee66757397c4c8ba91873575ca196edb67e4e31732144ad344e02e3777cad9 SHA512 47a49c1dac01279af2272aec81347ae9d9e40c7879e8ba25070f315c0d342daaddd4bea457fdd021b07c3bf2ab677185bf9c4ce92ae0d0cca4ce3e5f4eae73f6 WHIRLPOOL d5449aa8296057c805b2bb79ee067098ea6809154e31a027468beeee965246725c5378b9ea9c84343c5ea8d7fa8df056e6d5bff16f5a73026ba841a5ea7930aa
 EBUILD emacs-24.3-r3.ebuild 11067 SHA256 5287fcff4ef80f8b5be4fd9ef13d38466b8e7d74e949772ae5c8539c2ffb03ff SHA512 f3dbc9174369cfc83c20b52b7d2168b5a703eef753dca01c2658029e665a4a507009232241c9fe855211a85ca7ffaa97fdca3cdf544296c7a0bce9fe9f4293bf WHIRLPOOL 98876a6a50d27b1251e26a17c605bd34209f90124535eab114f5a07ae83bf20bc1d7083ea40024e696e9bc8be48808f6090d48339b328b1fc1cf9e6defd946a6
-MISC ChangeLog 85030 SHA256 040d25f462d889d023eeb5a3c9b961d5d1ac959b6b93f673226b230155e883cd SHA512 2b06c01aca6cea3445e606667151146a222b1470c8ac57beadf0ddd500dde3b2bcbac6eb1285f270de3fb101cd32997148599632b3c2a699ba431b5db900c8bf WHIRLPOOL cf1e5b9ac0136003e284cf57d2c97d2c0796b90c22fb166a446f5bdd1282dd3d97c489040676ac1c720f4b29561d7d2bbfd64fc49c054a3a791a02070e565735
+MISC ChangeLog 85113 SHA256 3320432b8b3b028e84b76ee48af48bb09928068d4dc1b41b9d38a6f0521ccecb SHA512 9148f1f227d79f5b41a8eb9ac176818fba2983ddb82c48a132af989bb3bfef2437a5b2ff4be079d4d6b37961f9f4638ad357129ac0510051a306fa9259235fa1 WHIRLPOOL 73009e40037132cfd4e13718b7a468c5cfe1f3d83da4c9aab7eed15e72ff24bdf43fcb454b45674462802a3b56787fceeafbe596ab5a3200775acfafc2d1aa8c
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTV35WAAoJEA2sAkrWKOU2lqYIAIL1dnvIFP0hzmiBpumiHVlD
-y7ZXFHexU7o2NvOCmhSAYFuXj1EglAQEEIk2nF3c5XyxehPhNjWe/7btidpQeiin
-l4JO9Z29IuwrLZUwTljygQiG6LBrIzYC1d3L6dNrIbjRzUFhY7EWzW8kMB9vGDOr
-HxUX/NjoOQ8lr0kgk+lnd8Mj+nkA27AfMHjFoElhxwR96rBuEAqEmjz3EP4EaIHk
-Ta7R91WtqekMZtensYutNZCTNB57w0c1Gsr7s/Me9FgBD/5oFTvC6VWRcsaiCcn3
-Am3cOqAaihfs6GQ+SY50OC3uuglJc/0Scl9GQZrV6xjlxjY3eK+giJaa226lnvs=
-=3EAi
+iQGcBAEBCAAGBQJTV6ZZAAoJEJQzkH1pP7W4EUQL/2cgX/CNrJq0MXgfjusDCreR
+rcS6Oct2KBHB/9EEwEw7jIVlWpwOR/3lFgLHK7HN59R5rP4PXvdsRephFVsWc9Wx
+77q0Q2w1CwiLQcwAdyU08J1bkfRJsF7rYkRnNg+8vGTgeY2GVUcYWJhDPCJRqwO3
+QKbQhVArf1mw5n9z10WDh3WJNmAEaPj7Voxwrch3NuLvDyecoHUrxSuX6saX21K8
+vxMZv1VGA2n5duzEB2ZYC/Uw5GIqV2xdmUVwLsM3d2fF6c1JndlBxkwPRXPyyxeC
+YhQM+m6JlJElVVriDNxwQqriBRnxUgCgGQYitWhJ1UkeHOfP0SYGc2RH4NCoqu0N
++V25qWb4GFQi158NazAA/A1WZ7NbvGU3f8M3mVtHN6eXSGoiSCp3CnWKlH913RdM
+XW7DzDy2X9adhb32YKkH87BnE5wly1YSCkVqc/bu5KM23dq+zdHWtSZkDUoKVHtq
+fYVz0JbmPDXTmCPK4NAnZctCaPP+skhy6QHM3iKSCA==
+=mrlH
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
deleted file mode 100644
index 941a99fff890..000000000000
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.14 2014/03/29 11:56:09 ulm Exp $
-
-EAPI=4
-
-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-8.tar.bz2"
-
-LICENSE="GPL-1+ GPL-2+ BSD" #HPND
-SLOT="18"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.2
-	amd64? (
-		|| (
-			sys-libs/ncurses[abi_x86_32(-)]
-			app-emulation/emul-linux-x86-baselibs[development]
-		)
-	)"
-#	X? ( x11-libs/libX11[-xcb] )
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff"
-	EPATCH_SUFFIX=patch epatch
-	epatch_user
-}
-
-src_configure() {
-	# autoconf? What's autoconf? We are living in 1992. ;-)
-	local arch
-	case ${ARCH} in
-		amd64)
-			if has x86 ${MULTILIB_ABIS}; then
-				arch=intel386
-				multilib_toolchain_setup x86
-			else
-				die "Need 32 bit ABI on amd64"
-			fi
-			;;
-		x86) arch=intel386 ;;
-		*) die "Architecture ${ARCH} not yet 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 || die
-
-	cat <<-END >src/paths.h
-		#define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp"
-		#define PATH_EXEC "/usr/share/emacs/${PV}/etc"
-		#define PATH_LOCK "/var/lib/emacs/lock/"
-		#define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!"
-	END
-
-	sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \
-		-e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \
-		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" \
-		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local basedir="/usr/share/emacs/${PV}" i
-
-	dodir ${basedir}
-	dodir /usr/share/man/man1
-	emake --jobs=1 \
-		LIBDIR="${D}"${basedir} \
-		BINDIR="${D}"/usr/bin \
-		MANDIR="${D}"/usr/share/man/man1 \
-		install
-
-	rmdir "${D}"${basedir}/lock || die
-	find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \
-		-o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die
-	fperms -R go-w ${basedir}
-
-	# remove duplicate DOC file
-	rm "${D}"${basedir}/etc/DOC || die
-
-	# move executables to the correct place
-	mv "${D}"/usr/bin/emacs{,-${SLOT}} || die
-	for i in etags ctags emacsclient; do
-		mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	dodir /usr/libexec/emacs/${PV}
-	for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \
-		yow env server
-	do
-		mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die
-		dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i}
-	done
-	for i in test-distrib make-docfile; do
-		rm "${D}"${basedir}/etc/${i} || die
-	done
-
-	# move man page
-	mv "${D}"/usr/share/man/man1/emacs{,-emacs-${SLOT}}.1 || die
-
-	# move Info files
-	dodir /usr/share/info
-	mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die
-	dosym ../../info/emacs-${SLOT} "${basedir}"/info
-	docompress -x /usr/share/info
-
-	# move Info dir to avoid collisions with the dir file generated by portage
-	mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die
-	touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir
-
-	dodir /var/lib/emacs
-	diropts -m0777
-	keepdir /var/lib/emacs/lock
-
-	dodoc README PROBLEMS
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	if [[ -d "${D}"/usr/share/info ]]; then
-		mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die
-	fi
-
-	# remove symlink and directory installed by -r6 and earlier
-	if [[ -L "${ROOT}"/usr/share/info/emacs-${SLOT} ]]; then
-		ewarn "Removing old symlink /usr/share/info/emacs-${SLOT}"
-		rm "${ROOT}"/usr/share/info/emacs-${SLOT} || die
-	fi
-	if [[ -d "${ROOT}"/usr/share/emacs/${PV}/info \
-		&& ! -L "${ROOT}"/usr/share/emacs/${PV}/info ]]; then
-		ewarn "Removing old directory /usr/share/emacs/${PV}/info"
-		rm -r "${ROOT}"/usr/share/emacs/${PV}/info || die
-	fi
-}
-
-pkg_postinst() {
-	eselect emacs update ifunset
-}
-
-pkg_postrm() {
-	eselect emacs update ifunset
-}