gentoo resync : 22.06.2019

8 files changed, 40 insertions, 334 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5f8caa07c5b2..16872d15a6e0 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index f3df06f85cda..3ed3c1819020 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,8 +1,4 @@
-DIST kvirc-5.0_pre20180819121252.tar.gz 6049652 BLAKE2B b4712e089a26498a7a3e4df10fe0def377814a9cc4082f55c2177da4929bc2fb02fbc947ee0603b62175a5cee657f6316ca246a275e96df71bd9d938453d4604 SHA512 de7ccb0f698488599ba3f58ca46ef2427632bdf1870d576baea8634e530cbe7654f60d4cdd58447301c4401941ef8b4e810f4d3eb4d6468a2899b80484380ea7
-DIST kvirc-5.0_pre20181013192652.tar.gz 5961689 BLAKE2B 9ee5536688e5e193b88e6425591d309396cd1c135622fd682fcc86e832ee72010493877d33bddd3a86bf6c18d34b252e6a4689f7001252e149eefbfd100da977 SHA512 1856f3fab772f04e01e6a367e101bdde0732c4439399f821cd50ffd4173b89de023e1da20327692387b3f002bda0f0880737a6f5f001e0112ae45e1257b0db24
 DIST kvirc-5.0_pre20181205184837.tar.gz 5968276 BLAKE2B eb1c2a38cedbae3f7e7951bdd4250e349d8c6745a24df30f81ccebf8fa0ac9bdca27f835b0d2bda261baff81d018eae58c5169656791f4436ff221cba7890e85 SHA512 fbfcf1b1bcd9dfb1207669ee61a7fa8023ceeb2b679e95c378ed1224020c901fb4a6b68b7505704874e935df2228be4ccfd36121a87aafc5ace41c5392058132
