Bump ebuild to EAPI 5. Depend on multilib-enabled ncurses on amd64.

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

3 files changed, 183 insertions, 12 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 6558c6c062f3..c53249ba9b56 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.599 2013/09/19 06:48:28 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.600 2013/10/03 09:21:49 ulm Exp $
+
+*emacs-18.59-r9 (03 Oct 2013)
+
+  03 Oct 2013; Ulrich Müller <ulm@gentoo.org> +emacs-18.59-r9.ebuild:
+  Bump ebuild to EAPI 5. Depend on multilib-enabled ncurses on amd64.
 
   19 Sep 2013; Ulrich Müller <ulm@gentoo.org> -emacs-24.3-r1.ebuild:
   Remove old.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index be0600e97b03..8699e5d47762 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -16,24 +16,25 @@ DIST emacs-24.3-patches-3.tar.xz 2108 SHA256 225e49dea51f913abf0f98800451a2c61ac
 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-r8.ebuild 4714 SHA256 515f85f1b755e6465e75e1529a35eac70cb43615c2c90eae43a99cded14b65be SHA512 c1d089095bbe92370f2605b95d8a9f963a7c0417f18d198f1c8b186bf3becc8d88031705f6aa839e862b9bf3727a068b98bab6ca72a82dc77e9a05117f1ea810 WHIRLPOOL bfd8918d558fcd5d7645a793e7d706c50d6632d6b872d3b95f8e1957d3e8e88f891121b262b067f6453e8294a17f54d234b57c8cc1eb8ac5636b59efab4bbf19
+EBUILD emacs-18.59-r9.ebuild 4749 SHA256 d5d786fb280a0e955200bde1dd03f1c9adcc02fe8f8db7a2730118c64281f008 SHA512 d0ff9a0c849376a9283d7bd971ab2becaf350123ab284dcf4833906af8542c119c82b9d3b0038870b197f963aa613032daeb0c430e2ffa61036d18a0ca18578e WHIRLPOOL 6408af0e91c6f993abf44063a14a99d244a17e7ca5d311ce332105a2630832be7ddfb7ace0f39be529393124d36a125cc09b23503512f93cbdface763ce64aaf
 EBUILD emacs-21.4-r24.ebuild 5286 SHA256 564082d9d96421342ec92f1d303ea07fb44ccf4c10aaf0d746a4fe8466ce7f74 SHA512 dd34062685d7c81e080d1ecc31de6c2da5ff6bf1e8f86794724c4edfad5dcd325e6f10e90f96a4700f48186bb4c887a962322a97ef15f57544aaab3250885b26 WHIRLPOOL d1baaf141b4833d23f12628b21b168f624a3f448b05103f123034744bd3de45d209369d6c3b91f038a31511e19990eeb0c1ac02ddb6da28123080726a579195a
 EBUILD emacs-22.3-r10.ebuild 7738 SHA256 5a219fa5f170f33347f07f4fcd8f52e8290bb3cd0c0be2c4abdadefd311511f3 SHA512 35a1450f8cbaeee5a14b7a8fb5e428e473b86e3b31481fad0144168a07b5f3158c9b2c3e68e244f1c14b8b044b1d0736d66e249239482ca3aa4b8be4ad8cfdbd WHIRLPOOL ace481ef8a33d517cb153545fd310761658d592da4232ab8d58c79e4c42bb742436a44fbc99ad91f472b9586bd62c20549347cbca7418c133a7a5b92ee66ba0b
 EBUILD emacs-23.4-r6.ebuild 10664 SHA256 23f281f4a84f70d0af8505fe55c06db51f2cb37dba030946afdff6a188660383 SHA512 1b38b8063103b5f1e2ad44a3731cc496a118eaa4d9151b5119ee84279fcd701ef45c8f2abc154ecb0f029633fdfa12103e43145fb5b043d735315b6c51eaa747 WHIRLPOOL 0e99ea5838535c69f2ac72957c557051ff86a49bab69afd51a62e46d141d72807982450c5bcf174cf4ae957abcaf8e2be3bb15ace17cb5f510af78d328ff4f5e
 EBUILD emacs-24.2-r1.ebuild 11000 SHA256 c482a3c0e91ffc14241a7576fbe99342831f5aeb11ae8f714bb239b9cb416b7e SHA512 93ddb550c0fdc801206588f7009401305877c93e7c03ab72a53c8b44763dc5b078f272e10631949a189476a12677d6e2c0f6f69c793f93efff80607591bd74e4 WHIRLPOOL 3d058a2fc9d74e247f9b90028e8b0e7976a3de28ba51252e4da311761d5196094cf0295d020f4d02c9caa14a35f2535fdd36495694c73b10a4e9c0c766da070d
 EBUILD emacs-24.3-r2.ebuild 10650 SHA256 df393015777ce3bda50f05d1c5a7f78687b9a2e428a19f0fc826d38814f8f8cc SHA512 d61735653b1004a1433632c522b61dfece209d8e97e3632af5632e865287a850794127493e0395d7f1b57486f07e6efe90a7735a5d28fd7d60f70bfbd8543344 WHIRLPOOL edb594efeca7e1e996c05b892b636ae5c4c35a3edae17fc34a509284cd32817458d8a470cc4d37558df9b96c9741f95cd73818d549aa415abb8bdaaf3e68e31e
