diff options
| -rw-r--r-- | x11-misc/sddm/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/sddm/Manifest | 33 | ||||
| -rw-r--r-- | x11-misc/sddm/files/sddm-0.1.0-consolekit.patch | 21 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.1.0-r1.ebuild | 12 | ||||
| -rw-r--r-- | x11-misc/sddm/sddm-0.1.0.ebuild | 46 |
5 files changed, 34 insertions, 84 deletions
diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog index f27e54c5d80a..9593cf2cdcb1 100644 --- a/x11-misc/sddm/ChangeLog +++ b/x11-misc/sddm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/sddm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.4 2014/05/26 21:58:35 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.5 2014/05/26 22:37:38 jauhien Exp $ + + 26 May 2014; <jauhien@gentoo.org> -sddm-0.1.0.ebuild, + files/sddm-0.1.0-consolekit.patch, sddm-0.1.0-r1.ebuild: + revert changing pam file. add warning for user, see bug #511484 *sddm-0.1.0-r1 (26 May 2014) diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 77f7be6bbee9..94b8f18dcfac 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -3,26 +3,25 @@ Hash: SHA256 AUX sddm-0.1.0-clang.patch 2759 SHA256 78c0711149f7f8734476379b75aafcacd0d8bd99494cd61206e1098971cb8a0f SHA512 d7c99e9a46f832b756c5d748853b5726c0d4d075a0c14c86d45fd14c5b0a520f9a3e0352a222079258c2c7701b5227a72d34c73425bdd80c0654e582585d335d WHIRLPOOL ba63c47cd84bcaf1d6f3fbbd24828945c1750e49f485924b9bbb84e4f3f12540646fa47160264718f467555826d51e69934be110d45d1df3f9403a95b1bb8160 AUX sddm-0.1.0-cmake.patch 1266 SHA256 e34eedffe8d48cd5b3c6c8ae1778e57a4275a3756ae7436f12349403a77303db SHA512 7b9f57d77184a3a81a81f31e3da5d98766edb551376b943a337edd942e9891eb427c3f932ff568ad56096cdec6336f2f5611e0fa86bafd6122c508100486681b WHIRLPOOL c10fd3f106aa262425ba16a784c52fb065605322342c98cb010613605a2cf269b1eccbeca3e291df4ef142d24975d63565ccbb0405576c1be521e7a18d4f2671 -AUX sddm-0.1.0-consolekit.patch 1404 SHA256 5b9216630c3a1a885119be939c15cb102ce314dde23fe1ca4780a783ce592807 SHA512 05e4a43f32f25411b82207c2d760607160958f1c57589ac6f8e48bd7ebd1eae6a636ddf9a0ffd82e214d7dbd0077ff896aa0eb55e95f616e0747e4e10f92cd29 WHIRLPOOL a8fa3e03f0f25c24b043b7ae68990a1551891b6991268b296f802f8ee8bbdc8ce923b60fa6ed335125203ed2246221d2a71c230da9d10f9de4ce0fb5144e984a +AUX sddm-0.1.0-consolekit.patch 499 SHA256 b46859a705539219102c8ee29e5ae00b5ae8aa1c3f593e94b7d7891531a721d0 SHA512 97f4ade68aabbf46371d445f12d86a0ef40381f8d68d3e1e6bfcf6f53be8bd9b6df0fcb6845ac106f167a2976fec357b203823a64927e0d2859ff34541777d24 WHIRLPOOL d365acebc2bf535d3d8a6f4afbad1b3cbd6dede5b5e8e37f578c376145c04a1c1f401b2171d05057d75f3cc25dc9ad36e7ee017a8c734f9cecf7a3dddb388265 DIST sddm-0.1.0.tar.gz 4710358 SHA256 586b87331663d2c389e27fc6cda7cfb83adcd7015aebd1dc683e4adcbe1bfc45 SHA512 b6ea89d9874e5b07f7a00b455cf1362590f0596cf521ebf13d5927b9181c316bbe8fce9d11715f6d1454f905b75681cb681bac4b7f642ffbac29b1b8ca4b6705 WHIRLPOOL d551b0c68a89c70a5255d79905db0676f01585da159819ecace6a394cf32a1c4dc395dc9a145dcfe89d046615cffdc1ef834c8064df3945fe4e647ceb748548a -EBUILD sddm-0.1.0-r1.ebuild 1244 SHA256 f6b7a1e7d265b6be98614fb6ab3d2ca7ca85e07b0fbeceec7e1837974aae8fce SHA512 1793ee9a645e83019ec2bac0da0ee7b7f0f8e2fa0bb248838cc276b3e72df96e2a40e53588659df673cea4b674a11fb9c98921d359427935d11c3689834c29d5 WHIRLPOOL 10738a075b801f1342657651e17117b40096dddc87b4b5b5dfa6e84e7adf6551600b682c3db039daece576ce1329a47b10232f843ec414323cfa97e37b74f1bf -EBUILD sddm-0.1.0.ebuild 1146 SHA256 b6791625596a8856a573e5793cc1c33fd98efc6705c8ccb20030f7654b1eaf9c SHA512 3846415da30db0b0d1ce0a82ddfaaa558c4f628f2951b722d1a7a08209f6be5aa8022105ede93f70ae19fc7b3ee4689e223ba8c2d79caf9de8c34672aaae132e WHIRLPOOL 9f4c91c19e165842ddbdec42aee04eb97c45d350459cbd7670c38fb53b87d6f0737dc1649f540141b8f871f0def59e30306c7895dc74df86ecaac859021eef67 -MISC ChangeLog 898 SHA256 9fafb5ba4c690271e90a2dc24cb51253835115d29cee9b4467d523354dc03cda SHA512 021f4229fd8ccf25be06df1dec740c89af58e2b18db69679e18fdaf11c168b7f4740927540ba577a98d0c815594e38e0d197ddaf41225dcef9abf315b0ff18cb WHIRLPOOL 5c4de4798c7115e69136bd5846788ec13042177f9447cdce5c950a1208f2333286f084b93253271abd524af5bb1d5fa2db5a8632d17b7bf0997c7d63212a2780 +EBUILD sddm-0.1.0-r1.ebuild 1603 SHA256 4df2befc949e553b7db873bf80c5c16212407790efa571c27c180abb34a399af SHA512 3f853875b858b1e28f11cba379edf541cad92b78f00d310c79597b18fb3de41c627d9998037abb8b623daa6f103292518f4529f83252bf7c5acda62eaa77739c WHIRLPOOL 488851a1ae79545e794be4db1b718abdb38faf74716ab54c9c77609774a9b3583a5f6c015d09efea5adcc2ea37ae149df00969771917f2f2537613fa11565b7c +MISC ChangeLog 1081 SHA256 108818ea6da89349333743b96ce0de82f20d336d1102af92ca5a09dc7f13ed8e SHA512 a4353cc41b798dbc3a8d94777cd85cbfa2542f40dfcfdcf43fd43a9df38a5c9975b3e079a1c1655c2af485cbd4eab9c36b0cbbee72539bfdbfa5d66562c2c9ec WHIRLPOOL 8093b3514f19f6fd7df12e3dd6f79b83f4d28d64ffa03a94380acdbe651e7e0db48537a590ab87390ad7ae9145dde86fb31b5c84b8546e8ee8472f926c2aebd4 MISC metadata.xml 708 SHA256 a4aa75a8aaa4c4570d5bc5df6b5c7b2a5db3740e867001601e78525fa33d7246 SHA512 0737002e407ef258dac967e81bc2b6572b6a71d44a6ce3bcc87a3aa584a0ace1dd25e8df5f415082a0af25130b530bedccae22dba1d926cd24de9ef55d14d8ce WHIRLPOOL 347ae231f7569f211662c7ad4fb67edb41bd2f138a49f6d2be884fe398e167bb6c055f92b6024a30bfb7687b2c8687d552e6d55d212e878abe7b5126a3fa711b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTg7kSAAoJELvuk32y76HUISoQAIuSz3M/WY230QY0DNxdwm6H -brm0lcQ/9IoQocnSvKQvkPXKOvdIn2rqyh9Gh32AzdIC2gSg7GArsy0ZNrg6gOeX -ane6MAiuluerPK4IrD5SpIjnCJi52xhfbEMot69CMdXWFzRaOqVA03rnu0EIEIrF -RLQHq7jhkp+mzd891G1aPimFXp4urvJ2arZNb3JRGDzq+1hxxv1dpFbw7m3PC+Er -1iuE1LCnkleAJpYLj1cYViesoca2RexC91I4PEXyCvYex5hqsrtrnBmJ0keNQNZm -wLegB/KUI0/UFIe+81kUXlQ6D9KtkSP96e8yRRTkzNPoDpH9+Nx2XqVE7l0m0Ty/ -Z3qEXgYPjKhthyxsJBHh1XPIykYrl7GY6ZGuYK2tbxYPJdGLr/LUdYVIUE3RHKpK -CUtbAtm+AkqEPXw9SOi7dZjYYTjmoySZ9xrFX89/buINuhPTZPOb+oNw1q+2jLhi -bEzMomSPnUX08uWI8UMF/XIF3VVX3Pt+xCQCTjSn4yEZ1QsUP6IHapVhaWG7n446 -3dnthaxoG+ADoTZzEFiBb35UpAT/5Qd4VaKWt4VtlCJf600y++VGS5kvmxYsUxBZ -w3V4+pgOfr66yuy0sJdSyoFeSoFS9Aq1/rkhc+lPOVW0gGbB5srGAGAt/72T7w1u -yk3N5VlOOUwEmEyeseMW -=B9DX +iQIcBAEBCAAGBQJTg8I5AAoJELvuk32y76HUsD0P/0rceHcyUTD3L5RJyFZamIwg +A0VAN3IWxrvTN5j6OqpWMxK5NB8RE9CxH9GcvEGZXMZ7ka1/Oax1lGXO7aJPqUkD +QNLHr9CgQrqr1IESAZA0deRfwhNMSqylnxrNGCEsvn81ib5N7fixZwh1B8oQwNjb +jMtPagoqbLXMi3YdfGwDXEMCk40+adVAGGztoEZGkTC8DZ2/hocK6gdd6MCnSTTM +XbMniBkqzHDxZi2SQGXp63FJBtorE2pu7mBkBUC259mH5j2ncOO2Vo98hT0he5fK +3reAo1/jfKu/kgpKBJS4ySPe4r6ZTbWVQb82o7oS2LNZswgmEvc2zWAAc2ShIV08 +QOpJrJrJXIhEVRr/kntZBXgcgN16yO2VzbW8X7COdEPimwQMzMJDE39JfWMLCGH7 +Bjw10hG2pRMP7Ph9ydbsctf/SYS5BTPnTlCj960e37cx8X7rWtZgNkSrtmjXeXZO +kLsc639eaw3jmKIxMQlVJT7C3tj6e3uHwpQAxNGYP9t7chk027qwgOusPhxxeH/c +95z7Sx1TXj7z+kgmsFkqpp+5ClKkqTPTFHIeUIczJhQFTz5Ec1Xy8KiL7LmjVDG2 +1UNas84bdWMEbcaWvA3mwRljJxIWmbkdYRR8Z+e8vc9YpTQdfmBYg8aAUvrxq9MM +fg9h9ieSq2xg/Na6luBX +=3Zk8 -----END PGP SIGNATURE----- diff --git a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch index 42ebf67671d0..a5ac62ac47f8 100644 --- a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch +++ b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch @@ -1,6 +1,5 @@ -diff -r -u sddm-0.1.0/data/scripts/Xsession sddm-0.1.0.patched/data/scripts/Xsession ---- sddm-0.1.0/data/scripts/Xsession 2013-03-19 21:23:36.000000000 +0100 -+++ sddm-0.1.0.patched/data/scripts/Xsession 2014-05-26 23:40:09.654374811 +0200 +--- data/scripts/Xsession ++++ data/scripts/Xsession @@ -74,13 +74,13 @@ exec xterm -geometry 80x24-0-0 ;; @@ -18,19 +17,3 @@ diff -r -u sddm-0.1.0/data/scripts/Xsession sddm-0.1.0.patched/data/scripts/Xses ;; esac exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." -diff -r -u sddm-0.1.0/services/sddm.pam sddm-0.1.0.patched/services/sddm.pam ---- sddm-0.1.0/services/sddm.pam 2013-03-19 21:23:36.000000000 +0100 -+++ sddm-0.1.0.patched/services/sddm.pam 2014-05-26 23:39:52.484616252 +0200 -@@ -3,4 +3,11 @@ - auth include system-login - account include system-login - password include system-login --session include system-login -+ -+session optional pam_loginuid.so -+session required pam_env.so -+session optional pam_lastlog.so silent -+session include system-auth -+-session optional pam_ck_connector.so -+session optional pam_motd.so motd=/etc/motd -+session optional pam_mail.so diff --git a/x11-misc/sddm/sddm-0.1.0-r1.ebuild b/x11-misc/sddm/sddm-0.1.0-r1.ebuild index 97065c36650b..cd3630ad31a3 100644 --- a/x11-misc/sddm/sddm-0.1.0-r1.ebuild +++ b/x11-misc/sddm/sddm-0.1.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.1 2014/05/26 21:58:34 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r1.ebuild,v 1.2 2014/05/26 22:37:38 jauhien Exp $ EAPI=5 inherit cmake-utils toolchain-funcs @@ -19,6 +19,7 @@ RDEPEND="sys-libs/pam x11-libs/libxcb[xkb(-)] dev-qt/qtdeclarative:4 dev-qt/qtdbus:4 + consolekit? ( sys-auth/consolekit ) systemd? ( sys-apps/systemd:= ) upower? ( sys-power/upower:= )" DEPEND="${RDEPEND} @@ -46,3 +47,12 @@ src_configure() { ) cmake-utils_src_configure } + +pkg_postinst() { + if use consolekit; then + ewarn "This display manager doesn't have native built-in ConsoleKit support." + ewarn "In order to use ConsoleKit pam module with this display manager," + ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so" + ewarn "line in /etc/pam.d/system-login" + fi +} diff --git a/x11-misc/sddm/sddm-0.1.0.ebuild b/x11-misc/sddm/sddm-0.1.0.ebuild deleted file mode 100644 index 5c9eec27df6a..000000000000 --- a/x11-misc/sddm/sddm-0.1.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0.ebuild,v 1.2 2014/05/25 10:53:42 jauhien Exp $ - -EAPI=5 -inherit cmake-utils toolchain-funcs - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" -SLOT="0" -IUSE="systemd +upower" -REQUIRED_USE="?? ( upower systemd )" - -RDEPEND="sys-libs/pam - x11-libs/libxcb[xkb(-)] - dev-qt/qtdeclarative:4 - dev-qt/qtdbus:4 - systemd? ( sys-apps/systemd:= ) - upower? ( sys-power/upower:= )" -DEPEND="${RDEPEND} - >=sys-devel/gcc-4.7.0 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-clang.patch" -) - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-version) < 4.7 ]] && \ - die 'The active compiler needs to be gcc 4.7 (or newer)' - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_use systemd) - $(cmake-utils_use_use upower) - ) - cmake-utils_src_configure -} |