gentoo auto-resync : 03:08:2023 - 22:54:30

4 files changed, 2 insertions, 225 deletions

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index eb670a006845..d1ea7cf83bba 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,6 +1,3 @@
-AUX kphotoalbum-5.10.0-exiv2-0.28.patch 5737 BLAKE2B bfdc846f99f4ce2f51467834636bbe14e01bd555bcae9eed7a670c0e611736fbf070c6a6a9765820b9df521cc98511744b9bfbb4559c2d689ec9ef68f7af6fc8 SHA512 8f4cf6aebbd49b67b596e4de06154299eed46783c42272aea07d995656c1c19356d75c9442d0747e0e635d4f4046ad65675e632f0ca750b0e8ea99ac484ef3e8
-DIST kphotoalbum-5.10.0.tar.xz 12002788 BLAKE2B e20a06f6829c1ac3df51102b09be4e59fe97557b7b51ab4c2ef072f2ea18b9c086acad9cd03dde14549e35ee652f325a558bb634e5760d3b216f9a1c6d681a63 SHA512 6e6e3d3173f2783c05319c6a372553e92b97174a43307d2bd1fdfa0eb6751bab435e61e07e1c33496254e6f53dd95032adf002899c68475dac7af7ad575c28cc
 DIST kphotoalbum-5.11.0.tar.xz 12005836 BLAKE2B 1a2872bc791cec6701a4bfe8b6ddac264731f7afdcb35d864bcd07cc0b5e5a4015184a071d9db9735d21b080c898d5ea598d0879bb979032abe464434f6fb821 SHA512 dd521b5e158a691da69e333fcefd3cf48135053c7510dbd7f22d94299059fe58037c56e70b92edfcd1d8d7a55b04f80278ff3bdde08dba16507dc43ca77af96e
