Sync with portage [Fri Jan 12 00:51:31 MSK 2018].

6 years ago · bf5904d605
parent a4fa6ec8f2
commit bf5904d605
811 changed files with 3246 additions and 2794 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@ -7,6 +7,7 @@ DIST rsyslog-8.28.0.tar.gz 2471122 BLAKE2B 48ed55cbf02eca22591c3d1d59db8f956e4d8
 DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c044ca81715062cebaacae5003463ed233f26358418651f63643bd6d7cdfb4f3192324d59d596c87480e37f40493 SHA512 6e0a69f2ac36fcfd0714b2b7053bd263ca8875d2aba7ad6452223eb8677edfa1cf4978989661614dd65dd1822f0123599d565679c8faa3960f136c8d9472e952
 DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
+DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
@ -16,3 +17,4 @@ DIST rsyslog-docs-8.28.0.tar.gz 4424901 BLAKE2B 9753b1a48b9d3bb045f2d088de5df0bb
 DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf512424f8d4fc9f00ba6c4c8e9bbbcb0ea4d4da4ba31c53bad23e28ed761e27e6378657b085cb0d72cebdc233ba25160023daa SHA512 791633b93693c1eacde965e07ced863b96d1bfa488fc5c4770424825ab702cae7babd5286e552da5e17d1d7779f228c61a1527b9726dffea31bbb3b4e80525dc
 DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
 DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
+DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
--- a/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
+++ b/app-admin/rsyslog/files/8-stable/rsyslog-8.32.0-fix-building-without-curl-r1.patch
@ -0,0 +1,90 @@
+https://github.com/rsyslog/rsyslog/pull/2378
+
+--- a/configure.ac
+++ b/configure.ac
+@@ -454,6 +454,8 @@ if test "$enable_libcurl" = "yes"; then
+ 	)
+ fi
+ 
+AM_CONDITIONAL(ENABLE_LIBCURL, test "x${enable_libcurl}" = "xyes")
+
+ # klog
+ AC_ARG_ENABLE(klog,
+         [AS_HELP_STRING([--enable-klog],[Integrated klog functionality @<:@default=yes@:>@])],
+--- a/grammar/rainerscript.c
+++ b/grammar/rainerscript.c
+@@ -1935,6 +1935,7 @@ done:
+ 	return(estr);
+ }
+ 
+#ifdef HAVE_LIBCURL
+ /* curl callback for doFunc_http_request */
+ static size_t
+ curlResult(void *ptr, size_t size, size_t nmemb, void *userdata)
+@@ -2010,6 +2011,7 @@ finalize_it:
+ 	}
+ 	RETiRet;
+ }
+#endif
+ 
+ static int ATTR_NONNULL(1,3,4)
+ doFunc_is_time(const char *__restrict__ const str,
+@@ -2513,11 +2515,16 @@ doFuncCall(struct cnffunc *__restrict__ const func, struct svar *__restrict__ co
+ 		if(bMustFree2) free(str2);
+ 		break;
+ 	case CNFFUNC_HTTP_REQUEST:
+#ifdef HAVE_LIBCURL
+ 		cnfexprEval(func->expr[0], &r[0], usrptr, pWti);
+ 		str = (char*) var2CString(&r[0], &bMustFree);
+ 		doFunc_http_request(func, ret, str);
+ 		if(bMustFree) free(str);
+ 		varFreeMembers(&r[0]);
+#else
+		LogError(0, RS_RET_INTERNAL_ERROR,
+			"rainerscript: internal error: HTTP_Fetch not supported, not built with libcurl support");
+#endif
+ 		break;
+ 	default:
+ 		if(Debug) {
+--- a/tests/Makefile.am
+++ b/tests/Makefile.am
+@@ -226,7 +226,6 @@ TESTS +=  \
+ 	rscript_contains.sh \
+ 	rscript_bare_var_root.sh \
+ 	rscript_bare_var_root-empty.sh \
+-	rscript_http_request.sh \
+ 	rscript_ipv42num.sh \
+ 	rscript_field.sh \
+ 	rscript_stop.sh \
+@@ -305,7 +304,11 @@ TESTS +=  \
+ 	lookup_table_rscript_reload.sh \
+ 	lookup_table_rscript_reload_without_stub.sh \
+ 	multiple_lookup_tables.sh
+-endif
+if ENABLE_LIBCURL
+TESTS +=  \
+	rscript_http_request.sh
+endif # ENABLE_LIBCURL
+endif # ENABLE_TESTBENCH2
+ 
+ if HAVE_VALGRIND
+ TESTS +=  \
+@@ -313,7 +316,6 @@ TESTS +=  \
+ 	mmexternal-InvldProg-vg.sh \
+ 	internal-errmsg-memleak-vg.sh \
+ 	rscript_set_memleak-vg.sh \
+-	rscript_http_request-vg.sh \
+ 	no-parser-vg.sh \
+ 	discard-rptdmsg-vg.sh \
+ 	discard-allmark-vg.sh \
+@@ -338,6 +340,10 @@ TESTS +=  \
+ 	multiple_lookup_tables-vg.sh \
+ 	fac_local0-vg.sh \
+ 	rscript_trim-vg.sh
+if ENABLE_LIBCURL
+TESTS +=  \
+	rscript_http_request-vg.sh
+endif # ENABLE_LIBCURL
+ endif # HAVE_VALGRIND
+ 
+ if ENABLE_ROOT_TESTS
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@ -4,9 +4,9 @@
 	<maintainer type="person">
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
-		<description>Primary Maintainer</description>
 	</maintainer>
 	<use>
+		<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
 		<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
--- a/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.32.0-r1.ebuild
@ -0,0 +1,459 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="http://www.rsyslog.com/"
+
+BRANCH="8-stable"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	MY_PV=${PV%_rc*}
+	MY_FILENAME="${PN}-${PV}.tar.gz"
+	MY_FILENAME_DOCS="${PN}-docs-${PV}.tar.gz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+
+	# Upstream URL schema:
+	# RC:      http://www.rsyslog.com/files/download/rsyslog/rc/rsyslog-8.18.0.tar.gz
+	#          http://www.rsyslog.com/files/download/rsyslog/rc2/rsyslog-8.18.0.tar.gz
+	# Release: http://www.rsyslog.com/files/download/rsyslog/rsyslog-8.18.0.tar.gz
+
+	MY_URL_PREFIX=
+	if [[ ${PV} = *_rc* ]]; then
+		_tmp_last_index=$(($(get_last_version_component_index ${PV})+1))
+		_tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${PV})
+		if [[ ${_tmp_suffix} = *rc* ]]; then
+			MY_URL_PREFIX="${_tmp_suffix}/"
+		fi
+
+		# Cleaning up temporary variables
+		unset _tmp_last_index
+		unset _tmp_suffix
+	else
+		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	fi
+
+	SRC_URI="
+		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
+		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
+	"
+
+	PATCHES=( "${FILESDIR}"/8-stable/${PN}-8.32.0-fix-building-without-curl-r1.patch )
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt grok jemalloc kafka kerberos libressl mdblookup mongodb mysql normalize omhttpfs"
+IUSE+=" omudpspoof postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid zeromq"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=dev-libs/liblogging-1.0.1:=[stdlog]
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	grok? ( >=dev-libs/grok-0.9.2 )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/mysql )
+	normalize? (
+		>=dev-libs/libee-0.4.0
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.14:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? ( >=net-libs/gnutls-2.12.23:0= )
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	test? (
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${MY_FILENAME_DOCS}
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		$(use_enable test testbench)
+		$(use_enable curl libcurl)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug memcheck)
+		$(use_enable debug rtinst)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable grok mmgrok)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/${BRANCH}/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${BRANCH}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${BRANCH}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${BRANCH}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/${BRANCH}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${BRANCH}/${PN}.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " http://www.rsyslog.com/doc/rsyslog_tls.html"
+}
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.4.ebuild
@ -16,7 +16,7 @@ SRC_URI="https://github.com/lancos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc gui python"
+IUSE="doc +gui python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

 PATCHES=(
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@ -1,3 +1 @@
-DIST Impressive-0.10.5.tar.gz 166707 BLAKE2B 2d5ef9d05d82a22af037fda0e0b01252d513ee0686f9ab21f1d24cf86b4e0a5043aaf7f16b3d9d8a6773b110f716948c184a058845d7595155a40410821c8ccf SHA512 3939188d45ac7a617a56be72e72c98923c23073bee2c3c1b7b81fc2e26ce415ceffdf5456d754f921e488181d8edb7df96ad90e6923b2425c49e38da75c02f20
-DIST Impressive-0.11.0b.tar.gz 195138 BLAKE2B daa8e7bc17ec028a9c858688182a4cd6426004aaec24b7ea1574cd415a7f43f0d8a0ae43b01089d66a66c16b316439454341a3f6c2d366768a351ba2fff85b93 SHA512 c4038ed7b71ac79078922ee0e24ce3bef4b0384d8d468291f0283266fe8a849825f5798ec1260e40ac12659a8a7cf5325e3aca0e2475b1c483d3ce830f4bc70f
 DIST Impressive-0.11.2.tar.gz 198391 BLAKE2B e0157a910b61c7dbe0796193b3d18f533210de50568d835e5204a848a5ac4978ab228b633d5137fb068af09a88d0c50fc2dbbb02b9b0d1a32a99f9de220ac1de SHA512 cabb52612f65ddadfb080e3db6417680a1aa9724fe45d8b78a1206b6508a8b60c5e5a7c218ff0f90e62adcd498aabe625837164fc547604dfd7aba425db87dd6
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ b/app-office/impressive/impressive-0.10.5.ebuild
@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	!>=dev-python/pillow-3.0.0
-	app-text/pdftk
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-	x11-misc/xdg-utils
-	x11-apps/xrandr
-	app-text/ghostscript-gpl
-	|| ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}.py
-
-	# compatibility symlinks
-	dosym impressive.py /usr/bin/impressive
-	dosym impressive.py /usr/bin/keyjnote
-
-	# docs
-	doman impressive.1
-	dohtml impressive.html
-	dodoc changelog.txt demo.pdf
-}
--- a/app-office/impressive/impressive-0.11.0b-r1.ebuild
+++ b/app-office/impressive/impressive-0.11.0b-r1.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-r1
-
-MY_PN="Impressive"
-
-DESCRIPTION="Stylish way of giving presentations with Python"
-HOMEPAGE="http://impressive.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV%b}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	app-text/pdftk
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	x11-apps/xrandr
-	|| (
-		app-text/mupdf
-		app-text/poppler
-		app-text/ghostscript-gpl
-		)
-	|| ( media-fonts/dejavu media-fonts/corefonts )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	sed \
-		-e 's:tostring:tobytes:g' \
-		-i impressive.py || die
-}
-
-src_install() {
-	python_foreach_impl python_doscript ${PN}.py
-
-	# compatibility symlinks
-	dosym impressive.py /usr/bin/impressive
-	dosym impressive.py /usr/bin/keyjnote
-
-	# docs
-	doman impressive.1
-	dohtml impressive.html
-	dodoc changelog.txt demo.pdf
-}
-
-pkg_postinst() {
-	elog "The experience with ${PN} can be enhanced by folowing packages:"
-	optfeature "Starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
-	optfeature "Sound and video playback" media-video/mplayer
-	optfeature "Sound and video playback" media-video/mplayer2
-	optfeature "Alternate PDF rendering" app-text/mupdf
-	optfeature "Alternate PDF rendering" app-text/poppler
-	optfeature "Alternate PDF rendering" app-text/ghostscript-gpl
-}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic qmake-utils
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/libunibreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# bugs #452636, #515698, #516794, #437262, #592588
+PATCHES=( "${FILESDIR}"/${P}-combined.patch )
+
+src_prepare() {
+	default
+
+	append-cflags -std=c++11
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/d" \
+		-i makefiles/config.mk || die "LDFLAGS sed failed"
+	sed -e "/^LDFLAGS =$/d" \
+		-i makefiles/arch/desktop.mk || die "LDFLAGS sed failed"
+
+	# Qt5 moc
+	sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
--- a/app-text/fbreader/files/fbreader-0.99.4-combined.patch
+++ b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
@ -0,0 +1,535 @@
+diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
+--- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/fbreader/Makefile	2018-01-11 22:18:18.000208200 +0700
+@@ -23,5 +23,5 @@
+ 	done;
+ 	@echo -n 'Linking $(TARGET) ...'
+-	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+ 	@echo ' OK'
+ 
+diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/fbreader/desktop/desktop	2018-01-11 22:13:58.401219117 +0700
+@@ -22,2 +22,3 @@
+ Icon=FBReader
+ Categories=Office;Viewer;Literature;
+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
+diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
+--- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp	2018-01-11 22:18:33.000207569 +0700
+@@ -60,5 +60,5 @@
+ 		return false;
+ 	}
+-	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
+	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+ 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+ 		clear();
+diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
+--- fbreader-0.99.4.orig/makefiles/arch/desktop.mk	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/makefiles/arch/desktop.mk	2018-01-11 22:18:40.119207269 +0700
+@@ -15,27 +15,9 @@
+ CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+ LDFLAGS =
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+ 
+-ifeq "$(UI_TYPE)" "qt"
+-  MOC = moc-qt3
+-  QTINCLUDE = -I /usr/include/qt3
+-else
+-  MOC = $(shell pkg-config QtCore --variable=moc_location)
+-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
+-endif
+-
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
+-
+-ifeq "$(UI_TYPE)" "qt"
+-  UILIBS = -lqt-mt
+-endif
+-
+-ifeq "$(UI_TYPE)" "qt4"
+-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
+MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+ 
+ RM = rm -rvf
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,7 +18,7 @@
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,15 +18,15 @@
+  */
+ 
+-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
+#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2018-01-11 22:18:40.120207269 +0700
+@@ -23,6 +23,6 @@
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,6 +18,6 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QPushButton>
+ 
+ #include <ZLDialogManager.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,6 +21,6 @@
+ #define __ZLQTDIALOG_H__
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLayout>
+ 
+ #include <ZLDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
+ 
+ #include "ZLQtDialogContent.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,5 +18,5 @@
+  */
+ 
+-#include <QtGui/QFileDialog>
+#include <QtWidgets/QFileDialog>
+ 
+ #include "ZLQtOpenFileDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,14 +20,14 @@
+ #include <cctype>
+ 
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QLabel>
+-#include <QtGui/QGroupBox>
+-#include <QtGui/QRadioButton>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSlider>
+-#include <QtGui/QLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QLayout>
+ 
+ #include <ZLStringUtil.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,7 +21,7 @@
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,9 +20,9 @@
+ #include <unistd.h>
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
+ #include <QtCore/QThreadPool>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -23,9 +23,9 @@
+ #include <string>
+ 
+-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
+ #include <QtGui/QCursor>
+-#include <QtGui/QDialog>
+-#include <QtGui/QProgressBar>
+-#include <QtGui/QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLabel>
+ #include <QtCore/QRunnable>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -20,10 +20,10 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -25,10 +25,10 @@
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2018-01-11 22:13:28.444220377 +0700
+@@ -49,3 +49,4 @@
+ 	  path = replacement + path.substr(1);
+ 	}
+	ZLUnixFSManager::normalizeRealPath(path);
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQAPPLICATION_H__
+ 
+-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
+ 
+ class ZLQApplication : public QApplication {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,5 +20,5 @@
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+@@ -73,5 +73,5 @@
+ 	new ZLQApplication(argc, argv);
+ 
+-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
+	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
+ 
+ 	ZLibrary::parseArguments(argc, argv);
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -25,5 +25,7 @@
+ #include <QtCore/QList>
+ #include <QtCore/QTimer>
+#include <QtCore/QUrlQuery>
+ 
+#include <QtNetwork/QNetworkCookie>
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+@@ -150,10 +152,10 @@
+ 	if (!scope.request->postParameters().empty()) {
+ 		QByteArray data;
+-		QUrl tmp;
+		QUrlQuery tmp;
+ 		typedef std::pair<std::string, std::string> string_pair;
+ 		foreach (const string_pair &pair, scope.request->postParameters()) {
+ 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
+ 		}
+-		data = tmp.encodedQuery();
+		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
+ 	} else {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-01-11 22:13:39.639219906 +0700
+@@ -87,5 +87,5 @@
+ 
+ void QtWaitingSpinner::setRoundness(qreal roundness) {
+-	myRoundness = std::max(0.0, std::min(100.0, roundness));
+	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
+ }
+ 
+@@ -149,5 +149,5 @@
+ 	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
+ 	qreal resultAlpha = color.alphaF() - gradation * distance;
+-	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
+	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
+ 	color.setAlphaF(resultAlpha);
+ 	return color;
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2018-01-11 22:18:40.121207269 +0700
+@@ -4,5 +4,5 @@
+ #include <QtCore/QTimer>
+ 
+-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
+ #include <QtGui/QColor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,12 +18,12 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,10 +21,10 @@
+ #define __ZLQTITEMSLISTWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QFrame>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QScrollArea>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QScrollArea>
+ 
+ #include <ZLTreeTitledNode.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+-#include <QtGui/QGraphicsDropShadowEffect>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QGraphicsDropShadowEffect>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,9 +21,9 @@
+ #define __ZLQTPREVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QVBoxLayout>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QVBoxLayout>
+ #include <QtCore/QSet>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
+#include <QtCore/QStringListModel>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QCompleter>
+ 
+ #include <ZLibrary.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2018-01-11 22:18:40.121207269 +0700
+@@ -22,6 +22,6 @@
+ 
+ #include <QtCore/QSet>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+ 
+ #include "QtWaitingSpinner.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,6 +20,6 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QLayout>
+-#include <QtGui/QScrollBar>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QScrollBar>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+@@ -186,9 +186,9 @@
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+ 	if (direction == ZLView::VERTICAL) {
+-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
+		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
+		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
+ 	} else {
+-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
+		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
+		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
+ 	}
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQTVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
+ 
+ #include "../../../../core/src/view/ZLViewWidget.h"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/appdirs/appdirs-1.4.3.ebuild
+++ b/dev-python/appdirs/appdirs-1.4.3.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/ActiveState/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""

 PATCHES=( "${FILESDIR}"/${PN}-1.4.3-distutils.patch )
--- a/dev-python/packaging/packaging-16.8.ebuild
+++ b/dev-python/packaging/packaging-16.8.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"

 RDEPEND="
--- a/dev-python/six/six-1.10.0.ebuild
+++ b/dev-python/six/six-1.10.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"

 DEPEND="
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@ -1,2 +1,3 @@
 DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
 DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
+DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
+GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
 SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"

 if [[ ${PV} = 9999 ]]; then
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-calendar-17.08.3.tar.xz 280448 BLAKE2B 639871f99310e94f936c2cf7784c5968274c40fd428334ad77c9480e88442ad55d7a4e432e936d34c477555b81e7f9c579b464a1f90ce32da29048548ec8735e SHA512 318be593363dc6710369555946f8152ec410a74a2b8821b5e10f7f1df8dedcd6faa1a4fd21255f0d9366760d2e5f61bd54b4b08a1bdb1f30a7409e4031c2a53c
-DIST akonadi-calendar-17.12.0.tar.xz 280020 BLAKE2B 2e7c4a05c6c5f4dbbbc678c87342cb355d9081dac9485d743fa88e14710cf13d76c8d164893f719fd729c584bea90a4c36f73dc2072a84ceaf362126dc30568c SHA512 e39db12740a2c1ed9541e034564eb7d93fa54398163f182a7409fe363ba6a46aedec5e0988c4da952a08d9b07c60f4c20a739454c18c9e48f9e57515142abe9d
+DIST akonadi-calendar-17.12.1.tar.xz 280016 BLAKE2B dec6b78b8c672d3e3451b24d681bd64e7fbb6f5f9fc75bd03150fd4be02914e70e3957ae74cb3c2e92ae6c161c4289a30a88d40a571d92a494e0b370961d9272 SHA512 c5d3fb041171b0649d38ccd431382f7fb2636328bfbd05c8ff05fcfa119a36ccb4d066c9e25cbb9bd36a08e4bc6005ba3758b0313d1bd57a0949fb548dbe4b03
--- a/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-contacts-17.08.3.tar.xz 353516 BLAKE2B 628a80b4bccc01e98d4124180fdceb68742fb4b0ef822baf665215a700c6ceb16c98b5efa7ad18c894910fdc269087e874cb32f5b80ca4d1e1a904e007fa2974 SHA512 d3b8dc0c82b4258aac3c06d87d62c8ecf881fe62c31a9f77b4c050a3ee70e10d225660b08f7cbf4cf6c813ed2c1c5c321cdf0633e37cf8e21bf70a04bd133870
-DIST akonadi-contacts-17.12.0.tar.xz 345212 BLAKE2B 266ac67b7426a397e7e73888ffa1d061165ccb02d350456354d6f5d144fb2d3099db25d7921279c35ece665712a7ec80e4b926543e7bf66e7bf80bf1b91da701 SHA512 d4303ab3d5c5f82c652f88b90f6124ad18d7b6db62d9b1bc09f9308941459335e75eccb111a0ed5f766d3c767a469b6351c6d3fe63e7d7208dd417591eda0fc0
+DIST akonadi-contacts-17.12.1.tar.xz 345012 BLAKE2B a51c69515101cba7b052628b8554d6b3b88114c4d94fd1e5d05c994ac8c5b03d879d4773d223f90695dd48c5844a57e0c23f75578cfb17b802a35d6f8ccfabe8 SHA512 6cc74f87f27e9be0193252279b85095d2f453e57382ee95dd6439d2f2ae41a329bf8154f4fef6d82ab2262e76d0d80e41e8ca60371282ac1efa594699a3dfd28
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -22,9 +22,8 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kjobwidgets)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-import-wizard-17.08.3.tar.xz 434632 BLAKE2B 7873ce751e8af1af3b4b4859e495a1e4f4820e8899c9955200d6ba7412d5f5ea3c974d4a112c547e3dd429f59d4d2de2170fe76fa8320dd974d838f8800727f5 SHA512 dde89492fa2b2e2c0eff38e7cfa5d83607a843ff62f46a4042139b8922b4744b887428d1d00d68e4dbd6b09afec6194e3793c27c1dd005550af7cb8c85879351
-DIST akonadi-import-wizard-17.12.0.tar.xz 436280 BLAKE2B 6f4464ec7486bd43fe5c95e076ace9429780d8d22c33d7ea623436b78420320d240f488dc04c3d3783a8d98821d260d4aecea1f44d563470c540cab4bd977c43 SHA512 ce52f354c1fd881b076d8f1d66053c33a2d8a6069ecf048714ab83ce22835632c622dcf335f4179a1990ea16213559aa0126dc9ece27b77315d3b41ca51c59bc
+DIST akonadi-import-wizard-17.12.1.tar.xz 436392 BLAKE2B b5a906ec8a538f347e31fc20cb8088f5621f741699a0679983136fcce9881a24215b7eb3f57e75db64cfd48fc1201a8644637b1f97953fa84722cd84538ecc70 SHA512 4426df8df9da5a7cb812a0c8b97cd5e2b69a973fd41dc02193905d7dadd010759af99403c5886f002df6977c5abacf8810892a04ed8078b0a4588408b43d0849
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-mime-17.08.3.tar.xz 130840 BLAKE2B 27d639f6f6fb29544847b452dd67a352a4b7569371da4ce05a5ac0207c6209df16dc7532eafc659a62d53c7b631260feebd795964350a6940dcd131de2ba8d92 SHA512 2bd31750fa63705035dcdc56b4686ec0e22fc593baa6514e0803e6e4ce7ab4346edb5f1eab14f598e7d5c23569b842f7d733dfd53f9d60a64b3f6214de8742f6
-DIST akonadi-mime-17.12.0.tar.xz 130680 BLAKE2B 8bb3b0152f26ca570be202dd3d1403a3af8759ef30a54717d22003a86bf11096b7895ddf380dfb04b6380c5ddb8b6d50c447579cd92ceac0db3ec14ca1f50e5d SHA512 328dc0790265216784640ef8b77c90b4c5837ecb60597244c5e370c1474feeed2be991ed60f34dc426b52244d5a3da62d02e273c5dfa28fd8a48d5611784553d
+DIST akonadi-mime-17.12.1.tar.xz 130696 BLAKE2B c41c21893e484d9e460055e5e11b0618da609f95e5c1be1323c532442da97fdc6f10de4f02e4a4fb82e4e356b748d548a450abedbc92edd5a38d137316c45102 SHA512 bb1b91a0119dc3e916fa3da177163ca87915119d3827dfef652e150908ea552e3e423fc500d2ccec5ad95622bf5b7ec24b4f8705a0b4f5cf873aab91ef90b22e
--- a/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-notes-17.08.3.tar.xz 24728 BLAKE2B 6447bff50f623c54f155038b47e52394f6b6798cbd0485de45ef01ec9cb7c45e4c023f6ee0d577e3046f17df3c6ba2e6d363c4e93e2510a71119c5eb8009bd9c SHA512 ea7f19cb833d9a54fe8c52f02e4b87ee45a7cbe997b7b6974d9f8372d5e13cd6815be180d15c2aec9df6e490c028ac2f5c6d97cdc9a87b0e20c3b8b701261a68
-DIST akonadi-notes-17.12.0.tar.xz 24564 BLAKE2B cbff73ba535917d9bc071cd4a2209390d62c8d06848ffcfa6872b8beb1199d384f2443cd8b44da3fe508655a6b69ba3569fd9df1442311cd45e1a48cfc2785f5 SHA512 6163fc18c42ca067d3ae87b5af2bb34700d67b01970a1835c487096d0f42bc0b002e876b2d5b577b3a288810a2ae56c4d8090404c67aecdc4d7320bdb2b1480b
+DIST akonadi-notes-17.12.1.tar.xz 24556 BLAKE2B 733b4186fe78e57dd77a6a16ccfb7acf67beddf55ca7d41c09482c28160f5187f7f9ed1cd0055d3de2b31e3fcb97b0a285d102bcb3ba0efd779ee7c8a02cd9c8 SHA512 1514103b64f4eed44b777c06d6149f3907b93a4d589812bb0150db2690d9382b16c4073b9bc586e2d23a653e95c475e04f16e5a435308c4849732884fc0434a5
--- a/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-search-17.08.3.tar.xz 81288 BLAKE2B 04342e552c47fb9e2d94e13715b4d6b564b02bf9704671ada211f353fc3554b7fc01600ff6c4b3e03cf6c2edd4f525a2c01e2b9e8a4479ea8b28de26ad2b79d5 SHA512 e76e0f2a4f0c26b353e31c8cfeb29f6a1e342101b58925d741479193955171e7698019e1a0117348694d7f1256c777cbce9c43033e8b7336cacef0e2c87f9c77
-DIST akonadi-search-17.12.0.tar.xz 81452 BLAKE2B ea39dfc5632c2a16f48c68d8738cecfb8d789ac97a667fd944d09e17a00650ff50c53bc28394db4b406849c0f02d4c3b01ef30a3c35bc38aef701ae5ad8564a5 SHA512 d9819cc5e1220b431179e3313f7fd2fbf5ab871482b1bb1935b84e8850d895a9908123d0fed2a9091ef7d450df170fdeb667a2a3331e2fb29606479dc8a47e39
+DIST akonadi-search-17.12.1.tar.xz 81600 BLAKE2B 56a2a27ca37af5e1a74d595bda34e9fdbb7672f9409d8d0b10cfe1bfc157bb198274f3ca63b3ba7e534a5210faae5b45021f42e88fde59886b6fc21d38851095 SHA512 67ff01fd3e5c0b488d4eab73c05369f2dce5fcdcf38304747c68705b10d596c0222664a13100e123bd366c29ccc98ab8d33922f75813085c0aba34539239cfa7
--- a/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-17.12.1.ebuild
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-17.08.3.tar.xz 1427896 BLAKE2B 37e19d5afb0911bf2002392e0579ea33429a5dc8ec5ddbf3c8e8fa5ec21b014dea5267e353cf5ab94927fa8444cacf9948c001de34a9acc730a891b96da7c0a5 SHA512 bd2a8832ba02b4c39aa2d004722559921a40c39d5bfd6660a0c1fe1d3a2f7103bda59849a45523f3d53b6a02d8686770cb304cbc04ad056fb9627d602b992adb
-DIST akonadi-17.12.0.tar.xz 1521468 BLAKE2B 3869b2446df6dfd721401f3edaf93d6866c61a3e5db2b09897ecd4b95b5e47be2b83acd3f14f39f13f35b35b6a2d43f3ea0cf15ef76ba24333da047bc8926f8b SHA512 106fe248554dd44cab2cdb3a6d1ebe1cc35f64c5862b631c7d13728d1d78ff9f17a981c363332d30ef85876130b6c2e5f40709c8f7bae9d03f646eb3cfc4717a
+DIST akonadi-17.12.1.tar.xz 1521928 BLAKE2B 9da0f21dfa43578fcef90522c007255a0a039d03d0bdfdfa5dcce52b572a6433800bf55149fb40a75385ee062d64e72d241e11f6fc8277d11414dba61d4e0423 SHA512 5e6ea993b98ee72a5c65156e13734da3b8b34438a1a6b791f616e50eb6274328d9f6331bf2b4b9cd2216ce7977a875174757fbd7c7d1d366759303ce89be8ea5
--- a/kde-apps/akonadi/akonadi-17.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@ -1,2 +1,2 @@
 DIST akonadiconsole-17.08.3.tar.xz 185196 BLAKE2B fb630eb12653f8a6d8f4064f0fa6a0deaf6766959db4d55f6a6526be504023d4a08954186924063bc4c6aca00d1523f46517d64b6f81da0f43e0a5878d7815dc SHA512 a9de6c25c9b7dea29595e5ed815e25cd37b715afa2c754c9920cf9c6be4755d5bcf5376cad82853fad75feb1540d29afb9691731c09ec057571e8ed860bf1563
-DIST akonadiconsole-17.12.0.tar.xz 185452 BLAKE2B 6fc92940582a261a77f0b830f0b5cbea27648a92062c202cababe3a21ddd113e4817fff7544da43621413ae63eefb8623b8c842a92309a254fe78308209eccd2 SHA512 df58a0940b51162829900dc33b754b9aab9701654271f5631bd8b1959a2a777372e5f7bc09ffa9571b1c0731a59181a1bdef217f1609c650bb70589a9e5d74f8
+DIST akonadiconsole-17.12.1.tar.xz 185432 BLAKE2B 9a5f9832aceee800036e24d9140166ac9699fa6549dcb0b41166ad5d94bfd35abb61f3b8fb65d25f2c1d4737a24675b93c74c458623b01796c7380fa16916be0 SHA512 d612c31db21086f301bfa0e60051603655f088edbaf1f3011e6ed485b5657764c8075eb29b1072ee0a3f2c945726e3c545812fb930353310117da9d54bdbf7ea
--- a/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@ -1,2 +1,2 @@
 DIST akregator-17.08.3.tar.xz 2248228 BLAKE2B a0542cc6a29f14af066507a64a1b5f70c8b95345bf2245d124c7e1b55c39e67e81d87e1b929a96ceb41947fb98cfa14fb3b0bc2654ead5f5516245fa7949fb78 SHA512 1415eea92cd26d6aa39e373d4177b09739479cb8f168f16ffaede7abf47c5a3b5a2e349bb583428ee210a44736cc4d27dde60fab69edf56e0621062512169ca5
-DIST akregator-17.12.0.tar.xz 2253244 BLAKE2B bca80c348084616359669591012a60dbef2abd1be6ce7dcb3c53048258e32d1510b9559c7fa6dc2b7ca3879dec95626b8627ceaa88808d9137f246d10a1f6672 SHA512 cd989bd8890ef4f77106c38f01feda7102b157356902b2109089b7004a3a070117608708abe60d1c59bd2d8b71238c8c2efa3846e1598f62f89717ac1ec51788
+DIST akregator-17.12.1.tar.xz 2253308 BLAKE2B 05d115a568b8979fb834796f4b4ac16d277bc34dfa2f86032a561804c997ccb601d5f96e45b5b5d617e9db4ba8f668f5f16098979aca1dec091b1013425e3237 SHA512 ec52857cae2a07c4fdb0ebebadd8c6212990d5a9c493f380822339c4f5c8e6b2662d81c7f9f1829583b0798af2317aaa2ab1f5b1b7d7bbfe3839f3daf848232a
--- a/kde-apps/akregator/akregator-17.12.1.ebuild
+++ b/kde-apps/akregator/akregator-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/analitza/Manifest
+++ b/kde-apps/analitza/Manifest
@ -1,2 +1,2 @@
 DIST analitza-17.08.3.tar.xz 329800 BLAKE2B 33c08be1b6459a6949eac99598b05ecafd24718769e97457eb881dd534a93dd9553a2a055170250ac37ac6f89cbee3e5e39fc207d5b8454f94923d670fb3127f SHA512 bc7f8b0d53ffd4fac7a24b457e4732c557589a55f0722e2fa24134563ba124dc89774f39c158d8b2bd5fedee7656f224b7e60b4f87c0246589b84f09d20e991f
-DIST analitza-17.12.0.tar.xz 331168 BLAKE2B e823f496dc87db648b869b10fb1439416481c9ae9fd64786950eb4bc881c117dcc04406e9b3ad72ddb76ade0c3e00f32f52eaca3ad7c591b3a6144fc391808eb SHA512 afcd93067f2d8a728f56f4e800d76d321fcb67a20327aa2c39116eb4f68cd74fc3320a49aae5ece16f0dfe1c13b4faf51db8eb3281d340faad8575f44d5dedc6
+DIST analitza-17.12.1.tar.xz 331232 BLAKE2B be4dfc81063dc7994b17555677fee2079db843c721a713940445e57148752cd880074b4f2e37abc3ef0408285daa38e700f8a7e60c4dd3f99b8399640595d4db SHA512 e02fd9d107e898e1ad076568bea4893a6c82f8e2a9dfb7c5db031f750e8715318dd63a2f5ed6c8b1cf35ceb4634fde07f0e9a2d2e7af2366dde966372ec5a2a9
--- a/kde-apps/analitza/analitza-17.12.1.ebuild
+++ b/kde-apps/analitza/analitza-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -14,6 +14,7 @@ IUSE="eigen nls"
 RDEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtprintsupport)
 	$(add_qt_dep qtsvg)
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@ -1,2 +1,2 @@
 DIST ark-17.08.3.tar.xz 1966132 BLAKE2B ec17cdd3d9682cbf2f533bb159fcc219c91426997120ac03fa4726123701b6e1d98686cdaa07330e541bd2a1189a920292c13932df824bb9855bc93c38c7c605 SHA512 c28eda02f561391a21723286de2b71b9d985a07edfabd510b690927ac598da7464b56ba6132bb0362a6fd7ddb35d99bcbeb8ef74b801cfbba22f6f6d91262fb8
