diff options
| -rw-r--r-- | x11-misc/slim/slim-1.3.6-r5.ebuild | 36 | ||||
| -rw-r--r-- | x11-misc/slim/slim-9999.ebuild | 10 |
2 files changed, 26 insertions, 20 deletions
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild index 6663621cf77b..3a0c714df65d 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-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -32,20 +32,24 @@ DEPEND="${RDEPEND} x11-proto/xproto" 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}-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 +) + +src_prepare() { + cmake-utils_src_prepare if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ @@ -55,12 +59,10 @@ src_prepare() { if use branding; then sed -i -e 's/ default/ slim-gentoo-simple/' slim.conf || die fi - - epatch_user } src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use pam USE_PAM) $(cmake-utils_use consolekit USE_CONSOLEKIT) ) diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild index 1b8b9a68b1c8..7b08d5e831de 100644 --- a/x11-misc/slim/slim-9999.ebuild +++ b/x11-misc/slim/slim-9999.ebuild @@ -38,9 +38,13 @@ DEPEND="${RDEPEND} x11-proto/xproto" PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" -src_prepare() { +PATCHES=( # Our Gentoo-specific config changes - epatch "${FILESDIR}"/${P}-config.diff + "${FILESDIR}"/${P}-config.diff +) + +src_prepare() { + cmake-utils_src_prepare if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ @@ -54,7 +58,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use pam USE_PAM) $(cmake-utils_use consolekit USE_CONSOLEKIT) ) |