gentoo resync : 17.01.2010

5 files changed, 40 insertions, 37 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 64a77ca74dfa..7e4db5d58ae0 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/github-pages-publish/Manifest b/dev-vcs/github-pages-publish/Manifest
index 90fb31a4fa90..0d7a8e3504e8 100644
--- a/dev-vcs/github-pages-publish/Manifest
+++ b/dev-vcs/github-pages-publish/Manifest
@@ -1,3 +1,3 @@
-DIST github-pages-publish-0.1.2.tar.gz 3295 BLAKE2B 6c891dde4fe450bb8708a5428fb1b205e111ebf876a7c8348e69dc89b95c43472a0ecc70ed75de7a3d137a8beead8ca00b12206dc8508371aa34c57ce53d6133 SHA512 3011a070c0798bc3f2853c32c6d97e20eb4711a23b4e2c2b188b4158d46d1434d89f8400bebed0806b9781cd8e13800f3e10d9e99ff2fc4e02059329fbee2658
-EBUILD github-pages-publish-0.1.2.ebuild 742 BLAKE2B 3b4052a909ad8f6bef1049c39a266e973e86f8614b376b29a1a1e4d59b35f06e619e6502921a2c3cb7c81f68d9b4c6e3ff709d4efde5858035e9ff70055b7a85 SHA512 194190921c7c8ce739e1e424a3d23089da3997b310653094549ec3628f65a02273e8541292db52cbc1135c41c37734c2a8fee54354e3fc68f2082a97c59cc3c3
+DIST github-pages-publish-0.1.3.tar.gz 3568 BLAKE2B d19d9d218d584f92a70016b6522b1e27edecf7de8dcc1fb4ca790980ec2a4ffd4f401f11ac7cd2483e5e723f9ae088678dc3aa346eb66de536a5c10435ff1953 SHA512 a501a6fbdf10038a35b5df8add58a79813d6cc2b26b2bfed2a2db7d02740c587a60402459c2fcdeeec66c72f1d5df532023490219daba14ce60782a2018b93d6
+EBUILD github-pages-publish-0.1.3.ebuild 755 BLAKE2B 655da651e3a39a4c2beda67a829e28eb7a00e3bfe0adeaff1c95106570cc058cbb64468fe3d52fb1af1b2331104f1f8bdd303b9f9d47544119ed4ba509ec84ab SHA512 5779dfa8da944a458409ab8c859ea4f99612283d824608976e4ddc838efe48e6a2e242ef318051e0bc02ae7bcd941b27936b99637c51174ebf4e9f1a9c167e98
 MISC metadata.xml 690 BLAKE2B 44cba5368226e6cc68ef5625a155c4aa41c243515e11ffea4886dc0a33d85f21c0b171910fa301429ebcb9f7fa93b41f5a565486f37d5391102ea38c93470d00 SHA512 e06cae5ac90a76620423fc720abee1165f4d0856fb083275e7d7f9c93c9c5689cd3d2b87489fe33bced9c3ad1d91f1eb681413abbb3ddd0079addf8a183fa025
diff --git a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
index 13890ea8da56..d24e31d07ff1 100644
--- a/dev-vcs/github-pages-publish/github-pages-publish-0.1.2.ebuild
+++ b/dev-vcs/github-pages-publish/github-pages-publish-0.1.3.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 GIT_ECLASS=
 if [[ ${PV} = *9999* ]]; then
@@ -28,6 +29,5 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-python/setuptools
-	>=dev-python/pygit2-0.20.0"
+DEPEND=">=dev-python/pygit2-0.20.0"
 RDEPEND="${DEPEND}"
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index ecc07bd4a4d2..5483d8b1c036 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1,3 +1,3 @@
 DIST kdesvn-2.1.0.tar.xz 2096108 BLAKE2B b2807e6222d5743858a9592fe568c851e466f1349bb97869c3acab892b6ef9ce730d6ec1875b720b2ebb5e2099f6d4287bf76995d7b95800f0814499736b97c7 SHA512 ec1ad8422fd698a9c07d43c3051aabff615ea774c0e988ae07843f1935a2a5c3390cf175db5c10acfe3d94abcd7a2b9b41680047598c4e7b53162cdb4e74768d
-EBUILD kdesvn-2.1.0.ebuild 1489 BLAKE2B d021e66f34ae59cccd828cf06a2d011f981079c0ce81c9892948f97e0891dd1eb131060e9e4e3e0c5131c3693f82298106507df86ec961f1f33cf473656e5599 SHA512 75b37b9d19c04135a463258f77ab66b3a45965e138b9147e14aa1c38e97686cdb43515eb71f15e20afa87dbc6ffe6015d2e280199f1cc79489a0f1524026cc2b
+EBUILD kdesvn-2.1.0.ebuild 1679 BLAKE2B af57aa6ae93d225878ff3c9f1ce2f62693b7b2156c1f4b9d659977129ac3dda77c64e81e4161e96b9d53d8f7dd2872ce61730eb2a3547d8e17f442e27ce1ff99 SHA512 43cb104fd007b4267ce337729d089eb924962a5c83fbde3780e30811ab5a8f032850920e18b6597a33915388e20c4bdbf18d536f989375c410514cc29172d82d
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
index a6bf20965e15..251a929b7516 100644
--- a/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
+++ b/dev-vcs/kdesvn/kdesvn-2.1.0.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="A frontend to the subversion vcs"
 HOMEPAGE="https://kde.org/applications/development/org.kde.kdesvn"
@@ -15,46 +17,47 @@ if [[ ${PV} != 9999* ]]; then
 fi
 
 LICENSE="GPL-2"
+SLOT="5"
 IUSE="+man"
 
 BDEPEND="
-	man? ( $(add_frameworks_dep kdoctools) )
+	man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )
 "
 DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
 	dev-libs/apr:1
 	dev-libs/apr-util:1
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	dev-vcs/subversion
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdesdk-kioslaves:4[subversion(-)]
 "
 
 src_prepare(){
-	kde5_src_prepare
+	ecm_src_prepare
 
 	if ! use man ; then
 		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die