-EBUILD kphotoalbum-5.10.0.ebuild 1974 BLAKE2B e3a5135a8566f064afb727e3c57d2d95e46eefbd27283283df58f83493dcc97d49774605860dacd22a97c512b898a1820303346cb885bb0d4cba0a393320c56e SHA512 e2d0b7e7bfad05be239026f3c88af935b9b2cbe980b0a809bf527db38f72ba1f0779ef61d6a4252a74f20a15d6c2f26ca29bff28d38fb5a6e5dc76e0feab6720
-EBUILD kphotoalbum-5.11.0.ebuild 1877 BLAKE2B f80324a62d6ea78beacb779a23c9488930c3bf0524cbaa25138bfbb92a3f2640fb0a4fe979e618d2609100ff9946bffac61697476627b90ac04bdee878796c5d SHA512 6ea8d327ab7dc588697ad175eb4e6fde217a237fec1c4e0b39c2cc3cd4fcf062a174d0a931579ac3defb7fcd53fe06dd57ea558409b44fc3eb501f54e7f5bbc7
+EBUILD kphotoalbum-5.11.0.ebuild 1876 BLAKE2B 529c837e0431317b208b55420f19a6614848cfaf5b351d3f3db09cecdcfd3c5a585b672cc41cac995880f917099b53c62c0e9e25e5aad1c92f952cd80f7d8c2f SHA512 520dfe99b55e085e293528138c743db9652cf33d4b74ddbbf15805e05b4ea035cad8c664ea62e66bb340fd3dd77959b6202e10511566180027ec325a0dcbc295
 MISC metadata.xml 733 BLAKE2B 8925ee0f3c5e6e4d8592c3403781228f00cf39f39b0363920c86091fdb566e43889b522121112cf3f0f857cdb94f2da86cf6dd0029276e990ac197870a0ab718 SHA512 824eed39872862a0502dadf33cfee45ecc269bd0750286157abc08119b49c0fa3abf6ec66eb170a37251e141dd2842563219084a41245dc9b8cfe61fa8ad8a08
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
deleted file mode 100644
index 2eea9495b735..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.10.0-exiv2-0.28.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-diff --git a/DB/FileInfo.cpp b/DB/FileInfo.cpp
-index dc4c9819b62706c9c7bbfa21f3da7ef7d3f8b6d3..8b4e275c1765e718ed917cb41e7b221ed8d484ef 100644
---- a/DB/FileInfo.cpp
-+++ b/DB/FileInfo.cpp
-@@ -1,5 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
- // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
- 
-@@ -13,6 +14,8 @@
- #include <QFileInfo>
- #include <QRegularExpression>
- 
-+#include <exiv2/version.hpp>
-+
- using namespace DB;
- 
- FileInfo FileInfo::read(const DB::FileName &fileName, DB::ExifMode mode)
-@@ -79,8 +82,14 @@ void DB::FileInfo::parseEXIV2(const DB::FileName &fileName)
-         const Exiv2::Exifdatum &datum = m_exifMap["Exif.Image.Orientation"];
- 
-         int orientation = 0;
--        if (datum.count() > 0)
-+        if (datum.count() > 0) {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+            orientation = datum.toInt64();
-+#else
-             orientation = datum.toLong();
-+#endif
-+        }
-+
-         m_angle = orientationToAngle(orientation);
-     }
- 
-diff --git a/lib/kpaexif/Database.cpp b/lib/kpaexif/Database.cpp
-index 4d0e228c72f5747f9d5b2a4e15871e2a11de4ed9..985713ceb53e60c3c17de80632f902a07ba94b14 100644
---- a/lib/kpaexif/Database.cpp
-+++ b/lib/kpaexif/Database.cpp
-@@ -1,6 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
--// SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
--// SPDX-FileCopyrightText: 2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2021-2022 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
- 
-@@ -320,7 +320,7 @@ bool Exif::Database::add(const DB::FileName &fileName)
-         return false;
- 
-     try {
--        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+        const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-         Q_ASSERT(image.get() != nullptr);
-         image->readMetadata();
-         Exiv2::ExifData &exifData = image->exifData();
-@@ -341,7 +341,7 @@ bool Exif::Database::add(const DB::FileNameList &list)
- 
-     for (const DB::FileName &fileName : list) {
-         try {
--            Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-+            const auto image = Exiv2::ImageFactory::open(fileName.absolute().toLocal8Bit().data());
-             Q_ASSERT(image.get() != nullptr);
-             image->readMetadata();
-             map << DBExifInfo(fileName, image->exifData());
-diff --git a/lib/kpaexif/DatabaseElement.cpp b/lib/kpaexif/DatabaseElement.cpp
-index 4e7ba198e425e81c582c585bb184ec19c31d4985..3d5d56cfbe5028a8e148753979bdae3f0922008d 100644
---- a/lib/kpaexif/DatabaseElement.cpp
-+++ b/lib/kpaexif/DatabaseElement.cpp
-@@ -1,13 +1,15 @@
--/* SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
-+// SPDX-FileCopyrightText: 2003-2010 Jesper K. Pedersen <blackie@kde.org>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
-+//
-+// SPDX-License-Identifier: GPL-2.0-or-later
- 
--   SPDX-License-Identifier: GPL-2.0-or-later
--*/
- #include "DatabaseElement.h"
- 
- #include <kpabase/Logging.h>
- 
- #include <QVariant>
- #include <exiv2/exif.hpp>
-+#include <exiv2/version.hpp>
- 
- static QString replaceDotWithUnderscore(const char *cstr)
- {
-@@ -76,10 +78,15 @@ QString Exif::IntExifElement::queryString() const
- 
- QVariant Exif::IntExifElement::valueFromExif(Exiv2::ExifData &data) const
- {
--    if (data[m_tag].count() > 0)
--        return QVariant { (int)data[m_tag].toLong() };
--    else
--        return QVariant { (int)0 };
-+    if (data[m_tag].count() > 0) {
-+#if EXIV2_TEST_VERSION(0, 28, 0)
-+        return QVariant((int) data[m_tag].toInt64());
-+#else
-+        return QVariant((int) data[m_tag].toLong());
-+#endif
-+    } else {
-+        return QVariant(0);
-+    }
- }
- 
- Exif::RationalExifElement::RationalExifElement(const char *tag)
-diff --git a/lib/kpaexif/Info.cpp b/lib/kpaexif/Info.cpp
-index 5f77fc8144516434465bd9f21ea2e885054aed37..162a05d14f3fbadd1d776d0eb10589a892bcf86c 100644
---- a/lib/kpaexif/Info.cpp
-+++ b/lib/kpaexif/Info.cpp
-@@ -1,5 +1,6 @@
- // SPDX-FileCopyrightText: 2003-2020 The KPhotoAlbum Development Team
- // SPDX-FileCopyrightText: 2021 Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-+// SPDX-FileCopyrightText: 2023 Tobias Leupold <tl at stonemx dot de>
- //
- // SPDX-License-Identifier: GPL-2.0-or-later
- 
-@@ -16,7 +17,6 @@
- #include <QTextCodec>
- #include <exiv2/exv_conf.h>
- #include <exiv2/image.hpp>
--#include <exiv2/version.hpp>
- 
- using namespace Exif;
- 
-@@ -166,7 +166,7 @@ Info::Info()
- void Exif::writeExifInfoToFile(const DB::FileName &srcName, const QString &destName, const QString &imageDescription)
- {
-     // Load Exif from source image
--    Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
-+    auto image = Exiv2::ImageFactory::open(QFile::encodeName(srcName.absolute()).data());
-     image->readMetadata();
-     Exiv2::ExifData data = image->exifData();
- 
-@@ -201,7 +201,7 @@ Exif::Metadata Exif::Info::metadata(const DB::FileName &fileName)
- {
-     try {
-         Exif::Metadata result;
--        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
-+        auto image = Exiv2::ImageFactory::open(QFile::encodeName(fileName.absolute()).data());
-         Q_ASSERT(image.get() != nullptr);
-         image->readMetadata();
-         result.exif = image->exifData();
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
deleted file mode 100644
index 6f0b4d7fe491..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
-SLOT="5"
-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
-	media-gfx/exiv2:=
-	media-libs/libjpeg-turbo:=
-	map? ( kde-apps/marble:5 )
-	phonon? ( >=media-libs/phonon-4.11.0 )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-"
-
-DOCS=( CHANGELOG.{md,old} README.md )
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.28.patch" ) # git master, bug 906469
-
-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 vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
index 034a17725fb9..2e3824144d0f 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.11.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kphotoalbum.org/"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"