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 157D41381F3 for ; Fri, 16 Aug 2013 18:12:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2A67E0EA8; Fri, 16 Aug 2013 18:12:53 +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 11D11E0EA8 for ; Fri, 16 Aug 2013 18:12:52 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E62A533EC1E for ; Fri, 16 Aug 2013 18:12:51 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 812) id 87E502171C; Fri, 16 Aug 2013 18:12:50 +0000 (UTC) From: "William Hubbs (williamh)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, williamh@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: openrc-0.12.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: openrc-0.12.ebuild ChangeLog X-VCS-Directories: sys-apps/openrc X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130816181250.87E502171C@flycatcher.gentoo.org> Date: Fri, 16 Aug 2013 18:12:50 +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: dff420dd-b284-41a4-9046-8dafb1a8f942 X-Archives-Hash: df420fc377433f61acbf82ef70cc2141 williamh 13/08/16 18:12:50 Modified: openrc-0.12.ebuild ChangeLog Log: move the net comment into a here document. (Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538) Revision Changes Path 1.4 sys-apps/openrc/openrc-0.12.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild?r1=1.3&r2=1.4 Index: openrc-0.12.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openrc-0.12.ebuild 16 Aug 2013 16:13:14 -0000 1.3 +++ openrc-0.12.ebuild 16 Aug 2013 18:12:50 -0000 1.4 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild,v 1.3 2013/08/16 16:13:14 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.12.ebuild,v 1.4 2013/08/16 18:12:50 williamh Exp $ EAPI=5 @@ -212,9 +212,16 @@ # ensure existing /etc/conf.d/net is not removed # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier # this needs to stay in openrc ebuilds for a long time. :( + # Added in 0.12. if [[ -f "${EROOT}"etc/conf.d/net ]]; then einfo "Modifying conf.d/net to keep it from being removed" - cat "${FILESDIR}"/net.confd.comment >>"${EROOT}"etc/conf.d/net + cat <<-EOF >>"${EROOT}"etc/conf.d/net + +# The network scripts are now part of net-misc/netifrc +# In order to avoid sys-apps/${P} from removing this file, this comment was +# added; you can safely remove this comment. Please see +# /usr/share/doc/netifrc*/README* for more information. +EOF fi fi } 1.277 sys-apps/openrc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.277&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.277&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.276&r2=1.277 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- ChangeLog 16 Aug 2013 17:39:21 -0000 1.276 +++ ChangeLog 16 Aug 2013 18:12:50 -0000 1.277 @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.276 2013/08/16 17:39:21 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.277 2013/08/16 18:12:50 williamh Exp $ + + 16 Aug 2013; William Hubbs -files/net.confd.comment, + openrc-0.12.ebuild: + move the net comment into a here document. 16 Aug 2013; William Hubbs openrc-9999.ebuild: partially sync live ebuild