[PATCH v3 0/5] rpm.eclass: rework app-arch/rpm support into pre-inherit variable
Eli Schwartz <[email protected]>
| Newsgroups | gmane.linux.gentoo.devel |
|---|---|
| Message-ID | <[email protected]> |
v3: add (+) to all USE flags, to handle app-arch/rpm-4.19 that
unconditionally enabled them.
Eli Schwartz (5):
rpm.eclass: rework app-arch/rpm support into pre-inherit variable
app-office/libreoffice-l10n: set rpm.eclass var for reference rpm
support
app-backup/tsm: set rpm.eclass var for reference rpm support
x11-themes/leonidas-backgrounds: set rpm.eclass var for reference rpm
support
rpm.eclass: make RPM_COMPRESS_TYPE mandatory in EAPI 9
app-backup/tsm/tsm-8.2.1.0.ebuild | 1 +
.../libreoffice-l10n-25.2.7.2.ebuild | 4 +-
eclass/rpm.eclass | 104 ++++++++++++++++--
.../leonidas-backgrounds-11.0.0.2-r2.ebuild | 4 +-
4 files changed, 100 insertions(+), 13 deletions(-)
Range-diff against v2:
1: 64122fbf0ef2 ! 1: e0d124f9b804 rpm.eclass: rework app-arch/rpm support into pre-inherit variable
@@ eclass/rpm.eclass: esac
+ elif [[ "${#types[@]}" -gt 0 ]]; then
+ for t in "${types[@]}"; do
+ case ${t} in
-+ bzip2|zstd) rpmuse+="${t}," ;;
-+ lzma) rpmuse+="${t},"; rpm2tar="false" ;;
-+ xz) rpmuse+="lzma," ;;
++ bzip2|zstd) rpmuse+="${t}(+)," ;;
++ lzma) rpmuse+="${t}(+),"; rpm2tar="false" ;;
++ xz) rpmuse+="lzma(+)," ;;
+ none) die "RPM_COMPRESS_TYPE: 'none' cannot be combined with other values" ;;
+ *) die "invalid RPM_COMPRESS_TYPE: ${RPM_COMPRESS_TYPE} (found: ${t})" ;;
+ esac
@@ eclass/rpm.eclass: rpm_unpack() {
+
+ case ${payload} in
+ "") payload=none;; # gzip/uncompressed
-+ PayloadIsBzip) payload=bzip2 usedep="[bzip2]";;
-+ PayloadIsXz) payload=xz usedep="[lzma]";;
-+ PayloadIsLzma) payload=lzma usedep="[lzma]";;
-+ PayloadIsZstd) payload=zstd usedep="[zstd]";;
++ PayloadIsBzip) payload=bzip2 usedep="[bzip2(+)]";;
++ PayloadIsXz) payload=xz usedep="[lzma(+)]";;
++ PayloadIsLzma) payload=lzma usedep="[lzma(+)]";;
++ PayloadIsZstd) payload=zstd usedep="[zstd(+)]";;
+ esac
+
+ local use_rpm=
2: 494657d7c9c9 = 2: 498bb6abd9f1 app-office/libreoffice-l10n: set rpm.eclass var for reference rpm support
3: 906ffacf4f41 = 3: e01580dc02e6 app-backup/tsm: set rpm.eclass var for reference rpm support
4: c836c5be6aef = 4: da42fe2f446a x11-themes/leonidas-backgrounds: set rpm.eclass var for reference rpm support
5: 883ad702bbc5 = 5: 62650655860d rpm.eclass: make RPM_COMPRESS_TYPE mandatory in EAPI 9
--
2.52.0