gentoo resync : 25.05.2018

16 files changed, 137 insertions, 40 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 673b438e8e5b..433f30c3a23e 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 25ceeb82248c..d19318c264c5 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,5 @@
 DIST ark-17.12.3.tar.xz 1970120 BLAKE2B b8e14f6b5f541c514107cf76b612edd99d6e0d97dfbe7600349bdcf2bd5afbfd1fcaf256d0358ff0c8838d8334a14ddd1ac5d29ce9befebe960444e0828aba5e SHA512 2f32f0107afa20ef115caddaf3c7ce6be37a575c72ea440f571312309d945a0e0491a4327db379e8ca7622a2b5016c5b2bbbfb3377d3b4272430f85b23fbb911
 DIST ark-18.04.1.tar.xz 1971344 BLAKE2B c1778e8777b6772f9ff72a23296b29daab9179c3ddc83297e46695f8e9b6c64490b3dad716104a5c9cbe936562481174a69d8356032caf901c0e8b91ae732ec2 SHA512 0a6a390f3771c4dc1d6386fcb17eac0416bc7494f6517d60a8007a676322b1986f6ff526ba8514a9f68913bd67f2105dfe9bfd1aa24feb2f19f67b442b1d1f8e
-EBUILD ark-17.12.3.ebuild 1834 BLAKE2B 89c23fab134592a27905dd66a4598b20df701ff11e9d2716b6015c85ee789779b90ac04077c4894544fd9e9cf92a878dd0cfa24f131d13075079aa29ff4cef37 SHA512 4577863a920fb488b2f275a78e74427176e4c2680ab604b6fe96c3e96ecacf692b1c757e09c787fb4a9a4b386094db4e1687d3fe61118ba570e9908201e06ff8
-EBUILD ark-18.04.1.ebuild 1836 BLAKE2B 0dbb76a934c833060023797c380d8bc57bec858c0ecaccae9eff606278c1e7a849788b4cd5f04ad26493e3b336e52ad27319152cdc8986c1cf48509700c1776b SHA512 669204c448e23da0fe05365dfefa81de2e88d5cfbad74d41944b21b0ef933b01f661e6e95529059008dd9f839cd3f0df51683866e5ceab625dcd19b95d8a15eb
+EBUILD ark-17.12.3.ebuild 1942 BLAKE2B 33c6fa57d3e3fca99e18c2cef0c2505ff239ea66f2f5bbc9fb177b293344c2b16360021902046fcbafc5ec6e71496fc47a96a07a849ae0a9cb75085d142bab9e SHA512 05f9578df0799c444409bac6ef1c7ac1824493a7080af68d9f908ef0a7bd6348722d2c2c2fdfd9e1e57296d7b5823416869cf57438def2e58942857db267e78a
+EBUILD ark-18.04.1.ebuild 1944 BLAKE2B 3f014c4d6621f7d41dbc11852b11b513ec6844bf73548e22461e503b7afaa2eba1e00a75a3286b4a355c473bd50c988a039c49b8195da3fbf92a2304fd5bacb4 SHA512 2aa41369da96eb37e926d8e8cced96313e30a9356fb96011aee678c29e4afde5b0e32d62734dd88e57fe6f6b32d9f699dac9429cee34a2333c519e639dd4fab5
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-17.12.3.ebuild b/kde-apps/ark/ark-17.12.3.ebuild
index e749e2732df5..cdcdabb24632 100644
--- a/kde-apps/ark/ark-17.12.3.ebuild
+++ b/kde-apps/ark/ark-17.12.3.ebuild
@@ -60,16 +60,16 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	# not a typo, app-arch/unar is a real package
-	if ! has_version app-arch/unar ; then
-		elog "For handling rar archives, install app-arch/unar"
+	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
 	fi
 
-	if ! has_version app-arch/p7zip ; then
-		elog "For handling 7-Zip archives, install app-arch/p7zip"
-	fi
+	has_version app-arch/rar || \
+		elog "For creating rar archives, installing app-arch/rar is required."
 
-	if ! has_version app-arch/lrzip ; then
-		elog "For handling lrz archives, install app-arch/lrzip"
-	fi
+	has_version app-arch/p7zip || \
+		elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+	has_version app-arch/lrzip || \
+		elog "For handling lrz archives, install app-arch/lrzip."
 }
