aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Hughes <davidhughes205@gmail.com>2021-04-13 09:18:16 -0400
committerDave Hughes <davidhughes205@gmail.com>2021-04-13 09:18:16 -0400
commit34c04bb47cddf41ebaf7360e2d631a778a3bfa0f (patch)
tree6cd043e22001e067a282f94e839f50dc5231a0c5 /x11-misc
parentsys-auth/elogind: sync with ::gentoo (diff)
downloadmusl-34c04bb47cddf41ebaf7360e2d631a778a3bfa0f.tar.gz
musl-34c04bb47cddf41ebaf7360e2d631a778a3bfa0f.tar.bz2
musl-34c04bb47cddf41ebaf7360e2d631a778a3bfa0f.zip
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@gmail.com>
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/slim/slim-1.3.6-r5.ebuild37
1 files 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
)