Version bump for Gnome 3.6. USE=introspection is now global. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64 Manifest-Sign-Key: 0xC6085806
author: Gilles Dartiguelongue <eva@gentoo.org> 2012-12-26 21:45:05 +0000
committer: Gilles Dartiguelongue <eva@gentoo.org> 2012-12-26 21:45:05 +0000
commit: 2b03e1ce10a856dde107479760f360e0e773135f (patch)
tree: 8044ab5ee6777df77f8441cba7626c6f690cbf0f /gnome-base
parent: marked x86 per bug 446526 (diff)
download: historical-2b03e1ce10a856dde107479760f360e0e773135f.tar.gz
historical-2b03e1ce10a856dde107479760f360e0e773135f.tar.bz2
historical-2b03e1ce10a856dde107479760f360e0e773135f.zip
13 files changed, 374 insertions, 1516 deletions
diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 6f445fdcf416..c6457f110cf3 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-base/gdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.357 2012/09/29 06:05:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.358 2012/12/26 21:45:01 eva Exp $
+
+*gdm-3.6.2 (26 Dec 2012)
+
+  26 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -gdm-2.20.11.ebuild,
+  -files/gdm-2.32.0-broken-VT-detection.patch, -gdm-2.32.1.ebuild,
+  -gdm-3.2.1.1-r1.ebuild, -gdm-3.2.1.1-r2.ebuild, -gdm-3.4.1.ebuild,
+  -gdm-3.4.1-r1.ebuild, gdm-3.4.1-r3.ebuild,
+  +files/gdm-3.6.0-fix-daemonize-regression.patch,
+  +files/gdm-3.6.0-selinux-automagic.patch, +gdm-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. USE=introspection is now global. Clean up old
+  revisions.
 
 *gdm-3.4.1-r3 (29 Sep 2012)
 
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index afe86d6abab3..71133c1610b0 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -27,7 +27,6 @@ AUX gdm-2.20.10-xinitrc-ssh-agent.patch 704 SHA256 59b0150159776a200c6041290f672
 AUX gdm-2.20.2-gksu.patch 544 SHA256 3c7dabba9904d1ae382989099e03938c47eb2ce882f50d8fae9164a573bddb4d SHA512 6fcb5681a47f9bb0aa248e9c0dba27ccc7820ac56e8d1bb4621652a8bd759981899d24c08bd0546a1c4937c664e5d82e101da9900938198a9a0d1a9349891877 WHIRLPOOL 655d16026cf3dfe3a5e7c0007c7e80fa996b5afe6f5704a5326e40540b049c348caa70b7c4e681e5bbeafc28160142be0abb73015905e42a202a9a5f322fe06a
 AUX gdm-2.20.9-parallel-make.patch 1499 SHA256 c8d04d1cae1c2bac16bf3f41fd481eacf5f4a3962f661996f93da39d4161bb0d SHA512 3ba30cdc5c9c665dc1000923d7fe61b2a4bf1ea9b5e8b88d07ed30e4ae28afa529894177e57fb032ec37b0a8ecc426a5f6acc4a6d2b1a973abf0ace50b17a8f3 WHIRLPOOL 7bf3163f549d498ded4f36a0a7f38b48819a676c0ac314286f920ee25e056a128c843b1df683edc2ceb3e8e947ca420f3fea1eb1d43519b2147aa5d262851c06
 AUX gdm-2.32.0-automagic-libxklavier-support.patch 2069 SHA256 91fdd46ab5ad1b4071cb798499ddd98bee47c67961906d1db0ee47cd4919fac5 SHA512 81628b88ae7c773e8965ab5b6ffe8aa40c6fa59e0389bfbebf69c3af66e79e8850d6b762d515ff2ab1993ded29fec23cbc3b69513f32575c3bbfbfe8c95551b5 WHIRLPOOL 9f12d3c3290545c3cbde6582e5bea216c94d5a88cfa153cbabf08475e9b3ca4683262479fa56baf0ce0102f8cca898d69f38c4550251f570b6ba92e29d9d991c
-AUX gdm-2.32.0-broken-VT-detection.patch 2851 SHA256 d1ab4a0c931e799adf436a8af53b06436e6fe0321ed05b6cc08de7ad3cba3d49 SHA512 ce6d05c29107652eddac852f3282cfb7796e09fc0d3ff8ea75b9760a13a85bf04a9c64b58d02405d5ea681efe5e69f4aa32c72500b7e8db72f1041bc274c83de WHIRLPOOL 70d15f29abb8d45480efde48c6586296d104ef5e96e555feec367b96ea0fa9cd320409de41da52e8865a52b73a7c75b3164348b0aa006c2496d4cd02831ca28d
 AUX gdm-2.32.0-custom-session.patch 1317 SHA256 3f79b0355225669dd791527a50d5bd0f7ceca850a8eab7bb32f52d609b10eed6 SHA512 625eb4e98f5f753e20c8bace386a465483e079bd866c0cd309194f04af21b48b6c8f3405feb23fb2a93181824ad3f6f6d75c7b049c13532386be28dbcc53cf50 WHIRLPOOL 2014140c9793592fb51c1bc115da1390a9dd74cd2e07ef8fba70feba1e51971035968d2defda6f3be2150e3a983613c1b456a08f642b15dee4f122135cda06d0
 AUX gdm-2.32.0-fix-daemonize-regression.patch 4048 SHA256 e95e1ebfcfe2c896130e4925fa6f23911bcfe4db27e2a6788229538c6bb2a59d SHA512 4b2e894096dcffb14fabcd4d7e8909bace087edb00077db0041d579311e1515e34ba88c416c2f933312f94cc6e376253970e5ab7751be2fa499719928f58b895 WHIRLPOOL ef70bdf111fd0cafe2d33889dfdbfaa70ea769c10d89e2319bdefa592f3290c4b3645a278f9ff10848c8fc2e6d0b895430078f453faeed9330d88072345fa393
 AUX gdm-2.32.0-fix-vt-problems.patch 6156 SHA256 12da81b8085d76ce3099f1af0ec588c07c3f020f341f825683f4855c9303731e SHA512 cc31f51c3eaa51b9ceac21c66a61e5d59b1c07e7dc2166fe4c3abfc4eccbdd4b43605c0e936d003aaf337de599d1dcbc00726c9d63d4f682636b02e111237d63 WHIRLPOOL f0bec91b5decdb784d79d3d101acfeb5adfa794da938e49f3e84d0a78134e968fcd1ed6d13d3f9889055c5afb0f5db2257d20f2af33098f2ea7cf0acf889e458
@@ -41,33 +40,25 @@ AUX gdm-3.3.92.1-disable-accessibility.patch 779 SHA256 a32bddeb5e57086df41b9db4
 AUX gdm-3.4.1-dconf-0.13.patch 647 SHA256 4a6a4266e624ed89ba2267ff16e7d026e5129a8329cb336d91ac844cfd17d9d9 SHA512 8a8e052df1dfb41b6c999453cf6db81e0f76a85a519e848ae1a009b1bc150e8be42ca65f81699f37e5faa8b13064f1c3907ea92d4c1139987efb877177a05cb4 WHIRLPOOL 373da58b9f66869eb5491b004cbec67b351d9b28a3732e04cd80e1c7add0230f8c93597075ea54f4679dd973f82b3d424e41da8a5e20fee6ec4323911ae818e3
 AUX gdm-3.4.1-plymouth.patch 10434 SHA256 22de460e0b1b659299f0afc8cd3a0e23e7da7b12a63e8317a43cb88b3342f718 SHA512 83f4e853d251fbc5f1ba4cc61eda4fd0cae1cd2f018d06f052f1dc8da75207ee413907fe7aef153b65493c95893070bb1f3fe90efa58d10f839a7c01152f8a95 WHIRLPOOL 9a1579e834ea1d63e8eb02b94501de477c09212cb73bc3439ae80ff97257621f0bda0da509a83e8419c32e8616e467264ee14a0cdec8f6bd89e8c90561e5469e
 AUX gdm-3.4.1-save-root-window.patch 5010 SHA256 1472af09a3ca0ac1657130e1104e36c11dbd31a67f7600c9bde41d969b919b65 SHA512 f699f5fd345283813558c4637bbb19c6bec8857d785ab11b2752d02d4b0ac9bf67b682b7afbf252e8eaa81943f7d68b320ab65d0206afea825c0a5841dfb7fca WHIRLPOOL fbd6d27f92d60bb060e4b06f2a95ce88561a4b1dcd4a3c2d70a9485c8371599458bfe4b1ce8c9d92f7929d1fa0b61c934a936e079f81a5a9042aca08f8a7a683