diff --git a/kde-apps/ark/ark-18.04.1.ebuild b/kde-apps/ark/ark-18.04.1.ebuild
index eb5ba8737873..7a5bb558b1c2 100644
--- a/kde-apps/ark/ark-18.04.1.ebuild
+++ b/kde-apps/ark/ark-18.04.1.ebuild
@@ -60,16 +60,16 @@ src_configure() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	# not a typo, app-arch/unar is a real package
-	if ! has_version app-arch/unar ; then
-		elog "For handling rar archives, install app-arch/unar"
+	if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+		elog "For extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
 	fi
 
-	if ! has_version app-arch/p7zip ; then
-		elog "For handling 7-Zip archives, install app-arch/p7zip"
-	fi
+	has_version app-arch/rar || \
+		elog "For creating rar archives, installing app-arch/rar is required."
 
-	if ! has_version app-arch/lrzip ; then
-		elog "For handling lrz archives, install app-arch/lrzip"
-	fi
+	has_version app-arch/p7zip || \
+		elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+	has_version app-arch/lrzip || \
+		elog "For handling lrz archives, install app-arch/lrzip."
 }
diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index 15b66ef8d825..7da44b71c61c 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,6 @@
+AUX dolphin-18.04.1-flto.patch 3061 BLAKE2B d24d99f9cebd2979d6e0b6c8edb30b552601ba502937313395dae35e9c21c2ec6b1978eaf949cb87c5846ea6a12fe535b4fc849b3d7547c6c95c5b75c0cfc2d9 SHA512 7af21ea15381a460b08c02d5dee0bc1702a2a30c0b86b2b8f1b937783a199fb3b3cc1f76ee827ac15ca934d0e975ad2e702053369477afa35990423abe7e9d63
 DIST dolphin-17.12.3.tar.xz 4841752 BLAKE2B 1f58cb0f1663e131a1b8dc58fc47d40a8a68bcb998fd3c6191f99176263523d40c1d9057b569c10c14e2a6b0be91b2eaaf07a54acdd386984d0da167cb84fabd SHA512 44cf8baaeead69dd5529ce7da96d78f507029fa47ac9ac50de9d77cb15335dd0b0e0c916f2cdd0d5cadc465e461115dbfd02c51af38d03da985d66bd22456136
 DIST dolphin-18.04.1.tar.xz 4849868 BLAKE2B 3335ced611590b51200135207b5bc5e2266504c7d556e8a903b6f3f63131547369d1fcccce8f13f93f4f15c84e695827ef4deb6088e5ec6219c15f85c140313f SHA512 13c9f45282168a4ae68b9d0977b1734918c662028043167ab36bc67b7b7f1756930a613e7bbd25bafc6db7e1591524f2ec3002247838ddbf0dc49037d4c7a0fd
 EBUILD dolphin-17.12.3.ebuild 2230 BLAKE2B 8e3d435eac7d521830bbd13122d7616bc5c54b786eef8386dad3c9b97447058a843d61c060308518c84e776787cdeb0e1b3399fc099f69faa6b7f055eae79c58 SHA512 b3999175d7bf0672fce3b697104b9fb024c9d0487dad8a40d1f37405ca7d611b2981a76629c024eb06cf7503c900a2a2d70c365d718fd8b173562103f1db975b
