Follow QA policy for game state directory, bug 537580.

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

7 files changed, 385 insertions, 27 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 50268f936dfc..6e193ce91dd5 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.654 2015/02/17 08:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.655 2015/02/21 08:47:49 ulm Exp $
+
+*emacs-24.4-r3 (21 Feb 2015)
+*emacs-23.4-r12 (21 Feb 2015)
+
+  21 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild,
+  +emacs-23.4-r12.ebuild, emacs-24.3-r6.ebuild, emacs-24.4-r1.ebuild,
+  -emacs-24.4-r2.ebuild, +emacs-24.4-r3.ebuild:
+  Follow QA policy for game state directory, bug 537580.
 
   17 Feb 2015; Ulrich Müller <ulm@gentoo.org> emacs-23.4-r11.ebuild,
   emacs-24.3-r6.ebuild, emacs-24.4-r1.ebuild, emacs-24.4-r2.ebuild:
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index d83a1019a3ce..82e91be959e8 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -5,30 +5,32 @@ DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a
 DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1
 DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6
 DIST emacs-23.4-patches-15.tar.xz 12400 SHA256 a8e609a75c2a904efeb7269f4d1a0829cc7701010faf5d8bf6ad08dd5826a509 SHA512 e11bc4383552387a0016ab0ea978da5cd079e8759161448d757f308d7dcca762b7111064842c8abe762e05818e380dca52295e6246b258d51d8515169c746882 WHIRLPOOL c776ae58a54320a29852d8cb63c33c4c86feacd21d1454a5205355c2294d73de2814f8746be8c97b799025f67f1eb5330ae4ede140a6d377b30199dcf6ee0d9f
+DIST emacs-23.4-patches-16.tar.xz 15052 SHA256 b19c01e19ade5de37242740afb229ab82ef9145549e4c738c6efc70fc8ba2526 SHA512 4c4d35c24f4a2f25c8c42681b0745b5fc091df1237dd845f0507982ed237372f1cb207b93d392a6b823d2b0f23364e2e7239af994a01a71ec9b09607f86d54a1 WHIRLPOOL 455e3806f20563332bbe0263808f054ff1cac1fd1453a44fed28138c2b3ca3fbf3e1a91800b69dedaf3090ce43faf97cfb65e4a0636ce7d28e822ec20df009c2
 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b
 DIST emacs-24.3-patches-7.tar.xz 6484 SHA256 167a004b3b528dada8f68d28ce98cfbf1f23a1e00e52d7b23e14352178e5eab7 SHA512 6e3f6f053ad66e6d298b4fd904c57a6c2a03269ec53e9dfc56f834672a42c8f48eeb20a7ed1bcfb534eb62e0cca6e01b4a1663bebb046a0ce7325b732a378868 WHIRLPOOL bb68a6874e682afe58fe4cdf60695bc7b8d763afd15ba40ffda3156e80a6cad318e969fed6f22cb6e484ffdc29daa1b6b64873bf6cf73de28cfa711172046138
 DIST emacs-24.3.tar.xz 35565352 SHA256 70aa2942e9ae689ed17eddedfca5027c364ffbcc8b59968b1645e935f4c7058d SHA512 a1300fa10a9fba2db9735db3d01382bcda89ceec033976c4622796dfdf6d2748ed5fa73edf229182b368190c8acbf706810dd5f344542d2c0d294154bc2d0ca9 WHIRLPOOL 687ad4c7d69b41884bf28269bdea1808e03cdcec5a5218d0bac23c07cca3ced341ef98b4d5892149e2dbe899774a5e60edde9931d6c0fe41687995f530fb61d8
 DIST emacs-24.4-patches-2.tar.xz 1316 SHA256 e67954091f565668b921d32c14f9f31800e09249248fe03fd4369480a17a26f5 SHA512 c52910391ca58fc9a4b99147f62f2f1d9432c08889bd756cb3b5bf21028ef205a5d285fdbd495c5f1608180b834682ee8b4877e2d02359afb3596078fea5533b WHIRLPOOL a571557a3e86c69dde864cb1aac34b12bc6b8b2d97b8a73293337c1c971143fcf807be30c61c0bf6ecec3d5174f46afdece7395f1012d366dca45b4560c825c7
