[gentoo-commits] gentoo-x86 commit in x11-misc/slim: slim-1.3.6-r4.ebuild ChangeLog slim-1.3.5-r4.ebuild

[Ian Stakenvicius (axs)]

axs         14/02/03 18:19:17

  Modified:             ChangeLog
  Added:                slim-1.3.6-r4.ebuild
  Removed:              slim-1.3.5-r4.ebuild
  Log:
  install slimlock suid, bug 500204; remove old
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)

Revision  Changes    Path
1.136                x11-misc/slim/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/ChangeLog?r1=1.135&r2=1.136

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ChangeLog	22 Dec 2013 13:23:30 -0000	1.135
+++ ChangeLog	3 Feb 2014 18:19:16 -0000	1.136
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/slim
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.135 2013/12/22 13:23:30 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.136 2014/02/03 18:19:16 axs Exp $
+
+*slim-1.3.6-r4 (03 Feb 2014)
+
+  03 Feb 2014; Ian Stakenvicius (_AxS_) <axs@g.o>
+  +files/slim-1.3.6-fix-slimlock-nopam-v2.patch, +slim-1.3.6-r4.ebuild,
+  -files/slim-1.3.4-config.diff, -files/slim-1.3.5-glibc217-crypt.patch,
+  -files/slim-1.3.5-honour-cflags.patch,
+  -files/slim-1.3.5-systemd-service.patch, -slim-1.3.5-r4.ebuild:
+  install slimlock suid, bug 500204; remove old
 
   22 Dec 2013; Agostino Sarubbo <ago@g.o> slim-1.3.6-r3.ebuild:
   Stable for ppc64, wrt bug #491492



1.1                  x11-misc/slim/slim-1.3.6-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild?rev=1.1&content-type=text/plain

Index: slim-1.3.6-r4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6-r4.ebuild,v 1.1 2014/02/03 18:19:16 axs Exp $

EAPI=5

CMAKE_MIN_VERSION="2.8.8"
inherit cmake-utils pam eutils systemd versionator

DESCRIPTION="Simple Login Manager"
HOMEPAGE="http://slim.berlios.de"
SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="branding pam consolekit"
REQUIRED_USE="consolekit? ( pam )"

RDEPEND="x11-libs/libXmu
	x11-libs/libX11
	x11-libs/libXpm
	x11-libs/libXft
	media-libs/libpng:0=
	virtual/jpeg:=
	x11-apps/sessreg
	consolekit? ( sys-auth/consolekit
		sys-apps/dbus )
	pam? (	virtual/pam
		!x11-misc/slimlock )"
DEPEND="${RDEPEND}
	virtual/pkgconfig
	x11-proto/xproto"
PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )"

src_prepare() {
	# Our Gentoo-specific config changes
	epatch "${FILESDIR}"/${P}-config.diff
	epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch
	epatch "${FILESDIR}"/${P}-honour-cflags.patch
	epatch "${FILESDIR}"/${P}-libslim-cmake-fixes.patch
	epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch
	epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch
	epatch "${FILESDIR}"/${P}-systemd-session.patch
	epatch "${FILESDIR}"/${P}-session-chooser.patch
	epatch "${FILESDIR}"/${P}-fix-slimlock-nopam-v2.patch

	if use elibc_FreeBSD; then
		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
			|| die
	fi

	if use branding; then
		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
	fi
}

src_configure() {
	mycmakeargs=(
		$(cmake-utils_use pam USE_PAM)
		$(cmake-utils_use consolekit USE_CONSOLEKIT)
	)

	cmake-utils_src_configure
}

src_install() {
	cmake-utils_src_install

	if use pam ; then
		pamd_mimic system-local-login slim auth account session
		pamd_mimic system-local-login slimlock auth
	fi

	systemd_dounit slim.service

	insinto /usr/share/slim
	newins "${FILESDIR}/Xsession-r3" Xsession

	insinto /etc/logrotate.d
	newins "${FILESDIR}/slim.logrotate" slim

	dodoc xinitrc.sample ChangeLog README TODO THEMES
}

pkg_postinst() {
	# note, $REPLACING_VERSIONS will always contain 0 or 1 PV's for slim
	if [[ -z ${REPLACING_VERSIONS} ]]; then
		elog
		elog "The configuration file is located at /etc/slim.conf."
		elog
		elog "If you wish ${PN} to start automatically, set DISPLAYMANAGER=\"${PN}\" "
		elog "in /etc/conf.d/xdm and run \"rc-update add xdm default\"."
	fi
	if ! version_is_at_least "1.3.2-r7" "${REPLACING_VERSIONS:-1.0}" ; then
		elog
		elog "By default, ${PN} is set up to do proper X session selection, including ~/.xsession"
		elog "support, as well as selection between sessions available in"
		elog "/etc/X11/Sessions/ at login by pressing [F1]."
		elog
		elog "The XSESSION environment variable is still supported as a default"
		elog "if no session has been specified by the user."
		elog
		elog "If you want to use .xinitrc in the user's home directory for session"
		elog "management instead, see README and xinitrc.sample in"
		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"
		elog "the console when restarting your window manager. If this is not desired, then"
		elog "please remerge ${PN} with USE=\"pam\""
		elog
	fi
}