Upstream has changed version number of emacs-24 branch to 24.4. Remove old.

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

5 files changed, 22 insertions, 742 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index 9ceccbce2b1d..6919ac507715 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.167 2014/10/02 07:13:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.168 2014/10/17 14:10:13 ulm Exp $
+
+*emacs-vcs-24.4.9999-r1 (17 Oct 2014)
+
+  17 Oct 2014; Ulrich Müller <ulm@gentoo.org> -emacs-vcs-24.3.91.ebuild,
+  -emacs-vcs-24.3.9999-r1.ebuild, -emacs-vcs-24.4.50_pre20140630.ebuild,
+  +emacs-vcs-24.4.9999-r1.ebuild:
+  Upstream has changed version number of emacs-24 branch to 24.4. Remove old.
 
 *emacs-vcs-25.0.9999 (02 Oct 2014)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 7b8e742c15e2..8a8ec309fa71 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,37 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST emacs-24.3.91.tar.xz 39423508 SHA256 40cee18cecd3a54b6b14dd2d9d46bf3de625a1649c39fa8826be42ad47dd217a SHA512 e944755ed464d269b535125f154127215ece9413e369286fe9d572bd32d9ef6160627a19644a9d80593c30d58412c55bb0559d06a7332d9090cb5fea718e1395 WHIRLPOOL f6b31889faa64a359969a33d319461865183d2a40ca61bab3398f07b9a939ac9f6ac8c9f84277e13682032a3f3efdcaf64c6dedf482a05c6c382373e8a27e826
 DIST emacs-24.3.92.tar.xz 39639748 SHA256 e5ae5097cbe22100550365e1022c171834a4b2bbcd663cf0850a10793b34beb7 SHA512 de9e534f4a61d1f4ef6a80445ad73c9ef5860fa7bc10e3f45440b0163aa1eaf3b213410168513bd72f01aeed5c2c5929fb70486fdabee48d7f1248c3ed8878ce WHIRLPOOL db471267cad1658c451154c97782bb83f7995136b5864da5ea69b678af5249df24b2587e1d2f6ed183503c3882211a5d4abadd7150be465eb3db6c56002045fc
 DIST emacs-24.3.93.tar.xz 39710980 SHA256 865434bbd17c6d1a5eb69f1aa62367d86dccba3e875c39f99749c351cc7ca67a SHA512 4a22f96248649a59f01b40f5a3eca9d8f599815e5983f6093bf44da5dcbdd7918777ae28cb68c1e8964bdc6d943f1c88a30eef9a56582fa2bbe9294110a9fd30 WHIRLPOOL a93a19f32dc4a57e2f3812af9ee81c6b763937377aa3b93a2e158a0e0daabec572214fa7e1172fdb89012f930cdbf8096f1e788820daf6781c334258e9f9ed34
 DIST emacs-24.3.94.tar.xz 39709608 SHA256 5751cac3e1604ad100f9847ff8a429c1b0907b26032152c040e89f294e515bc2 SHA512 a1b6e4256684680d2f553a7887678fbc61418dd8a43968b516d6398bf77812786db1208735798700bfcb9aaed9373769460dba5e68051c7ac8cfd895e08c7095 WHIRLPOOL 49693335656ad8ae18aaf11e5e7e4bcb863b6a30436de6c17dcfe8b37142eba80644964709bc5cb95bf8df97364e2a43e7c884457526b1c511d8ece62a22cf08
