From 2ba18872f5c70e96d18c8760e6c835c39eb2caca Mon Sep 17 00:00:00 2001 From: Marcel Telka <marcel@telka.sk> Date: Sun, 31 Mar 2024 12:16:31 +0200 Subject: [PATCH] python/jaraco.develop: update to 8.11.1 --- transforms/generate-cleanup | 63 +++++++++++++++++++++++++++---- 1 files changed, 55 insertions(+), 8 deletions(-) diff --git a/transforms/generate-cleanup b/transforms/generate-cleanup index 75c3458..13bc742 100644 --- a/transforms/generate-cleanup +++ b/transforms/generate-cleanup @@ -36,7 +36,9 @@ <transform dir file link hardlink license -> delete pkg.size .*> <transform dir file link hardlink license -> delete owner .*> <transform dir file link hardlink license -> delete group .*> -<transform dir file link hardlink license -> delete mode .*> +<transform dir link hardlink license -> delete mode .*> +# preserve mode for illumos-closed files +<transform file path=(?!opt/onbld/closed/root_i386) -> delete mode .*> #<transform set name=pkg.fmri -> edit value "@[^ \t\n\r\f\v]*" "@$!(IPS_COMPONENT_VERSION),$!(BUILD_VERSION)"> @@ -53,7 +55,45 @@ <transform dir file link hardlink -> \ edit path "/(sparc|i386)/" "/$!(MACH)/"> <transform dir file link hardlink -> \ - edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)"> + edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_TRIPLET)"> + +# perl support +<transform dir file link hardlink -> \ + edit path "^(usr/perl5/.*/)i86pc-solaris-(64int|thread-multi-64)/" "\1$!(PERL_ARCH)/"> +<transform dir file link hardlink -> \ + edit path "^(usr/perl5/(vendor_perl/)?)5\.[^/]*" "\1$!(PERLVER)"> +<transform dir file link hardlink \ + path=usr/perl5/.*/perllocal\.pod$ -> drop> +<transform dir file link hardlink \ + path=usr/perl5/.*/\.packlist$ -> drop> + +# Python support +<transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyc$ -> drop> +<transform dir file link hardlink path=usr\/lib\/python2\.7\/.*\.pyo$ -> drop> +<transform dir file link hardlink path=usr\/lib\/python3\.\d+\/(.*\/)?__pycache__\/ -> drop> +# Drop backports/__init__.py because all supported Python versions are PEP 420 +# compliant so this file is no longer needed. +# See https://github.com/jaraco/backports.entry_points_selectable/issues/5 +<transform dir file link hardlink path=usr\/lib\/python3\.\d+\/vendor-packages\/backports\/__init__\.py$ -> drop> +# PEP 627 made the RECORD file optional. Since we do not need the file and it +# could contain inaccurate info we simply drop it. +<transform dir file link hardlink path=usr\/lib\/python3\.\d+\/vendor-packages\/[^/]+\.dist-info/RECORD$ -> drop> +# Replace Python version by $(PYV) +<transform file -> \ + edit path "^(usr/lib/python3\.\d+/vendor-packages/(.*/)?[^/]+\.cpython-)3\d+\.so$" "\1$!(PYV).so"> +# Replace Python version by $(PYVER) +<transform file path=usr/bin/[^/]+-3\.\d+$ -> default tmp.fmri "$(COMPONENT_FMRI)"> +<transform file tmp.fmri=.*runtime/python -> edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)"> +<transform file tmp.fmri=.*library/python/ -> edit path "^(usr/bin/[^/]+-)3\.\d+$" "\1$!(PYVER)"> +<transform file tmp.fmri=.* -> delete tmp.fmri .*> +<transform dir file link hardlink -> \ + edit path "^(usr/lib/python3\.\d+/vendor-packages/[^/]+-py)3\.\d+(\.egg-info(/.*)?)$" "\1$!(PYVER)\2"> +<transform dir file link hardlink -> \ + edit path "^(usr/lib/python3\.\d+/vendor-packages/[^/]+-py)3\.\d+(-nspkg\.pth)$" "\1$!(PYVER)\2"> +<transform dir file link hardlink -> \ + edit path "^(usr/lib/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2"> +<transform dir file link hardlink -> \ + edit path "^(usr/include/python)3\.\d+(/.*)?$" "\1$!(PYVER)\2"> <transform dir file link hardlink -> \ edit target "/(sparcv9|amd64)$" "/$!(MACH64)"> @@ -68,7 +108,7 @@ <transform dir file link hardlink -> \ edit target "/(sparc|i386)/" "/$!(MACH)/"> <transform dir file link hardlink -> \ - edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)"> + edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_TRIPLET)/"> # <transform dir file link hardlink -> \ # edit path "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)"> @@ -76,14 +116,19 @@ # edit target "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)"> <transform dir file link hardlink -> \ - edit path "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)"> + edit path "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)"> <transform dir file link hardlink -> \ - edit target "$(COMPONENT_VERSION)" "$!(COMPONENT_VERSION)"> + edit target "$(HUMAN_VERSION_RE)" "$!(HUMAN_VERSION)"> <transform dir file link hardlink -> \ - edit path "$(IPS_VERSION)" "$!(IPS_VERSION)"> + edit path "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)"> <transform dir file link hardlink -> \ - edit target "$(IPS_VERSION)" "$!(IPS_VERSION)"> + edit target "$(COMPONENT_RE_VERSION)" "$!(COMPONENT_VERSION)"> + +<transform dir file link hardlink -> \ + edit path "$(IPS_COMPONENT_RE_VERSION)" "$!(IPS_COMPONENT_VERSION)"> +<transform dir file link hardlink -> \ + edit target "$(IPS_COMPONENT_RE_VERSION)" "$!(IPS_COMPONENT_VERSION)"> # convert temporary macro names to their real name <transform set -> \ @@ -109,4 +154,6 @@ <transform dir file link hardlink -> \ edit target "\$!\((.*)\)" "$(\1)"> -<transform dir path=mangled -> drop> +<transform file link hardlink path=mangled/(.*) -> drop> +# drop all dirs except for illumos-closed +<transform dir path=(?!(opt/onbld/closed/root_i386(-nd)?/)) -> drop> -- Gitblit v1.9.3