From 0c726a82a38fcdcc07627b10dacb33486bebeb8c Mon Sep 17 00:00:00 2001 From: Sorin Mihai Dobrescu Date: Wed, 15 Jan 2025 08:20:56 +0200 Subject: [PATCH] debug --- packages/apps/collection.yaml | 3 ++- packages/templates/functions.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/apps/collection.yaml b/packages/apps/collection.yaml index 2b9cbb8a..c86b4d1b 100644 --- a/packages/apps/collection.yaml +++ b/packages/apps/collection.yaml @@ -13587,7 +13587,7 @@ packages: - category: "apps" name: "mkvtoolnix" - version: "86.0+1" + version: "88.0" uri: - https://mkvtoolnix.download license: "GPL-2" @@ -13603,6 +13603,7 @@ packages: atoms: - atom: "media-video/mkvtoolnix" use: "dbus dvd gui nls # pch" + accept_keywords: "~amd64" inner_build_reqs: - dev-ruby/rake - app-text/po4a diff --git a/packages/templates/functions.yaml b/packages/templates/functions.yaml index 1ea67830..1c5c2391 100644 --- a/packages/templates/functions.yaml +++ b/packages/templates/functions.yaml @@ -258,11 +258,12 @@ {{- $value := ( index $atom "usepkg_exclude" ) }} {{- if $value }} + cat /etc/portage/make.conf || true; \ grep -qx 'EMERGE_DEFAULT_OPTS=.*' /etc/portage/make.conf || echo 'EMERGE_DEFAULT_OPTS=' >> /etc/portage/make.conf; \ sed -i -e "/EMERGE_DEFAULT_OPTS=.*--usepkg-exclude/! s/$/ --usepkg-exclude/" /etc/portage/make.conf; \ sed -i -e "/EMERGE_DEFAULT_OPTS=.*--usepkg-exclude[ ]*'/! s/\(EMERGE_DEFAULT_OPTS=.*--usepkg-exclude\)[ ]*/\1 ''/" /etc/portage/make.conf; \ sed -i -e "/--usepkg-exclude[ ]*'.*{{ $atom.atom | replace "/" "\\/" }}.*'/! s/--usepkg-exclude\([ ]*\)'\(.*\)'/--usepkg-exclude '{{ $atom.atom | replace "/" "\\/" }} \2'/" /etc/portage/make.conf; \ - cat /etc/portage/make.conf + cat /etc/portage/make.conf; \ {{- end }} {{- if eq ( mod $count 50 ) 0 }}