From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B877158042 for ; Mon, 21 Oct 2024 19:07:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FDE2E09ED; Mon, 21 Oct 2024 19:07:33 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11A1FE09ED for ; Mon, 21 Oct 2024 19:07:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2C9CA343014 for ; Mon, 21 Oct 2024 19:07:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 87FA41F45 for ; Mon, 21 Oct 2024 19:07:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1729537539.0262db6d52c2a9a9ca732ab8d7983b7976b2163c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/kphotoalbum/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/kphotoalbum/kphotoalbum-9999.ebuild X-VCS-Directories: media-gfx/kphotoalbum/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0262db6d52c2a9a9ca732ab8d7983b7976b2163c X-VCS-Branch: master Date: Mon, 21 Oct 2024 19:07:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7fa55a56-22c6-4920-9a87-c3ed07f5467d X-Archives-Hash: b347230f0d4ca4f4da198e3ff561fa27 commit: 0262db6d52c2a9a9ca732ab8d7983b7976b2163c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Sep 9 19:37:08 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Oct 21 19:05:39 2024 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0262db6d media-gfx/kphotoalbum: Port to KF6 Upstream commits: 170d891063f0bcdd0a1ff53b7d7c24322d3e8125 e6ecedc24ce664581bd495854bc9ebc53dd22713 f4b880cb02a91ff17af220023480a4d736540d0b Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/kphotoalbum/kphotoalbum-9999.ebuild | 54 +++++++++++++-------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild index 17da1cafb2..41b8321ccb 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild @@ -3,10 +3,11 @@ EAPI=8 +EGIT_BRANCH="kf6" ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.115.0 -QTMIN=5.15.12 +KFMIN=6.5.0 +QTMIN=6.7.2 inherit ecm kde.org DESCRIPTION="Tool for indexing, searching, and viewing images" @@ -18,36 +19,32 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then fi LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0" -SLOT="5" +SLOT="0" IUSE="map phonon +raw share +vlc" REQUIRED_USE="|| ( phonon vlc )" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[jpeg] - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${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/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets,xml] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=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/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 media-gfx/exiv2:= media-libs/libjpeg-turbo:= - map? ( kde-apps/marble:5 ) - phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] ) - raw? ( kde-apps/libkdcraw:5 ) - share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 ) + map? ( kde-apps/marble:6 ) + phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] ) + raw? ( kde-apps/libkdcraw:6 ) + share? ( >=kde-frameworks/kxmlgui-${KFMIN}:6 ) vlc? ( media-video/vlc:= ) " RDEPEND="${DEPEND} @@ -58,11 +55,10 @@ DOCS=( CHANGELOG.{md,old} README.md ) src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited $(cmake_use_find_package map Marble) - $(cmake_use_find_package phonon Phonon4Qt5) - $(cmake_use_find_package raw KF5KDcraw) - $(cmake_use_find_package share KF5Purpose) + $(cmake_use_find_package phonon Phonon4Qt6) + $(cmake_use_find_package raw KDcrawQt6) + $(cmake_use_find_package share KF6Purpose) $(cmake_use_find_package vlc LIBVLC) )