Revert ACCEPT_LICENSE support, since license group support is a requirement and it remain unimplemented. This brings trunk back into sync with the 2.1.2 branch.

svn path=/main/trunk/; revision=5081

1 files changed, 5 insertions, 20 deletions

diff --git a/bin/emerge b/bin/emerge
index 495215393..cfa1b1995 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1363,30 +1363,15 @@ class depgraph:
 							print "\n!!! "+red("All ebuilds that could satisfy ")+green(xinfo)+red(" have been masked.")
 							print "!!! One of the following masked packages is required to complete your request:"
 							oldcomment = ""
-							shown_licenses = []
 							for p in alleb:
 								mreasons = portage.getmaskingstatus(p,
 									settings=pkgsettings, portdb=portdb)
 								print "- "+p+" (masked by: "+string.join(mreasons, ", ")+")"
-								if "package.mask" in mreasons:
-									comment = portage.getpmaskcomment(p,
-										settings=pkgsettings, portdb=portdb)
-									if comment and comment != oldcomment:
-										print comment
-										oldcomment = comment
-								licdict = portage.getlicensetexts(p, settings=pkgsettings, portdb=portdb, onlymasked=True)
-								for lic in licdict.keys():
-									if lic+" license" in mreasons and not lic in shown_licenses:
-										if len(licdict[lic][1]) > 2000:
-											print "Please read the text of license %s in %s" % (lic, licdict[lic][0])
-											print
-										else:
-											print "License text for license %s:" % lic
-											print
-											print licdict[lic][1]
-											print
-										shown_licenses.append(lic)
-										
+								comment = portage.getmaskingreason(p,
+									settings=pkgsettings, portdb=portdb)
+								if comment and comment != oldcomment:
+									print comment
+									oldcomment = comment
 							print
 							print "For more information, see MASKED PACKAGES section in the emerge man page or "
 							print "refer to the Gentoo Handbook."