gentoo resync : 16.06.2018

8 files changed, 161 insertions, 11 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d666f291dc79..ef0115d55906 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index 1c1acb97451e..60987e87e5c1 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -1,10 +1,10 @@
 AUX iroffer-dinoex-3.29-config.patch 7014 BLAKE2B 69a79b55922735e51622f8df9cd2a9c3601362ba0f54d9ba4e6b28c134a9d23e0186c3dca99aa2be055ad958be56681f370b92d43763e3a2aba10629be8d3f35 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8
-AUX iroffer-dinoex-Werror.patch 498 BLAKE2B 85fe030eaa77f9691a8b5000b7ffc9ede2b15f524f75dc808911542d7602e1ae1f9dd4057cf707c194ead18ff2f217524e9e285f2f6f76a993993fcd746b05b8 SHA512 6d8b1e9410c90f635186749f0335e1de689333bcde2918453e7fd6e4ed3e917553d36cba694c1a8a4077a6e45c3019290cd56646aa39c6677802042e5ab131db
+AUX iroffer-dinoex-Werror.patch 502 BLAKE2B d93cb7c5643357f2ffc208f2a169aa0cbf652f9295664e5bae780dba3cd3b3f30780dc53568ec13aea0d733a5a58b4deaee08ef5d91ce1362caa18e33c063c11 SHA512 dc0c88d85943421f5c8998b0080b41585f4ca2513bd554709110d2bef31d7b6f59fc558124974b1255ca97c1edd86bb656c495cabac0fb5c9115cb52033aa7eb
 AUX iroffer-dinoex.conf 378 BLAKE2B 802cb152669d41a081d3400bad38da39fc73f083dc0ea5528861cb15581a2f62341fe1085c247b04f70e82943226895d8677013ae0900b6f50129702552468e2 SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634
 AUX iroffer-dinoex.init 1130 BLAKE2B ccd6615cd7c5c61532ccad49f5b69d5d6049d01af958b76a1c2e4f0588939d59b24fec040a6f74f961fb1f7d2b8c4a4adf5898fcb2137f741bfb9c27c1d7cfc7 SHA512 5fdae78dac704cfc8594fff417e0d223069d2a3f33536043550aef4f7143a3cdb69e6ae102d21cd14b97e3ccf61c6d1c11fbb3a87c3e1a1096fa40e36a1c772a
 AUX iroffer-dinoex.logrotate 173 BLAKE2B 855d14769a53f81135a2de494b90eeadbe487a9f9f29d45fe948b88b9798baf81a5832e8a89cc477826c6c51d7dde0459ab3d97249eb91d434f5b4c0686c0720 SHA512 6eb9a7f1949720a7d1544b90a22a190ad868b77d3ed604c5ec3acdc62e5711353d84a8e10dbfa332c4ceab13fedc3fa06d1679ce95d4612443a055f04f310015
 DIST iroffer-dinoex-3.29.tar.gz 537027 BLAKE2B f6dddd60b5e4e837cfb56c450ee32249607375a386f9215a9a4eb34e7696c066b6c817ae956c044bbc208f69a73967df5aee9835b2a94ca70a849045ff11f37d SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0
 DIST iroffer-dinoex-3.30.tar.gz 541131 BLAKE2B ea61113dffcd14b162153aa03c55a203d8ccd99e8f81de53a9ab8543bd91e948509281f753a8f332445eec102b6bd2b51972ff8bedb8b574b55b9325f6969269 SHA512 e45dc3dd901cbb73a9d59cd5a672834c7b6527864eb3385121856af562680a0f91e8846e8690fc60a6349dc4c4fc1cf190d3ac01813c6c045ef18147d61b7d4d
 EBUILD iroffer-dinoex-3.29.ebuild 2646 BLAKE2B b3db2502ebb186836894b1c8bf2083792623c0f6d2009241e432bb33ac0fc3716e684e44dcd4a7c9012989576d9667a14e4ef3631142a65a79af6bd5d602d76f SHA512 d47ffa947ae63147ce8939ce99f63114f9593b32f23d3a34d0ba3567bee14bb3d2ebcd14ae608fc0c841cc88d38abe7c2e57a06a54da0fbb3befd38af32b859e
