* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: metadata.xml openrc-9999.ebuild ChangeLog
@ 2013-01-03 21:11 William Hubbs (williamh)
0 siblings, 0 replies; 2+ messages in thread
From: William Hubbs (williamh) @ 2013-01-03 21:11 UTC (permalink / raw
To: gentoo-commits
williamh 13/01/03 21:11:37
Modified: metadata.xml openrc-9999.ebuild ChangeLog
Log:
Add support for tools use flag
(Portage version: 2.2.0_alpha149/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.10 sys-apps/openrc/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 10 Jul 2012 18:01:47 -0000 1.9
+++ metadata.xml 3 Jan 2013 21:11:37 -0000 1.10
@@ -4,5 +4,6 @@
<herd>openrc</herd>
<use>
<flag name="newnet">enable the new network stack (experimental)</flag>
+ <flag name="tools">build optional tools</flag>
</use>
</pkgmetadata>
1.117 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.117&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.117&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.116&r2=1.117
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- openrc-9999.ebuild 25 Nov 2012 06:01:12 -0000 1.116
+++ openrc-9999.ebuild 3 Jan 2013 21:11:37 -0000 1.117
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-9999.ebuild,v 1.116 2012/11/25 06:01:12 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.117 2013/01/03 21:11:37 williamh Exp $
EAPI=4
@@ -19,14 +19,15 @@
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode
- kernel_linux kernel_FreeBSD"
+IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs tools
+ unicode kernel_linux kernel_FreeBSD"
RDEPEND="virtual/init
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
elibc_glibc? ( >=sys-libs/glibc-2.5 )
ncurses? ( sys-libs/ncurses )
pam? ( sys-auth/pambase )
+ tools? ( dev-lang/perl )
>=sys-apps/baselayout-2.1-r1
kernel_linux? (
sys-process/psmisc
@@ -73,6 +74,7 @@
fi
use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet"
use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+ use tools && MAKE_ARGS="${MAKE_ARGS} MKTOOLS=yes"
export DEBUG=$(usev debug)
export MKPAM=$(usev pam)
export MKTERMCAP=$(usev ncurses)
1.262 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.262&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.262&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.261&r2=1.262
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- ChangeLog 2 Jan 2013 20:21:14 -0000 1.261
+++ ChangeLog 3 Jan 2013 21:11:37 -0000 1.262
@@ -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.261 2013/01/02 20:21:14 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.262 2013/01/03 21:11:37 williamh Exp $
+
+ 03 Jan 2013; William Hubbs <williamh@gentoo.org> metadata.xml,
+ openrc-9999.ebuild:
+ Add support for tools use flag
02 Jan 2013; William Hubbs <williamh@gentoo.org> -openrc-0.11.6.ebuild:
remove old version
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: metadata.xml openrc-9999.ebuild ChangeLog
@ 2013-08-14 3:56 William Hubbs (williamh)
0 siblings, 0 replies; 2+ messages in thread
From: William Hubbs (williamh) @ 2013-08-14 3:56 UTC (permalink / raw
To: gentoo-commits
williamh 13/08/14 03:56:38
Modified: metadata.xml openrc-9999.ebuild ChangeLog
Log:
adjustments for separating netifrc: add a temporary pdepend with a use flag to bring it in and add warnings about both network use flags missing.
(Portage version: 2.2.0/cvs/Linux i686, signed Manifest commit with key 0x30C46538)
Revision Changes Path
1.11 sys-apps/openrc/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/metadata.xml?r1=1.10&r2=1.11
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml 3 Jan 2013 21:11:37 -0000 1.10
+++ metadata.xml 14 Aug 2013 03:56:38 -0000 1.11
@@ -3,6 +3,7 @@
<pkgmetadata>
<herd>openrc</herd>
<use>
+ <flag name="netifrc">enable Gentoo's network stack (net.* scripts)</flag>
<flag name="newnet">enable the new network stack (experimental)</flag>
<flag name="tools">build optional tools</flag>
</use>
1.126 sys-apps/openrc/openrc-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.126&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?rev=1.126&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild?r1=1.125&r2=1.126
Index: openrc-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- openrc-9999.ebuild 11 Aug 2013 06:56:36 -0000 1.125
+++ openrc-9999.ebuild 14 Aug 2013 03:56:38 -0000 1.126
@@ -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-9999.ebuild,v 1.125 2013/08/11 06:56:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.126 2013/08/14 03:56:38 williamh Exp $
EAPI=5
@@ -19,8 +19,8 @@
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs tools
- unicode kernel_linux kernel_FreeBSD"
+IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs
+ tools unicode kernel_linux kernel_FreeBSD"
COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1
kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
@@ -43,9 +43,10 @@
kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
)"
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
src_prepare() {
sed -i 's:0444:0644:' mk/sys.mk || die
- sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342
if [[ ${PV} == "9999" ]] ; then
local ver="git-${EGIT_VERSION:0:6}"
@@ -119,9 +120,6 @@
cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
rm -rf "${ED}"/etc/runlevels
- # Install the default net configuration
- doconfd conf.d/net
-
# Setup unicode defaults for silly unicode users
set_config_yes_no /etc/rc.conf unicode use unicode
@@ -178,14 +176,6 @@
pkg_preinst() {
local f LIBDIR=$(get_libdir)
- # default net script is just comments, so no point in biting people
- # in the ass by accident. we save in preinst so that the package
- # manager doesnt go throwing etc-update crap at us -- postinst is
- # too late to prevent that. this behavior also lets us keep the
- # file in the CONTENTS for binary packages.
- [[ -e "${EROOT}"etc/conf.d/net ]] && \
- cp "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/
-
# avoid default thrashing in conf.d files when possible #295406
if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
(
@@ -276,14 +266,18 @@
# update the dependency tree after touching all files #224171
[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
- if use newnet; then
- local netscript=network
- else
- local netscript=net.lo
+ if ! use newnet && ! use netifrc; then
+ ewarn "You have emerged OpenRc without network support. This"
+ ewarn "means you need to SET UP a network manager such as"
+ ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+ ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+ ewarn "Or, you have the option of emerging openrc with the newnet"
+ ewarn "use flag and configuring /etc/conf.d/network and"
+ ewarn "/etc/conf.d/staticroute if you only use static interfaces."
fi
- if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then
- ewarn "Please add the $netscript script to your boot runlevel"
+ if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+ ewarn "Please add the network service to your boot runlevel"
ewarn "as soon as possible. Not doing so could leave you with a system"
ewarn "without networking."
fi
1.272 sys-apps/openrc/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.272&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?rev=1.272&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/openrc/ChangeLog?r1=1.271&r2=1.272
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -r1.271 -r1.272
--- ChangeLog 11 Aug 2013 06:56:36 -0000 1.271
+++ ChangeLog 14 Aug 2013 03:56:38 -0000 1.272
@@ -1,6 +1,11 @@
# 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.271 2013/08/11 06:56:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.272 2013/08/14 03:56:38 williamh Exp $
+
+ 14 Aug 2013; William Hubbs <williamh@gentoo.org> metadata.xml,
+ openrc-9999.ebuild:
+ adjustments for separating netifrc: add a temporary pdepend with a use flag to
+ bring it in and add warnings about both network use flags missing.
11 Aug 2013; Samuli Suominen <ssuominen@gentoo.org> openrc-0.11.8.ebuild,
openrc-9999.ebuild:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-14 3:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-14 3:56 [gentoo-commits] gentoo-x86 commit in sys-apps/openrc: metadata.xml openrc-9999.ebuild ChangeLog William Hubbs (williamh)
-- strict thread matches above, loose matches on Subject: below --
2013-01-03 21:11 William Hubbs (williamh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox