Attachment #17925 for bug #13616

View | Details | Raw Unified | Return to bug 13616 | Differences between

and this patch

Lines 83-96 Link Here

(-)ebuild.sh (-2 / +4 lines)
83		83
84	use() {	84	use() {
85	local x	85	local x
86	for x in ${USE}; do	86	for x in ${PUSE} ${USE}; do
87	if [ "${x}" == "${1}" ]; then	87	if [ "${x}" == "${1}" ]; then
88	if [ -r /dev/fd/1 ]; then	88	if [ -r /dev/fd/1 ]; then
89	tty --quiet < /dev/stdout \|\| echo "${x}"	89	tty --quiet < /dev/stdout \|\| echo "${x}"
90	else	90	else
91	echo "${x}"	91	echo "${x}"
92	fi	92	fi
93	return 0	93	return 0
		94	elif [ "${x}" == "-${1}" ]; then
		95	return 1
94	fi	96	fi
95	done	97	done
96	return 1	98	return 1





		update_spinner()

		myuse=portage.settings["USE"]
		if len(mybigkey) == 3:
			mytype,myroot,mykey=mybigkey
			myuse=string.split(portage.settings["USE"])
			for x in portage.dep_getpuse(mykey):
				if x[0]=="-":
					myuse.remove(x[1:])
					myuse.append(x)
				else:
					myuse.remove("-"+x)
					myuse.append(x)
			myuse=string.join(myuse)
		else:
			mytype,myroot,mykey,myuse=mybigkey
		


				iuse=""
				if "--verbose" in myopts:
					myiuse=portage.dep_getpuse(x[2])
					for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
						if ebuild_iuse in myiuse:
							iuse=iuse+darkred("+"+ebuild_iuse)+" "
						elif "-"+ebuild_iuse in myiuse:
							iuse=iuse+darkblue("-"+ebuild_iuse)+" "
						elif ebuild_iuse in portage.usesplit:
							iuse=iuse+red("+"+ebuild_iuse)+" "
						elif ebuild_iuse != "":
							iuse=iuse+blue("-"+ebuild_iuse)+" "

				xs=portage.pkgsplit(x[2])
				if xs[2]=="r0":

	else:
		myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
				'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
				'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
				'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
	myvars.sort()
	for x in myvars:
		print x+'="'+portage.settings[x]+'"'

Return to bug 13616

Lines 587-595 Link Here

(-)/tmp/emerge (-9 / +20 lines)
587		587
588	update_spinner()	588	update_spinner()
589		589
590	myuse=portage.settings["USE"]
591	if len(mybigkey) == 3:	590	if len(mybigkey) == 3:
592	mytype,myroot,mykey=mybigkey	591	mytype,myroot,mykey=mybigkey
		592	myuse=string.split(portage.settings["USE"])
		593	for x in portage.dep_getpuse(mykey):
		594	if x[0]=="-":
		595	myuse.remove(x[1:])
		596	myuse.append(x)
		597	else:
		598	myuse.remove("-"+x)
		599	myuse.append(x)
		600	myuse=string.join(myuse)
593	else:	601	else:
594	mytype,myroot,mykey,myuse=mybigkey	602	mytype,myroot,mykey,myuse=mybigkey
595		603
Lines 1074-1086 Link Here
1074		1082
1075	iuse=""	1083	iuse=""
1076	if "--verbose" in myopts:	1084	if "--verbose" in myopts:
		1085	myiuse=portage.dep_getpuse(x[2])
1077	for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):	1086	for ebuild_iuse in string.split(portage.portdb.aux_get(x[2],["IUSE"])[0], " "):
1078	try:	1087	if ebuild_iuse in myiuse:
1079	if (portage.usesplit.index(ebuild_iuse) >= 0) :	1088	iuse=iuse+darkred("+"+ebuild_iuse)+" "
1080	iuse=iuse+red("+"+ebuild_iuse)+" "	1089	elif "-"+ebuild_iuse in myiuse:
1081	except ValueError:	1090	iuse=iuse+darkblue("-"+ebuild_iuse)+" "
1082	if ebuild_iuse != "":	1091	elif ebuild_iuse in portage.usesplit:
1083	iuse=iuse+blue("-"+ebuild_iuse)+" "	1092	iuse=iuse+red("+"+ebuild_iuse)+" "
		1093	elif ebuild_iuse != "":
		1094	iuse=iuse+blue("-"+ebuild_iuse)+" "
1084		1095
1085	xs=portage.pkgsplit(x[2])	1096	xs=portage.pkgsplit(x[2])
1086	if xs[2]=="r0":	1097	if xs[2]=="r0":
Lines 1842-1849 Link Here
1842	else:	1853	else:
1843	myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',	1854	myvars=['GENTOO_MIRRORS', 'CONFIG_PROTECT', 'CONFIG_PROTECT_MASK',
1844	'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',	1855	'PORTDIR', 'DISTDIR', 'PKGDIR', 'PORTAGE_TMPDIR', 'PORTDIR_OVERLAY',
1845	'USE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS','ACCEPT_KEYWORDS',	1856	'USE', 'PKGUSE', 'COMPILER', 'CHOST', 'CFLAGS', 'CXXFLAGS',
1846	'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']	1857	'ACCEPT_KEYWORDS', 'MAKEOPTS', 'AUTOCLEAN', 'SYNC', 'FEATURES']
1847	myvars.sort()	1858	myvars.sort()
1848	for x in myvars:	1859	for x in myvars:
1849	print x+'="'+portage.settings[x]+'"'	1860	print x+'="'+portage.settings[x]+'"'