install slimlock suid, bug 500204; remove old

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

8 files changed, 61 insertions, 141 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 5efe50c7ba84..ac5cb24ca119 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/slim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.135 2013/12/22 13:23:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.136 2014/02/03 18:19:16 axs Exp $
+
+*slim-1.3.6-r4 (03 Feb 2014)
+
+  03 Feb 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/slim-1.3.6-fix-slimlock-nopam-v2.patch, +slim-1.3.6-r4.ebuild,
+  -files/slim-1.3.4-config.diff, -files/slim-1.3.5-glibc217-crypt.patch,
+  -files/slim-1.3.5-honour-cflags.patch,
+  -files/slim-1.3.5-systemd-service.patch, -slim-1.3.5-r4.ebuild:
+  install slimlock suid, bug 500204; remove old
 
   22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> slim-1.3.6-r3.ebuild:
   Stable for ppc64, wrt bug #491492
diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 079bbf1639ff..7024b29c7d60 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -1,14 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX Xsession-r3 4045 SHA256 5eaa3c03278443f27a8477397dd0bcaa5f95e7d0cf99448f028bf0165ce089af SHA512 6c0bfba4c3f00b75d6b5fb0e0e8a492fa262b2d0f3c6382861d7f3a8c657e803151a2060e181439952649fd2acf6fa71b75811565f1156018027ec14a761f7d0 WHIRLPOOL 4808e5a3303bf4e8aff965cf1e77e4ca45413468f54dfa163ced9e848a53d19f705b203054002729f05d2efcc303b8456fd76644de8c1fb28613a43599c815cb
-AUX slim-1.3.4-config.diff 2757 SHA256 03a8091b01f97f388c986ddbd5fba4d8634d4c97805678919de6304e89b6dbab SHA512 f1001fe897a33e22440edc83a9bc3ff77dc4854224d232812352ccaf622c3563957d9ed838071e8438c756878197eeaa98656a23218b9fe2970d54dbd24314b0 WHIRLPOOL 0cd9f83239cb9d7e70e53be439c67f39a024f3e8e4a7676098e611061d75a7b69a3a63072d6ca8c2ab33df536f51c020769886138c343118109793a5463e2da7
 AUX slim-1.3.5-arm.patch 289 SHA256 95c7be21f8a176ce649e2dd804b8c2fa019e5e206a2532233f8b76bdbf201fba SHA512 1d3a3a387433c8bfc9bff6ac3779e70e0e0ca5f65e6120dd83fb51d59dfa47facc6d31c6e955b737e41ebf760416015f7f12dc749e710957cbef274aa5d1d308 WHIRLPOOL 54cb1cff534d30c157460a729a054cb4089b39dbf950b7d78462f6cc8f1dcc1770b6943fe0e24198ad0313cd2c359e0684d35e99155e3945fc19e14638986437
 AUX slim-1.3.5-disable-ck-for-systemd.patch 3303 SHA256 e309716a177bcff758f2e5b807a99380d503ae08a819048cacd01f1010a40791 SHA512 64205963f8f56f012dd16c2aea18e2e4f4e155093d44222a512b242061b334b7faa9c3abdd1acc011213f0fed9007cf232da8c61e6cedc30c710b149fa841f04 WHIRLPOOL cc3e45fe35e5b178213f261f22e3f54e4175e501a6bd7b3a042206d14713d9f038238f531d1dd872abe15a8d118d5ccd0edec83028e49ad8df3ba1d77c55812c
