cbuild: add "renames" template field

Unlike `provides`, this can be used to reliably rename packages
including accounting for any potential automatic subpackages.

Author: q66

Packaging.md

@@ -965,6 +965,11 @@ Keep in mind that default values may be overridden by build styles.
   library scanning is automatic; but sometimes libraries provide either a
   non-conforming `SONAME` which the scanner does not pick up, or the
   scanner is disabled explicitly.
+* `renames` *(list)* A list of old names for the package. This is like
+  `provides` except no explicit version is required (it always takes on
+  the version of the package by default, but an explicit version can be
+  specified if needed) and they always make it into autosplit packages
+  with the appropriate suffix. This ensures a clean rename upgrade path.
 * `replaces_priority` *(int)* When used with `replaces`, this specifies
   which of the packages gets to keep the files (i.e. the higher-priority
   package will keep them). Defaults to 0.

main/kmod/template.py

@@ -35,15 +35,13 @@ def post_install(self):
 
 @subpackage("kmod-devel")
 def _(self):
-    # transitional
-    self.provides = [self.with_pkgver("libkmod-devel")]
+    self.renames = ["libkmod-devel"]
 
     return self.default_devel()
 
 
 @subpackage("kmod-libs")
 def _(self):
-    # transitional
-    self.provides = [self.with_pkgver("libkmod")]
+    self.renames = ["libkmod"]
 
     return self.default_libs()

main/zlib-ng-compat-devel-static

@@ -13,11 +13,8 @@
 hostmakedepends = ["pkgconf"]
 # we need to explicitly provide higher ver or apk won't upgrade it,
 # even with provider_priority set which is strange but it is how it is
-provides = [
-    f"so:libz.so.1={_cver}.99",
-    f"zlib={_cver}-r99",
-]
-replaces = [f"zlib<{_cver}-r99"]
+provides = [f"so:libz.so.1={_cver}.99"]
+renames = [f"zlib={_cver}-r99"]
 pkgdesc = "Implementation of zlib compression library"
 license = "Zlib"
 url = "https://github.com/zlib-ng/zlib-ng"
@@ -32,17 +29,8 @@
     configure_env["CHOST"] = self.profile().triplet
 
 
-@subpackage("zlib-ng-compat-devel-static")
-def _(self):
-    self.provides = [f"zlib-devel-static={_cver}-r99"]
-    self.replaces = [f"zlib-devel-static<{_cver}-r99"]
-
-    return ["usr/lib/*.a"]
-
-
 @subpackage("zlib-ng-compat-devel")
 def _(self):
-    self.provides = [f"zlib-devel={_cver}-r99"]
-    self.replaces = [f"zlib-devel<{_cver}-r99"]
+    self.renames = [f"zlib-devel={_cver}-r99"]
 
     return self.default_devel()

main/zlib-ng-compat/template.py

@@ -131,6 +131,13 @@ def _get_new_deps(pkg, origin):
     # explicit provides
     provides += pkg.provides
 
+    # renames are provides
+    for ren in pkg.renames:
+        if ren.find("=") < 0:
+            provides.append(f"{ren}={pkg.pkgver}-r{pkg.pkgrel}")
+        else:
+            provides.append(ren)
+
     # shlib provides
     if hasattr(pkg, "aso_provides"):
         provides += map(

src/cbuild/apk/generate.py

@@ -407,6 +407,7 @@ def find(self, path, pattern, files=False):
     # other package lists + related
     ("provides", [], list, False, True, False),
     ("provider_priority", 0, int, False, True, True),
+    ("renames", [], list, False, True, False),
     ("replaces", [], list, False, True, False),
     ("replaces_priority", 0, int, False, True, True),
     ("install_if", [], list, False, True, False),
@@ -507,6 +508,7 @@ def find(self, path, pattern, files=False):
     ("go_check_tags", False),
     ("provides", True),
     ("provider_priority", True),
+    ("renames", True),
     ("replaces", True),
     ("replaces_priority", True),
     ("install_if", True),
@@ -2330,16 +2332,24 @@ def __init__(
             else:
                 setattr(self, fl, copy_of_dval(dval))
 
-        # set up options/replaces if automatic, also setup paths
+        # set up options/replaces/renames if automatic, also setup paths
         # basically for each parent replace, we also replace matching
         # autopkg, e.g. foo replaces bar == foo-man replaces bar-man
         if auto:
+            asfx = self.pkgname.removeprefix(parent.pkgname)
             self.options = parent.options
             for rep in parent.replaces:
                 sn, sv, sop = autil.split_pkg_name(rep)
                 if sn:
-                    asfx = self.pkgname.removeprefix(parent.pkgname)
                     self.replaces.append(f"{sn}{asfx}{sop}{sv}")
+            # renames are a bit simpler to deal with
+            self.renames = []
+            for ren in parent.renames:
+                eq = ren.find("=")
+                if eq < 0:
+                    self.renames.append(f"{ren}{asfx}")
+                else:
+                    self.renames.append(f"{ren[0:eq]}{asfx}{ren[eq:]}")
             self.setup_paths()
 
         ddeps = []