[patch] new options: --root-deps[=rdeps]

root_deps.patch (text/plain), 4.94 KB, created by Zac Medico on 2009-04-01 01:55:51 UTC

Index: pym/_emerge/help.py
===================================================================
--- pym/_emerge/help.py	(revision 13240)
+++ pym/_emerge/help.py	(working copy)
@@ -407,6 +407,18 @@
 		print "              not trigger reinstallation when flags that the user has not"
 		print "              enabled are added or removed."
 		print
+		print "       "+green("--root-deps[=rdeps]")
+		desc = "If no argument is given then build-time dependencies are installed to " + \
+			"ROOT instead of /. If the rdeps argument is given then discard " + \
+			"all build-time dependencies of packages for ROOT. This option is " + \
+			"only meaningful when used together with ROOT and it should not " + \
+			"be enabled under normal circumstances. For currently supported " + \
+			"EAPI values, the build-time dependencies are specified in the " + \
+			"DEPEND variable. However, behavior may change for new " + \
+			"EAPIs when related extensions are added in the future."
+		for line in wrap(desc, desc_width):
+			print desc_indent + line
+		print
 		print "       "+green("--skipfirst")
 		desc = "This option is only valid when " + \
 			"used with --resume.  It removes the " + \
Index: pym/_emerge/__init__.py
===================================================================
--- pym/_emerge/__init__.py	(revision 13240)
+++ pym/_emerge/__init__.py	(working copy)
@@ -5252,8 +5252,18 @@
 		if removal_action and self.myopts.get("--with-bdeps", "y") == "n":
 			edepend["DEPEND"] = ""
 
+		bdeps_root = "/"
+		if self.target_root != "/":
+			root_deps = self.myopts.get("--root-deps")
+			if root_deps is not None:
+				if root_deps is True:
+					bdeps_root = myroot
+				elif root_deps == "rdeps":
+					bdeps_root = "/"
+					edepend["DEPEND"] = ""
+
 		deps = (
-			("/", edepend["DEPEND"],
+			(bdeps_root, edepend["DEPEND"],
 				self._priority(buildtime=(not bdeps_optional),
 				optional=bdeps_optional)),
 			(myroot, edepend["RDEPEND"], self._priority(runtime=True)),
@@ -14333,11 +14343,22 @@
 
 	new_args = []
 	jobs_opts = ("-j", "--jobs")
+	root_deps_opt = '--root-deps'
+	root_deps_choices = ('True', 'rdeps')
 	arg_stack = args[:]
 	arg_stack.reverse()
 	while arg_stack:
 		arg = arg_stack.pop()
 
+		if arg == root_deps_opt:
+			new_args.append(arg)
+			if arg_stack and arg_stack[-1] in root_deps_choices:
+				new_args.append(arg_stack.pop())
+			else:
+				# insert default argument
+				new_args.append('True')
+			continue
+
 		short_job_opt = bool("j" in arg and arg[:1] == "-" and arg[:2] != "--")
 		if not (short_job_opt or arg in jobs_opts):
 			new_args.append(arg)
@@ -14425,7 +14446,17 @@
 			"help":"specify conditions to trigger package reinstallation",
 			"type":"choice",
 			"choices":["changed-use"]
-		}
+		},
+		"--root": {
+		 "help"   : "specify the target root filesystem for merging packages",
+		 "action" : "store"
+		},
+
+		"--root-deps": {
+			"help"    : "modify interpretation of depedencies",
+			"type"    : "choice",
+			"choices" :("True", "rdeps")
+		},
 	}
 
 	from optparse import OptionParser
@@ -14454,6 +14485,9 @@
 
 	myoptions, myargs = parser.parse_args(args=tmpcmdline)
 
+	if myoptions.root_deps == "True":
+		myoptions.root_deps = True
+
 	if myoptions.jobs:
 		jobs = None
 		if myoptions.jobs == "True":
@@ -14818,6 +14852,8 @@
 		os.environ["PORTAGE_DEBUG"] = "1"
 	if "--config-root" in myopts:
 		os.environ["PORTAGE_CONFIGROOT"] = myopts["--config-root"]
+	if "--root" in myopts:
+		os.environ["ROOT"] = myopts["--root"]
 
 	# Portage needs to ensure a sane umask for the files it creates.
 	os.umask(022)
Index: man/emerge.1
===================================================================
--- man/emerge.1	(revision 13240)
+++ man/emerge.1	(working copy)
@@ -417,6 +417,19 @@
 not trigger reinstallation when flags that the user has not
 enabled are added or removed.
 .TP
+.BR \-\-root=DIR
+Set the \fBROOT\fR environment variable.
+.TP
+.BR "\-\-root\-deps[=rdeps]"
+If no argument is given then build\-time dependencies are installed to
+\fBROOT\fR instead of /. If the \fBrdeps\fR argument is given then discard
+all build\-time dependencies of packages for \fBROOT\fR. This option is
+only meaningful when used together with \fBROOT\fR and it should not
+be enabled under normal circumstances. For currently supported
+\fBEAPI\fR values, the build-time dependencies are specified in the
+\fBDEPEND\fR variable. However, behavior may change for new
+\fBEAPI\fRs when related extensions are added in the future.
+.TP
 .BR "\-\-skipfirst"
 This option is only valid when used with \fB\-\-resume\fR.  It removes the 
 first package in the resume list. Dependencies are recalculated for
@@ -471,7 +484,8 @@
 .TP
 \fBROOT\fR = \fI[path]\fR
 Use \fBROOT\fR to specify the target root filesystem to be used for
-merging packages or ebuilds.  This variable can be set in \fBmake.conf\fR(5).
+merging packages or ebuilds. This variable can be set via the \fB\-\-root\fR
+option or in \fBmake.conf\fR(5) (the command line overrides other settings).
 .br
 Defaults to /.
 .TP