-AUX slim-1.3.5-glibc217-crypt.patch 349 SHA256 53e864060fa5ebfaca63e973d435ff599b6afbadfb1b2fc2c39e927b6a4f4fec SHA512 3a8e70a0b08591f569db97c81beed9f34afeba07db2f8bc6c74adb4a6fc60c847d0d07aa17d17fe47cd80da1dffbc832af86d950392ae751fd1a851793c1f037 WHIRLPOOL c9a5be406f63b068e1a3db046647f51181866a904af7c2f3fd3e32ed582704b6466afb24ce370731c17fd677763fdf95d4b8c9cf842a88b08d07a1f5fd6425b4
-AUX slim-1.3.5-honour-cflags.patch 445 SHA256 fdac5dfd24d853af0dc0dc49857890455fdb682097db60f9826ccb8584522e13 SHA512 82e16d6ffa7291b00b6078e960b35352658deff7833bb05d00c80202588856b06678e5d7a09e1166152920dd2dfb3eefb4ea5f084976bc346bbf09489832acbd WHIRLPOOL 84b773c1b0b41d1d6b55f55669b8db4d6f40c4886d99ca6983f28845c2b8db80c807c54929f79da1d4139126bb1c95a159f98189fdb5332a9f0750571ad15dd3
-AUX slim-1.3.5-systemd-service.patch 430 SHA256 3dceb91b4d5f6cc086116530e4c261b6984d73e39dfdf132f4201b1ab0c68a98 SHA512 0a83cdf71c9aa521598ffdfda79deb7750e71585d9b7f54f956ec4219039ceb249de2a4f1a7af312a0e3535a24829cf24edddbd1340b30f02d23d817ffb2a223 WHIRLPOOL c19683aa5aedb2758ce406b5ba561ee69f7b4a8565733399ece6169dedd19991d071e6912a4d006dbc9dc07976185fedd82dd6340c112c1238407dc83e335497
 AUX slim-1.3.6-config.diff 2934 SHA256 5f7f1fcd6d0d28a4060b2360fdbd0489dd3884087596786ce3f31615098d1840 SHA512 afee976f30f563ed97187f40cdd618159545d7850e8af15bd5b30306c347cf8e5276c6c16938ce094bb589dcab8d88d5c368f7267dbe3f794a18f734f69ddf10 WHIRLPOOL caf3eac08c415e6370a1e0c4077137ccf4763c761a91d130648d9edbbcbb2ced2723c4a5dc4498fff4b3f410b7b6bb21b6f0c3882043aa25ce0941d37a5905cd
+AUX slim-1.3.6-fix-slimlock-nopam-v2.patch 839 SHA256 7ee18c47e3159145be99b16bc2a8c56543043be17ff4527e581cf033a0b4d42e SHA512 2251cd96801e593b387037d79014ea86fdec223d8910628fbfd0e9c5eafbe79c27ffb7f08123c89b635d33dc2bf9cf76e2964f5293352784c1e08c7b1c7427c0 WHIRLPOOL ec303bf8a764e0445726df941d1e09b94d0aaae522f43146dc3a5fef4ad197f0bd654d081489f51a7ed0cbbf30fe8954abb1f5ff5066e4ca69bbb04e21373c54
 AUX slim-1.3.6-fix-slimlock-nopam.patch 733 SHA256 052ca6357c180f19bc9a4b64fc04b652e0724faaf1e2af7280fb15ebaaf981c3 SHA512 ca0c9ae4ec1babb5572e05de084c92257cbbfaa9be78f5b537acfc180a05470667c00e95094756a3f4608b57c223c566040554367734fc6a5f8caa5f442eab7d WHIRLPOOL 51b87928a78a2d442f4d7f02cb71847f819b6433c67d8c7e47a9ba7b045f9e8a265828b2c2f9c813413bb1798febc1fe3c33c6277944e90e67003cf30b0c98d5
 AUX slim-1.3.6-honour-cflags.patch 499 SHA256 7a19c872c2f3a290a74df246cdd3f08126f7ce46e63fb5074a326b81adb805bf SHA512 bbc99d396d30e034100e468d8d5a69cee3bc26eb6029793bdb95f29bd6364f680baec13e12e9ca7dcf01d84de3d8d45712462de36f6f729c7f8c232865a71a7a WHIRLPOOL 96941218006cd2d91efca231f9f2917431a1aa4e0afd31137809a90efb4e69122addf5257aff76b2b345606fa44b8593d9b3bb9d01125a83f751ea6f5945dc48
 AUX slim-1.3.6-libslim-cmake-fixes.patch 852 SHA256 9565d206e0e34000975e59afbd2bc3de74fd3f590afdd9e34d0125cb3f12c75a SHA512 457e23e193c6b9ecb5335accad444470ffb2e0109550d041385bba2b6036fdfac8d48e031574e4229d8b8768a7a86f6d6c191b214540f1156a2a13e5a9f3451f WHIRLPOOL e712e7b829da0cc3113a7cc69364045467c89fa05a52b36ccc2393a708840f36108088088500485e251c9765eefd0485462876fb14ca15db09c49a7f63a81cad
