gentoo resync : 28.04.2018

3 files changed, 4 insertions, 69 deletions

diff --git a/app-doc/zeal/Manifest b/app-doc/zeal/Manifest
index 19b64e0401ff..cc0f2a069b11 100644
--- a/app-doc/zeal/Manifest
+++ b/app-doc/zeal/Manifest
@@ -1,7 +1,5 @@
-DIST zeal-0.2.1.tar.gz 914998 BLAKE2B da76e50e3285b0e60f4fe55b563da0e8c2b3ac9aac8cea1f03ed678f2e5c7c00b376e4d87571e4048286c2858a4e42ffa9d06d8bf7af505a49933b6c354ed286 SHA512 f17b7ef59649a5c57ef3461aa84dbb2636deed13646d5f73fe05adf1bb9519d317366a18c61d6716417044d6248fd6111cacb8341393fa194567769fd2048c3f
-DIST zeal-0.3.1.tar.gz 920814 BLAKE2B 907ae67ef8e25558c017e637f44b0ccec197a8812e642a3fe6e0e3f99f8e791a65155cd1f0a35d598faa7eb97789ecc3e4d8afd460aba4d952e0738935baf3fb SHA512 9d95d9d3a1966c823f4eebe2a389f046df84d27262863dead558e309ac4c0ac8ee5ab1fd8f3559e9745e0ee9248df36aa66de8ca242a5d4662c6bb1d5b722280
 DIST zeal-0.4.0.tar.gz 1049326 BLAKE2B b3007dad0ed280954b05464bc107fa51c603d79607acd42ab85bc745d0590bdaed740edac75dac91e0d0da34b5966eb96815e8250a3b68041cb5a8e0389676fc SHA512 fd1e7cd71469e40914b713c10057b3f3d1d2ae9808d296ca01ceb43941b6e7d6754a4f21edf43a594b1c3ebcab20728812db1bdffda6bc78ee49a1d4faaf9627
-EBUILD zeal-0.2.1.ebuild 999 BLAKE2B bfa39d6a8db121b146e1bdd5396b4aac937608e607d8c617590c04f7fb6075bdf70b505d3c236c2fa41034c2104ac68048c68e41d256e633a3b783621c63f0bb SHA512 bb26cb4c52f2c869f93bb36e47db6255174af3034322c78c027acc9d4fe2572b526a808bac9b980dd21baaff36845d72c1cc7e46e9c56c304ec58ad9b1b2a0eb
-EBUILD zeal-0.3.1.ebuild 972 BLAKE2B a0b722a1b8363dc232f391a1668296ae1eacd2a16fd2c71b2b7bb8d7a132761154df6db50ec5f8584ff625fde4e13b7e115ec85964e1fa18e6f1d2ec0b2897af SHA512 eb7359929d6cb99447648798a1c9173f5f8f542fb6dd34d625eba37183e9abdbcf275a73eec8f6ad9d6e2451cdbc68de9928f67150646e82edad13cc608df6da
+DIST zeal-0.6.0.tar.gz 1062223 BLAKE2B 691525380dcefa03a1ed94cf0651f16e4e630aef820beed612a4412d8cdef39de25d2cacb84a76b5f7d03b9c3833fbcd60e463722bd7f9c3e147e5e72037211c SHA512 453841cdbab405a6c3842818b0d18b93d3ee8ad299386c25f63986e04674dbd437665e1913a03f0d94944004a619ea18d218de969c487e68e06a205e0edc1d3a
 EBUILD zeal-0.4.0.ebuild 972 BLAKE2B a0b722a1b8363dc232f391a1668296ae1eacd2a16fd2c71b2b7bb8d7a132761154df6db50ec5f8584ff625fde4e13b7e115ec85964e1fa18e6f1d2ec0b2897af SHA512 eb7359929d6cb99447648798a1c9173f5f8f542fb6dd34d625eba37183e9abdbcf275a73eec8f6ad9d6e2451cdbc68de9928f67150646e82edad13cc608df6da
+EBUILD zeal-0.6.0.ebuild 878 BLAKE2B 20ed7fe613344d7a610293d79ed1eeb2f794ebacc7dcedd9528e30e71daa352522bcb6fd7bd9c7dc0dacc279768ae3b26b9ae04965b160e7144ebed39274f70d SHA512 fdad30af08e4582138d4700d8dfdc1a1ea45d7ae5bad0108b1af41498198322115b61d724d043c7cbb01dc70f71cdb456c57022e65184cea64dae71af2631ea8
 MISC metadata.xml 343 BLAKE2B eb010ce88edcf15d87348b5170ca84d46d96d975ff459b4467428af5b75a95bc9e6c6d1245119907b5833f9a2ad2060adf41ba9aa884a5b846c1441241eaf8ba SHA512 a51b0043a255567189cb7ba1247cd6e9427292e7dbb3bc4f33d6c00acb3bf158bce6a7db1262275899b2b55806cfcb71e53a365aa25f05e259d497d5f028074f
diff --git a/app-doc/zeal/zeal-0.2.1.ebuild b/app-doc/zeal/zeal-0.2.1.ebuild
deleted file mode 100644
index 2a73d0b4b217..000000000000
--- a/app-doc/zeal/zeal-0.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="Offline documentation browser inspired by Dash"
-HOMEPAGE="https://zealdocs.org/"
-SRC_URI="https://github.com/zealdocs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${P}/src"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	app-arch/libarchive
-	dev-qt/qtconcurrent:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	>=x11-libs/xcb-util-keysyms-0.3.9
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-
-src_configure() {
-	eqmake5
-		PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" PREFIX="${EPREFIX}/usr" install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-doc/zeal/zeal-0.3.1.ebuild b/app-doc/zeal/zeal-0.6.0.ebuild
index b61be4430323..5e421e6a1a5a 100644
--- a/app-doc/zeal/zeal-0.3.1.ebuild
+++ b/app-doc/zeal/zeal-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome2-utils qmake-utils xdg-utils
+inherit gnome2-utils cmake-utils xdg-utils
 
 DESCRIPTION="Offline documentation browser inspired by Dash"
 HOMEPAGE="https://zealdocs.org/"
@@ -22,6 +22,7 @@ DEPEND="
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
+	kde-frameworks/extra-cmake-modules:5
 	>=x11-libs/xcb-util-keysyms-0.3.9
 "
 
@@ -30,14 +31,6 @@ RDEPEND="
 	x11-themes/hicolor-icon-theme
 "
 
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" PREFIX="${EPREFIX}/usr" install
-}
-
 pkg_preinst() {
 	gnome2_icon_savelist
 }