-DIST emacs-24.4-patches-3.tar.xz 3780 SHA256 2dd1ba1e9cca9121731d14da30ecf3eb720c07e9644a7b9d75e3f02ebc2089d7 SHA512 dde60b26a7dffca1f80937af406ec8a7b4dd8c2563f57c290629acc4767ef38075fcc42ca62c5f172c972fc3cb6c2c0539d3db641386edc68a842bc6cf81237c WHIRLPOOL 3da7034ac9ce495f57ad5bd82f6f8a4d8a4baddd4126b6753423f5cf58aa01873838e22b2908b8c2e4cd48590dd7fb7ea3a520e1bf43be7d0eaf02583bdc9f6f
+DIST emacs-24.4-patches-4.tar.xz 4652 SHA256 8b97fe775ed120df42e6f3afbe3ce503c0fedd8957caa759649323ac340f2922 SHA512 b8f8aea92472b5c074fc4cb2198b329e7b0496a70ba04d76eea4f420e398f3882b89d848020750659f60828217ea3155f4d53078edc8dc715b2946b8a239157a WHIRLPOOL e5e92ce3fba0e62ba3135e89ab8de9b6196f9a342048dbe679e06c3530a305311a1b300b72abdee50416d989cb55ca053ea1e0b259e63cc56260bfd58d43894a
 DIST emacs-24.4.tar.xz 39733124 SHA256 47e391170db4ca0a3c724530c7050655f6d573a711956b4cd84693c194a9d4fd SHA512 f51f88a4736a3f153ef01f3ad710571e967cd3d0c0112b066169a4040725d370ec29b14a4ca8fa3e3f4c657c726ba8e64c3ac4e390b8e911ea47a3afb5ac755c WHIRLPOOL eae38c2382731fecf0ccf8f717f8c96cc130d01a893ff560caecde903294eb843660492761ea8cce9920b79bfc55e821921924e27c040f25355110f56cd2255b
 EBUILD emacs-18.59-r10.ebuild 4297 SHA256 74c5d7927ea976e02680e0a24a90a270a067787e45cbb74602c8e7e513eec166 SHA512 d19f66368ed77bd4caeb260b098e79077a8e87328522d75092297c2cf15b39deb267518242f4939405a99365682653506374c0b6942be267816ddf9419a0ae4a WHIRLPOOL f8fe6dd1b04e838b0e5acc2d199a2d356dbf5ae61152a3ec9df156eceb04a9120743f8f98b04b27ae620b7c30ec5e1841df65b86a572be0746044969c42699a5