-DIST ark-17.12.0.tar.xz 1969924 BLAKE2B 98f686d81a0531f670f9a212ed685710eacf9bcf79d865b6690ce1e9401200151d52db00f96acc7cd5aa28100370c01674d7ed23d611bc4f9a27eae2c0d8ee31 SHA512 f4e95fe8fa87e285172ba9a7a51c09fc05684d7f6093dd5059fc04367718d57dc0620c00272242fdc04a0b8be9f9d8d99db56fb21067e39401d80e5576a8a6a8
+DIST ark-17.12.1.tar.xz 1970844 BLAKE2B 5f758bd3d555a75e1c50b29292bb28f637184d7b7af9de5193ab24348845135cc6486a196d16320d11b108eb3f7c83eeedf2a0afa46019a8c09b6f1ea9bb104a SHA512 445b98bc1fe6484cb5f2b6fb78a2d33e6d0d1898968fbcea43574567af3b3d8847fe674a2bdb342bf8ca96b862bb2de25b4f06e82715a3d99899d1279b8a9fca
--- a/kde-apps/ark/ark-17.12.1.ebuild
+++ b/kde-apps/ark/ark-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/artikulate/Manifest
+++ b/kde-apps/artikulate/Manifest
@ -1,2 +1,2 @@
 DIST artikulate-17.08.3.tar.xz 3749500 BLAKE2B 99cce8d58f10ccaecaeb649b9f59036d4d1d4826e10e3b196e523818cdb925414917a53511640491c5d68a86d6d0a93890af723b54ea893fe6c44a5a355dab7a SHA512 8ee17dbb4a8d3e0ff0537f856a7eb8c918cb909852cf5c48b70c0e281bfb104d3c231053d2aad9368f82182c628c92c267b4f6946164417efea24c589d343ca2
