| 1 |
commit: 84a633a3c1487b5c1295c0a2705f3e6d9a26bdf1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 2 15:05:03 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 15:06:33 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84a633a3 |
| 7 |
|
| 8 |
x11-misc/sddm: Drop old |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 11 |
|
| 12 |
x11-misc/sddm/files/sddm-0.11.0-consolekit.patch | 11 --- |
| 13 |
x11-misc/sddm/sddm-0.14.0-r3.ebuild | 89 ------------------------ |
| 14 |
2 files changed, 100 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 0e2a7f8d7cb..00000000000 |
| 19 |
--- a/x11-misc/sddm/files/sddm-0.11.0-consolekit.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,11 +0,0 @@ |
| 22 |
---- a/data/scripts/Xsession 2015-01-08 12:58:24.448241484 +0100 |
| 23 |
-+++ b/data/scripts/Xsession 2015-01-08 13:00:07.794244087 +0100 |
| 24 |
-@@ -93,7 +93,7 @@ |
| 25 |
- exec xterm -geometry 80x24-0-0 |
| 26 |
- ;; |
| 27 |
- *) |
| 28 |
-- eval exec "$session" |
| 29 |
-+ eval exec ck-launch-session "$session" |
| 30 |
- ;; |
| 31 |
- esac |
| 32 |
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." |
| 33 |
|
| 34 |
diff --git a/x11-misc/sddm/sddm-0.14.0-r3.ebuild b/x11-misc/sddm/sddm-0.14.0-r3.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index 5a2d25ea534..00000000000 |
| 37 |
--- a/x11-misc/sddm/sddm-0.14.0-r3.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,89 +0,0 @@ |
| 40 |
-# Copyright 1999-2017 Gentoo Foundation |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
- |
| 43 |
-EAPI=6 |
| 44 |
-inherit cmake-utils user |
| 45 |
- |
| 46 |
-DESCRIPTION="Simple Desktop Display Manager" |
| 47 |
-HOMEPAGE="https://github.com/sddm/sddm" |
| 48 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" |
| 49 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 50 |
- |
| 51 |
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" |
| 52 |
-SLOT="0" |
| 53 |
-IUSE="consolekit elogind +pam systemd" |
| 54 |
- |
| 55 |
-REQUIRED_USE="?? ( elogind systemd )" |
| 56 |
- |
| 57 |
-RDEPEND=">=dev-qt/qtcore-5.6:5 |
| 58 |
- >=dev-qt/qtdbus-5.6:5 |
| 59 |
- >=dev-qt/qtgui-5.6:5 |
| 60 |
- >=dev-qt/qtdeclarative-5.6:5 |
| 61 |
- >=dev-qt/qtnetwork-5.6:5 |
| 62 |
- >=x11-base/xorg-server-1.15.1 |
| 63 |
- x11-libs/libxcb[xkb(-)] |
| 64 |
- consolekit? ( >=sys-auth/consolekit-0.9.4 ) |
| 65 |
- elogind? ( sys-auth/elogind ) |
| 66 |
- pam? ( sys-libs/pam ) |
| 67 |
- systemd? ( sys-apps/systemd:= ) |
| 68 |
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" |
| 69 |
- |
| 70 |
-DEPEND="${RDEPEND} |
| 71 |
- dev-python/docutils |
| 72 |
- >=dev-qt/linguist-tools-5.6:5 |
| 73 |
- >=dev-qt/qttest-5.6:5 |
| 74 |
- kde-frameworks/extra-cmake-modules |
| 75 |
- virtual/pkgconfig" |
| 76 |
- |
| 77 |
-PATCHES=( |
| 78 |
- "${FILESDIR}/${PN}-0.13.0-pam_kwallet.patch" |
| 79 |
- # fix for flags handling and bug 563108 |
| 80 |
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" |
| 81 |
- "${FILESDIR}/${P}-avatars.patch" |
| 82 |
- "${FILESDIR}/${PN}-enable-elogind.patch" |
| 83 |
-) |
| 84 |
- |
| 85 |
-pkg_pretend() { |
| 86 |
- if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then |
| 87 |
- if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 7 ]] ; then |
| 88 |
- die 'The active compiler needs to be gcc 4.7 (or newer)' |
| 89 |
- fi |
| 90 |
- fi |
| 91 |
-} |
| 92 |
- |
| 93 |
-src_prepare() { |
| 94 |
- use consolekit && eapply "${FILESDIR}/${P}-consolekit.patch" |
| 95 |
- |
| 96 |
- cmake-utils_src_prepare |
| 97 |
-} |
| 98 |
- |
| 99 |
-src_configure() { |
| 100 |
- local mycmakeargs=( |
| 101 |
- -DENABLE_PAM=$(usex pam) |
| 102 |
- -DNO_SYSTEMD=$(usex '!systemd') |
| 103 |
- -DUSE_ELOGIND=$(usex 'elogind') |
| 104 |
- -DBUILD_MAN_PAGES=ON |
| 105 |
- -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" |
| 106 |
- ) |
| 107 |
- |
| 108 |
- cmake-utils_src_configure |
| 109 |
-} |
| 110 |
- |
| 111 |
-pkg_postinst() { |
| 112 |
- enewgroup ${PN} |
| 113 |
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video |
| 114 |
- |
| 115 |
- if use consolekit && use pam && [[ -e "${ROOT}"/etc/pam.d/system-login ]]; then |
| 116 |
- local line=$(grep "pam_ck_connector.*nox11" "${ROOT}"/etc/pam.d/system-login) |
| 117 |
- if [[ -z ${line} ]]; then |
| 118 |
- ewarn |
| 119 |
- ewarn "Erroneous /etc/pam.d/system-login settings detected!" |
| 120 |
- ewarn "Please restore 'nox11' option in the line containing pam_ck_connector:" |
| 121 |
- ewarn |
| 122 |
- ewarn "session optional pam_ck_connector.so nox11" |
| 123 |
- ewarn |
| 124 |
- ewarn "or 'emerge -1 sys-auth/pambase' and run etc-update." |
| 125 |
- ewarn |
| 126 |
- fi |
| 127 |
- fi |
| 128 |
-} |
Archives