Rewrite pam.d files to hopefully address some of the problems systemd users have been having (e.g. bug #435042); pam.d files are now shipped in a tarball to keep FILESDIR a bit cleaner. Make license more precise. Note that gdm now relies on sys-auth/pambase with USE=gnome-keyring for automatic keyring unlocking.

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

11 files changed, 319 insertions, 33 deletions

diff --git a/gnome-base/gdm/ChangeLog b/gnome-base/gdm/ChangeLog
index 1fb2522e5359..93f17752d7f5 100644
--- a/gnome-base/gdm/ChangeLog
+++ b/gnome-base/gdm/ChangeLog
@@ -1,6 +1,18 @@
 # 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.355 2012/09/12 09:37:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/ChangeLog,v 1.356 2012/09/27 08:54:42 tetromino Exp $
+
+*gdm-3.4.1-r2 (27 Sep 2012)
+
+  27 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-2.20.11.ebuild,
+  gdm-2.20.11-r1.ebuild, gdm-2.32.1.ebuild, gdm-2.32.1-r1.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-r2.ebuild:
+  Rewrite pam.d files to hopefully address some of the problems systemd users
+  have been having (e.g. bug #435042); pam.d files are now shipped in a tarball
+  to keep FILESDIR a bit cleaner. Make license more precise.
+  Note that gdm now relies on sys-auth/pambase with USE=gnome-keyring for
+  automatic keyring unlocking.
 
   12 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gdm-2.20.11.ebuild,
   gdm-2.20.11-r1.ebuild, gdm-2.32.1.ebuild, gdm-2.32.1-r1.ebuild,
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 94f6857203ed..177d182d1fee 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -47,25 +47,27 @@ DIST gdm-2.32.1.tar.bz2 2441685 SHA256 7ba9cb2a8efb9856994467b14e4837a281fcf6d9d
 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-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 7212 SHA256 961f79530b15813ae7710cba291b53ea3836790a723123132f48f95370b23aac SHA512 5eab817a5f8a723d495722b00b9d834d27fe22a53cfd96b11e5ff965eba6d67e1b44c631639ce1401121011bb30e7c96d4bca6cb430ba4359d9ed63b662ee90e WHIRLPOOL ad133249f9f1f1db5620db7abb12e33865224fbd6778bccf3a10121896bb5e55c2b534943766fc778f8746583f4381d3bb0920a0b5a2f56cab620d94a993fcfa
-EBUILD gdm-2.20.11.ebuild 6971 SHA256 8307de9da6413a01dffb2a09085d27b8327c49c28fb807a2ee2143745c3d7fdb SHA512 8a1f0febc6cce533d56136798325c074cb56bc36564190a242a09bbcd95ae2e1ed600a10a0b5620b95016b069fc6f251c2d0368a90abd5979c268b894d855f4c WHIRLPOOL 171a99d41d6a849c216b4c32098be3c84c5cd90b18699a5401a7b798c882c856a10f1d430b59c9e5cb11c8c150a47313329d74b58199493ef12275754d24ec6b
-EBUILD gdm-2.32.1-r1.ebuild 5591 SHA256 091182b812919102601973b077f3620dc682adef8837c34e80db19378b2c58c1 SHA512 19b102e57683df9190cc7045cc14d268ac5d7b9a963ec2ddeac25f9364acf8c86b0e1c3ca77ee63f56a85ed81ddf6a0de70986175e1e9886069b37bcc6a96099 WHIRLPOOL 567fd4a0a949689936e365162c45dd280e85a35d054429fbc2254c443e67aca65d4c4d3b62955bebd4f5b5a68fd39bd9a90fa354dfea8e60210b20b2a36a7d34
-EBUILD gdm-2.32.1.ebuild 5597 SHA256 3c9e7662407f17f23eeef1c5e41ab0e7b4f8c17bd1e22588e75c98b976de9ba5 SHA512 434c6895b19ed72a03b4a26d14861b7fb3c052f04092c0e65621d96bfad3706103eb76ed0e32f4708d5356191aa84b35b4283b003fdd2b809e97997a4233d7e3 WHIRLPOOL af19a0d208fbd341db962179f7b6a7a770260275a68cd2ad61819a909c1426febf31c2fd799350a81bab4bb9f39925e3a7f8a3e6f9ab3cb4b5d4bc2a2252c6c6
-EBUILD gdm-3.2.1.1-r1.ebuild 8525 SHA256 3bc79bfa0a1c30d5b289e328cc5051d7340d023b147f7821158dcf9a5ce09f6a SHA512 89dedff0cee80937a9e4846087db713207c5a3d228b0592f12b8c5ecb3cc933ed44c48edfd3ccf30c5d5108d3bcaaaf076bc2222a3b9c670f4e7cd70d4e3ccb1 WHIRLPOOL 6f8fb08b3d0f0a5c97d18fb428c8f348cb647f7c1baf52e7ee68ef91d28d9e8c931a2a491778798cdf8edceb9b53c1aae19a9f0c1360a8046f0bb5abcd7f4ec2
-EBUILD gdm-3.2.1.1-r2.ebuild 8494 SHA256 af3f507f7085cfea569c41431858ac7f7c811ca698e79025e6b557c935855a2d SHA512 bcb6de0b4f239aba8e18050ec786e323cf2023c4de3f184390dc0165f0943fde362b806034dde374582251dff21a1814aa759e2deac9e3d7f976be1fe5ab0df3 WHIRLPOOL 2045a4053c2601b2976e83f62c7e79b5d72b867719acfe23eb4aa0efa462ec3bebc9c71f3925bab50a1d3081ae8d808721dca8fcac15371565bddbb4ac80f162
-EBUILD gdm-3.4.1-r1.ebuild 8791 SHA256 cd525445848c0895425987bab455cc8682721918d415754ad93695bc47086f91 SHA512 240d7a73f0786517dabd4ee69fff4897753bc3cab06507bb5951a152d61ad56478d40ef9ff62c4bd74af2e420b259ae3177760a9e16a475b1a32aa375ef92f02 WHIRLPOOL 3b86b137b023a79645821af756364903429c13426fdd0df5847a8feafb993e2237de473d895690dd0a8ad9c25ae636cdcfaaf4751855cb877f11026b4e5f847c
-EBUILD gdm-3.4.1.ebuild 8581 SHA256 e452df28f19c94368929d575325325c5b37489fbc8a9ef2a2ec237a88c12c72e SHA512 949cec205849665422812f32df61951c741a38099b6a3ff8cab1ea88720926b7eae110864cdb2c60e3f63a3182a0f79c2a22632a1bf0214dcd8b7de8dc30067a WHIRLPOOL 9bda5b37a0d7efa0a97b7c588739ea7ef516561031b5a75fd51165ce2f0e84533d3a1369c23fa7abd65cf546b344b08e887e68eef2ce0631e804bc3cb507f55e
-MISC ChangeLog 52219 SHA256 075a9139f67a0f9fde3bdc73a92e48e5c23d53503f900834693fe1ea01443077 SHA512 54ab7379e1e6d42ca75e2dee927eb410d13e66372c4906dea7e18cc8469a2a7ea703eededfec9e6c2753aafd00eef647e7206591eea526d43806ab28fc2ad50e WHIRLPOOL dcc06d94da03a2ddea4e764c28d8ef1387db4ed8de750da470e388eff4e9b010b25eadb90aad4bd76708635ae8a7b0da1c15886e6d6b5b9d390db80bf16e54d3
+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-r2.ebuild 8595 SHA256 1bb015e25dc89bf734ab732a688f632227fb855aa6a3a8952bbc275433d8a1e6 SHA512 9eaa57aefa029a54fecf412d612617e37ce579c7ebb9b08dbf101ce65ef661bdf368baa14acb81096e24960e5b7a7c7bd590bbb94907983ea1a92c9424e3a770 WHIRLPOOL 5f04c261d854947b27c9b7f380f03e0451884238fc0e08c09717ae040f06567ede12bb8a5f7db8cfdaa2af46c418926f6904c83efb5322f0e1105ba82565c813
+EBUILD gdm-3.4.1.ebuild 8582 SHA256 fa66031cbd183dd3e6a6a5e72c8ee933070625dfb8cf0ebee3685f69052e10c2 SHA512 9f31ae0e130f8fc36c9c903df75652af666561b838532f340d9f6d74c991ee734520ebfb3531df200651e731df1a9b68b6026db35418d21ea145cba48d397fbd WHIRLPOOL be48b7bb524fe3fa3ebf3cd9d6e2251a1793049f3cfb83a213a75f0f82d7bc6e544beccd9a8317cd52659a7691a6a7a25307f4d18a8d8ef0b89207d7e9983932
+MISC ChangeLog 52829 SHA256 3db07c682e3aabcdefa12fe04ad54c51209a674048e8cadc2f2fa5a0f4194a32 SHA512 e7886280b403b372c9ce148d8e07a403e67c21919adfa538561073744f2b9db3026ae732725d96830e45f5f4127d851e85f7bd6e96bef2d876d9eceb8848c043 WHIRLPOOL c56de7d2c3c1361ffb91adeaf68ce00bff054cbd4a54dcfed08a262142a3beac511c9949db8a53b8e7cebd87815b2a893e244af96c7077b1efa50b72a537c641
 MISC metadata.xml 1298 SHA256 6b65a6f30467b69a363f8c6032fce0ded6679baecb1627d1117019f853cbd1ad SHA512 68d672bb7163364eb754b886d690e8ada3527aacc37b8f51e30eb4b79ba27e6b3ad67f656bafa5e316a3c1f774a370c4d788caa8c9123abe82d9fa99d968eae2 WHIRLPOOL 182cda9a217a7f3f32de1e37185ffba41ce83c44a7c02b5654c1bd64fde4e141a12ad6c588bafc285869a972626c8424ea88583b4817bab07441cc1d6813f6d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQUFfGAAoJEJ0WA1zPCt1hnMoIAJLqzTsfLWwtum6wdgq/N6Y/
-ScsCXGlvkHMzDvWvT30Z4SCaGzLqZtCil4Nk8dIVwzZ+SDWj8e7Q3cgSMPHxVqWz
-sX8iNFfkt1RjbPcPgSE/TOC8LEdQTkE36zY6AE17bWWlQZmE1xlqaB60Rx5nUg0B
-nsxoylZh7QhE/xyWtJZu7ZZEEKTEjPi3GOX6Ca/djb2dg5Gj1XW9mTK+18DzkpxD
-MlUHMB8PjebrjT3E9mr0L4RYPN5IAjpobQUCTVNkaumdb3hIc+8Nf2BxzJJ/Yb34
-LZZEPHwVBLpk831tMCQmN6l8QHBwzVZAvDkZLDIOfr414AI5KSmoHXYfs5ufQvU=
-=4V3/
+iQEcBAEBCAAGBQJQZBRiAAoJEJ0WA1zPCt1h7DYIAJqA4424mMWUdYV2Jm+72mtl
+YH/twjYe7F/z7FbHoYhSJzLY3E2/XS6VjpaDasO9u212BdgOUkNj0xsX5glxZOHQ
+c519oDpQey2Bli1phmTZ1Ib2xGikhhXslQ8LMUxoXDKVLpX6tcoGKm7d2hEHxxGV
+MQcgsGjS+8fZWEuRM6dsLb7J7EdqYE4PltRuTHXiXycsJNtL+Hrrb0Wm0xWRoaDY
+SD0aaQ+wgzaa835qQSZb4SQkdh6kpMFtpy1qIDwj6cVoQ+Q8k+Mtfr3vQCYXKrqL
+WPCJZBlQxPzkSDF+HYbUDjGPGVib3iPlhlhib2Z+6vusqUL1Y9peBkRc5bg7ArY=
+=2JaZ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gdm/gdm-2.20.11-r1.ebuild b/gnome-base/gdm/gdm-2.20.11-r1.ebuild
index 9d25bfbc4444..bc237bde84d0 100644
--- a/gnome-base/gdm/gdm-2.20.11-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.20.11-r1.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-2.20.11-r1.ebuild,v 1.10 2012/09/12 09:37:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.20.11-r1.ebuild,v 1.11 2012/09/27 08:54:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils pam gnome2 user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 
diff --git a/gnome-base/gdm/gdm-2.20.11.ebuild b/gnome-base/gdm/gdm-2.20.11.ebuild
index 154f772d94a3..0bb8cb12896e 100644
--- a/gnome-base/gdm/gdm-2.20.11.ebuild
+++ b/gnome-base/gdm/gdm-2.20.11.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-2.20.11.ebuild,v 1.14 2012/09/12 09:37:04 tetromino Exp $
+# $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"
 
@@ -9,7 +9,7 @@ inherit eutils pam gnome2 user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
 
diff --git a/gnome-base/gdm/gdm-2.32.1-r1.ebuild b/gnome-base/gdm/gdm-2.32.1-r1.ebuild
index dee45079de33..6e4c889149cc 100644
--- a/gnome-base/gdm/gdm-2.32.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-2.32.1-r1.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-2.32.1-r1.ebuild,v 1.5 2012/09/12 09:37:04 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gdm/gdm-2.32.1-r1.ebuild,v 1.6 2012/09/27 08:54:42 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2 pam user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
 
diff --git a/gnome-base/gdm/gdm-2.32.1.ebuild b/gnome-base/gdm/gdm-2.32.1.ebuild
index 2fa2117f23ab..f4934ec766eb 100644
--- a/gnome-base/gdm/gdm-2.32.1.ebuild
+++ b/gnome-base/gdm/gdm-2.32.1.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-2.32.1.ebuild,v 1.5 2012/09/12 09:37:04 tetromino Exp $
+# $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"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2 pam user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~sh ~sparc ~x86"
 
diff --git a/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild b/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild
index 8de366fd36c3..60205f9de6ad 100644
--- a/gnome-base/gdm/gdm-3.2.1.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.2.1.1-r1.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.2.1.1-r1.ebuild,v 1.6 2012/09/12 09:37:04 tetromino Exp $
+# $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"
@@ -11,7 +11,7 @@ inherit autotools eutils gnome2 pam systemd user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~sh ~x86"
 
diff --git a/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild b/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild
index e01ec1f763c0..9b8d88ef19dc 100644
--- a/gnome-base/gdm/gdm-3.2.1.1-r2.ebuild
+++ b/gnome-base/gdm/gdm-3.2.1.1-r2.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.2.1.1-r2.ebuild,v 1.5 2012/09/12 09:37:04 tetromino Exp $
+# $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"
@@ -11,7 +11,7 @@ inherit autotools eutils gnome2 pam systemd user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~sh ~x86"
 
diff --git a/gnome-base/gdm/gdm-3.4.1-r1.ebuild b/gnome-base/gdm/gdm-3.4.1-r1.ebuild
index aeffaeed4cd5..52a292466eda 100644
--- a/gnome-base/gdm/gdm-3.4.1-r1.ebuild
+++ b/gnome-base/gdm/gdm-3.4.1-r1.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-r1.ebuild,v 1.2 2012/09/12 09:37:04 tetromino Exp $
+# $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 $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2 pam systemd user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~sh ~x86"
 
diff --git a/gnome-base/gdm/gdm-3.4.1-r2.ebuild b/gnome-base/gdm/gdm-3.4.1-r2.ebuild
new file mode 100644
index 000000000000..9abbaf2fc45d
--- /dev/null
+++ b/gnome-base/gdm/gdm-3.4.1-r2.ebuild
@@ -0,0 +1,272 @@
+# 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-r2.ebuild,v 1.1 2012/09/27 08:54:42 tetromino Exp $
+
+EAPI="4"
+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"
+KEYWORDS="~amd64 ~sh ~x86"
+
+IUSE="accessibility audit +consolekit +fallback fprint +gnome-shell +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
+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-0.11.6
+	>=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
+	sys-auth/pambase[consolekit?,systemd?]
+
+	accessibility? ( x11-libs/libXevie )
+	audit? ( sys-process/audit )
+	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[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
+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-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
+
+	# 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"
+
+	# dconf-0.13.x compatibility (next release)
+	epatch "${FILESDIR}/${P}-dconf-0.13.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
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+
+	# 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
+
+	# install XDG_DATA_DIRS gdm changes
+	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
+	doenvd 99xdg-gdm
+
+	cd "${WORKDIR}/${G_P}"
+	local LDAP
+	use ldap && LDAP=yes
+	emake LDAP=${LDAP} EPREFIX="${EPREFIX}" \
+		SYSTEMD_UNITDIR="$(systemd_get_unitdir)" DESTDIR="${D}" install
+}
+
+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 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
+		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.ebuild b/gnome-base/gdm/gdm-3.4.1.ebuild
index d9b4dbdf23e7..5da4b19f7682 100644
--- a/gnome-base/gdm/gdm-3.4.1.ebuild
+++ b/gnome-base/gdm/gdm-3.4.1.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.ebuild,v 1.3 2012/09/12 09:37:04 tetromino Exp $
+# $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"
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2 pam systemd user
 DESCRIPTION="GNOME Display Manager"
 HOMEPAGE="https://live.gnome.org/GDM"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~sh ~x86"