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 5ADD9139337 for ; Sun, 25 Jul 2021 23:23:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0766E0977; Sun, 25 Jul 2021 23:23:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77C0EE0977 for ; Sun, 25 Jul 2021 23:23:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F5DF340FC2 for ; Sun, 25 Jul 2021 23:23:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 00EB37DE for ; Sun, 25 Jul 2021 23:23:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1627255415.6118c0e2e25e655cdf9ae2608277822ea706ccb3.sam@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-r5.ebuild x11-misc/slim/slim-9999.ebuild X-VCS-Directories: x11-misc/slim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6118c0e2e25e655cdf9ae2608277822ea706ccb3 X-VCS-Branch: master Date: Sun, 25 Jul 2021 23:23:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 15aad8aa-20f3-4d51-a173-f5d107550db4 X-Archives-Hash: a8ef0001d68ccb74d0c92c7fd98e503d commit: 6118c0e2e25e655cdf9ae2608277822ea706ccb3 Author: Sam James gentoo org> AuthorDate: Sun Jul 25 23:11:21 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 25 23:23:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6118c0e2 x11-misc/slim: drop obsolete live ebuild Signed-off-by: Sam James gentoo.org> x11-misc/slim/slim-1.3.6-r5.ebuild | 9 +-- x11-misc/slim/slim-9999.ebuild | 131 ------------------------------------- 2 files changed, 2 insertions(+), 138 deletions(-) diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild index 66c1f3e89e6..880a442d847 100644 --- a/x11-misc/slim/slim-1.3.6-r5.ebuild +++ b/x11-misc/slim/slim-1.3.6-r5.ebuild @@ -6,13 +6,8 @@ EAPI=7 inherit cmake pam systemd DESCRIPTION="Simple Login Manager" -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git" - inherit git-r3 -else - SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" -fi +SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" +KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" LICENSE="GPL-2" SLOT="0" diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild deleted file mode 100644 index cfaf87f96c0..00000000000 --- a/x11-misc/slim/slim-9999.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake pam systemd - -DESCRIPTION="Simple Login Manager" -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/axs-gentoo/slim-git.git" - inherit git-r3 -else - SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz" - KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="branding 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 - pam? ( sys-libs/pam - !x11-misc/slimlock )" -DEPEND="${RDEPEND} - x11-base/xorg-proto" -BDEPEND="virtual/pkgconfig" -PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" - -PATCHES=( - # Our Gentoo-specific config changes - "${FILESDIR}"/${P}-config.diff -) - -src_prepare() { - cmake_src_prepare - - if use elibc_FreeBSD; then - sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ - || die - fi - - if use branding; then - sed -i -e '/current_theme/s/default/slim-gentoo-simple/' slim.conf \ - || die - fi -} - -src_configure() { - local mycmakeargs=( - -DUSE_PAM=$(usex pam) - -DUSE_CONSOLEKIT=OFF - ) - - cmake_src_configure -} - -src_install() { - cmake_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 build_files/slim.service - - insinto /usr/share/slim - newins "${FILESDIR}/Xsession-r3" Xsession - - insinto /etc/logrotate.d - newins "${FILESDIR}/slim.logrotate" slim - - dodoc xinitrc.sample README 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 ver_test "1.3.2-r7" -le "${rv}" ; then - rv=newer - break; - fi - - if ver_test "1.0" -le "${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 - 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 -}