-EBUILD iroffer-dinoex-3.30-r1.ebuild 2656 BLAKE2B 3dcc55257208076808e114ec96afd7ad9f9c73c63096977c84cb1e0ea012a59e4ef3d74c87c1445b2993e65d3c7607fcf297315d22dce1ca0012e803173b7b05 SHA512 de3d95e51e24b78d3a948d8a8187dc47cc2772304ef7df0638cbcb584e02333657955816d4e0cb7d5827c2acea9e0359f35f76d6338aa3179a8a21c7fd11bd70
+EBUILD iroffer-dinoex-3.30-r1.ebuild 2652 BLAKE2B 9db4a9b6d065944b9c31270ce08978a55d5c81ffab32af174d68ed30bb1b7adbb544050ea5293443f3e325a7f98a98240f0fe1e6e6e7f3643272cb9cf5c99070 SHA512 034712d52f4a3c2cb0e1772e72de392d95cebfbe9071f5d77cde1c1119573db13d663c4c9f495b474194014b0460d36574de46f1e8ae1636b87dd48b5fe82794
 MISC metadata.xml 795 BLAKE2B a6290795083bbd2c847fce5f5fb16c0cdc65f459642dec45f0be9f364a3c2d61579fb96ad0c5ee72c255a02d5ab2f32257ec669cbdaa7304d83830fcfcd083b4 SHA512 9e0690f67c3039e88a122fc149049bbb604958d3f5a4d07fe80b67845a7e8005f79901ade56ab4e55ffab885d3fefb1aac16419b4c56c206479f9e97edf062b3
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch
index cb8bf9248b03..f41a34652e16 100644
--- a/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-Werror.patch
@@ -1,5 +1,5 @@
---- Configure1	2013-02-07 22:10:22.000000000 +0400
-+++ Configure	2013-02-07 22:11:37.000000000 +0400
+--- a/Configure1	2013-02-07 22:10:22.000000000 +0400
++++ b/Configure	2013-02-07 22:11:37.000000000 +0400
 @@ -884,18 +884,6 @@
   ${msg} " ${irt_no}"
  fi
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
index 1776b3620bb7..d6533d41c96c 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.30-r1.ebuild
@@ -43,7 +43,7 @@ pkg_setup() {
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-3.29-config.patch"
-	eapply -p0 "${FILESDIR}/${PN}-Werror.patch"
+	eapply "${FILESDIR}/${PN}-Werror.patch"
 
 	eapply_user
 
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 0bfb3367b8e3..cf395534b86e 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,4 +1,6 @@
 DIST kvirc-5.0_pre20180401054732.tar.gz 6040980 BLAKE2B fa023ef84f5c84e92b11ed043be0a2e52316fc92f206c41bcb7216760e0473e13e118398445137aeafd657c856cdccfa2f5202f9534904771d8a049d5139f41a SHA512 6d3a9bb06018e2d54369139bbf0a768d3c4e39754b908c1e4294c79707c8b5b751141ae10bdf8456465bd9bf6e4e426a91bc6bef5a1c3563bf32adecc10582eb
-EBUILD kvirc-5.0_pre20180401054732.ebuild 3846 BLAKE2B bcf1f6bfc7687005977af9269c3c1eff57ad9f9656523dd2d8b7f21e6ccc8b92ff40f8228de23301fb8179bf6eb363439a791a62b0dbdaf802564bb0635b4874 SHA512 01182fdbc39f58c9709b507da28d805e1cd1bd9bb1856def96afcae390176a107528672649c70c8c4cca00a81bdba1a3d1fd2732f870a8a8d58314eda728fd91
-EBUILD kvirc-9999.ebuild 3768 BLAKE2B 6f94994a1892c1a1d40302a97f0d273c1458254696da5d22695e93bcf831399fae0eda70c257bc2e77f2ff04c1f57ba9bcafdd38745f49db922c5914a0ebc682 SHA512 64140f53a6c5df09d3c62a9df7eb45bae65728d61fedec3849d9d3c9af7e0ab850cc185193a021c535fc610f2981a974623cfc2ddbac1b81e1daf96caba915bc
+DIST kvirc-5.0_pre20180605072059.tar.gz 6048634 BLAKE2B db2a7a5ff0fa10a1eea6f011b6ea83301d434b08ba3ee61656ddd136ca027c8ce57a2565b491a69f6f1dff138e984ba76f81dc30ed25b6a0e54bb27821448f05 SHA512 f0da384990fc4a9cdf2727abdcc68cfc9c35e925379635acf02e91dc7d83d5ed584798a3d6ac41d259724993b48a67f8bfdae5e0a8d869f0189fbec3c6a652cf
+EBUILD kvirc-5.0_pre20180401054732.ebuild 3837 BLAKE2B 46f2db335a4cdefd2da23c4a13be5cbe87e098450e457862d2a6017210ad3dd89cad2e82d245de5fce97f3b3209c60b21123226f0b266667f5f6e2552df5875f SHA512 2bc026d32a22d75396c4921efdcaa4e35dad27ae0cc6cde18ac965a0cabd556ef68557a691467c88b3ac637d6a1dbf6ca4f1501772255a96be6d0d0311b46175
+EBUILD kvirc-5.0_pre20180605072059.ebuild 3822 BLAKE2B 907021ee297d4ed5f3e96d4faefc63a62af0fb4f0029cb7b8240f432453fda5fda861b4b9affb25108d6765f2b832abd53cf94eb78b5f1af2dc9f3cb18302cd4 SHA512 867ecc6d23d19248af13ec236c07c9814fd8001c843e54560734fd955ecc51e9f5077e702d9b47399f1c405bdde380805cf8ff18b2f3d9223f0f725be12a3dfd
+EBUILD kvirc-9999.ebuild 3759 BLAKE2B 3d8b72265f6f531fa139b64073f864efb70e0aa9725d43904e5e91dd27118917cdaa4ff775840d8f3e63dd4e00a32d060d5dc20128aeaede9b2eb8230c8d1850 SHA512 2875b8b78685e66c343213f9f82ba59107fc0082fc0fcfd410478beef315700a0cf250b1fc88212b6bfdb3d00ac3300ea835f7bc9afc5a33971acd5432eea18a
 MISC metadata.xml 618 BLAKE2B 5a6a28876a22cedbca154051a389fed0e7ef25039319786ed2303b580b1e421b648038237e0157678fb96e1b45839e725299e56584bcb770593f60f305932145 SHA512 af08ad67affb8dbe4ae6afbb2a251e5bd44e5fb30f9332dddebbb6dd504fa25b449b5b4c3a5c1f0337c6a7751b2395eb049cf94206a44cce2a7ab1df1d1b3eae
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
index 7e4d9bfe234f..56f9b6a0dd6c 100644
--- a/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
+++ b/net-irc/kvirc/kvirc-5.0_pre20180401054732.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=(python2_7)
 
-inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
diff --git a/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild b/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
new file mode 100644
index 000000000000..cf4358a57af0
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.0_pre20180605072059.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="8db61929facd9bfed245752c538b51d0242c3e2e"
+	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-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 98c8fdc1eb45..ddcaa318794f 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_COMPAT=(python2_7)
 
-inherit cmake-utils flag-o-matic gnome2-utils multilib python-single-r1 xdg-utils
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 xdg-utils
 
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3