From ae70ffefbe473b4f4d0a2a69b2cec814ded13681 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Sun, 18 Aug 2019 00:40:14 +0800 Subject: [USE] in the DEPEND should be extracted. Example: tk? ( dev-lang/R[tk] ), not r[tk]?. --- roverlay/ebuild/evars.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roverlay/ebuild/evars.py b/roverlay/ebuild/evars.py index 6ec6a2e..c2e355d 100644 --- a/roverlay/ebuild/evars.py +++ b/roverlay/ebuild/evars.py @@ -96,9 +96,7 @@ class UseExpandListValue ( RE_USENAME = re.compile ( ( '(?P.*[/])?' - '(?P' - '((?P.*)(?P[-][0-9].*([-]r[0-9]+)?))' - '|.*)' + '(?P[^\[]*)(\[(?P[^\]]*)\])?(?P[-][0-9].*([-]r[0-9]+)?)?' ) ) @@ -128,7 +126,7 @@ class UseExpandListValue ( match = self.__class__.RE_USENAME.match ( dep.dep ) if match: return self._get_use_key ( - ( match.group ( "pn" ) or match.group ( "pf" ) ) + ( match.group ( "use" ) or match.group ( "pn" ) ) ) else: raise ValueError ( -- cgit v1.2.3-65-gdbad