gentoo resync : 16.09.2020

4 files changed, 3 insertions, 73 deletions

diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 6864f902be87..0f8b4bea700c 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,3 @@
-DIST kphotoalbum-5.6.1.tar.xz 11773808 BLAKE2B c69cdc0afb455af64fe0624208b6bff34813a8f0341a4d3f21b7dc0462eb51f01574656028de497527c57a7ed70d1ab9dd6fe451ecec1696f09cfa8531dffe77 SHA512 fa1f4d566cd99e8c434b6e1fe28d8910b3b9c6aa05947ffbfa1b2b8efdab76f243f4b12883586e0c6692bfe54763a285374e16f3ceb23051619fe9b84cd58ea7
 DIST kphotoalbum-5.7.0.tar.xz 11784500 BLAKE2B 61b295178bac0724b1212c40ddb4178147183b7d982213077c82681e7480fc8344d5467851b839d06521f89bd8858a6c4727824e95ea712bb28c6e1bb2ce428d SHA512 36153fd946c7819540b1867a24b968103f7101d1d9ddc49a09b70df4b419380875b3016863417ba8326b50fd844d255888cd5b6f2d4ecf1e1a607d0c97e16851
-EBUILD kphotoalbum-5.6.1.ebuild 1726 BLAKE2B 3e2a2d490d50f51bc001838ec0413186b2758b520a2194c78ddb967e192fb45f8f94d4d3b78265186fc947964b7bb84e418dd9d183d041304cfd849c61774089 SHA512 85cc82a95bc884ae00139c4a5ddb9aba18a871eccb3e810d4a7a9ca2876fe2c53908b9e32c06a6fe76a9513f449f6a3c5cd65b4d111a3fcc336d7bb85363b372
-EBUILD kphotoalbum-5.7.0.ebuild 1576 BLAKE2B 9a93f696574f0209009971795379f980af38486627ccd01f74461b85d7c27437f904e4fde94e7b9012a4d5d8fedec492e4ff897bfca55e6f603bdc51aff77142 SHA512 8d7292249f60b3be33317f70bfdd10248da3dc8199647339c695ab140ebfd4bae6bd5813638ae20c10ccf390e17d8842115677e719a76600d132aff4853fb4b1
-MISC metadata.xml 520 BLAKE2B 209e6366254c9c863b1e5c3e850d914b83914a701e0615dbc6fcbdb2c30afc293f4649733a85dd8aa6827a3706c75447954eaa1d1d0eb4430fbc6c8d91a8475c SHA512 806029907a110b1936e6db79513a194a5e94bb195c917dbb700d479bf54a944993d1d0e8379e994c2b5feb05ad7ea495ad70a02e68fe638c5891e24801ee09d5
+EBUILD kphotoalbum-5.7.0.ebuild 1574 BLAKE2B 800f6a06118ddb5a1f51d286d5d08313ed29722cff38555688aa3bcb620fba32d7730edc5240d2d85fdfe8d612a899f67d4af584a91143c46722e86b63979caa SHA512 91ff5cb83b4b4dfb712ea90468f66f2d387dd0c5ea2dccf068f7f38d4586335f4a0a2c0f03f21f2c8446596950868d03399b6f65e6a867c66daa7be076e81d52
+MISC metadata.xml 450 BLAKE2B a20dea7c14d78a7fe31d76833fd632db0fbf91caaa04288e5de9089786b0725aaf523d73e89def8a940fe1bdb240463fbf37fcbe667f3270e070bfd9fdb0e3d3 SHA512 61eee726b84b0482e88c7b1f2bf811603e04ab2ed9b24154ba4ad863252dda11a7e715909637160541b8be90a2d2a510506255b05935c1da5bbff94f1f67877a
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
deleted file mode 100644
index 61893466aefd..000000000000
--- a/media-gfx/kphotoalbum/kphotoalbum-5.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-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"
-SLOT="5"
-IUSE="+kipi map +raw share"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=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/phonon[qt5(+)]
-	virtual/jpeg:0
-	kipi? ( kde-apps/libkipi:5= )
-	map? ( kde-apps/libkgeomap:5 )
-	raw? ( kde-apps/libkdcraw:5 )
-	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	media-video/ffmpeg
-	kipi? ( kde-apps/kipi-plugins:5 )
-"
-
-DOCS=( ChangeLog README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package map KF5KGeoMap)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
index dfafce49dc68..cac8efff8a79 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.7.0.ebuild
@@ -13,7 +13,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"
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index f0dad21bde3d..5b8b5f496a48 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="kipi">Support for the KDE Image Plugin Interface</flag>
 		<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>