-DIST emacs-24.4.50_pre20140630.tar.xz 24254808 SHA256 b0572905e0c03130d98c109bc587b0ea7bc9e3a4c86bc936e947707c8c9de7bd SHA512 03744241af70478a4932f8069a821dfe111e5a37fe56d5f7ee151aea0cfcc2a78d3657c46e8ac3897f744c94c118350f350262fed9982b2d09892e65a3084087 WHIRLPOOL edd2b1d37052b55ef761828b130a76ab00e661d4cd65b6698e03974bb9809007fda79161e7cb90d22fdfd0fe0becd0fc3e1c77c3686b3d9051af6fe6b5c6fa51
 DIST emacs-24.4.50_pre20140731.tar.xz 24297368 SHA256 4b91f9038f4d9f456caa587d2b89af734a894f508389ec08c09d1e3d53672501 SHA512 f70d7a5a38b634c9dc6d18ea34ec725888b6372a85fb46e3818fb43773a8378e52e07c23a8f59f93b417b27c6c12e3108ed1115adf06d0a05a7ed85d45b2de07 WHIRLPOOL 3c844819a78d56fe3f007be7d2f6fc635785cabaed9482eb8c8654f4aae1740a284214d75f63036ab7389afa815251835db05823d0ee7a516209e1144506140c
 DIST emacs-24.4.50_pre20140831.tar.xz 24312560 SHA256 ea61b4be2d65948a358f076d41dcb6d47a887f5f01cd691378ce4108417300b8 SHA512 4f2b7f6a2036dae95ffcae51374afe3c9122d909129e71092de7344798402a1d2b7a6197535b7e00889c2032a411ded2e510a579ee154b572efc81574a0aa0f3 WHIRLPOOL 5b9946c07f91f2499a3288859422a450b8beb9cab983ca2f29c500d4486ee9fbd431606cf28501817b776f3cd10ed990989efec80487da79607187d3fccd4e29
 DIST emacs-24.4.50_pre20140929.tar.xz 24341884 SHA256 06a32322c49390e9859f3743e4c0c348c1206d7dc5c33bd3d5248bc642a533df SHA512 7063eaa5e10006c967b7969624bc024ab22c6ac7583ecb631333fe973381325deecca5d3585fd61b55580198bebb900d477c2071f7016f393aa56fcb10b0b9b0 WHIRLPOOL 21eb7d5059aa631055416b6c4971700489653902e29fd0032510ad13b2279dcd6c9f42978101cd4d522baa7eb6014b4308be4a2f6de2f90a12858c467a3b9b2f
-EBUILD emacs-vcs-24.3.91.ebuild 11441 SHA256 2328d3bf668cb98cb343ce95739861ba24c39811a71ecfdd2ec3e91ef10444d7 SHA512 e3eaca660cee9b8aea5b0a8d1287f0474515f815f97b57b06bd270266a9362214d001677519defccfc6de9567c2d331c6308780867ea998e9a4f723b3ddd5640 WHIRLPOOL b25be868f80129222c2ce7ec6a731e95d34008fb8c109515064e24bde84dc869d90afb317406ad35af8857d177cbba4faeaae4b226fb1af13432d2a9f1821519
 EBUILD emacs-vcs-24.3.92.ebuild 11441 SHA256 c7a4970cff2ced6b2b1aa2f66163fad35d018d1061c8bea1c092845e603b85e5 SHA512 6e53a6e5e42f9ca5a6624c65a32ac9332379875d2313b79e8848286efd3a3862463dcb38a1ec4c603ae79fcead473c3fade9241c6187fc19854b3a86578e1515 WHIRLPOOL e1540a1d2b3bcb34f251d1fadbc29e3dcbc9b66ed5b5073a655d34e823bdb7ce0fe68c570fc174dde4e40e70aa2b911d22b47893b228a73eaf37bcfb4094775e
 EBUILD emacs-vcs-24.3.93.ebuild 11441 SHA256 db2c79320b08079da6830bf13f7150bc0ef6e62ac83722589b42265745993e13 SHA512 8d178c23f3d7ad172666bc381731e9420e508015dbfd89bf6eec17c268f8270cc5af94f601d284679aa1e0cd1369960237e86d19558b20ce6548abb681af9c15 WHIRLPOOL 849d65f982eaa99e587e982b9f1a509e4070403ee273b4b3859543d5274cff66c8d58a638dcb303d140d82bb61a75b20a98881db5b5bd1cb8a79fca53f7420c2
 EBUILD emacs-vcs-24.3.94.ebuild 11441 SHA256 62aae713ac97deb6e5bd752530956b9c1f6df6cea30be6a8be1a613cfde8893f SHA512 3d55a554f59bfdfb86880f4ae92bd5739600e98502e1b649d69cbd02a3f76e8d32431f018448980c115331b5c32b3faeb8300b82ee1698df8f7a227a348d55b5 WHIRLPOOL 48e68ded7d35db2ea9ede1f353de488aabae3fc184b1d66683cf20d0209e1151c1bb109de2bb1e01be363ed153d0c254e823026dd7bd1e7440c897076f9e0304