-DIST artikulate-17.12.0.tar.xz 3746568 BLAKE2B 971e8b1ec53f03860136fb7f2d85dffeb8260f7d290f27d14559379c6de59d0c61cb4566253e79c92d0c49b83665e043dfe86966ef47898035d6f417cb39d382 SHA512 7c17d3112d04593cd1042e356b3b95fd2e0f3066dc1bb8dc1812032df7495d8afd15fa661c698386e5228a90804cd1d9d44163377a408623d69f8716f65355f1
+DIST artikulate-17.12.1.tar.xz 3746124 BLAKE2B fb02fb203cea77e4c20eef77b6b0c4bc62a30b40754ca8de471f5b236b74f0af55b292f5dbbfff6b162558bf4c81afdd7d454b700995ed4768f3cd49ca3c3a5c SHA512 263f9fe1ee053cf546e647f4c805d4b10cd1d71cd14908e20486d68434f964af0fc7e5b641d15529fb18f09608bfe22abcef59c5b93f27f9b0efe4a9646d00d2
--- a/kde-apps/artikulate/artikulate-17.12.1.ebuild
+++ b/kde-apps/artikulate/artikulate-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,10 +11,13 @@ HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
 KEYWORDS="~amd64 ~x86"
 IUSE="+gstreamer qtmedia"

+REQUIRED_USE="|| ( gstreamer qtmedia )"
+
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep knewstuff)
@ -31,8 +34,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

-REQUIRED_USE="|| ( gstreamer qtmedia )"
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_GSTREAMER_PLUGIN=$(usex gstreamer)
--- a/kde-apps/audiocd-kio/Manifest
+++ b/kde-apps/audiocd-kio/Manifest
@ -1,2 +1,2 @@
 DIST audiocd-kio-17.08.3.tar.xz 247916 BLAKE2B b95475ff9080af1ba4f06952913c7d9ef8876e4a676237ff916baa33d8950cffad5e529079185fc5af88028b72339f0552a5bd032f941b2ba36ff6da34bed3d4 SHA512 000e344e0a9b8bfc09fdb57f0fa58b996a1a0d8a24b08dcf90210a519c2157774d666e1280291762c9b7bea45656cc93bcc5ae661103e4648260aae5ea4d7a26
-DIST audiocd-kio-17.12.0.tar.xz 247912 BLAKE2B 1efbc4cc844b41bc60cbf5a2090fe1143115bf2aa2004659e2559f6e4fd2fc3ba0fa360449b4840c0c0d0cab4766af886e6250866090166b3a404974e93501d9 SHA512 715bee94c06fa6025aa4165d246927e4ce5f731e7d3d19b6d00bab898d81f8545b4922583f38d1f910e916fab1355cf5d0f5cab42e13a518ccecf25348b452a3
+DIST audiocd-kio-17.12.1.tar.xz 247772 BLAKE2B 99ab12d7753c813f768a190a481cf314b246407913004743bcfcc7ccec1fb76e161c19c56e752aa780ac74a2e41eca8ea13571a5b4367aefc6db6b8b98baa040 SHA512 783093e7645cc41731aee1ef38778e2383776c34738b21f8545828996b7c16911114e1309bd863dbcdeb6b3e1f004286b705882ec1530ca4ee050b942e5010f0
--- a/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/baloo-widgets/Manifest
+++ b/kde-apps/baloo-widgets/Manifest
@ -1,2 +1,2 @@
 DIST baloo-widgets-17.08.3.tar.xz 152288 BLAKE2B 0cd9403cb8c730f27db69b03d24434638f0b3d35a5fcc8b08e573968cfbd7012ad4f455224f4841736e59edc589845119b27ad0905970dca8540eb5960d5e0b9 SHA512 5b218230c0778906d35c5070dbb91c84a708c7784059083ad972d6d20931388f531306c700fdfea4a58562b2573ed449cae4cb5bda2ac1bf77024f2827199e82
-DIST baloo-widgets-17.12.0.tar.xz 152296 BLAKE2B e361b88e037e82e3d7fcd912e13aa6d2940f290739c36f625471d13596431901b617ee4a1bcffea3a8b70fd96942d5b9fffd678f66ebf7604d09b3d0e60109d0 SHA512 f6ae9715dea5edd3f44b27d5bc9e742da8b12956f098640549b3d32548f57a53ad8be93d77434c16231fb2692e2d206a14bb456d1f456c57c2bf08333bba3efe
+DIST baloo-widgets-17.12.1.tar.xz 152260 BLAKE2B ee9d06d77fc5a41207ad33b8b9f82e0089dbe388ffe0c85e905b9a19d72369c2b9a89c3f58f723e96d14ee3d1f983712b8454dcc58627e4492804f5d03ce0308 SHA512 b8f54014c3d3a3f2250034b56e5f4724b85f86e957bdb358251fe5fb7339c3bf950bf8874cf8730f5f9bc8ae46391ac61ad881159fe2845afb2402dbe06eb6eb
--- a/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/blinken/Manifest
+++ b/kde-apps/blinken/Manifest
@ -1,2 +1,2 @@
 DIST blinken-17.08.3.tar.xz 2505448 BLAKE2B 17c568e461325d779c8217476bbc882142152c642980ac72b0e945cb7b38d8f594c685800d6f16dfb2aca317af7f4d139bf4f32853a3ed0e715f7cc80a3d10ef SHA512 bb4d8c9ec10cb5ba83411217d137f30ffb4a8975e686f8434133134bd18d68fdbb6eab8952eaff6641935fecba19986568281dfbc8cf36fc0a665c7cbcfedebc
