From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 98DDE1381F3 for ; Sat, 24 Aug 2013 16:52:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08105E0B7B; Sat, 24 Aug 2013 16:52:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BB9CE0B7B for ; Sat, 24 Aug 2013 16:52:20 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FA7733ECFB for ; Sat, 24 Aug 2013 16:52:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 24AAFE468F for ; Sat, 24 Aug 2013 16:52:18 +0000 (UTC) From: "Ulrich Mueller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Mueller" Message-ID: <1377363077.2e050fa70b6ffdd25698796ea9166893f623d605.ulm@gentoo> Subject: [gentoo-commits] proj/eselect:master commit in: /, modules/ X-VCS-Repository: proj/eselect X-VCS-Files: ChangeLog modules/rc.eselect X-VCS-Directories: / modules/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Mueller X-VCS-Revision: 2e050fa70b6ffdd25698796ea9166893f623d605 X-VCS-Branch: master Date: Sat, 24 Aug 2013 16:52:18 +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: c352d61b-0103-40a3-b810-b1490aceac82 X-Archives-Hash: 6c403b9a38999708c3bd9169de5c6bfb commit: 2e050fa70b6ffdd25698796ea9166893f623d605 Author: Ulrich Müller gentoo org> AuthorDate: Sat Aug 24 16:51:17 2013 +0000 Commit: Ulrich Mueller gentoo org> CommitDate: Sat Aug 24 16:51:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/eselect.git;a=commit;h=2e050fa7 Drop baselayout-1 compatibility code. * modules/rc.eselect (source_rc_functions): Drop baselayout-1 compatibility code. --- ChangeLog | 5 +++++ modules/rc.eselect | 7 +------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5883ce..0192116 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-24 Ulrich Müller + + * modules/rc.eselect (source_rc_functions): Drop baselayout-1 + compatibility code. + 2013-08-08 Ulrich Müller * configure.ac: Check whether we are building from git; diff --git a/modules/rc.eselect b/modules/rc.eselect index c9f4b8b..dc59ee2 100644 --- a/modules/rc.eselect +++ b/modules/rc.eselect @@ -8,16 +8,11 @@ DESCRIPTION="Manage /etc/init.d scripts in runlevels" MAINTAINER="eselect@gentoo.org" # source_rc_functions PRIVATE -# API for OpenRC or baselayout-1 +# API for OpenRC source_rc_functions() { [[ ${RC_GOT_FUNCTIONS} = yes ]] && return source "${EPREFIX}/etc/init.d/functions.sh" \ || die "Failed to source functions.sh" - # baselayout-1 compatibility - if [[ -e ${svclib}/sh/rc-services.sh ]]; then - source "${svclib}/sh/rc-services.sh" \ - || die "Failed to source rc-services.sh" - fi } # get_runlevel PRIVATE