[gentoo-commits] repo/gentoo:master commit in: app-leechcraft/lc-poshuku/, app-leechcraft/lc-cpuload/, ...

[David Seifert]

commit:     09222bd0523d448c79f1434b042f55e440097adf
Author:     0xd34df00d <0xd34df00d <AT> gmail <DOT> com>
AuthorDate: Sat Feb 25 18:49:28 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 11:58:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09222bd0

app-leechcraft: use Qt5, modernize the eclass and ebuilds

Closes: https://github.com/gentoo/gentoo/pull/4079

 app-leechcraft/laretz/laretz-9999.ebuild           |   6 +-
 app-leechcraft/laretz/metadata.xml                 |   8 +-
 .../lc-advancednotifications-9999.ebuild           |   6 +-
 .../lc-advancednotifications/metadata.xml          |  10 +-
 .../lc-aggregator/lc-aggregator-9999.ebuild        |  28 ++---
 app-leechcraft/lc-aggregator/metadata.xml          |  11 +-
 app-leechcraft/lc-anhero/lc-anhero-9999.ebuild     |   4 +-
 app-leechcraft/lc-anhero/metadata.xml              |   8 +-
 app-leechcraft/lc-auscrie/lc-auscrie-9999.ebuild   |   4 +-
 app-leechcraft/lc-auscrie/metadata.xml             |   8 +-
 app-leechcraft/lc-azoth/lc-azoth-9999.ebuild       | 122 ++++++++++++---------
 app-leechcraft/lc-azoth/metadata.xml               |  70 ++++++------
 .../lc-bittorrent/lc-bittorrent-9999.ebuild        |  23 ++--
 app-leechcraft/lc-bittorrent/metadata.xml          |   8 +-
 app-leechcraft/lc-blasq/lc-blasq-9999.ebuild       |  32 ++++--
 app-leechcraft/lc-blasq/metadata.xml               |  24 ++--
 app-leechcraft/lc-blogique/lc-blogique-9999.ebuild |  24 ++--
 app-leechcraft/lc-blogique/metadata.xml            |  20 ++--
 app-leechcraft/lc-certmgr/lc-certmgr-9999.ebuild   |  10 +-
 app-leechcraft/lc-certmgr/metadata.xml             |   8 +-
 app-leechcraft/lc-core/lc-core-9999.ebuild         |  36 +++---
 app-leechcraft/lc-core/metadata.xml                |  10 +-
 app-leechcraft/lc-cpuload/lc-cpuload-9999.ebuild   |   9 +-
 app-leechcraft/lc-cpuload/metadata.xml             |   8 +-
 app-leechcraft/lc-cstp/lc-cstp-9999.ebuild         |  11 +-
 app-leechcraft/lc-cstp/metadata.xml                |  12 +-
 .../lc-dbusmanager/lc-dbusmanager-9999.ebuild      |  10 +-
 app-leechcraft/lc-dbusmanager/metadata.xml         |   8 +-
 .../lc-deadlyrics/lc-deadlyrics-9999.ebuild        |  14 ++-
 app-leechcraft/lc-deadlyrics/metadata.xml          |   8 +-
 app-leechcraft/lc-devmon/lc-devmon-9999.ebuild     |   7 +-
 app-leechcraft/lc-devmon/metadata.xml              |   8 +-
 app-leechcraft/lc-dolozhee/lc-dolozhee-9999.ebuild |  10 +-
 app-leechcraft/lc-dolozhee/metadata.xml            |   8 +-
 .../lc-eleeminator/lc-eleeminator-9999.ebuild      |   8 +-
 app-leechcraft/lc-eleeminator/metadata.xml         |   8 +-
 app-leechcraft/lc-fenet/lc-fenet-9999.ebuild       |   9 +-
 app-leechcraft/lc-fenet/metadata.xml               |   8 +-
 app-leechcraft/lc-gacts/lc-gacts-9999.ebuild       |  15 +--
 app-leechcraft/lc-gacts/metadata.xml               |   8 +-
 app-leechcraft/lc-glance/lc-glance-9999.ebuild     |   8 +-
 app-leechcraft/lc-glance/metadata.xml              |   8 +-
 .../lc-gmailnotifier/lc-gmailnotifier-9999.ebuild  |  12 +-
 app-leechcraft/lc-gmailnotifier/metadata.xml       |   8 +-
 .../lc-historyholder/lc-historyholder-9999.ebuild  |  13 ++-
 app-leechcraft/lc-historyholder/metadata.xml       |   8 +-
 .../lc-hotsensors/lc-hotsensors-9999.ebuild        |  14 ++-
 app-leechcraft/lc-hotsensors/metadata.xml          |   8 +-
 .../lc-hotstreams/lc-hotstreams-9999.ebuild        |  12 +-
 app-leechcraft/lc-hotstreams/metadata.xml          |  12 +-
 app-leechcraft/lc-htthare/lc-htthare-9999.ebuild   |  10 +-
 app-leechcraft/lc-htthare/metadata.xml             |   8 +-
 app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild   |   9 +-
 app-leechcraft/lc-imgaste/metadata.xml             |   8 +-
 .../lc-intermutko/lc-intermutko-9999.ebuild        |   9 +-
 app-leechcraft/lc-intermutko/metadata.xml          |   8 +-
 app-leechcraft/lc-kbswitch/lc-kbswitch-9999.ebuild |  16 ++-
 app-leechcraft/lc-kbswitch/metadata.xml            |  11 +-
 app-leechcraft/lc-kinotify/lc-kinotify-9999.ebuild |   8 +-
 app-leechcraft/lc-kinotify/metadata.xml            |   8 +-
 app-leechcraft/lc-knowhow/lc-knowhow-9999.ebuild   |  10 +-
 app-leechcraft/lc-knowhow/metadata.xml             |   8 +-
 .../lc-krigstask/lc-krigstask-9999.ebuild          |  10 +-
 app-leechcraft/lc-krigstask/metadata.xml           |   8 +-
 app-leechcraft/lc-lackman/lc-lackman-9999.ebuild   |  13 ++-
 app-leechcraft/lc-lackman/metadata.xml             |   8 +-
 .../lc-lastfmscrobble-9999.ebuild                  |   9 +-
 app-leechcraft/lc-lastfmscrobble/metadata.xml      |   8 +-
 app-leechcraft/lc-laughty/lc-laughty-9999.ebuild   |  11 +-
 app-leechcraft/lc-laughty/metadata.xml             |   8 +-
 app-leechcraft/lc-launchy/lc-launchy-9999.ebuild   |  11 +-
 app-leechcraft/lc-launchy/metadata.xml             |  12 +-
 app-leechcraft/lc-lemon/lc-lemon-9999.ebuild       |  23 ++--
 app-leechcraft/lc-lemon/metadata.xml               |   8 +-
 app-leechcraft/lc-lhtr/lc-lhtr-9999.ebuild         |  12 +-
 app-leechcraft/lc-lhtr/metadata.xml                |   8 +-
 app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild     |  26 ++---
 app-leechcraft/lc-liznoo/metadata.xml              |  11 +-
 app-leechcraft/lc-lmp/lc-lmp-9999.ebuild           |  45 ++++----
 app-leechcraft/lc-lmp/metadata.xml                 |  24 ++--
 .../lc-mellonetray/lc-mellonetray-9999.ebuild      |   9 +-
 app-leechcraft/lc-mellonetray/metadata.xml         |   8 +-
 app-leechcraft/lc-monocle/lc-monocle-9999.ebuild   |  23 ++--
 app-leechcraft/lc-monocle/metadata.xml             |   8 +-
 .../lc-musiczombie/lc-musiczombie-9999.ebuild      |  15 ++-
 app-leechcraft/lc-musiczombie/metadata.xml         |   8 +-
 app-leechcraft/lc-nacheku/lc-nacheku-9999.ebuild   |   8 +-
 app-leechcraft/lc-nacheku/metadata.xml             |   8 +-
 .../lc-netstoremanager-9999.ebuild                 |  17 ++-
 app-leechcraft/lc-netstoremanager/metadata.xml     |  20 ++--
 .../lc-networkmonitor-9999.ebuild                  |   9 +-
 app-leechcraft/lc-networkmonitor/metadata.xml      |   8 +-
 app-leechcraft/lc-newlife/lc-newlife-9999.ebuild   |  11 +-
 app-leechcraft/lc-newlife/metadata.xml             |   8 +-
 app-leechcraft/lc-ooronee/lc-ooronee-9999.ebuild   |  15 ++-
 app-leechcraft/lc-ooronee/metadata.xml             |   8 +-
 app-leechcraft/lc-otlozhu/lc-otlozhu-9999.ebuild   |  18 ++-
 app-leechcraft/lc-otlozhu/metadata.xml             |   8 +-
 app-leechcraft/lc-pintab/lc-pintab-9999.ebuild     |   8 +-
 app-leechcraft/lc-pintab/metadata.xml              |   8 +-
 .../lc-pogooglue/lc-pogooglue-9999.ebuild          |  10 +-
 app-leechcraft/lc-pogooglue/metadata.xml           |  12 +-
 app-leechcraft/lc-popishu/lc-popishu-9999.ebuild   |   6 +-
 app-leechcraft/lc-popishu/metadata.xml             |   8 +-
 app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild   |  63 ++++++-----
 app-leechcraft/lc-poshuku/metadata.xml             |  39 ++++---
 app-leechcraft/lc-qrosp/lc-qrosp-9999.ebuild       |   7 +-
 app-leechcraft/lc-qrosp/metadata.xml               |   8 +-
 .../lc-rosenthal/lc-rosenthal-9999.ebuild          |   7 +-
 app-leechcraft/lc-rosenthal/metadata.xml           |  12 +-
 app-leechcraft/lc-sb2/lc-sb2-9999.ebuild           |   9 +-
 app-leechcraft/lc-sb2/metadata.xml                 |   8 +-
 .../lc-scroblibre/lc-scroblibre-9999.ebuild        |   9 +-
 app-leechcraft/lc-scroblibre/metadata.xml          |   8 +-
 app-leechcraft/lc-secman/lc-secman-9999.ebuild     |  19 +++-
 app-leechcraft/lc-secman/metadata.xml              |   8 +-
 app-leechcraft/lc-seekthru/lc-seekthru-9999.ebuild |  13 ++-
 app-leechcraft/lc-seekthru/metadata.xml            |   8 +-
 app-leechcraft/lc-summary/lc-summary-9999.ebuild   |   8 +-
 app-leechcraft/lc-summary/metadata.xml             |  14 ++-
 .../lc-sysnotify/lc-sysnotify-9999.ebuild          |   8 +-
 app-leechcraft/lc-sysnotify/metadata.xml           |   8 +-
 .../lc-tabsessmanager-9999.ebuild                  |   8 +-
 app-leechcraft/lc-tabsessmanager/metadata.xml      |   8 +-
 app-leechcraft/lc-tabslist/lc-tabslist-9999.ebuild |   8 +-
 app-leechcraft/lc-tabslist/metadata.xml            |   8 +-
 .../lc-touchstreams/lc-touchstreams-9999.ebuild    |  12 +-
 app-leechcraft/lc-touchstreams/metadata.xml        |   8 +-
 app-leechcraft/lc-tpi/lc-tpi-9999.ebuild           |   9 +-
 app-leechcraft/lc-tpi/metadata.xml                 |   8 +-
 app-leechcraft/lc-vgrabber/lc-vgrabber-9999.ebuild |   4 +-
 app-leechcraft/lc-vgrabber/metadata.xml            |   8 +-
 app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild     |  23 ++--
 app-leechcraft/lc-vrooby/metadata.xml              |   8 +-
 app-leechcraft/lc-xproxy/lc-xproxy-9999.ebuild     |   9 +-
 app-leechcraft/lc-xproxy/metadata.xml              |   8 +-
 app-leechcraft/lc-xtazy/lc-xtazy-9999.ebuild       |   6 +-
 app-leechcraft/lc-xtazy/metadata.xml               |   8 +-
 app-leechcraft/lcpackgen/lcpackgen-1.3.ebuild      |   4 +-
 app-leechcraft/lcpackgen/metadata.xml              |  18 +--
 .../leechcraft-meta/leechcraft-meta-9999.ebuild    |   8 +-
 app-leechcraft/leechcraft-meta/metadata.xml        |  10 +-
 app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild    |   4 +-
 app-leechcraft/liblaretz/liblaretz-9999.ebuild     |   6 +-
 app-leechcraft/liblaretz/metadata.xml              |   8 +-
 dev-libs/qrosscore/metadata.xml                    |   8 +-
 dev-libs/qrosspython/metadata.xml                  |   8 +-
 eclass/leechcraft.eclass                           |  42 ++-----
 media-libs/hupnp-ng/metadata.xml                   |   8 +-
 net-libs/qxmpp/metadata.xml                        |  30 ++---
 .../leechcraft-browser-9999.ebuild                 |   4 +-
 virtual/leechcraft-browser/metadata.xml            |   8 +-
 .../leechcraft-downloader-http-9999.ebuild         |   6 +-
 virtual/leechcraft-downloader-http/metadata.xml    |  12 +-
 .../leechcraft-notifier-9999.ebuild                |  10 +-
 virtual/leechcraft-notifier/metadata.xml           |   8 +-
 .../leechcraft-quark-sideprovider-9999.ebuild      |   8 +-
 virtual/leechcraft-quark-sideprovider/metadata.xml |   8 +-
 .../leechcraft-search-show-9999.ebuild             |   6 +-
 virtual/leechcraft-search-show/metadata.xml        |   8 +-
 .../leechcraft-storage-device-manager-9999.ebuild  |   6 +-
 .../leechcraft-storage-device-manager/metadata.xml |   8 +-
 .../leechcraft-task-show-9999.ebuild               |   6 +-
 virtual/leechcraft-task-show/metadata.xml          |  14 ++-
 .../leechcraft-trayarea-9999.ebuild                |   6 +-
 virtual/leechcraft-trayarea/metadata.xml           |   8 +-
 .../leechcraft-wysiwyg-editor-9999.ebuild          |   4 +-
 virtual/leechcraft-wysiwyg-editor/metadata.xml     |   8 +-
 168 files changed, 1296 insertions(+), 776 deletions(-)

