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 D6F1B138334 for ; Wed, 15 May 2019 18:51:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E581EE0827; Wed, 15 May 2019 18:51:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C7A8EE0827 for ; Wed, 15 May 2019 18:51:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BCA7A3445AB for ; Wed, 15 May 2019 18:51:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B2335E9 for ; Wed, 15 May 2019 18:51:42 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1557946275.244cc8e97a0e43856f503046359b8bd8372dc34b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/xinit/files/, x11-apps/xinit/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/xinit/files/startDM.sh x11-apps/xinit/files/startDM.sh.1 x11-apps/xinit/xinit-1.4.0-r1.ebuild X-VCS-Directories: x11-apps/xinit/ x11-apps/xinit/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 244cc8e97a0e43856f503046359b8bd8372dc34b X-VCS-Branch: master Date: Wed, 15 May 2019 18:51:42 +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: 46bdec9b-4151-4b68-a89c-b1470e403c06 X-Archives-Hash: f7432da48f75c69f1e38fa62178174af commit: 244cc8e97a0e43856f503046359b8bd8372dc34b Author: Matt Turner gentoo org> AuthorDate: Wed May 15 18:39:18 2019 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed May 15 18:51:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=244cc8e9 x11-apps/xinit: Don't use deprecated /etc/init.d/functions.sh Closes: https://bugs.gentoo.org/504140 Signed-off-by: Matt Turner gentoo.org> x11-apps/xinit/files/startDM.sh | 9 +++++++-- x11-apps/xinit/files/{startDM.sh => startDM.sh.1} | 0 x11-apps/xinit/xinit-1.4.0-r1.ebuild | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh index e2da6098d6a..a4bf30e31ba 100644 --- a/x11-apps/xinit/files/startDM.sh +++ b/x11-apps/xinit/files/startDM.sh @@ -1,12 +1,17 @@ #!/bin/sh -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 # We need to source /etc/profile for stuff like $LANG to work # bug #10190. . /etc/profile -. /etc/init.d/functions.sh +. /lib/rc/sh/functions.sh + +# Bail out early if on a non-OpenRC system: +if [ ! -d /run/openrc ]; then + eerror "$0 should only be used on OpenRC systems" +fi # baselayout-1 compat if ! type get_options >/dev/null 2>/dev/null ; then diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh.1 similarity index 100% copy from x11-apps/xinit/files/startDM.sh copy to x11-apps/xinit/files/startDM.sh.1 diff --git a/x11-apps/xinit/xinit-1.4.0-r1.ebuild b/x11-apps/xinit/xinit-1.4.0-r1.ebuild index f8dedbb1ce7..be9e7a84a64 100644 --- a/x11-apps/xinit/xinit-1.4.0-r1.ebuild +++ b/x11-apps/xinit/xinit-1.4.0-r1.ebuild @@ -42,7 +42,7 @@ src_install() { xorg-2_src_install exeinto /etc/X11 - doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh + doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh.1 exeinto /etc/X11/Sessions doexe "${FILESDIR}"/Xsession exeinto /etc/X11/xinit