gentoo resync : 15.12.2019

4 files changed, 51 insertions, 46 deletions

diff --git a/kde-apps/keditbookmarks/Manifest b/kde-apps/keditbookmarks/Manifest
index 3a1da9879ab0..a328bdd66458 100644
--- a/kde-apps/keditbookmarks/Manifest
+++ b/kde-apps/keditbookmarks/Manifest
@@ -1,5 +1,5 @@
-DIST keditbookmarks-19.04.3.tar.xz 184160 BLAKE2B a51e4ace794efec049c423a4408ef2d263923a2f034250e5162936744ca9634c2a75777cc18a0499ce8dca0bce6f796625d17d32348357c42ff672091419d963 SHA512 11c441a9153928b267cec1525875f854991c3e1a807b0bfc8e18e2afca441a0a8b8de36b675129e301fad36c15f26637e8dc23ced2287d7c2e5a5ea3e17e5587
 DIST keditbookmarks-19.08.3.tar.xz 187176 BLAKE2B 35872576bb07105f72474bb7e2a52b0bcb652e699ee4828a39747519720cb32b5d664f4ba9a8205085aa7f86928f258789f2ab5bf3ef7e10e44210d54e479632 SHA512 dfe6637232b33b01ca74626225c9040f462d4b8db59f10c97a505f3caa56cac07a7a63c154c3ba5be2832a1fa9be9080262773edd8b37469c92288b1a38a397c
-EBUILD keditbookmarks-19.04.3.ebuild 980 BLAKE2B 9b876ca8fdaf5ca819b3449f395076515e59e12b288bc264ea7a4b07589e9fd1392ef7ffed5ebe5af7534211c2659dc5d04ddad14a9380d1886e9107fa8dd978 SHA512 e5b9cdbd7de2176e95cb624a1300f8072eb9e626323d5e66337bdcef18c8665ea848254b846c7eef74a415783117950d55a77f0f6baead76f65be75f738915b1
-EBUILD keditbookmarks-19.08.3.ebuild 1156 BLAKE2B f0ca0567761e7e0e2d5e3cc16dc8c382f53ad879360204f41de1885135df3ff10e4250f60c7099b8fde854f6ad547430ee3d555ec06d2f315c822e6a4550423b SHA512 a4f9a35ab2c33f782d998eb21631f91a6b0ee4e6d1d47c80a3d9468e667ef0c425bf0f7aeea6a2715f61af4024c9daddf8470351731583c28f9e9b9d87a8665d
+DIST keditbookmarks-19.12.0.tar.xz 187376 BLAKE2B 5c9559d23da6d53e8c8c7c44ed7c89bb5a6949e2149f0c875a3d7bf3e05a0048f6555d6f2f9a3f236eb21e0e94c892a08da6f3df3a9d5ae066352d65bee4706f SHA512 d48791672609ebeeaeaee21814fd8392240a6215fa26a763619161ca13b874bf6154c3385a7868da939be165f635bc16c27badcf549c660b7a0f4170eb1ee4c5
+EBUILD keditbookmarks-19.08.3.ebuild 1153 BLAKE2B bff119eedab6c8fe5f60b439a79cbc7489675f467d9305d193d548e8a6fa5f258999c0438bb719e59a65160acac23d46921a2c8bcd5bec9fdd990c386d1e97c3 SHA512 1a6fd43c26b2a14332200b56fc10abedbc93e95fb7de20e16c018b3007750bd88434653374f23979e607c842cb0b12e0620312497893067cc50829ba74aeabc1
+EBUILD keditbookmarks-19.12.0.ebuild 1157 BLAKE2B 11441f290a4c61104dffeaf64e4bcc4dd2095e9b576db22a8321ecc617ebff194066dec51da3e4c1c63610af796b258788c37c1849833b9060e59fddaf44418d SHA512 51bfe8733625b7ed7bf69a5ccb041732284ac61bf70f3d8266e496347ebe222d331c45cac390e93b6a7a096d0174014388a1b2ea8de19d1f1ae678e7c6d8b77d
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild
deleted file mode 100644
index a3a7418d3ee9..000000000000
--- a/kde-apps/keditbookmarks/keditbookmarks-19.04.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Bookmarks editor based on KDE Frameworks"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+man"
-
-DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(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 kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare(){
-	kde5_src_prepare
-
-	if ! use man ; then
-		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
-	fi
-}
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
index 402e5d21e843..316916f73d05 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.08.3.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org
 DESCRIPTION="Bookmarks editor based on KDE Frameworks"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+man"
 
 DEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild b/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild
new file mode 100644
index 000000000000..4d1c3fba57df
--- /dev/null
+++ b/kde-apps/keditbookmarks/keditbookmarks-19.12.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Bookmarks editor based on KDE Frameworks"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+man"
+
+DEPEND="
+	>=kde-frameworks/kbookmarks-${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/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+	ecm_src_prepare
+
+	if ! use man ; then
+		sed -i -e "/kdoctools_create_manpage/ s/^/#/" doc/CMakeLists.txt || die
+	fi
+}