-DIST blinken-17.12.0.tar.xz 2505804 BLAKE2B cd4e702f7ec1985dbc624138fb2bdfaeb78f879045586bc0e0c4acdc9d8f31e16598ea8c440e2e642689e650547f755ac11a471163ccf294e3b40a3aace41e5f SHA512 724c48fd6d4a2faf81558d6eaec81d0e8a30c74dea3b11f6dd8bf9aa00fa87441fc294cc0a6f60ceb8a3561c8122d51265adcfe1c7cdc837e790d70b88f33e93
+DIST blinken-17.12.1.tar.xz 2505872 BLAKE2B 4d6049c3d028e11300e7b3d8db899f52ebf103d1997cd5d568e74ddd124f9cb4013e3790111286f08ceec5c759e11aebca7800f530d9bdd0b07f61d31809be95 SHA512 d86fd9aa8b1ef4eb447235c5b44a9dd0b789a96be364dbe2a1ffae15b1bb1ec153dad7bc09f10a4b36b789369f957d5ad57197acda0a79dcf54f68a4b13eb0c2
--- a/kde-apps/blinken/blinken-17.12.1.ebuild
+++ b/kde-apps/blinken/blinken-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/bomber/Manifest
+++ b/kde-apps/bomber/Manifest
@ -1,2 +1,2 @@
 DIST bomber-17.08.3.tar.xz 754600 BLAKE2B 8fe272d55026e8925e7587ffc8bf8465ab765805940eed318f4d3accd3876325f7a03a9e993945966e83c78e555699d79fe2a99e87470f6e355a7de6d69e7b87 SHA512 2fb6ad0b91062bfbb8e861493788f4f042d7a2244a0a93d3070109ba30e43653825dd060e65debaddbe7c26f416248e8ca68a2282a9e375fcc225750f35f7520
-DIST bomber-17.12.0.tar.xz 754084 BLAKE2B 5df6244a6aa38a06a44dbc749bca6e335773d47282aca615af83bfd2ae03aa0f141f8f32c1be3715e7ea1c40bdba74c1ed7a1db0414911352d34f0ca2f0466fc SHA512 bac8582cd6afc4639c2d5581f81a182e8ebdc5202c7c4dc685fc2cece0257984f5965c5184a79c9e4498e9cd834a704f299e47f9be7b9a2dce57272bada7b399
+DIST bomber-17.12.1.tar.xz 753892 BLAKE2B bb6c68b8d9e89f66bee395fd485afc0c9bbe948f5487b9019a4d3440e1da2678b69ca3aa72150a216b4f4f6e378b16266043e3d95ae7777238a124733fa6d1f3 SHA512 b294c8024de866342ae61c31c8e183306883655f6571b0868466a481fedbcd205b011f206dbb0cee6785c20c1446c09d189c135770814c7bcacc32b4520d74e1
--- a/kde-apps/bomber/bomber-17.12.1.ebuild
+++ b/kde-apps/bomber/bomber-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/bovo/Manifest
+++ b/kde-apps/bovo/Manifest
@ -1,2 +1,2 @@
 DIST bovo-17.08.3.tar.xz 186460 BLAKE2B dfb74374515a7b5cf88f618e5db04121d776656131ae6aafd63267c8da390092ae9c5793ef6ad47427f2a81503113694f16aed54f7948dd761306bb0af5528a6 SHA512 6d37cd6e687d2ac1c36bb3a9503bbfffc926c5b4d572327315bbdf70db42d956b45390dad74b839d8e6f7a641146ba25c5f84dc67640e1666e0fba19b2760013
-DIST bovo-17.12.0.tar.xz 186480 BLAKE2B f9fc5822d0fd8a766d426e1e2864658522839eea3c23d86bad64a15ed0a6ad144800056480ed7c9754c690b2abc0b2aa4845a8ba38ebf58e18af211083136f28 SHA512 5f0917133f84b7f26fe1171aeaa8a6e6734f306bc210e17094d741814939d43a4656794899f435e7c99a013c0e7f30e45e3e37945da714fdb0dd1e4c107d4ff4
+DIST bovo-17.12.1.tar.xz 186448 BLAKE2B e106cf278b9768f29905551454c9c0eea46d4896de792ad9a70b464952effcaacdc53ff79e1f8426eabd3f8efb31f9338456189e4d681c158d7b01db2c3f9884 SHA512 d162ada28c13f6983220e7ca0fb0c1a6276878d7167d4fdf91550c1e4dfce0ad3c23f3c24699d3e302fd63518af36311da9c212e62912336b3d2999a60cce6ff
--- a/kde-apps/bovo/bovo-17.12.1.ebuild
+++ b/kde-apps/bovo/bovo-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@ -1,2 +1,2 @@
 DIST akonadi-calendar-tools-17.08.3.tar.xz 223524 BLAKE2B 27b584a5a06c7d5388c4a182f824005e8905b54773dfca8c010faba4d254a73d794ed4b1eebdc516ba7a100d0e3b841f37b4a23e2efeeec6416813c2ed63f949 SHA512 9ff26e19f7fcbedb76698d40f781c4e96f97c6441e5002b3fa0d63b22558563ae8f25f8343b05acc400af2fa5e96b7f96c4fa3a9ffc82cbf5d01cf21e002cd40
-DIST akonadi-calendar-tools-17.12.0.tar.xz 224588 BLAKE2B c9d991270f00e9abcc84317d01ad605a47c917d366a6b6108b07fc76c7dc57b7db9102ac97b3b38b84e89eb24f3a63f28d289c9f5eb6aab0c18cd4e65b09e40b SHA512 f76b0d6417bcb17b62da0612c55da54878951112da9060ebf66505e6ddccd9d28caa6e2c6cd4d571e4496a2b6bfba6bb7f680e3f74ecac7e1ece521401358fdf
+DIST akonadi-calendar-tools-17.12.1.tar.xz 224584 BLAKE2B ca816ecc8deb68032b3063cdb777e92b4dc94b9eba782e285a99eacc40742e412f55c6c6f9fca3797b20692a2f516cd2414a0425a2a40a6a3b0ca8bf5bb614e1 SHA512 a7a30b833a835921b071a6288507f131b3688de38262d5fa6f49acfb32148d1625abd5c3e777af6452166d54d374e2991b02c11d328f9aec2ab337581ca38311
--- a/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@ -1,2 +1,2 @@
 DIST calendarsupport-17.08.3.tar.xz 644224 BLAKE2B 3a995ccb6db2d33abc7264fe0f50ac33b21dc44d76c0008652fdbc1ad7b7187da56879f17e3bc636b7810d679a27a6dcb53cd9a6beed815d4dcf61aaa84f73af SHA512 f7cf312d4e1970fd5d701c26e035443d3505fdbc97d6ca3f4c95c9f193014b3537f09d36c66d159981d22c188c38008ba359a70cf76eac2c3fe291441ee17587
-DIST calendarsupport-17.12.0.tar.xz 644800 BLAKE2B 716c4ffcb3a0b0d87ef117a536997c725b22eba3dc1ec2f800891e7c506db3b1440b815f3863a30e5eff0ef7d896e457fca74312f7f15bd39e82bd4df5b97ca8 SHA512 3988a731be0c89bf1fa2a5b214317e468ee021dce81c7ff86df461fe883304e83fae997ed617989a8274e0cfba7597aa9903792a0e04a220f8a64499928bbc26
+DIST calendarsupport-17.12.1.tar.xz 644840 BLAKE2B 2fd723c13bf89d3047c1dda3ba16550edf27d209f6aab9c01709315045a9e81eb62e37c57124a952d0677b03cd7163def266d91942e3f79d1da345f9e3dd9a74 SHA512 689d9b6b1d68542f586199297d3713bf052878440f3e4b76b97f78c11b2c69efa567a6252d582d09612922628560d870b342db6b143578a4a76f8ebc567199e2
--- a/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@ -1,3 +1,3 @@
 DIST cantor-16.12.3.tar.xz 378460 BLAKE2B 189ab04d6fda6864d1827abbd7689b87f59e784ed838613b8d00c44774b9672afad7456665310cc39d95345c5845b60f44708a28550842d14104948333a1e9af SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768
 DIST cantor-17.08.3.tar.xz 1062400 BLAKE2B c9ee9ca23679566c7e8b1895a6ef5a332d486f8abea75242529cd5a5f99f506cd1b3dfef5591a6275272a5a0b8441ff9ef1cf8621c236a7357c5391d187e60be SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b
-DIST cantor-17.12.0.tar.xz 1064392 BLAKE2B 537e6491a705bec0ca8d8aedafab34685b2b92042b8faf57685326375166f6e61ab0bf07307e5c0bb0f7b8e2590929e2e79712196295a40fe09e3ecf26f35215 SHA512 a2bbf4f5fffe2b732260faaf84e6fa2bf3338f5ce6b6943b247ef87ff643751a497c31221816ce4e5cf2f921bb946fd7075e750eba8750cc96448bb9ad400410
+DIST cantor-17.12.1.tar.xz 1064476 BLAKE2B 64eb91b1f0f033c5d6d33c21c9077cac1eb3ccfe33f25047dd18af8fec029cf1b5b26c5f68908eb3d12741ea48857639bb38db97748e48a6880993d37568711a SHA512 d15d9699e05a01fe5f376942dd39fdc9f6e8189819d44b11dbadb7ac43638766a233a361d107aa572e16df598eec4e220bfb9740d741d60a10ea7b00bb6fe095
--- a/kde-apps/cantor/cantor-17.12.1.ebuild
+++ b/kde-apps/cantor/cantor-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -32,6 +32,7 @@ DEPEND="
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kpty)
 	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_qt_dep qtgui)
--- a/kde-apps/cervisia/Manifest
+++ b/kde-apps/cervisia/Manifest
@ -1,2 +1,2 @@
 DIST cervisia-17.08.3.tar.xz 1905528 BLAKE2B f6780929aebebbda7ea1cfabc239d9b293c3de50363c9677b2bb6cb2486a4d239febc066d24c52d99716ccc8c2a7442f29b096da90d3db88be0af489d78f23be SHA512 0e9c5136745da6b6a7ace7bc009b87d697915b7fc39689c6c4b562d8a2e70212091e650043cf30abd453f1c59c64b4580e2df61ea5af3551ac3c9d45c15aa263
