* [gentoo-commits] proj/musl:master commit in: x11-misc/slim/
@ 2018-06-17 9:43 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2018-06-17 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 13ce605f7bfeea2c08fc5f55caacf9534b410de4
Author: stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sun Jun 17 08:48:28 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Jun 17 09:37:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=13ce605f
x11-misc/slim: fix xproto dep
x11-misc/slim/slim-1.3.6-r5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 0b2d323..bdce7fc 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -30,7 +30,7 @@ RDEPEND="x11-libs/libXmu
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
virtual/pkgconfig
- x11-proto/xproto"
+ x11-base/xorg-proto"
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-misc/slim/
@ 2020-11-03 23:38 Jory Pratt
0 siblings, 0 replies; 4+ messages in thread
From: Jory Pratt @ 2020-11-03 23:38 UTC (permalink / raw
To: gentoo-commits
commit: d8b7cb6133b613d96b696ce4562606e282d85283
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 23:38:08 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 23:38:08 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d8b7cb61
x11-misc/slim: remove consolekit support
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
x11-misc/slim/metadata.xml | 3 ---
x11-misc/slim/slim-1.3.6-r5.ebuild | 13 +++----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 8f38f15..0d0cf35 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -8,9 +8,6 @@
<email>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
- <use>
- <flag name="consolekit">Enable native consolekit support</flag>
- </use>
<upstream>
<remote-id type="sourceforge">slim.berlios</remote-id>
</upstream>
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 0741af8..c009139 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,8 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-IUSE="branding pam consolekit"
-REQUIRED_USE="consolekit? ( pam )"
+IUSE="branding pam"
RDEPEND="x11-libs/libXmu
x11-libs/libX11
@@ -24,8 +23,6 @@ RDEPEND="x11-libs/libXmu
media-libs/libpng:0=
virtual/jpeg:=
x11-apps/sessreg
- consolekit? ( sys-auth/consolekit
- sys-apps/dbus )
pam? ( sys-libs/pam
!x11-misc/slimlock )"
DEPEND="${RDEPEND}
@@ -64,7 +61,7 @@ src_prepare() {
src_configure() {
mycmakeargs=(
$(cmake-utils_use pam USE_PAM)
- $(cmake-utils_use consolekit USE_CONSOLEKIT)
+ -DUSE_CONSOLEKIT=OFF
)
cmake-utils_src_configure
@@ -128,10 +125,6 @@ pkg_postinst() {
elog "/usr/share/doc/${PF} and change your login_cmd in /etc/slim.conf"
elog "accordingly."
elog
- ewarn "Please note that slim supports consolekit directly. Please do not use any "
- ewarn "old work-arounds (including calls to 'ck-launch-session' in xinitrc scripts)"
- ewarn "and enable USE=\"consolekit\" instead."
- ewarn
fi
if ! use pam; then
elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-misc/slim/
@ 2021-04-13 13:24 Dave Hughes
0 siblings, 0 replies; 4+ messages in thread
From: Dave Hughes @ 2021-04-13 13:24 UTC (permalink / raw
To: gentoo-commits
commit: 34c04bb47cddf41ebaf7360e2d631a778a3bfa0f
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 13 13:18:16 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Tue Apr 13 13:18:16 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=34c04bb4
x11-misc/slim: sync with ::gentoo
Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
x11-misc/slim/slim-1.3.6-r5.ebuild | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index c009139..dfabeda 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-CMAKE_MIN_VERSION="2.8.8"
inherit cmake-utils pam eutils systemd versionator
DESCRIPTION="Simple Login Manager"
@@ -30,21 +29,25 @@ DEPEND="${RDEPEND}
x11-base/xorg-proto"
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"
-src_prepare() {
+PATCHES=(
# Our Gentoo-specific config changes
- epatch "${FILESDIR}"/${P}-config.diff \
- "${FILESDIR}"/${PN}-1.3.5-arm.patch \
- "${FILESDIR}"/${P}-honour-cflags.patch \
- "${FILESDIR}"/${P}-libslim-cmake-fixes.patch \
- "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch \
- "${FILESDIR}"/${P}-strip-systemd-unit-install.patch \
- "${FILESDIR}"/${P}-systemd-session.patch \
- "${FILESDIR}"/${P}-session-chooser.patch \
- "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch \
- "${FILESDIR}"/${P}-drop-zlib.patch \
- "${FILESDIR}"/${P}-freetype.patch \
- "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch \
- "${FILESDIR}"/${P}-add-missing-libgen_h.patch
+ "${FILESDIR}"/${P}-config.diff
+ "${FILESDIR}"/${PN}-1.3.5-arm.patch
+ "${FILESDIR}"/${P}-honour-cflags.patch
+ "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
+ "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
+ "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
+ "${FILESDIR}"/${P}-systemd-session.patch
+ "${FILESDIR}"/${P}-session-chooser.patch
+ "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch
+ "${FILESDIR}"/${P}-drop-zlib.patch
+ "${FILESDIR}"/${P}-freetype.patch
+ "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch
+ "${FILESDIR}"/${P}-add-missing-libgen_h.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
if use elibc_FreeBSD; then
sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -59,7 +62,7 @@ src_prepare() {
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
$(cmake-utils_use pam USE_PAM)
-DUSE_CONSOLEKIT=OFF
)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/musl:master commit in: x11-misc/slim/
@ 2021-04-29 18:58 Dave Hughes
0 siblings, 0 replies; 4+ messages in thread
From: Dave Hughes @ 2021-04-29 18:58 UTC (permalink / raw
To: gentoo-commits
commit: dadd0c065de1a8b5a3324ea801b0bdfce1832122
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Thu Apr 29 18:58:42 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Thu Apr 29 18:58:42 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=dadd0c06
x11-misc/slim: adjust KEYWORDS
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
x11-misc/slim/slim-1.3.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index dfabeda..c8299c8 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc x86"
IUSE="branding pam"
RDEPEND="x11-libs/libXmu
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-29 18:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-03 23:38 [gentoo-commits] proj/musl:master commit in: x11-misc/slim/ Jory Pratt
-- strict thread matches above, loose matches on Subject: below --
2021-04-29 18:58 Dave Hughes
2021-04-13 13:24 Dave Hughes
2018-06-17 9:43 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox