Merge updates from master

5 files changed, 2 insertions, 236 deletions

diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index 5c9acee6f536..5130645e1db1 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1,2 @@
-DIST skrooge-2.32.0.tar.xz 22945360 BLAKE2B d567aedb958c8dc7e49ca3d3c6d78d9e0b9b1a520bf0202fda145f75a4bfb82ae1afe9278524aa4693944a98f46cbe14bfde10a202fbdb2532dbb1421ec29262 SHA512 e39ddcf498281e0ac402a2bad0a858a5d14c9d17fd01185954de2b0c8d0cc9768762a33b846db94824f5640ccdc063cf055d46ef0b90b03615209a0c2f4bed6c
 DIST skrooge-2.33.0-cmake.patch.xz 9372 BLAKE2B ac2e5decc491eecb3adce61b36ace144c01a20ff74d3e7044351dc605d88b8ef3528a762d043d66776c6d37690e736b942e940110f600f013a6ea1592e65e164 SHA512 0561decdbe2ad5b8dbf8f91dee568f3448ac4e53e2ffaac3081ed1cf17cc001bfe417807876a5f3c0d379e025385caa705e52037edbfb31e68f9e9769eafef85
 DIST skrooge-2.33.0.tar.xz 23005952 BLAKE2B 081230d6db4768cc928844ef0559537bf5e260b922c61e5aab98f2b76f820a943f35c07655fb30fa6fe8e617c9321ba117ef67a083817e607330adcb93a1c10f SHA512 910417988cc3bad7eb733a1276677f9e7b38d8ea3652394efa79969772c377bef25a44ead1330d98c34505556ce79dc62c4adc52778796e46890ce985d6ad608
diff --git a/app-office/skrooge/skrooge-2.32.0-r1.ebuild b/app-office/skrooge/skrooge-2.32.0-r1.ebuild
deleted file mode 100644
index 1dfdc629f33c..000000000000
--- a/app-office/skrooge/skrooge-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm kde.org
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities ofx"
-
-# hangs + installs files (also requires KF5DesignerPlugin)
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+)]
-	dev-db/sqlcipher
-	dev-libs/grantlee:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5=
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
-	ofx? ( dev-libs/libofx:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-BDEPEND="
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSKG_WEBENGINE=ON
-		-DSKG_WEBKIT=OFF
-		-DSKG_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5Runner=ON
-		$(cmake_use_find_package ofx LibOfx)
-		-DSKG_BUILD_TEST=$(usex test)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local mycmakeargs=(
-		-DSKG_BUILD_TEST=ON
-	)
-	ecm_src_test
-}
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6e30881a5367..0c951842845e 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1 @@
-DIST digiKam-8.4.0.tar.xz 58025616 BLAKE2B 33441e023cd9d6edba2e7c01e482a6eea7a6b1972b6bad0fc804fb3e94f97cc62e2663690137b2445fb7043789b7e942d830b71209385de77ccffe57d22d09ff SHA512 4342d18a7c04ab239821de3cf908f8e7d676598778f0174164aa336e8cfdc0a76327d31c64e6c4e47dcf0d6fbef46b01918312e4622ce3359888a9a94948a22b
 DIST digiKam-8.5.0.tar.xz 62028432 BLAKE2B ef061b73e72d9b2ad3da361fcdd3e27a4758b1ef837adde1a405cfbd759cc950d373464765f5ff07f36e8457c6c9c15550002e3ebd94215b154d2c51723192ee SHA512 5610f0173043e29a2b5ff62b2ed2c2bea79e10cd20a0c2416ebb425457cee55aa8b8d575ba57e8e188a899cc909516ea05e6c80e73e3316742cc9e8119855509
