From 09fad035e53c80fe0406b9ef3a34eafc7ec63a14 Mon Sep 17 00:00:00 2001
From: Cullum Smith <cullum@sacredheartsc.com>
Date: Wed, 4 Dec 2024 22:55:07 -0500
Subject: update some make.conf flags, remove some unused kde packages

---
 files/usr/local/etc/poudriere.d/make.conf.pkg_repository | 9 +++------
 files/usr/local/etc/poudriere.d/pkglist.pkg_repository   | 2 ++
 scripts/hostclass/pkg_repository                         | 2 +-
 vars/hostclass/desktop                                   | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
index b883e53..2d79ab6 100644
--- a/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/make.conf.pkg_repository
@@ -4,7 +4,7 @@ DEFAULT_VERSIONS+=${poudriere_default_versions:-}
 MAKE_JOBS_NUMBER=${poudriere_make_jobs_number}
 
 # Global port options
-OPTIONS_UNSET=TEST DEBUG GSSAPI_HEIMDAL GSSAPI_BASE GSSAPI_NONE HEIMDAL HEIMDAL_BASE NLS DOCS AVAHI LIBWRAP MYSQL MSQLND ODBC READLINE PULSEAUDIO UPNP BASH ZSH INFO ALSA SAMBA WAYLAND PLATFORM_WAYLAND PIPEWIRE TCP_WRAPPERS COMPAT32 JACK
+OPTIONS_UNSET=TEST DEBUG GSSAPI_HEIMDAL GSSAPI_BASE GSSAPI_NONE HEIMDAL HEIMDAL_BASE NLS DOCS AVAHI LIBWRAP MYSQL MSQLND ODBC READLINE PULSEAUDIO UPNP BASH ZSH INFO SAMBA WAYLAND PLATFORM_WAYLAND PIPEWIRE TCP_WRAPPERS COMPAT32 JACK KDEPIM
 OPTIONS_SET=GSSAPI GSSAPI_MIT MIT NONFREE LIBEDIT
 
 # Per-port options
@@ -46,14 +46,12 @@ mail_thunderbird_UNSET=PROFILE
 # With using virutal_oss, the OSS plugin causes a red error bar every
 # time the music is stopped paused. SNDIO seems fine.
 multimedia_audacious-plugins_SET=LAME SNDIO
-multimedia_audacious-plugins_UNSET=OSS
 
 multimedia_ffmpeg_SET=OPENSSL
 multimedia_ffmpeg_UNSET=GNUTLS
 multimedia_kdemultimedia_UNSET=KDENLIVE
 multimedia_mpv_SET=CDIO LIBBLURAY
 multimedia_mpv_UNSET=NVDEC
-multimedia_pipewire_UNSET=JACK
 multimedia_vlc_SET=FLAC MPEG2 X264 X265 VPX DCA FAAD AOM
 multimedia_webcamd_UNSET=DVB INPUT RADIO
 net-im_py-matrix-synapse_SET=PGSQL URLPREVIEW LDAP
@@ -92,10 +90,9 @@ sysutils_rsyslog8_UNSET=GCRYPT
 textproc_en-hunspell_SET=US_LARGE
 textproc_en-hunspell_UNSET=US_STANDARD
 www_chromium_SET=WIDEVINE
-www_firefox_UNSET=PROFILE JACK
+www_firefox_UNSET=PROFILE
 www_nginx_SET=HTTPV3 HTTPV3_QTLS HTTP_AUTH_KRB5 HTTP_AUTH_LDAP
 www_nginx_UNSET=MAIL
-www_qt5-webengine_SET=ALSA
 x11-toolkits_gtk30_UNSET=COLORD BROADWAY
-x11_kde5_UNSET=KDEADMIN KDEEDU KDEGAMES
+x11_kde5_UNSET=KDEADMIN KDEEDU
 x11_libinput_UNSET=LIBWACOM
diff --git a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
index e54ba57..3ee3437 100644
--- a/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
+++ b/files/usr/local/etc/poudriere.d/pkglist.pkg_repository
@@ -5,6 +5,7 @@ archivers/unzip
 archivers/zip
 audio/elisa
 audio/freedesktop-sound-theme
+audio/pulseaudio
 audio/gsound
 audio/kid3@kf5
 audio/kmix
@@ -20,6 +21,7 @@ databases/postgresql${postgresql_version}-client
 databases/postgresql${postgresql_version}-server
 databases/redis
 deskutils/merkuro
+deskutils/pim-sieve-editor
 deskutils/plasma5-sddm-kcm
 deskutils/py-vdirsyncer
 devel/android-tools
diff --git a/scripts/hostclass/pkg_repository b/scripts/hostclass/pkg_repository
index 5ed852d..3d7b34f 100644
--- a/scripts/hostclass/pkg_repository
+++ b/scripts/hostclass/pkg_repository
@@ -5,7 +5,7 @@
 : ${poudriere_dataset:="${state_dataset:-zroot}"}
 : ${poudriere_make_jobs_number:='8'}
 : ${poudriere_priority_boost:='gcc* llvm* rust'}
-: ${poudriere_allow_make_jobs_packages:='ImageMagick* bitwarden-cli cargo-c *chromium* cmake cmake-core eclipse electron* ffmpeg firefox thunderbird gcc* gnutls gtk3* icu libreoffice* llvm* mongodb* mysql*-client mysql*-server node* openjdk* openssl pkg postgresql* qt*-webengine rust webkit* vaultwarden'}
+: ${poudriere_allow_make_jobs_packages:='ImageMagick* bitwarden-cli cargo-c *chromium* cmake cmake-core digikam eclipse electron* ffmpeg firefox thunderbird gcc* gnutls gtk3* icu libreoffice* llvm* mongodb* mysql*-client mysql*-server node* openjdk* openssl pkg postgresql* qt*-webengine rust webkit* vaultwarden'}
 : ${poudriere_ccache_size:='50.0G'}
 : ${poudriere_default_versions:='imagemagick=7-nox11'}
 
diff --git a/vars/hostclass/desktop b/vars/hostclass/desktop
index 784aaab..0e708f2 100644
--- a/vars/hostclass/desktop
+++ b/vars/hostclass/desktop
@@ -101,6 +101,7 @@ kde5
 kid3-kf5
 kmix
 konversation
+pim-sieve-editor
 en-hunspell
 merkuro
 sddm"
-- 
cgit v1.2.3