virtual/imagemagick-tools: Bump v.0+5

macaroni-os · Feb 17, 2023 · 59b1c0f · 59b1c0f
1 parent cbf974d
commit 59b1c0f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/packages/atoms/office/virtual/imagemagick-tools/build.yaml b/packages/atoms/office/virtual/imagemagick-tools/build.yaml
@@ -1,15 +1,27 @@
-env:
-- JOBS={{ ( index .Values.labels "jobs" ) | default "3" }}
-- LUET_PORTAGE_CACHE_PACKAGES="/var/cache/portage/packages"
-- LUET_PORTAGE_IGNORE_TAR_WARNING=1
-- LUET_PORTAGE_PKGMETA=1
-- LUET_PORTAGE_PKGFILES=1
-- FEATURES="-sandbox -usersandbox -ipc-sandbox -pid-sandbox -network-sandbox"
 prelude:
-- eval 'rm -rf /pkgdir/ || true' && mkdir -p /pkgdir/{{ .Values.name }} && luet-portage
-  --dir /pkgdir/{{ .Values.name }} {{ ( index .Values.labels "emerge.packages"
-  ) }}
-- rm -v /var/cache/distfiles/* ${LUET_PORTAGE_CACHE_PACKAGES}/* || true
+- |-
+  export FEATURES="-sandbox -usersandbox -ipc-sandbox -pid-sandbox -network-sandbox" && \
+  export JOBS={{ ( index .Values.labels "jobs" ) | default "3" }} && \
+  eval 'mkdir -p /var/cache/portage/distfiles || true' && \
+  chown portage:portage -R /var/cache/portage/ && \
+  {{- if .Values.use_flags }}
+  USE="{{ join " " .Values.use_flags }}" emerge {{ ( index .Values.labels "emerge.packages" ) }} -pv -t && \
+  {{- else }}
+  emerge -j ${JOBS} {{ ( index .Values.labels "emerge.packages" ) }} -pv -t && \
+  {{- end }}
+  {{- if .Values.use_flags }}
+  USE="{{ join " " .Values.use_flags }}" emerge -j ${JOBS} --nodeps {{ ( index .Values.labels "emerge.packages" ) }}
+  {{- else }}
+  emerge -j ${JOBS} --nodeps {{ ( index .Values.labels "emerge.packages" ) }}
+  {{- end }}
+- >-
+  export LUET_PORTAGE_CACHE_PACKAGES="/var/cache/portage/packages" &&
+  export LUET_PORTAGE_IGNORE_TAR_WARNING=1 &&
+  export LUET_PORTAGE_PKGMETA=1 &&
+  export LUET_PORTAGE_PKGFILES=1 &&
+  eval 'rm -rf /pkgdir/ || true' && mkdir -p /pkgdir/{{ .Values.name }} &&
+  luet-portage --dir /pkgdir/{{ .Values.name }} {{ ( index .Values.labels "emerge.packages" ) }} &&
+  eval 'rm -v /var/cache/distfiles/* ${LUET_PORTAGE_CACHE_PACKAGES}/* || true'
 package_dir: /pkgdir/{{ .Values.name }}
 excludes:
 - ^/var/cache/portage/

diff --git a/packages/atoms/office/virtual/imagemagick-tools/definition.yaml b/packages/atoms/office/virtual/imagemagick-tools/definition.yaml
@@ -1,5 +1,5 @@
 name: imagemagick-tools
-version: 0+4
+version: 0+5
 category: virtual
 requires:
 - name: imagemagick