gentoo resync : 21.07.2018

4 files changed, 32 insertions, 25 deletions

diff --git a/net-irc/quassel/Manifest b/net-irc/quassel/Manifest
index c1f9d25c33e0..f25c62a9d2bb 100644
--- a/net-irc/quassel/Manifest
+++ b/net-irc/quassel/Manifest
@@ -4,7 +4,8 @@ AUX quasselcore.conf-r1 333 BLAKE2B 67586dc8a62e94131d11d81502f09387026f98b7452a
 AUX quasselcore.init-r1 492 BLAKE2B 568e41c649875fc9e334b54f341dc9f95295e37d1c350ac3356b1e92859786a242da52103acb4692bd32d647983d2b5a758b847db66041791dac5bf531cf448a SHA512 6b050c6bafa2c49ab92f8e7c77be3c6868b58040b4df8b2cc3bbc217c4bf9d69fa63a7efe9e1c9e3b055de170d79af6470fa58828c5291e0b3d6b6eb7044aff3
 AUX quasselcore.service 189 BLAKE2B a115a98b17f4e59f2bbae584ac998cb16729977b617feb7b76696fcb682c1bc2d88cc40847ed1b20dce04dd8702b86a406ce0117304501c203453d1d30667e47 SHA512 3f0e15582dca70ca11beddb50aa6c6d993d4283ff89dc83a84b1acf2c0d2edba306fdab30eb05937f363cf507e34b7f884e0852d88be68748b68ac7b4013b776
 DIST quassel-0.12.5.tar.bz2 3747392 BLAKE2B 624cd18c2a5e1c480f701072bfeeeb18589cdbd2f2b7ab0d524f32e384ac4feb7328b23b60c3005340d53e4bf3a209f75a5d673a8d5d3f659825f0ef21bd3f9f SHA512 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685
-EBUILD quassel-0.12.5-r2.ebuild 4944 BLAKE2B b98fa3138101abca722cbb1d2a8dd82a8e62bb3f8394e0a1fce4cfb6c41efdb3022ab7f93311d5451c494075189997447e911cd8354acf0b1ecd646ae5e9586d SHA512 977e4f053599fdd291289d4a6f089c2514ca1dcfeaa119ca3aa11841a516e11df2048b7992702f305f9957ad6799f1a100417447f89c3e4c71d28d0e62f52121
-EBUILD quassel-0.12.5.ebuild 4885 BLAKE2B f732d9aea2322f507845cf69321a442c02ff835f24be64974b15f64858a661ac594894e8f2b81d7305469d50523a862fbd08186fc96aa7f2b20301c1ec77e467 SHA512 d59718ca4709c99279f2a0ef8a4786bb32a3b0a4ab57c4f65db13e4518dfd2add6ef9642532313a60c06fc72b9e46e462b791384da2cdacb2e8cc957380daf54
-EBUILD quassel-9999.ebuild 4935 BLAKE2B 1fd769f104e51caa2ab20837368cb53d5c71f802c4f6fd8624403e265980a0d2870ef2c66c90b6a1f598e15d4d09f019430f68a0f210a38d1aa9a01377790602 SHA512 dfb30906d7bca817d6a14b1e7a1ac6df4a7076bd1b119e8af44cadfb582bf7bfffda6fa8daa25b8964138fac27d2a2a029c254d7efdd3050395f9be29edf0caa
+DIST quassel-0.13-rc1.tar.bz2 4114806 BLAKE2B 609d994c676b9e930884e738fb008a35e603e03fa0890b5119ffe91d7fbfd8d593eeefc903610309f360ca4c5cc985895e0e532c45d5eeafe1700f9de6735c9e SHA512 13cbaeae83673fc476b8e1f59ca1b6eb929b9bb6dddf15ca248d0fc9535cc8d98a02d194dc16e5c18197c9bacbe7142d1a4712d79133226f979fa9aa7a7813aa
+EBUILD quassel-0.12.5-r2.ebuild 4943 BLAKE2B 5f996b57334d498c9311e1df249fe6f6ca5703ff1b6d5cfc5d64cd82e08298a098b03f23f763f0580c8e328cea3fe49599f390476c8bf372e71d526f8ce90a32 SHA512 cda2554d2e63d4f600b82293e04dbd8e2d90be8ded0749ee95cd98c9b0363a33147b05fd05acb7b3e872742d54e9eca04daf1eed5a44d4285db815c401714255
+EBUILD quassel-0.13_rc1.ebuild 4979 BLAKE2B 6b39a3322e17ebc86a7897d8031a20385a38fa9815e458fd2297d7b10846da6b3a63b0520d20423151a7b6556de8ec8a1f39f6c09a77de088485d79854313ce8 SHA512 e2af4521ffd8f87d332ea82d66f405fa46c5ed141ecd83c930b31cffc011c922d63bc69843419e5e909e073ee48739a81b0d767fded91ba83fa1f259bad64cf0
+EBUILD quassel-9999.ebuild 4984 BLAKE2B 5c9a7134ead3008d6eefedc8007a03a216df0a49ff861c5da11f37a57e1e70fab57a8d87b8f54e1a27930202ae0d5cb2a23c53a4e4634208a899939b5d6a1519 SHA512 40d62c134fea0c93fc1f197a5f40f4333c70fa3acfd908c151fafe96e9227a0fcf2400200638029ea85e16f4c186fe2456ef555adb97aa7e3a7632dc16b981cd
 MISC metadata.xml 1960 BLAKE2B a7e329fb44a58cf74d1964b426cc75b7697160478d62d2c4216d93defb62fd6d9e018ab29689b7a8652571db62a2a2a00f22dda6fb697feb9a381c37cc4a6ac6 SHA512 17931d04330ce51f30dd77579ebed36c04050d150db1faa793fd65307f3808ee2cdfb807a40e3881ebd879c75a583434367e46963a90c99c1a1724659946a8ca