-EBUILD emacs-23.4-r11.ebuild 11320 SHA256 7634b7d8b8389403ebb238211b2848f17236d3cc3d52a0b26d31ac9c4d41ffa4 SHA512 87cdc4e9b168b5539c99a6eace662208c341c1bd1fae6a47e6e9588723fc7c5e9cc046914eb031be1a64c5e27b58218e5ba52d0e4cb2dfafe0b49d3db1f713a4 WHIRLPOOL f2b7588c56bf6abebaeb01cc3808e9b553255bf86b3f6a8fcb499e636d4fcd9c794fce091e6ac193677eab17c3f81fe2c865cd46437d39129c5a527886d51e50
-EBUILD emacs-24.3-r6.ebuild 11210 SHA256 a77204b19821569c12522183061d244ff9e327869678043776d840a1ffa5ee17 SHA512 68fc25e822f5b4f2789b72fa4801fc5e99a0c1cbb1f5c27d174944f333a621b0b32659e0ecb934da9679f1e326e9fbb1e40f2dd47aaf0725084c62d95b798f97 WHIRLPOOL daffb3d30823c9a6e124875e9e9cf6e18996689f69ff724bdddd9006182eb576b7a5be369f6ff938a2d06cf02f0c7bd94d584a2580f6148b35c1882350da7d93
-EBUILD emacs-24.4-r1.ebuild 10674 SHA256 5ecdf406a5f2703510fee68cbc27e10e74142a2867b8c8f0c72438320c29acd0 SHA512 b014b506134a38cba53d124ba1e08fab5cd52c35cb11c0340c223f6d4cfa2ca67e26bd5607e520189661534d31798bb0bf3a075db4b74ea147eefb0536c40cd5 WHIRLPOOL 20386c1eec6516b92561c0511a38d211135db8f5ad64d49cbfffe92c1bc623b0e997901bb0159332206b1cceee23d05078f711e9f52f9fd7aca1650703d45882
-EBUILD emacs-24.4-r2.ebuild 10678 SHA256 2fe97cf751134763f29fa3add0c32ff4471543252b93f62a03e356d83e124568 SHA512 8922c83219277170f9eb22f23bdafd3d00cce2bd074f484d02bd70eed4e430f3db638a129505cf43aa400464bbd784fb7723e3b7c88d3551d16bc3ed56448879 WHIRLPOOL 2b90f2ddff83f525f6bc4b57cc8bc0ee48972445260cc96054f9cd7fe4cfbeae1c1fefe64b31500fa6fa3c6dd9e5d79ad8ac4853d40cc54fe5d063ceaa798ee6
-MISC ChangeLog 89491 SHA256 15d06ec94cada34315228f1796858d23e4b16d67123abf3d0f3344bf25d5296c SHA512 ab8339a708a5fc5db90537821a7d94ead9dba13f5095e980a01ed21c212d3a0e564d081dcabc5b8e9a928540577dd8e161303cf272233b5239fa5cc1c8211a51 WHIRLPOOL 23b3907bcb49eb7268af4aff098b8289eef69a530eea3ece3ad4f5e8218b4ccefc8f2b08b8381c8fa5f68239ecec1197662e84ff21bab228c59c25cc608abdc5
+EBUILD emacs-23.4-r11.ebuild 11319 SHA256 df29478792ae9912443457734c9b7b892dc71fae05becc47c84293d3c1fb90a5 SHA512 d0cf42dd55084d1b036824f8fdbdf357a9cb847cb8dc4476b7d77927f0fbc67dd38c90129aa5cd5d6864ace374d83f5cbfbda06174c848eb7eef688f5c79cb2b WHIRLPOOL 4ffda9764d7f928f0bbdcbf5a564e252bdda075cc3c897a6c3459d1fb5d14ef5a3eb50f280366a79b578d40db10a2ed47f415263d339053e67af7038dc2f7142
+EBUILD emacs-23.4-r12.ebuild 11313 SHA256 9d609625b7bf4e847a5e002caa863b113d6788ca33a8b2e22fde0bdb8b87507d SHA512 b6611042ebb086231407f25e114641dd1cb4e3b6bf583b0c30553d60bb1ef0541261e4099a403e9e08ff9a39bf34ee6c8f5488af7b5d1a4b8136996abb02cfe8 WHIRLPOOL 8f6942c138a7a4e363ee75922fb96c9a057c882c7cc7c890f16b89ab294e19ed029d7a55cf4bc947899948414c6411c3e7bee53a3d16df921cf9f89e64a1a943
+EBUILD emacs-24.3-r6.ebuild 11209 SHA256 c97e55a1be23cc2328b96016d8a5186311192eddeffc00731f39223a31f298a4 SHA512 d6e86dace7c538c208554faab1d6f10aa9cf24cb538ba1d895b64b94a660d54caad39916838653f2709f968f77b1dffaabcfbb32b6b034dc44a5b4b793123490 WHIRLPOOL 30ad89340e953d1575ed0f3b4498190afdea24725baba0399586a123b8760318a3dc62d434608bdd812297324a970482f22ddd0fa39937f4bbdcf70e75d6633e
+EBUILD emacs-24.4-r1.ebuild 10673 SHA256 63d9d28197c4a534683f4f28dd726fcb8117e81d86e4413afdfc2dbf77bcfe5d SHA512 b224a5417bdeac422dfbc429cf9eb4db5596018857002e03e58da8f4fdf011f3b56d7f33be8b28d9598c89b7b3cabf291f9f753c0218885f544638524e6552e1 WHIRLPOOL 72452927887b81730b759ab45da940935c23d0b56637ce68ed259d3f22de010786e4f8f0c66430063e8ad235c3acabc1c0dc243305c1a702c2a86cb232a562ac
+EBUILD emacs-24.4-r3.ebuild 10663 SHA256 e44773c6a9e8d79a3124857d7681d230f4a6b41e3e56114f88936d2da9e2e248 SHA512 2f5574428f519ef1ce51416055acc2748201905b9676cb4e46a355bdc62f84cb59b60149de8d6cca2d25eed144a93f36cbf2e361d2c4620f1f8691851607d0f7 WHIRLPOOL a41c420179f5544a8f4af08accccc92efa2ff64fb7ed7e0c5188d9aa2028876c096275549b0d5be27dda7c457939686775c635a3053e18ae45fcef90fbf5882b
+MISC ChangeLog 89797 SHA256 12ab3f7f89907b9148a6af02f9dfac7c6d3e1433fec74ca21f4fb5bd4932ffd0 SHA512 2c8c1ba75d30e3e18ad6418d91c216881305d0bf7dc7a401824192f8beb951ac27a6636badb623d5f2bdf8c49f65ecb0403217d9b444e98e56c2e6afeba2629e WHIRLPOOL 8b6d090458481193d1e72e5b019a39a925bd9004bdb63d634bd37aea03aebdfca9ba9c9a69d86382e158df230703d0e6a125cfba11c0d5cf2086e5b0a9f31a80
 MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQGcBAEBCAAGBQJU4vs4AAoJEJQzkH1pP7W4yHAMAKhFwOG1mYDy7q5SHTOzD0lW