-EBUILD emacs-vcs-24.3.9999-r1.ebuild 11291 SHA256 e18678477ed72ff1124799238306aee8bafb0b2ceedde3c8a3e592d53bf08e32 SHA512 73c310e9a351faf37eb967dc202ccadc5c0d862485938c6df732cf8a83c77ce69bb912fcab337c4447f6d7567f5d994c6596f860aed5930ea0576058c166b3c2 WHIRLPOOL de7371f51cc0d8e7241e82ab8eda1991b65e11cf572b90804333289a06843b19aaccf83ea5d03d7ff0c5e44c82f92bf225138d9ab1565fa56e9a545732256cd2
-EBUILD emacs-vcs-24.4.50_pre20140630.ebuild 11318 SHA256 bf78ad0dc99e14679752e562175509c45c799c821820d916423344df2e800140 SHA512 16873f1ba73aec0c7e845a1a0b89023b873f77dee3ae860562413f003087e44d47c9494803489b4c9c04cb6cbb4930acaede7912e4dd27d73304948cbc073b3e WHIRLPOOL 936ecff95f050e2be0ac7481f28cd5bba1386546a1c497dce2eab1596e723d65b34cd496b86af3af6e236bbe8c5b15d8d8f97d094d0fda23176ce5a9a8e92751
 EBUILD emacs-vcs-24.4.50_pre20140731.ebuild 11318 SHA256 4517905d4754749f2e963d9d6b9ea7cad487f63c0a76de1b96e7ddb0997bd8f6 SHA512 06e4ce02abe81d1b9bd5fd236da861117efd755564039698fb77f92bcf380b2306c694f561423b29754bdbf64648aece5524b01d02ddd4d109c6530ae554dfe0 WHIRLPOOL 5c81a6086ef302895a6bd004416156ccfc6735c86e1f1acf567aa9128fc473b6af0b776d50d0cc7e50fb988c8427a571a546aab2223de5149c3cec5bfbfb8b9f
 EBUILD emacs-vcs-24.4.50_pre20140831.ebuild 11318 SHA256 b2a4d681057e6aa6688756a61140dac8e83bd69f0233dfc3c49fd91cb383e2b9 SHA512 f314ba49da6f4c7014862b77d750940c49a90b257ea58cb88ffc23bff64221b5fe24d891e026cfbb9b5fb91a023ff10998b55d2c2ddfafcd1aab6a466c41fc3f WHIRLPOOL 3c6fdca73de54befda5561eda906556e06a76e427c0398ae01c6a66f89babf5bc27fe5ebf3bc29f8ed2ac7d25585b6631bb8b69806feb084b3903a9e9e610043
 EBUILD emacs-vcs-24.4.50_pre20140929.ebuild 11318 SHA256 661711b335ffaaa44f3fb4205c1b4800c290c4443401d577dfd375908763a886 SHA512 03cd609b8d183a40f73c614c28f1eaa764af9b094666e2523faea5a262f68d42199b5c76050def71347418aaad1fc09161e4cf780316cd9e3efc937775df9902 WHIRLPOOL 88fc64a6cfb906311c862899c466dfad092ff03ca176e083a2fb891b52ce752928f76d317b3b5f374b20e2c738bee9151fe1cf43ff78c2606b5352131190d8f7
+EBUILD emacs-vcs-24.4.9999-r1.ebuild 11447 SHA256 d66bb35d71b758edf87e9fe8929532536d56461e2f5a360835e4d5e92b89d42f SHA512 5e7aa69cfed98fd46bf5e95d49a925594a1550bdc7834c89be2455e2eceee6fbfb5dabee1c23f048f48506d52210d62682f567fbea8da5a7f4e791262679efe6 WHIRLPOOL e9845515f0a8386b0270a87b44b3da3fc04cea601ef697edfaeb24e1ad41c8795ca125b2b228320612672138b3d8053fdcb34a8e6dac40d414beb66fd267e965
 EBUILD emacs-vcs-25.0.9999.ebuild 11285 SHA256 3beef4517aa9f3e7ed93f613f6e3868935baa1041821d2559f2302f2c3bf004c SHA512 af7069025c02c98cb29bde216047d79d5b80bb6d66d88e25a9177b6bf4b85c14182d68237d960acc60da52cf7cf9559107671f954ec7329dcf6463077da5a631 WHIRLPOOL 8cd2f42eeb6b969e3cb611d1804e1dd10ebbdbd1176fe609bf947726fb7576c45743c651efd48e2426992af2ebf97783227343023d662f16c972b5a15a20c082
