gentoo resync : 22.06.2019

4 files changed, 2 insertions, 128 deletions

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index cff2f12ea04f..9ad7cef12382 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,6 +1,3 @@
-AUX kphotoalbum-5.4-exiv2-0.27.patch 1687 BLAKE2B b1d94b96200dc3e750e76c1e8567061ee6fa693478aa82556f24ef805365653eb90d72252b0a26d24b9b8a224f767ca56710e0d52701a71d82e41d3651e86d17 SHA512 768e7c1e31e4472dc304eae85bf8ba73bc590cd7817c486ae9051f0a25eb333f9054dea81187230b816381c6299e6bf374e1d6455db9b7d2532490b6f1f934f7
-DIST kphotoalbum-5.4.2.tar.xz 11807452 BLAKE2B 45ecdb4fbe3d66770394751911201737b698d2d497bb387871755113d153ef2c01a9b7e4a101f2b465d79801d0f88f084a0d0832550591012b44c70e5b28ff7f SHA512 9a4548141c56dd6426244e646a0d2bfb2eac28797c63ae478a56d6b1c0484ce5e607abcb079e50fcbc0643f7e9a94844a9af6600748ce465b8f66781aa5e3038
 DIST kphotoalbum-5.5.tar.xz 11661532 BLAKE2B a14900cb7628b86aafa736de4b443f3aad3b4198bc6a04bc67fbc40f1bec9898ebbc33e60d4ca90db3b857871f75c70d6946efa2e756b3c5d7ae769bee6b2723 SHA512 fcca891a94580db2f606c5d077af2651e1dbcd59429823410f9fd2d07ac0c3c625ac441b723d4c8cb3ac7ede26ccf69f955c19fe302fffc9788fc33def9ee3e0
-EBUILD kphotoalbum-5.4.2.ebuild 1576 BLAKE2B 29430537ec49d17356232341a687a57bc2ac88e0307bf370a0deedab0b39ce41f377914c21c23c55913990eefd20d6a06b4c57172b81c6f5b8c5b0cbb0741cc4 SHA512 d2454c899ccaa1b85164b74d6e4080a48a21c1e24b351049c4ccf9278891878604a3d2bcae9e6dbbdf965fa02c7339c0a44502befcf7b385bc9e58f8c472092d
-EBUILD kphotoalbum-5.5.ebuild 1521 BLAKE2B 0a6e7c204fd03881b2b9f1dbc6694d7f12905adfa03a5b30be2085e4f82f7344282679e6c12707f3e9407038814d54dad80e9c6bcfc226492973841e4c1ab85d SHA512 132be79a4b22a264667c3e7505e3a394abee66900f9b0ea94e5aad82e5d69158c51154750893fd6e9e43c4dbf240cf57eb27367189d47f08744013248d7ba532
+EBUILD kphotoalbum-5.5.ebuild 1519 BLAKE2B 866de469ea2bc6f2121ac5689eadb99b370953162adc09b5fe2fed8ca0b94c1f73799e163add92617942b13dc152f316c10e6a41da26a2d127f625992e8c0d64 SHA512 779d8d5f93d466dade4d75078cba7aa9a738d91e46dfc5c76cbaad668ec967c3269f52d3cda379a5e2351488fb389adaed1e4431e4ad141a8be8412930bfc9d3
 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
deleted file mode 100644
index 7b7f612b94f9..000000000000
--- a/media-gfx/kphotoalbum/files/kphotoalbum-5.4-exiv2-0.27.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 41c7da0531c8a1eb7046345c2b991e7a5d1e6657 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Sun, 30 Dec 2018 23:36:24 +0100
-Subject: Use Exiv2 0.27 if available.
-
-Beginning with version 0.27, Exiv2 ships with cmake package config
-files.
----
- CMakeLists.txt | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3012f7a..5dcc29c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -44,7 +44,17 @@ if(JPEG_FOUND)
-     include_directories(${JPEG_INCLUDE_DIR})
- endif()
- 
--find_package(Exiv2 REQUIRED)
-+### 2018-12-30 jzarl
-+# When Exiv2 0.26 can be deprecated, FindExiv2.cmake should be removed
-+# and only find_package(exiv2) should be used
-+find_package(exiv2 CONFIG QUIET)
-+if(exiv2_FOUND)
-+    # search againg with REQUIRED, so that the feature summary correctly shows exiv as required dependency
-+    find_package(exiv2 CONFIG REQUIRED)
-+    set(EXIV2_LIBRARIES exiv2lib)
-+else()
-+    find_package(Exiv2 REQUIRED)
-+endif()
- 
- find_package(KF5Kipi 5.1.0)
- set_package_properties(KF5Kipi
--- 
-cgit v1.1
-From cf4f7645b3c94246a1fcf664f1c865a93ae2b684 Mon Sep 17 00:00:00 2001
-From: Johannes Zarl-Zierl <johannes@zarl-zierl.at>
-Date: Sun, 30 Dec 2018 23:43:14 +0100
-Subject: Fix compilation with exiv2 0.27
-
----
- Exif/Info.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Exif/Info.cpp b/Exif/Info.cpp
-index be4c88f..9545360 100644
---- a/Exif/Info.cpp
-+++ b/Exif/Info.cpp
-@@ -28,7 +28,8 @@
- #include <QFile>
- 
- #include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exv_conf.h>
-+#include <exiv2/version.hpp>
- 
- using namespace Exif;
- 
--- 
-cgit v1.1
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
deleted file mode 100644
index f2dda9ed28ed..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.4.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Tool for indexing, searching, and viewing images"
-HOMEPAGE="https://www.kphotoalbum.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="+kipi map +raw"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-gfx/exiv2:=
-	media-libs/phonon[qt5(+)]
-	virtual/jpeg:0
-	kipi? ( $(add_kdeapps_dep libkipi) )
-	map? ( $(add_kdeapps_dep libkgeomap) )
-	raw? ( $(add_kdeapps_dep libkdcraw) )
-"
-RDEPEND="${DEPEND}
-	|| ( media-video/ffmpeg media-video/mplayer )
-	kipi? ( media-plugins/kipi-plugins:5 )
-	!media-gfx/kphotoalbum:4
-"
-
-DOCS=( ChangeLog README )
-
-PATCHES=( "${FILESDIR}/${PN}-5.4-exiv2-0.27.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package map KF5KGeoMap)
-		$(cmake-utils_use_find_package raw KF5KDcraw)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
index b062c1d18226..c6580ef98077 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
@@ -11,7 +11,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"