diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-28 10:27:13 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-28 10:27:13 +0100 |
| commit | f4fc10428424904caf2035cffc442195cb088b2c (patch) | |
| tree | 72f320d5963e55586cfdeed2b14c72b8191b6327 /x11-misc/slim/slim-1.3.6-r5.ebuild | |
| parent | fbd9734cedfe790955100b8e4ab3613457d77b1a (diff) | |
gentoo resync : 28.07.2021
Diffstat (limited to 'x11-misc/slim/slim-1.3.6-r5.ebuild')
| -rw-r--r-- | x11-misc/slim/slim-1.3.6-r5.ebuild | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild index ef30117b352d..ee566409d2d3 100644 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ b/x11-misc/slim/slim-1.3.6-r5.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit cmake-utils pam systemd versionator +inherit cmake pam systemd DESCRIPTION="Simple Login Manager" HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" +KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" IUSE="branding pam" RDEPEND="x11-libs/libXmu @@ -25,8 +25,8 @@ RDEPEND="x11-libs/libXmu pam? ( sys-libs/pam !x11-misc/slimlock )" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" PATCHES=( @@ -43,10 +43,11 @@ PATCHES=( "${FILESDIR}"/${P}-drop-zlib.patch "${FILESDIR}"/${P}-freetype.patch "${FILESDIR}"/${P}-envcpy-bad-pointer-arithmetic.patch + "${FILESDIR}"/${PN}-1.3.6-gcc11.patch ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ @@ -60,15 +61,15 @@ src_prepare() { src_configure() { local mycmakeargs=( - $(cmake-utils_use pam USE_PAM) + -DUSE_PAM=$(usex pam) -DUSE_CONSOLEKIT=OFF ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install + cmake_src_install if use pam ; then pamd_mimic system-local-login slim auth account session @@ -94,11 +95,12 @@ pkg_postinst() { # a previous emerge attempt failed in the middle of qmerge. local rv=none for rv in ${REPLACING_VERSIONS} ; do - if version_is_at_least "1.3.2-r7" "${rv}" ; then + if ver_test "1.3.2-r7" -le "${rv}" ; then rv=newer break; fi - if version_is_at_least "1.0" "${rv}" ; then + + if ver_test "1.0" -le "${rv}" ; then rv=older break; fi @@ -126,6 +128,7 @@ pkg_postinst() { elog "accordingly." elog fi + if ! use pam; then elog "You have merged ${PN} without USE=\"pam\", this will cause ${PN} to fall back to" elog "the console when restarting your window manager. If this is not desired, then" |