-EBUILD kvirc-5.0_pre20180819121252.ebuild 3838 BLAKE2B c2bbe3f8ae2479d18b887207ab70cc2799004987052232e2e1e23674b0539fc90fdbb3854b9169d3f770561e9e75340caf280bc8515a2668d69c9b46607b6d8f SHA512 d34667e43f9efee5b9d835afb8f2aab0376d80bd9b2d4bd055b2af3886effaaf62d5ec1b98e723c318db539d1068012047b7b7ffe1d463a917ace14f96eee13d
-EBUILD kvirc-5.0_pre20181013192652.ebuild 3838 BLAKE2B 092d287a6db4c94e03203d2b75fcd1848c66ecd27098d3221a144f24e92dd27672670e69044cea1b726f2b559f63ce4818a92e949907208122d708764c9fa43b SHA512 71cb533d92cfa5b787f9963dd65fa82345a7612f1b3ec7402cf0f396e90a890cf3c2ba9244578455ec087df42d34273dc9e06e9a974eebb50516ba2889996877
-EBUILD kvirc-5.0_pre20181205184837.ebuild 3838 BLAKE2B ed0e309e78f00bf3c5e413deb9196f4dcf3e6e5ba87a46b61e8fe52a73a95192d98d8c8a1680a5523bb8d2ee3bf6c7f9b76cf67b438c92d9a72d0551465bc998 SHA512 58751e2647bf24cbd37543aaf68e9ce3c9e089a6d74c455282832f48233eb195b79ffd776bba0ee9575df6955448d5e00bf5477dfae522ba58a89152b352b2b3
-EBUILD kvirc-9999.ebuild 3777 BLAKE2B 1fd03974614fb4b6c2bdec28d7a836ad8cbc242741ae143be2db1915b3f5724c5cb0f62e61ac5b55501fd1252b88f11aaff3115e5a58800bb1434d274eff8193 SHA512 e666615ce16b7a42fc9a638fe95decb92fa0a26c2abe78ed8264802123de090a46095d6770b98fa18ecd3d2e5dbae6b4187a8d4b641269713a9c6f0140a886f1
+EBUILD kvirc-5.0_pre20181205184837.ebuild 3897 BLAKE2B 1f2c4069b0c79999878f0a0546cdbc3e0629b9937b46f8cd790c1ba1532cb177a0abe56da66278304bde9a3f8aff8d56fdc2bf25f05d88c631a092ebd59689d2 SHA512 ffddf67f93ed062d2e148a1f40bd01a96a31dbf1e4e5812ad23cf8a34bf7a0f571c4342ddc7775f153437215aacc9390e28b4fc27d1ef7d08effbaa844a3cbe6
+EBUILD kvirc-9999.ebuild 3836 BLAKE2B b664572608e41d7bb66e9efbda369a54f81259ab14dad0a673d32f9e94f448934bdc9385d1f769b6b13dde4263c8ea6572c9ce6f3d9dd5d6c1890f218736cd44 SHA512 2496d4f0d8a4e7f3c82cf8ab4922eb7a96104c47c8b772912a049d96ce0e61106eba96b3a348ae5a1987989b518b8777ebd5eec44a7f8fde459d6a919892f5e6
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
deleted file mode 100644
index 2ae7426292a4..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20180819121252.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="abc7a305d16d5ff939959164cff856af8f6d6ca1"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
deleted file mode 100644
index cbed98639985..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20181013192652.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
-	KVIRC_GIT_REVISION=""
-	KVIRC_GIT_SOURCES_DATE=""
-else
-	inherit vcs-snapshot
-
-	KVIRC_GIT_REVISION="c7eea2406bf70a77a127b6bf472f422f2dbd9de9"
-	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
-	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
-fi
-
-DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
-if [[ "${PV}" == "9999" ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="kvirc"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
-REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:0=
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	audiofile? ( media-libs/audiofile )
-	dbus? ( dev-qt/qtdbus:5 )
-	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
-	kde? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/kservice:5
-		kde-frameworks/kwindowsystem:5
-		kde-frameworks/kxmlgui:5
-	)
-	perl? ( dev-lang/perl:0= )
-	phonon? ( media-libs/phonon[qt5(+)] )
-	python? ( ${PYTHON_DEPS} )
-	spell? ( app-text/enchant:0= )
-	ssl? ( dev-libs/openssl:0= )
-	theora? (
-		media-libs/libogg
-		media-libs/libtheora
-		media-libs/libvorbis
-	)
-	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	gsm? ( media-sound/gsm )"
-
-DOCS=()
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ "${PV}" == "9999" ]]; then
-		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
-		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
-	fi
-	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
-	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX=${libdir#lib}
-		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
-		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
-		-DWANT_ENV_FLAGS=yes
-		-DWANT_VERBOSE=yes
-
-		-DWANT_CRYPT=yes
-		-DWANT_DCC_VOICE=yes
-		-DWANT_IPC=yes
-		-DWANT_IPV6=yes
-		-DWANT_TRANSPARENCY=yes
-
-		-DWANT_AUDIOFILE=$(usex audiofile)
-		-DWANT_DCC_VIDEO=$(usex dcc_video)
-		-DWANT_DEBUG=$(usex debug)
-		-DWANT_DOXYGEN=$(usex doc)
-		-DWANT_GETTEXT=$(usex nls)
-		-DWANT_GSM=$(usex gsm)
-		-DWANT_KDE=$(usex kde)
-		-DWANT_MEMORY_PROFILE=$(usex profile)
-		-DWANT_OGG_THEORA=$(usex theora)
-		-DWANT_OPENSSL=$(usex ssl)
-		-DWANT_OSS=$(usex oss)
-		-DWANT_PERL=$(usex perl)
-		-DWANT_PHONON=$(usex phonon)
-		-DWANT_PYTHON=$(usex python)
-		-DWANT_QTDBUS=$(usex dbus)
-		-DWANT_QTWEBKIT=$(usex webkit)
-		-DWANT_SPELLCHECKER=$(usex spell)
-
-		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
index 412a2fc2a562..c5e59822e5e2 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2009-2019 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+# True Authors: Arfrever Frehtes Taifersar Arahesis
+
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -13,8 +15,6 @@ if [[ "${PV}" == "9999" ]]; then
 	KVIRC_GIT_REVISION=""
 	KVIRC_GIT_SOURCES_DATE=""
 else
-	inherit vcs-snapshot
-
 	KVIRC_GIT_REVISION="f06b4f0397fa7feb23713e4fe4c00759d2cced71"
 	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
 	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
@@ -28,13 +28,17 @@ else
 	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
 fi
 
-LICENSE="kvirc"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-qt/qtcore:5
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -68,14 +72,13 @@ RDEPEND="dev-qt/qtcore:5
 		media-libs/libvorbis
 	)
 	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