diff --git a/app-leechcraft/laretz/laretz-9999.ebuild b/app-leechcraft/laretz/laretz-9999.ebuild
index 655c1cf6fc..76df732ac3 100644
--- a/app-leechcraft/laretz/laretz-9999.ebuild
+++ b/app-leechcraft/laretz/laretz-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="The Laretz sync server"
 HOMEPAGE="http://leechcraft.org"
@@ -10,7 +10,7 @@ HOMEPAGE="http://leechcraft.org"
 EGIT_REPO_URI="git://github.com/0xd34df00d/laretz.git"
 EGIT_PROJECT="laretz"
 
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
 
 LICENSE="Boost-1.0"
 SLOT="0"

diff --git a/app-leechcraft/laretz/metadata.xml b/app-leechcraft/laretz/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/laretz/metadata.xml
+++ b/app-leechcraft/laretz/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-advancednotifications/lc-advancednotifications-9999.ebuild b/app-leechcraft/lc-advancednotifications/lc-advancednotifications-9999.ebuild
index 3fb94612c3..e982e40cf5 100644
--- a/app-leechcraft/lc-advancednotifications/lc-advancednotifications-9999.ebuild
+++ b/app-leechcraft/lc-advancednotifications/lc-advancednotifications-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,7 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4"
+	dev-qt/qtdeclarative:5"
 RDEPEND="${DEPEND}"
 
 pkg_postinst() {

diff --git a/app-leechcraft/lc-advancednotifications/metadata.xml b/app-leechcraft/lc-advancednotifications/metadata.xml
index 5bd8633aab..a14b015c93 100644
--- a/app-leechcraft/lc-advancednotifications/metadata.xml
+++ b/app-leechcraft/lc-advancednotifications/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>Advanced Notifications module provides an extremely flexible and configurable
 		notifications framework for LeechCraft. More information is in the corresponding devel
-		digest: http://leechcraft.org/devel-digest-5.</longdescription> 
+		digest: http://leechcraft.org/devel-digest-5.</longdescription>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-aggregator/lc-aggregator-9999.ebuild b/app-leechcraft/lc-aggregator/lc-aggregator-9999.ebuild
index 151b1d8ba6..e796249694 100644
--- a/app-leechcraft/lc-aggregator/lc-aggregator-9999.ebuild
+++ b/app-leechcraft/lc-aggregator/lc-aggregator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,23 +10,23 @@ DESCRIPTION="Full-featured RSS/Atom feed reader for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug mysql +sqlite postgres webaccess"
-
-DEPEND="~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
-	dev-qt/qtwebkit:4"
+IUSE="debug mysql +sqlite postgres"
+
+DEPEND="
+	~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite?,postgres?,mysql?]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5"
 RDEPEND="${DEPEND}
 		virtual/leechcraft-downloader-http"
 
 REQUIRED_USE="|| ( mysql sqlite postgres )"
 
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enale webaccess AGGREGATOR_WEBACCESS)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_setup(){
+pkg_postinst(){
 	if use mysql; then
 		ewarn "Support for MySQL databases is experimental and is more likely"
 		ewarn "to contain bugs or mishandle your data than other storage"

diff --git a/app-leechcraft/lc-aggregator/metadata.xml b/app-leechcraft/lc-aggregator/metadata.xml
index 924fdc5f72..ef43617d9e 100644
--- a/app-leechcraft/lc-aggregator/metadata.xml
+++ b/app-leechcraft/lc-aggregator/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="webaccess">Enables web interface submodule for Aggregator</flag>
-	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-anhero/lc-anhero-9999.ebuild b/app-leechcraft/lc-anhero/lc-anhero-9999.ebuild
index 0db4c417bc..e027b21ef1 100644
--- a/app-leechcraft/lc-anhero/lc-anhero-9999.ebuild
+++ b/app-leechcraft/lc-anhero/lc-anhero-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 

diff --git a/app-leechcraft/lc-anhero/metadata.xml b/app-leechcraft/lc-anhero/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-anhero/metadata.xml
+++ b/app-leechcraft/lc-anhero/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-auscrie/lc-auscrie-9999.ebuild b/app-leechcraft/lc-auscrie/lc-auscrie-9999.ebuild
index 6a39ac3646..3ab2f053e0 100644
--- a/app-leechcraft/lc-auscrie/lc-auscrie-9999.ebuild
+++ b/app-leechcraft/lc-auscrie/lc-auscrie-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 

diff --git a/app-leechcraft/lc-auscrie/metadata.xml b/app-leechcraft/lc-auscrie/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-auscrie/metadata.xml
+++ b/app-leechcraft/lc-auscrie/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
index 8d42947426..9c28b11659 100644
--- a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
+++ b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -15,25 +15,41 @@ IUSE="debug doc astrality +acetamide +adiumstyles +autoidler +autopaste +birthda
 		+juick +keeso +lastseen	+metacontacts media +murm +latex +nativeemoticons
 		+otroid +spell sarin shx +standardstyles +vader velvetbird +woodpecker +xmpp +xtazy"
 
-COMMON_DEPEND="~app-leechcraft/lc-core-${PV}
-		dev-libs/qjson
-		dev-qt/qtwebkit:4
-		autoidler? ( x11-libs/libXScrnSaver )
-		astrality? ( net-libs/telepathy-qt )
-		otroid? ( net-libs/libotr )
-		media? ( dev-qt/qt-mobility[multimedia] )
-		woodpecker? ( dev-libs/kqoauth )
-		xmpp? (
-			=net-libs/qxmpp-9999
-			media? ( =net-libs/qxmpp-9999[speex] )
-		)
-		xtazy? (
-			~app-leechcraft/lc-xtazy-${PV}
-			dev-qt/qtdbus:4
-		)
-		crypt? ( app-crypt/qca:2[qt4(+)] )
-		sarin? ( net-libs/tox )
-"
+COMMON_DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
+	dev-qt/qtdbus:5
+	crypt? ( app-crypt/qca:2[qt5] )
+	media? (
+		dev-qt/qtmultimedia:5
+	)
+	sarin? (
+		dev-qt/qtconcurrent:5
+		net-libs/tox
+	)
+	lastseen? (
+		dev-qt/qtconcurrent:5
+	)
+	otroid? (
+		dev-qt/qtconcurrent:5
+	)
+	autoidler? (
+		dev-qt/qtx11extras:5
+		x11-libs/libXScrnSaver
+	)
+	astrality? ( net-libs/telepathy-qt[qt5] )
+	otroid? ( net-libs/libotr )
+	woodpecker? ( dev-libs/kqoauth )
+	xmpp? (
+		>=net-libs/qxmpp-0.9.3[qt5]
+		media? ( >=net-libs/qxmpp-0.9.3[qt5,speex] )
+	)
+	xtazy? (
+		~app-leechcraft/lc-xtazy-${PV}
+	)"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 RDEPEND="${COMMON_DEPEND}
@@ -47,45 +63,45 @@ RDEPEND="${COMMON_DEPEND}
 		virtual/latex-base
 	)
 	spell? (
-		app-leechcraft/lc-rosenthal
+		~app-leechcraft/lc-rosenthal-${PV}
 	)"
 
 REQUIRED_USE="|| ( standardstyles adiumstyles )"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable crypt CRYPT)
-		$(cmake-utils_use_with doc DOCS)
-		$(cmake-utils_use_enable acetamide AZOTH_ACETAMIDE)
-		$(cmake-utils_use_enable adiumstyles AZOTH_ADIUMSTYLES)
-		$(cmake-utils_use_enable astrality AZOTH_ASTRALITY)
-		$(cmake-utils_use_enable autoidler AZOTH_AUTOIDLER)
-		$(cmake-utils_use_enable autopaste AZOTH_AUTOPASTE)
-		$(cmake-utils_use_enable birthdaynotifier AZOTH_BIRTHDAYNOTIFIER)
-		$(cmake-utils_use_enable chathistory AZOTH_CHATHISTORY)
-		$(cmake-utils_use_enable depester AZOTH_DEPESTER)
-		$(cmake-utils_use_enable embedmedia AZOTH_EMBEDMEDIA)
-		$(cmake-utils_use_enable herbicide AZOTH_HERBICIDE)
-		$(cmake-utils_use_enable hili AZOTH_HILI)
-		$(cmake-utils_use_enable isterique AZOTH_ISTERIQUE)
-		$(cmake-utils_use_enable juick AZOTH_JUICK)
-		$(cmake-utils_use_enable keeso AZOTH_KEESO)
-		$(cmake-utils_use_enable lastseen AZOTH_LASTSEEN)
-		$(cmake-utils_use_enable metacontacts AZOTH_METACONTACTS)
-		$(cmake-utils_use_enable media MEDIACALLS)
-		$(cmake-utils_use_enable latex AZOTH_MODNOK)
-		$(cmake-utils_use_enable murm AZOTH_MURM)
-		$(cmake-utils_use_enable nativeemoticons AZOTH_NATIVEEMOTICONS)
-		$(cmake-utils_use_enable otroid AZOTH_OTROID)
-		$(cmake-utils_use_enable sarin AZOTH_SARIN)
-		$(cmake-utils_use_enable spell AZOTH_ROSENTHAL)
-		$(cmake-utils_use_enable shx AZOTH_SHX)
-		$(cmake-utils_use_enable standardstyles AZOTH_STANDARDSTYLES)
-		$(cmake-utils_use_enable vader AZOTH_VADER)
-		$(cmake-utils_use_enable velvetbird AZOTH_VELVETBIRD)
-		$(cmake-utils_use_enable woodpecker AZOTH_WOODPECKER)
-		$(cmake-utils_use_enable xmpp AZOTH_XOOX)
-		$(cmake-utils_use_enable xtazy AZOTH_XTAZY)
+		-DENABLE_CRYPT=$(usex crypt)
+		-DWITH_DOCS=$(usex doc)
+		-DENABLE_AZOTH_ACETAMIDE=$(usex acetamide)
+		-DENABLE_AZOTH_ADIUMSTYLES=$(usex adiumstyles)
+		-DENABLE_AZOTH_ASTRALITY=$(usex astrality)
+		-DENABLE_AZOTH_AUTOIDLER=$(usex autoidler)
+		-DENABLE_AZOTH_AUTOPASTE=$(usex autopaste)
+		-DENABLE_AZOTH_BIRTHDAYNOTIFIER=$(usex birthdaynotifier)
+		-DENABLE_AZOTH_CHATHISTORY=$(usex chathistory)
+		-DENABLE_AZOTH_DEPESTER=$(usex depester)
+		-DENABLE_AZOTH_EMBEDMEDIA=$(usex embedmedia)
+		-DENABLE_AZOTH_HERBICIDE=$(usex herbicide)
+		-DENABLE_AZOTH_HILI=$(usex hili)
+		-DENABLE_AZOTH_ISTERIQUE=$(usex isterique)
+		-DENABLE_AZOTH_JUICK=$(usex juick)
+		-DENABLE_AZOTH_KEESO=$(usex keeso)
+		-DENABLE_AZOTH_LASTSEEN=$(usex lastseen)
+		-DENABLE_AZOTH_METACONTACTS=$(usex metacontacts)
+		-DENABLE_MEDIACALLS=$(usex media)
+		-DENABLE_AZOTH_MODNOK=$(usex latex)
+		-DENABLE_AZOTH_MURM=$(usex murm)
+		-DENABLE_AZOTH_NATIVEEMOTICONS=$(usex nativeemoticons)
+		-DENABLE_AZOTH_OTROID=$(usex otroid)
+		-DENABLE_AZOTH_SARIN=$(usex sarin)
+		-DENABLE_AZOTH_ROSENTHAL=$(usex spell)
+		-DENABLE_AZOTH_SHX=$(usex shx)
+		-DENABLE_AZOTH_STANDARDSTYLES=$(usex standardstyles)
+		-DENABLE_AZOTH_VADER=$(usex vader)
+		-DENABLE_AZOTH_VELVETBIRD=$(usex velvetbird)
+		-DENABLE_AZOTH_WOODPECKER=$(usex woodpecker)
+		-DENABLE_AZOTH_XOOX=$(usex xmpp)
+		-DENABLE_AZOTH_XTAZY=$(usex xtazy)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-leechcraft/lc-azoth/metadata.xml b/app-leechcraft/lc-azoth/metadata.xml
index 7684b5c845..cb1e80eb2d 100644
--- a/app-leechcraft/lc-azoth/metadata.xml
+++ b/app-leechcraft/lc-azoth/metadata.xml
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<use>
-	<flag name="astrality">Build Astrality, support for protocols provided by Telepathy</flag>
-	<flag name="acetamide">Build Acetamide, the IRC protocol support</flag>
-	<flag name="adiumstyles">Build support for Adium styles</flag>
-	<flag name="autoidler">Build support for automatic status changing according to user idle time</flag>
-	<flag name="autopaste">Build Autopaste for pasting long texts to pastebins</flag>
-	<flag name="birthdaynotifier">Build Birthday Notifier for you to not forget about birthdays of your contacts.</flag>
-	<flag name="chathistory">Build ChatHistory which stories chat history</flag>
-	<flag name="depester">Build Depester which enables to ignore MUC participants</flag>
-	<flag name="embedmedia">Build EmbedMedia for embedding flash videos and images directly into chat windows</flag>
-	<flag name="herbicide">Build Herbicide, a basic antispam plugin</flag>
-	<flag name="hili">Build HiLi which allows to customize highlight settings in MUCs</flag>
-	<flag name="isterique">Build Isterique plugin for neutralizing excessive caps lock usage</flag>
-	<flag name="juick">Build plugin for the Juick.com microblogging service</flag>
-	<flag name="keeso">Build plugin for changing text into SoMEtHInG lIKe THiS</flag>
-	<flag name="lastseen">Build plugin for client-side recording of the last online/available time</flag>
-	<flag name="metacontacts">Build plugin for metacontacts support</flag>
-	<flag name="media">Enable media calls</flag>
-	<flag name="murm">Build Murm, the VKontakte messaging support via their native API (instead of XMPP)</flag>
-	<flag name="nativeemoticons">Build support for native Azoth's emoticons packs</flag>
-	<flag name="otroid">Build OTRoid, plugin for the Off-the-Record deniable encryption system</flag>
-	<flag name="sarin">Build Sarin, Tox protocol support module. Please add mva overlay to use <pkg>net-libs/tox</pkg></flag>
-	<flag name="shx">Build shell command executor plugin</flag>
-	<flag name="standardstyles">Build support for standard Azoth styles engine</flag>
-	<flag name="vader">Bulid Vader, the MRIM (Mail.Ru Agent) protocol support plugin</flag>
-	<flag name="velvetbird">Build support for protocols provided by libpurple</flag>
-	<flag name="woodpecker">Build Woodpecker, the Twitter client plugin</flag>
-	<flag name="xtazy">Build Xtazy for publishing currently playing tune</flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="astrality">Build Astrality, support for protocols provided by Telepathy</flag>
+		<flag name="acetamide">Build Acetamide, the IRC protocol support</flag>
+		<flag name="adiumstyles">Build support for Adium styles</flag>
+		<flag name="autoidler">Build support for automatic status changing according to user idle time</flag>
+		<flag name="autopaste">Build Autopaste for pasting long texts to pastebins</flag>
+		<flag name="birthdaynotifier">Build Birthday Notifier for you to not forget about birthdays of your contacts.</flag>
+		<flag name="chathistory">Build ChatHistory which stories chat history</flag>
+		<flag name="depester">Build Depester which enables to ignore MUC participants</flag>
+		<flag name="embedmedia">Build EmbedMedia for embedding flash videos and images directly into chat windows</flag>
+		<flag name="herbicide">Build Herbicide, a basic antispam plugin</flag>
+		<flag name="hili">Build HiLi which allows to customize highlight settings in MUCs</flag>
+		<flag name="isterique">Build Isterique plugin for neutralizing excessive caps lock usage</flag>
+		<flag name="juick">Build plugin for the Juick.com microblogging service</flag>
+		<flag name="keeso">Build plugin for changing text into SoMEtHInG lIKe THiS</flag>
+		<flag name="lastseen">Build plugin for client-side recording of the last online/available time</flag>
+		<flag name="metacontacts">Build plugin for metacontacts support</flag>
+		<flag name="media">Enable media calls</flag>
+		<flag name="murm">Build Murm, the VKontakte messaging support via their native API (instead of XMPP)</flag>
+		<flag name="nativeemoticons">Build support for native Azoth's emoticons packs</flag>
+		<flag name="otroid">Build OTRoid, plugin for the Off-the-Record deniable encryption system</flag>
+		<flag name="sarin">Build Sarin, Tox protocol support module. Please add mva overlay to use <pkg>net-libs/tox</pkg></flag>
+		<flag name="shx">Build shell command executor plugin</flag>
+		<flag name="standardstyles">Build support for standard Azoth styles engine</flag>
+		<flag name="vader">Bulid Vader, the MRIM (Mail.Ru Agent) protocol support plugin</flag>
+		<flag name="velvetbird">Build support for protocols provided by libpurple</flag>
+		<flag name="woodpecker">Build Woodpecker, the Twitter client plugin</flag>
+		<flag name="xtazy">Build Xtazy for publishing currently playing tune</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild b/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild
index 4c7602d3f9..ecf3e17672 100644
--- a/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild
+++ b/app-leechcraft/lc-bittorrent/lc-bittorrent-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,15 +12,20 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug geoip"
 
-DEPEND="~app-leechcraft/lc-core-${PV}
-		net-libs/rb_libtorrent"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	net-libs/rb_libtorrent
+	dev-qt/qtxml:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-task-show
-		geoip? ( dev-libs/geoip )"
+	virtual/leechcraft-task-show
+	geoip? ( dev-libs/geoip )
+"
 
 src_configure(){
-	local mycmakeargs="
-		$(cmake-utils_use_enable geoip BITTORRENT_GEOIP)
-	"
+	local mycmakeargs=(
+		-DENABLE_BITTORRENT_GEOIP=$(usex geoip)
+	)
 	cmake-utils_src_configure
 }

diff --git a/app-leechcraft/lc-bittorrent/metadata.xml b/app-leechcraft/lc-bittorrent/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-bittorrent/metadata.xml
+++ b/app-leechcraft/lc-bittorrent/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-blasq/lc-blasq-9999.ebuild b/app-leechcraft/lc-blasq/lc-blasq-9999.ebuild
index 7453543cca..13375b498d 100644
--- a/app-leechcraft/lc-blasq/lc-blasq-9999.ebuild
+++ b/app-leechcraft/lc-blasq/lc-blasq-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,19 +12,29 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug +deathnote +rappor +spegnersi +vangog"
 
-DEPEND="~app-leechcraft/lc-core-${PV}
-		deathnote? ( dev-qt/qtxmlpatterns:4 )
-		spegnersi? ( dev-libs/kqoauth )
-		vangog? ( dev-libs/qjson )
-		"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdeclarative:5
+	rappor? ( dev-qt/qtxml:5 )
+	deathnote? (
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)
+	spegnersi? (
+		dev-libs/kqoauth
+		dev-qt/qtxml:5
+	)
+	vangog? ( dev-qt/qtxml:5 )"
 RDEPEND="${DEPEND}"
 
 src_configure(){
 	local mycmakeargs=(
-		$(cmake-utils_use_enable deathnote BLASQ_DEATHNOTE)
-		$(cmake-utils_use_enable rappor BLASQ_RAPPOR)
-		$(cmake-utils_use_enable spegnersi BLASQ_SPEGNERSI)
-		$(cmake-utils_use_enable vangog BLASQ_VANGOG)
+		-DENABLE_BLASQ_DEATHNOTE=$(usex deathnote)
+		-DENABLE_BLASQ_RAPPOR=$(usex rappor)
+		-DENABLE_BLASQ_SPEGNERSI=$(usex spegnersi)
+		-DENABLE_BLASQ_VANGOG=$(usex vangog)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-leechcraft/lc-blasq/metadata.xml b/app-leechcraft/lc-blasq/metadata.xml
index 4050cea982..4d414f6797 100644
--- a/app-leechcraft/lc-blasq/metadata.xml
+++ b/app-leechcraft/lc-blasq/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<use>
-	<flag name="deathnote">Support LiveJournal FotoBilder service</flag>
-	<flag name="rappor">Support VKontakte service</flag>
-	<flag name="spegnersi">Support Flickr service</flag>
-	<flag name="vangog">Support Picasa service</flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="deathnote">Support LiveJournal FotoBilder service</flag>
+		<flag name="rappor">Support VKontakte service</flag>
+		<flag name="spegnersi">Support Flickr service</flag>
+		<flag name="vangog">Support Picasa service</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-blogique/lc-blogique-9999.ebuild b/app-leechcraft/lc-blogique/lc-blogique-9999.ebuild
index a7843149f5..974b777f91 100644
--- a/app-leechcraft/lc-blogique/lc-blogique-9999.ebuild
+++ b/app-leechcraft/lc-blogique/lc-blogique-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,18 +12,26 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug +metida +hestia"
 
-DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtsql:4[sqlite]
-	metida? ( dev-qt/qtxmlpatterns:4 )
-	"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtsql:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtdeclarative:5
+	metida? (
+		dev-qt/qtnetwork:5
+		dev-qt/qtxmlpatterns:5
+	)
+"
 RDEPEND="${DEPEND}
 	virtual/leechcraft-wysiwyg-editor
 	"
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable metida BLOGIQUE_METIDA)
-		$(cmake-utils_use_enable hestia BLOGIQUE_HESTIA)
+		-DENABLE_BLOGIQUE_METIDA=$(usex metida)
+		-DENABLE_BLOGIQUE_HESTIA=$(usex hestia)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-leechcraft/lc-blogique/metadata.xml b/app-leechcraft/lc-blogique/metadata.xml
index d5d89ecb28..504534b19e 100644
--- a/app-leechcraft/lc-blogique/metadata.xml
+++ b/app-leechcraft/lc-blogique/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<use>
-	<flag name="metida">Support for the LiveJournal blogging platform</flag>
-	<flag name="hestia">Allows one to keep a local blog</flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="metida">Support for the LiveJournal blogging platform</flag>
+		<flag name="hestia">Allows one to keep a local blog</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-certmgr/lc-certmgr-9999.ebuild b/app-leechcraft/lc-certmgr/lc-certmgr-9999.ebuild
index 6fdccb9807..72d1a129a9 100644
--- a/app-leechcraft/lc-certmgr/lc-certmgr-9999.ebuild
+++ b/app-leechcraft/lc-certmgr/lc-certmgr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-certmgr/metadata.xml b/app-leechcraft/lc-certmgr/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-certmgr/metadata.xml
+++ b/app-leechcraft/lc-certmgr/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-core/lc-core-9999.ebuild b/app-leechcraft/lc-core/lc-core-9999.ebuild
index a89da19a87..41d7d4926e 100644
--- a/app-leechcraft/lc-core/lc-core-9999.ebuild
+++ b/app-leechcraft/lc-core/lc-core-9999.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 EGIT_REPO_URI="git://github.com/0xd34df00d/leechcraft.git"
-EGIT_PROJECT="leechcraft-${PV}"
 
-inherit eutils leechcraft
+inherit eutils confutils leechcraft
 
 DESCRIPTION="Core of LeechCraft, the modular network client"
 
@@ -15,20 +14,25 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug doc +sqlite postgres +qwt"
 
-COMMON_DEPEND=">=dev-libs/boost-1.46
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtdeclarative:4
-	dev-qt/qtgui:4
-	dev-qt/qtscript:4
-	dev-qt/qtsql:4[postgres?,sqlite?]
-	dev-qt/qtwebkit:4
-	dev-qt/qtdbus:4
-	qwt? ( x11-libs/qwt:6 )"
+COMMON_DEPEND=">=dev-libs/boost-1.62
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[postgres?,sqlite?]
+	dev-qt/qtdbus:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+	qwt? ( x11-libs/qwt:6[qt5] )"
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )"
 RDEPEND="${COMMON_DEPEND}
-	dev-qt/qtsvg:4
+	dev-qt/qtsvg:5
 	|| (
 		kde-frameworks/oxygen-icons
 		x11-themes/kfaenza
@@ -39,8 +43,8 @@ REQUIRED_USE="|| ( postgres sqlite )"
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_PLUGINS=False
-		$(cmake-utils_use_with doc DOCS)
-		$(cmake-utils_use_with qwt QWT)
+		-DWITH_DOCS=$(usex doc)
+		-DWITH_QWT=$(usex qwt)
 	)
 	if [[ ${PV} != 9999 ]]; then
 		mycmakeargs+=( -DLEECHCRAFT_VERSION=${PV} )

diff --git a/app-leechcraft/lc-core/metadata.xml b/app-leechcraft/lc-core/metadata.xml
index 93047c9afa..79bb4d800d 100644
--- a/app-leechcraft/lc-core/metadata.xml
+++ b/app-leechcraft/lc-core/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Core of LeechCraft, the opensource modular network client providing a full-featured web browser, BitTorrent client and much more.</longdescription> 
+	<longdescription>Core of LeechCraft, the opensource modular network client providing a full-featured web browser, BitTorrent client and much more.</longdescription>
 	<use>
 		<flag name="qwt">Support for QML plotting item through <pkg>x11-libs/qwt</pkg></flag>
 	</use>