-MISC ChangeLog 79624 SHA256 8af9a6664d77ca0cc1c3ca8b77a474003d41309eb2a05560d6fe7810274bdde0 SHA512 034806f375ff63432fbb90e09669c62699337d145b954f3aeba866a9a2f4f4cc79e97c54367e6c870b35655cf1945280f9cbeb99b7fd27ba02b0b171ba7cb8aa WHIRLPOOL 2c51ceead0950abf9b5ae907ad977e78a5f3752b1596bf3d70fb940cdb8d664d63286f2d0d93fdbd19c4266f850107b80da4a7d6501143f6b625637242072fe5
+MISC ChangeLog 79923 SHA256 37aa5576a5bc1912cc1716485677ce31c3f1be0ab4275ca3dc4c39d21055af0b SHA512 dbae90010cc3bbc9da89f0ca2a98b30bbeb13a78562fdec613df9589c53caa05bdee7ca3c86f3352f862826189aab395cfccfc7e443eb42670bf0ae2f4ef7abf WHIRLPOOL dd157b20da725eeff327dde11ff47f1efcd328878184c243bf80dd291810a3910fed8f1e390c7f7bb0f8383bffbb3e95eaaf4d6af4d299fa9ee48d7d2e741585
 MISC metadata.xml 2522 SHA256 0dcfb3cd3457215ad785b82adfd0d60eafc10df3ac58c9125f6006e4ac90ced6 SHA512 8fefab8f3644c38b5a5c37e8aba2ee45a0b329b4dd846d280ef33893d940892abaf09204bf807d98870106677caf48e376667a4f2bf7c1dca26e72b6b5ea2c54 WHIRLPOOL b40fe229764c94b5bf59eda550e9a480a9793f3a4df43fa65c0dea518ad2372faf3276ce6009ad44a02907c2df63068b9596fc39e53cc7214dd5b30750df9a8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJULPuQAAoJEJQzkH1pP7W47koMAJtw21H/7ZrETRsQzqtTeBzv