+AUX gdm-3.6.0-fix-daemonize-regression.patch 6639 SHA256 6ff6eeba681dc73ae77058ba6ad1ecb292af843189a83071b96b1d84fbe887e9 SHA512 5de1e38b447e1dce933b004951366c701707a35c990fa35c84959753b32326e93be7fde073abc51e5bf439b5fd4277adce5f3ab190a7aac3d65211d84411f06a WHIRLPOOL f6a5db38a750d47375f69088765dd9e653dc4a70750a542e660ce7c876cc30f61e05e332250e5daf0f9d50c512791eac18cc69585c42aa5decb206b2ee7b361d
+AUX gdm-3.6.0-selinux-automagic.patch 909 SHA256 9b1a3c5913e53f30641dc1177d396060c81abcfff6d8e9acc738e4d19e396580 SHA512 68a6fa710862bde6479b9e35f66d5b65c5cf90df462d8f318ad06ad04fd2106376915250d8b09a6ca0716fab78aedc619e41de6f2c93e57449442a7613fe575b WHIRLPOOL a5ca1901f52be902cb6896759a3ce92f2298782d80ca6c6a023a3fd7a6cea8884f93af7cbc85788fd24166f4bf5da1c357b2056d3d6141fb5540273b9dd63a5a
 DIST gdm-2.20.11.tar.bz2 4013059 SHA256 2e21c9a44941cd0033aaa6b381b563488bbdd0ad1a28ef05f7e0178891f1eaa2 SHA512 ca8ce81161c640ef2753a35b8eb0fd8669a7e42dc6272b2aa7b4a9f525b4d03dc46bb5aa8d41b69aaba36c8715a220c92e75c169ce9d5af39b25853505abeb39 WHIRLPOOL 0bdb90aef849c7b505ffb1b0af1b904970a9cd11c27cf631794b14a01b5e0fb01666a51b68cf288ae79057dd7bfca9a8f1ef9518ec5b04a4867eb7792c631765
 DIST gdm-2.20.9-gentoo-files-r1.tar.bz2 3494 SHA256 666c0bf1ba28ccc257bf1235b5286e1eb9e15230c0036413ab428e09c54238f9 SHA512 aaf0f4bfdb13f6dc81dbfe93b144343b6a8146698450fce9753396c92bef2c4e699f3f5c2ff9b88736432d2fcb861ab8dc423148109cb9194983e0c07baa8aa5 WHIRLPOOL 698cd66740872260a106f8174a51a44a45817112d696b2741fd537a10362308ffa8917df31190fe042c46b7ea76e2f8d1147f5c15e39cfb33f1f2f7e951ffb78
 DIST gdm-2.32.1.tar.bz2 2441685 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9dc9a267ea38a9aae1ec55abc SHA512 3a8a375a171392ce1097e6b870cdbdcea6c7f7bd0984434bf3865e6784130d9b25793a32e9e678f6dd3be6a70a25cd941c9ce4fea67c74a84eb0f05b2073cf25 WHIRLPOOL ea84cd34ec162eafebbd43ebb337855b39dbae692a40c14dee37e8f98634b6034ee74b50a58e207e52ef9b12dcfb4bc312ad4ac06b442e022a787850647df22d
-DIST gdm-3.2.1.1-gentoo-files.tar.xz 996 SHA256 610f7a1652996d77462773994adb5fd396ed973bbd9df51daa301004d38ca10a SHA512 1345d27a7337e6c7a2ec99798659079ba1d654351bfcf06d255eca6c77ec59d86d5f6247e59e5dc116c79d458c43ee6a71c6b2389520ef8a26e99e47daf23b05 WHIRLPOOL 132be257a0bb73bcd0c8ca7e600cb098d9bf9e6bea03a0cab76e871da31cac50fa7532c424941da549aba34d07176d252fd176e1e1665964bbeed7d764747a55
-DIST gdm-3.2.1.1.tar.xz 1632116 SHA256 85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd SHA512 f3d1e2f8bc8faf4f2337140a51f45d222b874477483fe2c4724cdc8d36c756205184ab36852dede7d8696f21439101490723b204612382fae4d4108a173bb352 WHIRLPOOL eb02645beaddd9fdbe3a59bec708835d8a0dd65b5ec4d71cc713ea20961982709e4080d93eeff7e58090e5ef01c77a60b4ebe3bac8372f27efe5c1964ab20aea
 DIST gdm-3.4.1.tar.xz 1615612 SHA256 6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665 SHA512 0c3692a6008d8576319dc9d40411f36e0d04481809b342a84a88407b0d342cc234db01b21103a8e87fbbe0703d280e86444f0923e8df02f0642c59fe5c95ffed WHIRLPOOL 315d07e510303330e0e530c901ff9ac078254ebc9c2c406e573819672854073721736770caf63d31892c230beb9dcd5220985b0a53a464400a8154277ce97f23
+DIST gdm-3.6.2.tar.xz 1627356 SHA256 fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9 SHA512 0761cda9d26b6e665989e708be0f3dfa2fa85b997f4c5cfeb151b45e19114e6e1fcbd2c67a547e6698d83f3978e37203db3dcf2e5670356f6f93986ffc55d37e WHIRLPOOL 0396435f90b504605fe0555264de1202efea57f2a48a94035a4113828fe66ff117a4dde3eaa648591b26f902b84e9a8bfab117f29cc4a7ea31b45a0b8c965904
 DIST gdm-gentoo-2012.09.25.tar.xz 1448 SHA256 f5978e4309e5486be41fec437a6e538dbfca3451757f3282a557941c4e70700d SHA512 c9d1a4699c34ce8708a4e7eed1b38d66ead507a4a2a6b45f2ef6254d54b46c755c9195db0593d6aa6785a8986e2ef5235592071c0cae8c1c8963951ecdb7c079 WHIRLPOOL c0efd131977b0036431b9edd6932025247323f198dc1bd7195efb55d31fd6b106ebdf391944b0009cf7a3261e99160fa6041a26348fe020badf26d0785f5dcc8
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a WHIRLPOOL bac9f9ef3e7e88401e605c34deca6e7c31e2d4456af3781252a91f7bc33084af27ecc9e4a74022767b25db23d8f70842a39225c8544f1c02229ad7f7af670d42
 EBUILD gdm-2.20.11-r1.ebuild 7213 SHA256 71ac1e2eaaac38e36b3a11fc9bd883399e57b0bcae84458804f15611b5bf05b0 SHA512 5b78fe76b6ce79f5cab0ff027c1bc117766c234acfa58869155e56cd4fe0aae5a2e971014f2d9ea15637dbc6fcc5d5e536b5f36a6e3e664b2b2cb68779d83b04 WHIRLPOOL 7837696f0f0e54045ae4df101b89aa8ac9147ce064a406ed604ef8c7c04b30953ba35a8773c6bc404a60d62f6bca124db486c498690a561d2e8112b5f4452b5d
-EBUILD gdm-2.20.11.ebuild 6972 SHA256 e329faa4cfec2ab0e83b068eb379109e8d5063ccc3d8f991e009c9335d55cde0 SHA512 5a4c80e69b756573b10df9eb333367b86cb80055cdf5c83b44380c06c8e843495fb231a04c1e246cb198eb91589ed4f042982dec365e92bebc51f8e37e862273 WHIRLPOOL 948a622e67f3f418fb93f5165864fb829e9eb41c0ffa2e4a2b4ef37e60e958c6a5895f0f558bd16b8b17e7f01e83011b79f52f2b3e8a1b665c22abe7795c3f4f
 EBUILD gdm-2.32.1-r1.ebuild 5592 SHA256 765c26e987ec88b21b2ea01abe2bd2f5f5947a6b8f2263a55ba03bbea8b2d08d SHA512 097770d57c11f60eda7cb2d95d13b2b820d4c09f12de3f98889204f2cbcb1b65aa807f37db120a95e9666066b421504a12cfb9fc459f77f6050392061f9466de WHIRLPOOL b3e361b9b11a1ac8b5e89d2d69a18f9ad6c022e6fe8c10b6a2498e295b372f1c6b6bff4e0f5fb8c0aacad004276d6905fac0ed2606c6b0a9fe3693e553259c1e
