pycargoebuild 0.12__tar.gz → 0.13.0__tar.gz

{pycargoebuild-0.12 → pycargoebuild-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycargoebuild
-Version: 0.12
+Version: 0.13.0
 Summary: A generator for Rust/Cargo ebuilds written in Python
 Author-email: Michał Górny <mgorny@gentoo.org>
 Requires-Python: >=3.9

{pycargoebuild-0.12 → pycargoebuild-0.13.0}/pycargoebuild/__init__.py

@@ -1,3 +1,3 @@
 """A generator for Rust/Cargo ebuilds written in Python"""
 
-__version__ = "0.12"
+__version__ = "0.13.0"

{pycargoebuild-0.12 → pycargoebuild-0.13.0}/pycargoebuild/__main__.py

@@ -6,6 +6,7 @@ import logging
 import lzma
 import os.path
 import shutil
+import subprocess
 import sys
 import tarfile
 import tempfile
@@ -78,6 +79,10 @@ def main(prog_name: str, *argv: str) -> int:
                       action="store_true",
                       help="Do not include LICENSEs (e.g. when crates are "
                            "only used at build time")
+    argp.add_argument("-M", "--no-manifest",
+                      action="store_true",
+                      help="Do not call `pkgdev manifest` (called only if "
+                           "Manifest exists)")
     argp.add_argument("-o", "--output",
                       help="Ebuild file to write (default: INPUT if --input "
                            "is specified, {name}-{version}.ebuild otherwise)")
@@ -272,6 +277,9 @@ def main(prog_name: str, *argv: str) -> int:
     fetch_crates(crates)
     verify_crates(crates, distdir=args.distdir)
 
+    umask = os.umask(0)
+    os.umask(umask)
+
     if args.crate_tarball:
         crate_tarball = Path(
             args.crate_tarball_path.format(name=pkg_meta.name,
@@ -293,6 +301,7 @@ def main(prog_name: str, *argv: str) -> int:
                                   encoding="UTF-8",
                                   preset=9 | lzma.PRESET_EXTREME,
                                   ) as tar_out:  # type: ignore
+                    os.fchmod(cratef.fileno(), 0o666 & ~umask)
                     logging.info("Repacking crates ...")
                     repack_crates(tar_out, crates)
             except BaseException:
@@ -300,7 +309,10 @@ def main(prog_name: str, *argv: str) -> int:
                 raise
         Path(cratef.name).rename(crate_tarball)
         logging.info(f"Crate tarball written to {crate_tarball}")
-        crates = set(filter(lambda x: not isinstance(x, FileCrate), crates))
+
+        # do not regenerate Manifest, crate tarball needs to be uploaded
+        # first
+        args.no_manifest = True
 
     if args.input is not None:
         ebuild = update_ebuild(
@@ -309,6 +321,7 @@ def main(prog_name: str, *argv: str) -> int:
             crates,
             distdir=args.distdir,
             crate_license=not args.no_license,
+            crate_tarball=crate_tarball if args.crate_tarball else None,
             license_overrides=config_toml.get("license-overrides", {}),
             )
         logging.warning(
@@ -320,6 +333,7 @@ def main(prog_name: str, *argv: str) -> int:
             crates,
             distdir=args.distdir,
             crate_license=not args.no_license,
+            crate_tarball=crate_tarball if args.crate_tarball else None,
             license_overrides=config_toml.get("license-overrides", {}),
             )
 
@@ -335,8 +349,6 @@ def main(prog_name: str, *argv: str) -> int:
                                 outf.fileno())  # type: ignore
                 args.input.close()
             else:
-                umask = os.umask(0)
-                os.umask(umask)
                 os.fchmod(outf.fileno(), 0o666 & ~umask)
             outf.write(ebuild)
         except BaseException:
@@ -344,6 +356,12 @@ def main(prog_name: str, *argv: str) -> int:
             raise
     Path(outf.name).rename(outfile)
 
+    if not args.no_manifest and (outfile.parent / "Manifest").exists():
+        try:
+            subprocess.call(["pkgdev", "manifest"], cwd=outfile.parent)
+        except FileNotFoundError:
+            logging.warning("pkgdev not found, Manifest will not be updated")
+
     print(f"{outfile}")
     return 0
 

{pycargoebuild-0.12 → pycargoebuild-0.13.0}/pycargoebuild/ebuild.py

@@ -38,11 +38,19 @@ DESCRIPTION="{description}"
 HOMEPAGE="{homepage}"
 SRC_URI="
 \t${{CARGO_CRATE_URIS}}
-"
+"{opt_crate_tarball}
 
 LICENSE="{pkg_license}"
 """
 
+EBUILD_TEMPLATE_CRATE_TARBALL = """
+if [[ ${{PKGBUMPING}} != ${{PVR}} ]]; then
+\tSRC_URI+="
+\t\t{}
+\t"
+fi\
+"""
+
 EBUILD_TEMPLATE_CRATE_LICENSE = """\
 # Dependent crate licenses
 LICENSE+="{crate_licenses}"
@@ -54,12 +62,14 @@ KEYWORDS="~amd64"
 """
 
 
-def get_CRATES(crates: typing.Iterable[Crate]) -> str:
+def get_CRATES(crates: typing.Iterable[Crate],
+               ) -> str:
     """
     Return the value of CRATES for the given crate list
     """
     if not crates:
-        return ""
+        # cargo.eclass rejects empty crates, we need some whitespace
+        return "\n"
     return ("\n" +
             "\n".join(sorted(f"\t{c.crate_entry}"
                              for c in crates
@@ -184,6 +194,7 @@ def get_ebuild(pkg_meta: PackageMetadata,
                distdir: Path,
                *,
                crate_license: bool = True,
+               crate_tarball: typing.Optional[Path] = None,
                license_overrides: typing.Dict[str, str] = {},
                ) -> str:
     """
@@ -196,11 +207,13 @@ def get_ebuild(pkg_meta: PackageMetadata,
     template += EBUILD_TEMPLATE_END
 
     return template.format(
-        crates=get_CRATES(crates),
+        crates=get_CRATES(crates if crate_tarball is None else ()),
         crate_licenses=get_crate_LICENSE(crates, distdir, license_overrides),
         description=bash_dquote_escape(collapse_whitespace(
             pkg_meta.description or "")),
         homepage=url_dquote_escape(pkg_meta.homepage or ""),
+        opt_crate_tarball=EBUILD_TEMPLATE_CRATE_TARBALL.format(
+            crate_tarball.name) if crate_tarball is not None else "",
         opt_git_crates=get_GIT_CRATES(crates, distdir),
         pkg_license=get_package_LICENSE(pkg_meta.license),
         prog_version=__version__,
@@ -255,13 +268,15 @@ def update_ebuild(ebuild: str,
                   distdir: Path,
                   *,
                   crate_license: bool = True,
+                  crate_tarball: typing.Optional[Path] = None,
                   license_overrides: typing.Dict[str, str] = {},
                   ) -> str:
     """
     Update the CRATES, GIT_CRATES and LICENSE in an existing ebuild
     """
 
-    crates_repl = CountingSubst(partial(get_CRATES, crates))
+    crates_repl = CountingSubst(
+        partial(get_CRATES, crates if crate_tarball is None else ()))
     git_crates_repl = GitCratesSubst(partial(get_GIT_CRATES, crates, distdir))
     crate_license_repl = (
         CountingSubst(partial(get_crate_LICENSE, crates, distdir,