From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18E16139696 for ; Tue, 7 Mar 2017 09:14:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7AE521C043; Tue, 7 Mar 2017 09:14:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90FD421C043 for ; Tue, 7 Mar 2017 09:14:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 189B434163E for ; Tue, 7 Mar 2017 09:14:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E3735F5B for ; Tue, 7 Mar 2017 09:14:30 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1488877915.b5af1634f41935959a83e8ab6be899a7abd7eb1c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/slim/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/slim/slim-1.3.6-r3.ebuild X-VCS-Directories: x11-misc/slim/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: b5af1634f41935959a83e8ab6be899a7abd7eb1c X-VCS-Branch: master Date: Tue, 7 Mar 2017 09:14:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: affb071c-85d4-456e-9861-3c080765006f X-Archives-Hash: d1e90a0a25d5c3abc352a30eceb17af1 commit: b5af1634f41935959a83e8ab6be899a7abd7eb1c Author: Harri Nieminen gmail com> AuthorDate: Mon Mar 6 14:52:55 2017 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Mar 7 09:11:55 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5af1634 x11-misc/slim: Remove old Package-Manager: Portage-2.3.4, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4142 x11-misc/slim/slim-1.3.6-r3.ebuild | 137 ------------------------------------- 1 file changed, 137 deletions(-) diff --git a/x11-misc/slim/slim-1.3.6-r3.ebuild b/x11-misc/slim/slim-1.3.6-r3.ebuild deleted file mode 100644 index 8da12a6b392..00000000000 --- a/x11-misc/slim/slim-1.3.6-r3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils pam eutils systemd versionator - -DESCRIPTION="Simple Login Manager" -HOMEPAGE="https://sourceforge.net/projects/slim.berlios/" -SRC_URI="mirror://sourceforge/project/${PN}.berlios/${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 - x11-libs/libXrandr - 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.patch - epatch "${FILESDIR}"/${P}-drop-zlib.patch - epatch "${FILESDIR}"/${P}-freetype.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() { - # massage ${REPLACING_VERSIONS} to come up with whether or not it's a new install - # or if it's older than 1.3.2-r7 - # Note - there should only ever be zero or one version as this package isn't slotted, - # so the logic doesn't worry about what happens if there's two, due to the case where - # 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 - rv=newer - break; - fi - if version_is_at_least "1.0" "${rv}" ; then - rv=older - break; - fi - done - - if [[ ${rv} == none ]]; 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 [[ ${rv} != newer ]]; 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 -}