subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: x11\-misc\/sddm\/"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2024-04-09 Thread Andreas Sturmlechner

commit: 74fd8aa97757eb583822d3f4bb0ea9d8d03b4828
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr  9 19:48:01 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr  9 20:01:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74fd8aa9

x11-misc/sddm: drop 0.20.0-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   2 -
 x11-misc/sddm/files/sddm-0.18.1-Xsession.patch |  24 -
 x11-misc/sddm/sddm-0.20.0-r1.ebuild| 143 -
 3 files changed, 169 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 62a7a158873c..8d6ee0946cd6 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,6 +1,4 @@
 DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B 
b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1
 SHA512 
30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-DIST sddm-0.20.0-patchset.tar.xz 4024 BLAKE2B 
cb138568a158fb1070c3f4ed4182867973abef257e7b551a373a5d17adf19c15474cff27a3662de9fa674da218e9b04374802d0f1813569ce2966257903ac791
 SHA512 
fe07102ac4e41cc9e212f795405db8e4dac342c1dde2ec3b47002aaf251fc6a7641af4226f4729ef3325f070a77d6448602fffe7b5ff775b9dbfb57db9004d3c
-DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 
06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144
 SHA512 
6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
 DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458

diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
deleted file mode 100644
index e1e3c1527be7..
--- a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 a/data/scripts/Xsession
-+++ b/data/scripts/Xsession
-@@ -50,6 +50,10 @@
- ;;
- esac
- 
-+# Make D-Bus start properly, see:
-+# /etc/X11/xinit/xinitrc.d/80-dbus
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
- 
-@@ -94,8 +98,8 @@
-   . "$USERXSESSION"
- fi
- 
--if [ -z "$*" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
- else
--exec $@
-+exec $command
- fi

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
deleted file mode 100644
index 813a5d7bf9e0..
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${P}-patchset"
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-fi
-
-QTMIN=5.15.2
-inherit cmake linux-info optfeature systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   acct-group/sddm
-   acct-user/sddm
-   >=dev-qt/qtcore-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   sys-libs/pam
-   x11-libs/libXau
-   x11-libs/libxcb:=
-   elogind? ( sys-auth/elogind[pam] )
-   systemd? ( sys-apps/systemd:=[pam] )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-   test? (

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2024-03-29 Thread Arthur Zamarin

commit: ea78102621afe2123306eac34ba951225a577375
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 29 06:18:55 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 29 06:18:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea781026

x11-misc/sddm: Stabilize 0.21.0 arm64, #928073

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
index 40bc5edef5cc..b4c68027b7fd 100644
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=5.15.12

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2024-03-29 Thread Arthur Zamarin

commit: 0978c5686ef450140183f2fc4eb2c5baf7c94ce4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 29 06:18:58 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 29 06:18:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0978c568

x11-misc/sddm: Stabilize 0.21.0 x86, #928073

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
index b4c68027b7fd..6aa0a5118fe9 100644
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QTMIN=5.15.12

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2024-03-29 Thread Arthur Zamarin

commit: 01379db2b3820f5c20cbbb1cc2077bb10d49da68
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 29 06:18:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 29 06:18:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01379db2

x11-misc/sddm: Stabilize 0.21.0 amd64, #928073

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.21.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.21.0.ebuild b/x11-misc/sddm/sddm-0.21.0.ebuild
index 6aeaf469501a..40bc5edef5cc 100644
--- a/x11-misc/sddm/sddm-0.21.0.ebuild
+++ b/x11-misc/sddm/sddm-0.21.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=5.15.12

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2024-03-08 Thread Andreas Sturmlechner

commit: d625786b7adf82cd36e70094c219f794ead8e810
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  9 00:08:49 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  9 00:11:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d625786b

x11-misc/sddm: move 0.20.0 patches into patchset tarball

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |  1 +
 .../files/sddm-0.20.0-dbus-policy-in-usr.patch | 29 
 .../sddm-0.20.0-disable-etc-debian-check.patch | 26 ---
 .../sddm-0.20.0-fix-use-development-sessions.patch | 83 --
 .../sddm-0.20.0-greeter-platform-detection.patch   | 24 ---
 ...sddm-0.20.0-no-default-pam_systemd-module.patch | 43 ---
 ...dm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch | 32 -
 .../files/sddm-0.20.0-sddm.pam-use-substack.patch  | 37 --
 x11-misc/sddm/sddm-0.20.0-r1.ebuild| 23 +++---
 9 files changed, 16 insertions(+), 282 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 1a53a302692c..62a7a158873c 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,5 +1,6 @@
 DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B 
b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1
 SHA512 
30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
+DIST sddm-0.20.0-patchset.tar.xz 4024 BLAKE2B 
cb138568a158fb1070c3f4ed4182867973abef257e7b551a373a5d17adf19c15474cff27a3662de9fa674da218e9b04374802d0f1813569ce2966257903ac791
 SHA512 
fe07102ac4e41cc9e212f795405db8e4dac342c1dde2ec3b47002aaf251fc6a7641af4226f4729ef3325f070a77d6448602fffe7b5ff775b9dbfb57db9004d3c
 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 
06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144
 SHA512 
6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
 DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458

diff --git a/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch 
b/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch
deleted file mode 100644
index 8926b8400430..
--- a/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0823810ed1683e6dcb7d687795764e11ddb6ff8a Mon Sep 17 00:00:00 2001
-From: Gioele Barabucci 
-Date: Sun, 16 Jul 2023 11:51:08 +0200
-Subject: [PATCH] CMakeLists.txt: Install dbus policy in /usr/share, not /etc
-
-From https://bugs.debian.org/1006631:
-
-> dbus supports policy files in both `/usr/share/dbus-1/system.d` and
-> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
-> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
-> instead reserving it for the sysadmin. This is the same idea as the
-> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.

- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72c4086bb..44956e52d 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,7 +181,7 @@ endif()
- 
- # Set constants
- set(DATA_INSTALL_DIR"${CMAKE_INSTALL_FULL_DATADIR}/sddm"  
  CACHE PATH  "System application data install directory")
--set(DBUS_CONFIG_DIR "${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d" 
  CACHE PATH  "DBus config files directory")
-+set(DBUS_CONFIG_DIR 
"${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system.d"   CACHE PATH  "DBus 
config files directory")
- set(STATE_DIR   
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/sddm"  CACHE PATH  "State 
directory")
- set(RUNTIME_DIR "${RUNTIME_DIR_DEFAULT}"  
  CACHE PATH  "Runtime data storage directory")
- set(QML_INSTALL_DIR

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2024-03-08 Thread Andreas Sturmlechner

commit: 34ed989923e6cf1c509d2f2fc113ce23e9c2e314
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar  8 23:57:41 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar  9 00:03:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ed9899

x11-misc/sddm: move 0.18.1 patches into patchset tarball

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   3 +-
 x11-misc/sddm/files/pam-1.4-substack.patch |  31 
 x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch  |  32 
 .../sddm/files/sddm-0.18.1-cve-2020-28049.patch|  94 ---
 .../files/sddm-0.18.1-drop-wayland-suffix.patch|  28 
 .../sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch |  33 
 ...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 -
 .../sddm-0.18.1-nvidia-glitches-vt-switch.patch|  46 --
 .../sddm-0.18.1-only-reuse-online-sessions.patch   |  27 ---
 x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch|  23 ---
 .../files/sddm-0.18.1-respect-user-flags.patch |  25 ---
 ...18.1-revert-honor-PAM-supplemental-groups.patch |  87 --
 x11-misc/sddm/files/sddm.tmpfiles  |   1 -
 x11-misc/sddm/sddm-0.18.1-r8.ebuild|  32 ++--
 14 files changed, 19 insertions(+), 625 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 57ed50b91404..1a53a302692c 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,4 +1,5 @@
+DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B 
b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1
 SHA512 
30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
-DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458
 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 
06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144
 SHA512 
6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2
+DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458

diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch 
b/x11-misc/sddm/files/pam-1.4-substack.patch
deleted file mode 100644
index b0467b268228..
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 sddm-0.18.1/services/sddm-autologin.pam.bak2020-06-19 
22:27:57.305580696 +0200
-+++ sddm-0.18.1/services/sddm-autologin.pam2020-06-19 22:30:50.513583973 
+0200
-@@ -1,6 +1,5 @@
- #%PAM-1.0
- authrequiredpam_env.so
--authrequiredpam_tally.so file=/var/log/faillog onerr=succeed
- authrequiredpam_shells.so
- authrequiredpam_nologin.so
- authrequiredpam_permit.so
 sddm-0.18.1/services/sddm.pam.bak  2020-06-19 22:27:26.721580117 +0200
-+++ sddm-0.18.1/services/sddm.pam  2020-06-19 22:27:48.729580533 +0200
-@@ -1,15 +1,15 @@
- #%PAM-1.0
- 
--auth  include system-login
-+auth  substacksystem-login
- -auth optionalpam_gnome_keyring.so
- -auth   optional  pam_kwallet5.so
- 
--account   include system-login
-+account   substacksystem-login
- 
--password  include system-login
-+password  substacksystem-login
- -password optionalpam_gnome_keyring.so use_authtok
- 
- session   optionalpam_keyinit.so force revoke
--session   include system-login
-+session   substacksystem-login
- -session  optionalpam_gnome_keyring.so

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2024-03-08 Thread Andreas Sturmlechner

commit: 73163d56cdd1a916e9f6d3a06e97e97acf3b3087
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar  7 18:09:33 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar  8 22:59:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73163d56

x11-misc/sddm: Ship our own pam files

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |  1 +
 .../sddm-0.21.0-disable-etc-debian-check.patch | 26 -
 ...sddm-0.21.0-no-default-pam_systemd-module.patch | 44 --
 x11-misc/sddm/sddm-0.21.0.ebuild   | 24 +---
 4 files changed, 20 insertions(+), 75 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index c5a2b8780fb4..57ed50b91404 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,4 @@
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
 DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458
+DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 
06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144
 SHA512 
6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2

diff --git a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch 
b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
deleted file mode 100644
index b0a13259991b..
--- a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cef0ad9776d9349e85020b529d20dcc88113015a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 13 Oct 2020 01:04:44 +0200
-Subject: [PATCH 4/5] Disable /etc/debian_version check
-
-Signed-off-by: Andreas Sturmlechner 

- services/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 5158e87..441e46a 100644
 a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -20,7 +20,7 @@ endif()
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" 
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
- 
- if(INSTALL_PAM_CONFIGURATION)
--if(EXISTS "/etc/debian_version")
-+if(0)
- install(FILES debian.sddm-autologin.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
- install(FILES debian.sddm-greeter.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
- install(FILES debian.sddm.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
--- 
-2.43.0
-

diff --git 
a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch 
b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
deleted file mode 100644
index 4a213d853d16..
--- a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6f618b6862d625796c13677ff265bae21b44e029 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 13 Oct 2020 01:10:00 +0200
-Subject: [PATCH 5/5] Don't add pam_systemd.so to pam.d/sddm-greeter in case of
- NO_SYSTEMD
-

- services/CMakeLists.txt  | 7 +--
- services/sddm-greeter.pam.in | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index 441e46a..8e70fb1 100644
 a/services/CMakeLists.txt
-+++ b/services/CMakeLists.txt
-@@ -12,10 +12,13 @@ if(DEFINED SYSTEMD_TMPFILES_DIR)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm-tmpfiles.conf" 
DESTINATION "${SYSTEMD_TMPFILES_DIR}" RENAME sddm.conf)
- endif()
- 
-+set(LOGIND_PAM_MODULE "sessionoptional")
- if(USE_ELOGIND)
--set(LOGIND_PAM_MODULE "pam_elogind.so")
-+set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}   pam_elogind.so")
-+elseif(NOT NO_SYSTEMD)
-+set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}   pam_systemd.so")
- else()
--set(LOGIND_PAM_MODULE "pam_systemd.so")
-+set(LOGIND_PAM_MODULE "")
- endif()
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2024-02-27 Thread Andreas Sturmlechner

commit: 24554604dd9e5e0810aefde471e33471a90c6e43
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb 27 12:02:04 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 27 12:09:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24554604

x11-misc/sddm: add 0.21.0

Not adding Qt6 option yet, as this is still WIP upstream.

Closes: https://bugs.gentoo.org/565862
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   1 +
 x11-misc/sddm/files/sddm-0.21.0-Xsession.patch |  41 ++
 .../sddm-0.21.0-disable-etc-debian-check.patch |  26 
 ...sddm-0.21.0-no-default-pam_systemd-module.patch |  44 +++
 x11-misc/sddm/files/sddm.logrotate |   5 +
 x11-misc/sddm/sddm-0.21.0.ebuild   | 138 +
 6 files changed, 255 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index c952e48624cf..c5a2b8780fb4 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a
+DIST sddm-0.21.0.tar.gz 3557266 BLAKE2B 
849cb8b06b9510e5366ea28ef322c242db7d5a77d94c0a5a727f468209880a717055ad8b0c2f5a857852202a4d6bc1f68281fe0e0ab3c6a32327b5a4219af3a0
 SHA512 
2e8e460e7f318f20a406dcbb1a9fa1dc78b6a5b8d888bfbbaae22b9c642dbc49cf2ac682b4ea9ed847bbafa9bdc361ba08795e59cad970088b370c70f458

diff --git a/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
new file mode 100644
index ..0388ee894231
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.21.0-Xsession.patch
@@ -0,0 +1,41 @@
+From dac9752495d1467d11e30450989194177677f30a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 21 Oct 2017 14:44:59 2017 +0200
+Subject: [PATCH 2/5] Xsession
+
+Thanks-to: Joakim Tjernlund 
+Bug: https://bugs.gentoo.org/611210
+
+---
+ data/scripts/Xsession | 8 ++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a971d40..2d84a5a 100755
+--- a/data/scripts/Xsession
 b/data/scripts/Xsession
+@@ -39,6 +39,10 @@ case $SHELL in
+ ;;
+ esac
+ 
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f /usr/local/etc/xprofile ] && . /usr/local/etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+@@ -87,8 +91,8 @@ if [ -f "$USERXSESSION" ]; then
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$*" ]; then
++if [ -z "$command" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
+ else
+-exec $@
++exec $command
+ fi
+-- 
+2.43.0
+

diff --git a/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch 
b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
new file mode 100644
index ..b0a13259991b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.21.0-disable-etc-debian-check.patch
@@ -0,0 +1,26 @@
+From cef0ad9776d9349e85020b529d20dcc88113015a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH 4/5] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ services/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 5158e87..441e46a 100644
+--- a/services/CMakeLists.txt
 b/services/CMakeLists.txt
+@@ -20,7 +20,7 @@ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" 
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
+ 
+ if(INSTALL_PAM_CONFIGURATION)
+-if(EXISTS "/etc/debian_version")
++if(0)
+ install(FILES debian.sddm-autologin.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
+ install(FILES debian.sddm-greeter.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
+ install(FILES debian.sddm.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
+-- 
+2.43.0
+

diff --git 
a/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch 
b/x11-misc/sddm/files/sddm-0.21.0-no-default-pam_systemd-module.patch
new file mode 100644
index ..4a213d853d16
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-10 Thread Mike Gilbert

commit: b6ee44471a5481a55b8d532f5d8a1981c6616b8c
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Sep 11 00:27:00 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Sep 11 00:28:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6ee4447

Revert "x11-misc/sddm: allow the user to set SDDM_INITIAL_VT"

This seems like a perfect use for MYCMAKEARGS. See cmake.eclass for
details.

Reverts: 1b55ff51e0bc86be8f8d11f2cf158b67e8bd0476
Bug: https://bugs.gentoo.org/913898
Signed-off-by: Mike Gilbert  gentoo.org>

 x11-misc/sddm/sddm-0.20.0-r1.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
index 29b964e4141c..691c947bfa3d 100644
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
@@ -97,8 +97,6 @@ src_configure() {
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-DNO_SYSTEMD=$(usex !systemd)
-DUSE_ELOGIND=$(usex elogind)
-   # User can override this, bug 913898.
-   -DSDDM_INITIAL_VT="${SDDM_INITIAL_VT:-1}"
)
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-10 Thread Mike Gilbert

commit: 1b55ff51e0bc86be8f8d11f2cf158b67e8bd0476
Author: Mike Gilbert  gentoo  org>
AuthorDate: Sun Sep 10 21:19:11 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep 10 21:19:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b55ff51

x11-misc/sddm: allow the user to set SDDM_INITIAL_VT

Closes: https://bugs.gentoo.org/913898
Signed-off-by: Mike Gilbert  gentoo.org>

 x11-misc/sddm/sddm-0.20.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
index 691c947bfa3d..29b964e4141c 100644
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
@@ -97,6 +97,8 @@ src_configure() {
-DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-DNO_SYSTEMD=$(usex !systemd)
-DUSE_ELOGIND=$(usex elogind)
+   # User can override this, bug 913898.
+   -DSDDM_INITIAL_VT="${SDDM_INITIAL_VT:-1}"
)
cmake_src_configure
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-03 Thread Sam James

commit: a42dc466c4e99c0f6f3433df75398539a803c3fc
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 14:19:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 14:19:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a42dc466

x11-misc/sddm: Stabilize 0.20.0-r1 arm64, #913531

Signed-off-by: Sam James  gentoo.org>

 x11-misc/sddm/sddm-0.20.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
index ac2ec9cbab17..691c947bfa3d 100644
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
+   KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QTMIN=5.15.2

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-03 Thread Sam James

commit: 90953156b1a8adc8f421909ec36c2bfa11dd69e8
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 14:17:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 14:17:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90953156

x11-misc/sddm: Stabilize 0.20.0-r1 amd64, #913531

Signed-off-by: Sam James  gentoo.org>

 x11-misc/sddm/sddm-0.20.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
index 63babd63cc42..e369fe14d363 100644
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 QTMIN=5.15.2

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-03 Thread Sam James

commit: c66a95b943b19b0a267e112ac14a07e47269ed80
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep  3 14:17:04 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep  3 14:17:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66a95b9

x11-misc/sddm: Stabilize 0.20.0-r1 x86, #913531

Signed-off-by: Sam James  gentoo.org>

 x11-misc/sddm/sddm-0.20.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.20.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
index e369fe14d363..ac2ec9cbab17 100644
--- a/x11-misc/sddm/sddm-0.20.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.20.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
 else
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 QTMIN=5.15.2

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2023-09-02 Thread Andreas Sturmlechner

commit: 94d5a070729123284b72092743d5316d3563b9f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 17:00:55 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 18:01:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94d5a070

x11-misc/sddm: Backport some post-0.20 fixes

- greeter: Look at WAYLAND_DISPLAY for platform detection
- Ignore InputMethod=qtvirtualkeyboard on wayland
- Install dbus policy in /usr/share, not /etc

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/sddm-0.20.0-dbus-policy-in-usr.patch |  29 +
 .../sddm-0.20.0-greeter-platform-detection.patch   |  24 
 ...dm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch |  32 +
 x11-misc/sddm/sddm-0.20.0-r1.ebuild| 136 +
 4 files changed, 221 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch 
b/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch
new file mode 100644
index ..8926b8400430
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-dbus-policy-in-usr.patch
@@ -0,0 +1,29 @@
+From 0823810ed1683e6dcb7d687795764e11ddb6ff8a Mon Sep 17 00:00:00 2001
+From: Gioele Barabucci 
+Date: Sun, 16 Jul 2023 11:51:08 +0200
+Subject: [PATCH] CMakeLists.txt: Install dbus policy in /usr/share, not /etc
+
+From https://bugs.debian.org/1006631:
+
+> dbus supports policy files in both `/usr/share/dbus-1/system.d` and
+> `/etc/dbus-1/systemd`. [The] recently released dbus 1.14.0, officially
+> deprecates installing packages' default policies into `/etc/dbus-1/systemd`,
+> instead reserving it for the sysadmin. This is the same idea as the
+> difference between `/usr/lib/udev/rules.d` and `/etc/udev/rules.d`.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 72c4086bb..44956e52d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -181,7 +181,7 @@ endif()
+ 
+ # Set constants
+ set(DATA_INSTALL_DIR"${CMAKE_INSTALL_FULL_DATADIR}/sddm"  
  CACHE PATH  "System application data install directory")
+-set(DBUS_CONFIG_DIR "${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d" 
  CACHE PATH  "DBus config files directory")
++set(DBUS_CONFIG_DIR 
"${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/system.d"   CACHE PATH  "DBus 
config files directory")
+ set(STATE_DIR   
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/sddm"  CACHE PATH  "State 
directory")
+ set(RUNTIME_DIR "${RUNTIME_DIR_DEFAULT}"  
  CACHE PATH  "Runtime data storage directory")
+ set(QML_INSTALL_DIR "${QT_IMPORTS_DIR}"   
  CACHE PATH  "QML component installation directory")

diff --git a/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch 
b/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch
new file mode 100644
index ..57d138875bea
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-greeter-platform-detection.patch
@@ -0,0 +1,24 @@
+From e27b70957505dc7b986ab2fa68219af546c63344 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Fri, 30 Jun 2023 09:42:58 +0200
+Subject: [PATCH] greeter: Look at WAYLAND_DISPLAY for platform detection
+
+When running sddm-greeter manually in a wayland session, it otherwise
+misdetects that as xcb.
+---
+ src/greeter/GreeterApp.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index c2978d67e..4e4f65301 100644
+--- a/src/greeter/GreeterApp.cpp
 b/src/greeter/GreeterApp.cpp
+@@ -319,7 +319,7 @@ int main(int argc, char **argv)
+ platform = QString::fromUtf8(qgetenv("QT_QPA_PLATFORM"));
+ }
+ if (platform.isEmpty()) {
+-platform = QStringLiteral("xcb");
++platform = qEnvironmentVariableIsSet("WAYLAND_DISPLAY") ? 
QStringLiteral("wayland") : QStringLiteral("xcb");
+ }
+ 
+ // Install message handler

diff --git 
a/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch 
b/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch
new file mode 100644
index ..0081f3d4e8a3
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-no-qtvirtualkeyboard-on-wayland.patch
@@ -0,0 +1,32 @@
+From 07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Fri, 30 Jun 2023 09:44:37 +0200
+Subject: [PATCH] Ignore InputMethod=qtvirtualkeyboard on wayland
+
+Using QT_IM_MODULE=qtvirtualkeyboard in wayland client applications is not
+supported by Qt, but is sddm's builtin default. Avoid setting that.
+---
+ src/greeter/GreeterApp.cpp | 10 --
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index 4e4f65301..01613cc66 100644
+--- a/src/greeter/GreeterApp.cpp

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-09-02 Thread Andreas Sturmlechner

commit: e5455c0b6799862364bff7fd10ec715f25083aea
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 17:05:07 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 18:01:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5455c0b

x11-misc/sddm: drop 0.20.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.20.0.ebuild | 132 ---
 1 file changed, 132 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.20.0.ebuild b/x11-misc/sddm/sddm-0.20.0.ebuild
deleted file mode 100644
index 7d246cd0dea3..
--- a/x11-misc/sddm/sddm-0.20.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-fi
-
-QTMIN=5.15.2
-inherit cmake linux-info optfeature systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   acct-group/sddm
-   acct-user/sddm
-   >=dev-qt/qtcore-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   sys-libs/pam
-   x11-libs/libXau
-   x11-libs/libxcb:=
-   elogind? ( sys-auth/elogind[pam] )
-   systemd? ( sys-apps/systemd:=[pam] )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( >=dev-qt/qttest-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   x11-base/xorg-server
-   !systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-   dev-python/docutils
-   >=dev-qt/linguist-tools-${QTMIN}:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   # Downstream patches
-   "${FILESDIR}/${P}-respect-user-flags.patch"
-   "${FILESDIR}/${PN}-0.18.1-Xsession.patch" # bug 611210
-   "${FILESDIR}/${P}-sddm.pam-use-substack.patch" # bug 728550
-   "${FILESDIR}/${P}-disable-etc-debian-check.patch"
-   "${FILESDIR}/${P}-no-default-pam_systemd-module.patch" # bug 669980
-   "${FILESDIR}/${P}-fix-use-development-sessions.patch" # git master
-)
-
-pkg_setup() {
-   local CONFIG_CHECK="~DRM"
-   use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
-   touch 01gentoo.conf || die
-
-cat <<-EOF >> 01gentoo.conf
-[General]
-# Remove qtvirtualkeyboard as InputMethod default
-InputMethod=
-EOF
-
-   cmake_src_prepare
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   -DRUNTIME_DIR=/run/sddm
-   -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-   -DNO_SYSTEMD=$(usex !systemd)
-   -DUSE_ELOGIND=$(usex elogind)
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   insinto /etc/sddm.conf.d/
-   doins "${S}"/01gentoo.conf
-}
-
-pkg_postinst() {
-   tmpfiles_process "${PN}.conf"
-
-   elog "NOTE: If SDDM startup appears to hang then entropy pool is too 
low."
-   elog "This can be fixed by configuring one of the following:"
-   elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
-   elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
-   elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
-   elog
-   elog "SDDM example config can be shown with:"
-   elog "  ${EROOT}/usr/bin/sddm --example-config"
-   elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific 
options."
-   elog
-   elog "For more information on how to configure SDDM, please visit the 
wiki:"
-   elog "  https://wiki.gentoo.org/wiki/SDDM;
-   if has_version x11-drivers/nvidia-drivers; then
-   elog
-   elog "  Nvidia GPU owners in particular should pay attention"
-   elog "  to the troubleshooting section."
-   fi
-
-   optfeature "Weston DisplayServer support (EXPERIMENTAL)" dev-libs/weston
-   optfeature "KWin DisplayServer support (EXPERIMENTAL)" kde-plasma/kwin
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2023-06-27 Thread Andreas Sturmlechner

commit: 94c6fa3154bbae2d4a906d9ee4f105fc62320702
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 26 15:51:27 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 27 11:25:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c6fa31

x11-misc/sddm: add 0.20.0

See also:
https://github.com/sddm/sddm/releases/tag/v0.20.0

This is adding back RDEPEND=x11-base/xorg-server for two reasons:
- X11 is the default DisplayServer, with all other options EXPERIMENTAL
- every other distro still depends on it, probably for that reason

Closes: https://bugs.gentoo.org/669980
Bug: https://bugs.gentoo.org/728550
Closes: https://bugs.gentoo.org/790713
Closes: https://bugs.gentoo.org/907069
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   1 +
 .../sddm-0.20.0-fix-use-development-sessions.patch |  83 +
 x11-misc/sddm/sddm-0.20.0.ebuild   | 132 +
 3 files changed, 216 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 4145f4344c73..09b732679e91 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 DIST sddm-0.19.0_p20230608.tar.gz 3553104 BLAKE2B 
41622866f28f9a2aee3b1f6f02f66271d8fe762da71d2215bb6b4b87418504ce321db81625a6cfab099bdaa395da1bf4153a65e795612e745546c2a42e97f270
 SHA512 
76a591a41d3f171c6c3ec5d57837d3061f3dd094ec1e08003f0bacd90c061613505c899ce0b86c7bd4c5f8c346f7bb15f9cd574377dcece123a756329a805562
+DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a

diff --git a/x11-misc/sddm/files/sddm-0.20.0-fix-use-development-sessions.patch 
b/x11-misc/sddm/files/sddm-0.20.0-fix-use-development-sessions.patch
new file mode 100644
index ..3213828181ca
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-fix-use-development-sessions.patch
@@ -0,0 +1,83 @@
+From 5b702ae986464fe6dbc8557d4b2da725ac1ed175 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Mon, 26 Jun 2023 09:52:05 +0200
+Subject: [PATCH] Session: Parse .desktop files manually again
+
+Using QSettings::IniFormat doesn't quite work. Implement a custom parser
+for those files to handle them according to the specification.
+
+Fixes #1745
+---
+ src/common/Session.cpp | 52 +-
+ 1 file changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index 4bb2142ca..5eec64859 100644
+--- a/src/common/Session.cpp
 b/src/common/Session.cpp
+@@ -34,6 +34,56 @@
+ const QString s_entryExtention = QStringLiteral(".desktop");
+ 
+ namespace SDDM {
++// QSettings::IniFormat can't be used to read .desktop files due to 
different
++// syntax of values (escape sequences, quoting, automatic QStringList 
detection).
++// So implement yet another .desktop file parser.
++class DesktopFileFormat {
++static bool readFunc(QIODevice , QSettings::SettingsMap )
++{
++QString currentSectionName;
++while(!device.atEnd())
++{
++// Iterate each line, remove line terminators
++const auto line = device.readLine().replace("\r", 
"").replace("\n", "");
++if(line.isEmpty() || line.startsWith('#'))
++continue; // Ignore empty lines and comments
++
++if(line.startsWith('[')) // Section header
++{
++// Remove [ and ].
++currentSectionName = QString::fromUtf8(line.mid(1, 
line.length() - 2));
++}
++else if(int equalsPos = line.indexOf('='); equalsPos > 0) // 
Key=Value
++{
++const auto key = QString::fromUtf8(line.left(equalsPos));
++
++// Read the value, handle escape sequences
++auto valueBytes = line.mid(equalsPos + 1);
++valueBytes.replace("\\s", " ").replace("\\n", "\n");
++valueBytes.replace("\\t", "\t").replace("\\r", "\r");
++valueBytes.replace("", "\\");
++
++auto value = QString::fromUtf8(valueBytes);
++map.insert(currentSectionName + QLatin1Char('/') + key, 
value);
++}
++}
++
++return true;
++}
++public:
++// Register the .desktop file

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2023-06-27 Thread Andreas Sturmlechner

commit: be299feba92ab84bc84cf48e211c08423af6cd57
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 27 11:19:52 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 27 11:25:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be299feb

x11-misc/sddm: drop 0.19.0_p20230608

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   1 -
 x11-misc/sddm/sddm-0.19.0_p20230608.ebuild | 137 -
 2 files changed, 138 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 09b732679e91..c952e48624cf 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,2 @@
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
-DIST sddm-0.19.0_p20230608.tar.gz 3553104 BLAKE2B 
41622866f28f9a2aee3b1f6f02f66271d8fe762da71d2215bb6b4b87418504ce321db81625a6cfab099bdaa395da1bf4153a65e795612e745546c2a42e97f270
 SHA512 
76a591a41d3f171c6c3ec5d57837d3061f3dd094ec1e08003f0bacd90c061613505c899ce0b86c7bd4c5f8c346f7bb15f9cd574377dcece123a756329a805562
 DIST sddm-0.20.0.tar.gz 3552722 BLAKE2B 
8086c9555d5ce1598db3279353de077d51adbcc5222a929750e8558a1bcdad395a411f90608bffdc6e1ca7e7ac2b8325e25cf04cbf8476698d787ce7e60c2105
 SHA512 
0f64b405f1451873a01a2210530feb6f4cbbdea17be9d039c105088963a48322968db7b60c0d20ac5d97c8ec2a19e5130f0a74c0f9de58c61453d8ce8bb6272a

diff --git a/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild 
b/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild
deleted file mode 100644
index 40d21b378104..
--- a/x11-misc/sddm/sddm-0.19.0_p20230608.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-COMMIT=40250a647291ea0cf587631c79f61903ced075e3
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/${PN}/${PN}.git;
-else
-   SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
-   S="${WORKDIR}/${PN}-${COMMIT}"
-   KEYWORDS=""
-fi
-
-QTMIN=5.15.2
-inherit cmake linux-info optfeature systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="+elogind systemd test"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   acct-group/sddm
-   acct-user/sddm
-   >=dev-qt/qtcore-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5
-   sys-libs/pam
-   x11-libs/libXau
-   x11-libs/libxcb:=
-   elogind? ( sys-auth/elogind[pam] )
-   systemd? ( sys-apps/systemd:=[pam] )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( >=dev-qt/qttest-${QTMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-   dev-python/docutils
-   >=dev-qt/linguist-tools-${QTMIN}:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   # Downstream patches
-   "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch"
-   "${FILESDIR}/${PN}-0.18.1-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.20.0-sddm.pam-use-substack.patch" # bug 728550
-   "${FILESDIR}/${PN}-0.20.0-disable-etc-debian-check.patch"
-   "${FILESDIR}/${PN}-0.20.0-no-default-pam_systemd-module.patch" # bug 
669980
-)
-
-pkg_setup() {
-   local CONFIG_CHECK="~DRM"
-   use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
-   touch 01gentoo.conf || die
-
-cat <<-EOF >> 01gentoo.conf
-[General]
-# Remove qtvirtualkeyboard as InputMethod default
-InputMethod=
-EOF
-
-   cmake_src_prepare
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   -DRUNTIME_DIR=/run/sddm
-   -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d"
-   -DNO_SYSTEMD=$(usex !systemd)
-   -DUSE_ELOGIND=$(usex elogind)
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   insinto /etc/sddm.conf.d/
-   doins "${S}"/01gentoo.conf
-}
-
-pkg_postinst() {
-   tmpfiles_process "${PN}.conf"
-
-   elog "NOTE: If SDDM startup appears to hang then entropy pool is too 
low."
-   elog "This can be fixed by

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2023-06-18 Thread Andreas Sturmlechner

commit: 6005bae9a3c36693a31521851a53fcd0aa2b443f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 18 18:30:04 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 18 18:51:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6005bae9

x11-misc/sddm: Add 0.19.0_p20230608 snapshot w/o KEYWORDS

Short summary of changes:
- Drop IUSE pam, require elogind or systemd
- Drop obsolete default settings (now upstream defaults)
- Change RUNTIME_DIR path to "/run/sddm"
- Use upstream sddm-tmpfiles.conf
- Update dependencies
- Drop x11-base/xorg-server RDEPEND (only ensured xdm init script in past)
- Switch SDDM configuration to /etc/sddm.conf.d/
- Don't look for pam_systemd.so by default

Bug: https://bugs.gentoo.org/669980
Bug: https://bugs.gentoo.org/728550
Bug: https://bugs.gentoo.org/790713
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |   1 +
 .../sddm-0.20.0-disable-etc-debian-check.patch |  26 
 ...sddm-0.20.0-no-default-pam_systemd-module.patch |  43 +++
 .../files/sddm-0.20.0-respect-user-flags.patch |  11 ++
 .../files/sddm-0.20.0-sddm.pam-use-substack.patch  |  37 ++
 x11-misc/sddm/sddm-0.19.0_p20230608.ebuild | 137 +
 6 files changed, 255 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index d1006dba1575..4145f4344c73 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1 +1,2 @@
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
+DIST sddm-0.19.0_p20230608.tar.gz 3553104 BLAKE2B 
41622866f28f9a2aee3b1f6f02f66271d8fe762da71d2215bb6b4b87418504ce321db81625a6cfab099bdaa395da1bf4153a65e795612e745546c2a42e97f270
 SHA512 
76a591a41d3f171c6c3ec5d57837d3061f3dd094ec1e08003f0bacd90c061613505c899ce0b86c7bd4c5f8c346f7bb15f9cd574377dcece123a756329a805562

diff --git a/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch 
b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
new file mode 100644
index ..b851c852cc9b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-disable-etc-debian-check.patch
@@ -0,0 +1,26 @@
+From 20adb0eb3462e79ec76f93f2a622b99956145424 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 13 Oct 2020 01:04:44 +0200
+Subject: [PATCH] Disable /etc/debian_version check
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ services/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 5032f33..afa5fd5 100644
+--- a/services/CMakeLists.txt
 b/services/CMakeLists.txt
+@@ -11,7 +11,7 @@ else()
+ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" 
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
+ 
+-if(EXISTS "/etc/debian_version")
++if(0)
+ install(FILES debian.sddm-autologin.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-autologin)
+ install(FILES debian.sddm-greeter.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm-greeter)
+ install(FILES debian.sddm.pam DESTINATION 
${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d RENAME sddm)
+-- 
+2.39.1
+

diff --git 
a/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch 
b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
new file mode 100644
index ..2ad739a86761
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.20.0-no-default-pam_systemd-module.patch
@@ -0,0 +1,43 @@
+From 02a13d11dac72699e7580c538c152a7b5e0eb056 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 13 Oct 2020 01:10:00 +0200
+Subject: Don't add pam_systemd.so to pam.d/sddm-greeter in case of NO_SYSTEMD
+
+---
+ services/CMakeLists.txt  | 7 +--
+ services/sddm-greeter.pam.in | 2 +-
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
+index 3d12eec..2ff13a8 100644
+--- a/services/CMakeLists.txt
 b/services/CMakeLists.txt
+@@ -4,10 +4,13 @@ if(SYSTEMD_FOUND)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sddm.service" DESTINATION 
"${SYSTEMD_SYSTEM_UNIT_DIR}")
+ endif()
+ 
++set(LOGIND_PAM_MODULE "sessionoptional")
+ if(USE_ELOGIND)
+-set(LOGIND_PAM_MODULE "pam_elogind.so")
++set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}   pam_elogind.so")
++elseif(NOT NO_SYSTEMD)
++set(LOGIND_PAM_MODULE "${LOGIND_PAM_MODULE}   pam_systemd.so")
+ else()
+-set(LOGIND_PAM_MODULE "pam_systemd.so")
++set(LOGIND_PAM_MODULE "")
+ endif()
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sddm-greeter.pam.in" 
"${CMAKE_CURRENT_BINARY_DIR}/sddm-greeter.pam")
+ 
+diff --git

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-12-03 Thread Andreas Sturmlechner

commit: c333a114ec102dea6dc4637a09bc3bc513ab750e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  3 17:01:58 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  3 17:13:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c333a114

x11-misc/sddm: drop 0.18.1-r6

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 129 
 1 file changed, 129 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
deleted file mode 100644
index c2cc2cb95d77..
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake linux-info systemd tmpfiles
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="+elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-   acct-group/sddm
-   acct-user/sddm
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtdeclarative:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   x11-base/xorg-server
-   x11-libs/libxcb[xkb]
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   !pam? ( virtual/libcrypt:= )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
-   test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !systemd? ( gui-libs/display-manager-init )
-"
-BDEPEND="
-   dev-python/docutils
-   dev-qt/linguist-tools:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-respect-user-flags.patch"
-   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-   # fix for groups: https://github.com/sddm/sddm/issues/1159
-   "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-   "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-   # fix for ReuseSession=true
-   "${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-   # TODO: fix properly
-   "${FILESDIR}/pam-1.4-substack.patch"
-   # upstream git develop branch:
-   "${FILESDIR}/${P}-qt-5.15.2.patch"
-   "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
-)
-
-pkg_setup() {
-   local CONFIG_CHECK="~DRM"
-   use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
-   cmake_src_prepare
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-   # Create a default.conf as upstream dropped /etc/sddm.conf w/o 
replacement
-   local confd="/usr/share/sddm/sddm.conf.d"
-   dodir ${confd}
-   "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-   || die "Failed to create 00default.conf"
-
-   sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-   -e "/^ReuseSession/s/false/true/" \
-   -e "/^EnableHiDPI/s/false/true/" \
-   -i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-   tmpfiles_process "${PN}.conf"
-
-   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-   elog "Use it to override specific options. SDDM defaults are now"
-   elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-   elog
-   elog "NOTE: If SDDM startup appears to hang then entropy pool is too 
low."
-   elog "This can be fixed by configuring one of the following:"
-   elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
-   elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
-   elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
-   elog
-   elog "For more information on how to configure SDDM, please visit the 
wiki:"
-   elog "  https://wiki.gentoo.org/wiki/SDDM;
-   if has_version x11-drivers/nvidia-drivers; then
-   elog
-   elog "  Nvidia GPU owners in particular should pay attention"
-   elog "  to the troubleshooting

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-12-03 Thread Arthur Zamarin

commit: c05d231855066e13ab88fee80ac4b3c091045b0e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 14:44:39 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 14:44:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05d2318

x11-misc/sddm: Stabilize 0.18.1-r8 x86, #883289

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
index 7e05e7874d69..6394fe47a726 100644
--- a/x11-misc/sddm/sddm-0.18.1-r8.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-12-03 Thread Arthur Zamarin

commit: 770b22435bef3efec83a1bc798707c8c7c1d3f66
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 12:49:12 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 12:49:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770b2243

x11-misc/sddm: Stabilize 0.18.1-r8 arm64, #883289

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
index 7b3b1db91081..7e05e7874d69 100644
--- a/x11-misc/sddm/sddm-0.18.1-r8.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-11-29 Thread Andreas Sturmlechner

commit: 60a460c025be04245602b3a6a77cbd8ae3e35ca8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 29 21:00:20 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 29 21:00:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60a460c0

x11-misc/sddm: Drop USE dep on x11-libs/libxcb[xkb], add slot op

Closes: https://bugs.gentoo.org/875989
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/{sddm-0.18.1-r7.ebuild => sddm-0.18.1-r8.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r7.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
similarity index 99%
rename from x11-misc/sddm/sddm-0.18.1-r7.ebuild
rename to x11-misc/sddm/sddm-0.18.1-r8.ebuild
index a7e8f1c35a3e..3796e136a344 100644
--- a/x11-misc/sddm/sddm-0.18.1-r7.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r8.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
dev-qt/qtgui:5
dev-qt/qtnetwork:5
x11-base/xorg-server
-   x11-libs/libxcb[xkb]
+   x11-libs/libxcb:=
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
!pam? ( virtual/libcrypt:= )

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2022-11-24 Thread Andreas Sturmlechner

commit: c6d2f39f1e75acd270d6213e7f52c0383647718e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 24 20:41:18 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 24 21:05:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d2f39f

x11-misc/sddm: Backport several 0.19.0 and master branch fixes

- Nvidia VT switching glitch
- Crash w/ Qt 5.15.7 (KDE QtPatchCollection)
- Prevent duplicate (Wayland) session suffix

Alex (1):
  Prevent duplicate session name.

David Edmundson (1):
  Enable QSurfaceFormat::ResetNotification on new Qt

Harald Sitter (1):
  disable automatic portal launching

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=458865

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/sddm-0.18.1-drop-wayland-suffix.patch|  28 +
 .../sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch |  33 ++
 .../sddm-0.18.1-nvidia-glitches-vt-switch.patch|  46 +++
 x11-misc/sddm/sddm-0.18.1-r7.ebuild| 132 +
 4 files changed, 239 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch 
b/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch
new file mode 100644
index ..70efa284803f
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-drop-wayland-suffix.patch
@@ -0,0 +1,28 @@
+From 9a440ba5917ff93c6a78726380c6267d91c13f19 Mon Sep 17 00:00:00 2001
+From: Alex 
+Date: Mon, 30 Sep 2019 16:50:16 -0400
+Subject: [PATCH] Prevent duplicate session name.
+
+Several desktop sessions (e.g. KDE Plasma) already include the string " 
(Wayland)" in the session name. When this happens, the session name displayed 
to the user is "Plasma (Wayland) (Wayland)". This change makes it so that only 
"Plasma (Wayland)" will be displayed.
+
+(cherry picked from commit f9a0648ff3f841b68a07c139c3540b9e75bfd279)
+---
+ src/common/Session.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/Session.cpp b/src/common/Session.cpp
+index aa4dad3..923ecd4 100644
+--- a/src/common/Session.cpp
 b/src/common/Session.cpp
+@@ -169,7 +169,7 @@ namespace SDDM {
+ 
+ if (line.startsWith(QLatin1String("Name="))) {
+ if (type == WaylandSession)
+-m_displayName = QObject::tr("%1 
(Wayland)").arg(line.mid(5));
++m_displayName = QObject::tr("%1").arg(line.mid(5));
+ else
+ m_displayName = line.mid(5);
+ }
+-- 
+2.38.1
+

diff --git a/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch 
b/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch
new file mode 100644
index ..65e9b8573356
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-fix-qt-5.15.7.patch
@@ -0,0 +1,33 @@
+From 5fe712d0e73c6263647bf306f40fbac94a52f4a6 Mon Sep 17 00:00:00 2001
+From: Harald Sitter 
+Date: Mon, 24 Oct 2022 13:15:48 +0200
+Subject: disable automatic portal launching
+
+in Qt6 (and the KDE patch collection for Qt 5) genericunixservices will
+internally attempt to probe the portal tech early on in the app life
+cycle. this causes the protal system to launch app and then crash
+because we aren't actually providing a fully functional session. instead
+opt out of this altogether
+
+(cherry picked from commit fc24321541f6f65b7d1aac89cd82336ffd53e1a0)
+---
+ src/greeter/GreeterApp.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index 4e117a7..a491f4d 100644
+--- a/src/greeter/GreeterApp.cpp
 b/src/greeter/GreeterApp.cpp
+@@ -318,6 +318,9 @@ int main(int argc, char **argv)
+ QSurfaceFormat::setDefaultFormat(format);
+ }
+ 
++// Qt internally may load the xdg portal system early on, prevent this, 
we do not have a functional session running.
++qputenv("QT_NO_XDG_DESKTOP_PORTAL", "1");
++
+ QGuiApplication app(argc, argv);
+ 
+ QCommandLineParser parser;
+-- 
+2.38.1
+

diff --git a/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch 
b/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch
new file mode 100644
index ..ab2fc18cbcbf
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-nvidia-glitches-vt-switch.patch
@@ -0,0 +1,46 @@
+From 76c11653522453efcf86f6f2f53bca1a497ea350 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Thu, 28 Mar 2019 11:43:37 +
+Subject: Enable QSurfaceFormat::ResetNotification on new Qt
+
+This fixes graphical glitches on nvidia after VT switching.
+
+It's opt-in as it requires code paths to handle glGetError differently.
+The version comparison is because my early implementations missed a code
+path. This was fixed in 5.12.2, but we may as well play safe
+
+(cherry picked from commit cd4e1fa21e1ab7178fa5d2ef858f3271575fd315)
+---
+ src/greeter/GreeterApp.cpp | 9 +
+ 1 file changed, 9 insertions(+)
+
+diff --git a/src/greeter/GreeterApp.cpp

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-10-06 Thread Andreas Sturmlechner

commit: 4059b4929b51068c6994813e6d0ba79d836a4334
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 09:14:09 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:14:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4059b492

x11-misc/sddm: add cpe upstream metadata

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index 4250b6ff2954..86353a72d168 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -16,5 +16,6 @@


sddm/sddm
+   cpe:/a:sddm_project:sddm

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-05-25 Thread WANG Xuerui

commit: 520a99d5df3eb755c30e93c1253476b2533e61c0
Author: WANG Xuerui  gentoo  org>
AuthorDate: Wed May 25 11:18:14 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Wed May 25 11:18:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520a99d5

x11-misc/sddm: keyword 0.18.1-r6 for ~loong

See: https://github.com/xen0n/loongson-overlay/pull/25
Tested-by: HougeLangley  gmail.com>
Signed-off-by: WANG Xuerui  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 2eef0e695021..c2cc2cb95d77 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2022-04-02 Thread Andreas Sturmlechner

commit: 4c2f2e12abcee705d727ecccbf9f6b6d07374710
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  2 12:37:49 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  2 12:37:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2f2e12

x11-misc/sddm: Cleanup vulnerable 0.18.1-r5

Bug: https://bugs.gentoo.org/753104
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch |  20 
 x11-misc/sddm/files/sddm-0.18.0-Xsession.patch   |  24 -
 x11-misc/sddm/sddm-0.18.1-r5.ebuild  | 111 ---
 3 files changed, 155 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch 
b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
deleted file mode 100644
index bbe2a272840c..
--- a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
-has the same interface names as logind.
-
-This patch forces sddm to use legacy behaviour when consolekit2 is detected.
-
-Bug: https://bugs.gentoo.org/633920
-Bug: https://github.com/sddm/sddm/issues/903
-Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
-
 a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -60,7 +60,7 @@
- 
- if 
(QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")))
 {
- qDebug() << "Console kit interface found";
--available = true;
-+available = false;
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
- managerIfaceName = 
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't 
match logind

diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
deleted file mode 100644
index 41c813a06645..
--- a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
-@@ -50,6 +50,10 @@
- ;;
- esac
- 
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
- 
-@@ -94,8 +98,8 @@
-   . "$USERXSESSION"
- fi
- 
--if [ -z "$*" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
- else
--exec $@
-+exec $command
- fi

diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
deleted file mode 100644
index 52bc18534548..
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake plocale systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="elogind +pam systemd test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
-RDEPEND="
-   >=dev-qt/qtcore-5.9.4:5
-   >=dev-qt/qtdbus-5.9.4:5
-   >=dev-qt/qtdeclarative-5.9.4:5
-   >=dev-qt/qtgui-5.9.4:5
-   >=dev-qt/qtnetwork-5.9.4:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   !pam? ( virtual/libcrypt:= )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-qt/qttest-5.9.4:5 )
-"
-
-PATCHES=(
-   "${FILESDIR}/${P}-respect-user-flags.patch"
-   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-   # fix for groups: https://github.com/sddm/sddm/issues/1159
-   "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-   "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-   # fix for ReuseSession=true
-   "${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-   # TODO: fix properly
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-02 Thread Arthur Zamarin

commit: 7008aaf8ea42f0144a70bc1f9cd1454b10dd17e6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr  2 12:12:05 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr  2 12:12:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7008aaf8

x11-misc/sddm: Stabilize 0.18.1-r6 arm64, #836603

Signed-off-by: Arthur Zamarin  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index e4df6e85e671..2eef0e695021 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-02 Thread Agostino Sarubbo

commit: c2f342cb91cd8ed0f07bb7156cf6b51d8bb11766
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  2 08:03:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  2 08:03:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2f342cb

x11-misc/sddm: x86 stable wrt bug #836603

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 022def6f4744..e4df6e85e671 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-02 Thread Agostino Sarubbo

commit: 2b194fbf85cc9fa9727898e68f4a1c09d4d571fb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Apr  2 07:58:54 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Apr  2 07:58:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b194fbf

x11-misc/sddm: amd64 stable wrt bug #836603

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index a4e0a84a003f..022def6f4744 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: 76b5804af15b85aed27a5a529180f0e311578a4e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr  1 08:36:07 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b5804a

x11-misc/sddm: Set IUSE="elogind" as default

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 49d64156113b..c10a93b04d85 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="elogind +pam systemd test"
+IUSE="+elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2022-04-01 Thread Andreas Sturmlechner

commit: d4fe5a71ce71d8c80cbd90e0cd9676dd2dc087d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Oct 12 21:44:29 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4fe5a71

x11-misc/sddm: Rebase *respect-user-flags.patch onto 0.18.1

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ect-user-flags.patch => sddm-0.18.1-respect-user-flags.patch} | 9 -
 x11-misc/sddm/sddm-0.18.1-r5.ebuild  | 2 +-
 x11-misc/sddm/sddm-0.18.1-r6.ebuild  | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch 
b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
similarity index 69%
rename from x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
rename to x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
index fc450169792d..6801fa799ead 100644
--- a/x11-misc/sddm/files/sddm-0.12.0-respect-user-flags.patch
+++ b/x11-misc/sddm/files/sddm-0.18.1-respect-user-flags.patch
@@ -1,9 +1,8 @@
-diff -u CMakeLists.txt CMakeLists.txt 
 a/CMakeLists.txt  2015-09-05 22:40:50.0 +0200
-+++ b/CMakeLists.txt  2015-09-07 12:15:33.419530808 +0200
-@@ -35,22 +35,6 @@
+--- a/CMakeLists.txt   2020-10-12 13:03:39.0 +0200
 b/CMakeLists.txt   2020-10-12 23:40:04.480687143 +0200
+@@ -41,22 +41,6 @@
  # Definitions
- add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII)
+ add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII 
-DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_FOREACH)
  
 -# Default build type
 -if(NOT CMAKE_BUILD_TYPE)

diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 20b127562993..52bc18534548 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+   "${FILESDIR}/${P}-respect-user-flags.patch"
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index ee7fbfa1a60b..3d1b2b680504 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+   "${FILESDIR}/${P}-respect-user-flags.patch"
"${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: 18aa436e28784a14b52aa3a771cbc4128e76ce2a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr  1 07:54:17 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18aa436e

x11-misc/sddm: Cleanup metadata.xml, drop X11 mention, fix typos

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/metadata.xml | 36 
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index ff51f919ae32..4250b6ff2954 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,24 +1,20 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-l...@gentoo.org
-LXQt
-  
-  
-k...@gentoo.org
-Gentoo KDE Project
-  
-  
-Use sys-auth/elogind for session 
tracking.
-  
-  
-SDDM is a modern display manager for X11 aiming to be fast, simple
-and beatiful. It uses modern technologies like QtQuick, which in
-turn gives the designer the ability to create smooth, animated
-user interfaces.
-  
-  
-sddm/sddm
-  
+   
+   l...@gentoo.org
+   LXQt
+   
+   
+   k...@gentoo.org
+   Gentoo KDE Project
+   
+   
+   SDDM is a modern display manager aiming to be fast, simple
+   and beautiful. It uses modern technologies like QtQuick, which
+   gives the designer the ability to create smooth, animated UIs.
+   
+   
+   sddm/sddm
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: fd3d4e174e04d50697e9761bdf2e14be2476fd0a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:46:57 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd3d4e17

x11-misc/sddm: Add pkg_postinst info for fixing entropy

Closes: https://bugs.gentoo.org/660812
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 4decc69e0e77..51a634ccb024 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -110,6 +110,12 @@ pkg_postinst() {
elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
elog "Use it to override specific options. SDDM defaults are now"
elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
+   elog
+   elog "NOTE: If SDDM startup appears to hang then entropy pool is too 
low."
+   elog "This can be fixed by configuring one of the following:"
+   elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
+   elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
+   elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
 
systemd_reenable sddm.service
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: 5c4a0c53c3cfa3c1c1e69aa39ee9b520976c2a5e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr  1 08:09:47 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c4a0c53

x11-misc/sddm: Add postinst wiki link and special nvidia-drivers note

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 8 
 1 file changed, 8 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 51a634ccb024..a4e0a84a003f 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -116,6 +116,14 @@ pkg_postinst() {
elog "  - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel"
elog "  - # emerge sys-apps/haveged && rc-update add haveged boot"
elog "  - # emerge sys-apps/rng-tools && rc-update add rngd boot"
+   elog
+   elog "For more information on how to configure SDDM, please visit the 
wiki:"
+   elog "  https://wiki.gentoo.org/wiki/SDDM;
+   if has_version x11-drivers/nvidia-drivers; then
+   elog
+   elog "  Nvidia GPU owners in particular should pay attention"
+   elog "  to the troubleshooting section."
+   fi
 
systemd_reenable sddm.service
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: 02af4dc92a92f4fe64394bb4e97543f12a5a4fe8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr  1 08:16:51 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02af4dc9

x11-misc/sddm: Cleanup long obsolete min Qt, xorg-server version

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index c10a93b04d85..4decc69e0e77 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -20,12 +20,12 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
acct-group/sddm
acct-user/sddm
-   >=dev-qt/qtcore-5.9.4:5
-   >=dev-qt/qtdbus-5.9.4:5
-   >=dev-qt/qtdeclarative-5.9.4:5
-   >=dev-qt/qtgui-5.9.4:5
-   >=dev-qt/qtnetwork-5.9.4:5
-   >=x11-base/xorg-server-1.15.1
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   x11-base/xorg-server
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
@@ -34,14 +34,14 @@ COMMON_DEPEND="
!systemd? ( sys-power/upower )
 "
 DEPEND="${COMMON_DEPEND}
-   test? ( >=dev-qt/qttest-5.9.4:5 )
+   test? ( dev-qt/qttest:5 )
 "
 RDEPEND="${COMMON_DEPEND}
!systemd? ( gui-libs/display-manager-init )
 "
 BDEPEND="
dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
+   dev-qt/linguist-tools:5
kde-frameworks/extra-cmake-modules:5
virtual/pkgconfig
 "

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2022-04-01 Thread Andreas Sturmlechner

commit: ef6b9e5792b528c6a7ae70d8cda5646d5e75bdfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:32:24 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef6b9e57

x11-misc/sddm: Drop obsolete ConsoleKit patch and quirks

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/files/sddm-0.18.1-Xsession.patch | 24 
 x11-misc/sddm/sddm-0.18.1-r6.ebuild|  6 ++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
new file mode 100644
index ..e1e3c1527be7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession
 b/data/scripts/Xsession
+@@ -50,6 +50,10 @@
+ ;;
+ esac
+ 
++# Make D-Bus start properly, see:
++# /etc/X11/xinit/xinitrc.d/80-dbus
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$*" ]; then
++if [ -z "$command" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
+ else
+-exec $@
++exec $command
+ fi

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 3d1b2b680504..3ee4febc099e 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -46,7 +46,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${P}-respect-user-flags.patch"
-   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
# fix for groups: https://github.com/sddm/sddm/issues/1159
"${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
@@ -54,12 +54,10 @@ PATCHES=(
# fix for ReuseSession=true
"${FILESDIR}/${P}-only-reuse-online-sessions.patch"
# TODO: fix properly
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
"${FILESDIR}/pam-1.4-substack.patch"
# upstream git develop branch:
"${FILESDIR}/${P}-qt-5.15.2.patch"
-   # bug 753104
-   "${FILESDIR}/${P}-cve-2020-28049.patch"
+   "${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: b1199e1c46f04b7d2c4ba9a8835121cbde240872
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:43:27 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1199e1c

x11-misc/sddm: RDEPEND on gui-libs/display-manager-init for !systemd

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 883cc2480bad..49d64156113b 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -17,7 +17,7 @@ IUSE="elogind +pam systemd test"
 REQUIRED_USE="?? ( elogind systemd )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+COMMON_DEPEND="
acct-group/sddm
acct-user/sddm
>=dev-qt/qtcore-5.9.4:5
@@ -33,9 +33,12 @@ RDEPEND="
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
test? ( >=dev-qt/qttest-5.9.4:5 )
 "
+RDEPEND="${COMMON_DEPEND}
+   !systemd? ( gui-libs/display-manager-init )
+"
 BDEPEND="
dev-python/docutils
>=dev-qt/linguist-tools-5.9.4:5

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: d105282d0bfd72150192bd33716e7d7a112e18c3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:37:52 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d105282d

x11-misc/sddm: Check for CONFIG_DRM using linux-info.eclass

Closes: https://bugs.gentoo.org/579746
Closes: https://bugs.gentoo.org/584960
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 3ee4febc099e..7d3a0ac81808 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake plocale systemd tmpfiles
+inherit cmake linux-info plocale systemd tmpfiles
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -60,6 +60,11 @@ PATCHES=(
"${FILESDIR}/${P}-cve-2020-28049.patch" # bug 753104
 )
 
+pkg_setup() {
+   local CONFIG_CHECK="~DRM"
+   use kernel_linux && linux-info_pkg_setup
+}
+
 src_prepare() {
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: b238b7ff426557c2b1955a6d18e28482af0b89c8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:38:38 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b238b7ff

x11-misc/sddm: Drop plocales.eclass

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index 7d3a0ac81808..ae99117b54eb 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake linux-info plocale systemd tmpfiles
+inherit cmake linux-info systemd tmpfiles
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -68,12 +67,6 @@ pkg_setup() {
 src_prepare() {
cmake_src_prepare
 
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   plocale_find_changes "data/translations" "" ".ts"
-   plocale_for_each_disabled_locale disable_locale
-
if ! use test; then
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
cmake_comment_add_subdirectory test

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2022-04-01 Thread Andreas Sturmlechner

commit: 5a1dd8850917c44f1ce26097b85f0545ee7ec585
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 31 20:41:37 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1dd885

x11-misc/sddm: EAPI-8 bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r6.ebuild | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
index ae99117b54eb..883cc2480bad 100644
--- a/x11-misc/sddm/sddm-0.18.1-r6.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake linux-info systemd tmpfiles
 
@@ -13,16 +13,10 @@ LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="elogind +pam systemd test"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
 
-BDEPEND="
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
 RDEPEND="
acct-group/sddm
acct-user/sddm
@@ -42,6 +36,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
test? ( >=dev-qt/qttest-5.9.4:5 )
 "
+BDEPEND="
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.9.4:5
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig
+"
 
 PATCHES=(
"${FILESDIR}/${P}-respect-user-flags.patch"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2022-04-01 Thread Andreas Sturmlechner

commit: 943445b50d918a2a5ac0712105e109973147eb6e
Author: Conrad Kostecki  gentoo  org>
AuthorDate: Sun Mar 27 19:42:50 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  1 14:47:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=943445b5

x11-misc/sddm: migrate to glep-81

Also added tmpfiles handling and patch for CVE-2020-28049.

Bug: https://bugs.gentoo.org/753104
Closes: https://bugs.gentoo.org/802306
Signed-off-by: Conrad Kostecki  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../sddm/files/sddm-0.18.1-cve-2020-28049.patch|  94 +
 x11-misc/sddm/files/sddm.tmpfiles  |   1 +
 x11-misc/sddm/sddm-0.18.1-r6.ebuild| 116 +
 3 files changed, 211 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch 
b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch
new file mode 100644
index ..8209c0739dc6
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-cve-2020-28049.patch
@@ -0,0 +1,94 @@
+From be202f533ab98a684c6a007e8d5b4357846bc222 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Tue, 6 Oct 2020 21:21:38 +0200
+Subject: [PATCH] Fix X not having access control on startup
+
+If the auth file is empty, X allows any local application (= any user on the
+system) to connect. This is currently the case until X wrote the display
+number to sddm and sddm used that to write the entry into the file.
+To work around this chicken-and-egg problem, make use of the fact that X
+doesn't actually look at the display number in the passed auth file and just
+use :0 unconditionally. Also make sure that writing the entry was actually
+successful.
+
+CVE-2020-28049
+---
+ src/daemon/XorgDisplayServer.cpp | 25 -
+ src/daemon/XorgDisplayServer.h   |  2 +-
+ 2 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp 
b/src/daemon/XorgDisplayServer.cpp
+index d04f6344..df685b2d 100644
+--- a/src/daemon/XorgDisplayServer.cpp
 b/src/daemon/XorgDisplayServer.cpp
+@@ -88,7 +88,7 @@ namespace SDDM {
+ return m_cookie;
+ }
+ 
+-void XorgDisplayServer::addCookie(const QString ) {
++bool XorgDisplayServer::addCookie(const QString ) {
+ // log message
+ qDebug() << "Adding cookie to" << file;
+ 
+@@ -104,13 +104,13 @@ namespace SDDM {
+ 
+ // check file
+ if (!fp)
+-return;
++return false;
+ fprintf(fp, "remove %s\n", qPrintable(m_display));
+ fprintf(fp, "add %s . %s\n", qPrintable(m_display), 
qPrintable(m_cookie));
+ fprintf(fp, "exit\n");
+ 
+ // close pipe
+-pclose(fp);
++return pclose(fp) == 0;
+ }
+ 
+ bool XorgDisplayServer::start() {
+@@ -127,6 +127,15 @@ namespace SDDM {
+ // log message
+ qDebug() << "Display server starting...";
+ 
++// generate auth file.
++// For the X server's copy, the display number doesn't matter.
++// An empty file would result in no access control!
++m_display = QStringLiteral(":0");
++if(!addCookie(m_authPath)) {
++qCritical() << "Failed to write xauth file";
++return false;
++}
++
+ if (daemonApp->testing()) {
+ QStringList args;
+ QDir x11socketDir(QStringLiteral("/tmp/.X11-unix"));
+@@ -217,8 +226,14 @@ namespace SDDM {
+ emit started();
+ }
+ 
+-// generate auth file
+-addCookie(m_authPath);
++// The file is also used by the greeter, which does care about the
++// display number. Write the proper entry, if it's different.
++if(m_display != QStringLiteral(":0")) {
++if(!addCookie(m_authPath)) {
++qCritical() << "Failed to write xauth file";
++return false;
++}
++}
+ changeOwner(m_authPath);
+ 
+ // set flag
+diff --git a/src/daemon/XorgDisplayServer.h b/src/daemon/XorgDisplayServer.h
+index d2bdf6d4..e97a0b53 100644
+--- a/src/daemon/XorgDisplayServer.h
 b/src/daemon/XorgDisplayServer.h
+@@ -40,7 +40,7 @@ namespace SDDM {
+ 
+ const QString () const;
+ 
+-void addCookie(const QString );
++bool addCookie(const QString );
+ 
+ public slots:
+ bool start();

diff --git a/x11-misc/sddm/files/sddm.tmpfiles 
b/x11-misc/sddm/files/sddm.tmpfiles
new file mode 100644
index ..300d646138c1
--- /dev/null
+++ b/x11-misc/sddm/files/sddm.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/sddm 0755 sddm sddm

diff --git a/x11-misc/sddm/sddm-0.18.1-r6.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
new file mode 100644
index ..ee7fbfa1a60b
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.18.1-r6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, profiles/

2022-02-26 Thread Andreas Sturmlechner

commit: 4358362c18fef2411b0053d9556745e749d3afdd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 18 18:59:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 26 21:06:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4358362c

x11-misc/sddm: Drop vulnerable 0.15.0

Bug: https://bugs.gentoo.org/753104
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 profiles/package.mask   |  5 ---
 x11-misc/sddm/Manifest  |  1 -
 x11-misc/sddm/sddm-0.15.0-r2.ebuild | 63 -
 3 files changed, 69 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 1502c374b92c..8847d8ffd4cf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -466,11 +466,6 @@ media-plugins/kodi-game-libretro-dosbox
 app-office/texmacs
  (2018-11-25)
-# Masked per security vulnerability CVE-2018-14345, bug #661510
-# Keeping it masked while users have unsolved issues with >0.15.0.
- (2018-10-07)
 # Masked for more testing especially of reverse-deps.
 >=dev-games/ogre-1.11.2

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 09a0d01520a9..d1006dba1575 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1 @@
-DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60

diff --git a/x11-misc/sddm/sddm-0.15.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.15.0-r2.ebuild
deleted file mode 100644
index 6c3a8e611fc2..
--- a/x11-misc/sddm/sddm-0.15.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   !pam? ( virtual/libcrypt:= )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
-
-# fix for flags handling and bug 563108
-PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
-
-src_prepare() {
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2021-08-25 Thread Andreas Sturmlechner

commit: e5812e3f2bf160145b0dbbe8fd18d9eafda72ce0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 25 14:12:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 25 14:35:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5812e3f

x11-misc/sddm: Fix build with Qt 5.15.2++

Upstream commit e93bf95c54ad8c2a1604f8d7be05339164b19308

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch | 23 +++
 x11-misc/sddm/sddm-0.18.1-r5.ebuild |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch 
b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch
new file mode 100644
index 000..7179d14e4c1
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-qt-5.15.2.patch
@@ -0,0 +1,23 @@
+From e93bf95c54ad8c2a1604f8d7be05339164b19308 Mon Sep 17 00:00:00 2001
+From: "aa...@kde.org" 
+Date: Thu, 12 Nov 2020 23:42:48 +0100
+Subject: [PATCH] Fix compilation once QTBUG-88431 gets fixed
+
+And also comes closes to Qt6 compatibility
+---
+ src/daemon/XorgDisplayServer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/XorgDisplayServer.cpp 
b/src/daemon/XorgDisplayServer.cpp
+index 5f93a1b3..d5f29a94 100644
+--- a/src/daemon/XorgDisplayServer.cpp
 b/src/daemon/XorgDisplayServer.cpp
+@@ -65,7 +65,7 @@ namespace SDDM {
+ // create a random hexadecimal number
+ const char *digits = "0123456789abcdef";
+ for (int i = 0; i < 32; ++i)
+-m_cookie[i] = digits[dis(gen)];
++m_cookie[i] = QLatin1Char(digits[dis(gen)]);
+ }
+ 
+ XorgDisplayServer::~XorgDisplayServer() {

diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 8f888089fe3..20b12756299 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -54,6 +54,8 @@ PATCHES=(
# TODO: fix properly
"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
"${FILESDIR}/pam-1.4-substack.patch"
+   # upstream git develop branch:
+   "${FILESDIR}/${P}-qt-5.15.2.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2021-07-26 Thread Yixun Lan

commit: 3a91355a986f996bd9d86bc2875e48572cd6e4d5
Author: Alex Fan  yahoo  com>
AuthorDate: Sun Jul 25 08:24:09 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Jul 26 07:37:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a91355a

x11-misc/sddm: keyword 0.18.1-r5 for ~riscv

Signed-off-by: Alex Fan  yahoo.com>
Signed-off-by: Yixun Lan  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 504fb2a2a9e..8f888089fe3 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2021-07-04 Thread Ulrich Müller

commit: 80a4d94c674fd1c9a8abc700091b1c9f7fffc279
Author: Ulrich Müller  gentoo  org>
AuthorDate: Sat Jul  3 15:47:41 2021 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Sun Jul  4 14:02:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a4d94c

x11-misc/sddm: Update from l10n.eclass to plocale.eclass

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r5.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r5.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 2461112b823..504fb2a2a9e 100644
--- a/x11-misc/sddm/sddm-0.18.1-r5.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake l10n systemd user
+inherit cmake plocale systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -62,8 +62,8 @@ src_prepare() {
disable_locale() {
sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
}
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
+   plocale_find_changes "data/translations" "" ".ts"
+   plocale_for_each_disabled_locale disable_locale
 
if ! use test; then
sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2021-06-26 Thread Sam James

commit: df57bc2a679296f027268e4696d2a3e50e01e23a
Author: Arfrever Frehtes Taifersar Arahesis  Apache  Org>
AuthorDate: Sat Jun 26 00:00:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 27 01:03:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df57bc2a

x11-misc/sddm: Depend on virtual/libcrypt only with USE="-pam".

Fixes: ecee0fc84188e4955961d5a35bc5a1afeae1eaad
Signed-off-by: Arfrever Frehtes Taifersar Arahesis  Apache.Org>
Signed-off-by: Sam James  gentoo.org>

 x11-misc/sddm/{sddm-0.15.0-r1.ebuild => sddm-0.15.0-r2.ebuild} | 2 +-
 x11-misc/sddm/{sddm-0.18.1-r4.ebuild => sddm-0.18.1-r5.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.15.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.15.0-r2.ebuild
similarity index 97%
rename from x11-misc/sddm/sddm-0.15.0-r1.ebuild
rename to x11-misc/sddm/sddm-0.15.0-r2.ebuild
index e510b699867..6c3a8e611fc 100644
--- a/x11-misc/sddm/sddm-0.15.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0-r2.ebuild
@@ -22,11 +22,11 @@ RDEPEND="
>=dev-qt/qtgui-5.6:5
>=dev-qt/qtdeclarative-5.6:5
>=dev-qt/qtnetwork-5.6:5
-   virtual/libcrypt:=
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
+   !pam? ( virtual/libcrypt:= )
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )"
 

diff --git a/x11-misc/sddm/sddm-0.18.1-r4.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
similarity index 99%
rename from x11-misc/sddm/sddm-0.18.1-r4.ebuild
rename to x11-misc/sddm/sddm-0.18.1-r5.ebuild
index 74d55d1da26..2461112b823 100644
--- a/x11-misc/sddm/sddm-0.18.1-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r5.ebuild
@@ -30,11 +30,11 @@ RDEPEND="
>=dev-qt/qtdeclarative-5.9.4:5
>=dev-qt/qtgui-5.9.4:5
>=dev-qt/qtnetwork-5.9.4:5
-   virtual/libcrypt:=
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
+   !pam? ( virtual/libcrypt:= )
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )
 "

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2021-06-24 Thread Sam James

commit: ecee0fc84188e4955961d5a35bc5a1afeae1eaad
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 24 23:18:15 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 24 23:27:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecee0fc8

x11-misc/sddm: add dependency on virtual/libcrypt

Needed for libxcrypt migration which is upcoming.

Acked-by: David Seifert  gentoo.org>
Reported-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 x11-misc/sddm/{sddm-0.15.0.ebuild => sddm-0.15.0-r1.ebuild}| 3 ++-
 x11-misc/sddm/{sddm-0.18.1-r3.ebuild => sddm-0.18.1-r4.ebuild} | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild 
b/x11-misc/sddm/sddm-0.15.0-r1.ebuild
similarity index 96%
rename from x11-misc/sddm/sddm-0.15.0.ebuild
rename to x11-misc/sddm/sddm-0.15.0-r1.ebuild
index 115926b2651..e510b699867 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,7 @@ RDEPEND="
>=dev-qt/qtgui-5.6:5
>=dev-qt/qtdeclarative-5.6:5
>=dev-qt/qtnetwork-5.6:5
+   virtual/libcrypt:=
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )

diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r4.ebuild
similarity index 98%
rename from x11-misc/sddm/sddm-0.18.1-r3.ebuild
rename to x11-misc/sddm/sddm-0.18.1-r4.ebuild
index b2925b5571e..74d55d1da26 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,6 +30,7 @@ RDEPEND="
>=dev-qt/qtdeclarative-5.9.4:5
>=dev-qt/qtgui-5.9.4:5
>=dev-qt/qtnetwork-5.9.4:5
+   virtual/libcrypt:=
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
elogind? ( sys-auth/elogind )

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2020-10-10 Thread Mikle Kolyada

commit: 452c9cc66a9ddfc49f49e8a9d209449c12e41797
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 10 10:13:59 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 10 10:13:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=452c9cc6

x11-misc/sddm: Drop old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 107 
 1 file changed, 107 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
deleted file mode 100644
index a413e69e420..000
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="elogind +pam systemd test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
-   kde-frameworks/extra-cmake-modules:5
-   virtual/pkgconfig
-"
-RDEPEND="
-   >=dev-qt/qtcore-5.9.4:5
-   >=dev-qt/qtdbus-5.9.4:5
-   >=dev-qt/qtdeclarative-5.9.4:5
-   >=dev-qt/qtgui-5.9.4:5
-   >=dev-qt/qtnetwork-5.9.4:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   elogind? ( sys-auth/elogind )
-   pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )
-"
-DEPEND="${RDEPEND}
-   test? ( >=dev-qt/qttest-5.9.4:5 )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-   # fix for groups: https://github.com/sddm/sddm/issues/1159
-   "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
-   "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
-   # fix for ReuseSession=true
-   "${FILESDIR}/${P}-only-reuse-online-sessions.patch"
-   # TODO: fix properly
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake_src_configure
-}
-
-src_install() {
-   cmake_src_install
-
-   # Create a default.conf as upstream dropped /etc/sddm.conf w/o 
replacement
-   local confd="/usr/share/sddm/sddm.conf.d"
-   dodir ${confd}
-   "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-   || die "Failed to create 00default.conf"
-
-   sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-   -e "/^ReuseSession/s/false/true/" \
-   -e "/^EnableHiDPI/s/false/true/" \
-   -i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-   elog "Use it to override specific options. SDDM defaults are now"
-   elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2020-10-06 Thread Mikle Kolyada

commit: 4c2c73b5f641f7cee794c01f754334a9d405eb8e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Oct  6 18:19:57 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Oct  6 18:20:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2c73b5

x11-misc/sddm: remove consolekit support

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/files/sddm-0.14.0-consolekit.patch | 9 -
 x11-misc/sddm/metadata.xml   | 1 -
 x11-misc/sddm/sddm-0.15.0.ebuild | 6 ++
 x11-misc/sddm/sddm-0.18.1-r1.ebuild  | 3 +--
 x11-misc/sddm/sddm-0.18.1-r3.ebuild  | 3 +--
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch 
b/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
deleted file mode 100644
index 64ea0648286..000
--- a/x11-misc/sddm/files/sddm-0.14.0-consolekit.patch
+++ /dev/null
@@ -1,9 +0,0 @@
 a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession2016-08-28 14:53:07.157184480 +0200
-@@ -91,5 +91,5 @@
- if [ -z "$@" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
- else
--exec $@
-+exec ck-launch-session $@
- fi

diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index c5bfbd1e394..9d1e3774b72 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -10,7 +10,6 @@
 Gentoo KDE Project
   
   
-Use ck-launch-session from sys-auth/consolekit by 
default in Xsession (no native support)
 Use sys-auth/elogind for session 
tracking.
   
   

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index 9dde4b79612..115926b2651 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit elogind +pam systemd"
+IUSE="elogind +pam systemd"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
@@ -24,7 +24,6 @@ RDEPEND="
>=dev-qt/qtnetwork-5.6:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )
@@ -41,7 +40,6 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
 
 src_prepare() {
-   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
cmake-utils_src_prepare
 }
 

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index bb3da55d933..a413e69e420 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,7 +32,6 @@ RDEPEND="
>=dev-qt/qtnetwork-5.9.4:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
systemd? ( sys-apps/systemd:= )

diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
index 9b168d277fe..b2925b5571e 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit elogind +pam systemd test"
+IUSE="elogind +pam systemd test"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
@@ -32,7 +32,6 @@ RDEPEND="
>=dev-qt/qtnetwork-5.9.4:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
pam? ( sys-libs/pam )
systemd? ( sys-apps/systemd:= )

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2020-07-24 Thread Mikle Kolyada

commit: 1428b755f8441519116e6d83503253fcb9daccb7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jul 24 20:59:53 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jul 24 21:00:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1428b755

x11-misc/sddm: advance stable keywords

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r3.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
index ddadebe514b..9b168d277fe 100644
--- a/x11-misc/sddm/sddm-0.18.1-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit elogind +pam systemd test"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2020-06-21 Thread Andreas Sturmlechner

commit: 75696cf518e17fbf7cebb0052a5c51c5aa7348cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 21 09:25:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 21 09:25:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75696cf5

x11-misc/sddm: Make sure everyone gets the fixes...

Bug: https://bugs.gentoo.org/728922
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/{sddm-0.18.1-r2.ebuild => sddm-0.18.1-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r2.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r3.ebuild
similarity index 100%
rename from x11-misc/sddm/sddm-0.18.1-r2.ebuild
rename to x11-misc/sddm/sddm-0.18.1-r3.ebuild

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/

2020-06-20 Thread Mikle Kolyada

commit: b784e831946a9b297a24e4e8db4877550cf18480
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 20 21:40:37 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 20 21:41:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b784e831

x11-misc/sddm: redo pam patch

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/files/pam-1.4-substack.patch | 38 --
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch 
b/x11-misc/sddm/files/pam-1.4-substack.patch
index 56be825e6e9..b0467b26822 100644
--- a/x11-misc/sddm/files/pam-1.4-substack.patch
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -1,18 +1,5 @@
-From 9fc1d933517eb01846585f41d04ee335f9f198e8 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada 
-Date: Sat, 20 Jun 2020 18:32:37 +0300
-Subject: [PATCH] Fix pam v1.4.0 compat
-
-Signed-off-by: Mikle Kolyada 

- services/sddm-autologin.pam | 1 -
- services/sddm.pam   | 8 
- 2 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/sddm-0.18.1/services/sddm-autologin.pam 
b/sddm-0.18.1/services/sddm-autologin.pam
-index 4c82048..fc86790 100755
 a/services/sddm-autologin.pam
-+++ b/services/sddm-autologin.pam
+--- sddm-0.18.1/services/sddm-autologin.pam.bak2020-06-19 
22:27:57.305580696 +0200
 sddm-0.18.1/services/sddm-autologin.pam2020-06-19 22:30:50.513583973 
+0200
 @@ -1,6 +1,5 @@
  #%PAM-1.0
  authrequiredpam_env.so
@@ -20,10 +7,8 @@ index 4c82048..fc86790 100755
  authrequiredpam_shells.so
  authrequiredpam_nologin.so
  authrequiredpam_permit.so
-diff --git a/sddm-0.18.1/services/sddm.pam b/sddm-0.18.1/services/sddm.pam
-index 343650e..61c1976 100755
 a/services/sddm.pam
-+++ b/services/sddm.pam
+--- sddm-0.18.1/services/sddm.pam.bak  2020-06-19 22:27:26.721580117 +0200
 sddm-0.18.1/services/sddm.pam  2020-06-19 22:27:48.729580533 +0200
 @@ -1,15 +1,15 @@
  #%PAM-1.0
  
@@ -33,17 +18,14 @@ index 343650e..61c1976 100755
  -auth   optional  pam_kwallet5.so
  
 -account   include system-login
-+account   substacksystem-login
++account   substacksystem-login
  
 -password  include system-login
-+password  substacksystem-login
++password  substacksystem-login
  -password optionalpam_gnome_keyring.so use_authtok
  
--session   optionalpam_keyinit.so force revoke
-+session   substackpam_keyinit.so force revoke
- session   include system-login
+ session   optionalpam_keyinit.so force revoke
+-session   include system-login
++session   substacksystem-login
  -session  optionalpam_gnome_keyring.so auto_start
- -session  optional  pam_kwallet5.so auto_start
--- 
-2.26.2
-
+ -session  optional  pam_kwallet5.so auto_start
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2020-06-20 Thread Mikle Kolyada

commit: fc12cf7f28f79caafd79b95919f3c1aa6f1cdf11
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 20 15:41:55 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 20 15:42:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc12cf7f

x11-misc/sddm: fix pam-1.4 compat

Closes: https://bugs.gentoo.org/728550
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/files/pam-1.4-substack.patch |  49 +
 x11-misc/sddm/sddm-0.18.1-r2.ebuild| 109 +
 2 files changed, 158 insertions(+)

diff --git a/x11-misc/sddm/files/pam-1.4-substack.patch 
b/x11-misc/sddm/files/pam-1.4-substack.patch
new file mode 100644
index 000..56be825e6e9
--- /dev/null
+++ b/x11-misc/sddm/files/pam-1.4-substack.patch
@@ -0,0 +1,49 @@
+From 9fc1d933517eb01846585f41d04ee335f9f198e8 Mon Sep 17 00:00:00 2001
+From: Mikle Kolyada 
+Date: Sat, 20 Jun 2020 18:32:37 +0300
+Subject: [PATCH] Fix pam v1.4.0 compat
+
+Signed-off-by: Mikle Kolyada 
+---
+ services/sddm-autologin.pam | 1 -
+ services/sddm.pam   | 8 
+ 2 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/sddm-0.18.1/services/sddm-autologin.pam 
b/sddm-0.18.1/services/sddm-autologin.pam
+index 4c82048..fc86790 100755
+--- a/services/sddm-autologin.pam
 b/services/sddm-autologin.pam
+@@ -1,6 +1,5 @@
+ #%PAM-1.0
+ authrequiredpam_env.so
+-authrequiredpam_tally.so file=/var/log/faillog onerr=succeed
+ authrequiredpam_shells.so
+ authrequiredpam_nologin.so
+ authrequiredpam_permit.so
+diff --git a/sddm-0.18.1/services/sddm.pam b/sddm-0.18.1/services/sddm.pam
+index 343650e..61c1976 100755
+--- a/services/sddm.pam
 b/services/sddm.pam
+@@ -1,15 +1,15 @@
+ #%PAM-1.0
+ 
+-auth  include system-login
++auth  substacksystem-login
+ -auth optionalpam_gnome_keyring.so
+ -auth   optional  pam_kwallet5.so
+ 
+-account   include system-login
++account   substacksystem-login
+ 
+-password  include system-login
++password  substacksystem-login
+ -password optionalpam_gnome_keyring.so use_authtok
+ 
+-session   optionalpam_keyinit.so force revoke
++session   substackpam_keyinit.so force revoke
+ session   include system-login
+ -session  optionalpam_gnome_keyring.so auto_start
+ -session  optional  pam_kwallet5.so auto_start
+-- 
+2.26.2
+

diff --git a/x11-misc/sddm/sddm-0.18.1-r2.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r2.ebuild
new file mode 100644
index 000..ddadebe514b
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.18.1-r2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
+inherit cmake l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="consolekit elogind +pam systemd test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.9.4:5
+   kde-frameworks/extra-cmake-modules:5
+   virtual/pkgconfig
+"
+RDEPEND="
+   >=dev-qt/qtcore-5.9.4:5
+   >=dev-qt/qtdbus-5.9.4:5
+   >=dev-qt/qtdeclarative-5.9.4:5
+   >=dev-qt/qtgui-5.9.4:5
+   >=dev-qt/qtnetwork-5.9.4:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )
+"
+DEPEND="${RDEPEND}
+   test? ( >=dev-qt/qttest-5.9.4:5 )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
+   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
+   # fix for groups: https://github.com/sddm/sddm/issues/1159
+   "${FILESDIR}/${P}-revert-honor-PAM-supplemental-groups.patch"
+   "${FILESDIR}/${P}-honor-PAM-supplemental-groups-v2.patch"
+   # fix for ReuseSession=true
+   "${FILESDIR}/${P}-only-reuse-online-sessions.patch"
+   # TODO: fix properly
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+   "${FILESDIR}/pam-1.4-substack.patch"
+)
+
+src_prepare() {
+   cmake_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2020-06-18 Thread Mikle Kolyada

commit: e94bdab2ff16b741bb215ebc0c522bb0b8a84742
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jun 18 12:21:42 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun 18 12:23:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e94bdab2

x11-misc/sddm: restrict the version of pam

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mikle Kolyada  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index f237ad81fa5..bb3da55d933 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,7 +34,7 @@ RDEPEND="
x11-libs/libxcb[xkb]
consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
+   pam? ( <=sys-libs/pam-1.3.1_p20200128-r1 )
systemd? ( sys-apps/systemd:= )
!systemd? ( sys-power/upower )
 "

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-09-08 Thread Andreas Sturmlechner

commit: f7a6880221807f4712af6fc1d5d0b1f1a60a8f12
Author: Erhard F  mailbox  org>
AuthorDate: Tue Sep  3 20:06:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:17:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a68802

x11-misc/sddm: keyworded 0.18.1-r1 for ppc64, bug #689606

Bug: https://bugs.gentoo.org/689606
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Erhard Furtner  mailbox.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 2f50d0f57a0..6aa05f682d1 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-07-22 Thread Andreas Sturmlechner

commit: 8fb49654edc4d47631b990f9998a86060d1d8c84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 22 22:05:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul 22 22:05:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fb49654

x11-misc/sddm: Drop 0.18.0

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest   |  1 -
 x11-misc/sddm/sddm-0.18.0.ebuild | 96 
 2 files changed, 97 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 19b5710855b..09a0d01520a 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,2 @@
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
-DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 
96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811
 SHA512 
474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
deleted file mode 100644
index 11c784821bb..000
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.9.4:5
-   >=dev-qt/qtdbus-5.9.4:5
-   >=dev-qt/qtdeclarative-5.9.4:5
-   >=dev-qt/qtgui-5.9.4:5
-   >=dev-qt/qtnetwork-5.9.4:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.9.4:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
-   "${FILESDIR}/${P}-sddmconfdir.patch"
-   # TODO: fix properly
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   # Create a default.conf as upstream dropped /etc/sddm.conf w/o 
replacement
-   local confd="/usr/share/sddm/sddm.conf.d"
-   dodir ${confd}
-   "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-   || die "Failed to create 00default.conf"
-   sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-   -i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-   elog "Use it to override specific options. SDDM defaults are now"
-   elog "found

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-07-22 Thread Aaron Bauman

commit: 0797479a3329cb9f5f8bdf775e5562eba78f6940
Author: Aaron Bauman  gentoo  org>
AuthorDate: Mon Jul 22 21:56:05 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Mon Jul 22 21:56:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0797479a

x11-misc/sddm: arm64 stable (bug #688582)

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 1069727b348..2f50d0f57a0 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-06-26 Thread Agostino Sarubbo

commit: 65dbe86dbb0dde9ac32ec9a232dd348463415788
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 26 09:44:15 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 26 09:44:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dbe86d

x11-misc/sddm: x86 stable wrt bug #688582

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 7b587c70e96..1069727b348 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-06-26 Thread Agostino Sarubbo

commit: fc7241a3fc652072bab4c553e318e5ebf290ddf3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun 26 08:31:44 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun 26 08:31:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc7241a3

x11-misc/sddm: amd64 stable wrt bug #688582

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 x11-misc/sddm/sddm-0.18.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild 
b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index f0955a4b7f7..7b587c70e96 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-06-23 Thread Andreas Sturmlechner

commit: a29ae2b7cc82569458dbcd7c52b247e21659dde7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 23 11:31:42 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 23 14:55:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a29ae2b7

x11-misc/sddm: Drop 0.18.1 (r0)

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/sddm-0.18.1.ebuild | 96 
 1 file changed, 96 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.1.ebuild b/x11-misc/sddm/sddm-0.18.1.ebuild
deleted file mode 100644
index 9e721cefd46..000
--- a/x11-misc/sddm/sddm-0.18.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.9.4:5
-   >=dev-qt/qtdbus-5.9.4:5
-   >=dev-qt/qtdeclarative-5.9.4:5
-   >=dev-qt/qtgui-5.9.4:5
-   >=dev-qt/qtnetwork-5.9.4:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.9.4:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.9.4:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
-   # TODO: fix properly
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   if ! use test; then
-   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
-   cmake_comment_add_subdirectory test
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-
-   # Create a default.conf as upstream dropped /etc/sddm.conf w/o 
replacement
-   local confd="/usr/share/sddm/sddm.conf.d"
-   dodir ${confd}
-   "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
-   || die "Failed to create 00default.conf"
-   sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
-   -i "${D}/${confd}"/00default.conf || die
-}
-
-pkg_postinst() {
-   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-   elog "Use it to override specific options. SDDM defaults are now"
-   elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
-
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2019-06-23 Thread Andreas Sturmlechner

commit: e54d537de46adc04d15f8279e5e96821f420609b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 22 20:45:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 23 14:55:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54d537d

x11-misc/sddm: EAPI-7 bump, PAM groups, reuse sessions, HiDPI default

Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...m-0.18.1-honor-PAM-supplemental-groups-v2.patch | 182 +
 .../sddm-0.18.1-only-reuse-online-sessions.patch   |  27 +++
 ...18.1-revert-honor-PAM-supplemental-groups.patch |  87 ++
 x11-misc/sddm/sddm-0.18.1-r1.ebuild| 107 
 4 files changed, 403 insertions(+)

diff --git 
a/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch 
b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
new file mode 100644
index 000..f4ce7ae7ad7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.1-honor-PAM-supplemental-groups-v2.patch
@@ -0,0 +1,182 @@
+From 75e6e00d9e1ecf25e3a9c8332530a1e40d737cdb Mon Sep 17 00:00:00 2001
+From: "J. Konrad Tegtmeier-Rottach" 
+Date: Thu, 9 May 2019 03:06:48 +0200
+Subject: [PATCH] Honor PAM's supplemental groups (v2) (#834, #1159)
+
+This moves the supplemental group initialization step from
+UserSession.cpp to the Backend system, so that the Pam Backend can
+inject additional supplemental groups via modules like pam_group.so.
+
+pam_setcred(3) assumes that it operates on an already initialized
+supplemental group list. However, PamBackend calls
+pam_setcred(PAM_ESTABLISH_CRED) earlier, at the start
+PamBackend::openSession, so a pam_setcred(PAM_REINITIALIZE_CRED) call
+must be issued to repeat the injection of PAM's supplemental groups.
+---
+ src/helper/Backend.cpp|  5 +
+ src/helper/Backend.h  |  3 +++
+ src/helper/HelperApp.cpp  |  4 
+ src/helper/HelperApp.h|  1 +
+ src/helper/UserSession.cpp| 13 -
+ src/helper/backend/PamBackend.cpp | 18 ++
+ src/helper/backend/PamBackend.h   |  2 ++
+ 7 files changed, 41 insertions(+), 5 deletions(-)
+
+diff --git a/src/helper/Backend.cpp b/src/helper/Backend.cpp
+index d6bb4d0a..35ae2bdf 100644
+--- a/src/helper/Backend.cpp
 b/src/helper/Backend.cpp
+@@ -29,6 +29,7 @@
+ #include 
+ 
+ #include 
++#include 
+ 
+ namespace SDDM {
+ Backend::Backend(HelperApp* parent)
+@@ -79,4 +80,8 @@ namespace SDDM {
+ bool Backend::closeSession() {
+ return true;
+ }
++
++bool Backend::setupSupplementalGroups(struct passwd *pw) {
++return !initgroups(pw->pw_name, pw->pw_gid);
++}
+ }
+diff --git a/src/helper/Backend.h b/src/helper/Backend.h
+index b790e001..3caf1592 100644
+--- a/src/helper/Backend.h
 b/src/helper/Backend.h
+@@ -22,6 +22,7 @@
+ #define BACKEND_H
+ 
+ #include 
++#include 
+ 
+ namespace SDDM {
+ class HelperApp;
+@@ -38,6 +39,8 @@ namespace SDDM {
+ void setAutologin(bool on = true);
+ void setGreeter(bool on = true);
+ 
++virtual bool setupSupplementalGroups(struct passwd *pw);
++
+ public slots:
+ virtual bool start(const QString  = QString()) = 0;
+ virtual bool authenticate() = 0;
+diff --git a/src/helper/HelperApp.cpp b/src/helper/HelperApp.cpp
+index cad93bd8..d0891d75 100644
+--- a/src/helper/HelperApp.cpp
 b/src/helper/HelperApp.cpp
+@@ -253,6 +253,10 @@ namespace SDDM {
+ return m_session;
+ }
+ 
++Backend *HelperApp::backend() {
++return m_backend;
++}
++
+ const QString& HelperApp::user() const {
+ return m_user;
+ }
+diff --git a/src/helper/HelperApp.h b/src/helper/HelperApp.h
+index 3742df12..cb5959a7 100644
+--- a/src/helper/HelperApp.h
 b/src/helper/HelperApp.h
+@@ -39,6 +39,7 @@ namespace SDDM {
+ virtual ~HelperApp();
+ 
+ UserSession *session();
++Backend *backend();
+ const QString () const;
+ const QString () const;
+ 
+diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp
+index f71fd358..62fd4d70 100644
+--- a/src/helper/UserSession.cpp
 b/src/helper/UserSession.cpp
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include "Backend.h"
+ #include "Configuration.h"
+ #include "UserSession.h"
+ #include "HelperApp.h"
+@@ -129,7 +130,8 @@ namespace SDDM {
+ #endif
+ 
+ // switch user
+-const QByteArray username = 
qobject_cast(parent())->user().toLocal8Bit();
++HelperApp* app = qobject_cast(parent());
++const QByteArray username = app->user().toLocal8Bit();
+ struct passwd pw;
+ struct passwd *rpw;
+ long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+@@ -146,12 +148,13 @@ namespace SDDM {
+ qCritical() << "getpwnam_r(" << username << ") failed with 
error: " << strerror(err);
+ exit(Auth::HELPER_OTHER_ERROR);
+

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-05-27 Thread Aaron Bauman

commit: 7024d8c88d018ae1df7a53b69d095b0ab5988429
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue May 28 02:27:46 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue May 28 02:35:16 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7024d8c8

x11-misc/sddm: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 x11-misc/sddm/sddm-0.18.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index 4763b8f4f54..11c784821bb 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2019-03-31 Thread Michael Palimaka

commit: 400dc109526e36fb9f206a49fedf7e9f87a84d79
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Mar 31 09:03:22 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Mar 31 09:03:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=400dc109

x11-misc/sddm: version bump 0.18.1

Closes: https://bugs.gentoo.org/679890
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka  gentoo.org>

 x11-misc/sddm/Manifest   |  1 +
 x11-misc/sddm/sddm-0.18.1.ebuild | 96 
 2 files changed, 97 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 33ffd8431a8..19b5710855b 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 
96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811
 SHA512 
474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f
+DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 
99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e
 SHA512 
ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60

diff --git a/x11-misc/sddm/sddm-0.18.1.ebuild b/x11-misc/sddm/sddm-0.18.1.ebuild
new file mode 100644
index 000..9e721cefd46
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.18.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn 
pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk 
zh_CN zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.9.4:5
+   >=dev-qt/qtdbus-5.9.4:5
+   >=dev-qt/qtdeclarative-5.9.4:5
+   >=dev-qt/qtgui-5.9.4:5
+   >=dev-qt/qtnetwork-5.9.4:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.9.4:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.9.4:5 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${PN}-0.18.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.18.0-sddmconfdir.patch"
+   # TODO: fix properly
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes "data/translations" "" ".ts"
+   l10n_for_each_disabled_locale_do disable_locale
+
+   if ! use test; then
+   sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die
+   cmake_comment_add_subdirectory test
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+
+   # Create a default.conf as upstream dropped /etc/sddm.conf w/o 
replacement
+   local confd="/usr/share/sddm/sddm.conf.d"
+   dodir ${confd}
+   "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \
+   || die "Failed to create 00default.conf"
+   sed -e "/^InputMethod/s/qtvirtualkeyboard//" \
+   -i "${D}/${confd}"/00default.conf || die
+}
+
+pkg_postinst() {
+   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
+   elog "Use it to override specific

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2018-11-13 Thread Andreas Sturmlechner

commit: 5e996d8c5d2e1f27ad0eceed39173e46039c8a5b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 13 15:29:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 13 21:30:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e996d8c

x11-misc/sddm: Drop vulnerable 0.17.0-r4

Bug: https://bugs.gentoo.org/661510
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 x11-misc/sddm/Manifest |  1 -
 x11-misc/sddm/files/sddm-0.16.0-Xsession.patch | 24 ---
 x11-misc/sddm/files/sddm-0.17.0-consolekit.patch   | 22 --
 x11-misc/sddm/files/sddm-0.17.0-logind-race.patch  | 26 ---
 .../files/sddm-0.17.0-switchtogreeter-r1.patch | 54 --
 x11-misc/sddm/sddm-0.17.0-r4.ebuild| 84 --
 6 files changed, 211 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index ddeba3e7838..33ffd8431a8 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,2 @@
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
-DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B 
b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492
 SHA512 
81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 
96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811
 SHA512 
474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f

diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
deleted file mode 100644
index f341e1863f7..000
--- a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
+++ /dev/null
@@ -1,24 +0,0 @@
 a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
-+++ b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
-@@ -50,6 +50,10 @@
- ;;
- esac
- 
-+# Make D-Bus and ConsoleKit start properly, see:
-+# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
-+command="$@"
-+
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f $HOME/.xprofile ] && . $HOME/.xprofile
- 
-@@ -94,8 +98,8 @@
-   . "$USERXSESSION"
- fi
- 
--if [ -z "$@" ]; then
-+if [ -z "$command" ]; then
- exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
- else
--exec $@
-+exec $command
- fi

diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch 
b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
deleted file mode 100644
index ca265d13145..000
--- a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001
-From: Erik Ridderby 
-Date: Sat, 12 May 2018 08:04:26 +0200
-Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027)
-

- src/daemon/LogindDBusTypes.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
-index 79c70312..011bb7f5 100644
 a/src/daemon/LogindDBusTypes.cpp
-+++ b/src/daemon/LogindDBusTypes.cpp
-@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal()
- available = true;
- serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
- managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
--managerIfaceName = 
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't 
match logind
-+managerIfaceName = 
QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match 
logind
- seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat");
- sessionIfaceName = 
QStringLiteral("org.freedesktop.ConsoleKit.Session");
- userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User");

diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch 
b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
deleted file mode 100644
index a55702061c9..000
--- a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001
-From: Pier Luigi Fiorini 
-Date: Mon, 26 Feb 2018 09:03:05 +0100
-Subject: [PATCH] Fix race between sddm and logind
-
-Make sure sddm is run after logind.
-An explicit dependency will make sddm run after logind every time.
-
-Closes: #978

- services/sddm.service.in | 2 +-
- 1 file

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-08-09 Thread Andreas Sturmlechner

commit: a2ee6ba9b9e43a5daae3945867bc9b1ed76bafee
Author: Francesco Turco  fastmail  fm>
AuthorDate: Sun Aug  5 19:18:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  9 20:47:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ee6ba9

x11-misc/sddm: use elog instead of einfo for messages to users

Closes: https://github.com/gentoo/gentoo/pull/9463

 x11-misc/sddm/sddm-0.18.0.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index e182c190190..4763b8f4f54 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -85,9 +85,9 @@ src_install() {
 }
 
 pkg_postinst() {
-   einfo "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
-   einfo "Use it to override specific options. SDDM defaults are now"
-   einfo "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
+   elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf"
+   elog "Use it to override specific options. SDDM defaults are now"
+   elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf"
 
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-07-28 Thread Thomas Deutschmann

commit: 6e46788061d9213ba4d14da03af471674872
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Jul 28 13:19:02 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Jul 28 13:24:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e467880

x11-misc/sddm: x86 stable (bug #661510)

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 x11-misc/sddm/sddm-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index f4b731f7432..e182c190190 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-07-26 Thread Mikle Kolyada

commit: bc80df29951c0a101614416ac0a79fb7c9448e82
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jul 26 21:44:29 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jul 26 21:44:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc80df29

x11-misc/sddm: amd64 stable wrt bug #661510

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/sddm-0.18.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
index 71b170a41f8..f4b731f7432 100644
--- a/x11-misc/sddm/sddm-0.18.0.ebuild
+++ b/x11-misc/sddm/sddm-0.18.0.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

2018-07-22 Thread Andreas Sturmlechner

commit: ae159450bf401ffa9651ce243e8c12ca088e127b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 21 21:07:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 22 11:21:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae159450

x11-misc/sddm: 0.18.0 version bump

Bug: https://bugs.gentoo.org/661510
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 x11-misc/sddm/Manifest|  1 +
 x11-misc/sddm/files/sddm-0.18.0-Xsession.patch| 24 ++
 x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch | 32 
 x11-misc/sddm/sddm-0.18.0.ebuild  | 96 +++
 4 files changed, 153 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 0c663f33667..ddeba3e7838 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B 
b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492
 SHA512 
81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
+DIST sddm-0.18.0.tar.gz 3526688 BLAKE2B 
96db3f7b4745b7b5686c3c5e4353c99f175f28c99d329df3bc49cf41788257eaf823c6998b165de90e2150e34470e65ca69731375194072aae7583c8e8dfa811
 SHA512 
474be3fc159ca31cae409ef5263c47376d41f500d8b495fc7ef896ad0f1a599a5fea9a58d7df2874493dfd9230d0121cdd836ec6171774df2ce1639e8e4c652f

diff --git a/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
new file mode 100644
index 000..41c813a0664
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
 b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+ ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$*" ]; then
++if [ -z "$command" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
+ else
+-exec $@
++exec $command
+ fi

diff --git a/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch 
b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch
new file mode 100644
index 000..9d8f2b545a1
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.18.0-sddmconfdir.patch
@@ -0,0 +1,32 @@
+From 300078995ae82495cf09a0646a07e0214f0ae030 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 21 Jul 2018 22:41:29 +0200
+Subject: [PATCH] Change location of sddm.conf.d to DATAROOTDIR
+
+/usr/lib is not a location that should be hardcoded - depending on
+distribution and architecture this can be different. So far, SDDM
+does not use this path unless the above conditions happen to make
+it coincide with the install location of its Qml modules.
+
+DATAROOTDIR is defined as: Read-only architecture-independent data.
+This seems to be a better fit for a system SDDM default config dir.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8500c65..5150b7d 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -184,7 +184,7 @@ set(WAYLAND_SESSION_COMMAND 
"${DATA_INSTALL_DIR}/scripts/wayland-session"
+ 
+ set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf"  
  CACHE PATH  "Path of the sddm config file")
+ set(CONFIG_DIR  
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/sddm.conf.d"  CACHE PATH  "Path of 
the sddm config directory")
+-set(SYSTEM_CONFIG_DIR   
"${CMAKE_INSTALL_PREFIX}/lib/sddm/sddm.conf.d"  CACHE PATH  "Path of 
the system sddm config directory")
++set(SYSTEM_CONFIG_DIR   
"${CMAKE_INSTALL_FULL_DATAROOTDIR}/sddm/sddm.conf.d" CACHE PATH  "Path of 
the system sddm config directory")
+ set(LOG_FILE
"${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/sddm.log"  CACHE PATH  "Path of 
the sddm log file")
+ set(DBUS_CONFIG_FILENAME"org.freedesktop.DisplayManager.conf" 
  CACHE STRING"Name of the sddm config file")
+ set(COMPONENTS_TRANSLATION_DIR  "${DATA_INSTALL_DIR}/translations"
  CACHE PATH  "Components translations directory")
+-- 
+2.18.0
+

diff --git a/x11-misc/sddm/sddm-0.18.0.ebuild b/x11-misc/sddm/sddm-0.18.0.ebuild
new file mode 100644
index

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/

2018-07-08 Thread Andreas Sturmlechner

commit: 5d0418f942e4280b3645d273b48fdf9ae1bfec5b
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun Jul  8 09:01:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  8 11:23:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d0418f9

x11-misc/sddm: remove unused patch

 .../sddm/files/sddm-0.17.0-switchtogreeter.patch   | 54 --
 1 file changed, 54 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch 
b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
deleted file mode 100644
index 22d2fa4ae9b..000
--- a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Subject: [PATCH] Fix switchToGreeter not available without logind
-From: Alexander Miller 
-
-Seats can't be created until SeatManager's signals are
-connected to the DisplayManager, or the latter won't see
-them and switchToGreeter doesn't work. So split SeatManager
-initialization from its constructor and call initialize it
-only after all connections have been set up in DaemonApp's
-constructor.
-
-With logind there may have been enough delay before seats
-got actually added so things would work, but it's still
-cleaner to fix the order.
-
-Fixes: https://bugs.gentoo.org/644718
-Fixes: https://github.com/sddm/sddm/issues/824
-
 a/src/daemon/SeatManager.h
-+++ b/src/daemon/SeatManager.h
-@@ -31,8 +31,9 @@ namespace SDDM {
- class SeatManager : public QObject {
- Q_OBJECT
- public:
--explicit SeatManager(QObject *parent = 0);
-+explicit SeatManager(QObject *parent = 0) {}
- 
-+void initialize();
- void createSeat(const QString );
- void removeSeat(const QString );
- void switchToGreeter(const QString );
 a/src/daemon/SeatManager.cpp
-+++ b/src/daemon/SeatManager.cpp
-@@ -93,8 +93,7 @@ namespace SDDM {
- }
- }
- 
--SeatManager::SeatManager(QObject *parent) : QObject(parent) {
--
-+void SeatManager::initialize() {
- if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
- //if we don't have logind/CK2, just create a single seat 
immediately and don't do any other connections
- createSeat(QStringLiteral("seat0"));
 a/src/daemon/DaemonApp.cpp
-+++ b/src/daemon/DaemonApp.cpp
-@@ -75,6 +75,9 @@ namespace SDDM {
- 
- // log message
- qDebug() << "Starting...";
-+
-+// initialize seats only after signals are connected
-+m_seatManager->initialize();
- }
- 
- bool DaemonApp::testing() const {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-06-23 Thread Andreas Sturmlechner

commit: 263de47847d8eb38244794506bf58bcce80c5b5c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 23 08:42:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 23 16:43:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=263de478

x11-misc/sddm: Drop 0.17.0-r3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r3.ebuild | 83 -
 1 file changed, 83 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
deleted file mode 100644
index 623e779a6f1..000
--- a/x11-misc/sddm/sddm-0.17.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-   "${FILESDIR}/${P}-logind-race.patch" # bug 656286
-   # TODO: not yet upstream
-   "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || 
die
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-06-22 Thread Mikle Kolyada

commit: 3192990d80c0214c0449ac64afde80f96872f7cb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jun 22 07:23:33 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jun 22 07:23:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3192990d

x11-misc/sddm: amd64 stable wrt bug #658238

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
index 9afc12bd4a4..ba166f9c67f 100644
--- a/x11-misc/sddm/sddm-0.17.0-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-06-17 Thread Thomas Deutschmann

commit: ef0da6bc69512ee7d2947e64e0fd62cf89112ebe
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun 17 23:27:33 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jun 17 23:29:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0da6bc

x11-misc/sddm: x86 stable (bug #658238)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
index 090a03ea4de..9afc12bd4a4 100644
--- a/x11-misc/sddm/sddm-0.17.0-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2018-06-06 Thread Andreas Sturmlechner

commit: 12842ffb4b5a4ca1490724bb2d6646e49a4832d0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun  6 10:12:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 10:12:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12842ffb

x11-misc/sddm: Fix switchtogreeter patch, add consolekit fix

Bug: https://bugs.gentoo.org/647254
Bug: https://bugs.gentoo.org/655912
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/files/sddm-0.17.0-consolekit.patch   | 22 ++
 .../files/sddm-0.17.0-switchtogreeter-r1.patch | 54 ++
 x11-misc/sddm/sddm-0.17.0-r4.ebuild| 84 ++
 3 files changed, 160 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch 
b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
new file mode 100644
index 000..ca265d13145
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-consolekit.patch
@@ -0,0 +1,22 @@
+From 7bd9f322182d840f3cfaee9a49f5cbd5f426aa1b Mon Sep 17 00:00:00 2001
+From: Erik Ridderby 
+Date: Sat, 12 May 2018 08:04:26 +0200
+Subject: [PATCH] Fixed typo that prevents ConsoleKit to be detected (#1027)
+
+---
+ src/daemon/LogindDBusTypes.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
+index 79c70312..011bb7f5 100644
+--- a/src/daemon/LogindDBusTypes.cpp
 b/src/daemon/LogindDBusTypes.cpp
+@@ -63,7 +63,7 @@ LogindPathInternal::LogindPathInternal()
+ available = true;
+ serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+ managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+-managerIfaceName = 
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't 
match logind
++managerIfaceName = 
QStringLiteral("org.freedesktop.ConsoleKit.Manager"); //note this doesn't match 
logind
+ seatIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.Seat");
+ sessionIfaceName = 
QStringLiteral("org.freedesktop.ConsoleKit.Session");
+ userIfaceName = QStringLiteral("org.freedesktop.ConsoleKit.User");

diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch 
b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
new file mode 100644
index 000..35982bceda2
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter-r1.patch
@@ -0,0 +1,54 @@
+Subject: [PATCH] Fix switchToGreeter not available without logind
+From: Alexander Miller 
+
+Seats can't be created until SeatManager's signals are
+connected to the DisplayManager, or the latter won't see
+them and switchToGreeter doesn't work. So split SeatManager
+initialization from its constructor and call initialize it
+only after all connections have been set up in DaemonApp's
+constructor.
+
+With logind there may have been enough delay before seats
+got actually added so things would work, but it's still
+cleaner to fix the order.
+
+Fixes: https://bugs.gentoo.org/644718
+Fixes: https://github.com/sddm/sddm/issues/824
+
+--- a/src/daemon/SeatManager.h
 b/src/daemon/SeatManager.h
+@@ -31,8 +31,9 @@ namespace SDDM {
+ class SeatManager : public QObject {
+ Q_OBJECT
+ public:
+-explicit SeatManager(QObject *parent = 0);
++explicit SeatManager(QObject *parent = 0) : QObject(parent) {}
+ 
++void initialize();
+ void createSeat(const QString );
+ void removeSeat(const QString );
+ void switchToGreeter(const QString );
+--- a/src/daemon/SeatManager.cpp
 b/src/daemon/SeatManager.cpp
+@@ -93,8 +93,7 @@ namespace SDDM {
+ }
+ }
+ 
+-SeatManager::SeatManager(QObject *parent) : QObject(parent) {
+-
++void SeatManager::initialize() {
+ if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
+ //if we don't have logind/CK2, just create a single seat 
immediately and don't do any other connections
+ createSeat(QStringLiteral("seat0"));
+--- a/src/daemon/DaemonApp.cpp
 b/src/daemon/DaemonApp.cpp
+@@ -75,6 +75,9 @@ namespace SDDM {
+ 
+ // log message
+ qDebug() << "Starting...";
++
++// initialize seats only after signals are connected
++m_seatManager->initialize();
+ }
+ 
+ bool DaemonApp::testing() const {

diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
new file mode 100644
index 000..090a03ea4de
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-06-06 Thread Andreas Sturmlechner

commit: 97eed1c855e25f26cc47f5a99946c99e2807eb66
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun  6 10:13:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  6 10:13:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97eed1c8

x11-misc/sddm: Drop 0.17.0-r2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r2.ebuild | 82 -
 1 file changed, 82 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
deleted file mode 100644
index 6e91b0dcb03..000
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-   # TODO: not yet upstream
-   "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || 
die
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2018-05-27 Thread Andreas Sturmlechner

commit: dc186212892ef0c9872c16b73f55f79a96f0198e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 27 20:26:08 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 27 21:34:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc186212

x11-misc/sddm: Upstream adj. to sddm.service to fix logind race cond.

Closes: https://bugs.gentoo.org/656286
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-misc/sddm/files/sddm-0.17.0-logind-race.patch | 26 +++
 x11-misc/sddm/sddm-0.17.0-r3.ebuild   | 83 +++
 2 files changed, 109 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch 
b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
new file mode 100644
index 000..a55702061c9
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-logind-race.patch
@@ -0,0 +1,26 @@
+From fca8c808b7fa4a947a0c60157f0eb5227b3ccfff Mon Sep 17 00:00:00 2001
+From: Pier Luigi Fiorini 
+Date: Mon, 26 Feb 2018 09:03:05 +0100
+Subject: [PATCH] Fix race between sddm and logind
+
+Make sure sddm is run after logind.
+An explicit dependency will make sddm run after logind every time.
+
+Closes: #978
+---
+ services/sddm.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/services/sddm.service.in b/services/sddm.service.in
+index df03d92a..9d7618c6 100644
+--- a/services/sddm.service.in
 b/services/sddm.service.in
+@@ -2,7 +2,7 @@
+ Description=Simple Desktop Display Manager
+ Documentation=man:sddm(1) man:sddm.conf(5)
+ Conflicts=getty@tty1.service
+-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
++After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service 
systemd-logind.service
+ 
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm

diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
new file mode 100644
index 000..623e779a6f1
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+   "${FILESDIR}/${P}-logind-race.patch" # bug 656286
+   # TODO: not yet upstream
+   "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes "data/translations" "" ".ts"
+   l10n_for_each_disabled_locale_do disable_locale
+
+   use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || 
die
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-05-05 Thread Andreas Sturmlechner

commit: 37e195d1e67b518ad119dadef6233c57b5d701cf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May  5 06:43:38 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May  5 06:43:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e195d1

x11-misc/sddm: Drop 0.17.0-r1

-r2 was stabilised with a fix for elogind.

Closes: https://bugs.gentoo.org/649888
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r1.ebuild | 80 -
 1 file changed, 80 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
deleted file mode 100644
index f50c269e5e8..000
--- a/x11-misc/sddm/sddm-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || 
die
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-05-04 Thread Thomas Deutschmann

commit: cc011a13130f2a68a8998af5afad22dc65e9417b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May  4 15:34:29 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May  4 15:34:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc011a13

x11-misc/sddm: x86 stable (bug #644718)

Package-Manager: Portage-2.3.34, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
index 900a2ec69fb..6e91b0dcb03 100644
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-05-03 Thread Mikle Kolyada

commit: 281c6f2f4dafca51bd689f73c4ccc8c90e177ce9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  3 14:19:14 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  3 14:45:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281c6f2f

x11-misc/sddm: amd64 stable wrt bug #644718

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-misc/sddm/sddm-0.17.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
index 8ea9f21b440..900a2ec69fb 100644
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-04-19 Thread Andreas Sturmlechner

commit: 166fa75028679f05b0306f0046434a810a4cac0f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 18 18:07:49 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 19 17:17:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166fa750

x11-misc/sddm: Drop obsolete 0.16.0-r3

Newer version is stable.

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 x11-misc/sddm/Manifest  |  1 -
 x11-misc/sddm/sddm-0.16.0-r3.ebuild | 75 -
 2 files changed, 76 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 37cb870cfb0..0c663f33667 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,2 @@
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B 
b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377
 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
-DIST sddm-0.16.0.tar.gz 3523735 BLAKE2B 
d460cc6d6b9273310cc339f62f2463defea8933441b0332b58da9af394593a6fcb57f2789d2090710d6cb423843380d6693d8e9ead4bdfbab0556a09cbe36fa9
 SHA512 
1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B 
b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492
 SHA512 
81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101

diff --git a/x11-misc/sddm/sddm-0.16.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
deleted file mode 100644
index aa78c82fcbd..000
--- a/x11-misc/sddm/sddm-0.16.0-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
-   "${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-04-05 Thread Andreas Sturmlechner

commit: 253d7a238f4e2d8fba5f6a95ac09d825ccfe308d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  5 15:58:33 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 15:58:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253d7a23

x11-misc/sddm: Drop incorrect comment and DEPEND

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 x11-misc/sddm/sddm-0.17.0-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
index 0baf9364f5e..8ea9f21b440 100644
--- a/x11-misc/sddm/sddm-0.17.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
@@ -24,7 +24,6 @@ RDEPEND="
>=dev-qt/qtgui-5.6:5
>=dev-qt/qtnetwork-5.6:5
>=x11-base/xorg-server-1.15.1
-   x11-libs/libXau
x11-libs/libxcb[xkb]
consolekit? ( >=sys-auth/consolekit-0.9.4 )
elogind? ( sys-auth/elogind )
@@ -43,7 +42,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
"${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
"${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-   # not yet upstream, fixing issues caused by hostname changes
+   # TODO: not yet upstream
"${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
 )

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2018-04-05 Thread Andreas Sturmlechner

commit: 8e892dae48e6e695e7e809748a94d67e70be6c2f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  5 15:53:03 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr  5 15:54:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e892dae

x11-misc/sddm: Fix SwitchToGreeter error

Thanks-to: Alexander Miller  gmx.de>
Bug: https://bugs.gentoo.org/644718
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../sddm/files/sddm-0.17.0-switchtogreeter.patch   | 54 ++
 x11-misc/sddm/sddm-0.17.0-r2.ebuild| 83 ++
 2 files changed, 137 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch 
b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
new file mode 100644
index 000..22d2fa4ae9b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.17.0-switchtogreeter.patch
@@ -0,0 +1,54 @@
+Subject: [PATCH] Fix switchToGreeter not available without logind
+From: Alexander Miller 
+
+Seats can't be created until SeatManager's signals are
+connected to the DisplayManager, or the latter won't see
+them and switchToGreeter doesn't work. So split SeatManager
+initialization from its constructor and call initialize it
+only after all connections have been set up in DaemonApp's
+constructor.
+
+With logind there may have been enough delay before seats
+got actually added so things would work, but it's still
+cleaner to fix the order.
+
+Fixes: https://bugs.gentoo.org/644718
+Fixes: https://github.com/sddm/sddm/issues/824
+
+--- a/src/daemon/SeatManager.h
 b/src/daemon/SeatManager.h
+@@ -31,8 +31,9 @@ namespace SDDM {
+ class SeatManager : public QObject {
+ Q_OBJECT
+ public:
+-explicit SeatManager(QObject *parent = 0);
++explicit SeatManager(QObject *parent = 0) {}
+ 
++void initialize();
+ void createSeat(const QString );
+ void removeSeat(const QString );
+ void switchToGreeter(const QString );
+--- a/src/daemon/SeatManager.cpp
 b/src/daemon/SeatManager.cpp
+@@ -93,8 +93,7 @@ namespace SDDM {
+ }
+ }
+ 
+-SeatManager::SeatManager(QObject *parent) : QObject(parent) {
+-
++void SeatManager::initialize() {
+ if (DaemonApp::instance()->testing() || !Logind::isAvailable()) {
+ //if we don't have logind/CK2, just create a single seat 
immediately and don't do any other connections
+ createSeat(QStringLiteral("seat0"));
+--- a/src/daemon/DaemonApp.cpp
 b/src/daemon/DaemonApp.cpp
+@@ -75,6 +75,9 @@ namespace SDDM {
+ 
+ // log message
+ qDebug() << "Starting...";
++
++// initialize seats only after signals are connected
++m_seatManager->initialize();
+ }
+ 
+ bool DaemonApp::testing() const {

diff --git a/x11-misc/sddm/sddm-0.17.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
new file mode 100644
index 000..0baf9364f5e
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libXau
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+   # not yet upstream, fixing issues caused by hostname changes
+   "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-02-02 Thread Michael Palimaka

commit: 53c7ff779511831fe833f8af8c0e5874efc7e1da
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Feb  2 13:03:47 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Feb  2 13:03:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c7ff77

x11-misc/sddm: stabilise 0.17.0-r1 for x86

Bug: https://bugs.gentoo.org/643804
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-misc/sddm/sddm-0.17.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
index 41d4694c003..f50c269e5e8 100644
--- a/x11-misc/sddm/sddm-0.17.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-01-09 Thread Mikle Kolyada

commit: d7c1c8e0878a120fbea99152874fde0c767e2503
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jan  9 11:55:01 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jan  9 11:55:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7c1c8e0

x11-misc/sddm: amd64 stable wrt bug #643804

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 x11-misc/sddm/sddm-0.17.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.17.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
index 50e729d2502..41d4694c003 100644
--- a/x11-misc/sddm/sddm-0.17.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-01-05 Thread Andreas Sturmlechner

commit: 9cb18946f8293ba878c9e3763fd6e1c001fa3e6b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  6 01:19:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  6 02:13:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb18946

x11-misc/sddm: Remove qtvirtualkeyboard as InputMethod default

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-misc/sddm/sddm-0.17.0-r1.ebuild | 80 +
 1 file changed, 80 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.17.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
new file mode 100644
index 000..50e729d2502
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes "data/translations" "" ".ts"
+   l10n_for_each_disabled_locale_do disable_locale
+
+   use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || 
die
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2018-01-05 Thread Andreas Sturmlechner

commit: 5f908a4d47c3d9dfbce525a77f8ecddcd8908ef7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  6 01:19:30 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  6 02:13:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f908a4d

x11-misc/sddm: Drop 0.17.0 (r0)

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 x11-misc/sddm/sddm-0.17.0.ebuild | 75 
 1 file changed, 75 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.17.0.ebuild b/x11-misc/sddm/sddm-0.17.0.ebuild
deleted file mode 100644
index 9e7594ad238..000
--- a/x11-misc/sddm/sddm-0.17.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig
-   test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
-   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
-)
-
-src_prepare() {
-   cmake-utils_src_prepare
-
-   disable_locale() {
-   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
-   }
-   l10n_find_plocales_changes "data/translations" "" ".ts"
-   l10n_for_each_disabled_locale_do disable_locale
-
-   use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/

2017-12-27 Thread Michael Palimaka

commit: 07fcab0de1513d9ab62b4c07f49f9f69c06a415d
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Dec 27 09:46:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec 27 10:40:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07fcab0d

x11-misc/sddm: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/6658

 x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch | 10 ---
 x11-misc/sddm/files/sddm-0.14.0-avatars.patch | 33 ---
 2 files changed, 43 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch 
b/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch
deleted file mode 100644
index ff1c4d2dd40..000
--- a/x11-misc/sddm/files/sddm-0.13.0-pam_kwallet.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/services/sddm.pam2015-08-17 18:06:19.0 +0200
-+++ b/services/sddm.pam2016-02-21 19:54:08.654091951 +0100
-@@ -4,3 +4,7 @@
- account   include system-login
- password  include system-login
- session   include system-login
-+-auth optionalpam_kwallet.so kdehome=.kde4
-+-auth optionalpam_kwallet5.so
-+-session  optionalpam_kwallet.so
-+-session  optionalpam_kwallet5.so auto_start

diff --git a/x11-misc/sddm/files/sddm-0.14.0-avatars.patch 
b/x11-misc/sddm/files/sddm-0.14.0-avatars.patch
deleted file mode 100644
index d40f68c10a2..000
--- a/x11-misc/sddm/files/sddm-0.14.0-avatars.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ecb903e48822bd90650bdd64fe80754e3e9664cb Mon Sep 17 00:00:00 2001
-From: Bastian Beischer 
-Date: Fri, 2 Sep 2016 13:05:18 +0200
-Subject: [PATCH] Fix display of user avatars. (#684)
-
-QFile::exists("...") does not understand file:// URLs, at least in Qt
-5.7.0 and Qt 4.8.7.

- src/greeter/UserModel.cpp | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 41a9f10..94c492d 100644
 a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -107,13 +107,13 @@ namespace SDDM {
- d->lastIndex = i;
- 
- if (avatarsEnabled) {
--const QString userFace = 
QStringLiteral("file://%1/.face.icon").arg(user->homeDir);
--const QString systemFace = 
QStringLiteral("file://%1/%2.face.icon").arg(facesDir).arg(user->name);
-+const QString userFace = 
QStringLiteral("%1/.face.icon").arg(user->homeDir);
-+const QString systemFace = 
QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name);
- 
- if (QFile::exists(userFace))
--user->icon = userFace;
-+user->icon = QStringLiteral("file://%1").arg(userFace);
- else if (QFile::exists(systemFace))
--user->icon = systemFace;
-+user->icon = QStringLiteral("file://%1").arg(systemFace);
- }
- }
- }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-12-06 Thread Manuel Rüger

commit: 223c1f4210ba1d1753d16587f3d3e0f01969e9f1
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Dec  6 19:25:10 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Dec  6 19:25:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223c1f42

x11-misc/sddm: Version bump to 0.17.0

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-misc/sddm/Manifest   |  3 +-
 x11-misc/sddm/sddm-0.17.0.ebuild | 75 
 2 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 44242a37552..8b39c3aca39 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,3 +1,4 @@
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 
7e348258618b20f67a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 
ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366
 WHIRLPOOL 
d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 
a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 WHIRLPOOL 
48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
-DIST sddm-0.16.0.tar.gz 3523735 SHA256 
f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 
1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
 WHIRLPOOL 
1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733
+DIST sddm-0.16.0.tar.gz 3523735 BLAKE2B 
d460cc6d6b9273310cc339f62f2463defea8933441b0332b58da9af394593a6fcb57f2789d2090710d6cb423843380d6693d8e9ead4bdfbab0556a09cbe36fa9
 SHA512 
1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
+DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B 
b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492
 SHA512 
81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101

diff --git a/x11-misc/sddm/sddm-0.17.0.ebuild b/x11-misc/sddm/sddm-0.17.0.ebuild
new file mode 100644
index 000..9e7594ad238
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.17.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd test"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.6:5 )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
+   "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes "data/translations" "" ".ts"
+   l10n_for_each_disabled_locale_do disable_locale
+
+   use test || cmake_comment_add_subdirectory test
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-12-06 Thread Manuel Rüger

commit: 9cc857a3c4c8fb3e8b0e64dd290a7f8da47e146d
Author: Manuel Rüger  gentoo  org>
AuthorDate: Wed Dec  6 19:26:42 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Wed Dec  6 19:26:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cc857a3

x11-misc/sddm: Remove old

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 x11-misc/sddm/Manifest  |  1 -
 x11-misc/sddm/sddm-0.14.0-r2.ebuild | 86 -
 x11-misc/sddm/sddm-0.16.0-r2.ebuild | 62 --
 3 files changed, 149 deletions(-)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 8b39c3aca39..7293a28fe70 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,4 +1,3 @@
-DIST sddm-0.14.0.tar.xz 3298360 SHA256 
7e348258618b20f67a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 
ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366
 WHIRLPOOL 
d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 
a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 WHIRLPOOL 
48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
 DIST sddm-0.16.0.tar.gz 3523735 BLAKE2B 
d460cc6d6b9273310cc339f62f2463defea8933441b0332b58da9af394593a6fcb57f2789d2090710d6cb423843380d6693d8e9ead4bdfbab0556a09cbe36fa9
 SHA512 
1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B 
b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492
 SHA512 
81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101

diff --git a/x11-misc/sddm/sddm-0.14.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.14.0-r2.ebuild
deleted file mode 100644
index f3ac6dba4c9..000
--- a/x11-misc/sddm/sddm-0.14.0-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-KEYWORDS="amd64 ~arm x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit +pam systemd"
-
-RDEPEND=">=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb(-)]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
-   # fix for flags handling and bug 563108
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-   "${FILESDIR}/${P}-avatars.patch"
-)
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-   if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 
&& $(gcc-minor-version) -lt 7 ]] ; then
-   die 'The active compiler needs to be gcc 4.7 (or newer)'
-   fi
-   fi
-}
-
-src_prepare() {
-   use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-
-   if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login 
]]; then
-   local line=$(grep "pam_ck_connector.*nox11" 
"${ROOT}"/etc/pam.d/system-login)
-   if [[ -z ${line} ]]; then
-   ewarn
-   ewarn "Erroneous /etc/pam.d/system-login settings 
detected!"
-   ewarn "Please restore 'nox11' option in the line 
containing pam_ck_connector:"
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-11-12 Thread Andreas Sturmlechner

commit: 1102f3773398797d55a888129351e46c2ce2cb46
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 12 13:24:38 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 12 15:12:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1102f377

x11-misc/sddm: Use l10n.eclass to filter translations

Bug: https://bugs.gentoo.org/582016
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/sddm/sddm-0.16.0-r3.ebuild | 73 +
 1 file changed, 73 insertions(+)

diff --git a/x11-misc/sddm/sddm-0.16.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
new file mode 100644
index 000..17284874ff8
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl 
pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN 
zh_TW"
+inherit cmake-utils l10n systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   >=dev-qt/qttest-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
+   "${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   disable_locale() {
+   sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
+   }
+   l10n_find_plocales_changes "data/translations" "" ".ts"
+   l10n_for_each_disabled_locale_do disable_locale
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-11-12 Thread Andreas Sturmlechner

commit: ce70cec84584aa56cdfbfd69534bfd10d51e71cf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 12 13:56:49 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 12 15:12:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce70cec8

x11-misc/sddm: Make qttest:5 optional

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/sddm/sddm-0.16.0-r3.ebuild | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.16.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
index 17284874ff8..aa78c82fcbd 100644
--- a/x11-misc/sddm/sddm-0.16.0-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.16.0-r3.ebuild
@@ -13,15 +13,15 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit elogind +pam systemd"
+IUSE="consolekit elogind +pam systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
 RDEPEND="
>=dev-qt/qtcore-5.6:5
>=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
>=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtgui-5.6:5
>=dev-qt/qtnetwork-5.6:5
>=x11-base/xorg-server-1.15.1
x11-libs/libxcb[xkb]
@@ -34,9 +34,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
dev-python/docutils
>=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
+   virtual/pkgconfig
+   test? ( >=dev-qt/qttest-5.6:5 )"
 
 PATCHES=(
"${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
@@ -52,6 +52,8 @@ src_prepare() {
}
l10n_find_plocales_changes "data/translations" "" ".ts"
l10n_for_each_disabled_locale_do disable_locale
+
+   use test || cmake_comment_add_subdirectory test
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-11-12 Thread Andreas Sturmlechner

commit: 647a095ca5a6b54babd64b31e9cdf4e4931f503f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 12 13:25:19 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 12 15:12:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647a095c

x11-misc/sddm: Drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 x11-misc/sddm/sddm-0.16.0-r1.ebuild | 66 -
 x11-misc/sddm/sddm-0.16.0.ebuild| 64 ---
 2 files changed, 130 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.16.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
deleted file mode 100644
index 3aaacde32ab..000
--- a/x11-misc/sddm/sddm-0.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
-   "${FILESDIR}/${P}-ck2-revert.patch" #bug 633920
-)
-
-src_prepare() {
-   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

diff --git a/x11-misc/sddm/sddm-0.16.0.ebuild b/x11-misc/sddm/sddm-0.16.0.ebuild
deleted file mode 100644
index acd5a8fc755..000
--- a/x11-misc/sddm/sddm-0.16.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
-   >=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
-
-# fix for flags handling and bug 563108
-PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
-
-src_prepare() {
-   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   systemd_reenable sddm.service
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-10-23 Thread Michael Palimaka

commit: 78d95c1c41bd6b6411aafb649cb976584a661f91
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 23 11:34:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 23 11:35:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d95c1c

x11-misc/sddm: stabilise 0.15.0 for x86

Bug: https://bugs.gentoo.org/633848
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/sddm/sddm-0.15.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index cc14c6f7411..9dde4b79612 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2017-10-21 Thread Andreas Sturmlechner

commit: 43b42afbcdf73e9dc819938fb6ed4c8d289beecb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 12:44:59 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 19:45:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b42afb

x11-misc/sddm: Fix Xsession launch for consolekit

Based on patch by Joakim Tjernlund  infinera.com>

Gentoo-bug: 611210
Package-Manager: Portage-2.3.12, Repoman-2.3.3

 x11-misc/sddm/files/sddm-0.16.0-Xsession.patch | 24 ++
 x11-misc/sddm/sddm-0.16.0-r2.ebuild| 62 ++
 2 files changed, 86 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch 
b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
new file mode 100644
index 000..f341e1863f7
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-Xsession.patch
@@ -0,0 +1,24 @@
+--- a/data/scripts/Xsession2016-08-28 14:52:04.910181422 +0200
 b/data/scripts/Xsession2017-10-21 15:25:47.668886596 +0200
+@@ -50,6 +50,10 @@
+ ;;
+ esac
+ 
++# Make D-Bus and ConsoleKit start properly, see:
++# /etc/X11/xinit/xinitrc.d/{80-dbus,90-consolekit}
++command="$@"
++
+ [ -f /etc/xprofile ] && . /etc/xprofile
+ [ -f $HOME/.xprofile ] && . $HOME/.xprofile
+ 
+@@ -94,8 +98,8 @@
+   . "$USERXSESSION"
+ fi
+ 
+-if [ -z "$@" ]; then
++if [ -z "$command" ]; then
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION 
is no valid session."
+ else
+-exec $@
++exec $command
+ fi

diff --git a/x11-misc/sddm/sddm-0.16.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
new file mode 100644
index 000..26770167920
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   >=dev-qt/qttest-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${P}-Xsession.patch" # bug 611210
+   "${FILESDIR}/${P}-ck2-revert.patch" # bug 633920
+)
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2017-10-21 Thread Andreas Sturmlechner

commit: efe17b52278ad2d1c223b002b567f746f85265a8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 16:29:24 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 19:45:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe17b52

x11-misc/sddm: Drop old

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../sddm/files/sddm-0.14.0-nsswitch_conf.patch | 27 ---
 x11-misc/sddm/files/sddm-enable-elogind.patch  | 56 -
 x11-misc/sddm/sddm-0.14.0-r4.ebuild| 92 --
 3 files changed, 175 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch 
b/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
deleted file mode 100644
index 371df93e2b8..000
--- a/x11-misc/sddm/files/sddm-0.14.0-nsswitch_conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 1f39c7a91ea4bc9527628adb01cb49173f1e68be Mon Sep 17 00:00:00 2001
-From: Palo Kisa 
-Date: Fri, 9 Jun 2017 10:13:01 +0200
-Subject: [PATCH] UserModel: Check for duplicates from getpwent()
-

- src/greeter/UserModel.cpp | 7 +++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 94c492d0..33114d08 100644
 a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -72,6 +72,13 @@ namespace SDDM {
- if 
(mainConfig.Users.HideShells.get().contains(QString::fromLocal8Bit(current_pw->pw_shell)))
- continue;
- 
-+// skip duplicates
-+// Note: getpwent() makes no attempt to suppress duplicate 
information
-+// if multiple sources are specified in nsswitch.conf(5).
-+if (d->users.cend()
-+!= std::find_if(d->users.cbegin(), d->users.cend(), 
[current_pw](const UserPtr & u) { return u->uid == current_pw->pw_uid; }))
-+continue;
-+
- // create user
- UserPtr user { new User() };
- user->name = QString::fromLocal8Bit(current_pw->pw_name);

diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch 
b/x11-misc/sddm/files/sddm-enable-elogind.patch
deleted file mode 100644
index d1277e9554f..000
--- a/x11-misc/sddm/files/sddm-enable-elogind.patch
+++ /dev/null
@@ -1,56 +0,0 @@
 a/CMakeLists.txt   2016-11-10 09:27:03.866358608 +0100
-+++ b/CMakeLists.txt   2016-11-10 10:28:25.384374766 +0100
-@@ -93,7 +93,7 @@
- endif()
- 
- # systemd
--if(NOT NO_SYSTEMD)
-+if(NOT NO_SYSTEMD AND NOT USE_ELOGIND)
- pkg_check_modules(SYSTEMD "systemd")
- endif()
- 
-@@ -127,12 +127,34 @@
- set(REBOOT_COMMAND "/usr/bin/systemctl reboot")
- else()
- set(SYSTEMD_FOUND 0)
-+endif()
-+add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
-+add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
-+# elogind
-+if(NO_SYSTEMD AND USE_ELOGIND)
-+pkg_check_modules(ELOGIND "libelogind")
-+endif()
-+
-+if(ELOGIND_FOUND)
-+add_definitions(-DHAVE_ELOGIND)
-+set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND)
-+
-+set(MINIMUM_VT 7)
-+set(HALT_COMMAND "/usr/bin/loginctl poweroff")
-+set(REBOOT_COMMAND "/usr/bin/loginctl reboot")
-+else()
-+set(ELOGIND_FOUND 0)
-+endif()
-+add_feature_info("elogind" ELOGIND_FOUND "elogind support")
-+
-+# Default behaviour if neither systemd nor elogind is used
-+if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND)
- set(MINIMUM_VT 7)
- set(HALT_COMMAND "/sbin/shutdown -h -P now")
- set(REBOOT_COMMAND "/sbin/shutdown -r now")
- endif()
--add_feature_info("systemd" SYSTEMD_FOUND "systemd support")
--add_feature_info("journald" JOURNALD_FOUND "journald support")
-+
- 
- # Set constants
- set(DATA_INSTALL_DIR"${CMAKE_INSTALL_FULL_DATADIR}/sddm"  
  CACHE PATH  "System application data install directory")
 a/services/sddm-greeter.pam2016-06-19 12:24:42.0 +0200
-+++ b/services/sddm-greeter.pam2016-11-02 09:48:18.990032363 +0100
-@@ -14,4 +14,5 @@
- 
- # Setup session
- session   required pam_unix.so
- session   optional pam_systemd.so
-+session   optional pam_elogind.so

diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild 
b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
deleted file mode 100644
index f67abdc0bdc..000
--- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND=">=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-10-19 Thread Manuel Rüger

commit: 3752bc0f8b8022e3ce2d4b1ac418859f4ccdb265
Author: Manuel Rüger  gentoo  org>
AuthorDate: Thu Oct 19 12:57:03 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Thu Oct 19 12:57:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3752bc0f

x11-misc/sddm: Stable on amd64

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 x11-misc/sddm/sddm-0.15.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index acd5a8fc755..cc14c6f7411 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -8,7 +8,7 @@ inherit cmake-utils systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2017-10-13 Thread Michael Palimaka

commit: 58f84fe4964a0bdd7e335c7819cdb9c03c52697c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 14 04:24:32 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 14 04:26:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58f84fe4

x11-misc/sddm: fix runtime failure when consolekit is used

Bug: https://bugs.gentoo.org/633920
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch | 20 +++
 x11-misc/sddm/sddm-0.16.0-r1.ebuild  | 66 
 2 files changed, 86 insertions(+)

diff --git a/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch 
b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
new file mode 100644
index 000..bbe2a272840
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.16.0-ck2-revert.patch
@@ -0,0 +1,20 @@
+SDDM 0.16.0 fails to start with consolekit2 because it assumes consolekit2
+has the same interface names as logind.
+
+This patch forces sddm to use legacy behaviour when consolekit2 is detected.
+
+Bug: https://bugs.gentoo.org/633920
+Bug: https://github.com/sddm/sddm/issues/903
+Bug: https://github.com/ConsoleKit2/ConsoleKit2/issues/99
+
+--- a/src/daemon/LogindDBusTypes.cpp
 b/src/daemon/LogindDBusTypes.cpp
+@@ -60,7 +60,7 @@
+ 
+ if 
(QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit")))
 {
+ qDebug() << "Console kit interface found";
+-available = true;
++available = false;
+ serviceName = QStringLiteral("org.freedesktop.ConsoleKit");
+ managerPath = QStringLiteral("/org/freedesktop/ConsoleKit/Manager");
+ managerIfaceName = 
QStringLiteral("/org.freedesktop.ConsoleKit.Manager"); //note this doesn't 
match logind

diff --git a/x11-misc/sddm/sddm-0.16.0-r1.ebuild 
b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
new file mode 100644
index 000..3aaacde32ab
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   >=dev-qt/qttest-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags 
handling and bug 563108
+   "${FILESDIR}/${P}-ck2-revert.patch" #bug 633920
+)
+
+src_prepare() {
+   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-10-09 Thread Manuel Rüger

commit: 51c15e20846b4a279f273143ccf94f7e3bbb2351
Author: Manuel Rüger  gentoo  org>
AuthorDate: Mon Oct  9 14:07:26 2017 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct  9 14:07:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c15e20

x11-misc/sddm: Version bump to 0.16.0

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 x11-misc/sddm/Manifest   |  1 +
 x11-misc/sddm/sddm-0.16.0.ebuild | 64 
 2 files changed, 65 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 195294a8bd0..44242a37552 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1,2 +1,3 @@
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 
7e348258618b20f67a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 
ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366
 WHIRLPOOL 
d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
 DIST sddm-0.15.0.tar.gz 3520188 SHA256 
a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 WHIRLPOOL 
48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4
+DIST sddm-0.16.0.tar.gz 3523735 SHA256 
f7f73c6dd6d544ec2c5e4657e181f60467ec31d84bf1b775c544dfe8748badbe SHA512 
1efac1ae374ae6e6cba5ea3189f720f706aed8cc5ef2289dd55498b828584c2fa50c1b3374009b1ff5d400a9f9e3e379cfeb0a0411f8078cf618a2df77f0c59c
 WHIRLPOOL 
1a51b2d53fa5427a6785070107152bf9c907a8ebf77dd0532820d9fbcca33d68d7dbc5bcacd863d1881c54d26617bf6986c276ae6d99806e1a2bce6920240733

diff --git a/x11-misc/sddm/sddm-0.16.0.ebuild b/x11-misc/sddm/sddm-0.16.0.ebuild
new file mode 100644
index 000..acd5a8fc755
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.16.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils systemd user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   >=dev-qt/qttest-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig"
+
+# fix for flags handling and bug 563108
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
+
+src_prepare() {
+   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
+}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-09-02 Thread Mike Gilbert

commit: 934192b55ae7ecc82be37fad7b9060e2bd1abd3d
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Aug 28 22:21:45 2017 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sun Sep  3 01:14:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934192b5

x11-misc/sddm: call systemd_reenable in postinst

Bug: https://bugs.gentoo.org/627984
Package-Manager: Portage-2.3.6_p39, Repoman-2.3.3_p17

 x11-misc/sddm/sddm-0.14.0-r2.ebuild | 4 +++-
 x11-misc/sddm/sddm-0.14.0-r4.ebuild | 4 +++-
 x11-misc/sddm/sddm-0.15.0.ebuild| 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/x11-misc/sddm/sddm-0.14.0-r2.ebuild 
b/x11-misc/sddm/sddm-0.14.0-r2.ebuild
index 8946151552d..f3ac6dba4c9 100644
--- a/x11-misc/sddm/sddm-0.14.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.14.0-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils user
+inherit cmake-utils systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -68,6 +68,8 @@ pkg_postinst() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
 
+   systemd_reenable sddm.service
+
if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login 
]]; then
local line=$(grep "pam_ck_connector.*nox11" 
"${ROOT}"/etc/pam.d/system-login)
if [[ -z ${line} ]]; then

diff --git a/x11-misc/sddm/sddm-0.14.0-r4.ebuild 
b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
index a79ea8f1a2f..f67abdc0bdc 100644
--- a/x11-misc/sddm/sddm-0.14.0-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.14.0-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils user
+inherit cmake-utils systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -74,6 +74,8 @@ pkg_postinst() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
 
+   systemd_reenable sddm.service
+
if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login 
]]; then
local line=$(grep "pam_ck_connector.*nox11" 
"${ROOT}"/etc/pam.d/system-login)
if [[ -z ${line} ]]; then

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
index 0099ac086cd..acd5a8fc755 100644
--- a/x11-misc/sddm/sddm-0.15.0.ebuild
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils user
+inherit cmake-utils systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm;
@@ -59,4 +59,6 @@ src_configure() {
 pkg_postinst() {
enewgroup ${PN}
enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+
+   systemd_reenable sddm.service
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/, x11-misc/sddm/files/

2017-09-02 Thread Andreas Sturmlechner

commit: 84a633a3c1487b5c1295c0a2705f3e6d9a26bdf1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 15:05:03 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 15:06:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a633a3

x11-misc/sddm: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/sddm/files/sddm-0.11.0-consolekit.patch | 11 ---
 x11-misc/sddm/sddm-0.14.0-r3.ebuild  | 89 
 2 files changed, 100 deletions(-)

diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch 
b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch
deleted file mode 100644
index 0e2a7f8d7cb..000
--- a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/data/scripts/Xsession2015-01-08 12:58:24.448241484 +0100
-+++ b/data/scripts/Xsession2015-01-08 13:00:07.794244087 +0100
-@@ -93,7 +93,7 @@
- exec xterm -geometry 80x24-0-0
- ;;
-   *)
--eval exec "$session"
-+eval exec ck-launch-session "$session"
- ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute 
$session. Check $DESKTOP_SESSION.desktop."

diff --git a/x11-misc/sddm/sddm-0.14.0-r3.ebuild 
b/x11-misc/sddm/sddm-0.14.0-r3.ebuild
deleted file mode 100644
index 5a2d25ea534..000
--- a/x11-misc/sddm/sddm-0.14.0-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz;
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND=">=dev-qt/qtcore-5.6:5
-   >=dev-qt/qtdbus-5.6:5
-   >=dev-qt/qtgui-5.6:5
-   >=dev-qt/qtdeclarative-5.6:5
-   >=dev-qt/qtnetwork-5.6:5
-   >=x11-base/xorg-server-1.15.1
-   x11-libs/libxcb[xkb(-)]
-   consolekit? ( >=sys-auth/consolekit-0.9.4 )
-   elogind? ( sys-auth/elogind )
-   pam? ( sys-libs/pam )
-   systemd? ( sys-apps/systemd:= )
-   !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-
-DEPEND="${RDEPEND}
-   dev-python/docutils
-   >=dev-qt/linguist-tools-5.6:5
-   >=dev-qt/qttest-5.6:5
-   kde-frameworks/extra-cmake-modules
-   virtual/pkgconfig"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch"
-   # fix for flags handling and bug 563108
-   "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch"
-   "${FILESDIR}/${P}-avatars.patch"
-   "${FILESDIR}/${PN}-enable-elogind.patch"
-)
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary  && $(tc-getCC) == *gcc* ]]; then
-   if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 
&& $(gcc-minor-version) -lt 7 ]] ; then
-   die 'The active compiler needs to be gcc 4.7 (or newer)'
-   fi
-   fi
-}
-
-src_prepare() {
-   use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch"
-
-   cmake-utils_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DENABLE_PAM=$(usex pam)
-   -DNO_SYSTEMD=$(usex '!systemd')
-   -DUSE_ELOGIND=$(usex 'elogind')
-   -DBUILD_MAN_PAGES=ON
-   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
-   )
-
-   cmake-utils_src_configure
-}
-
-pkg_postinst() {
-   enewgroup ${PN}
-   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
-   if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login 
]]; then
-   local line=$(grep "pam_ck_connector.*nox11" 
"${ROOT}"/etc/pam.d/system-login)
-   if [[ -z ${line} ]]; then
-   ewarn
-   ewarn "Erroneous /etc/pam.d/system-login settings 
detected!"
-   ewarn "Please restore 'nox11' option in the line 
containing pam_ck_connector:"
-   ewarn
-   ewarn "session  optional  pam_ck_connector.so 
nox11"
-   ewarn
-   ewarn "or 'emerge -1 sys-auth/pambase' and run 
etc-update."
-   ewarn
-   fi
-   fi
-}

[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/

2017-09-02 Thread Andreas Sturmlechner

commit: 4d554223bfaf775fb3a83b954095d197b103362e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  2 14:59:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  2 15:06:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d554223

x11-misc/sddm: 0.15.0 version bump

Gentoo-bug: 629532
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 x11-misc/sddm/Manifest   |  1 +
 x11-misc/sddm/sddm-0.15.0.ebuild | 62 
 2 files changed, 63 insertions(+)

diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 491da324496..195294a8bd0 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -1 +1,2 @@
 DIST sddm-0.14.0.tar.xz 3298360 SHA256 
7e348258618b20f67a98f9e377b48824b5cb5aad3a3f10f8482c1eb27778 SHA512 
ae6f02e168dbb4ef1d5d360e6b26a2c45a9891fba9d53b73d41a5cc14906f3fcca3bde6d16d7bb109132d23e3e0e768c5976934fd2f59c23d919cc9f81fbd366
 WHIRLPOOL 
d7d80c5d1e8eb5016fa6f5909026bb477293b4356b9caff92d741c936534504e35fdfe81feea8cb2312cdb53ed0e7cc5bda3af5fc4226d5a797baea97e431ecb
+DIST sddm-0.15.0.tar.gz 3520188 SHA256 
a4211e5b66f674415e07bc1cc39c16f60ae6025418bcbaba1118cd51e57c3174 SHA512 
4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 WHIRLPOOL 
48d4ab7ac8d4527719d532e13956e59bdd6b94a094fdf83cb58f1c32d946b111f5ad9f2fefabe9fd6fac8bbccd2d4f8d63ef467d840b975b54d879d5f1b711f4

diff --git a/x11-misc/sddm/sddm-0.15.0.ebuild b/x11-misc/sddm/sddm-0.15.0.ebuild
new file mode 100644
index 000..0099ac086cd
--- /dev/null
+++ b/x11-misc/sddm/sddm-0.15.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils user
+
+DESCRIPTION="Simple Desktop Display Manager"
+HOMEPAGE="https://github.com/sddm/sddm;
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
+SLOT="0"
+IUSE="consolekit elogind +pam systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+   >=dev-qt/qtcore-5.6:5
+   >=dev-qt/qtdbus-5.6:5
+   >=dev-qt/qtgui-5.6:5
+   >=dev-qt/qtdeclarative-5.6:5
+   >=dev-qt/qtnetwork-5.6:5
+   >=x11-base/xorg-server-1.15.1
+   x11-libs/libxcb[xkb]
+   consolekit? ( >=sys-auth/consolekit-0.9.4 )
+   elogind? ( sys-auth/elogind )
+   pam? ( sys-libs/pam )
+   systemd? ( sys-apps/systemd:= )
+   !systemd? ( sys-power/upower )"
+
+DEPEND="${RDEPEND}
+   dev-python/docutils
+   >=dev-qt/linguist-tools-5.6:5
+   >=dev-qt/qttest-5.6:5
+   kde-frameworks/extra-cmake-modules
+   virtual/pkgconfig"
+
+# fix for flags handling and bug 563108
+PATCHES=( "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" )
+
+src_prepare() {
+   use consolekit && eapply "${FILESDIR}/${PN}-0.14.0-consolekit.patch"
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DENABLE_PAM=$(usex pam)
+   -DNO_SYSTEMD=$(usex '!systemd')
+   -DUSE_ELOGIND=$(usex 'elogind')
+   -DBUILD_MAN_PAGES=ON
+   -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
+   )
+   cmake-utils_src_configure
+}
+
+pkg_postinst() {
+   enewgroup ${PN}
+   enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
+}

1 2 >

1 - 100 of 136 matches

Mail list logo