diff --git a/app-leechcraft/lc-cpuload/lc-cpuload-9999.ebuild b/app-leechcraft/lc-cpuload/lc-cpuload-9999.ebuild
index bfb3c90aba..90ca85b6cc 100644
--- a/app-leechcraft/lc-cpuload/lc-cpuload-9999.ebuild
+++ b/app-leechcraft/lc-cpuload/lc-cpuload-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,7 +12,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtdeclarative:5
+"
 RDEPEND="${DEPEND}
 	virtual/leechcraft-quark-sideprovider
 "

diff --git a/app-leechcraft/lc-cpuload/metadata.xml b/app-leechcraft/lc-cpuload/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-cpuload/metadata.xml
+++ b/app-leechcraft/lc-cpuload/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-cstp/lc-cstp-9999.ebuild b/app-leechcraft/lc-cstp/lc-cstp-9999.ebuild
index 6e04d117c4..7da45a5bae 100644
--- a/app-leechcraft/lc-cstp/lc-cstp-9999.ebuild
+++ b/app-leechcraft/lc-cstp/lc-cstp-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,6 +12,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-task-show"
+	virtual/leechcraft-task-show"

diff --git a/app-leechcraft/lc-cstp/metadata.xml b/app-leechcraft/lc-cstp/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/app-leechcraft/lc-cstp/metadata.xml
+++ b/app-leechcraft/lc-cstp/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-dbusmanager/lc-dbusmanager-9999.ebuild b/app-leechcraft/lc-dbusmanager/lc-dbusmanager-9999.ebuild
index e61b1a89fa..5f763b9594 100644
--- a/app-leechcraft/lc-dbusmanager/lc-dbusmanager-9999.ebuild
+++ b/app-leechcraft/lc-dbusmanager/lc-dbusmanager-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,6 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}
-		dev-qt/qtdbus:4"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtdbus:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-dbusmanager/metadata.xml b/app-leechcraft/lc-dbusmanager/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-dbusmanager/metadata.xml
+++ b/app-leechcraft/lc-dbusmanager/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-deadlyrics/lc-deadlyrics-9999.ebuild b/app-leechcraft/lc-deadlyrics/lc-deadlyrics-9999.ebuild
index 69d4ba1ad3..9b25933ea8 100644
--- a/app-leechcraft/lc-deadlyrics/lc-deadlyrics-9999.ebuild
+++ b/app-leechcraft/lc-deadlyrics/lc-deadlyrics-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,7 +12,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-search-show
-		virtual/leechcraft-downloader-http"
+	virtual/leechcraft-search-show
+	virtual/leechcraft-downloader-http
+"

diff --git a/app-leechcraft/lc-deadlyrics/metadata.xml b/app-leechcraft/lc-deadlyrics/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-deadlyrics/metadata.xml
+++ b/app-leechcraft/lc-deadlyrics/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild b/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
index 7be29f6930..de77787485 100644
--- a/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
+++ b/app-leechcraft/lc-devmon/lc-devmon-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,6 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}
+DEPEND="
+	~app-leechcraft/lc-core-${PV}
 	virtual/udev"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-devmon/metadata.xml b/app-leechcraft/lc-devmon/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-devmon/metadata.xml
+++ b/app-leechcraft/lc-devmon/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-dolozhee/lc-dolozhee-9999.ebuild b/app-leechcraft/lc-dolozhee/lc-dolozhee-9999.ebuild
index 4695fb007a..4c009567b4 100644
--- a/app-leechcraft/lc-dolozhee/lc-dolozhee-9999.ebuild
+++ b/app-leechcraft/lc-dolozhee/lc-dolozhee-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-dolozhee/metadata.xml b/app-leechcraft/lc-dolozhee/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-dolozhee/metadata.xml
+++ b/app-leechcraft/lc-dolozhee/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-eleeminator/lc-eleeminator-9999.ebuild b/app-leechcraft/lc-eleeminator/lc-eleeminator-9999.ebuild
index 005e63e671..4a58624378 100644
--- a/app-leechcraft/lc-eleeminator/lc-eleeminator-9999.ebuild
+++ b/app-leechcraft/lc-eleeminator/lc-eleeminator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	x11-libs/qtermwidget"
+	dev-qt/qtwidgets:5
+	x11-libs/qtermwidget
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-eleeminator/metadata.xml b/app-leechcraft/lc-eleeminator/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-eleeminator/metadata.xml
+++ b/app-leechcraft/lc-eleeminator/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild b/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild
index 9484b3ece8..ed1967730b 100644
--- a/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild
+++ b/app-leechcraft/lc-fenet/lc-fenet-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="
-	~app-leechcraft/lc-core-${PV}
-	dev-libs/qjson
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
 "
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-fenet/metadata.xml b/app-leechcraft/lc-fenet/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-fenet/metadata.xml
+++ b/app-leechcraft/lc-fenet/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-gacts/lc-gacts-9999.ebuild b/app-leechcraft/lc-gacts/lc-gacts-9999.ebuild
index 91daaed231..729e6d88bd 100644
--- a/app-leechcraft/lc-gacts/lc-gacts-9999.ebuild
+++ b/app-leechcraft/lc-gacts/lc-gacts-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,12 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	x11-libs/libqxt"
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+"
 RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GACTS_BUNDLED_QXT=OFF
-	)
-	cmake-utils_src_configure
-}

diff --git a/app-leechcraft/lc-gacts/metadata.xml b/app-leechcraft/lc-gacts/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-gacts/metadata.xml
+++ b/app-leechcraft/lc-gacts/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-glance/lc-glance-9999.ebuild b/app-leechcraft/lc-glance/lc-glance-9999.ebuild
index 07c6dbe23f..7bedf062c6 100644
--- a/app-leechcraft/lc-glance/lc-glance-9999.ebuild
+++ b/app-leechcraft/lc-glance/lc-glance-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-glance/metadata.xml b/app-leechcraft/lc-glance/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-glance/metadata.xml
+++ b/app-leechcraft/lc-glance/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-9999.ebuild b/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-9999.ebuild
index 7c320e7187..1b43936c8e 100644
--- a/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-9999.ebuild
+++ b/app-leechcraft/lc-gmailnotifier/lc-gmailnotifier-9999.ebuild
@@ -1,19 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
-DESCRIPTION="Notifier about new mail in a GMail inbox for LeechCraft"
+DESCRIPTION="Notifies about new mail in a GMail inbox for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
 IUSE="debug notify quark"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}
 	quark? ( ~virtual/leechcraft-quark-sideprovider-${PV} )
 	notify? ( ~virtual/leechcraft-notifier-${PV} )"

diff --git a/app-leechcraft/lc-gmailnotifier/metadata.xml b/app-leechcraft/lc-gmailnotifier/metadata.xml
index 3fdc6e37e8..c92c33ea77 100644
--- a/app-leechcraft/lc-gmailnotifier/metadata.xml
+++ b/app-leechcraft/lc-gmailnotifier/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="quark">Pull in a plugin to show GMail Notifier's quark</flag>

diff --git a/app-leechcraft/lc-historyholder/lc-historyholder-9999.ebuild b/app-leechcraft/lc-historyholder/lc-historyholder-9999.ebuild
index 868087d052..dca021448d 100644
--- a/app-leechcraft/lc-historyholder/lc-historyholder-9999.ebuild
+++ b/app-leechcraft/lc-historyholder/lc-historyholder-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,6 +12,11 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtsql:5[sqlite]
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-search-show"
+		~virtual/leechcraft-search-show-${PV}"

diff --git a/app-leechcraft/lc-historyholder/metadata.xml b/app-leechcraft/lc-historyholder/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-historyholder/metadata.xml
+++ b/app-leechcraft/lc-historyholder/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild b/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
index 0975132ab2..0bf65ca62a 100644
--- a/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
+++ b/app-leechcraft/lc-hotsensors/lc-hotsensors-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -15,8 +15,10 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}[qwt]
-	~virtual/leechcraft-quark-sideprovider-${PV}
-	dev-qt/qtdeclarative:4
 	sys-apps/lm_sensors
-	"
-RDEPEND="${DEPEND}"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5[widgets]
+"
+RDEPEND="${DEPEND}
+	~virtual/leechcraft-quark-sideprovider-${PV}"

diff --git a/app-leechcraft/lc-hotsensors/metadata.xml b/app-leechcraft/lc-hotsensors/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-hotsensors/metadata.xml
+++ b/app-leechcraft/lc-hotsensors/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-hotstreams/lc-hotstreams-9999.ebuild b/app-leechcraft/lc-hotstreams/lc-hotstreams-9999.ebuild
index a572cac1fc..2d382ae6b6 100644
--- a/app-leechcraft/lc-hotstreams/lc-hotstreams-9999.ebuild
+++ b/app-leechcraft/lc-hotstreams/lc-hotstreams-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit eutils leechcraft toolchain-funcs
 
@@ -10,8 +10,12 @@ DESCRIPTION="Provides some cool radio streams to music players like LMP"
 
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-libs/qjson"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-hotstreams/metadata.xml b/app-leechcraft/lc-hotstreams/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/app-leechcraft/lc-hotstreams/metadata.xml
+++ b/app-leechcraft/lc-hotstreams/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-htthare/lc-htthare-9999.ebuild b/app-leechcraft/lc-htthare/lc-htthare-9999.ebuild
index a5acf7bbea..71f8af741b 100644
--- a/app-leechcraft/lc-htthare/lc-htthare-9999.ebuild
+++ b/app-leechcraft/lc-htthare/lc-htthare-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,6 +10,10 @@ DESCRIPTION="Simple HTTP server for Leechcraft"
 
 SLOT="0"
 KEYWORDS=""
+IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-htthare/metadata.xml b/app-leechcraft/lc-htthare/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-htthare/metadata.xml
+++ b/app-leechcraft/lc-htthare/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild b/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
index f01bbb8c1e..e193154746 100644
--- a/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
+++ b/app-leechcraft/lc-imgaste/lc-imgaste-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-imgaste/metadata.xml b/app-leechcraft/lc-imgaste/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-imgaste/metadata.xml
+++ b/app-leechcraft/lc-imgaste/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-intermutko/lc-intermutko-9999.ebuild b/app-leechcraft/lc-intermutko/lc-intermutko-9999.ebuild
index 50a517c9a9..62061a3cb8 100644
--- a/app-leechcraft/lc-intermutko/lc-intermutko-9999.ebuild
+++ b/app-leechcraft/lc-intermutko/lc-intermutko-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-intermutko/metadata.xml b/app-leechcraft/lc-intermutko/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-intermutko/metadata.xml
+++ b/app-leechcraft/lc-intermutko/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-kbswitch/lc-kbswitch-9999.ebuild b/app-leechcraft/lc-kbswitch/lc-kbswitch-9999.ebuild
index a99417b626..5440b6a5ab 100644
--- a/app-leechcraft/lc-kbswitch/lc-kbswitch-9999.ebuild
+++ b/app-leechcraft/lc-kbswitch/lc-kbswitch-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,8 +10,14 @@ DESCRIPTION="Provides plugin- or tab-grained keyboard layout control"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug quark"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtdeclarative:5[widgets]
+"
 RDEPEND="${DEPEND}
-	x11-apps/setxkbmap"
+	x11-apps/setxkbmap
+	quark? ( ~virtual/leechcraft-quark-sideprovider-${PV} )"

diff --git a/app-leechcraft/lc-kbswitch/metadata.xml b/app-leechcraft/lc-kbswitch/metadata.xml
index 30c188bbd0..3c7b5c6f28 100644
--- a/app-leechcraft/lc-kbswitch/metadata.xml
+++ b/app-leechcraft/lc-kbswitch/metadata.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="quark">Provide sidebar quark</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-kinotify/lc-kinotify-9999.ebuild b/app-leechcraft/lc-kinotify/lc-kinotify-9999.ebuild
index 56bcd000f4..3a982faf5a 100644
--- a/app-leechcraft/lc-kinotify/lc-kinotify-9999.ebuild
+++ b/app-leechcraft/lc-kinotify/lc-kinotify-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-		>=dev-qt/qtwebkit-4.6:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwebkit:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-kinotify/metadata.xml b/app-leechcraft/lc-kinotify/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-kinotify/metadata.xml
+++ b/app-leechcraft/lc-kinotify/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-knowhow/lc-knowhow-9999.ebuild b/app-leechcraft/lc-knowhow/lc-knowhow-9999.ebuild
index a9ff9c6d1f..5c22bdc699 100644
--- a/app-leechcraft/lc-knowhow/lc-knowhow-9999.ebuild
+++ b/app-leechcraft/lc-knowhow/lc-knowhow-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-knowhow/metadata.xml b/app-leechcraft/lc-knowhow/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-knowhow/metadata.xml
+++ b/app-leechcraft/lc-knowhow/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-krigstask/lc-krigstask-9999.ebuild b/app-leechcraft/lc-krigstask/lc-krigstask-9999.ebuild
index 53d0b8c44f..0d8844e249 100644
--- a/app-leechcraft/lc-krigstask/lc-krigstask-9999.ebuild
+++ b/app-leechcraft/lc-krigstask/lc-krigstask-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,7 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4
-	x11-libs/libXcomposite"
+	x11-libs/libXcomposite
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5
+"
 RDEPEND="${DEPEND}
 	 ~virtual/leechcraft-quark-sideprovider-${PV}"