-DIST cervisia-17.12.0.tar.xz 1905988 BLAKE2B 7a415fcf17e88d8bb2360772c0c1d28d3c62f7b45e91be9d7b94305f0bd7f4d50ff600c8e533c887f9c6f380df5b5c5cddd46458be4aa51ebd903e25b6341987 SHA512 8e3a0b10822624228653da8b60516cff7c294b8c2012cba118524c0f1924c7ab07269bc56427b91ce8fc9171918ea3ddee8c569878c74247536eb765ac4e6f9f
+DIST cervisia-17.12.1.tar.xz 1905836 BLAKE2B 8e7faa64a635767ddd8fc9bc2ad4882d624ec43d0a97d056a272f4879102dbf4e541065d35f38cd7d126e941a5dc05e207940426e47387b608cdd50ab72c7fb5 SHA512 eb4e2b615a73e5e59c9c6d38346721658f2864c8cacd32c08dbb555e767d0dd21967fa17bc98c524211d84f87b2b849ec9d23108795f6436dcef49c23c405e04
--- a/kde-apps/cervisia/cervisia-17.12.1.ebuild
+++ b/kde-apps/cervisia/cervisia-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/dolphin-plugins/Manifest
+++ b/kde-apps/dolphin-plugins/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-plugins-17.08.3.tar.xz 187084 BLAKE2B abe392d68e622c8cc02aaae31d71ffa28bc19544e7b9306ae3cfcc73a18ae9d4b453626274158d94d52140bff16e39c987a68423d4e24dfcac38efcab65cefef SHA512 49bd9b9059a129e9276d2cc216679abbdec595a98aa3ee950164fafcef30a2206b18e3b7487a6665aa3da6c643d92017309fedcfad0caacdadd7433126690970
-DIST dolphin-plugins-17.12.0.tar.xz 187108 BLAKE2B 828bc8e728b28b8ba20f664055e090809b0901dc3444f6d1a1c4bdf79d65b8059cf73b379acd23a5d6eec85ebb59f278b2f7d797962777cf0b12803cbb9f76bc SHA512 551406733c97d0a4a0bb4d0567ce0351c64c33db501afad2c7ab49436d67e512c5d3ad34e7f5544765c09aba853ae31a48c1eeac81722f83485d91b41c22a586
+DIST dolphin-plugins-17.12.1.tar.xz 187316 BLAKE2B 36c1f8e264daa021f27aea9675784443d7d223f779822d05e077e93c232ba828527042507ee081758c958a9cf9aaad6d0f5a1551a30941b9ac9820fbfd6127bc SHA512 e0e63cac17211ab8390e62274ba69e5706dd0ff3df5a3c91adbfb4cc276cd79f73e6209b7c1fc8c1d4ffd804a974547d58f79bd1a4cf7363783a9eb1a510a8cf
--- a/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@ -1,2 +1,2 @@
 DIST dolphin-17.08.3.tar.xz 4832732 BLAKE2B 8fcb23bdac474ed4c0e8cb220f28443ae759ed5d818935ec96eee02121855173ef905938dbf0ef024daafd3e946bc1c544a3b82a10447aadd5fc3a17eb4de241 SHA512 c2b0a41b29bc0370b7e9614edb5cf80585748c3fe2179b40799e5922dd7370c75608b756384d2155b1a1a7e8cec599e94539174a615239303bd6ee002050b662
-DIST dolphin-17.12.0.tar.xz 4840308 BLAKE2B 0f03354a855c06150793c95cea07c5a12d8c92e1fbe55e3fa00e9e98de9519f7582fb9091e71b82a0c5849abeac4167a3805f4c4442344d08f0b307afbefa8b1 SHA512 bd6ba516da2e963963b35413d2fc02250bef4e20791316d62478341d37ed6f1a7b850f1d4b5d838daa485ae7c90ea04bc983611c4ebb9ee614dc93c9449f5fe9
+DIST dolphin-17.12.1.tar.xz 4840748 BLAKE2B 803f27c3a8b5bd0dfa1ca9eab01c3a3ea7c28479ad7c4ace72b74b1a5565adeda5ff8c1a6f25625bd3dfc263605401808c595613d834d89ac0b433286130c6a3 SHA512 0780eeb1bb730ac797532cf52411ad1036633565ed1e098b35828252f1a393554489367a136029b5b43f4783c4b5f16dbde1ab38314df997f206a91ddb540837
--- a/kde-apps/dolphin/dolphin-17.12.1.ebuild
+++ b/kde-apps/dolphin/dolphin-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/dragon/Manifest
+++ b/kde-apps/dragon/Manifest
@ -1,2 +1,2 @@
 DIST dragon-17.08.3.tar.xz 1463028 BLAKE2B b5804388182fc916d458d0c08d5cc3f39ce59222732f282199d1b57e543abebbd79fe1b1ec894935c4cc95bdd04e2b038a10c1ed62339fcb1eb49f545a568f35 SHA512 ca71a17ea38f5ea28c53f7b10a050c25b12f7e02da36dad8140868cb6a86d10b2d4efb25df28ea05ae65d36bffb074177db56c4b6a2505364dee060f8e47b5ff
-DIST dragon-17.12.0.tar.xz 1463144 BLAKE2B 97947f5806f978fa6672451e961e1e37808466b21dfd4cea5ab45db6146e547a1baaf7c5b64618fb6516bdf574cfed146863d396ac7c9683aa12917886b50ebc SHA512 ded54fb6face4360fd1280710e006c492ca7e15594d080cd6d72ee4f58f8eee8a688f3a36f5493d39a2c61601d4c507f42f06ca0ffef20f18696f3e2f44d38c0
+DIST dragon-17.12.1.tar.xz 1463184 BLAKE2B d43bce2a65301d0f93faaa849c69093523831273410032247c96073b5e1b0acda0dbc133d4a6fd16aef3dd7252133eddfbd886c4efdcb9c2d14779e93a3fe72c SHA512 3326c0485ca505e75c4c41e53ded1a23909c045335674b489eac181bc4aee00b167fd4338456882236034045568630b985f8dd52beee70f35f1adab8bebf6860
--- a/kde-apps/dragon/dragon-17.12.1.ebuild
+++ b/kde-apps/dragon/dragon-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -22,6 +22,7 @@ RDEPEND="
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@ -1,2 +1,2 @@
 DIST eventviews-17.08.3.tar.xz 433968 BLAKE2B 3ce619b1f5498dbf434e396eda47274c834e65a12b4899b5eb5bd3bb9e09a7887ceb0cd92b2bbda240f1c2b58a59293001ddefe619b945030d8b6288fa91de7b SHA512 ac44d1657293430ef4edd0ea8119529fea56fffc0c88dac3a928a37a4191f345ee5f035b2a70bcae22d6da0c3fc9f8642ee56c050da91bffccf7864816a4786c
-DIST eventviews-17.12.0.tar.xz 436208 BLAKE2B c949aecffbfaded056c284a97170e5130ed7e25af49c9ab95f74b6d00dedf1dacaa53c1f83aa974774a04be962c05f2525ae37f46a23376fdc41f892accd09c3 SHA512 cefb7def74e9d42f1cade37656f86dc8b711a9e9eebbe4fbc07d3e0696a54389bddffb7efc4e798976c8a00ddf56b669f410e35e0bd5fdbb0905c173f7633c89
+DIST eventviews-17.12.1.tar.xz 438316 BLAKE2B 8b1747d8e44a2858ea9528e788a130fb1eed8a6457ee39bc7aaf1a9ef3a866cc2625d7e8f75e5ae6f42b941a4355b5747e4407f898f3e5d51934cbb4647cfa13 SHA512 4c02d634c8fc7b2efdf54f4954548b082d7e50b74f754d3291ce4fbfdf25a7be6dce98060e9e25985020d4a8ff12d500f5fe38079fa5fb7f034de87e40216dd4
--- a/kde-apps/eventviews/eventviews-17.12.1.ebuild
+++ b/kde-apps/eventviews/eventviews-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@ -1,2 +1,2 @@
 DIST ffmpegthumbs-17.08.3.tar.xz 21100 BLAKE2B 29f53acf700c15423a27b9616d6fa3151ab7282aaa158d21f5a396857d7889f14b8b1030913f9a5151c427490140ca2bf35097327abad41566eadd8c90ac1075 SHA512 81ac9b17395fd07bd49200393eba409d7d5c3fae3ca78772dca1f2d24ce7f7a1162ff1be1df7fd1f7dbfc055af4163562c3a890c89eabaed7eb000afcbcf74e0
-DIST ffmpegthumbs-17.12.0.tar.xz 21104 BLAKE2B 14be791d8e444c5444f69c555ceb8008f97088749e8b14c4c0b596510bf34a3e82cc5a6b5060574976739f1207a0dd0a443efb81bf7fd70ec05156c047ad2694 SHA512 965f9f93a575762414502c1383501060e9a83a41250f2462e555bd8b0a62948a76a9d168995ce735ecd868a0688ab38c4e11d4d35a640e3944e3cfb55690e3a5
+DIST ffmpegthumbs-17.12.1.tar.xz 21108 BLAKE2B 46b4c53ebb3d7113340b30048b657d015c3583210caff256f9a2780e9dca09b41fdbc1727c55f44c87be599a37789871a11409fbc990354ff35d7fac31982922 SHA512 534b9b8a85bf02bc2f58f5491b1bc7f977d9b3031042cd1b0ba2b4adea5a36e6e47c7e650e4aeccf41b0836a633c2b4812dbea9d700cce87953027edd990e5a3
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/filelight/Manifest
+++ b/kde-apps/filelight/Manifest
@ -1,2 +1,2 @@
 DIST filelight-17.08.3.tar.xz 650248 BLAKE2B a8d41a4c65e27b435ae00f71db150bb5db5d88a1dbeae866a32b3e014fa3ff087950cf69e6627a338b36105589ac2e5da3101c9ff64c219a90f8a19d7be4ead6 SHA512 e1da378d1dcf1ca7f6ec38900a0909768cf6c0de34524f7e35bcb44767a35adeb76d9c59ba5e079cabaa40f5cadbed68b10631b65457d1f40eb8b2be6064471d