-EBUILD dolphin-18.04.1.ebuild 2232 BLAKE2B b4f046f19a528c78bf029e0a7834c4bee8759c053fdafb3c7cc199f527981090eb670b70fcff76854071a7fd656bc30da75b96cc60661724a0a54f0d3774a62f SHA512 d1fe6680f462eb3ee58bd6e12d13d0cf9594dbf14b8a4521d241c62e3a2a7d46e74b9a61120450a5037a9f9c61d349b0a0975c208fa0759e667788d4495b7fa5
-MISC metadata.xml 331 BLAKE2B a91c4bcb2198a9547445e94220760e327f2cfd2225e4189b4d5ec23ade31bd0c2560403cd085d91430fcde303df0cf25477b840aeda3010f332a3f053aa5aeaf SHA512 2946556cf6d92f1d2c33c44b4b261003d6e26f2829944082422afceab77f7a504dac7cc945fddaa0539953884b57a41dcc8f2f8b972b48fb4dca502b8a92d367
+EBUILD dolphin-18.04.1.ebuild 2275 BLAKE2B 13fc14e37471e745d503ef2fb3bd56bb9ba8369f652baef4be81336344ae69b80836adc02b64b9cb3c921a4df74586b12de84cc4e843524d85ac8d051d8769a8 SHA512 43d99858981bd3adeb81552a5563b6772a8cda7412c69fc51647a0be6ffee6dda93686c43bff6e8a2c84bc0f626d940ac9dd7d98bb694bca2f80fbd749e2cff2
+MISC metadata.xml 325 BLAKE2B 2526d5a76392c6c3ba96998586cab48d43c3bf87422c698fbfe009c398d2f84b13193f4cebd06e87b3f7856a83824e3ed3a34b902a437671fb9302de2af44674 SHA512 8a728d296c68f8046b32871bb185a467b1b03a25af3c026647d76b40d83d1f8ee959fac135b26ed1fdb3ec15cdb6c58c75d9fd128122331181530637e2d69169
diff --git a/kde-apps/dolphin/dolphin-18.04.1.ebuild b/kde-apps/dolphin/dolphin-18.04.1.ebuild
index 256cdd947622..6814ee4e99cb 100644
--- a/kde-apps/dolphin/dolphin-18.04.1.ebuild
+++ b/kde-apps/dolphin/dolphin-18.04.1.ebuild
@@ -62,6 +62,8 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-flto.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
diff --git a/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
new file mode 100644
index 000000000000..8edef6b36013
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-18.04.1-flto.patch
@@ -0,0 +1,96 @@
+From b607091c3982f6b84732fcf0c23c1c3f0054f203 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:43:25 +0200
+Subject: [PATCH 1/2] Remove main.cpp from dolphinstatic_SRCS
+
+Summary:
+The file main.cpp is already in dolphin_SRCS and doesn't
+belong in dolphinstatic_SRCS.
+
+Normally the duplicate object is simply ignored, but with
+link time optimization (LTO), linking dolphin can fail.
+Apparently, the compiler tries to inline inline kdemain()
+in this case. That is undesirable anyway and it ultimately
+fails because the DBusInterface definition is not available:
+
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x2583): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `DBusInterface::~DBusInterface()':
+<artificial>:(.text+0x5aa3): undefined reference to `vtable for DBusInterface'
+.../ccHEv6cl.ltrans0.ltrans.o: In function `kdemain':
+<artificial>:(.text+0x7686): undefined reference to `DBusInterface::DBusInterface()'
+<artificial>:(.text+0x7b64): undefined reference to `vtable for DBusInterface'
+collect2: error: ld returned 1 exit status
+
+See also <https://bugs.gentoo.org/655710>.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: elvisangelaccio, asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12929
+---
+ src/CMakeLists.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 263b3ff0c..e8fe719a4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -207,7 +207,6 @@ set(dolphinstatic_SRCS
+     dolphintabwidget.cpp
+     trash/dolphintrash.cpp
+     filterbar/filterbar.cpp
+-    main.cpp
+     panels/information/filemetadataconfigurationdialog.cpp
+     panels/information/informationpanel.cpp
+     panels/information/informationpanelcontent.cpp
+-- 
+2.17.0
+
+
+From 8e6f4eecd318041d2e4e6386d1660742dd4ddd89 Mon Sep 17 00:00:00 2001
+From: Alexander Miller <alex.miller@gmx.de>
+Date: Fri, 18 May 2018 22:44:52 +0200
+Subject: [PATCH 2/2] Make target_link_libraries for kdeinit_dolphin PRIVATE
+
+Summary:
+There is no need to add all of kdeinit_dolphin's
+dependencies (including the static archive) when
+linking dolphin; kdemain is the only needed symbol.
+Mark the link libraries PRIVATE to simplify the
+link command for dolphin.
+
+Reviewers: #dolphin, elvisangelaccio
+
+Reviewed By: elvisangelaccio
+
+Subscribers: asturmlechner, kfm-devel
+
+Tags: #dolphin
+
+Differential Revision: https://phabricator.kde.org/D12931
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index e8fe719a4..beaa0ec50 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -299,7 +299,7 @@ ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
+ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
+ 
+ 
+-target_link_libraries(kdeinit_dolphin
++target_link_libraries(kdeinit_dolphin PRIVATE
+     dolphinstatic
+     dolphinprivate
+ )
+-- 
+2.17.0
+
diff --git a/kde-apps/dolphin/metadata.xml b/kde-apps/dolphin/metadata.xml
index b3bd92dee775..6038ccc85636 100644
--- a/kde-apps/dolphin/metadata.xml
+++ b/kde-apps/dolphin/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="thumbnail">Enables video thumbnail generation</flag>
+		<flag name="thumbnail">Enables thumbnail generation</flag>
 	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index fd8834f390e2..0c1b8b35116b 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,4 +2,4 @@ DIST kio-extras-17.12.3.tar.xz 555544 BLAKE2B f8821e0ce5c3f6a7a28ae6a5d672227697
 DIST kio-extras-18.04.1.tar.xz 549832 BLAKE2B 5771114528fbdd65a909d8a9674df1bf4160e3d7f5716245d5aa9cc5a6dbbb31bf07f45c22106316bd090bf48934fb7d866a4d97fa192a962cb5d398d82b4c08 SHA512 7a08fabf8ff3cc03b02e88f38e889798489e1997c6678635c07c7597bbd9142450030e28958d4ccfd5e1aabc2ba0b213faa981fc30256d7edb76217ae99e40bc
 EBUILD kio-extras-17.12.3.ebuild 2296 BLAKE2B 765a560c155d84d38e9b2112ffc9bbb8c24b25fbf77e45a82b263c4a84ef0931b3d42f75f37416b685ce630e0988bcde065c513ba70e16cfb76dc380b34781b6 SHA512 6d7d7f1f347b11b038d6d0c224f26762068b495b90447d82f2ca4b9e54f45529ffd37250d60a1c273e5e8e95fc3e97e819d7381e0ebcf3ce003a238276d42bae
 EBUILD kio-extras-18.04.1.ebuild 2225 BLAKE2B 1fee0b466ed3ff3feb108bcbfdac696749c94b550bf17d9b5e86f86359926c8b0404c29341192a4ee1a1bea14fa5fe400b0355cf63ebe370690d150e396aa42d SHA512 67b691874315de0d52cadab2f404d54d63b1677f660c80cf2cd8ee966ff2967f83bf46080a74c2b3e03ca600af93ebd652b61c3f5240b1010487659d96acd818
-MISC metadata.xml 679 BLAKE2B d5e3be772a13920bb093a4314931eac48f5a398582794ef769869d4f1e7c0d8136a12ebd1ce2fecccaaae99001194533b6c08b34a7f1a1e33c711e233428997a SHA512 018a5237fe9ace1ffba82c4dd5d3a4ce6228244476a163fb01ab5f914262cb20ff77d58e8dcc99713071ceb1764b9bc24fb61a8713001059b057963a9620abf3
+MISC metadata.xml 765 BLAKE2B dc7954f6adcbf433e73a70b1e352c0522d61a9dbcd09894584407d5bad621788b36eb8e9f5f79c83b923baf11b14dea8372244d06f005220c282549a7d8f3dd6 SHA512 63acedc06b541f4150c89fc289ce05b86fab57de253e33626fbe9b02ca0511e9d34cdc1169c1559945ee1621f46aad09fd526c7fa647ffd1cc04e09509516378
diff --git a/kde-apps/kio-extras/metadata.xml b/kde-apps/kio-extras/metadata.xml
index c32c83220788..eb1ddeffa305 100644
--- a/kde-apps/kio-extras/metadata.xml
+++ b/kde-apps/kio-extras/metadata.xml
@@ -11,5 +11,6 @@
 		<flag name="man">Enable manpages kioslave</flag>
 		<flag name="phonon">Enable file audio preview plugin using <pkg>media-libs/phonon</pkg></flag>
 		<flag name="sftp">Enable SFTP protocol support using <pkg>net-libs/libssh</pkg></flag>
+		<flag name="taglib">Enable audio thumbnails via <pkg>media-libs/taglib</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/kde-apps/kopete/Manifest b/kde-apps/kopete/Manifest
index cde794836346..3c0a4d37a4ec 100644
--- a/kde-apps/kopete/Manifest
+++ b/kde-apps/kopete/Manifest
@@ -1,3 +1,3 @@
 DIST kopete-18.04.1.tar.xz 9733608 BLAKE2B 33879b2d95c47f1d21e50b0577c82ce8a619d2967b8b6389cac11b0bd3b1235c9789b28e318f89387496639669cbebaa1e109d479b6365622bef74cb9d127d04 SHA512 2b503ba717d4b64823a64eb093bc4ddbdeb7cb7ae0a73827eaa4a8ae4ad3a5aacf33c4d9e3cc28d88bc4f915418135ddb6b236e5c9d8227e14c802f8b9385e6a
 EBUILD kopete-18.04.1.ebuild 4615 BLAKE2B b6d483eb30ee85504a8ff917549d13354be4b907827d61c398303ce594086c536a8570561fd0bf1e4dd5e719ccad49ad4281d3727c283f06381e59e1a0720fc7 SHA512 c56282f80044aa835bec79c03b0e4b03b54641c41e262cf02fa1bc0f56c52de09f2cd5fa5c6bca01f8ae7ecdcde4f13a2c481530e01ed3078948f7e68cedb799
-MISC metadata.xml 2351 BLAKE2B 0f8ef4e3906f98a4be58f252fe1beb8ff8a9bb872584e5be9432d63a4932872a81c3036a9cd0d72d98a1ce961ef79194b613b5115e19970e352d5b832bcb6b44 SHA512 2b0350f15c75e45326fc0a6c16f875a2b923726de45ff8558e55c7a592c3c033c0f518f85f9cb4dea3bf54b9c182ec0ea083f3b11b878d398df6d7429a3f75d1
+MISC metadata.xml 2090 BLAKE2B 33e9e9e73f5140e7775f5e8b00ba6c96b66e99457fcd460a84d3f191b65b2af1c99d18526c2b43e2f71cdf58c1f6668c23e00e65d38aa2417bd9d48ae1e55f92 SHA512 24e7bd54aacee76798f9182a145c4bd271effcc624aa9283bed05e5fb156feabd73d5d29143034158fda85feef2f43100c5d9ded586a8136ca63438560dc7136
diff --git a/kde-apps/kopete/metadata.xml b/kde-apps/kopete/metadata.xml
index 64e9226784bf..0cefd8509a69 100644
--- a/kde-apps/kopete/metadata.xml
+++ b/kde-apps/kopete/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<!-- PLUGINS -->
 		<flag name="addbookmarks">Automatically add incoming urls to bookmarks.</flag>
@@ -21,20 +25,10 @@
 		<!-- PROTOCOLS -->
 		<flag name="gadu">Enable the Gadu protocol handler.</flag>
 		<flag name="groupwise">Enable the Groupwise protocol handler.</flag>
-		<!-- uncomment this when enabled in ebuild
-		<flag name="irc">Enable the IRC protocol handler.</flag>
-		-->
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<!-- uncomment this when enabled in ebuild
-		<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>
-		-->
 		<flag name="testbed">Enable the testbed protocol.</flag>
 		<flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
 		<flag name="yahoo">Enable yahoo protocol support.</flag>
 		<flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 	</use>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/kde-apps/libkipi/Manifest b/kde-apps/libkipi/Manifest
index 6ef8c14e9dad..35d44715ae61 100644
--- a/kde-apps/libkipi/Manifest
+++ b/kde-apps/libkipi/Manifest
@@ -2,4 +2,4 @@ DIST libkipi-17.12.3.tar.xz 103492 BLAKE2B c1833e63fad20cff775d9e047dff4df5ef98d
 DIST libkipi-18.04.1.tar.xz 103640 BLAKE2B 7cb5f87ea59495517b689eda819603766d78e58d463cbb5d1bc7f30c2bb3be1dfaf5061ca57c0f42907d35c7eece6b766198663ee14be01900195dfe650af07d SHA512 b495ad4db5a29da2cf7d05d35e4abad2ded1b3b7497d601ab074b3604d14eef9c2c5e04ebcae0afcc53bdaa91f8522a4e4e601cfc2b298f49b6dfcf7d594704b
 EBUILD libkipi-17.12.3.ebuild 565 BLAKE2B acee4da04f26efc545d222e1c19f89798033e9490457538e053b9d2d454a705aca5afa45525db0fd9f46bd79a9f5a5acb3c2ab78f47e63904d3e26d94c345886 SHA512 cd81c2e285559058b0cf2f400cca5ce4ed7ee59f95d695ec92d378e5c1c10d69a25dcd3d23ade4f6ee77fb0c31ccfc92bc4ebe1fd401b7cd10fe0cef63995113
 EBUILD libkipi-18.04.1.ebuild 567 BLAKE2B 82932dbb414788179a2e99d71892d55fa392831a5048cea801876c439fab5bfc30c3295d9f04aaa5f26ea5b66cea662d10a7e44a8c84373271aa84d59fad20cf SHA512 f6a8e5b46a04e01c44d6cab1e0317f744a4b3e8306caf7e9c05855cbcf308be9de1fd3d40ffcdf1bc326045789d0281320695a48eb6db9b107b847bd2bebf753
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
+MISC metadata.xml 335 BLAKE2B 5c247ec0a28d838467da7959769e291841df01349fac42c6565236f00d0c20a0f577c3595516ee28f2910ba7b35748accf740ca25004bf299e73220551805a88 SHA512 52f1ab2e6580181b506efe3c169d0697c00fdcbbf12fa711f6affac5bbdb065aefec398bd806c6f75ba9464e2559a371332e35ab33b90bf8cb6d245f220d7d33
diff --git a/kde-apps/libkipi/metadata.xml b/kde-apps/libkipi/metadata.xml
index 2fdbf33d963d..acef20363a48 100644
--- a/kde-apps/libkipi/metadata.xml
+++ b/kde-apps/libkipi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<slots>
+		<subslots>Reflects ABI compatibility of libKF5Kipi.so</subslots>
+	</slots>
 </pkgmetadata>
diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest
index 93a069604655..dc4c4f2f1d91 100644
--- a/kde-apps/step/Manifest
+++ b/kde-apps/step/Manifest
@@ -2,4 +2,4 @@ DIST step-17.12.3.tar.xz 862236 BLAKE2B b931d732c54467fefbf217326776b4ca664c93f3
 DIST step-18.04.1.tar.xz 862508 BLAKE2B abf2aa2f6f56fa35d4750c96304a85c36d4ccc22c382fb2bb222ffac4d011823884b59c7214fc4f1d856509e442deef6105e6b22ed8dcddf3c866aee543e2791 SHA512 cc790b66ba845bcc97820c3a81d9a5899a3977c99108dd286d09f06b0b8e6f91e2f92440bd8404af584f026e8e3c32ff14b7b7b8acada604ea39fa4261a3c5f3
 EBUILD step-17.12.3.ebuild 1578 BLAKE2B 154226cbb51fc9a345ab059ce1af8c7a7d3cf3dc868f7f3992ee644041ed2010bf16579703c2f83bd1cc7b5fe28de727cd76a19f829796b8ef35da2ced0b5d53 SHA512 7d9dea75d6d531c4c649f059f3fd268b8107b9f57c4cf4ed6de11bb245a312e9892566ec07f1d99e41eb2bc3796f96312da4e2c82e35417cb9cb0b1719ba6e5e
 EBUILD step-18.04.1.ebuild 1489 BLAKE2B b3856e1ce092d3485e1cec6932a64809c17f989fa94673639561fe065c963a6c07a06fd14a2b75b7bc707c37d548dd8c58b1bd817f448531911dc91df0e089cd SHA512 4e42856ed4796035fc4fd318c42310eef2d3fb496ef4a69f3fdc4ef2043a281c4decfedac7095f5cae56a0f7ae9d2ad684d125850359c61228df2efa5e45957d
-MISC metadata.xml 348 BLAKE2B e238f960586796416f3a60ab5c9fab8df0d88b79c76530be5243c3b2f4dedc98c87c343aae8e950a40a9876d75622fb6da96b6c697a3ff55fb6bede25fe160a5 SHA512 58a3225b3993d3bd5db5d5cc5b0660fd42034e593e8fb4d657f8e6ed86e4db57df66b99a6edafc6aebf356542edcb7516cd6fe70cda6b7c8ce9a002455531b70
+MISC metadata.xml 348 BLAKE2B 2272eeeaddfebea19cd0eb32819f025ac5ded6b7b9b7958a88a0305cfda2913f8eed8075ad4990d6a30dd256e45badc36fc2f59c844c62d506e9d0fff1cd5078 SHA512 7e79f2809e7ce64f797e87c45a84fdae86a535e95df724521e5e5c5c7c152d6426fc09fdbdc2b863fdd646b673637abb4cde531d7f203242c6ba82814881e830
diff --git a/kde-apps/step/metadata.xml b/kde-apps/step/metadata.xml
index 4db78025bcce..f6287bcadeb7 100644
--- a/kde-apps/step/metadata.xml
+++ b/kde-apps/step/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
-	</use>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
+	<use>
+		<flag name="qalculate">Enable the libqalculate library for unit conversion</flag>
+	</use>
 </pkgmetadata>