From 70b82ae359a5538711e103b0e8dfb92654296644 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 27 Oct 2018 12:48:57 +0100
Subject: gentoo resync : 27.10.2018

---
 net-libs/qxmpp/Manifest          |  2 +-
 net-libs/qxmpp/qxmpp-9999.ebuild | 52 ++++++++++++++++------------------------
 2 files changed, 21 insertions(+), 33 deletions(-)

(limited to 'net-libs/qxmpp')

diff --git a/net-libs/qxmpp/Manifest b/net-libs/qxmpp/Manifest
index 4e691a2118fb..8717c24c6306 100644
--- a/net-libs/qxmpp/Manifest
+++ b/net-libs/qxmpp/Manifest
@@ -1,4 +1,4 @@
 DIST qxmpp-0.9.3.tar.gz 300764 BLAKE2B a98d9bd9ab9c84ce6ac90722cd1f1b1609d345daa0b4e690e44b845408753b006261b293898bf419bea011005558584de24090ac1c8809845ec6f8a5c8bb05b1 SHA512 c6ada4398468b9ce84955ab3a1ca155afe3098dfe39dc952c3675be1a1e3a4f118f8b1e251567bc124faa645d2654252d3e32d94e21aae79547056a10a2d6a71
 EBUILD qxmpp-0.9.3-r2.ebuild 1815 BLAKE2B 7e800dcaad27d3d876a07b41dbba5dfd2f27c506c8a95f0c75b42778054a25b584828756437309787fe0b585868e433e4cce764b8ce8325c044ba6218d4f0fdc SHA512 69a64ff108de9d7d0b70bc5f21d18c1bcc0c2949a701ba5b89eef13412fa4f85c7084ae3c6f3f70e814cb9aaeb027bfbf5afdd83c2ed7f43e40652f3766092b3
-EBUILD qxmpp-9999.ebuild 1770 BLAKE2B 8d0527aae9d208fd4272fbcde1dd3594a20a061233fc397cf602908aa938b687889888be6c9c0633376bdb35ad17b62e54e80542d5d7f71f7bcabfcfc9c756be SHA512 82826b15736b6f8b05ffe41dce048ca56ee321d6b2ea2bf9ed58908260091ce1f963d5ab3a4c3e1d7496991d926088bfe1030245d10eb7abf4cd0da6358fed8a
+EBUILD qxmpp-9999.ebuild 1346 BLAKE2B 706db83d1c49524069d421e26fae37d49ce6221ed88a225e5a8b9ceec792c51523326d21661b4d7a1fd022d85e0483ef71175fdfcf5191928c90efe25524c7f0 SHA512 7df917d3cb6138af27d7717a2ec98f701f1a00e067b33dcda0eaaf808851800cb6800390f60edfe64af0fcd66a06195426a892a4173d7060c4a4a91cae38d63e
 MISC metadata.xml 710 BLAKE2B c162e3ff5798eaac98ead84af9bd40273b056e88b7061a00c9e52010d3f250998e3aad86aee59f2cb92bd3b4108ef365b1bd238750886292c882efe96f94643f SHA512 fd8ffbbd483fc453197c278622d316d59b1ee947b0ad4cbb9fa25760a84644b56f3582933363f2b55d7806521bc98bb0ccf6021d346fc98dc84887652f1f1426
diff --git a/net-libs/qxmpp/qxmpp-9999.ebuild b/net-libs/qxmpp/qxmpp-9999.ebuild
index 6bc4e3d83103..a6fb6f67b142 100644
--- a/net-libs/qxmpp/qxmpp-9999.ebuild
+++ b/net-libs/qxmpp/qxmpp-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 EGIT_REPO_URI="https://github.com/qxmpp-project/qxmpp"
 
-inherit git-r3 qmake-utils
+inherit git-r3 cmake-utils
 
 DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
 HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
@@ -25,50 +25,38 @@ RDEPEND="
 	vpx? ( media-libs/libvpx:= )
 "
 DEPEND="${RDEPEND}
+	dev-util/cmake
 	test? ( dev-qt/qttest:5 )
+	doc? ( app-doc/doxygen )
 "
 
 src_prepare() {
-	default
+	# requires network connection, bug #623708
+	sed -e "/qxmppiceconnection/d" \
+		-i tests/CMakeLists.txt || die "failed to drop single test"
 
-	if ! use doc; then
-		sed -e '/SUBDIRS/s/doc//' \
-			-e '/INSTALLS/d' \
-			-i qxmpp.pro || die "failed to remove docs"
-	fi
-	if ! use test; then
-		sed -e '/SUBDIRS/s/tests//' \
-			-i qxmpp.pro || die "failed to remove tests"
-	else
-		# requires network connection, bug #623708
-		sed -e "/qxmppiceconnection/d" \
-			-i tests/tests.pro || die "failed to drop single test"
-	fi
-	# There is no point in building examples. Also, they require dev-qt/qtgui
-	sed -e '/SUBDIRS/s/examples//' \
-		-i qxmpp.pro || die "sed for removing examples failed"
+	cmake-utils_src_prepare
 }
 
 src_configure() {
-	eqmake5 "${S}"/qxmpp.pro \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="$(get_libdir)" \
-		QXMPP_USE_OPUS=$(usex opus 1 '') \
-		QXMPP_USE_SPEEX=$(usex speex 1 '') \
-		QXMPP_USE_THEORA=$(usex theora 1 '') \
-		QXMPP_USE_VPX=$(usex vpx 1 '')
+	local mycmakeargs=(
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DBUILD_EXAMPLES=OFF
+		-DBUILD_TESTS=$(usex test)
+		-DWITH_OPUS=$(usex opus)
+		-DWITH_SPEEX=$(usex speex)
+		-DWITH_THEORA=$(usex theora)
+		-DWITH_VPX=$(usex vpx)
+	)
+
+	cmake-utils_src_configure
 }
 
 src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
+	cmake-utils_src_install
+
 	if use doc; then
 		# Use proper path for documentation
 		mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die "doc mv failed"
 	fi
 }
-
-src_test() {
-	MAKEOPTS="-j1" # random tests fail otherwise
-	default_src_test
-}
-- 
cgit v1.2.3