-EBUILD gdm-2.32.1.ebuild 5598 SHA256 07e3f9943690b9ef5b15ca5aec52e4eab8821a98963003823276f4cdc5bd0d2d SHA512 df5eab27646635aedfb219a802ae141f7021f3308591374da373f01326a3d36aa016629fce2eb05dbf94c0658344087660d4b3611d1e4a9edf2cbb96da5727fe WHIRLPOOL 7bd429065b18350cf9bce01e2906e8040eb038d8da6a88e9e7acb1e893fbe9029aca7e07fc5cac7da9c4e40e5a6a44693f5cc477fa66a66c8728d3e8260c03c0
-EBUILD gdm-3.2.1.1-r1.ebuild 8526 SHA256 f0912fbf728c0d57270c4641ac0c0e592d2c685266cbbe54af03f120f8254d81 SHA512 7d506a0301799bdd74b94ec2f580c03a00110cf45737d37f5fa66ec16bdd95ae667f3d847a370ecab49ed34f8c67065ad60e92be0f72295e8d9f4063e5e22e8d WHIRLPOOL f37b8f19934b010afee6a452af8074bcae76b2b729206443526a7686f81492eea86e2377b68862837043c78bf35bdea05eb58001f3148904cd3e17b7f309cad1
-EBUILD gdm-3.2.1.1-r2.ebuild 8495 SHA256 19caabcbbb3ab9e5f134d6b2f1334eab39455b6100343468d812e2e3fb3c5ed6 SHA512 a53db45ce7a772dac65f55d8b23768cd8000178b278652d230954d6a282918e8ad0fc87b70e49b5d35f7a3e1088b1a14a8625de14bea8d64e2bce81a3811ae9d WHIRLPOOL 8f74680bf1b1da81f73f395c0cd9792038aff7e97d261f5ddaf9a51f2a605f6cb6b3dae817b3d27f69fc648b3088dea048103e28c1a9d01bbe2e051e24798c4a
-EBUILD gdm-3.4.1-r1.ebuild 8792 SHA256 65649cceccdd4ccac39e641ad87d04f2411ffc5d5f223fe80e4a001ee4d17e50 SHA512 45835b2e1b184bb28d839f28a4544b7e438224a75148e576c2d1301c4c1fde1dfd8a715cbe8deebb9120bdd69f064e2834939af94ccfadfe5109fa0c1c02201e WHIRLPOOL 3a075ed9502829048393e10e061ab6ab414b8c4f915f223f1b5539a35ad7c925c2c840983817a2327141254f0b5fd2997badd2cd611f56f6990fcfe1bbe689a3
-EBUILD gdm-3.4.1-r3.ebuild 8698 SHA256 7caee61fa2339d3fb2b961b9f599f534558ede5fe38ae50ddf688ea1107e7bee SHA512 37542fa07c67dd65f6b7f11f94620c47c1ef67d2f80b87b3335c266cfa35aacb9921e2341c94c98847d108194de95309c91b73dad4bb53e63908c7c344ac9198 WHIRLPOOL d167aeb722035028584b8757b92360b6ae0a8806c52e707f109f8459d14d6760edd54727b205dba82943f4477af19eb43368b82a6d8071e3a20af9e1e874f1bc
-EBUILD gdm-3.4.1.ebuild 8582 SHA256 fa66031cbd183dd3e6a6a5e72c8ee933070625dfb8cf0ebee3685f69052e10c2 SHA512 9f31ae0e130f8fc36c9c903df75652af666561b838532f340d9f6d74c991ee734520ebfb3531df200651e731df1a9b68b6026db35418d21ea145cba48d397fbd WHIRLPOOL be48b7bb524fe3fa3ebf3cd9d6e2251a1793049f3cfb83a213a75f0f82d7bc6e544beccd9a8317cd52659a7691a6a7a25307f4d18a8d8ef0b89207d7e9983932
-MISC ChangeLog 53085 SHA256 b92bd479d55e4b7a5046e3c416f3f782d70052c106c317e0bfc0a20e1f4d79d1 SHA512 37c7b758de275bbb27f9b9d69b6fe8aa210fbd4642c7a578d0f147f73470cb8d58fe3e2656a08915a1e04ec3d47d884133cb4b301521fb11763dde46e6053c17 WHIRLPOOL c62083d19c7f6fa7c2cc3855aaee99ac623df6c37d838749ac14eb3997bf326b296981c69ee01cee05b7de6ae61042688448889f427169fbc3a8bcdc898ae0f6
-MISC metadata.xml 1298 SHA256 6b65a6f30467b69a363f8c6032fce0ded6679baecb1627d1117019f853cbd1ad SHA512 68d672bb7163364eb754b886d690e8ada3527aacc37b8f51e30eb4b79ba27e6b3ad67f656bafa5e316a3c1f774a370c4d788caa8c9123abe82d9fa99d968eae2 WHIRLPOOL 182cda9a217a7f3f32de1e37185ffba41ce83c44a7c02b5654c1bd64fde4e141a12ad6c588bafc285869a972626c8424ea88583b4817bab07441cc1d6813f6d0
+EBUILD gdm-3.4.1-r3.ebuild 8733 SHA256 a36c6f424e43c2b0911a44d190b8535b98b9a164d497919d65e3ebe717fcde48 SHA512 813c27847916a12f131f7e20876970052f8e6c93eafff50cd490c4ef47bb6af35f607551b4c2c13d81c9d9c5baa3a62068e76736f8bb00304439d203350d38f9 WHIRLPOOL a6a7dee748920bb3c237bd5adb0fe49651dfe38fc0f30fc35a7614fff131aa075d56b656e3c8a0a2a36d74af8e2f1fee5a98977df583c0022f4d45824c05cc52
+EBUILD gdm-3.6.2.ebuild 7756 SHA256 89dedac9c47202c7e4bc9ae3912440f477e7dd9c9a507bfbaa98f345b45dfe81 SHA512 65cb83fec5b80c57faf782bac36251774e758ca6a087c2101606e72c7f0b0d4e670d2d5acca95d66dcf766ee1d88a2eb195c3c613e9a3fe1e11c7a838449c5f6 WHIRLPOOL 6c328bc3a0435d5ac6a84fd78d8167c128b435ae6f029e20d7d9f11c7a5109fa24f04aefcfe25f5314e99bc792cf7801c7ca9bd1ca97a347162ef85c8023cc37
+MISC ChangeLog 53579 SHA256 54d497f72c714a3cadca39490ab65819fd6529e5356cd106dc1e15cf0856865c SHA512 159a8214398d04fe07c1c037c17cfaf28d554cfd9b343e307db545054779a1b3a4f44e06040e1388323b1c46abc7db72fdf0d901c996f6692cee4cc1170e2fb6 WHIRLPOOL cf3f9e49202348c361c364b7a040baddea2ab5f38557c347d49577ceb8f655b517b905ca41ef90082e4085117fd8c2db1f2f85f6bf5c42dbc972ad0edfe3608f
+MISC metadata.xml 1198 SHA256 12a62ad1cd6177eae915d242841c64cf8b02eb23b61bd825cbcdbfb3759e3a46 SHA512 fa81b652ed5548ca9ab95cd48852d26534861194044e5573442a150f7146c67d988ec99ad9c16ef53880873a3c55035a4f1d4905f9e51f8ded3e9299f28a0ce6 WHIRLPOOL c68ff0db9a24909e13dd62e7d97b09ff1d527686082b9211e183117b17cf86dc24564087ca7d8d3b569a9b8213d2b18ae37ddb6723c4d3d18cd290ebe15bc020
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZo+hAAoJEJ0WA1zPCt1hjHwIAIuDAgLUVcc9hscHdAcw+wZa
-o9ISK8vUilrRxoc7/k5eFAZURmwKbI7oYM3t8M9KBh2LTl539IfyTZ8UUpM1oqot
-meKBcKg4Mifnn9qxkJeUw74hyrRoBpaXzDQblHSdc/HGiXpSsykPkn7yTsWFEQug
-7kAWNzYsBXG0mMENQLkIWmFAdUJyOP8QiNNgzkWD1bqB+29PAT0BElgettwQWl/a
-tMA1TUTpUvNZjjSAeP/wm0i9Si19ty4xxKtZFQ5yXS77O5G5lKoEaRPtPGFQtS25
-r4MOT2c47M11QWma539znNnr7v12VDDjKB62qpIvTgCM7DJnfuEcdP5LlAmLbsc=
-=YIGs
+iEYEAREIAAYFAlDbb94ACgkQ1fmVwcYIWAbsaACcDNf29S+fhO+TR/K1Ymg4cRvU
+QlcAoOPXy66Uk8Did2HDQyuDCbhCYt4t
+=BR/N
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/files/gdm-2.32.0-broken-VT-detection.patch b/gnome-base/gdm/files/gdm-2.32.0-broken-VT-detection.patch
deleted file mode 100644
index 475a9394d3a7..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-broken-VT-detection.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 75b80587960b4cee6bd849a34d9e84dd46b91abc Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:18:21 +0100
-Subject: [PATCH 3/6] Fix VT grab problem causing GDM to grab VT2 instead of 7
-
-Gentoo bug: #261339
-
----
- common/gdm-settings-keys.h |    1 +
- daemon/gdm-server.c        |   15 ++++++++++++---
- data/gdm.schemas.in.in     |    5 +++++
- 3 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/common/gdm-settings-keys.h b/common/gdm-settings-keys.h
-index 65a1628..e64eba0 100644
---- a/common/gdm-settings-keys.h
-+++ b/common/gdm-settings-keys.h
-@@ -27,6 +27,7 @@ G_BEGIN_DECLS
- 
- #define GDM_KEY_USER "daemon/User"
- #define GDM_KEY_GROUP "daemon/Group"
-+#define GDM_KEY_VT "daemon/VT"
- #define GDM_KEY_AUTO_LOGIN_ENABLE "daemon/AutomaticLoginEnable"
- #define GDM_KEY_AUTO_LOGIN_USER "daemon/AutomaticLogin"
- #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 339f3cc..f25d6f1 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -47,7 +47,9 @@
- 
- #include "gdm-common.h"
- #include "gdm-signal-handler.h"
--
-+#include "gdm-settings.h"
-+#include "gdm-settings-direct.h"
-+#include "gdm-settings-keys.h"
- #include "gdm-server.h"
- 
- extern char **environ;
-@@ -83,7 +85,7 @@ struct GdmServerPrivate
-         char    *parent_display_name;
-         char    *parent_auth_file;
-         char    *chosen_hostname;
--
-+        char    *vt;
-         guint    child_watch_id;
- };
- 
-@@ -686,7 +688,7 @@ gdm_server_start (GdmServer *server)
-         gboolean res;
- 
-         /* fork X server process */
--        res = gdm_server_spawn (server, NULL);
-+        res = gdm_server_spawn (server, server->priv->vt);
- 
-         return res;
- }
-@@ -937,6 +939,8 @@ gdm_server_class_init (GdmServerClass *klass)
- static void
- gdm_server_init (GdmServer *server)
- {
-+        int vt;
-+        gboolean has_vt;
- 
-         server->priv = GDM_SERVER_GET_PRIVATE (server);
- 
-@@ -944,6 +948,11 @@ gdm_server_init (GdmServer *server)
-         server->priv->command = g_strdup (X_SERVER " -br -verbose");
-         server->priv->log_dir = g_strdup (LOGDIR);
- 
-+        has_vt =  gdm_settings_direct_get_int (GDM_KEY_VT, &vt);
-+        if (has_vt) {
-+                server->priv->vt = g_strdup_printf ("vt %d", vt);
-+        }
-+
-         add_ready_handler (server);
- }
- 
-diff --git a/data/gdm.schemas.in.in b/data/gdm.schemas.in.in
-index 514117d..948e403 100644
---- a/data/gdm.schemas.in.in
-+++ b/data/gdm.schemas.in.in
-@@ -23,6 +23,11 @@
-       <default>@GDM_GROUPNAME@</default>
-     </schema>
-     <schema>
-+      <key>daemon/VT</key>
-+      <signature>i</signature>
-+      <default>7</default>
-+    </schema>
-+    <schema>
-       <key>daemon/AutomaticLoginEnable</key>
-       <signature>b</signature>
-       <default>false</default>
--- 
-1.7.3.1
-
diff --git a/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch b/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch
new file mode 100644
index 000000000000..27f207970a8f
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.6.0-fix-daemonize-regression.patch
@@ -0,0 +1,192 @@
+From 722d31dc8823090b651b103f0194b6380f2d458e Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 25 Sep 2012 22:30:29 -0400
+Subject: [PATCH] daemonize so that the boot process can continue
+
+Gentoo bug: #236701
+
+Based on original patch by Dan Nicholson <dbn.lists@gmail.com> and
+Gilles Dartiguelongue <eva@gentoo.org>.
+
+Fork gdm-binary, except when -nodaemon is used
+
+Makes the gdm main binary fork and daemonize unless the -nodaemon or
+--nodaemon options are used. Provides compatibility with xdm. Fixes
+bug #550170.
+
+In daemonized mode, start a new process group, and kill it in our signal
+handlers, so that killing gdm kills its spawned processes, and so that
+"/etc/init.d/xdm stop" actually works.
+---
+ configure.ac       |  4 ++++
+ daemon/Makefile.am |  1 +
+ daemon/main.c      | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 65 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 61a43d6..a851ba5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -99,6 +99,10 @@ PKG_CHECK_MODULES(DAEMON,
+ AC_SUBST(DAEMON_CFLAGS)
+ AC_SUBST(DAEMON_LIBS)
+ 
++PKG_CHECK_MODULES(LIBDAEMON, libdaemon)
++AC_SUBST(LIBDAEMON_CFLAGS)
++AC_SUBST(LIBDAEMON_LIBS)
++
+ GLIB_GSETTINGS
+ 
+ PKG_CHECK_MODULES(NSS,
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index bb84765..cf89b47 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -380,6 +380,7 @@ gdm_binary_LDADD = \
+ 	$(top_builddir)/common/libgdmcommon.la	\
+ 	$(XLIB_LIBS)				\
+ 	$(DAEMON_LIBS)				\
++	$(LIBDAEMON_LIBS)			\
+ 	$(XDMCP_LIBS)                           \
+ 	$(LIBWRAP_LIBS)                         \
+ 	$(SYSTEMD_LIBS)				\
+diff --git a/daemon/main.c b/daemon/main.c
+index 3b8572c..c2fe4fe 100644
+--- a/daemon/main.c
++++ b/daemon/main.c
+@@ -34,6 +34,8 @@
+ #include <locale.h>
+ #include <signal.h>
+ 
++#include <libdaemon/dfork.h>
++
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+@@ -336,16 +338,26 @@ signal_cb (int      signo,
+            gpointer data)
+ {
+         int ret;
++        static gboolean ignore_signals = FALSE;
+ 
+         g_debug ("Got callback for signal %d", signo);
+ 
+         ret = TRUE;
+ 
++        /* don't commit suicide before killing everyone in our process group */
++        if (ignore_signals)
++                return ret;
++
+         switch (signo) {
+         case SIGFPE:
+         case SIGPIPE:
+                 /* let the fatal signals interrupt us */
+                 g_debug ("Caught signal %d, shutting down abnormally.", signo);
++                /* if we daemonized, kill all the processes we spawned */
++                ignore_signals = TRUE;
++                kill (-getpid (), signo);
++                ignore_signals = FALSE;
++
+                 ret = FALSE;
+ 
+                 break;
+@@ -354,6 +366,11 @@ signal_cb (int      signo,
+         case SIGTERM:
+                 /* let the fatal signals interrupt us */
+                 g_debug ("Caught signal %d, shutting down normally.", signo);
++                /* if we daemonized, kill all the processes we spawned */
++                ignore_signals = TRUE;
++                kill (-getpid (), signo);
++                ignore_signals = FALSE;
++
+                 ret = FALSE;
+ 
+                 break;
+@@ -418,13 +435,16 @@ main (int    argc,
+         GOptionContext     *context;
+         GError             *error;
+         int                 ret;
++        int                 i;
+         gboolean            res;
+         GdmSignalHandler   *signal_handler;
+         static gboolean     do_timed_exit    = FALSE;
+         static gboolean     print_version    = FALSE;
+         static gboolean     fatal_warnings   = FALSE;
++        static gboolean     no_daemon        = FALSE;
+         static GOptionEntry entries []   = {
+                 { "fatal-warnings", 0, 0, G_OPTION_ARG_NONE, &fatal_warnings, N_("Make all warnings fatal"), NULL },
++                { "nodaemon", 0, 0, G_OPTION_ARG_NONE, &no_daemon, N_("Do not fork into the background"), NULL },
+                 { "timed-exit", 0, 0, G_OPTION_ARG_NONE, &do_timed_exit, N_("Exit after a time (for debugging)"), NULL },
+                 { "version", 0, 0, G_OPTION_ARG_NONE, &print_version, N_("Print GDM version"), NULL },
+ 
+@@ -439,6 +459,14 @@ main (int    argc,
+ 
+         g_type_init ();
+ 
++        /* preprocess the arguments to support the xdm style
++         * -nodaemon option
++         */
++        for (i = 0; i < argc; i++) {
++                if (strcmp (argv[i], "-nodaemon") == 0)
++                        argv[i] = "--nodaemon";
++        }
++
+         context = g_option_context_new (_("GNOME Display Manager"));
+         g_option_context_add_main_entries (context, entries, NULL);
+         g_option_context_set_ignore_unknown_options (context, TRUE);
+@@ -465,6 +493,33 @@ main (int    argc,
+                 g_log_set_always_fatal (fatal_mask);
+         }
+ 
++        if (!no_daemon) {
++                pid_t pid;
++                if (daemon_retval_init () < 0) {
++                        g_warning ("Failed to create pipe");
++                        exit (-1);
++                }
++                if ((pid = daemon_fork ()) < 0) {
++                        /* Fork failed */
++                        daemon_retval_done ();
++                        exit (1);
++                } else if (pid) {
++                        /* Parent process: wait 20s for daemon_retval_send() in the daemon process */
++                        if ((ret = daemon_retval_wait (20)) < 0) {
++                            g_warning ("Timed out waiting for daemon process: %s", strerror(errno));
++                            exit (255);
++                        } else if (ret > 0) {
++                            g_warning ("Daemon process returned error code %d", ret);
++                            exit (ret);
++                        }
++                        exit (0);
++                }
++                /* Daemon process */
++                daemon_close_all (-1);
++                /* Start a new process group so that killing the daemon will kill the processes that it spawned */
++                setsid ();
++        }
++
+         gdm_log_init ();
+ 
+         settings = gdm_settings_new ();
+@@ -519,6 +574,9 @@ main (int    argc,
+                 g_timeout_add_seconds (30, (GSourceFunc) timed_exit_cb, main_loop);
+         }
+ 
++        if (!no_daemon)
++                daemon_retval_send (0);
++
+         g_main_loop_run (main_loop);
+ 
+         g_debug ("GDM finished, cleaning up...");
+@@ -535,6 +593,8 @@ main (int    argc,
+         ret = 0;
+ 
+  out:
++        if (!no_daemon)
++                daemon_retval_send (ret);
+ 
+         return ret;
+ }
+-- 
+1.7.12
+
diff --git a/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch b/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch
new file mode 100644
index 000000000000..035d0fa4b173
--- /dev/null
+++ b/gnome-base/gdm/files/gdm-3.6.0-selinux-automagic.patch
@@ -0,0 +1,31 @@
+From 8f9bf7b053fc7a6c2e5b33fc43c168ba7250cb98 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 25 Sep 2012 17:38:37 -0400
+Subject: [PATCH] configure: Make selinux check non-automagic
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 80a1fd4..61a43d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,9 +142,13 @@ AC_SUBST(UPOWER)
+ AC_SUBST(UPOWER_CFLAGS)
+ AC_SUBST(UPOWER_LIBS)
+ 
++AC_ARG_WITH(selinux,
++	    AS_HELP_STRING([--with-selinux],
++	                   [Add SELinux support]))
++
+ PKG_CHECK_MODULES(LIBSELINUX, libselinux, have_selinux=yes, have_selinux=no)
+ 
+-if test "x$have_selinux" = "xyes" ; then
++if test "x$have_selinux" = "xyes" && test "x$with_selinux" != "xno" ; then
+         AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux])
+ fi
+ AC_SUBST(LIBSELINUX_CFLAGS)
+-- 
+1.7.12
+
diff --git a/gnome-base/gdm/gdm-2.20.11.ebuild b/gnome-base/gdm/gdm-2.20.11.ebuild
deleted file mode 100644
index 0bb8cb12896e..000000000000
--- a/gnome-base/gdm/gdm-2.20.11.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11.ebuild,v 1.15 2012/09/27 08:54:42 tetromino Exp $
-
-EAPI="2"
-
-inherit eutils pam gnome2 user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility afs branding +consolekit dmx ipv6 gnome-keyring pam remote selinux tcpd xinerama $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND=">=dev-libs/glib-2.12:2
-	>=x11-libs/gtk+-2.6:2
-	>=x11-libs/pango-1.3
-	>=gnome-base/libglade-2:2.0
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/librsvg-1.1.1:2
-	>=dev-libs/libxml2-2.4.12:2
-	>=media-libs/libart_lgpl-2.3.11
-	x11-libs/gksu
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-apps/sessreg
-	x11-libs/libXdmcp
-	xinerama? ( x11-libs/libXinerama )
-	consolekit? (
-		sys-auth/consolekit
-		dev-libs/dbus-glib )
-	accessibility? ( x11-libs/libXevie )
-	afs? ( net-fs/openafs sys-libs/lwp )
-	dmx? ( x11-libs/libdmx )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	pam? ( virtual/pam )
-	!pam? ( elibc_glibc? ( sys-apps/shadow ) )
-	remote? ( gnome-extra/zenity )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	>=x11-misc/xdg-utils-1.0.2-r3"
-DEPEND="${RDEPEND}
-	dmx? ( x11-proto/dmxproto )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-prefetch
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--with-pam-prefix=/etc
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_enable ipv6)
-		$(use_enable remote secureremote)
-		$(use_with accessibility xevie)
-		$(use_with consolekit console-kit)
-		$(use_with dmx)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	if use pam; then
-		G2CONF="${G2CONF} --enable-authentication-scheme=pam"
-	else
-		G2CONF="${G2CONF} --enable-console-helper=no"
-		if use elibc_glibc ; then
-			G2CONF="${G2CONF} --enable-authentication-scheme=shadow"
-		else
-			G2CONF="${G2CONF} --enable-authentication-scheme=crypt"
-		fi
-	fi
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux (#41022)
-	epatch "${FILESDIR}/${PN}-2.13.0.1-selinux-remove-attr.patch"
-
-	# Add gksu to gdmsetup menu entry
-	epatch "${FILESDIR}/${PN}-2.20.2-gksu.patch"
-
-	# Fix parallel install, bug #217037
-	epatch "${FILESDIR}/${PN}-2.20.9-parallel-make.patch"
-
-	# Make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.20.10-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.20.10-xinitrc-ssh-agent.patch"
-
-	# Fix wrong DESKTOP_SESSION set if ${HOME}/.dmrc is not found or
-	# does not contain any relevant data and autologin enabled, bug #281442
-	epatch "${FILESDIR}/${PN}-2.20.10-desktop-session-dmrc-autologin.patch"
-
-	# Fix 24 hour combo box in gdmsetup, bug #301151
-	# patch imported from ubuntu mirrors
-	epatch "${FILESDIR}/${PN}-2.20.10-gdmsetup-24hr-combo.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 1 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 2 failed"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay" || die "dobin failed"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	if use pam ; then
-		use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-		dopamd "${gentoodir}"/pam.d/*
-		dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-	fi
-
-	# use graphical greeter local
-	dosed "s:#Greeter=/usr/libexec/gdmlogin:Greeter=/usr/libexec/gdmgreeter:" \
-		/usr/share/gdm/defaults.conf
-
-	# list available users
-	dosed "s:^#MinimalUID=.*:MinimalUID=1000:" /usr/share/gdm/defaults.conf
-	dosed "s:^#IncludeAll=.*:IncludeAll=true:" /usr/share/gdm/defaults.conf
-
-	# Fix old X11R6 paths
-	dosed "s:/usr/X11R6/bin:/usr/bin:" /usr/share/gdm/defaults.conf
-
-	# Use Clearlooks as default theme, bug #268496
-	dosed "s:#GtkTheme=Default:GtkTheme=Clearlooks:" /usr/share/gdm/defaults.conf
-
-	# Move Gentoo theme in
-	if use branding ; then
-		mv "${WORKDIR}"/gentoo-*  "${D}/usr/share/gdm/themes"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-
-	elog "GDM has changed the location of its configuration file.  Please"
-	elog "edit /etc/X11/gdm/custom.conf.  The factory defaults are located"
-	elog "at /usr/share/gdm/{defaults.conf,factory-defaults.conf}"
-
-	elog "See README.install for more information about the change."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# Soft restart, assumes Gentoo defaults for file locations
-	# Do restart after gdm.conf move above
-	FIFOFILE=/var/gdm/.gdmfifo
-	PIDFILE=/var/run/gdm.pid
-
-	if [ -w ${FIFOFILE} ] ; then
-		if [ -f ${PIDFILE} ] ; then
-			if kill -0 `cat ${PIDFILE}`; then
-				(echo;echo SOFT_RESTART) >> ${FIFOFILE}
-			fi
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if [ "$(rc-config list default | grep xdm)" != "" ] ; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-2.32.1.ebuild b/gnome-base/gdm/gdm-2.32.1.ebuild
deleted file mode 100644
index f4934ec766eb..000000000000
--- a/gnome-base/gdm/gdm-2.32.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1.ebuild,v 1.6 2012/09/27 08:54:42 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pam user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
-
-IUSE_LIBC="elibc_glibc"
-IUSE="accessibility +consolekit ipv6 gnome-keyring selinux tcpd test xinerama +xklavier $IUSE_LIBC"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-2.20.9-gentoo-files-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${GDM_EXTRA}.tar.bz2"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-RDEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.22:2
-	>=x11-libs/gtk+-2.20.2:2
-	>=x11-libs/pango-1.3
-	>=media-libs/libcanberra-0.4[gtk]
-	>=gnome-base/gconf-2.31.3
-	>=gnome-base/gnome-panel-2[bonobo]
-	<gnome-base/gnome-panel-2.91
-	>=gnome-base/gnome-session-2.28
-	>=x11-misc/xdg-utils-1.0.2-r3
-	>=sys-power/upower-0.9
-	app-text/iso-codes
-
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-apps/sessreg
-
-	virtual/pam
-	consolekit? ( sys-auth/consolekit )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )
-
-	!gnome-extra/fast-user-switch-applet"
-DEPEND="${RDEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--localstatedir=/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=/etc
-		SOUND_PROGRAM=/usr/bin/gdmplay
-		$(use_with accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewuser gdm -1 -1 /var/lib/gdm gdm
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux, bug #41022
-	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
-
-	# fix VT grab problem causing GDM to grab VT2 instead of 7, bug #261339
-	epatch "${FILESDIR}/${PN}-2.32.0-broken-VT-detection.patch"
-
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-2.32.0-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# fix libxklavier automagic support
-	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
-	mkdir "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${D}/usr/sbin/gdm"
-	dosym /usr/sbin/gdm-binary /usr/sbin/gdm
-
-	# our x11's scripts point to /usr/bin/gdm
-	dosym /usr/sbin/gdm-binary /usr/bin/gdm
-
-	# log, etc.
-	keepdir /var/log/gdm
-	keepdir /var/gdm
-
-	fowners root:gdm /var/gdm
-	fperms 1770 /var/gdm
-
-	# add a custom xsession .desktop by default (#44537)
-	exeinto /etc/X11/dm/Sessions
-	doexe "${gentoodir}/custom.desktop" || die "doexe 1 failed"
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# add a custom sound playing script (#248253)
-	dobin "${gentoodir}/gdmplay"
-
-	# avoid file collision, bug #213118
-	rm -f "${D}/usr/share/xsessions/gnome.desktop"
-
-	# We replace the pam stuff by our own
-	rm -rf "${D}/etc/pam.d"
-
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-
-	dopamd "${gentoodir}"/pam.d/*
-	dopamsecurity console.apps "${gentoodir}/security/console.apps/gdmsetup"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if rc-config list default | grep -q xdm; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild b/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild
deleted file mode 100644
index 60205f9de6ad..000000000000
--- a/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild,v 1.7 2012/09/27 08:54:42 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pam systemd user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~sh ~x86"
-
-IUSE="accessibility +consolekit fprint +gnome-shell ipv6 gnome-keyring +introspection selinux smartcard tcpd test xinerama +xklavier"
-
-# Name of the tarball with gentoo specific files
-GDM_EXTRA="${PN}-3.2.1.1-gentoo-files"
-
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/gdm/${GDM_EXTRA}.tar.xz"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.3:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=x11-libs/pango-1.3
-	dev-libs/nspr
-	>=dev-libs/nss-3.11.1
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=gnome-base/gconf-2.31.3
-	>=x11-misc/xdg-utils-1.0.2-r3
-	>=sys-power/upower-0.9
-	>=sys-apps/accountsservice-0.6.12
-
-	gnome-base/dconf
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	app-text/iso-codes
-
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-apps/sessreg
-
-	virtual/pam
-	consolekit? ( sys-auth/consolekit )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	x11-proto/randrproto
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-# XXX: These deps are from session and desktop files in data/ directory
-# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-2.91.92
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	consolekit? ( gnome-extra/polkit-gnome )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
-	!gnome-shell? ( x11-wm/metacity )
-	smartcard? (
-		app-crypt/coolkey
-		sys-auth/pam_pkcs11 )
-
-	!gnome-extra/fast-user-switch-applet"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		$(use_with accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# remove unneeded linker directive for selinux, bug #41022
-	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
-
-	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
-
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# fix libxklavier automagic support
-	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
-	# don't load accessibility support at runtime when USE=-accessibility
-	use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.1-disable-accessibility.patch"
-
-	# make gdm-fallback session the default if USE=-gnome-shell
-	if ! use gnome-shell; then
-		sed -e "s:'gdm-shell':'gdm-fallback':" \
-			-i data/00-upstream-settings || die "sed failed"
-	fi
-
-	mkdir -p "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-
-	local gentoodir="${WORKDIR}/${GDM_EXTRA}"
-
-	# Install the systemd unit file
-	systemd_dounit "${gentoodir}/gdm@.service"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${ED}/usr/sbin/gdm"
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
-	# our x11's scripts point to /usr/bin/gdm
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"
-
-	# log, etc.
-	keepdir /var/log/gdm
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain" || die "doexe 2 failed"
-	doexe "${FILESDIR}/50-ssh-agent" || die "doexe 3 failed"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm || die "doenvd failed"
-
-	# install PAM files
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${gentoodir}"/pam.d/*
-	dopamd "${gentoodir}"/pam.d/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome}
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	dbus-launch dconf update || die "'dconf update' failed"
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	elog
-	elog "GDM ignores most non-localization environment variables. If you"
-	elog "need GDM to launch gnome-session with a particular environment,"
-	elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see"
-	elog "the pam_env man page for more information."
-	elog
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=513579
-	# Lennart says this problem is fixed, but users are still reporting problems
-	# XXX: Do we want this elog?
-#	if has_version "media-libs/libcanberra[pulseaudio]" ; then
-#		elog
-#		elog "You have media-libs/libcanberra with the pulseaudio USE flag"
-#		elog "enabled. GDM will start a pulseaudio process to play sounds. This"
-#		elog "process should automatically terminate when a user logs into a"
-#		elog "desktop session. If GDM's pulseaudio fails to terminate and"
-#		elog "causes problems for users' audio, you can prevent GDM from"
-#		elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf"
-#		elog "so it contains the following two lines:"
-#		elog
-#		elog "autospawn = no"
-#		elog "daemon-binary = /bin/true"
-#	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if rc-config list default | grep -q xdm; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild b/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild
deleted file mode 100644
index 9b8d88ef19dc..000000000000
--- a/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild,v 1.6 2012/09/27 08:54:42 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 pam systemd user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~sh ~x86"
-
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection selinux smartcard tcpd test xinerama +xklavier"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.3:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=x11-libs/pango-1.3
-	dev-libs/nspr
-	>=dev-libs/nss-3.11.1
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=gnome-base/gconf-2.31.3
-	>=x11-misc/xdg-utils-1.0.2-r3
-	>=sys-power/upower-0.9
-	>=sys-apps/accountsservice-0.6.12
-
-	gnome-base/dconf
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	app-text/iso-codes
-
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-apps/sessreg
-
-	virtual/pam
-	consolekit? ( sys-auth/consolekit )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	x11-proto/randrproto
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2"
-# XXX: These deps are from session and desktop files in data/ directory
-# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-2.91.92
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	consolekit? ( gnome-extra/polkit-gnome )
-	fallback? ( x11-wm/metacity )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
-	!gnome-shell? ( x11-wm/metacity )
-	smartcard? (
-		app-crypt/coolkey
-		sys-auth/pam_pkcs11 )
-
-	!gnome-extra/fast-user-switch-applet"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		$(use_with accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with selinux)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# remove unneeded linker directive for selinux, bug #41022
-	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
-
-	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
-
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# fix libxklavier automagic support
-	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
-	# fixes for logging in with slow pam modules from git master branch
-	epatch "${FILESDIR}/${PN}-3.2.1.1-pam-fix-"{1,2}.patch
-
-	# don't load accessibility support at runtime when USE=-accessibility
-	use accessibility || epatch "${FILESDIR}/${PN}-3.2.1.1-disable-accessibility.patch"
-
-	# make gdm-fallback session the default if USE=-gnome-shell
-	if ! use gnome-shell; then
-		sed -e "s:'gdm-shell':'gdm-fallback':" \
-			-i data/00-upstream-settings || die "sed failed"
-	fi
-
-	mkdir -p "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the systemd unit file
-	systemd_dounit "${FILESDIR}/3.2.1.1/gdm.service"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${ED}/usr/sbin/gdm"
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
-	# our x11's scripts point to /usr/bin/gdm
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"
-
-	# log, etc.
-	keepdir /var/log/gdm
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain"
-	doexe "${FILESDIR}/50-ssh-agent"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	# install PAM files
-	mkdir "${T}/pam.d" || die "mkdir failed"
-	cp "${FILESDIR}/3.2.1.1"/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome} \
-		"${T}/pam.d" || die "cp failed"
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${T}/pam.d"/*
-	dopamd "${T}/pam.d"/*
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	dbus-launch dconf update || die "'dconf update' failed"
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	elog
-	elog "GDM ignores most non-localization environment variables. If you"
-	elog "need GDM to launch gnome-session with a particular environment,"
-	elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see"
-	elog "the pam_env man page for more information."
-	elog
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=513579
-	# Lennart says this problem is fixed, but users are still reporting problems
-	# XXX: Do we want this elog?
-#	if has_version "media-libs/libcanberra[pulseaudio]" ; then
-#		elog
-#		elog "You have media-libs/libcanberra with the pulseaudio USE flag"
-#		elog "enabled. GDM will start a pulseaudio process to play sounds. This"
-#		elog "process should automatically terminate when a user logs into a"
-#		elog "desktop session. If GDM's pulseaudio fails to terminate and"
-#		elog "causes problems for users' audio, you can prevent GDM from"
-#		elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf"
-#		elog "so it contains the following two lines:"
-#		elog
-#		elog "autospawn = no"
-#		elog "daemon-binary = /bin/true"
-#	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if rc-config list default | grep -q xdm; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.4.1-r3.ebuild b/gnome-base/gdm/gdm-3.4.1-r3.ebuild
index af4287f712cb..b7dcd25c3a8a 100644
--- a/gnome-base/gdm/gdm-3.4.1-r3.ebuild
+++ b/gnome-base/gdm/gdm-3.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r3.ebuild,v 1.1 2012/09/29 06:05:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r3.ebuild,v 1.2 2012/12/26 21:45:01 eva Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -16,9 +16,8 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~sh ~x86"
-
 IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama +xklavier"
+KEYWORDS="~amd64 ~sh ~x86"
 
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
@@ -104,31 +103,6 @@ RDEPEND="${COMMON_DEPEND}
 	!gnome-extra/fast-user-switch-applet"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		$(use_with accessibility xevie)
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with systemd)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
 	enewgroup gdm
 	enewgroup video # Just in case it hasn't been created yet
 	enewuser gdm -1 -1 /var/lib/gdm gdm,video
@@ -186,6 +160,34 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	G2CONF="${G2CONF}
+		--disable-static
+		--localstatedir=${EPREFIX}/var
+		--with-xdmcp=yes
+		--enable-authentication-scheme=pam
+		--with-pam-prefix=${EPREFIX}/etc
+		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
+		$(use_with accessibility xevie)
+		$(use_with audit libaudit)
+		$(use_enable ipv6)
+		$(use_enable xklavier libxklavier)
+		$(use_with consolekit console-kit)
+		$(use_with plymouth)
+		$(use_with selinux)
+		$(use_with systemd)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)"
+	gnome2_src_configure
+}
+
 src_install() {
 	gnome2_src_install
 
diff --git a/gnome-base/gdm/gdm-3.4.1.ebuild b/gnome-base/gdm/gdm-3.4.1.ebuild
deleted file mode 100644
index 5da4b19f7682..000000000000
--- a/gnome-base/gdm/gdm-3.4.1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1.ebuild,v 1.4 2012/09/27 08:54:42 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 pam systemd user
-
-DESCRIPTION="GNOME Display Manager"
-HOMEPAGE="https://live.gnome.org/GDM"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~sh ~x86"
-
-IUSE="accessibility +consolekit +fallback fprint +gnome-shell ipv6 gnome-keyring +introspection plymouth selinux smartcard systemd tcpd test xinerama +xklavier"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.3:2
-	>=x11-libs/gtk+-2.91.1:3
-	>=x11-libs/pango-1.3
-	dev-libs/nspr
-	>=dev-libs/nss-3.11.1
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=x11-misc/xdg-utils-1.0.2-r3
-	>=sys-power/upower-0.9
-	>=sys-apps/accountsservice-0.6.12
-
-	gnome-base/dconf
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/dbus
-
-	app-text/iso-codes
-
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrandr
-	x11-apps/sessreg
-
-	virtual/pam
-	consolekit? ( sys-auth/consolekit )
-
-	accessibility? ( x11-libs/libXevie )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-39 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	x11-proto/randrproto
-	>=dev-util/intltool-0.40.0
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig"
-# XXX: These deps are from session and desktop files in data/ directory
-# at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
-# fprintd is used via dbus by gdm-fingerprint-extension
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-2.91.92
-	x11-apps/xhost
-	x11-themes/gnome-icon-theme-symbolic
-
-	accessibility? (
-		app-accessibility/gnome-mag
-		app-accessibility/gok
-		app-accessibility/orca
-		gnome-extra/at-spi:1 )
-	consolekit? ( gnome-extra/polkit-gnome )
-	fallback? ( x11-wm/metacity )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-	gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 )
-	!gnome-shell? ( x11-wm/metacity )
-	smartcard? (
-		app-crypt/coolkey
-		sys-auth/pam_pkcs11 )
-
-	!gnome-extra/fast-user-switch-applet"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		$(use_with accessibility xevie)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with systemd)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# remove unneeded linker directive for selinux, bug #41022
-	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
-
-	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
-
-	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
-
-	# make custom session work, bug #216984
-	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
-
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# fix libxklavier automagic support
-	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
-	# plymouth support (in next release)
-	epatch "${FILESDIR}/${P}-save-root-window.patch"
-	epatch "${FILESDIR}/${P}-plymouth.patch"
-
-	# don't load accessibility support at runtime when USE=-accessibility
-	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
-
-	# make gdm-fallback session the default if USE=-gnome-shell
-	if ! use gnome-shell; then
-		sed -e "s:'gdm-shell':'gdm-fallback':" \
-			-i data/00-upstream-settings || die "sed failed"
-	fi
-
-	mkdir -p "${S}"/m4
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Install the systemd unit file
-	systemd_dounit "${FILESDIR}/3.2.1.1/gdm.service"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${ED}/usr/sbin/gdm"
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
-	# our x11's scripts point to /usr/bin/gdm
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"
-
-	# log, etc.
-	keepdir /var/log/gdm
-
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	doexe "${FILESDIR}/49-keychain"
-	doexe "${FILESDIR}/50-ssh-agent"
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	# install PAM files
-	mkdir "${T}/pam.d" || die "mkdir failed"
-	cp "${FILESDIR}/3.2.1.1"/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome} \
-		"${T}/pam.d" || die "cp failed"
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${T}/pam.d"/*
-	dopamd "${T}/pam.d"/*
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	dbus-launch dconf update || die "'dconf update' failed"
-
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
-
-	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
-	elog "and then execute 'rc-update add xdm default'."
-	elog "If you already have GDM running, you will need to restart it."
-
-	elog
-	elog "GDM ignores most non-localization environment variables. If you"
-	elog "need GDM to launch gnome-session with a particular environment,"
-	elog "you need to use pam_env.so in /etc/pam.d/gdm-welcome; see"
-	elog "the pam_env man page for more information."
-	elog
-
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
-	fi
-
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
-		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
-		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
-		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
-	fi
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=513579
-	# Lennart says this problem is fixed, but users are still reporting problems
-	# XXX: Do we want this elog?
-#	if has_version "media-libs/libcanberra[pulseaudio]" ; then
-#		elog
-#		elog "You have media-libs/libcanberra with the pulseaudio USE flag"
-#		elog "enabled. GDM will start a pulseaudio process to play sounds. This"
-#		elog "process should automatically terminate when a user logs into a"
-#		elog "desktop session. If GDM's pulseaudio fails to terminate and"
-#		elog "causes problems for users' audio, you can prevent GDM from"
-#		elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf"
-#		elog "so it contains the following two lines:"
-#		elog
-#		elog "autospawn = no"
-#		elog "daemon-binary = /bin/true"
-#	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	if rc-config list default | grep -q xdm; then
-		elog "To remove GDM from startup please execute"
-		elog "'rc-update del xdm default'"
-	fi
-}
diff --git a/gnome-base/gdm/gdm-3.4.1-r1.ebuild b/gnome-base/gdm/gdm-3.6.2.ebuild
index 52a292466eda..98ad0808961e 100644
--- a/gnome-base/gdm/gdm-3.4.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.6.2.ebuild
@@ -1,44 +1,46 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.4.1-r1.ebuild,v 1.3 2012/09/27 08:54:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-3.6.2.ebuild,v 1.1 2012/12/26 21:45:01 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GNOME2_LA_PUNT="yes"
 
 inherit autotools eutils gnome2 pam systemd user
 
+G_PV="2012.09.25"
+G_P="gdm-gentoo-${G_PV}"
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
+SRC_URI="${SRC_URI}
+	http://dev.gentoo.org/~tetromino/distfiles/${PN}/${G_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
+IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama"
 KEYWORDS="~amd64 ~sh ~x86"
 
-IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell gnome-keyring +introspection ipv6 ldap plymouth selinux smartcard systemd tcpd test xinerama +xklavier"
-
 # NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
 # nspr used by smartcard extension
 # dconf, dbus and g-s-d are needed at install time for dconf update
+# libdaemon needed for our fix-daemonize-regression.patch
 COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.29.3:2
+	app-text/iso-codes
+	>=dev-libs/glib-2.33.2:2
 	>=x11-libs/gtk+-2.91.1:3
+	dev-libs/libdaemon
 	>=x11-libs/pango-1.3
 	dev-libs/nspr
 	>=dev-libs/nss-3.11.1
-	>=media-libs/fontconfig-2.5.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	>=x11-misc/xdg-utils-1.0.2-r3
-	>=sys-power/upower-0.9
-	>=sys-apps/accountsservice-0.6.12
-
 	>=gnome-base/dconf-0.11.6
 	>=gnome-base/gnome-settings-daemon-3.1.4
 	gnome-base/gsettings-desktop-schemas
+	>=media-libs/fontconfig-2.5.0
+	>=media-libs/libcanberra-0.4[gtk3]
 	sys-apps/dbus
+	>=sys-apps/accountsservice-0.6.12
+	>=sys-power/upower-0.9
 
-	app-text/iso-codes
-
+	x11-apps/sessreg
 	x11-base/xorg-server
 	x11-libs/libXi
 	x11-libs/libXau
@@ -47,37 +49,27 @@ COMMON_DEPEND="
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXrandr
-	x11-apps/sessreg
+	>=x11-misc/xdg-utils-1.0.2-r3
 
 	virtual/pam
-	consolekit? ( sys-auth/consolekit )
+	sys-auth/pambase[consolekit?,systemd?]
 
 	accessibility? ( x11-libs/libXevie )
 	audit? ( sys-process/audit )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] )
+	consolekit? ( sys-auth/consolekit[pam] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 	plymouth? ( sys-boot/plymouth )
 	selinux? ( sys-libs/libselinux )
-	systemd? ( >=sys-apps/systemd-39 )
+	systemd? ( >=sys-apps/systemd-186[pam] )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	xinerama? ( x11-libs/libXinerama )
-	xklavier? ( >=x11-libs/libxklavier-4 )"
-DEPEND="${COMMON_DEPEND}
-	test? ( >=dev-libs/check-0.9.4 )
-	xinerama? ( x11-proto/xineramaproto )
-	app-text/docbook-xml-dtd:4.1.2
-	sys-devel/gettext
-	x11-proto/inputproto
-	x11-proto/randrproto
-	>=dev-util/intltool-0.40.0
-	>=app-text/scrollkeeper-0.1.4
-	>=app-text/gnome-doc-utils-0.3.2
-	virtual/pkgconfig"
+"
 # XXX: These deps are from session and desktop files in data/ directory
 # at-spi:1 is needed for at-spi-registryd (spawned by simple-chooser)
 # fprintd is used via dbus by gdm-fingerprint-extension
+# gnome-session-3.6 needed to avoid freezing with orca
 RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-2.91.92
+	>=gnome-base/gnome-session-3.6
 	x11-apps/xhost
 	x11-themes/gnome-icon-theme-symbolic
 
@@ -97,34 +89,20 @@ RDEPEND="${COMMON_DEPEND}
 		app-crypt/coolkey
 		sys-auth/pam_pkcs11 )
 
-	!gnome-extra/fast-user-switch-applet"
+	!gnome-extra/fast-user-switch-applet
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	x11-proto/inputproto
+	x11-proto/randrproto
+	test? ( >=dev-libs/check-0.9.4 )
+	xinerama? ( x11-proto/xineramaproto )
+"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	G2CONF="${G2CONF}
-		--disable-static
-		--localstatedir=${EPREFIX}/var
-		--with-xdmcp=yes
-		--enable-authentication-scheme=pam
-		--with-pam-prefix=${EPREFIX}/etc
-		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
-		$(use_with accessibility xevie)
-		$(use_with audit libaudit)
-		$(use_enable ipv6)
-		$(use_enable xklavier libxklavier)
-		$(use_with consolekit console-kit)
-		$(use_with plymouth)
-		$(use_with selinux)
-		$(use_with systemd)
-		$(use_with tcpd tcp-wrappers)
-		$(use_with xinerama)"
-
 	enewgroup gdm
 	enewgroup video # Just in case it hasn't been created yet
 	enewuser gdm -1 -1 /var/lib/gdm gdm,video
@@ -142,14 +120,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# remove unneeded linker directive for selinux, bug #41022
-	epatch "${FILESDIR}/${PN}-2.32.0-selinux-remove-attr.patch"
+	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
+	# XXX: We can now pass a hard-coded initial value; temporary fix
+	#epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
 
 	# daemonize so that the boot process can continue, bug #236701
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-daemonize-regression.patch"
-
-	# GDM grabs VT2 instead of VT7, bug 261339, bug 284053, bug 288852
-	epatch "${FILESDIR}/${PN}-2.32.0-fix-vt-problems.patch"
+	epatch "${FILESDIR}/${PN}-3.6.0-fix-daemonize-regression.patch"
 
 	# make custom session work, bug #216984
 	epatch "${FILESDIR}/${PN}-3.2.1.1-custom-session.patch"
@@ -157,15 +133,8 @@ src_prepare() {
 	# ssh-agent handling must be done at xinitrc.d, bug #220603
 	epatch "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
 
-	# fix libxklavier automagic support
-	epatch "${FILESDIR}/${PN}-2.32.0-automagic-libxklavier-support.patch"
-
-	# plymouth support (in next release)
-	epatch "${FILESDIR}/${P}-save-root-window.patch"
-	epatch "${FILESDIR}/${P}-plymouth.patch"
-
-	# dconf-0.13.x compatibility (next release)
-	epatch "${FILESDIR}/${P}-dconf-0.13.patch"
+	# automagic selinux :/
+	epatch "${FILESDIR}/${PN}-3.6.0-selinux-automagic.patch"
 
 	# don't load accessibility support at runtime when USE=-accessibility
 	use accessibility || epatch "${FILESDIR}/${PN}-3.3.92.1-disable-accessibility.patch"
@@ -182,49 +151,76 @@ src_prepare() {
 	gnome2_src_prepare
 }
 
+src_configure() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+	# PAM is the only auth scheme supported
+	# even though configure lists shadow and crypt
+	# they don't have any corresponding code.
+	# --with-at-spi-registryd-directory= needs to be passed explicitly because
+	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
+	G2CONF="${G2CONF}
+		--disable-static
+		--localstatedir=${EPREFIX}/var
+		--with-xdmcp=yes
+		--enable-authentication-scheme=pam
+		--with-pam-prefix=${EPREFIX}/etc
+		--with-default-pam-config=none
+		--with-at-spi-registryd-directory=${EPREFIX}/usr/libexec
+		--with-initial-vt=7
+		$(use_with accessibility xevie)
+		$(use_with audit libaudit)
+		$(use_enable ipv6)
+		$(use_with consolekit console-kit)
+		$(use_with plymouth)
+		$(use_with selinux)
+		$(use_with systemd)
+		$(systemd_with_unitdir)
+		$(use_with tcpd tcp-wrappers)
+		$(use_with xinerama)
+		ITSTOOL=$(type -P true)"
+	gnome2_src_configure
+}
+
 src_install() {
 	gnome2_src_install
 
-	# Install the systemd unit file
-	systemd_dounit "${FILESDIR}/3.4.1/gdm.service"
-
-	# gdm-binary should be gdm to work with our init (#5598)
-	rm -f "${ED}/usr/sbin/gdm"
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/sbin/gdm"
 	# our x11's scripts point to /usr/bin/gdm
-	ln -sfn /usr/sbin/gdm-binary "${ED}/usr/bin/gdm"
+	dosym /usr/sbin/gdm-binary /usr/bin/gdm
 
 	# log, etc.
 	keepdir /var/log/gdm
 
-	# add xinitrc.d scripts
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
+	# gdm user's home directory
+	keepdir /var/lib/gdm
+	fowners gdm:gdm /var/lib/gdm
 
 	# install XDG_DATA_DIRS gdm changes
 	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
 	doenvd 99xdg-gdm
 
-	# install PAM files
-	mkdir "${T}/pam.d" || die "mkdir failed"
-	cp "${FILESDIR}/3.4.1"/gdm{,-autologin,-password,-fingerprint,-smartcard,-welcome} \
-		"${T}/pam.d" || die "cp failed"
-	use gnome-keyring && sed -i "s:#Keyring=::g" "${T}/pam.d"/*
-	use ldap && sed -i "s:#LDAP=::g" "${T}/pam.d"/*
-	use systemd && sed -i "s:#Systemd=::g" "${T}/pam.d"/*
-	dopamd "${T}/pam.d"/*
+	cd "${WORKDIR}/${G_P}"
+	local LDAP
+	use ldap && LDAP=yes
+	emake GDM_WELCOME="gdm-launch-environment" LDAP=${LDAP} EPREFIX="${EPREFIX}" \
+		SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install
 }
 
 pkg_postinst() {
+	local d ret
+
 	gnome2_pkg_postinst
 
 	dbus-launch dconf update || die "'dconf update' failed"
 
-	ewarn
-	ewarn "This is an EXPERIMENTAL release, please bear with its bugs and"
-	ewarn "visit us on #gentoo-desktop if you have problems."
-	ewarn
+	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
+	ret=0
+	ebegin "Fixing ${EROOT}var/lib/gdm ownership"
+	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
+	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
+		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
+	done
+	eend ${ret}
 
 	elog "To make GDM start at boot, edit /etc/conf.d/xdm"
 	elog "and then execute 'rc-update add xdm default'."
@@ -237,33 +233,19 @@ pkg_postinst() {
 	elog "the pam_env man page for more information."
 	elog
 
-	if use gnome-keyring; then
-		elog "For autologin to unlock your keyring, you need to set an empty"
-		elog "password on your keyring. Use app-crypt/seahorse for that."
+	if has_version sys-auth/pambase[gnome-keyring]; then
+		elog "For passwordless login to unlock your keyring, you need to set an"
+		elog "empty password on your keyring. Use app-crypt/seahorse for that."
+	else
+		elog "To unlock your keyring on login, install sys-auth/pambase"
+		elog "with USE=gnome-keyring"
 	fi
 
-	if [ -f "/etc/X11/gdm/gdm.conf" ]; then
+	if [[ -f "/etc/X11/gdm/gdm.conf" ]]; then
 		elog "You had /etc/X11/gdm/gdm.conf which is the old configuration"
 		elog "file.  It has been moved to /etc/X11/gdm/gdm-pre-gnome-2.16"
 		mv /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm-pre-gnome-2.16
 	fi
-
-	# https://bugzilla.redhat.com/show_bug.cgi?id=513579
-	# Lennart says this problem is fixed, but users are still reporting problems
-	# XXX: Do we want this elog?
-#	if has_version "media-libs/libcanberra[pulseaudio]" ; then
-#		elog
-#		elog "You have media-libs/libcanberra with the pulseaudio USE flag"
-#		elog "enabled. GDM will start a pulseaudio process to play sounds. This"
-#		elog "process should automatically terminate when a user logs into a"
-#		elog "desktop session. If GDM's pulseaudio fails to terminate and"
-#		elog "causes problems for users' audio, you can prevent GDM from"
-#		elog "starting pulseaudio by editing /var/lib/gdm/.pulse/client.conf"
-#		elog "so it contains the following two lines:"
-#		elog
-#		elog "autospawn = no"
-#		elog "daemon-binary = /bin/true"
-#	fi
 }
 
 pkg_postrm() {
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index baf8cbdf90e2..967ce1cbe067 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.xml
@@ -7,14 +7,13 @@
 	<flag name="consolekit">Allow proper handling of removable media according
 		to who is actually present on the machine.</flag>
 	<flag name="dmx">Enables Distributed Multihead X (DMX) support</flag>
+
 	<flag name="fallback">Install <pkg>x11-wm/metacity</pkg> as fallback in
 		case gnome-shell greeter fails to start</flag>
 	<flag name="fprint">Enables experimental fingerprint authentication using
 		<pkg>sys-auth/fprintd</pkg></flag>
 	<flag name="gnome-shell">Enables a greeter based on GNOME Shell (uses
 		OpenGL)</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
 	<flag name="plymouth">Enable support for smooth transition from
 		<pkg>sys-boot/plymouth</pkg></flag>
 	<flag name="remote">Enables support for secure remote connections</flag>
author	Gilles Dartiguelongue <eva@gentoo.org>	2012-12-26 21:45:05 +0000
committer	Gilles Dartiguelongue <eva@gentoo.org>	2012-12-26 21:45:05 +0000
commit	2b03e1ce10a856dde107479760f360e0e773135f (patch)
tree	8044ab5ee6777df77f8441cba7626c6f690cbf0f /gnome-base
parent	marked x86 per bug 446526 (diff)
download	historical-2b03e1ce10a856dde107479760f360e0e773135f.tar.gz historical-2b03e1ce10a856dde107479760f360e0e773135f.tar.bz2 historical-2b03e1ce10a856dde107479760f360e0e773135f.zip