gentoo resync : 13.06.2020

3 files changed, 4 insertions, 42 deletions

diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 6588c79bca16..e2f6b4ec2d04 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,3 @@
-DIST karchive-5.67.0.tar.xz 459424 BLAKE2B 61a864cc05671a13ab49c02c33ecf931ea0e9eb93446be6a26df7acc2c1b4738da1d47860ac111d7105e7a06932cb851b52cca709ee3c1db17ba1d36b594084c SHA512 e8a7695bebc8e9ab9596e10ad0ca9393942e4d3b198929481e59ededde7651859e8944586ddd00036e37c15a8501e5b067eff31562fb2384ab1c3ff6eb27d28e
 DIST karchive-5.70.0.tar.xz 987844 BLAKE2B 01702c2104d0abca1a43f87f072e8c3d34e6850d3f4e076a6d4efaa7e0d144c2e118a01810f2b41aebe307107fa8f4918062c429c2822c66968358bb601afb81 SHA512 3d3408ad6fcafdb7e945997228f8c3fd68f6229d07f76a081a35d1f793b1175be0367e24724dcbdaa16a297c4b7de042e4d160111f15e58a0fe8c6f2aad8ac41
-EBUILD karchive-5.67.0.ebuild 558 BLAKE2B 196bf6319d6d6f2edfc105344daf65d32827b5458cd107fe7d03f65cac67c17e4433538f231e0086b087be67553a48a4495acd4aee7a3118ddc45ef28b1f9be2 SHA512 2d320637c96c8f68829e389d21acf99278ef681a3e6ddee24f7c422563e11d8909b310ba1b3c7b6a3a0095af2ed52fc39818ee06a2aa8a249d869e37fac4f457
-EBUILD karchive-5.70.0.ebuild 561 BLAKE2B 58c15627ff36c45e49ad999af1c091575e24cf43235414965e7dbb6f5e6a0d76791ba1af06507ca2d656b48e205a5a60adc635f8cf9d77ea404625d79176f1c8 SHA512 b2749d9f1e7f564789677a3f14cf76f38ecfaf8f9455984def22ce4000818963c12f0b15b6b847aa5f29ef815c62229c82ebca9c98ad347688251a105bce601f
+EBUILD karchive-5.70.0-r1.ebuild 379 BLAKE2B 23e4d303944b7f0a94f479cd1819dd04a192a52c89f36eb0acf693c4309b310eb57af5634ba05cd18007867842be30ae95429aa2f093a3ebcb1fa2d2de780f57 SHA512 db8727a93a72f2f52afeb5c0781fd02f7caba491f1fd7bf73e12f38b523d525ba57482409e93f662a63b699b54431e47203cbd1eabe33a587ebd256dac204451
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.67.0.ebuild b/kde-frameworks/karchive/karchive-5.70.0-r1.ebuild
index 36bfa331cb49..e0cf280e5458 100644
--- a/kde-frameworks/karchive/karchive-5.67.0.ebuild
+++ b/kde-frameworks/karchive/karchive-5.70.0-r1.ebuild
@@ -8,20 +8,11 @@ inherit ecm kde.org
 DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
 LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="+bzip2 +lzma"
+IUSE=""
 
 DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
 	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
 "
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bzip2 BZip2)
-		$(cmake_use_find_package lzma LibLZMA)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-frameworks/karchive/karchive-5.70.0.ebuild b/kde-frameworks/karchive/karchive-5.70.0.ebuild
deleted file mode 100644
index 670e0664b959..000000000000
--- a/kde-frameworks/karchive/karchive-5.70.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit ecm kde.org
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+bzip2 +lzma"
-
-DEPEND="
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package bzip2 BZip2)
-		$(cmake_use_find_package lzma LibLZMA)
-	)
-
-	ecm_src_configure
-}