From e3ad6b190beb7c086767440d36d8bff2b5e6d1ab Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 9 Oct 2010 02:05:25 -0700
Subject: Add support for emerge --buildpkg=n.

---
 pym/_emerge/help.py |  2 +-
 pym/_emerge/main.py | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'pym/_emerge')

diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index ce494ffd5..4533cfba0 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -325,7 +325,7 @@ def help(myopts, havecolor=1):
 		for line in wrap(desc, desc_width):
 			print(desc_indent + line)
 		print()
-		print("       "+green("--buildpkg")+" ("+green("-b")+" short option)")
+		print("       "+green("--buildpkg") + "[=%s]" % turquoise("n") + " ("+green("-b")+" short option)")
 		desc = "Tells emerge to build binary packages for all ebuilds processed in" + \
 			" addition to actually merging the packages. Useful for maintainers" + \
 			" or if you administrate multiple Gentoo Linux systems (build once," + \
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 765164efd..3181df3e7 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -52,7 +52,7 @@ if sys.hexversion >= 0x3000000:
 options=[
 "--ask",          "--alphabetical",
 "--ask-enter-invalid",
-"--buildpkg",     "--buildpkgonly",
+"--buildpkgonly",
 "--changed-use",
 "--changelog",    "--columns",
 "--debug",
@@ -80,7 +80,7 @@ options=[
 shortmapping={
 "1":"--oneshot",
 "a":"--ask",
-"b":"--buildpkg",  "B":"--buildpkgonly",
+"B":"--buildpkgonly",
 "c":"--depclean",
 "C":"--unmerge",
 "d":"--debug",
@@ -395,6 +395,7 @@ def insert_optional_args(args):
 
 	default_arg_opts = {
 		'--autounmask'           : ('n',),
+		'--buildpkg'             : ('n',),
 		'--complete-graph' : ('n',),
 		'--deep'       : valid_integers,
 		'--deselect'   : ('n',),
@@ -544,6 +545,13 @@ def parse_opts(tmpcmdline, silent=False):
 			"action" : "store"
 		},
 
+		"--buildpkg": {
+			"shortopt" : "-b",
+			"help"     : "build binary packages",
+			"type"     : "choice",
+			"choices"  : ("True", "n")
+		},
+
 		"--config-root": {
 			"help":"specify the location for portage configuration files",
 			"action":"store"
@@ -755,6 +763,11 @@ def parse_opts(tmpcmdline, silent=False):
 	if myoptions.autounmask in ("True",):
 		myoptions.autounmask = True
 
+	if myoptions.buildpkg in ("True",):
+		myoptions.buildpkg = True
+	else:
+		myoptions.buildpkg = None
+
 	if myoptions.changed_use is not False:
 		myoptions.reinstall = "changed-use"
 		myoptions.changed_use = False
-- 
cgit v1.2.3-1-g7c22