@@ -16,26 +13,15 @@ AUX slim-1.3.6-session-chooser.patch 3994 SHA256 3ee06061b10f42925cbd33ca25af1e8
 AUX slim-1.3.6-strip-systemd-unit-install.patch 474 SHA256 01e02399cad7f223233e70c255956aff809aa16d416c3e1428d171e0a810c576 SHA512 377b1443c700ab6697b2087affed8486d9661de8794355e134a78125695a22e966927f26296e6330b8f4e7a600e9d21bca034dbc2d5445171e05618a2bfad55a WHIRLPOOL 5aef1e500930710b3cfe042078c3916d361800c61aac9813c56cd64d654786afb67a9f9357c0e1ffede6f5a65068c837767aca8f6fdddeb7935bdcd5e4b4ca9f
 AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c642497638aa1707234d8595e58adee3e SHA512 df653a31bd2b0d3bb5b09d700d89d6b4c444b3ef49dc6d5a0646cab5480841a76ecb1c3bcd45b602eb0d2000971a5ef576eac63de67907769ea23b6925329635 WHIRLPOOL 7557d7afd65ad3dd232656f05f1da7735668c1bb55125b1c833c55f9e4ea1411dcbfd8a104cba0d4d0f94aecd29a9f36d56c06515464e78da772e2ee304019db
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
-DIST slim-1.3.5.tar.gz 226413 SHA256 818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 SHA512 09757dc115488efd883eeced70ddb7d13afca0738e9cc531b2a66065e55eef52a3f67f5352365f7b9762b75132be4eb18bcbb12d47b3f79bb9ec0e0e2f62d85e WHIRLPOOL 61742167f8c732719411c58d8358a065800db828dae4fe94aad3690ba3f70bd9c57476ea21d09298a96c6236cd5308e83398ba36b43f46aa729363eccb4367c3
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
-EBUILD slim-1.3.5-r4.ebuild 3430 SHA256 3cb71044bd2e3137fbaad2d1436c16de047d2bb81fa0f31bce8e3f0beb5cc745 SHA512 fc0b9ea5723f39ffa2b000cfe598a1cbc99ceb519b92ad15810ecf00937ab3d34f2a432993284f83d0efcdae9aebfa0cb5d107c24e0b131ac179cb2537ec1e3f WHIRLPOOL d5d994d48cdc26d3c1d71998a1875b7c735a79d618eca495d43391da667a7f2437e337b44d4c7af3c6321a62fefe63c0dcb48c4d27bfa5d1a76764f248a97f2e
 EBUILD slim-1.3.6-r3.ebuild 3698 SHA256 798cd720ce20311ae2bc57f7ff0d706ddbcf613fe481f1895612deb88b19bc7c SHA512 83881fdd7aad97b9b3b59496e48efbffe77531711ac8160475ddd21c808043d929e660c12abc58cd78336db2fdd0e6ef21a5cd24be8893172e398a61b1042da3 WHIRLPOOL 2f2df93b2ef53e0bf3682b1d5c58b6e40ef987f91c2f5381fd8a419d5859eda7a920cc3d4528e1daec4ccc72fe279801f97dc495c40e818fea39205ee397d753
