3 files changed, 55 insertions, 56 deletions
diff --git a/dev-libs/sink/Manifest b/dev-libs/sink/Manifest
index 67f7acb5a21f..ecc0c5efb290 100644
--- a/dev-libs/sink/Manifest
+++ b/dev-libs/sink/Manifest
@@ -1,3 +1,3 @@
-DIST sink-0.8.0.tar.xz 295064 BLAKE2B 8187520979b43966a4e2d782e0ceb651c49eb25a349e2f9f2251b47978b0eebe64a98ce8c04f1854cdd05779f01c2cb68f1fa008568c1e95d292dbcd65fc61fe SHA512 008ca8355ffbed2bf89a906510aac4c505c8e44de49f445db283aa565e233e7652f2e46c5bcf37e680dec940a8c0f1525e6a8f708e1b4742db62522255c8bad6
-EBUILD sink-0.8.0-r1.ebuild 1141 BLAKE2B 6b5d8760261e500ee0102869b986a741c1ee2e20e663bc41a47b17d4deeee9283d9f1fab4dad4a3276f8968b3a18db5ab2bcd95f802ada02f501410e72a5b6af SHA512 70a46bda78a774a717e5118880d70f6215161db2c9275cd0bfd439749b19fc43efdf47afb25b34aba43b347dd502916a1a57796efb51f19de78e15e4cced4388
+DIST sink-0.7.0.tar.gz 383090 BLAKE2B b853609889ead6f623c7288b9dfe8dba0388dc0d5e8f28d9967fa9be1d78b10bafd9d4674f11355bfe60506843d2abe033149c448ff293329db558ed00fef18b SHA512 591838cb9c76d89c1794b94b02bff3d67155e1f27ae32b7ac9369d15aa109130c7792f30e74b61009765e7b7cb78141bf5e3c93304d814bce22bf91059339fd0
+EBUILD sink-0.7.0.ebuild 1278 BLAKE2B 4f1bcd6d98914fd2c51a96ef7dde5636bdcec6e76f1af63d9b1628f410a35d0253832fb2e85c6a122dfad3f3810892539de11a1608a61d1b2d35f4f47f6e5bca SHA512 2b9ddddf426c1a3396aefc41b94a02f2a4e108bdc7fd7da1ec518a8c8634122f4d065dd4425bd82712feae7a3dc2ded963445ae5a7ea668ac046d961edc70a2c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/sink/sink-0.7.0.ebuild b/dev-libs/sink/sink-0.7.0.ebuild
new file mode 100644
index 000000000000..4e7f4708a8f5
--- /dev/null
+++ b/dev-libs/sink/sink-0.7.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="false" # build breaks otherwise. tests not isolated.
+inherit kde5
+
+DESCRIPTION="Data access layer handling synchronization, caching and indexing"
+SRC_URI="https://github.com/KDE/sink/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64"
+IUSE=""
+
+# qtgui is bogus but is required because something else in the deptree
+# uses it as a public dependency but doesn't search for it properly
+RDEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	dev-db/lmdb:=
+	dev-libs/flatbuffers
+	dev-libs/kasync
+	>=dev-libs/xapian-1.4.4:0=
+	net-libs/kdav2
+	net-libs/kimap2
+	net-misc/curl
+	sys-libs/readline:0=
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+
+# fails to build
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	# FIXME: sink is useless without its 'examples'. Workaround our eclass
+	sed -i -e "/add_subdirectory(examples)/ s/#DONOTCOMPILE //" \
+		CMakeLists.txt || die "Failed to fix CMakeLists.txt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
+	)
+	kde5_src_configure
+}
diff --git a/dev-libs/sink/sink-0.8.0-r1.ebuild b/dev-libs/sink/sink-0.8.0-r1.ebuild
deleted file mode 100644
index b578e12e6682..000000000000
--- a/dev-libs/sink/sink-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Data access layer handling synchronization, caching and indexing"
-HOMEPAGE="https://kube-project.com"
-SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="~amd64"
-
-# qtgui is bogus but is required because something else in the deptree
-# uses it as a public dependency but doesn't search for it properly
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-db/lmdb:=
-	dev-libs/flatbuffers
-	>=dev-libs/kasync-0.3:5
-	>=dev-libs/xapian-1.4.4:0=
-	kde-frameworks/extra-cmake-modules:5
-	|| (
-		kde-frameworks/kcalendarcore:5
-		kde-apps/kcalcore:5
-	)
-	|| (
-		kde-frameworks/kcontacts:5
-		kde-apps/kcontacts:5
-	)
-	kde-frameworks/kcoreaddons:5
-	kde-apps/kmime:5
-	>=net-libs/kdav2-0.3:5
-	>=net-libs/kimap2-0.3:5
-	net-misc/curl
-	sys-libs/readline:0=
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-
-# fails to build
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
-	)
-	cmake-utils_src_configure
-}