diff --git a/app-leechcraft/lc-krigstask/metadata.xml b/app-leechcraft/lc-krigstask/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-krigstask/metadata.xml
+++ b/app-leechcraft/lc-krigstask/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild b/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
index 5816c04bdb..a2f1e5e1c2 100644
--- a/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
+++ b/app-leechcraft/lc-lackman/lc-lackman-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,6 +13,11 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-		>=dev-qt/qtwebkit-4.6:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-downloader-http"
+		~virtual/leechcraft-downloader-http-${PV}"

diff --git a/app-leechcraft/lc-lackman/metadata.xml b/app-leechcraft/lc-lackman/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-lackman/metadata.xml
+++ b/app-leechcraft/lc-lackman/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-9999.ebuild b/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-9999.ebuild
index 61241b30fd..d0a7ee37f6 100644
--- a/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-9999.ebuild
+++ b/app-leechcraft/lc-lastfmscrobble/lc-lastfmscrobble-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,8 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	media-libs/liblastfm[qt4(+)]"
+	media-libs/liblastfm[qt5]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-lastfmscrobble/metadata.xml b/app-leechcraft/lc-lastfmscrobble/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-lastfmscrobble/metadata.xml
+++ b/app-leechcraft/lc-lastfmscrobble/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-laughty/lc-laughty-9999.ebuild b/app-leechcraft/lc-laughty/lc-laughty-9999.ebuild
index c93c7a518c..b3f1789936 100644
--- a/app-leechcraft/lc-laughty/lc-laughty-9999.ebuild
+++ b/app-leechcraft/lc-laughty/lc-laughty-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,6 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdbus:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+	dev-qt/qtdbus:5
+	"
 RDEPEND="${DEPEND}
-	virtual/leechcraft-notifier"
+	~virtual/leechcraft-notifier-${PV}"

diff --git a/app-leechcraft/lc-laughty/metadata.xml b/app-leechcraft/lc-laughty/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-laughty/metadata.xml
+++ b/app-leechcraft/lc-laughty/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-launchy/lc-launchy-9999.ebuild b/app-leechcraft/lc-launchy/lc-launchy-9999.ebuild
index 3d7d0f682a..268d242daf 100644
--- a/app-leechcraft/lc-launchy/lc-launchy-9999.ebuild
+++ b/app-leechcraft/lc-launchy/lc-launchy-9999.ebuild
@@ -2,17 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft toolchain-funcs
 
-DESCRIPTION="Allows one to launch third-party applications from LeechCraft"
+DESCRIPTION="Allows launching external applications (and LeechCraft plugins) from LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtgui:5
+	dev-qt/qtdeclarative:5[widgets]
+"
 RDEPEND="${DEPEND}
 	~virtual/leechcraft-trayarea-${PV}"

diff --git a/app-leechcraft/lc-launchy/metadata.xml b/app-leechcraft/lc-launchy/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/app-leechcraft/lc-launchy/metadata.xml
+++ b/app-leechcraft/lc-launchy/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-lemon/lc-lemon-9999.ebuild b/app-leechcraft/lc-lemon/lc-lemon-9999.ebuild
index 87a7d0a961..d24ea2b0ce 100644
--- a/app-leechcraft/lc-lemon/lc-lemon-9999.ebuild
+++ b/app-leechcraft/lc-lemon/lc-lemon-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,10 +13,19 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	~virtual/leechcraft-quark-sideprovider-${PV}
-	dev-qt/qtbearer:4
-	dev-qt/qtdeclarative:4
+	x11-libs/qwt:6[qt5]
 	dev-libs/libnl:3
-	x11-libs/qwt:6
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5[widgets]
 	"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	~virtual/leechcraft-quark-sideprovider-${PV}"
+
+pkg_postinst() {
+	if has_version 'dev-qt/qtnetwork:5[-connman,-networkmanager]'; then
+		ewarn "dev-qt/qtnetwork:5 was built without any bearer plugins, so detecting network"
+		ewarn "devices may be crippled. Consider enabling either 'connman' or 'networkmanager'"
+		ewarn "USE flags if that is a problem for you."
+	fi
+}

diff --git a/app-leechcraft/lc-lemon/metadata.xml b/app-leechcraft/lc-lemon/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-lemon/metadata.xml
+++ b/app-leechcraft/lc-lemon/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-lhtr/lc-lhtr-9999.ebuild b/app-leechcraft/lc-lhtr/lc-lhtr-9999.ebuild
index 9ad62e1597..0b6802cdb9 100644
--- a/app-leechcraft/lc-lhtr/lc-lhtr-9999.ebuild
+++ b/app-leechcraft/lc-lhtr/lc-lhtr-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,7 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	app-text/htmltidy
-	dev-qt/qtwebkit:4
-	"
+	app-text/tidy-html5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtwebkit:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-lhtr/metadata.xml b/app-leechcraft/lc-lhtr/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-lhtr/metadata.xml
+++ b/app-leechcraft/lc-lhtr/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild b/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild
index 22a1f7df1e..5cd11d5897 100644
--- a/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild
+++ b/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,21 +10,15 @@ DESCRIPTION="UPower-based power manager for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug systemd"
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	x11-libs/qwt:6
-	dev-qt/qtdbus:4
-	virtual/leechcraft-trayarea"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdbus:5
+	dev-qt/qtconcurrent:5
+"
 RDEPEND="${DEPEND}
-	!systemd? ( || ( >=sys-power/upower-0.99 sys-power/upower-pm-utils ) )
-	systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
-
-pkg_postinst() {
-	if has_version '>=sys-power/upower-0.99'; then
-		ewarn "The new sys-power/upower version you have installed doesn't have hibernate"
-		ewarn "and suspend. If you need hibernate and suspend in ${PN}, and you use"
-		ewarn "systemd, you should downgrade sys-power/upower to 0.9.23 series. All others"
-		ewarn "should switch to sys-power/upower-pm-utils, also to 0.9.23 series."
-	fi
-}
+	~virtual/leechcraft-trayarea-${PV}
+	|| ( sys-power/upower sys-power/upower-pm-utils )"

diff --git a/app-leechcraft/lc-liznoo/metadata.xml b/app-leechcraft/lc-liznoo/metadata.xml
index bf80182150..ef43617d9e 100644
--- a/app-leechcraft/lc-liznoo/metadata.xml
+++ b/app-leechcraft/lc-liznoo/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="systemd">Pull in correct UPower dependencies for systemd and non-systemd users.</flag>
-	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild b/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild
index c2891fa8e2..84ec922b1f 100644
--- a/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild
+++ b/app-leechcraft/lc-lmp/lc-lmp-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -14,27 +14,32 @@ IUSE="debug +fradj +graffiti +guess +mpris +mtp +mp3tunes potorchu"
 
 # depend on gstreamer:0.10 to match current Qt deps
 DEPEND="~app-leechcraft/lc-core-${PV}
-		graffiti? ( media-libs/flac )
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtconcurrent:5
+		dev-qt/qtxml:5
+		media-libs/gstreamer:1.0
+
+		mpris? ( dev-qt/qtdbus:5 )
 		guess? ( app-i18n/libguess )
-		media-libs/gstreamer:0.10
 		media-libs/taglib
-		mpris? ( dev-qt/qtdbus:4 )
-		mtp? (
-			~app-leechcraft/lc-devmon-${PV}
-			media-libs/libmtp
-		)
-		potorchu? ( media-libs/libprojectm )
-		dev-qt/qtdeclarative:4"
-RDEPEND="${DEPEND}"
+		mtp? ( media-libs/libmtp )
+		potorchu? ( media-libs/libprojectm )"
+RDEPEND="${DEPEND}
+		mtp? ( ~app-leechcraft/lc-devmon-${PV} )
+		graffiti? ( media-libs/flac )"
 
 src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable fradj LMP_FRADJ)
-		$(cmake-utils_use_enable graffiti LMP_GRAFFITI)
-		$(cmake-utils_use_enable guess LMP_LIBGUESS)
-		$(cmake-utils_use_enable mpris LMP_MPRIS)
-		$(cmake-utils_use_enable mtp LMP_MTPSYNC)
-		$(cmake-utils_use_enable mp3tunes LMP_MP3TUNES)
-		$(cmake-utils_use_enable potorchu LMP_POTORCHU)"
+	local mycmakeargs=(
+		-DENABLE_LMP_FRADJ=$(usex fradj)
+		-DENABLE_LMP_GRAFFITI=$(usex graffiti)
+		-DENABLE_LMP_LIBGUESS=$(usex guess)
+		-DENABLE_LMP_MPRIS=$(usex mpris)
+		-DENABLE_LMP_MTPSYNC=$(usex mtp)
+		-DENABLE_LMP_MP3TUNES=$(usex mp3tunes)
+		-DENABLE_LMP_POTORCHU=$(usex potorchu)
+	)
 	cmake-utils_src_configure
 }

diff --git a/app-leechcraft/lc-lmp/metadata.xml b/app-leechcraft/lc-lmp/metadata.xml
index c6abcd9f6d..87c916e3cb 100644
--- a/app-leechcraft/lc-lmp/metadata.xml
+++ b/app-leechcraft/lc-lmp/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-<use>
-	<flag name="fradj">Build FrAdj, the equalizer effect module</flag>
-	<flag name="graffiti">Build media tags editor plugin</flag>
-	<flag name="guess">Enable tags encoding guessing via the libguess library</flag>
-	<flag name="mpris">Enable MPRIS support</flag>
-	<flag name="mp3tunes">Build plugin for supporting the mp3tunes.com music locker service</flag>
-	<flag name="potorchu"> Enable the projectM-based visualization effects module for LMP</flag>
-</use>
+	<use>
+		<flag name="fradj">Build FrAdj, the equalizer effect module</flag>
+		<flag name="graffiti">Build media tags editor plugin</flag>
+		<flag name="guess">Enable tags encoding guessing via the libguess library</flag>
+		<flag name="mpris">Enable MPRIS support</flag>
+		<flag name="mp3tunes">Build plugin for supporting the mp3tunes.com music locker service</flag>
+		<flag name="potorchu"> Enable the projectM-based visualization effects module for LMP</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-mellonetray/lc-mellonetray-9999.ebuild b/app-leechcraft/lc-mellonetray/lc-mellonetray-9999.ebuild
index ff2c6b44c7..7992621801 100644
--- a/app-leechcraft/lc-mellonetray/lc-mellonetray-9999.ebuild
+++ b/app-leechcraft/lc-mellonetray/lc-mellonetray-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,7 +13,10 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtx11extras:5
 	x11-libs/libXdamage
 	x11-libs/libXrender"
 RDEPEND="${DEPEND}

diff --git a/app-leechcraft/lc-mellonetray/metadata.xml b/app-leechcraft/lc-mellonetray/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-mellonetray/metadata.xml
+++ b/app-leechcraft/lc-mellonetray/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
index 62917cfb1a..65fe56456d 100644
--- a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
+++ b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -15,7 +15,12 @@ IUSE="debug +djvu doc +fb2 +mobi +pdf +postscript"
 REQUIRED_USE="postscript? ( pdf )"
 
 CDEPEND="~app-leechcraft/lc-core-${PV}
-	pdf? ( app-text/poppler[qt4] )
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtxml:5
+	pdf? ( app-text/poppler[qt5] )
 	djvu? ( app-text/djvu )"
 
 RDEPEND="${CDEPEND}
@@ -26,12 +31,12 @@ DEPEND="${CDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable djvu MONOCLE_SEEN)
-		$(cmake-utils_use_with doc DOCS)
-		$(cmake-utils_use_enable fb2 MONOCLE_FXB)
-		$(cmake-utils_use_enable mobi MONOCLE_DIK)
-		$(cmake-utils_use_enable pdf MONOCLE_PDF)
-		$(cmake-utils_use_enable postscript MONOCLE_POSTRUS)
+		-DENABLE_MONOCLE_SEEN=$(usex djvu)
+		-DWITH_DOCS=$(usex doc)
+		-DENABLE_MONOCLE_FXB=$(usex fb2)
+		-DENABLE_MONOCLE_DIK=$(usex mobi)
+		-DENABLE_MONOCLE_PDF=$(usex pdf)
+		-DENABLE_MONOCLE_POSTRUS=$(usex postscript)
 	)
 	cmake-utils_src_configure
 }

diff --git a/app-leechcraft/lc-monocle/metadata.xml b/app-leechcraft/lc-monocle/metadata.xml
index a77f7b5b50..421dc6dc17 100644
--- a/app-leechcraft/lc-monocle/metadata.xml
+++ b/app-leechcraft/lc-monocle/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="fb2">Enable support for FictionBook format</flag>

diff --git a/app-leechcraft/lc-musiczombie/lc-musiczombie-9999.ebuild b/app-leechcraft/lc-musiczombie/lc-musiczombie-9999.ebuild
index 0b3eb438ce..e199fc5b5a 100644
--- a/app-leechcraft/lc-musiczombie/lc-musiczombie-9999.ebuild
+++ b/app-leechcraft/lc-musiczombie/lc-musiczombie-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,12 +13,17 @@ KEYWORDS=""
 IUSE="debug acoustid"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
 	acoustid? ( media-libs/chromaprint )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_with acoustid MUSICZOMBIE_CHROMAPRINT)