-MISC ChangeLog 21755 SHA256 b9bea30411e82b5c30613cf096d9de38134cf206e20b7903923b9d939c1a4c4b SHA512 1b3b535f103320e8e5d6cf61b8d32d808b82b38f2f34dad423b79a8c41b7ad303c57e350accf3788447ad458762d24333d033136942d5f134555fb5f45c3e20a WHIRLPOOL 27a38c081cf9c4661b1879cd39ac652c3284e27c6d37d4f8c8543ff4b9a9b647f987b1eb827fa67c1f6703963e603ab1a93dd1e53b8728ea5a051edbd1c344ed
+EBUILD slim-1.3.6-r4.ebuild 3707 SHA256 93077c772eb6f8e3e6ccffb619df26b6f0c4a4ed64ac51c085f06467d8fa476d SHA512 9be4eeb310d862b9ec0fef79ef0f45d9a225683b4f70fe0eaecef2a18c294dd1b29354b9f5b87bc7cb8e745d5799a19159d49d4302586996a68ec71bb7c5751b WHIRLPOOL 935185a2e80d531432d66c8c99d7faa491460615e0bdb5afc0f9d4890c1d5f013ab17175ab62d72b292750b9f7cfd3c69026233da87eb53ebc1ab58e13aecb25
+MISC ChangeLog 22143 SHA256 35f161d7d461db4ddbaa5e4e3777c764dbc7dec2c52d019648b9ccea44dee6fc SHA512 980e76302c720e6627db3f537473530d8204cb42055d7cfb9fe60037c4761fbb3e8f03d6e34ef0adc407a311644284d1912e41c925f1339fb1d35284ca71ff55 WHIRLPOOL 10d80376ea3527887c81b9bcc80e6870cecb4e1787b8bf60b556dabf7b928f26ff66990896ba6eae438b640e64120aceb4fc15b18131a7854c3c71a1b942fbf3
 MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJStubhAAoJELp701BxlEWfa4sP/3PWcB00BR6eWD4CzKlk+0Gz
