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

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

2 files changed, 106 insertions, 86 deletions

diff --git a/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild b/app-leechcraft/lc-azoth/lc-azoth-9999.ebuild
index 8d4294742618..9c28b116591a 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 7684b5c84583..cb1e80eb2d68 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@gentoo.org</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@gmail.com</email>
+		<name>Georg Rudoy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</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>