-DIST filelight-17.12.0.tar.xz 653964 BLAKE2B 51df7c5ea8f1285ef4d643ffbd9d2f8c8eaa25c95eea41d97ed451a8d7a8b2d46b4b60fcc3b851aae31c453ec92d770d22b3a548a258369dbe5aa8117bc6ed84 SHA512 a4824ee236cbccf4dabf5ad19faf4a7e4572a61f64cc5fac69c4681f50a4d3d9b5ceb0eef790ca7051ee79a11670d6b21857605eee2d117f5c46ea0784a0cde6
+DIST filelight-17.12.1.tar.xz 654724 BLAKE2B 3f0833dea22080acd705d131d5e0bdcfaefb0822f4622885f0ee6b8d174821f6a49d6077ac61b5639346200272ed777024f45c6fb4f01c06ee8b00ef78e6c410 SHA512 9282dd4ed14ae8880af5ea97760ceea2011af5c6789fb166855afbdc8da002017153988549d7b49a1e38d184da2f92a6bace907858dadd9f04738456b882439e
--- a/kde-apps/filelight/filelight-17.12.1.ebuild
+++ b/kde-apps/filelight/filelight-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/granatier/Manifest
+++ b/kde-apps/granatier/Manifest
@ -1,2 +1,2 @@
 DIST granatier-17.08.3.tar.xz 1959756 BLAKE2B 41695a3bed6c767bfc5a776bba44cf473d3cf00ebcdbf2badb0221247582183626462c4db1374ba0bc9884b10a132cd68972aa71f3dc742433a00350504e436d SHA512 0edf00c3523fbad518ab757812ff217a1841ebf712f001f9007ba158c73a7994f5aa94b94f5a9efd813097a242204c87b8103795f29f3058946ce6f969931e56
-DIST granatier-17.12.0.tar.xz 1960024 BLAKE2B cf450cd9e7701406a105c885b93331101e020465eeca38fe0c140fa83230a0b9cc1e60eb2c23682ccd8b6581dbf637a5f9a75384df53fbc26c62adf3a39a2cf1 SHA512 94ea2458001c7d1e5e720b5bcd43598f453d8ea119948f88a48c3f68f9f0b2daa82d40acd5232681a0105b8a5a80f53b39f3b404345597794c2014184406795c
+DIST granatier-17.12.1.tar.xz 1959924 BLAKE2B a4561499a01cee69d6f1bad48bbf5214967f4e199ed6590d60fc13efdf7f6cd614f3348c1e6c0a649b1d6d5735a8df2d1239f177b50d62d131b7875c2d74902d SHA512 945bd6ab6c69d67abeba2ff4a5e0da6e2c5acf639c9543d57b2b77a430b44710b1892f3909c1a583fa9dd5cc3755545c367d8e9f54c010333c18fc00017a3b0f
--- a/kde-apps/granatier/granatier-17.12.1.ebuild
+++ b/kde-apps/granatier/granatier-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@ -1,2 +1,2 @@
 DIST grantlee-editor-17.08.3.tar.xz 110740 BLAKE2B 0eccacb3a0b30a776305ab7d76f6f7e384ffd07c30747b72622bfe0d2e7d465d4fe18631e7365c8edb523744f722c420ef64fb1182755284280d70f0638c2100 SHA512 696168482e3c9368156e34e932010cbd5587f72e642ff07eec024e008b95178c296edc89f6cf50a0a94d29385279590fea3aaabd2de067b69e129c0a1a65d6db
-DIST grantlee-editor-17.12.0.tar.xz 110648 BLAKE2B 99739f304d728ead379c8d7e18578c6463fd7cdd6492ccbe8d6134fe51636ca4526b089b18d5ee84786003d42397953c676882f4fcb401c746c864b248a7ddb8 SHA512 5661ea91009d8e21ae2bf4925084f2bd8cd71af9fcbec125a551dfc5f5c0d20863fbe79122df04c66133da71507b02889efbba069c7c941d0a696aacee49a6c4
+DIST grantlee-editor-17.12.1.tar.xz 110572 BLAKE2B 5d0b5fe027aba60b002fa31ff665442266ba08409d15bebff4e28e278d42b13127cb2a50fb99105479a9a0c20fe770d7aaec812737f598a937154c0b38862bba SHA512 ff4ab90013ee855c2d70c1223cdbba5fe0d2eae8eff0cd0f6c1def4dfe2cddcd62697b9790a3598fd4b91fcd65d89339c0e1d3fdc07bebfb2750cf51ccd984aa
--- a/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@ -1,2 +1,2 @@
 DIST grantleetheme-17.08.3.tar.xz 51180 BLAKE2B 3531f6edffe0bd0605c839d1c58f37216736704b4562caf1c3da917f0ee459b476888703c14acc85f980c7b052c096aa7bbc93b8b56f43370226048c0ee79e93 SHA512 ef859d8a4ddd201abdf0f4e51757b948593aea4ba751d9eb9a98ad41692a5322d088044bffdfbb778e3d17f91bc31b1be1218f45d5aa15595eb8aac2adcffec9
-DIST grantleetheme-17.12.0.tar.xz 51400 BLAKE2B 3856dfdae84533794115dfa6d3dd247f00be0f2a4f1f35f20fa00026233e050e4f4516ddc24d462c865105c2d90969c22e6fe1f997187bff0b8b587ad576c7a4 SHA512 1b801551dce492e49598a1683a4d3c351bcfd2ae88bd73576f578133a86d2903d62a82613f2148ba4a5070e51f414597231069543082dbbf6b9ccc6b48215639
+DIST grantleetheme-17.12.1.tar.xz 51392 BLAKE2B db694f7784914bffc08b394b8c926114672b35cd77d69259b36ae61d0fcc0c9df5f75c812a330c48bb51121ca9753510bb465ce3c4b02b147368a977302cbf9a SHA512 89aca54e01b406bd0f56fa16b1c43e5c882015a3c16524d37473d917f622fb9abb2ff1e6d5f43e3cc5c5e7fbf49ee25087f790ccdb61cf1284b201f55c8b2f60
--- a/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@ -1,2 +1,2 @@
 DIST gwenview-17.08.3.tar.xz 5909172 BLAKE2B 013660d574e6dfeeac5685f2af7c14536be02f4d77f008c9426cbd052be5086832d8399ca5bae7dcaad0b38c8b6a9f4bd08a63d91c2e4baf4c8d3c8346928550 SHA512 3961e331aefde8625943720e740e324a82fcd72e298a21d77e05b59b3f62681ed7af9c24343a9827e01454f050ec8f1631bd63c863ac3e6a2015df83a2c286ab
-DIST gwenview-17.12.0.tar.xz 6021388 BLAKE2B 25c6b677576ca75054ca1bcca042de1ba9617bd2836c9904d20ba55d44b6e05779c25e4418c8d23cad48d01b846aa978e1b3f6c644b989efe77994f85441e356 SHA512 cd724d0fe1ee6ddfb5e6fa91a75a9cf8b2361ec6c935049090ceee9e70df665e02a5dbd64036a57c3ed853f6e4be95fe2546db82dc6d667893cc19fd5744a628
+DIST gwenview-17.12.1.tar.xz 6021296 BLAKE2B 9e3ba61536ca92de76c474d71c09f8ef897efcc0d0ef11e8c06daefa85acf887121b565938e4887929edc45a36f8126f40902772568c414394aeaa307f924cae SHA512 cc436e6fb99fa41f58c7f93856c1ce2abcbcfb986cb45705fdf34b85dd85b27a0c0c7cdf7b2df06694a271ba3119a6f5b933b90346c4f1fb8668e12df78137f8
--- a/kde-apps/gwenview/gwenview-17.12.1.ebuild
+++ b/kde-apps/gwenview/gwenview-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -35,9 +35,9 @@ COMMON_DEPEND="
 	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep kparts)
 	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtopengl)
 	$(add_qt_dep qtprintsupport)
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@ -1,2 +1,2 @@
 DIST incidenceeditor-17.08.3.tar.xz 518168 BLAKE2B ab2e87bb3a32da79106cadce073f71f41dd0a7b0d1cbe25176ca27d05887430a8c68d17ca0744899fe63b0936f168495ce8d5b13762289a280f941bd844221bf SHA512 51c641c91a783dac7c25d857b19cc2579fa36f79f0660d2bc41af91b6a5d23478b4b722a412477b5716be836fa708a2c149e97cd42aa6965a360b9e3d7cd2514
-DIST incidenceeditor-17.12.0.tar.xz 518272 BLAKE2B e1fa2092f1ebb72d63ea5938f3178e50a134b7bc1193ebe496e0815e4a54ab19085447c713c3a1a1fef82f105f0ae1e2037f003ea46b740dfc6bf69ea8e4a539 SHA512 daa56a1951176836a661c124a6b22b3b585a10118537e6d92750048e4dc1843fb807fd4ea0182a4713755a7895421733a12a2a8f7b22e3c063b39768269766e1
+DIST incidenceeditor-17.12.1.tar.xz 518252 BLAKE2B 6a1627b6dd134c97147938e3504f4b8e280666882a71e3c131a6127628bfc8ba18ce0e944647b2e8847b77b39d894f8570b71b161c9e50b9589d55d4f0d5dc52 SHA512 1776a4ab785da9e17293786325ab0cb206f7d7547d9219db51a95dff42d5cb6c2c3de796dfd6c1746b5d2d63cb97ec1ece03de5db29fb4dd320518c57abe5c0c
--- a/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/juk/Manifest
+++ b/kde-apps/juk/Manifest
@ -1,2 +1,2 @@
 DIST juk-17.08.3.tar.xz 446096 BLAKE2B a43a44b1d8d7b3a7a347d5f383786d7b48fda65cfefb2f330402e8abfbde663b58b2131732dbd2ca2866a443fe6efb77d412db8cce6e656ad50ebc53019f2542 SHA512 888d260ac707c7f39740840d2aef1e10ceba1b8973fdf987e4f58da1e12c3c457e8c20a225517e5e7f6110ae907a7786425d3b2c3db0703df9912cb19a7f8f9a
-DIST juk-17.12.0.tar.xz 1868100 BLAKE2B 56dfb5c2b7c6b065b24b71198978a1c1e099d83910dd8660543f1dd17bc9ad2e4de94a02651a3923dc17902621c5d8fdd68686670675f255774845e5aa704dd8 SHA512 db18529589df670bb3ff669fcf842d4027ade67786b214338e762d6d087e8c02a5afac2e908010bd5229926c722a3441c00909c3c0dfa748d0a0de345a9649a2
+DIST juk-17.12.1.tar.xz 1868340 BLAKE2B fca369a89fc1f8b71a5ab8cdcb05cea702cf04606edc8ef87cd3f8bfad794de205b1218e0dd8a41953e584c94646761acb67dee59569f5e476fff8d2da809f6b SHA512 3fa76b768d75bd19246f776895030b870f4ca5c776bbc843898ed64cd76ae5904a0c6268ff1a77c92763a11ac5e7e87797354df6e8ffd086163b6ccb12747f4d
--- a/kde-apps/juk/juk-17.12.1.ebuild
+++ b/kde-apps/juk/juk-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -19,9 +19,12 @@ DEPEND="
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kglobalaccel)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwallet)
 	$(add_frameworks_dep kwidgetsaddons)
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@ -1,2 +1,2 @@
 DIST k3b-17.08.3.tar.xz 10565760 BLAKE2B 75d98ab39ff4691baadc1c8a26f635981d7bb086c154a7c4e06dda79d4756f781c76b126838d3b0ea141f98750df09dd16a5dd9978340eedd1dc3a7acff45ed3 SHA512 91038cc862bdebad1cfa843e8688a71494140cdf59fc8f9815a6e6eef2dca40b94ee7d0a8e7c6b277004ff0945431bb7873113e6e7fc5649b8120ef03b1564ba