-MISC ChangeLog 82842 SHA256 4ce8f2d3a149c44a35d86ff282d63dea12d4e824c4546ea2f66beeb3e3e4e684 SHA512 75f8f51b9bf4efbe2781217515377363f01d06a291081008e38c2614b16bb464936e0cbfb6c117c0462950c4149dca9c2a5c69fd63f5d854f4e1cacf4562992a WHIRLPOOL 463c098fbb6a5cc33d0a885bfdaaac7565d1321f83021e26cee342fb03dcbccf134590cd57a0d4456b3fa0e9496bff9e7351eb49803fe101f371b527fc0259de
+MISC ChangeLog 83015 SHA256 9c7dcc4356049dc9f1d7933b2ba952e6942cf5bff47f3309d1b0beb53c34632d SHA512 7d8f6bea3a077562fa728813a7a554e7781b02c257f84faf34c68c2c07485c68e83f589f61cc5abbb4a0c59908eb015a094156ad7e17bcf94d34361c794a2aeb WHIRLPOOL 86feefb960b1efb5a561cfcde7401e4cbadd5bfd8451367972fce51b3739e305c0149f68497b500e9b6460cea7f863e76fb17804a6d18c66710c6d1c749c8b16
 MISC metadata.xml 2554 SHA256 94ab92fa323dcb5747564f95bfd1e2a3eca2511cd3e95b48e4ca95ea40ac8238 SHA512 24207b2227969f1d87126bbca5046f10f848f22584fa9c2a23a88ebb854e4344cc564902be1e6e1b86ae8b9da416f65ccf6172d4595633d6063f78893f9ae0c1 WHIRLPOOL db5cb9f87e4804152bf0a41807497733f4a4c382dd634b2ba7cc41fb6bda07191adca7e68b11dcac79d681b3b17dc9a4d629d0b8d152cd8c148883e754385155
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQGcBAEBCAAGBQJSOp5eAAoJEJQzkH1pP7W4bwIL/3FKuV0sctdSP1zrPljUEHfQ
-yFZp1meVyTXBwysb7uFGVqDdnEGvZD8EL1s8r25b8u0x5CbWizoWI5SdmtObczR8
-ZiF0iSneLx4zO5+h698usNIjQgiJXC7FayD5qANDcwQU703SX/sBkzZP0M2EHxNs
-7uKTnFS5/c/NdAu/OUu3RUU1MdXuo+f/8cLelBr+tePpg+FinzIifnLv1xC0ak7s
-YII+RwGdRQB+jzlxJISp2y/T3JNQjCFXvGZItbC7l/nE7WDCACfFBHEBpjoHAPb1
-1qdocVnRFfJcpy1X3Rw7EYHu4vaoI0yEJJ9b7iUBYbVJSWrrsmFY3JcHA7UUXl4p
-R9HoHgrW3dh1NWP/PZNz2LX7M8xU3Ce2KqhSPm8+1grPkRycwX6nnsaZtrLaeCde
-uVRr7rKIpGazYNakAMOziF6xHEN0CHpusuePaqbp7qUijGzgBbDQE02fy7v2CI4h
-bMvRwh+ycEysYwzkyJk10WQgTANf33kzUuMbs7rm1g==
-=NtHr
+iQGcBAEBCAAGBQJSTTdiAAoJEJQzkH1pP7W4j7UL+gO72khv2IuE25LvaYvu8NCk
+oCKgD2slUDPncApG9YGC+WXxxMUZ27EBwOSbRv1YF8qkiDBpNtx1srQ6y6lUZ2H0
+vwzoXrS8QbKi4Z4yN9K/KBTV1p6fKmMe1eo/5eD/nx75b0LwOFwZR+lbMP3D4rLI
+nnLknpM0BqBTproiPAb7OOD3vU/8koRpeNLVGKgWUPcfKq2GLdhw1rGoWQN/1zRp
+tRnfCI2zkEe8rZt0IhkDNJgVV2UO5E0I2IT51ZXrNcV8j65VPxlrFlhVz4hY9p2g
+QdmdarqWHzxF4rlrrz+5tVSgdbEHaZRY9mEmBjXzEc1JJMLwRI2RH2mlEDIef+IM
+NP9jBo1wQzRaosbJlHO2b54hqUIUU16Ofi8IcBGVwjfyNaGIFnUx71f2TOo4ub/Z
+KUVHHqdDk00ChJm/glkm546GNJPvnrgJWiTGUzZtTSOnV5SmctVm0G45EsCGLva7
+nsuJ3NaRqjxPcywbY9r+v+/+WGWGjB+vCdZs0G0GYg==
+=OcGB
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-18.59-r9.ebuild b/app-editors/emacs/emacs-18.59-r9.ebuild
new file mode 100644
index 000000000000..df2a0ae9616b
--- /dev/null
+++ b/app-editors/emacs/emacs-18.59-r9.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r9.ebuild,v 1.1 2013/10/03 09:21:49 ulm Exp $
+
+EAPI=5
+
+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="+abi_x86_32 abi_x86_x32"
+REQUIRED_USE="amd64? ( || ( abi_x86_32 abi_x86_x32 ) )"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.2
+	amd64? (
+		sys-libs/ncurses[abi_x86_x32(-)?]
+		!abi_x86_x32? ( sys-libs/ncurses[abi_x86_32(-)?] )
+	)"
+#	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 use abi_x86_x32; then
+				arch=x86-x32
+				multilib_toolchain_setup x32
+			elif use abi_x86_32; 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
+}