[portage] QA fixes

Author: Tatsh

stubs/portage/METADATA.toml

@@ -1,5 +1,5 @@
 version = "3.0.*"
-upstream_repository = "https://gitweb.gentoo.org/proj/portage.git"
+upstream_repository = "https://github.com/gentoo/portage"
 partial_stub = true
 
 [tool.stubtest]

stubs/portage/portage/__init__.pyi

@@ -1,17 +1,19 @@
+from _typeshed import Incomplete
 from collections.abc import Mapping
-from typing import Any, TypedDict, type_check_only
+from typing import TypedDict, type_check_only
 
 from .dbapi.porttree import portagetree
 from .package.ebuild.config import config
 
 @type_check_only
 class _DBRootDict(TypedDict):
-    bintree: Any
+    bintree: Incomplete
     porttree: portagetree
-    virtuals: Any
+    vartree: Incomplete
+    virtuals: dict[str, Incomplete]
 
 db: Mapping[str, _DBRootDict]
 root: str
 settings: config
 
-def __getattr__(name: str): ...  # incomplete module
+def __getattr__(name: str) -> Incomplete: ...  # incomplete module

stubs/portage/portage/dbapi/__init__.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Incomplete
 from typing import Literal
 
 class dbapi:
@@ -29,6 +30,6 @@ class dbapi:
         mytree: str | None = ...,
         myrepo: str | None = ...,
     ) -> list[str]: ...
-    def match(self, mydep: str, use_cache: Literal[0, 1] = ...) -> list[str] | str: ...
+    def match(self, mydep: str, use_cache: Literal[0, 1] = 1) -> list[str] | str: ...
 
-def __getattr__(name: str): ...  # incomplete module
+def __getattr__(name: str) -> Incomplete: ...  # incomplete module

stubs/portage/portage/package/ebuild/config.pyi

@@ -1,4 +1,5 @@
-from typing import Any
+from collections.abc import Hashable, Mapping
+from typing import Literal, TypeVar
 
 class config:
     def __init__(
@@ -20,4 +21,17 @@ class config:
     def __setitem__(self, key: str, value: str) -> None: ...
     def __delitem__(self, key: str) -> None: ...
     def __iter__(self) -> str: ...
-    def get(self, k: str, x: Any = ...) -> Any: ...
+    def get(self, k: str, x=...): ...
+
+_K = TypeVar("_K")
+_V = TypeVar("_V")
+
+def best_from_dict(
+    key: Hashable,
+    top_dict: Mapping[_K, _V],
+    key_order,
+    EmptyOnError: Literal[0, 1] = 1,
+    FullCopy: Literal[0, 1] = 1,
+    AllowEmpty: Literal[0, 1] = 1,
+) -> Literal[""] | dict[_K, _V]: ...
+def autouse(myvartree, use_cache: Literal[0, 1] = 1, mysettings: config | None = None) -> Literal[""]: ...

stubs/portage/portage/package/ebuild/doebuild.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Literal
+from _typeshed import Incomplete
+from typing import Literal
 
 from portage.dbapi.porttree import portdbapi
 
@@ -38,17 +39,19 @@ def doebuild(
         "unpack",
     ],
     settings: config | None = ...,
-    debug: Literal[0, 1] = ...,
-    listonly: Literal[0, 1] = ...,
-    fetchonly: Literal[0, 1] = ...,
-    cleanup: Literal[0, 1] = ...,
-    use_cache: Literal[0, 1] = ...,
-    fetchall: Literal[0, 1] = ...,
+    debug: Literal[0, 1] = 0,
+    listonly: Literal[0, 1] = 0,
+    fetchonly: Literal[0, 1] = 0,
+    cleanup: Literal[0, 1] = 0,
+    use_cache: Literal[0, 1] = 1,
+    fetchall: Literal[0, 1] = 0,
     tree: Literal["vartree", "porttree", "bintree"] = ...,
     mydbapi: portdbapi | None = ...,
-    vartree: Any = ...,
-    prev_mtimes: dict[str, Any] | None = ...,
+    vartree=...,
+    prev_mtimes: dict[str, Incomplete] | None = ...,
     fd_pipes: dict[str, str] | None = ...,
     returnproc: int | bool = ...,
 ) -> Literal[0, 1] | bool | list[int]:  # Missing portage.process.MultiprocessingProcess
     ...
+
+def __getattr__(name: str) -> Incomplete: ...  # incomplete module

stubs/portage/portage/versions.pyi

@@ -1,6 +1,9 @@
-from typing import Any, Literal
+from _typeshed import Incomplete
+from typing import Literal
 from typing_extensions import Self
 
+from .package.ebuild.config import config
+
 def vercmp(ver1: str, ver2: str, silent: Literal[0, 1] = ...) -> int | None: ...
 
 class _pkg_str(str):
@@ -9,36 +12,37 @@ class _pkg_str(str):
     def __new__(
         cls,
         cpv: str,
-        metadata: dict[str, Any] | None = ...,
-        settings: Any = ...,
-        eapi: Any = ...,
+        metadata: dict[str, Incomplete] | None = ...,
+        settings: config = ...,
+        eapi=...,
         repo: str | None = ...,
         slot: str | None = ...,
         build_time: int | None = ...,
         build_id: str | None = ...,
         file_size: int | None = ...,
         mtime: int | None = ...,
-        db: Any = ...,
-        repoconfig: Any = ...,
+        db=...,
+        repoconfig=...,
     ) -> Self: ...
     def __init__(
         self,
         cpv: str,
-        metadata: dict[str, Any] | None = ...,
-        settings: Any = ...,
-        eapi: Any = ...,
+        metadata: dict[str, Incomplete] | None = ...,
+        settings: config = ...,
+        eapi=...,
         repo: str | None = ...,
         slot: str | None = ...,
         build_time: int | None = ...,
         build_id: str | None = ...,
         file_size: int | None = ...,
         mtime: int | None = ...,
-        db: Any = ...,
-        repoconfig: Any = ...,
+        db=...,
+        repoconfig=...,
     ) -> None: ...
     @staticmethod
-    def _long(var: Any, default: int) -> int: ...
+    def _long(var, default: int) -> int: ...
 
 def catpkgsplit(
     mydata: str | _pkg_str, silent: Literal[0, 1] = ..., eapi: str | None = ...
 ) -> tuple[str | None, str, str, str] | None: ...
+def __getattr__(name: str) -> Incomplete: ...  # incomplete module