-	"
+	local mycmakeargs=(
+		-DWITH_MUSICZOMBIE_CHROMAPRINT=$(usex acoustid)
+	)
 	cmake-utils_src_configure
 }

diff --git a/app-leechcraft/lc-musiczombie/metadata.xml b/app-leechcraft/lc-musiczombie/metadata.xml
index a123d3910c..b5bf77f944 100644
--- a/app-leechcraft/lc-musiczombie/metadata.xml
+++ b/app-leechcraft/lc-musiczombie/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="acoustid">Use <pkg>media-libs/chromaprint</pkg> for acoustic fingerprinting</flag>

diff --git a/app-leechcraft/lc-nacheku/lc-nacheku-9999.ebuild b/app-leechcraft/lc-nacheku/lc-nacheku-9999.ebuild
index 1b634ff86b..e49e01bd19 100644
--- a/app-leechcraft/lc-nacheku/lc-nacheku-9999.ebuild
+++ b/app-leechcraft/lc-nacheku/lc-nacheku-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-nacheku/metadata.xml b/app-leechcraft/lc-nacheku/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-nacheku/metadata.xml
+++ b/app-leechcraft/lc-nacheku/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-netstoremanager/lc-netstoremanager-9999.ebuild b/app-leechcraft/lc-netstoremanager/lc-netstoremanager-9999.ebuild
index 6baf9d582d..b4fba5b6b4 100644
--- a/app-leechcraft/lc-netstoremanager/lc-netstoremanager-9999.ebuild
+++ b/app-leechcraft/lc-netstoremanager/lc-netstoremanager-9999.ebuild
@@ -2,27 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
 inherit leechcraft
 
-DESCRIPTION="Plugin for supporting and managing Internet data storages like Yandex.Disk"
+DESCRIPTION="LeechCraft plugin for supporting cloud data storages like Google Drive"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="+googledrive +yandexdisk"
+IUSE="+dropbox +googledrive"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	googledrive? (
-		dev-libs/qjson
-		sys-apps/file
-	)"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
 
 src_configure(){
 	local mycmakeargs=(
-		$(cmake-utils_use_enable googledrive NETSTOREMANAGER_GOOGLEDRIVE)
-		$(cmake-utils_use_enable yandexdisk NETSTOREMANAGER_YANDEXDISK)
+		-DENABLE_NETSTOREMANAGER_DROPBOX=$(usex dropbox)
+		-DENABLE_NETSTOREMANAGER_GOOGLEDRIVE=$(usex googledrive)
 	)
 
 	cmake-utils_src_configure

diff --git a/app-leechcraft/lc-netstoremanager/metadata.xml b/app-leechcraft/lc-netstoremanager/metadata.xml
index 46b22c67b6..59814de682 100644
--- a/app-leechcraft/lc-netstoremanager/metadata.xml
+++ b/app-leechcraft/lc-netstoremanager/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<use>
-	<flag name="googledrive">Support Google Drive storage backend</flag>
-	<flag name="yandexdisk">Support Yandex.Disk storage backend</flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="dropbox">Build Dropbox storage backend</flag>
+		<flag name="googledrive">Build Google Drive storage backend</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-networkmonitor/lc-networkmonitor-9999.ebuild b/app-leechcraft/lc-networkmonitor/lc-networkmonitor-9999.ebuild
index 257b09c113..b5ee1b1aa8 100644
--- a/app-leechcraft/lc-networkmonitor/lc-networkmonitor-9999.ebuild
+++ b/app-leechcraft/lc-networkmonitor/lc-networkmonitor-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-networkmonitor/metadata.xml b/app-leechcraft/lc-networkmonitor/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-networkmonitor/metadata.xml
+++ b/app-leechcraft/lc-networkmonitor/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-newlife/lc-newlife-9999.ebuild b/app-leechcraft/lc-newlife/lc-newlife-9999.ebuild
index 0a0930c8f9..4441065ee0 100644
--- a/app-leechcraft/lc-newlife/lc-newlife-9999.ebuild
+++ b/app-leechcraft/lc-newlife/lc-newlife-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtsql:5[sqlite]
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-newlife/metadata.xml b/app-leechcraft/lc-newlife/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-newlife/metadata.xml
+++ b/app-leechcraft/lc-newlife/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-ooronee/lc-ooronee-9999.ebuild b/app-leechcraft/lc-ooronee/lc-ooronee-9999.ebuild
index ad510adbf7..c18ee5f8d0 100644
--- a/app-leechcraft/lc-ooronee/lc-ooronee-9999.ebuild
+++ b/app-leechcraft/lc-ooronee/lc-ooronee-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit eutils leechcraft
 
@@ -12,14 +12,19 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtdeclarative:5
+"
 RDEPEND="${DEPEND}
-	virtual/leechcraft-quark-sideprovider
+	~virtual/leechcraft-quark-sideprovider-${PV}
 "
 
 pkg_postinst() {
 	elog "Install at least some of the following additional LeechCraft modules for Ooronee to be useful:"
-	optfeature "upload images" app-leechcraft/lc-imgaste app-leechcraft/lc-blasq
+	optfeature "upload images to imagebins" app-leechcraft/lc-imgaste
+	optfeature "upload images to cloud hostings like Picasa or VKontante" app-leechcraft/lc-blasq
 	optfeature "search via OpenSearch" app-leechcraft/lc-seekthru
 	optfeature "search via Google" app-leechcraft/lc-pogooglue
 }

diff --git a/app-leechcraft/lc-ooronee/metadata.xml b/app-leechcraft/lc-ooronee/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-ooronee/metadata.xml
+++ b/app-leechcraft/lc-ooronee/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-otlozhu/lc-otlozhu-9999.ebuild b/app-leechcraft/lc-otlozhu/lc-otlozhu-9999.ebuild
index 39cf822c15..3bbf43bcc6 100644
--- a/app-leechcraft/lc-otlozhu/lc-otlozhu-9999.ebuild
+++ b/app-leechcraft/lc-otlozhu/lc-otlozhu-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,6 +13,16 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	~app-leechcraft/liblaretz-${PV}
-	>=dev-qt/qtgui-4.8:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}"
+
+src_configure(){
+	local mycmakeargs=(
+		-DENABLE_OTLOZHU_SYNC=OFF
+	)
+
+	cmake-utils_src_configure
+}

diff --git a/app-leechcraft/lc-otlozhu/metadata.xml b/app-leechcraft/lc-otlozhu/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-otlozhu/metadata.xml
+++ b/app-leechcraft/lc-otlozhu/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-pintab/lc-pintab-9999.ebuild b/app-leechcraft/lc-pintab/lc-pintab-9999.ebuild
index df6d0afd1a..7d955d13c7 100644
--- a/app-leechcraft/lc-pintab/lc-pintab-9999.ebuild
+++ b/app-leechcraft/lc-pintab/lc-pintab-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-pintab/metadata.xml b/app-leechcraft/lc-pintab/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-pintab/metadata.xml
+++ b/app-leechcraft/lc-pintab/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-pogooglue/lc-pogooglue-9999.ebuild b/app-leechcraft/lc-pogooglue/lc-pogooglue-9999.ebuild
index d702333230..97f4acb458 100644
--- a/app-leechcraft/lc-pogooglue/lc-pogooglue-9999.ebuild
+++ b/app-leechcraft/lc-pogooglue/lc-pogooglue-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,7 +10,9 @@ DESCRIPTION="Provides searching with Google to other LeechCraft plugins"
 
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-pogooglue/metadata.xml b/app-leechcraft/lc-pogooglue/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/app-leechcraft/lc-pogooglue/metadata.xml
+++ b/app-leechcraft/lc-pogooglue/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild b/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
index 091ea50452..07a25a5588 100644
--- a/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
+++ b/app-leechcraft/lc-popishu/lc-popishu-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	x11-libs/qscintilla[qt4(-)]"
+	x11-libs/qscintilla[qt5]"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-popishu/metadata.xml b/app-leechcraft/lc-popishu/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-popishu/metadata.xml
+++ b/app-leechcraft/lc-popishu/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild b/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild
index def6273887..50e7cb01fa 100644
--- a/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild
+++ b/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild
@@ -1,49 +1,52 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
-inherit confutils leechcraft
+inherit leechcraft
 
 DESCRIPTION="Poshuku, the full-featured web browser plugin for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="+autosearch debug +dcac +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
-		+pcre postgres qrd +sqlite wyfv"
+IUSE="+autosearch debug +dcac +cleanweb +fatape +filescheme +foc +fua +idn +keywords +onlinebookmarks
+	  postgres qrd +speeddial +sqlite webengine +webkit"
 
 DEPEND="~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
-		dev-qt/qtwebkit:4
-		idn? ( net-dns/libidn )
-		onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 )
-		pcre? ( >=dev-libs/libpcre-8.12 )
-		qrd? ( media-gfx/qrencode )
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	dev-qt/qtprintsupport:5
+	cleanweb? ( dev-qt/qtconcurrent:5 )
+	idn? ( net-dns/libidn )
+	qrd? ( media-gfx/qrencode )
+	webkit? ( dev-qt/qtwebkit:5 )
+	webengine? ( dev-qt/qtwebengine:5 )
 "
 RDEPEND="${DEPEND}
-		virtual/leechcraft-downloader-http"
+	virtual/leechcraft-downloader-http"
 
-REQUIRED_USE="pcre? ( cleanweb )"
-
-pkg_setup() {
-	confutils_require_any postgres sqlite
-}
+REQUIRED_USE="|| ( postgres sqlite )
+	|| ( webkit webengine )"
 
 src_configure() {
-	local mycmakeargs="
-		$(cmake-utils_use_enable autosearch POSHUKU_AUTOSEARCH)
-		$(cmake-utils_use_enable cleanweb POSHUKU_CLEANWEB)
-		$(cmake-utils_use_enable dcac POSHUKU_DCAC)
-		$(cmake-utils_use_enable fatape POSHUKU_FATAPE)
-		$(cmake-utils_use_enable filescheme POSHUKU_FILESCHEME)
-		$(cmake-utils_use_enable fua POSHUKU_FUA)
-		$(cmake-utils_use_enable idn IDN)
-		$(cmake-utils_use_enable keywords POSHUKU_KEYWORDS)
-		$(cmake-utils_use_enable onlinebookmarks POSHUKU_ONLINEBOOKMARKS)
-		$(cmake-utils_use_enable qrd POSHUKU_QRD)
-		$(cmake-utils_use_enable pcre POSHUKU_CLEANWEB_PCRE)
-		$(cmake-utils_use_enable wyfv POSHUKU_WYFV)
-		"
+	local mycmakeargs=(
+		-DENABLE_POSHUKU_AUTOSEARCH=$(usex autosearch)
+		-DENABLE_POSHUKU_CLEANWEB=$(usex cleanweb)
+		-DENABLE_POSHUKU_DCAC=$(usex dcac)
+		-DENABLE_POSHUKU_FATAPE=$(usex fatape)
+		-DENABLE_POSHUKU_FILESCHEME=$(usex filescheme)
+		-DENABLE_POSHUKU_FOC=$(usex foc)
+		-DENABLE_POSHUKU_FUA=$(usex fua)
+		-DENABLE_IDN=$(usex idn)
+		-DENABLE_POSHUKU_KEYWORDS=$(usex keywords)
+		-DENABLE_POSHUKU_ONLINEBOOKMARKS=$(usex onlinebookmarks)
+		-DENABLE_POSHUKU_QRD=$(usex qrd)
+		-DENABLE_POSHUKU_SPEEDDIAL=$(usex speeddial)
+		-DENABLE_POSHUKU_WEBKITVIEW=$(usex webkitview)
+		-DENABLE_POSHUKU_WEBENGINEVIEW=$(usex webengineview)
+	)
 
 	cmake-utils_src_configure
 }