-PIEcSFXzh0gNaqiNidFzVr/PQ5vRepMPY/4O4Snr2oD04R18thwaBVutcYwUJXHN
-uc2m8IfkFXYNDUNsdFA0q7RKIuLb1G0w75LPOs3NJMJ9LDghjSb6ZEKdbHogMwdw
-yZrp0c/9AUE3caUqvrig1RR2btFY2gIiB6WymlJ2qqneqgug+hWAOlTq2UjI/47w
-9vnnIbjfwhyrI5zAgzBOqPLQNlH7EzKyWzfFOvvCwwvLsgf7sLzthediizI41qf9
-TsuwhkcvMrxXKAplCSjdimeBallwbD7NToF/baAENtuiX3Pd0e0yTQZ5KAukGZDo
-mw56j2BAIyVy5NW00diA8hnAPYfsAOoJkzwIv8+3xPbtJw//+idFHxbXzkRkC8W/
-zbTqjeCi4oRe2Ml96QD/Ut8BtOMSHXNdJLcUeh+LB5J5Re+94FhvxFXsvc5FEZnf
-pkgSRPonbbrDWn5mCfpIulHSYSRKMwdFTkdfF1Gk9w==
-=Brex
+iQGcBAEBCAAGBQJUQSPfAAoJEJQzkH1pP7W4lSUL/iQzFYvxvm1RyKOwzjSaTPop
+u+gbuyxyWpecujFpKC+AedRJgQX2LgS5tVevBdIDaSc6QnTv+1bE3xa7Y5CJxUzW
+qZrUWENOIzy7xHHOGnlhYNTUmLS11IziSBWj6CDaB7vjB2aRefIO9HLImDCf35LY
+mXvCDqKpTwQnvd3mu2rcO8oAyPZdyON6WLo2wDojBkLu2J52YYy358rP9KbR03uR
+8v8IYWIUvmLIiK/prFhZFKdtgt4TRUKgAUtWtfOgr8WOfqqSGP/W3gPwXFZay+Wn
+0L58foTKZ4RIIK26TH4Y8hTfzAUC/l29Ub5QplOGC4BaTYWTDUvgVDwBG90cxhs0
+59UONhi8PczuTHn+Yx6MtRGN5jIhQCayh88HLXKOA8OCkkajg7kiq5XajqaYelx/
++9A24yzpefbGFYbjxnqnnlFFF/vN/Gox/NQifOqWIdX2LvvDthcjiYOrRxEefwN9
+39ukv9Cn3QnT/NnKM8zEkP0n71yYQxQBhHxylEvAQw==
+=xZTb
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
deleted file mode 100644
index 1753dd82f387..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.9999-r1.ebuild
+++ /dev/null
@@ -1,361 +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-vcs/emacs-vcs-24.3.9999-r1.ebuild,v 1.5 2014/05/16 20:10:42 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="emacs-24"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-	EBZR_WORKDIR_CHECKOUT="t"	#434746
-	inherit bzr
-	S="${EBZR_UNPACK_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	S="${WORKDIR}/emacs-${FULL_VERSION}"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT(emacs,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild
deleted file mode 100644
index 0bbfb4958975..000000000000
--- a/app-editors/emacs-vcs/emacs-vcs-24.4.50_pre20140630.ebuild
+++ /dev/null
@@ -1,362 +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-vcs/emacs-vcs-24.4.50_pre20140630.ebuild,v 1.1 2014/07/07 07:09:39 ulm Exp $
-
-EAPI=5
-
-inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
-
-if [[ ${PV##*.} = 9999 ]]; then
-	EBZR_PROJECT="emacs"
-	EBZR_BRANCH="trunk"
-	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# "Nosmart" is much faster for initial branching.
-	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
-	EBZR_UNPACK_DIR="${WORKDIR}/emacs"
-	EBZR_WORKDIR_CHECKOUT="t"	#434746
-	inherit bzr
-	S="${EBZR_UNPACK_DIR}"
-else
-	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
-		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
-	# FULL_VERSION keeps the full version number, which is needed in
-	# order to determine some path information correctly for copy/move
-	# operations later on
-	FULL_VERSION="${PV%%_*}"
-	#S="${WORKDIR}/emacs-${FULL_VERSION}"
-	S="${WORKDIR}/emacs"
-fi
-
-DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
-HOMEPAGE="http://www.gnu.org/software/emacs/"
-
-LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
-SLOT="24"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
-REQUIRED_USE="?? ( aqua X )"
-
-RDEPEND="sys-libs/ncurses
-	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
-	net-libs/liblockfile
-	acl? ( virtual/acl )
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	gfile? ( >=dev-libs/glib-2.28.6 )
-	gnutls? ( net-libs/gnutls )
-	gpm? ( sys-libs/gpm )
-	hesiod? ( net-dns/hesiod )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( >=dev-libs/libxml2-2.2.0 )
-	selinux? ( sys-libs/libselinux )
-	zlib? ( sys-libs/zlib )
-	X? (
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-misc/xbitmaps
-		gconf? ( >=gnome-base/gconf-2.26.2 )
-		gsettings? ( >=dev-libs/glib-2.28.6 )
-		gif? ( media-libs/giflib )
-		jpeg? ( virtual/jpeg:0= )
-		png? ( >=media-libs/libpng-1.4:0= )
-		svg? ( >=gnome-base/librsvg-2.0 )
-		tiff? ( media-libs/tiff )
-		xpm? ( x11-libs/libXpm )
-		imagemagick? ( >=media-gfx/imagemagick-6.6.2 )
-		xft? (
-			media-libs/fontconfig
-			media-libs/freetype
-			x11-libs/libXft
-			m17n-lib? (
-				>=dev-libs/libotf-0.9.4
-				>=dev-libs/m17n-lib-1.5.1
-			)
-		)
-		gtk? (
-			gtk3? ( x11-libs/gtk+:3 )
-			!gtk3? ( x11-libs/gtk+:2 )
-		)
-		!gtk? (
-			motif? ( >=x11-libs/motif-2.3:0 )
-			!motif? (
-				Xaw3d? ( x11-libs/libXaw3d )
-				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
-			)
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gzip-el? ( app-arch/gzip )
-	pax_kernel? (
-		sys-apps/attr
-		sys-apps/paxctl
-	)"
-
-if [[ ${PV##*.} = 9999 ]]; then
-	DEPEND="${DEPEND}
-	sys-apps/texinfo"
-fi
-
-EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
-SITEFILE="20${PN}-${SLOT}-gentoo.el"
-
-src_prepare() {
-	if [[ ${PV##*.} = 9999 ]]; then
-		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
-			configure.ac)
-		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
-		einfo "Emacs branch: ${EBZR_BRANCH}"
-		einfo "Revision: ${EBZR_REVISION:-${EBZR_REVNO}}"
-		einfo "Emacs version number: ${FULL_VERSION}"
-		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
-			|| die "Upstream version number changed to ${FULL_VERSION}"
-	fi
-
-	epatch_user
-
-	# Fix filename reference in redirected man page
-	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
-		|| die "unable to sed ctags.1"
-
-	AT_M4DIR=m4 eautoreconf
-}
-
-src_configure() {
-	strip-flags
-
-	if use sh; then
-		replace-flags "-O[1-9]" -O0		#262359
-	elif use ia64; then
-		replace-flags "-O[2-9]" -O1		#325373
-	else
-		replace-flags "-O[3-9]" -O2
-	fi
-
-	local myconf
-
-	if use alsa; then
-		use sound || ewarn \
-			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
-		myconf+=" --with-sound=alsa"
-	else
-		myconf+=" --with-sound=$(usex sound oss)"
-	fi
-
-	if use X; then
-		myconf+=" --with-x --without-ns"
-		myconf+=" $(use_with gconf)"
-		myconf+=" $(use_with gsettings)"
-		myconf+=" $(use_with toolkit-scroll-bars)"
-		myconf+=" $(use_with gif)"
-		myconf+=" $(use_with jpeg)"
-		myconf+=" $(use_with png)"
-		myconf+=" $(use_with svg rsvg)"
-		myconf+=" $(use_with tiff)"
-		myconf+=" $(use_with xpm)"
-		myconf+=" $(use_with imagemagick)"
-
-		if use xft; then
-			myconf+=" --with-xft"
-			myconf+=" $(use_with m17n-lib libotf)"
-			myconf+=" $(use_with m17n-lib m17n-flt)"
-		else
-			myconf+=" --without-xft"
-			myconf+=" --without-libotf --without-m17n-flt"
-			use m17n-lib && ewarn \
-				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
-		fi
-
-		local f
-		if use gtk; then
-			einfo "Configuring to build with GIMP Toolkit (GTK+)"
-			myconf+=" --with-x-toolkit=$(usex gtk3 gtk3 gtk2)"
-			for f in motif Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"gtk\" is set."
-			done
-		elif use motif; then
-			einfo "Configuring to build with Motif toolkit"
-			myconf+=" --with-x-toolkit=motif"
-			for f in Xaw3d athena; do
-				use ${f} && ewarn \
-					"USE flag \"${f}\" has no effect if \"motif\" is set."
-			done
-		elif use athena || use Xaw3d; then
-			einfo "Configuring to build with Athena/Lucid toolkit"
-			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
-		else
-			einfo "Configuring to build with no toolkit"
-			myconf+=" --with-x-toolkit=no"
-		fi
-	elif use aqua; then
-		einfo "Configuring to build with Nextstep (Cocoa) support"
-		myconf+=" --with-ns --disable-ns-self-contained"
-		myconf+=" --without-x"
-	else
-		myconf+=" --without-x --without-ns"
-	fi
-
-	# Save version information in the Emacs binary. It will be available
-	# in variable "system-configuration-options".
-	myconf+=" GENTOO_PACKAGE=${CATEGORY}/${PF}"
-	if [[ ${PV##*.} = 9999 ]]; then
-		myconf+=" EBZR_BRANCH=${EBZR_BRANCH} EBZR_REVNO=${EBZR_REVNO}"
-	fi
-
-	econf \
-		--program-suffix="-${EMACS_SUFFIX}" \
-		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
-		--without-compress-install \
-		--with-file-notification=$(usev gfile || usev inotify || echo no) \
-		$(use_enable acl) \
-		$(use_with dbus) \
-		$(use_with gnutls) \
-		$(use_with gpm) \
-		$(use_with hesiod) \
-		$(use_with kerberos) $(use_with kerberos kerberos5) \
-		$(use_with libxml2 xml2) \
-		$(use_with selinux) \
-		$(use_with wide-int) \
-		$(use_with zlib) \
-		${myconf}
-}
-
-src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
-}
-
-src_install () {
-	emake DESTDIR="${D}" NO_BIN_LINK=t install
-
-	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
-		|| die "moving emacs executable failed"
-	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
-		|| die "moving emacs man page failed"
-
-	# move info dir to avoid collisions with the dir file generated by portage
-	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
-		|| die "moving info dir failed"
-	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
-	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
-
-	# avoid collision between slots, see bug #169033 e.g.
-	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
-	rm -rf "${ED}"/usr/share/{applications,icons}
-	rm -rf "${ED}"/var
-
-	# remove unused <version>/site-lisp dir
-	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
-
-	if use gzip-el; then
-		# compress .el files when a corresponding .elc exists
-		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
-			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
-		assert "gzip .el failed"
-	fi
-
-	local cdir
-	if use source; then
-		cdir="/usr/share/emacs/${FULL_VERSION}/src"
-		insinto "${cdir}"
-		# This is not meant to install all the source -- just the
-		# C source you might find via find-function
-		doins src/*.{c,h,m}
-	elif has installsources ${FEATURES}; then
-		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
-	fi
-
-	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF
-	X
-	;;; ${PN}-${SLOT} site-lisp configuration
-	X
-	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
-	Y  (setq find-function-C-source-directory
-	Y	"${EPREFIX}${cdir}")
-	X  (let ((path (getenv "INFOPATH"))
-	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
-	X	(re "\\\\\`${EPREFIX}/usr/share/info\\\\>"))
-	X    (and path
-	X	 ;; move Emacs Info dir before anything else in /usr/share/info
-	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
-	X	   (while (and (cdr q) (not (string-match re (cadr q))))
-	X	     (setq q (cdr q)))
-	X	   (setcdr q (cons dir (delete dir (cdr q))))
-	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
-	EOF
-	elisp-site-file-install "${T}/${SITEFILE}" || die
-
-	dodoc README BUGS
-
-	if use aqua; then
-		dodir /Applications/Gentoo
-		rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app
-		mv nextstep/Emacs.app \
-			"${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die
-	fi
-
-	DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs
-		through the Emacs eselect module, which also redirects man and info
-		pages. Therefore, several Emacs versions can be installed at the
-		same time. \"man emacs.eselect\" for details.
-		\\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is
-		strongly recommended that you use app-admin/emacs-updater to rebuild
-		all byte-compiled elisp files of the installed Emacs packages."
-	use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
-		Installing media-fonts/font-adobe-{75,100}dpi on the X server's
-		machine would satisfy basic Emacs requirements under X11.
-		See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
-		for how to enable anti-aliased fonts."
-	use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in
-		\"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink
-		it into /Applications by yourself."
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# move Info dir file to correct name
-	local infodir=/usr/share/info/${EMACS_SUFFIX} f
-	if [[ -f ${ED}${infodir}/dir.orig ]]; then
-		mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
-	elif [[ -d "${ED}"${infodir} ]]; then
-		# this should not happen in EAPI 4
-		ewarn "Regenerating Info directory index in ${infodir} ..."
-		rm -f "${ED}"${infodir}/dir{,.*}
-		for f in "${ED}"${infodir}/*; do
-			if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
-				install-info --info-dir="${ED}"${infodir} "${f}" \
-					|| die "install-info failed"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-
-	local pvr
-	for pvr in ${REPLACING_VERSIONS}; do
-		[[ ${pvr%%[-_]*} = 24.[12] ]] && FORCE_PRINT_ELOG=1
-	done
-	readme.gentoo_print_elog
-
-	if use livecd; then
-		# force an update of the emacs symlink for the livecd/dvd,
-		# because some microemacs packages set it with USE=livecd
-		eselect emacs update
-	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
-		# refresh symlinks in case any installed files have changed
-		eselect emacs set ${EMACS_SUFFIX}
-	else
-		eselect emacs update ifunset
-	fi
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	eselect emacs update ifunset
-}
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
index 48ccab885965..33ae03bd548d 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.3.91.ebuild,v 1.2 2014/05/16 20:10:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.4.9999-r1.ebuild,v 1.1 2014/10/17 14:10:13 ulm Exp $
 
 EAPI=5
 
@@ -19,6 +19,7 @@ if [[ ${PV##*.} = 9999 ]]; then
 else
 	SRC_URI="http://dev.gentoo.org/~ulm/distfiles/emacs-${PV}.tar.xz
 		mirror://gnu-alpha/emacs/pretest/emacs-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 	# FULL_VERSION keeps the full version number, which is needed in
 	# order to determine some path information correctly for copy/move
 	# operations later on
@@ -31,7 +32,6 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"