-DIST digikam-8.4.0-patchset.tar.xz 11904 BLAKE2B 6ab167cae66710505eb81bb538fde2a81458b6580bf8c70d0c28500ca81a3c9c9b9e0a12ca288a4dc6f39ae1a175f7b2bd09e4d94624337348084c228eafcc38 SHA512 df1199d3aaecc0afc032090424af69c031e95afba1fed70b00cf61c5ef52fa2a7c3d97918592c167f9ea918dd2823e4cc52f12a470a9eede815b3ff43314001b
diff --git a/media-gfx/digikam/digikam-8.4.0-r11.ebuild b/media-gfx/digikam/digikam-8.4.0-r11.ebuild
deleted file mode 100644
index ab9884b9b338..000000000000
--- a/media-gfx/digikam/digikam-8.4.0-r11.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=6.3.0
-QTMIN=6.6.2
-inherit ecm kde.org toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/digiKam-${PV/_/-}.tar.xz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="addressbook calendar geolocation gphoto2 heif +imagemagick jpegxl +lensfun mysql openmp +panorama scanner semantic-desktop spell video"
-
-# bug 366505
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/expat
-	>=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,-gles2-only,gui,mysql?,network,opengl,sql,widgets,xml]
-	>=dev-qt/qtnetworkauth-${QTMIN}:6
-	>=dev-qt/qtscxml-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kio-${KFMIN}:6
-	>=kde-frameworks/knotifications-${KFMIN}:6
-	>=kde-frameworks/knotifyconfig-${KFMIN}:6
-	>=kde-frameworks/kservice-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kwindowsystem-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	>=kde-frameworks/solid-${KFMIN}:6
-	>=media-gfx/exiv2-0.27.1:=[xmp]
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/liblqr
-	media-libs/libpng:=
-	>=media-libs/opencv-3.3.0:=[contrib,contribdnn,features2d]
-	media-libs/tiff:=
-	virtual/opengl
-	x11-libs/libX11
-	addressbook? (
-		>=kde-apps/akonadi-contacts-24.05.2:6
-		>=kde-frameworks/kcontacts-${KFMIN}:6
-	)
-	calendar? ( >=kde-frameworks/kcalendarcore-${KFMIN}:6 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	heif? (
-		media-libs/libheif:=
-		media-libs/x265:=
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	jpegxl? ( media-libs/libjxl:= )
-	lensfun? ( media-libs/lensfun )
-	panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:6 )
-	scanner? ( >=kde-apps/libksane-24.05.2:6 )
-	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:6 )
-	spell? ( >=kde-frameworks/sonnet-${KFMIN}:6 )
-	video? ( >=dev-qt/qtmultimedia-${QTMIN}:6 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost
-	addressbook? ( >=kde-apps/akonadi-24.05.2:6 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-	media-libs/exiftool
-	mysql? ( virtual/mysql[server(+)] )
-	panorama? ( media-gfx/hugin )
-"
-BDEPEND="
-	sys-devel/gettext
-	panorama? (
-		app-alternatives/lex
-		app-alternatives/yacc
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-8.4.0-cmake.patch"
-	"${FILESDIR}/${PN}-8.3.0-cmake-addressbook.patch"
-	# bug 936507; KDE-bugs 488662, 490611, 491007, 490484, 490821,
-	# 490859, 490828, 490690, 490552, 490385, 489751, 490128
-	"${WORKDIR}/${P}-patchset"
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	ecm_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		-DBUILD_TESTING=OFF # bug 698192
-		-DENABLE_APPSTYLES=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
-		-DENABLE_SHOWFOTO=ON # built unconditionally so far, new option since 8.0
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		$(cmake_use_find_package calendar KF6CalendarCore)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake_use_find_package gphoto2 Gphoto2)
-		$(cmake_use_find_package heif Libheif)
-		$(cmake_use_find_package imagemagick ImageMagick)
-		$(cmake_use_find_package jpegxl Libjxl)
-		$(cmake_use_find_package lensfun LensFun)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_INTERNALMYSQL=$(usex mysql)
-		$(cmake_use_find_package panorama KF6ThreadWeaver)
-		$(cmake_use_find_package scanner KSaneWidgets6)
-		-DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop)
-		$(cmake_use_find_package spell KF6Sonnet)
-		-DENABLE_MEDIAPLAYER=$(usex video)
-	)
-
-	ecm_src_configure
-}
diff --git a/sys-kernel/installkernel/installkernel-49.ebuild b/sys-kernel/installkernel/installkernel-49.ebuild
index 3051f6f2e8a3..fd725cda3fbc 100644
--- a/sys-kernel/installkernel/installkernel-49.ebuild
+++ b/sys-kernel/installkernel/installkernel-49.ebuild
@@ -220,8 +220,9 @@ pkg_postinst() {
 	fi
 
 	# Initialize log file if there is none
+	dodir /var/log
 	local log=${ROOT}/var/log/installkernel.log
-	if [[ ! -f ${log} ]]; then
+	if [[ ! -s ${log} ]]; then
 		echo -e \
 "DATE\t"\
 "KI_VENDOR\t"\