diff --git a/app-leechcraft/lc-poshuku/metadata.xml b/app-leechcraft/lc-poshuku/metadata.xml
index 91328c1eb0..fc972e3c9e 100644
--- a/app-leechcraft/lc-poshuku/metadata.xml
+++ b/app-leechcraft/lc-poshuku/metadata.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<use>
-	<flag name="autosearch">Provide automatic search suggestions for Poshuku.</flag>
-	<flag name="cleanweb">Build CleanWeb for ad blocking compatible with Firefox's AdBlock+.</flag>
-	<flag name="dcac">Build color inverter module providing a night mode.</flag>
-	<flag name="fatape">Build FatApe, GreaseMonkey userscripts support layer.</flag>
-	<flag name="filescheme">Build FileScheme for accessing local URLs.</flag>
-	<flag name="fua">Build FUA for faking user agents for different hosts.</flag>
-	<flag name="keywords">Build Keywords for adjusting search shortcuts.</flag>
-	<flag name="onlinebookmarks">Build OnlineBookmarks for syncing bookmarks with social bookmarking services like Read It Later.</flag>
-	<flag name="pcre">Use <pkg>dev-libs/libpcre</pkg> for rules matching in CleanWeb instead of slower QRegExp.</flag>
-	<flag name="qrd">Build module for displaying the QR code of a web page.</flag>
-	<flag name="wyfv">Build WYFV for replacing Flash-based video players on some sites.</flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="autosearch">Provide automatic search suggestions for Poshuku.</flag>
+		<flag name="cleanweb">Build CleanWeb for ad blocking compatible with Firefox's AdBlock+.</flag>
+		<flag name="dcac">Build color inverter module providing a night mode.</flag>
+		<flag name="fatape">Build FatApe, GreaseMonkey userscripts support layer.</flag>
+		<flag name="filescheme">Build FileScheme for accessing local URLs.</flag>
+		<flag name="foc">Build FOC for Flash-on-Click functionality.</flag>
+		<flag name="fua">Build FUA for faking user agents for different hosts.</flag>
+		<flag name="keywords">Build Keywords for adjusting search shortcuts.</flag>
+		<flag name="onlinebookmarks">Build OnlineBookmarks for syncing bookmarks with social bookmarking services like Read It Later.</flag>
+		<flag name="qrd">Build module for displaying the QR code of a web page.</flag>
+		<flag name="speeddial">Build SpeedDial module.</flag>
+		<flag name="webengine">Build WebEngine- (that is, Chromium-)based rendering backend.</flag>
+	</use>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-qrosp/lc-qrosp-9999.ebuild b/app-leechcraft/lc-qrosp/lc-qrosp-9999.ebuild
index 6dc66780a0..c0dffd9797 100644
--- a/app-leechcraft/lc-qrosp/lc-qrosp-9999.ebuild
+++ b/app-leechcraft/lc-qrosp/lc-qrosp-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,6 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-libs/qjson
-	dev-libs/qrosscore"
+	>=dev-libs/qrosscore-0.3.2"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-qrosp/metadata.xml b/app-leechcraft/lc-qrosp/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-qrosp/metadata.xml
+++ b/app-leechcraft/lc-qrosp/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-rosenthal/lc-rosenthal-9999.ebuild b/app-leechcraft/lc-rosenthal/lc-rosenthal-9999.ebuild
index ef068d5cb3..b9a7439f4a 100644
--- a/app-leechcraft/lc-rosenthal/lc-rosenthal-9999.ebuild
+++ b/app-leechcraft/lc-rosenthal/lc-rosenthal-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,8 +10,9 @@ DESCRIPTION="Spellchecking support for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtgui:5
 	app-text/hunspell"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-rosenthal/metadata.xml b/app-leechcraft/lc-rosenthal/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/app-leechcraft/lc-rosenthal/metadata.xml
+++ b/app-leechcraft/lc-rosenthal/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-sb2/lc-sb2-9999.ebuild b/app-leechcraft/lc-sb2/lc-sb2-9999.ebuild
index bc08489a46..8d5c4e00d8 100644
--- a/app-leechcraft/lc-sb2/lc-sb2-9999.ebuild
+++ b/app-leechcraft/lc-sb2/lc-sb2-9999.ebuild
@@ -2,18 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
-DESCRIPTION="Sidebar with combined launcher and tab switcher, as well as tray area"
+DESCRIPTION="Sidebar for LeechCraft supporting quarks like tab switcher, tray area and so on"
 
 SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4
-	dev-libs/qjson
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtdeclarative:5[widgets]
 "
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-sb2/metadata.xml b/app-leechcraft/lc-sb2/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-sb2/metadata.xml
+++ b/app-leechcraft/lc-sb2/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-scroblibre/lc-scroblibre-9999.ebuild b/app-leechcraft/lc-scroblibre/lc-scroblibre-9999.ebuild
index 3df9d9b934..94da7c3028 100644
--- a/app-leechcraft/lc-scroblibre/lc-scroblibre-9999.ebuild
+++ b/app-leechcraft/lc-scroblibre/lc-scroblibre-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,8 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-scroblibre/metadata.xml b/app-leechcraft/lc-scroblibre/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-scroblibre/metadata.xml
+++ b/app-leechcraft/lc-scroblibre/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-secman/lc-secman-9999.ebuild b/app-leechcraft/lc-secman/lc-secman-9999.ebuild
index 7758cdc51a..37f8d40d99 100644
--- a/app-leechcraft/lc-secman/lc-secman-9999.ebuild
+++ b/app-leechcraft/lc-secman/lc-secman-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -10,7 +10,18 @@ DESCRIPTION="Security and personal data manager for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug crypt"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	crypt? ( dev-libs/openssl:0 )
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_SECMAN_SECURESTORAGE=$(usex crypt)
+	)
+
+	cmake-utils_src_configure
+}

diff --git a/app-leechcraft/lc-secman/metadata.xml b/app-leechcraft/lc-secman/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-secman/metadata.xml
+++ b/app-leechcraft/lc-secman/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-seekthru/lc-seekthru-9999.ebuild b/app-leechcraft/lc-seekthru/lc-seekthru-9999.ebuild
index 2c5f396313..853c5525c3 100644
--- a/app-leechcraft/lc-seekthru/lc-seekthru-9999.ebuild
+++ b/app-leechcraft/lc-seekthru/lc-seekthru-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,7 +12,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
 RDEPEND="${DEPEND}
-		virtual/leechcraft-search-show
-		virtual/leechcraft-downloader-http"
+		~virtual/leechcraft-search-show-${PV}
+		~virtual/leechcraft-downloader-http-${PV}"

diff --git a/app-leechcraft/lc-seekthru/metadata.xml b/app-leechcraft/lc-seekthru/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-seekthru/metadata.xml
+++ b/app-leechcraft/lc-seekthru/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-summary/lc-summary-9999.ebuild b/app-leechcraft/lc-summary/lc-summary-9999.ebuild
index a782c0d9fd..3d0066b858 100644
--- a/app-leechcraft/lc-summary/lc-summary-9999.ebuild
+++ b/app-leechcraft/lc-summary/lc-summary-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-summary/metadata.xml b/app-leechcraft/lc-summary/metadata.xml
index 944f4a60fd..8cbd28294b 100644
--- a/app-leechcraft/lc-summary/metadata.xml
+++ b/app-leechcraft/lc-summary/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<longdescription>Summary which shows all the downloads, events and statuses in LeechCraft.</longdescription> 
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Summary which shows all the downloads, events and statuses in LeechCraft.</longdescription>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-sysnotify/lc-sysnotify-9999.ebuild b/app-leechcraft/lc-sysnotify/lc-sysnotify-9999.ebuild
index f9b9787dc1..082f2956e2 100644
--- a/app-leechcraft/lc-sysnotify/lc-sysnotify-9999.ebuild
+++ b/app-leechcraft/lc-sysnotify/lc-sysnotify-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdbus:4"
+	dev-qt/qtgui:5
+	dev-qt/qtdbus:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-sysnotify/metadata.xml b/app-leechcraft/lc-sysnotify/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-sysnotify/metadata.xml
+++ b/app-leechcraft/lc-sysnotify/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-9999.ebuild b/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-9999.ebuild
index 5813df9714..052237cebf 100644
--- a/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-9999.ebuild
+++ b/app-leechcraft/lc-tabsessmanager/lc-tabsessmanager-9999.ebuild
@@ -2,15 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
-DESCRIPTION="Provides session restore between LeechCraft runs and manual saves/restores"
+DESCRIPTION="Tabs sessions manager"
 
 SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-tabsessmanager/metadata.xml b/app-leechcraft/lc-tabsessmanager/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-tabsessmanager/metadata.xml
+++ b/app-leechcraft/lc-tabsessmanager/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-tabslist/lc-tabslist-9999.ebuild b/app-leechcraft/lc-tabslist/lc-tabslist-9999.ebuild
index 368a4102b2..0a0d2dbf64 100644
--- a/app-leechcraft/lc-tabslist/lc-tabslist-9999.ebuild
+++ b/app-leechcraft/lc-tabslist/lc-tabslist-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,5 +12,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-tabslist/metadata.xml b/app-leechcraft/lc-tabslist/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-tabslist/metadata.xml
+++ b/app-leechcraft/lc-tabslist/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild b/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild
index 2636921210..22cd23f3a9 100644
--- a/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild
+++ b/app-leechcraft/lc-touchstreams/lc-touchstreams-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,7 +13,9 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	>=dev-libs/boost-1.52.0
-	dev-libs/qjson
-	dev-qt/qtwebkit:4"
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtconcurrent:5
+"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-touchstreams/metadata.xml b/app-leechcraft/lc-touchstreams/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-touchstreams/metadata.xml
+++ b/app-leechcraft/lc-touchstreams/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-tpi/lc-tpi-9999.ebuild b/app-leechcraft/lc-tpi/lc-tpi-9999.ebuild
index 0505b43126..c75a2d79de 100644
--- a/app-leechcraft/lc-tpi/lc-tpi-9999.ebuild
+++ b/app-leechcraft/lc-tpi/lc-tpi-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,6 +13,7 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-	dev-qt/qtdeclarative:4
+	dev-qt/qtgui:5
+"
+RDEPEND="${DEPEND}
 	~virtual/leechcraft-quark-sideprovider-${PV}"
-RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-tpi/metadata.xml b/app-leechcraft/lc-tpi/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-tpi/metadata.xml
+++ b/app-leechcraft/lc-tpi/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-vgrabber/lc-vgrabber-9999.ebuild b/app-leechcraft/lc-vgrabber/lc-vgrabber-9999.ebuild
index bb9253dc0a..50a4a3aeaf 100644
--- a/app-leechcraft/lc-vgrabber/lc-vgrabber-9999.ebuild
+++ b/app-leechcraft/lc-vgrabber/lc-vgrabber-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 

diff --git a/app-leechcraft/lc-vgrabber/metadata.xml b/app-leechcraft/lc-vgrabber/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-vgrabber/metadata.xml
+++ b/app-leechcraft/lc-vgrabber/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild b/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
index 55924a98df..886cb31778 100644
--- a/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
+++ b/app-leechcraft/lc-vrooby/lc-vrooby-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,15 +13,14 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-		dev-qt/qtdbus:4"
+	dev-qt/qtwidgets:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5[widgets]
+"
 RDEPEND="${DEPEND}
-		sys-fs/udisks:2"
+	sys-fs/udisks:2"
 
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_VROOBY_UDISKS=OFF
-		-DENABLE_VROOBY_UDISKS2=ON
-		)
-
-	cmake-utils_src_configure
-}
+mycmakeargs=(
+	-DENABLE_VROOBY_UDISKS=OFF
+	-DENABLE_VROOBY_UDISKS2=ON
+	)

diff --git a/app-leechcraft/lc-vrooby/metadata.xml b/app-leechcraft/lc-vrooby/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-vrooby/metadata.xml
+++ b/app-leechcraft/lc-vrooby/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-xproxy/lc-xproxy-9999.ebuild b/app-leechcraft/lc-xproxy/lc-xproxy-9999.ebuild
index abb3714555..4f3037e0ec 100644
--- a/app-leechcraft/lc-xproxy/lc-xproxy-9999.ebuild
+++ b/app-leechcraft/lc-xproxy/lc-xproxy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit leechcraft
 