diff --git a/net-irc/quassel/quassel-0.12.5-r2.ebuild b/net-irc/quassel/quassel-0.12.5-r2.ebuild
index dd632d791bb6..a0296d1e259e 100644
--- a/net-irc/quassel/quassel-0.12.5-r2.ebuild
+++ b/net-irc/quassel/quassel-0.12.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils gnome2-utils pax-utils systemd user versionator
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
 	inherit git-r3
diff --git a/net-irc/quassel/quassel-0.12.5.ebuild b/net-irc/quassel/quassel-0.13_rc1.ebuild
index 6f3dde9b18d0..ed2efb5c8b9f 100644
--- a/net-irc/quassel/quassel-0.12.5.ebuild
+++ b/net-irc/quassel/quassel-0.13_rc1.ebuild
@@ -3,11 +3,13 @@
 
 EAPI=6
 
-inherit cmake-utils gnome2-utils pax-utils systemd user versionator
+inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~sparc-solaris"
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~sparc-solaris"
+	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
 	inherit git-r3
@@ -17,12 +19,13 @@ DESCRIPTION="Qt/KDE IRC client supporting a remote daemon for 24/7 connectivity"
 HOMEPAGE="http://quassel-irc.org/"
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="crypt dbus debug kde monolithic phonon postgres +server
-snorenotify +ssl syslog webkit X"
+IUSE="bundled-icons crypt +dbus debug kde ldap monolithic oxygen postgres +server
+snorenotify +ssl syslog urlpreview X"
 
 SERVER_RDEPEND="
 	dev-qt/qtscript:5
 	crypt? ( app-crypt/qca:2[qt5(+),ssl] )
+	ldap? ( net-nds/openldap )
 	postgres? ( dev-qt/qtsql:5[postgres] )
 	!postgres? ( dev-qt/qtsql:5[sqlite] dev-db/sqlite:3[threadsafe(+),-secure-delete] )
 	syslog? ( virtual/logger )
@@ -30,7 +33,12 @@ SERVER_RDEPEND="
 
 GUI_RDEPEND="
 	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
+	!bundled-icons? (
+		kde-frameworks/breeze-icons:5
+		oxygen? ( kde-frameworks/oxygen-icons:5 )
+	)
 	dbus? (
 		>=dev-libs/libdbusmenu-qt-0.9.3_pre20140619[qt5(+)]
 		dev-qt/qtdbus:5
@@ -45,9 +53,8 @@ GUI_RDEPEND="
 		kde-frameworks/kxmlgui:5
 		kde-frameworks/sonnet:5
 	)
-	phonon? ( media-libs/phonon[qt5(+)] )
 	snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
-	webkit? ( dev-qt/qtwebkit:5 )
+	urlpreview? ( dev-qt/qtwebengine:5[widgets] )
 "
 
 RDEPEND="
@@ -73,13 +80,11 @@ DOCS=( AUTHORS ChangeLog README.md )
 REQUIRED_USE="
 	|| ( X server monolithic )
 	crypt? ( || ( server monolithic ) )
-	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) dbus phonon )
-	phonon? ( || ( X monolithic ) )
+	kde? ( || ( X monolithic ) dbus )
+	ldap? ( || ( server monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	snorenotify? ( || ( X monolithic ) )
 	syslog? ( || ( server monolithic ) )
-	webkit? ( || ( X monolithic ) )
 "
 
 pkg_setup() {
@@ -94,27 +99,26 @@ pkg_setup() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_QT4=OFF
 		-DUSE_QT5=ON
-		-DEMBED_DATA=OFF
+		-DUSE_CCACHE=OFF
 		-DCMAKE_SKIP_RPATH=ON
+		-DEMBED_DATA=OFF
+		-DWITH_WEBKIT=OFF
+		-DWITH_BUNDLED_ICONS=$(usex bundled-icons)
 		$(cmake-utils_use_find_package crypt QCA2-QT5)
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
 		$(cmake-utils_use_find_package dbus Qt5DBus)
 		-DWITH_KDE=$(usex kde)
-		-DWITH_OXYGEN=$(usex !kde)
+		-DWITH_LDAP=$(usex ldap)
 		-DWANT_MONO=$(usex monolithic)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		-DWITH_OXYGEN_ICONS=$(usex oxygen)
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
-		-DWITH_WEBKIT=$(usex webkit)
+		-DWITH_WEBENGINE=$(usex urlpreview)
 		-DWANT_QTCLIENT=$(usex X)
 	)
 
-	# Something broke upstream detection since Qt 5.5
-	if use ssl ; then
-		mycmakeargs+=( "-DHAVE_SSL=TRUE" )
-	fi
-
 	cmake-utils_src_configure
 }
 
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index a5038bf8a0ac..5db02b583e65 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -6,8 +6,10 @@ EAPI=6
 inherit cmake-utils gnome2-utils pax-utils systemd user
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://quassel-irc.org/pub/${P}.tar.bz2"
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="http://quassel-irc.org/pub/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~sparc-solaris"
+	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "https://github.com/${PN}/${PN}" "git://git.${PN}-irc.org/${PN}" )
 	inherit git-r3