gentoo resync : 18.08.2019

6 files changed, 166 insertions, 223 deletions

diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 279c2c6121f8..9342a6b75011 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,6 +1,5 @@
-DIST kvirc-5.0_pre20181205184837.tar.gz 5968276 BLAKE2B eb1c2a38cedbae3f7e7951bdd4250e349d8c6745a24df30f81ccebf8fa0ac9bdca27f835b0d2bda261baff81d018eae58c5169656791f4436ff221cba7890e85 SHA512 fbfcf1b1bcd9dfb1207669ee61a7fa8023ceeb2b679e95c378ed1224020c901fb4a6b68b7505704874e935df2228be4ccfd36121a87aafc5ace41c5392058132
+AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
-EBUILD kvirc-5.0_pre20181205184837.ebuild 3897 BLAKE2B 1f2c4069b0c79999878f0a0546cdbc3e0629b9937b46f8cd790c1ba1532cb177a0abe56da66278304bde9a3f8aff8d56fdc2bf25f05d88c631a092ebd59689d2 SHA512 ffddf67f93ed062d2e148a1f40bd01a96a31dbf1e4e5812ad23cf8a34bf7a0f571c4342ddc7775f153437215aacc9390e28b4fc27d1ef7d08effbaa844a3cbe6
-EBUILD kvirc-5.2_pre20190628041642.ebuild 3899 BLAKE2B 97c75c0a45a6bb736fdd858f0457340ae3d9d0177caabe9037be884fe84dd00807dfb58b20dc628b07718cbed83e72cd83c3fa1b3dc2d63dca792b8ebae9bc76 SHA512 8818afaa7a3aa38f2ea8d98955d79e409dfa903d3c026b6e8e11ded3b9a75c4af70e766a87e944112c11259a9a8d84c81be1c3fdfd13e308bc985445afb97c07
-EBUILD kvirc-9999.ebuild 3836 BLAKE2B b664572608e41d7bb66e9efbda369a54f81259ab14dad0a673d32f9e94f448934bdc9385d1f769b6b13dde4263c8ea6572c9ce6f3d9dd5d6c1890f218736cd44 SHA512 2496d4f0d8a4e7f3c82cf8ab4922eb7a96104c47c8b772912a049d96ce0e61106eba96b3a348ae5a1987989b518b8777ebd5eec44a7f8fde459d6a919892f5e6
-MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
+EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
+EBUILD kvirc-9999.ebuild 4261 BLAKE2B 796cbac383831084f9b9677d7888b02a394b9ab1d9d5720b3660193d9f3accb2a6c44d850ee4f1756fb75640cc85f08bec8d237da8c1901c0fce3fefb893f4cf SHA512 6136cbaf6f4dd7d1c4effb3fabe341d69a2cee6e802e44f46d3ad400c920860e631d1a12b6ca1a5c900a220334ab182a096d3f20a0d8195c7bb9e23f2e132918
+MISC metadata.xml 501 BLAKE2B f8d9ac4c9a0a596f619716b2df66a95367d6599b9651fdbc5fb9d933c986d0079903cf097ce824c6d43786937b8cd478380723c578f5f96af0931ed6604da561 SHA512 36053b960a07fdf5e1307ce1097d77620b8bc48864568244e011371f459dcd7fbf4e7fcc2cfc0331183fdd681765a1aa017d3a6c4fbc1259834ba88d2e44be03
diff --git a/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
new file mode 100644
index 000000000000..14e9e6f795c7
--- /dev/null
+++ b/net-irc/kvirc/files/kvirc-5.2_pre20190628041642-python-3.patch
@@ -0,0 +1,53 @@
+https://github.com/kvirc/KVIrc/pull/2269
+
+--- /CMakeLists.txt
++++ /CMakeLists.txt
+@@ -67,9 +67,6 @@
+ set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER})
+ set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS})
+ 
+-# Prefer Python 2.7 over 3.x (which is currently incompatible) - GitHub issue #2020
+-set(Python_ADDITIONAL_VERSIONS "2.7")
+-
+ # Suffix for GNU/Linux
+ set(LIB_SUFFIX
+ 	CACHE STRING "Define suffix of directory name (32/64)"
+@@ -751,10 +748,10 @@
+ # Check for Python support
+ option(WANT_PYTHON "Compile Python support" ON)
+ if(WANT_PYTHON)
+-	find_package(PythonLibs 2.7)
++	find_package(PythonLibs)
+ 	if(PYTHONLIBS_FOUND)
+ 		set(COMPILE_PYTHON_SUPPORT 1)
+-		set(CMAKE_STATUS_PYTHON_SUPPORT "Yes")
++		set(CMAKE_STATUS_PYTHON_SUPPORT "Yes, Python ${PYTHONLIBS_VERSION_STRING}")
+ 		list(APPEND LIBS ${PYTHON_LIBRARIES})
+ 		include_directories(${PYTHON_INCLUDE_DIRS})
+ 	else()
+--- /src/modules/pythoncore/kvircmodule.cpp
++++ /src/modules/pythoncore/kvircmodule.cpp
+@@ -413,7 +413,7 @@
+ 	else
+ 	{
+ 		// Create a CObject containing the API pointer array's address
+-		PyObject * pC_API_Object = PyCObject_FromVoidPtr(PyKVIrc_API, nullptr);
++		PyObject * pC_API_Object = PyCapsule_New((void *)PyKVIrc_API, "kvirc._C_API", nullptr);
+ 		if(pC_API_Object)
+ 			PyModule_AddObject(pModule, "_C_API", pC_API_Object);
+ 	}
+--- /src/modules/pythoncore/pythonheaderwrapper.h
++++ /src/modules/pythoncore/pythonheaderwrapper.h
+@@ -1,6 +1,12 @@
+ #ifndef _PYTHONHEADERWRAPPER_H_
+ #define _PYTHONHEADERWRAPPER_H_
+ 
++// As of Python 3, something inside <Python.h> defines a struct with a member
++// called "slots" which conflicts with the builtin Qt keyword. But since we
++// include stuff from KVIrc itself back into the python module, we can't just
++// use QT_NO_KEYWORDS.
++#undef slots
++
+ // See http://stackoverflow.com/questions/16200997/why-doesnt-include-python-h-work and http://stackoverflow.com/questions/19716859/puzzling-dependency-of-boost-python-1-54-debug-build-to-python27-lib-on-window
+ 
+ #if defined(_DEBUG) && defined(_MSC_VER)
diff --git a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild b/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
deleted file mode 100644
index c5e59822e5e2..000000000000
--- a/net-irc/kvirc/kvirc-5.0_pre20181205184837.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 2009-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
-EAPI="7"
-PYTHON_COMPAT=(python2_7)
-
-inherit cmake-utils flag-o-matic 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
-	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}"
-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="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} )"
-
-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
-	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 )"
-RDEPEND="${DEPEND}
-	gsm? ( media-sound/gsm )"
-
-if [[ "${PV}" != "9999" ]]; then
-	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
-fi
-
-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() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
index 69f50a2969a3..7e84f4e5ca9b 100644
--- a/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
+++ b/net-irc/kvirc/kvirc-5.2_pre20190628041642.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
@@ -30,11 +29,12 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+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} )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="dev-lang/perl:0
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
 	nls? ( sys-devel/gettext )"
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
 DOCS=()
 
 pkg_setup() {
@@ -106,40 +110,59 @@ src_configure() {
 		-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)
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
+		-DWANT_QTSVG=OFF
 	)
 
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		cmake-utils_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
 pkg_postinst() {
 	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 b37c64f007b3..46a0772c2758 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2009-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# True Authors: Arfrever Frehtes Taifersar Arahesis
-
 EAPI="7"
-PYTHON_COMPAT=(python2_7)
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
@@ -34,7 +33,8 @@ 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} )"
 
-BDEPEND="virtual/pkgconfig
+BDEPEND="dev-lang/perl:0
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	kde? ( kde-frameworks/extra-cmake-modules:5 )
 	nls? ( sys-devel/gettext )"
@@ -79,6 +79,10 @@ if [[ "${PV}" != "9999" ]]; then
 	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
 fi
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
 DOCS=()
 
 pkg_setup() {
@@ -106,40 +110,59 @@ src_configure() {
 		-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)
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
 
 		# COMPILE_SVG_SUPPORT not used in source code.
-		-DWANT_QTSVG=no
+		-DWANT_QTSVG=OFF
 	)
 
 	cmake-utils_src_configure
 }
 
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		cmake-utils_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 0bd31948cd6d..3ef850bff6bd 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -5,10 +5,6 @@
 		<email>arfrever.fta@gmail.com</email>
 		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>