-6sUeKnSAom1tTJxhbj7yV/BEKZL6F0uFsW46xP1W0Lid9DwCeN8Pkg8Aj6LxgnGY
-Jj3FPFEVRII+gAlV8p+e6Vm7uX/WlMiJf65Nvo+MYQ1sh45kw7uo9mMJwhyeowjC
-rquXjjpRpSuDcrVuKScfcl2kZxk9yHUt9RImDXGTwL5dT40gtAVf0sBE4QLAzrUK
-v5PK+TnlHkbzaiDUM/NKYrrimUCr3eCTvA5spN4VqHNQfb2hcfL/hyzjnChiA+Rm
-EDb5pXtxKsrhtInb0qwgJKWzl4+TxDpRSxiLpA+0oSG4BR1kdzl/ib2M8sHcJouk
-FXlevZ2S0QoxSpA1U28rwSBfYaFNgOoiOOUbJlR0FYJpJYjix7VotYghvQPQDe3H
-hNf4ngBhz5XFgvAUX577VEMcn4OoBAvsgGpfB5tFVR1x3/AeHTGFhz4kMQThXI/e
-9KFjgmFXs/YkWFf6sanEZ1MsEmzDS6k15HKmmBPpTg==
-=gDyu
+iQGcBAEBCAAGBQJU6EZBAAoJEJQzkH1pP7W42b8L/0FbN/yju0kZgtgfH+X+H0SZ
+XwHFUwuNDBl4oxcqvDB6XTlp7MIRj/xMLY4sXg922ZBBqpzB6JTItWzzIhpZn8c9
+xInmVk1kVrU3IVpqtk4N7kcR7VDHuWL7bbbnkU6G4puyXcl0W0eLkD6Rf3SgoIh/
+OtMs+RLfaBKtwMom4BmMCz9iNHbyTKLO54OEGvsWwdM4cWf8gmqCoWvCws9dsBmE
+Y2iGI4dYmahuOnmL44hJf3nGjGgI/v8cbgGwgKG3+hGLp5WellXhX7DrWYZJtVdq
+r3y33H3Xu7CFkgXGdeqXbs+4M7b98kx8TDZS2Cz0SxHFYIaq7FOosmgfH56EQs/L
+PV/G8rvqmbGPSdL6cnsD4KcGlvBq3ULukFy8g3JGT7tR9y5GL15u2sd4d8gnNflS
+ghVYSSYFg7x9N/jebErplInV9Wq0K8oDSmyMftIe3R/r9NNDl3AR26pQZa3ApxU6
+E7R3AYLfby60VWd/ueSUGqbqxVC8r8ZR5L2VowuLSQ==
+=Crow
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.4-r11.ebuild b/app-editors/emacs/emacs-23.4-r11.ebuild
index 31e55aa3bb0d..f18c09d2776f 100644
--- a/app-editors/emacs/emacs-23.4-r11.ebuild
+++ b/app-editors/emacs/emacs-23.4-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.15 2015/02/17 08:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r11.ebuild,v 1.16 2015/02/21 08:47:49 ulm Exp $
 
 EAPI=5
 WANT_AUTOMAKE="none"