@@ -12,7 +12,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="~app-leechcraft/lc-core-${PV}"
+DEPEND="~app-leechcraft/lc-core-${PV}
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
 
 pkg_postinst() {

diff --git a/app-leechcraft/lc-xproxy/metadata.xml b/app-leechcraft/lc-xproxy/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-xproxy/metadata.xml
+++ b/app-leechcraft/lc-xproxy/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lc-xtazy/lc-xtazy-9999.ebuild b/app-leechcraft/lc-xtazy/lc-xtazy-9999.ebuild
index 95719b78bf..266ab030ee 100644
--- a/app-leechcraft/lc-xtazy/lc-xtazy-9999.ebuild
+++ b/app-leechcraft/lc-xtazy/lc-xtazy-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit leechcraft
 
@@ -13,5 +13,5 @@ KEYWORDS=""
 IUSE="debug"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
-		dev-qt/qtdbus:4"
+		dev-qt/qtdbus:5"
 RDEPEND="${DEPEND}"

diff --git a/app-leechcraft/lc-xtazy/metadata.xml b/app-leechcraft/lc-xtazy/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/app-leechcraft/lc-xtazy/metadata.xml
+++ b/app-leechcraft/lc-xtazy/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/app-leechcraft/lcpackgen/lcpackgen-1.3.ebuild b/app-leechcraft/lcpackgen/lcpackgen-1.3.ebuild
index 1a8f746ba3..9ab8eb1690 100644
--- a/app-leechcraft/lcpackgen/lcpackgen-1.3.ebuild
+++ b/app-leechcraft/lcpackgen/lcpackgen-1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 inherit cmake-utils
 

diff --git a/app-leechcraft/lcpackgen/metadata.xml b/app-leechcraft/lcpackgen/metadata.xml
index 12c590f043..29e1fba6ca 100644
--- a/app-leechcraft/lcpackgen/metadata.xml
+++ b/app-leechcraft/lcpackgen/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>leechcraft@g.o</email>
-    <name>LeechCraft</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">0xd34df00d/lcpackgen</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">0xd34df00d/lcpackgen</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild b/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild
index 4a3d35db23..afb093c333 100644
--- a/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild
+++ b/app-leechcraft/leechcraft-meta/leechcraft-meta-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 DESCRIPTION="Metapackage containing all ready-to-use LeechCraft plugins"
 HOMEPAGE="http://leechcraft.org/"
@@ -65,6 +65,10 @@ RDEPEND="
 		~app-leechcraft/lc-nacheku-${PV}
 		~app-leechcraft/lc-xtazy-${PV}
 		~app-leechcraft/lc-htthare-${PV}
+		~app-leechcraft/lc-hotsensors-${PV}
+		~app-leechcraft/lc-sb2-${PV}
+		~app-leechcraft/lc-intermutko-${PV}
+		~app-leechcraft/lc-ooronee-${PV}
 		de? (
 			~app-leechcraft/lc-devmon-${PV}
 			~app-leechcraft/lc-fenet-${PV}

diff --git a/app-leechcraft/leechcraft-meta/metadata.xml b/app-leechcraft/leechcraft-meta/metadata.xml
index 63c788d933..8e9a81fac0 100644
--- a/app-leechcraft/leechcraft-meta/metadata.xml
+++ b/app-leechcraft/leechcraft-meta/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>LeechCraft full package including all official plugins which are considered to be useful.</longdescription> 
+	<longdescription>LeechCraft full package including all official plugins which are considered to be useful.</longdescription>
 	<use>
 		<flag name="de">Install components, that allow using Leechcraft as Desktop Environment</flag>
 	</use>

diff --git a/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild b/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild
index 43ea1dba69..0ccd3ca108 100644
--- a/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild
+++ b/app-leechcraft/liblaretz/liblaretz-0.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Shared library to be used by the Laretz sync server and its clients"
 HOMEPAGE="http://leechcraft.org"

diff --git a/app-leechcraft/liblaretz/liblaretz-9999.ebuild b/app-leechcraft/liblaretz/liblaretz-9999.ebuild
index 18d9ba8294..37d68814bb 100644
--- a/app-leechcraft/liblaretz/liblaretz-9999.ebuild
+++ b/app-leechcraft/liblaretz/liblaretz-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="Shared library to be used by the Laretz sync server and its clients"
 HOMEPAGE="http://leechcraft.org"
@@ -10,7 +10,7 @@ HOMEPAGE="http://leechcraft.org"
 EGIT_REPO_URI="git://github.com/0xd34df00d/laretz.git"
 EGIT_PROJECT="laretz"
 
-inherit cmake-utils git-2
+inherit cmake-utils git-r3
 
 LICENSE="Boost-1.0"
 SLOT="0"

diff --git a/app-leechcraft/liblaretz/metadata.xml b/app-leechcraft/liblaretz/metadata.xml
index 969d57a493..ebb8b8332c 100644
--- a/app-leechcraft/liblaretz/metadata.xml
+++ b/app-leechcraft/liblaretz/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">0xd34df00d/laretz</remote-id>

diff --git a/dev-libs/qrosscore/metadata.xml b/dev-libs/qrosscore/metadata.xml
index 3b2e487b93..bdb16316b2 100644
--- a/dev-libs/qrosscore/metadata.xml
+++ b/dev-libs/qrosscore/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Qross is a KDE-free version of Kross.

diff --git a/dev-libs/qrosspython/metadata.xml b/dev-libs/qrosspython/metadata.xml
index 8cdb947b14..543b736070 100644
--- a/dev-libs/qrosspython/metadata.xml
+++ b/dev-libs/qrosspython/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Python interpreter for Qross.

diff --git a/eclass/leechcraft.eclass b/eclass/leechcraft.eclass
index ffc647adea..2ce9be5dcd 100644
--- a/eclass/leechcraft.eclass
+++ b/eclass/leechcraft.eclass
@@ -4,7 +4,7 @@
 #
 # @ECLASS: leechcraft.eclass
 # @MAINTAINER:
-# leechcraft@g.o
+# 0xd34df00d@×××××.com
 # @AUTHOR:
 # 0xd34df00d@×××××.com
 # NightNord@××××××.ru
@@ -19,29 +19,27 @@
 #
 # Thanks for original eclass to Andrian Nord <NightNord@××××××.ru>.
 #
-# Only EAPI >3 supported
+# Only EAPI >4 supported
 
 case ${EAPI:-0} in
-	4|5) ;;
-	0|1|2|3) die "EAPI not supported, bug ebuild mantainer" ;;
-	*) die "Unknown EAPI, bug eclass maintainers" ;;
+	6) ;;
+	*) die "EAPI not supported, bug ebuild mantainer" ;;
 esac
 
-inherit cmake-utils toolchain-funcs versionator
+inherit cmake-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://github.com/0xd34df00d/leechcraft.git
 	               https://github.com/0xd34df00d/leechcraft.git"
-	EGIT_PROJECT="leechcraft"
 
-	inherit git-2
+	inherit git-r3
 else
 	DEPEND="app-arch/xz-utils"
-	SRC_URI="http://dist.leechcraft.org/LeechCraft/${PV}/leechcraft-${PV}.tar.xz"
+	SRC_URI="https://dist.leechcraft.org/LeechCraft/${PV}/leechcraft-${PV}.tar.xz"
 	S="${WORKDIR}/leechcraft-${PV}"
 fi
 
-HOMEPAGE="http://leechcraft.org/"
+HOMEPAGE="https://leechcraft.org/"
 LICENSE="Boost-1.0"
 
 # @ECLASS-VARIABLE: LEECHCRAFT_PLUGIN_CATEGORY
@@ -57,27 +55,3 @@ elif [[ ${PN} != lc-core ]]; then
 else
 	CMAKE_USE_DIR="${S}"/src
 fi
-
-EXPORT_FUNCTIONS "pkg_pretend"
-
-# @FUNCTION: leechcraft_pkg_pretend
-# @DESCRIPTION:
-# Determine active compiler version and refuse to build
-# if it is not satisfied at least to minimal version,
-# supported by upstream developers
-leechcraft_pkg_pretend() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# All in-tree versions require at least gcc 4.6
-		[[ $(gcc-major-version) -lt 4 ]] || \
-				( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-			&& die "Sorry, but gcc 4.6 or higher is required."
-		# 0.6.65 monocle and all later plugins require at least gcc 4.8
-		if version_is_at_least 0.6.66 || ( [[ ${PN} == lc-monocle ]] && version_is_at_least 0.6.65 ); then
-			[[ $(gcc-major-version) -lt 4 ]] || \
-					( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]] ) \
-				&& die "Sorry, but gcc 4.8 or higher is required."
-		fi
-	fi
-}

diff --git a/media-libs/hupnp-ng/metadata.xml b/media-libs/hupnp-ng/metadata.xml
index 975190e886..a8c4592328 100644
--- a/media-libs/hupnp-ng/metadata.xml
+++ b/media-libs/hupnp-ng/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">0xd34df00d/hupnp-ng</remote-id>

diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 915f97dc4a..128b3f2f7f 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<upstream>
-	<bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
-	<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
-	<remote-id type="github">qxmpp-project/qxmpp</remote-id>
-</upstream>
-<use>
-	<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg></flag>
-	<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
-</use>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
+		<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
+		<remote-id type="github">qxmpp-project/qxmpp</remote-id>
+	</upstream>
+	<use>
+		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg></flag>
+		<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
+	</use>
 </pkgmetadata>

diff --git a/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild b/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
index f9a8826ad1..221bfcec78 100644
--- a/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
+++ b/virtual/leechcraft-browser/leechcraft-browser-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins providing a web browser"
 HOMEPAGE=""

diff --git a/virtual/leechcraft-browser/metadata.xml b/virtual/leechcraft-browser/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-browser/metadata.xml
+++ b/virtual/leechcraft-browser/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild b/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild
index 46cdbc7c2c..1fe8567c99 100644
--- a/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild
+++ b/virtual/leechcraft-downloader-http/leechcraft-downloader-http-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins providing HTTP downloading"
 HOMEPAGE=""
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-leechcraft/lc-cstp"
+RDEPEND="~app-leechcraft/lc-cstp-${PV}"
 DEPEND=""

diff --git a/virtual/leechcraft-downloader-http/metadata.xml b/virtual/leechcraft-downloader-http/metadata.xml
index d0b2a1a5e5..ef43617d9e 100644
--- a/virtual/leechcraft-downloader-http/metadata.xml
+++ b/virtual/leechcraft-downloader-http/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild b/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild
index 5fff964d3c..5e359f1d9b 100644
--- a/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild
+++ b/virtual/leechcraft-notifier/leechcraft-notifier-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins capable of visually notifying the user"
 HOMEPAGE=""
@@ -11,6 +11,10 @@ SRC_URI=""
 LICENSE=""
 SLOT="0"
 KEYWORDS=""
+IUSE=""
 
-RDEPEND="|| ( app-leechcraft/lc-kinotify app-leechcraft/lc-dbusmanager )"
+RDEPEND="|| (
+		~app-leechcraft/lc-kinotify-${PV}
+		~app-leechcraft/lc-dbusmanager-${PV}
+	)"
 DEPEND=""

diff --git a/virtual/leechcraft-notifier/metadata.xml b/virtual/leechcraft-notifier/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-notifier/metadata.xml
+++ b/virtual/leechcraft-notifier/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild b/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild
index dca72bca2f..3f7eff0d45 100644
--- a/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild
+++ b/virtual/leechcraft-quark-sideprovider/leechcraft-quark-sideprovider-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
-DESCRIPTION="Virtual for LeechCraft plugins, displaying quarks in small size somewhere near screen end"
+DESCRIPTION="Virtual for LeechCraft plugins displaying quarks near window edges"
 HOMEPAGE=""
 SRC_URI=""
 
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-leechcraft/lc-sb2"
+RDEPEND="~app-leechcraft/lc-sb2-${PV}"
 DEPEND=""

diff --git a/virtual/leechcraft-quark-sideprovider/metadata.xml b/virtual/leechcraft-quark-sideprovider/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-quark-sideprovider/metadata.xml
+++ b/virtual/leechcraft-quark-sideprovider/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild b/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild
index 09fab58d38..d6e59326aa 100644
--- a/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild
+++ b/virtual/leechcraft-search-show/leechcraft-search-show-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins providing UI for search plugins"
 HOMEPAGE=""
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-leechcraft/lc-summary"
+RDEPEND="~app-leechcraft/lc-summary-${PV}"
 DEPEND=""

diff --git a/virtual/leechcraft-search-show/metadata.xml b/virtual/leechcraft-search-show/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-search-show/metadata.xml
+++ b/virtual/leechcraft-search-show/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild b/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild
index 6ad13e3d34..bfe43b66a6 100644
--- a/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild
+++ b/virtual/leechcraft-storage-device-manager/leechcraft-storage-device-manager-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=6
 
-DESCRIPTION="Virtual for LeechCraft plugins that add support for managing removable storage devices"
+DESCRIPTION="Virtual for LeechCraft plugins for managing removable storage devices"
 HOMEPAGE=""
 SRC_URI=""
 

diff --git a/virtual/leechcraft-storage-device-manager/metadata.xml b/virtual/leechcraft-storage-device-manager/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-storage-device-manager/metadata.xml
+++ b/virtual/leechcraft-storage-device-manager/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild b/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild
index 5fa671c216..43477f78c2 100644
--- a/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild
+++ b/virtual/leechcraft-task-show/leechcraft-task-show-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for plugins that can show IDownloads and IJobHolders"
 HOMEPAGE=""
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-leechcraft/lc-summary"
+RDEPEND="~app-leechcraft/lc-summary-${PV}"
 DEPEND=""

diff --git a/virtual/leechcraft-task-show/metadata.xml b/virtual/leechcraft-task-show/metadata.xml
index 70d6e7808c..4799a2ff64 100644
--- a/virtual/leechcraft-task-show/metadata.xml
+++ b/virtual/leechcraft-task-show/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>leechcraft@g.o</email>
-	<name>LeechCraft</name>
-</maintainer>
-<longdescription>Virtual for plugins that can show IDownloads and IJobHolders</longdescription> 
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Virtual for plugins that can show IDownloads and IJobHolders</longdescription>
 </pkgmetadata>

diff --git a/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild b/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
index 73a9b2c1e6..cf65d2085a 100644
--- a/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
+++ b/virtual/leechcraft-trayarea/leechcraft-trayarea-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins providing a tray area"
 HOMEPAGE=""
@@ -13,5 +13,5 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="app-leechcraft/lc-sb2"
+RDEPEND="~app-leechcraft/lc-sb2-${PV}"
 DEPEND=""

diff --git a/virtual/leechcraft-trayarea/metadata.xml b/virtual/leechcraft-trayarea/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-trayarea/metadata.xml
+++ b/virtual/leechcraft-trayarea/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild b/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
index 8b2dced01c..9ec0f9bda4 100644
--- a/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
+++ b/virtual/leechcraft-wysiwyg-editor/leechcraft-wysiwyg-editor-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 DESCRIPTION="Virtual for LeechCraft plugins providing WYSIWYG text editor"
 HOMEPAGE=""

diff --git a/virtual/leechcraft-wysiwyg-editor/metadata.xml b/virtual/leechcraft-wysiwyg-editor/metadata.xml
index 30c188bbd0..ef43617d9e 100644
--- a/virtual/leechcraft-wysiwyg-editor/metadata.xml
+++ b/virtual/leechcraft-wysiwyg-editor/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>0xd34df00d@×××××.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>leechcraft@g.o</email>
-		<name>LeechCraft</name>
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 </pkgmetadata>