+fi
+
 DOCS=()
 
 pkg_setup() {
@@ -138,11 +141,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 543e5042b440..b37c64f007b3 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 2009-2018 Arfrever Frehtes Taifersar Arahesis
+# Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+# True Authors: Arfrever Frehtes Taifersar Arahesis
+
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 
-inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
@@ -13,8 +15,6 @@ if [[ "${PV}" == "9999" ]]; then
 	KVIRC_GIT_REVISION=""
 	KVIRC_GIT_SOURCES_DATE=""
 else
-	inherit vcs-snapshot
-
 	KVIRC_GIT_REVISION=""
 	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
 	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
@@ -28,13 +28,17 @@ else
 	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
 fi
 
-LICENSE="kvirc"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
 IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
 REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="dev-qt/qtcore:5
+BDEPEND="virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtnetwork:5
@@ -68,14 +72,13 @@ RDEPEND="dev-qt/qtcore:5
 		media-libs/libvorbis
 	)
 	webkit? ( dev-qt/qtwebkit:5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	gsm? ( media-sound/gsm )"
 
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
+fi
+
 DOCS=()
 
 pkg_setup() {
@@ -138,11 +141,11 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index a41998f93aa1..54de2284ccce 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -6,6 +6,6 @@ DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac8760
 DIST znc-1.7.3.tar.gz 2084575 BLAKE2B 4d8f76abef8bf2c5f96d9bd04716cd2debae2b2fcd3b8688aa715af6ef09e60c2aac203c5c7b32d2f4d56730f30dbbe9abd5eeec4f07e7580900dcb1cd164530 SHA512 4cd63be2cb3bc1e3950f38984b128c6511bd1b9fc01a00d51cfcdc46826c2dedad120d6ed8e30d9c400909e33d39b2b14579fb40ee1e3508b7f3a07eff3a15d8
 DIST znc-1.7.4-rc1.tar.gz 2084722 BLAKE2B cdbc9a6713ecb1261275060b07bfdc16f9edd933bd7337f346c4c2bbf450f1810b5c82f382d31000d3b07fef145279adacf2bdd8518541dbe9ba3a9c4ab972f5 SHA512 49e45732db371159ada2678df1e494a0f4ae9c517f111672ab184e3c5ac60e354a63f7039167a7ca0ca09c300c33b9cc3f9dfc35ba3940f5a70efa35c0089911
 EBUILD znc-1.7.3.ebuild 5131 BLAKE2B c0e6c3bfb68238536751011f5e295d6b62af68a6a5e7de24bff6bbb88e551ac537e415887ddfd3c1fa52a42283d548977fe8bc17580ad801a76b93bde2330c49 SHA512 66086374351cf262d2268fc016a44b195500f721c6716ef748791d38105da7796cc9317707ee51cbaed9c2238dbee7cdd3da97eb7daae378ce966cc78161035b
-EBUILD znc-1.7.4_rc1.ebuild 5134 BLAKE2B 480c004ba905ec736e7ce762ef2f725ce907f1c4a39edf4db6733dfaba6757c3fb89df7460115ff357718b099cc2a34ea08031c55ef624103629db091c5e524d SHA512 3682cb23b35eb6a2e3956320f3c586cdb2d35a0d8dc322c7397c3f18747503a5a4158f46d81fec8a6948ed4df7d5587fc19e3904b131346e5ef54b112a4487f4
+EBUILD znc-1.7.4_rc1.ebuild 5132 BLAKE2B 06d86447e4a996e5f584fbc5dce0d6b26c95cbe4944b759b7bb188cf697405c0161052b91cf3647fefb0a9b91a71a1adb2755b00748de98c3be702c0a1501ee2 SHA512 f911008c2bd0f0908bec7741412dd0956226564342a1d835e3199609efaa495f928d68fcd37e26b5ecbd740edd414c04076715dd2d53742a03109ef8dd969e38
 EBUILD znc-9999.ebuild 5134 BLAKE2B 480c004ba905ec736e7ce762ef2f725ce907f1c4a39edf4db6733dfaba6757c3fb89df7460115ff357718b099cc2a34ea08031c55ef624103629db091c5e524d SHA512 3682cb23b35eb6a2e3956320f3c586cdb2d35a0d8dc322c7397c3f18747503a5a4158f46d81fec8a6948ed4df7d5587fc19e3904b131346e5ef54b112a4487f4
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.4_rc1.ebuild b/net-irc/znc/znc-1.7.4_rc1.ebuild
index e2a032f9ea5e..9e33853571da 100644
--- a/net-irc/znc/znc-1.7.4_rc1.ebuild
+++ b/net-irc/znc/znc-1.7.4_rc1.ebuild
@@ -22,7 +22,7 @@ else
 		https://znc.in/releases/archive/${MY_P}.tar.gz
 		test? ( ${GTEST_URL} )
 	"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${MY_P}
 fi