@@ -20,7 +20,7 @@ REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+	=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
 	net-libs/liblockfile
 	hesiod? ( net-dns/hesiod )
 	kerberos? ( virtual/krb5 )
diff --git a/app-editors/emacs/emacs-23.4-r12.ebuild b/app-editors/emacs/emacs-23.4-r12.ebuild
new file mode 100644
index 000000000000..0fb70a506418
--- /dev/null
+++ b/app-editors/emacs/emacs-23.4-r12.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r12.ebuild,v 1.1 2015/02/21 08:47:49 ulm Exp $
+
+EAPI=5
+WANT_AUTOMAKE="none"
+
+inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="http://www.gnu.org/software/emacs/"
+SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
+	http://dev.gentoo.org/~ulm/emacs/${P}-patches-16.tar.xz"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+SLOT="23"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
+REQUIRED_USE="?? ( aqua X )"
+
+RDEPEND="sys-libs/ncurses
+	>=app-admin/eselect-emacs-1.16
+	>=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
+	net-libs/liblockfile
+	hesiod? ( net-dns/hesiod )
+	kerberos? ( virtual/krb5 )
+	alsa? ( media-libs/alsa-lib )
+	gpm? ( sys-libs/gpm )
+	dbus? ( sys-apps/dbus )
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXt
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		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:0 )
+		xpm? ( x11-libs/libXpm )
+		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? ( x11-libs/gtk+:2 )
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				Xaw3d? ( x11-libs/libXaw3d )
+				!Xaw3d? ( athena? ( x11-libs/libXaw ) )
+			)
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	alsa? ( virtual/pkgconfig )
+	dbus? ( virtual/pkgconfig )
+	X? ( virtual/pkgconfig )
+	gzip-el? ( app-arch/gzip )
+	pax_kernel? (
+		sys-apps/attr
+		sys-apps/paxctl
+	)"
+
+RDEPEND="${RDEPEND}
+	!<app-editors/emacs-vcs-${PV}"
+
+EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
+SITEFILE="20${PN}-${SLOT}-gentoo.el"
+# 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}"
+
+src_prepare() {
+	EPATCH_SUFFIX=patch epatch
+	epatch_user
+
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
+		|| die "unable to sed ctags.1"
+
+	if ! use alsa; then
+		# ALSA is detected even if not requested by its USE flag.
+		# Suppress it by supplying pkg-config with a wrong library name.
+		sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+	if ! use gzip-el; then
+		# Emacs' build system automatically detects the gzip binary and
+		# compresses el files. We don't want that so confuse it with a
+		# wrong binary name
+		sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
+			|| die "unable to sed configure.in"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -fstrict-aliasing -pie
+	append-flags $(test-flags -fno-strict-aliasing)
+
+	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 && ! use sound; then
+		einfo "Although sound USE flag is disabled you chose to have alsa,"
+		einfo "so sound is switched on anyway."
+		myconf+=" --with-sound"
+	else
+		myconf+=" $(use_with sound)"
+	fi
+
+	if use X; then
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		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)"
+
+		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
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
+		local f
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			myconf+=" --with-x-toolkit=gtk"
+			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}"
+
+	# According to configure, this option is only used for GNU/Linux
+	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
+	# out the location because $(get_libdir) does not necessarily return
+	# something that matches the host OS's libdir naming (e.g. RHEL).
+	local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
+	crtdir=${crtdir%/*}
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--with-crt-dir="${crtdir}" \
+		--with-gameuser=":gamestat" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		${myconf}
+}
+
+src_compile() {
+	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	emake CC="$(tc-getCC)" \
+		AR="$(tc-getAR) cq" \
+		RANLIB="$(tc-getRANLIB)"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
+		|| die "removing duplicate emacs executable failed"
+	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
+		|| die "moving emacs executable failed"
+
+	# move man pages to the correct place
+	local m
+	mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
+		|| die "moving emacs man page failed"
+	for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
+		mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
+			|| die "moving ${m} man page failed"
+	done
+
+	# 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
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	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}
+		doins -r src/{m,s}
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c
+		rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README
+	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 a previous major version of Emacs, 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
+	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/emacs-24.3-r6.ebuild b/app-editors/emacs/emacs-24.3-r6.ebuild
index 384ab191197f..b1bb56fbb92b 100644
--- a/app-editors/emacs/emacs-24.3-r6.ebuild
+++ b/app-editors/emacs/emacs-24.3-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.13 2015/02/17 08:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.3-r6.ebuild,v 1.14 2015/02/21 08:47:49 ulm Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+	=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
 	net-libs/liblockfile
 	hesiod? ( net-dns/hesiod )
 	kerberos? ( virtual/krb5 )
diff --git a/app-editors/emacs/emacs-24.4-r1.ebuild b/app-editors/emacs/emacs-24.4-r1.ebuild
index 54f08a1d26c6..7fc992b70381 100644
--- a/app-editors/emacs/emacs-24.4-r1.ebuild
+++ b/app-editors/emacs/emacs-24.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.7 2015/02/17 08:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r1.ebuild,v 1.8 2015/02/21 08:47:49 ulm Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+	=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
 	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-editors/emacs/emacs-24.4-r2.ebuild b/app-editors/emacs/emacs-24.4-r3.ebuild
index 0c0127808e55..2dd62b327563 100644
--- a/app-editors/emacs/emacs-24.4-r2.ebuild
+++ b/app-editors/emacs/emacs-24.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r2.ebuild,v 1.2 2015/02/17 08:19:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.4-r3.ebuild,v 1.1 2015/02/21 08:47:49 ulm Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ inherit elisp-common eutils flag-o-matic multilib readme.gentoo
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.xz
-	http://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
+	http://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
 
 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="24"
@@ -19,7 +19,7 @@ REQUIRED_USE="?? ( aqua X )"
 
 RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-1.16
-	>=app-emacs/emacs-common-gentoo-1.4-r1[games?,X?]
+	>=app-emacs/emacs-common-gentoo-1.4-r2[games?,X?]
 	net-libs/liblockfile
 	acl? ( virtual/acl )
 	alsa? ( media-libs/alsa-lib )
@@ -182,7 +182,7 @@ src_configure() {
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--localstatedir="${EPREFIX}"/var \
 		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
-		--with-gameuser="${GAMES_USER_DED:-games}" \
+		--with-gameuser=":gamestat" \
 		--without-compress-install \
 		--with-file-notification=$(usev gfile || usev inotify || echo no) \
 		$(use_enable acl) \