-DIST k3b-17.12.0.tar.xz 10574540 BLAKE2B 10713f203d4de6dc572cb2379429fddc2e919733920ce4d179506127ddbf4d34e39694b3d656aefb8589b0f5b0ecca7f4d6a8aee455296b92d39d072163d0edb SHA512 8832bb5d3aa3068e355b57406ba81e559606a82b7df0c9253ca5924fc120f421b54126489a0fca25d8c5e49b8e426be88bf7a1ad146c784d8553ea34c5385d9c
+DIST k3b-17.12.1.tar.xz 10575632 BLAKE2B 41c8703c8792240335037a134114713e3727c992fb595d2e791bba5b2325da85687896c6517ab482c78c69ca2576ffeca3beaa8881fd2fcf719ce980ede96820 SHA512 ab778d992f07ecb6a2626b815e5d1d91c814f2d15b59fa976a0008e08dc6479a2fc8d6a30036d7c2a64ecf884d01be0d4e2be74e6479ce35350813448a903773
--- a/kde-apps/k3b/k3b-17.12.1.ebuild
+++ b/kde-apps/k3b/k3b-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -52,7 +52,10 @@ DEPEND="
 	musepack? ( >=media-sound/musepack-tools-444 )
 	sndfile? ( media-libs/libsndfile )
 	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
 	webkit? ( $(add_qt_dep qtwebkit) )
 "
 RDEPEND="${DEPEND}
--- a/kde-apps/kaccounts-integration/Manifest
+++ b/kde-apps/kaccounts-integration/Manifest
@ -1,2 +1,2 @@
 DIST kaccounts-integration-17.08.3.tar.xz 69016 BLAKE2B a94d70053620bc41ab094b071d9cc33eb620bda4c99f3e9ea998174a7379a644a012f6ae5e00f0aad3ccdbdc7ca9805a381fbfc0038bb67d1c1eba2af27dfcf9 SHA512 00210737f43b7d4808bafd1899630989ece2ef65e23e0849717fa8fb2cd93881099fe670591025f44b8d901130e6ee0a2843af40f49c6ee7adbcec6cf163aa55
-DIST kaccounts-integration-17.12.0.tar.xz 70848 BLAKE2B c6da23a769265c7733a3d156ff38a8ad3308e392b8017ccc095ea93c04c2ae693fd45f187f819754045aeb9fa337982163601188e06bfd995c5207cd7d735dbe SHA512 378a2bb3edb168852026a229a072a720a35efef0ec7547297a9da0f8df3f59b5464de66709796c7893c3f549fdd372cd16e4bc3efc156fc0924a16637425e4e3
+DIST kaccounts-integration-17.12.1.tar.xz 71364 BLAKE2B e2a3e541079c77a58200d66e597c883ea48cea58016bcafad3dbc38dd33e7fa4120bfc316bf6912c509aa985d2e8de86a45ce46829cc5f12976e95babb43dcc1 SHA512 c167786079f55f29b74757fd84669ec2678ea1d1639e333be74cd66bb1a9aec2d6ab52dd68f22d5675e6562115b7a266f813e7b5a2dacc6303af8c5d66c44c34
--- a/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -20,6 +20,7 @@ RDEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep kdeclarative)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kwidgetsaddons)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
--- a/kde-apps/kaccounts-providers/Manifest
+++ b/kde-apps/kaccounts-providers/Manifest
@ -1,2 +1,2 @@
 DIST kaccounts-providers-17.08.3.tar.xz 31924 BLAKE2B 5016ce8a614fecda734da661a74ddf2a0c24f687fc53546870429cd5f683ab3201da5e3a57d04f2be660101ceb7584ee44da2f16a9cf04abafcd49d7a3bf38c5 SHA512 75248f6e3cae47cb6587895724a52dd38d4ebf88995b937506be992399740ac89cb0bf7a64a3769d18200b96968ef4b7c3b3f281b539bde86dee331639473570
-DIST kaccounts-providers-17.12.0.tar.xz 31864 BLAKE2B a59e7215bf63cf74e30923c986907a12f0599fa2767095901f51197cb4ff4f105dbda3a4dc12b226bbc7c8cb1790f9fad839de135adf50c8b14d900e2e28e4f8 SHA512 8dbc3061f131db2491eb028461bd7a14aa7777fd1dfac9ff6d10a4d4a49a093b2e536ffc2acdc1324a7fbe04c4664820141394832cc9efd0836e31e33523b9e5
+DIST kaccounts-providers-17.12.1.tar.xz 31944 BLAKE2B 54772fe2dd438f7d0d803a9744a11fa26f66fe162b0dffc2336d10969778f9c906efc406c3429a23c6a0a9f60f694a3c189ed57d0585576224cb7072d4302a1a SHA512 ed204c6783299ffa3554c3052a79ae26541e9ae9050d9425d9b91ff6e6f562ad5b8a524a08f93f26d6e6f5a95d9bc2f0e3028ff1d6984a58a1e35f155c4267c9
--- a/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@ -1,2 +1,2 @@
 DIST kaddressbook-17.08.3.tar.xz 546868 BLAKE2B f6394c2bd27429ff8cf302c05f27757bd03ef310479fab9cf589d8a265e9f773d488aa0cb792cff93b6fbdbd16a19ed5e585f2aaabc7af25cab72186c1eef24d SHA512 baffd3f377dc33cc4bc3402f4f814f630efa1b152e2cfe02698cb0d2237011f7b3fa1c7ceff0eb83b5a10ef2ef038f5fa89a07609db8e009da2df3f080903757
-DIST kaddressbook-17.12.0.tar.xz 546800 BLAKE2B f9c6fd3c8ce7c6fb70eac98a380e5d21ede87519ac12ec34118470ee7b3160289126dea0992ec5c8113ccd0cab0f0c5446c6a27b3929cf6b8ae6878635ff9fc0 SHA512 17156dc2663649a9ae6c849215a52a3c0f0edec67047b254e1ea319a3afd9295f62f19b5b253671049dd6d6a05aea633ba1d02532246925fc089240ba397c5c8
+DIST kaddressbook-17.12.1.tar.xz 546856 BLAKE2B 690574b4f655ad71f26ea8d946ee619f4e49ae04e36ebe852e62fd7eb329d047d55808217beac9924a2dc39d04cf6dbcaab9204f06dfc4520244adc914600230 SHA512 efb9c3e51e5bab149518dacd64d1e96d5fedab79941b540e2934f19a52fd18f003e315a805db1c0bd5484ca916eac4bb7aecda7959511da17b8ecfa144f45534
--- a/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/kajongg/Manifest
+++ b/kde-apps/kajongg/Manifest
@ -1,2 +1,2 @@
 DIST kajongg-17.08.3.tar.xz 4239184 BLAKE2B 5e8db5a3f11f8f820a9aea7ae587e703e21cee34816cc56980cf499ad5e411dcf90cf738b0d0ef2d8267639ffa4988a31c0b9fe87351a29c8898da96e7560288 SHA512 e4e595988da98cd2f7dbf089c8c29a88e1df57bfaab98e8efddcc0e69ea5c7cfd74c7557661e6b6b86649ebb8a487c6609a05e16a7fcd272048140ff22389402
-DIST kajongg-17.12.0.tar.xz 4239560 BLAKE2B 7f05519d7aae46a9eba15514903e87dc903379612376ae505905a5cda92a6131d288c9d2cc2b328bbf35d4e29dd410b15ae0b563ac449eca00398a31b4f31a16 SHA512 3f48d29bc29d6a8c9960bf38505a363c0666ea811dd09e7d981478b41830f29fe6d9f388e86a6fafd8468417318987691a76e1e11573c1c1623c8bbbe6ba1edd
+DIST kajongg-17.12.1.tar.xz 4239736 BLAKE2B 8de212ebcbd4ce24124d1b7904bd33fe7a737ebfbb8352f464341bd0d138a395d3cb8aa631df79e140bfdbd250bd35339732856f4f76b2d345be42421e885126 SHA512 beddcd6be75b022d6209d91337cddefdd6b8734b6d8bd7eeb1585544bb5f204a119904016f12e2c6cabbfed46b3b5d8d46ee7e82e3efe31e90712d0a07f00d01
--- a/kde-apps/kajongg/kajongg-17.12.1.ebuild
+++ b/kde-apps/kajongg/kajongg-17.12.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@ -1,2 +1,2 @@
 DIST kalarm-17.08.3.tar.xz 1823924 BLAKE2B 1b4528ede1e8e2be77a6b52a2bfd9b7e627f6328196803714aeb22b62266ed113689ffbd07432cc3137188f989fc9d3e1c3ba5f505da95bac7a76d7da2931ad7 SHA512 827c2eeef667d42fc691fba0fd6d458fa245eb5fb9e6abb1926137c5e1a66bf309e0e9739cd9fb62f95a14d7f46f96f2ad864434edb1e8bbcccbf8172a5f4b6e
-DIST kalarm-17.12.0.tar.xz 1798344 BLAKE2B 23d23342cd42aec864f5592f7ee80a9196128018971ee1abc0072c5a47e06476afc27944e158b335294d0ffd1f6412ac650373d5accdd6842d9e4569c90a214b SHA512 5b9b34595b5c7105c3da6a7b4eaee9eab765ceb57a44f9d5417f50dabf4dccea17f2faf85d7b4b523cb6344b88bf4a1a1b1ceeb628db5fe2a012765ea24319bc
+DIST kalarm-17.12.1.tar.xz 1798540 BLAKE2B f439e46d444d12aed10d4d2d96077e84ecc6ba285c4396be200fd5ff8206278310eb0377e4db2ba328f4177b931f076f5c0939d672f2dde45c5483de25529dd3 SHA512 f2b2f1f4477359d66f8974b76f4cd612666e129b73b0179fbfee94805e31661392526926e57710427402709d0a0fe22a1c726576f8ba37afa2a09e29e67ea8a2
--- a/Show More
+++ b/Show More