-d8Je65YFh9yCJT6K5jLvcBqUZeinBPeQc8Y+sCICAZT3ub8EspQhhvKP2neFsw3C
-PaxLzey0UI3S44ZjXXizGaMWRMhwnNOY80B2TqXpYsoaxtsnKiVKs0iYMdYajQ3N
-G78PQx/7e7PFunHwTbkspenaz47bzB8JjPkHYYNF/ToC3b4aMdCzx3WPTndj7W+P
-bRgukYsv3q2zie9MnaAdmVdrBJuk5bhkelaFPkX+8i2neWSs04x0KN7oLgVpZtCO
-ek4WFgJYrnntkU1a58K3C8Axd4hyjirwMVaqvo+mSDvr0wUwDFo8RqQSZvk9Skc0
-ir4tO/89d8l4465mvSQgDmKd4IeUkuKTQQO+Jsb6Fkew5hPEGFC9cjCeNsYuGW6f
-9csEj0KenMC3hRJJhvvJub/BHTCrgUaFpOrYrjcq1gsB8bP6Rxi8rz1vIt7gFMvm
-YXyrzaV82cq0oUhTKOMgG1tJgQCME9fmVB8uVfmxlX7X1tU9iFTxAfY0dz+ixa4i
-Nb50klRthCV2Gcx/414KzY6UNm9+yZfn8GgPQkTM4erAj8Dih6Pd1UPUfohHyVQG
-9/G1J6Gm7KvyJvGxFWssl9g7dQh7vy1w4lakgDymGPrCtot58f+gE5iOFPWw2OLX
-I5uz4Sbaijyr0A2e+EIa
-=8kUA
+iF4EAREIAAYFAlLv3aQACgkQ2ugaI38ACPAViQD5AUgWUiGE0SNRzVObvZ5lBx8k
+27hIvOn3+oR+QtyLbDIBAJr4zFtlbvz/1GeuovW38RZKAtyDjBAS9yaa8L8QZvRd
+=19wp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/slim/files/slim-1.3.4-config.diff b/x11-misc/slim/files/slim-1.3.4-config.diff
deleted file mode 100644
index cfc6aa2a1770..000000000000
--- a/x11-misc/slim/files/slim-1.3.4-config.diff
+++ /dev/null
@@ -1,74 +0,0 @@
---- slim.conf.orig	2010-08-25 11:52:23.000000000 -0400
-+++ slim.conf	2010-08-25 11:58:58.000000000 -0400
-@@ -2,7 +2,7 @@
- # Note: -xauth $authfile is automatically appended
- default_path        /bin:/usr/bin:/usr/local/bin
- default_xserver     /usr/bin/X
--#xserver_arguments   -dpi 75
-+xserver_arguments   -nolisten tcp -br -deferglyphs 16 vt07
- 
- # Commands for halt, login, etc.
- halt_cmd            /sbin/shutdown -h now
-@@ -18,7 +18,7 @@
- 
- 
- # Activate numlock when slim starts. Valid values: on|off
--# numlock             on
-+numlock             on
- 
- # Hide the mouse cursor (note: does not work with some WMs).
- # Valid values: true|false
-@@ -33,7 +33,8 @@
- # to adjust the command according to your preferred shell,
- # i.e. for freebsd use:
- # login_cmd           exec /bin/sh - ~/.xinitrc %session
--login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+# login_cmd           exec /bin/bash -login ~/.xinitrc %session
-+login_cmd           exec /bin/bash -login /usr/share/slim/Xsession %session
- 
- # Commands executed when starting and exiting a session.
- # They can be used for registering a X11 session with
-@@ -41,20 +42,27 @@
- #
- # sessionstart_cmd	some command
- # sessionstop_cmd	some command
-+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
-+sessionstop_cmd     /usr/bin/sessreg -d -l :0.0 %user
- 
- # Start in daemon mode. Valid values: yes | no
- # Note that this can be overriden by the command line
- # options "-d" and "-nodaemon"
--# daemon	yes
-+daemon	yes
- 
--# Available sessions (first one is the default).
--# The current chosen session name is replaced in the login_cmd
-+# Available sessions:
-+# The current chosen session name replaces %session in the login_cmd
- # above, so your login command can handle different sessions.
-+# If no session is chosen (via F1), %session will be an empty string.
- # see the xinitrc.sample file shipped with slim sources
--sessions            xfce4,icewm-session,wmaker,blackbox
-+#sessions            xfce4,icewm-session,wmaker,blackbox
-+# Alternatively, read available sessions from a directory:
-+sessiondir           /etc/X11/Sessions
- 
--# Executed when pressing F11 (requires imagemagick)
-+# Executed when pressing F11 (requires media-gfx/imagemagick for import)
-+# Alternative is media-gfx/scrot. See Gentoo bug 252241 for more info.
- screenshot_cmd      import -window root /slim.png
-+#screenshot_cmd      scrot /root/slim.png
- 
- # welcome message. Available variables: %host, %domain
- welcome_msg         Welcome to %host
-@@ -83,8 +88,8 @@
- # randomly choose from
- current_theme       default
- 
--# Lock file
--lockfile            /var/run/slim.lock
-+# Lock file, /etc/init.d/xdm expects slim.pid
-+lockfile            /var/run/slim.pid
- 
- # Log file
- logfile             /var/log/slim.log
diff --git a/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch b/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch
deleted file mode 100644
index 71807f0588e4..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-glibc217-crypt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- app.cpp	2013-10-22 10:45:54.041120246 -0400
-+++ app.cpp.new	2013-10-22 10:46:58.864122061 -0400
-@@ -486,7 +486,7 @@
- 		return true;
- 
- 	encrypted = crypt(LoginPanel->GetPasswd().c_str(), correct);
--	return ((strcmp(encrypted, correct) == 0) ? true : false);
-+	return ((encrypted && strcmp(encrypted, correct) == 0) ? true : false);
- }
- #endif
- 
diff --git a/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
deleted file mode 100644
index e628c30bf596..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-honour-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt	2013-02-08 08:28:40.000000000 -0500
-+++ CMakeLists.txt.new	2013-02-08 08:29:48.000000000 -0500
-@@ -41,10 +41,6 @@
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"")
- set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"")
- 
--# Flags
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2" )
--set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2" )
--
- # source 
- set(slim_srcs
- 	main.cpp
diff --git a/x11-misc/slim/files/slim-1.3.5-systemd-service.patch b/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
deleted file mode 100644
index 35e023834025..000000000000
--- a/x11-misc/slim/files/slim-1.3.5-systemd-service.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- slim-1.3.5-old/CMakeLists.txt	2012-12-31 08:03:42.000000000 -0500
-+++ slim-1.3.5/CMakeLists.txt	2013-02-06 09:05:06.000000000 -0500
-@@ -171,6 +171,6 @@
- # configure
- install(FILES slim.conf DESTINATION ${SYSCONFDIR})
- # systemd service file
--install(FILES slim.service DESTINATION usr/lib/systemd/system)
-+install(FILES slim.service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/systemd/system)
- # themes directory
- subdirs(themes)
diff --git a/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
new file mode 100644
index 000000000000..d5fc4db4838d
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.6-fix-slimlock-nopam-v2.patch
@@ -0,0 +1,26 @@
+--- a/CMakeLists.txt	2013-10-27 21:24:21.193802669 -0400
++++ b/CMakeLists.txt	2013-10-27 21:26:54.127806951 -0400
+@@ -220,7 +220,6 @@
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set_target_properties(libslim PROPERTIES
+@@ -235,8 +234,14 @@
+ 
+ # man file
+ install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
+-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
++
++#slimlock
++if(BUILD_SLIMLOCK)
++install(TARGETS slimlock RUNTIME DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID)
++install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
++
+ # themes directory
+ subdirs(themes)
diff --git a/x11-misc/slim/slim-1.3.5-r4.ebuild b/x11-misc/slim/slim-1.3.6-r4.ebuild
index 17da8ab6e521..f95dc2e3ead5 100644
--- a/x11-misc/slim/slim-1.3.5-r4.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r4.ebuild,v 1.7 2013/12/17 13:00:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild,v 1.1 2014/02/03 18:19:16 axs Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="branding pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
@@ -22,11 +22,12 @@ RDEPEND="x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXft
 	media-libs/libpng:0=
-	virtual/jpeg
+	virtual/jpeg:=
 	x11-apps/sessreg
 	consolekit? ( sys-auth/consolekit
 		sys-apps/dbus )
-	pam? ( virtual/pam )"
+	pam? (	virtual/pam
+		!x11-misc/slimlock )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xproto"
@@ -34,12 +35,15 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
 
 src_prepare() {
 	# Our Gentoo-specific config changes
-	epatch "${FILESDIR}"/${PN}-1.3.4-config.diff
-	epatch "${FILESDIR}"/${P}-arm.patch
-	epatch "${FILESDIR}"/${P}-systemd-service.patch
+	epatch "${FILESDIR}"/${P}-config.diff
+	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
 	epatch "${FILESDIR}"/${P}-honour-cflags.patch
-	epatch "${FILESDIR}"/${P}-disable-ck-for-systemd.patch
-	epatch "${FILESDIR}"/${P}-glibc217-crypt.patch
+	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+	epatch "${FILESDIR}"/${P}-systemd-session.patch
+	epatch "${FILESDIR}"/${P}-session-chooser.patch
+	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -65,8 +69,11 @@ src_install() {
 
 	if use pam ; then
 		pamd_mimic system-local-login slim auth account session
+		pamd_mimic system-local-login slimlock auth
 	fi
 
+	systemd_dounit slim.service
+
 	insinto /usr/share/slim
 	newins "${FILESDIR}/Xsession-r3" Xsession