[gentoo-commits] repo/gentoo:master commit in: net-irc/kvirc/

[Mike Gilbert]

commit:     1a5ed7f8fbb29b378ce63402a9ab2e3dc7c3b77f
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Dec 19 15:09:40 2015 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 15:25:02 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5ed7f8

net-irc/kvirc: Rename qt-dbus USE flag to dbus USE flag.

 net-irc/kvirc/kvirc-4.4_pre6250.ebuild | 8 ++++----
 net-irc/kvirc/kvirc-9999.ebuild        | 6 +++---
 net-irc/kvirc/metadata.xml             | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
index 05cfcd1..fd52aec 100644
--- a/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
+++ b/net-irc/kvirc/kvirc-4.4_pre6250.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,13 +14,14 @@ SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.xz"
 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
-IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus +ssl theora +transparency webkit"
+IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +ssl theora +transparency webkit"
 
 RDEPEND=">=dev-qt/qtcore-4.6:4
 	>=dev-qt/qtgui-4.6:4
 	>=dev-qt/qtsql-4.6:4
 	sys-libs/zlib
 	x11-libs/libX11
+	dbus? ( >=dev-qt/qtdbus-4.6:4 )
 	dcc_video? (
 		media-libs/libv4l
 		theora? ( media-libs/libogg media-libs/libtheora )
@@ -29,7 +30,6 @@ RDEPEND=">=dev-qt/qtcore-4.6:4
 	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-libs/phonon[qt4] >=dev-qt/qtphonon-4.6:4 ) )
-	qt-dbus? ( >=dev-qt/qtdbus-4.6:4 )
 	ssl? ( dev-libs/openssl )
 	webkit? ( >=dev-qt/qtwebkit-4.6:4 )"
 DEPEND="${RDEPEND}
@@ -72,6 +72,7 @@ src_configure() {
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want dbus QTDBUS)
 		$(cmake-utils_use_want dcc_video DCC_VIDEO)
 		$(cmake-utils_use_want dcc_voice DCC_VOICE)
 		$(cmake-utils_use_want debug DEBUG)
@@ -86,7 +87,6 @@ src_configure() {
 		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
-		$(cmake-utils_use_want qt-dbus QTDBUS)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want theora OGG_THEORA)
 		$(cmake-utils_use_want transparency TRANSPARENCY)

diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 89c085b..1cddf5e 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -15,7 +15,7 @@ EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
 LICENSE="kvirc"
 SLOT="4"
 KEYWORDS=""
-IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus spell +ssl theora +transparency webkit"
+IUSE="audiofile +dbus dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python spell +ssl theora +transparency webkit"
 
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -28,6 +28,7 @@ RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtxml:5
 	sys-libs/zlib
 	x11-libs/libX11
+	dbus? ( dev-qt/qtdbus:5 )
 	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
 	kde? (
 		kde-frameworks/kcoreaddons:5
@@ -40,7 +41,6 @@ RDEPEND="dev-qt/qtcore:5
 	oss? ( audiofile? ( media-libs/audiofile ) )
 	perl? ( dev-lang/perl )
 	phonon? ( media-libs/phonon:0[qt5] )
-	qt-dbus? ( dev-qt/qtdbus:5 )
 	spell? ( app-text/enchant )
 	ssl? ( dev-libs/openssl )
 	theora? (
@@ -88,6 +88,7 @@ src_configure() {
 		-DWANT_ENV_FLAGS=1
 		-DWANT_VERBOSE=1
 		$(cmake-utils_use_want audiofile AUDIOFILE)
+		$(cmake-utils_use_want dbus QTDBUS)
 		$(cmake-utils_use_want dcc_video DCC_VIDEO)
 		$(cmake-utils_use_want dcc_voice DCC_VOICE)
 		$(cmake-utils_use_want debug DEBUG)
@@ -102,7 +103,6 @@ src_configure() {
 		$(cmake-utils_use_want phonon PHONON)
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
-		$(cmake-utils_use_want qt-dbus QTDBUS)
 		$(cmake-utils_use_want spell SPELLCHECKER)
 		$(cmake-utils_use_want ssl OPENSSL)
 		$(cmake-utils_use_want theora OGG_THEORA)

diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index af4e29d..535a6e6 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>arfrever.fta@×××××.com</email>
+		<name>Arfrever Frehtes Taifersar Arahesis</name>
 	</maintainer>
+	<herd>proxy-maintainers</herd>
 	<use>
 		<flag name="dcc_video">Support video connections over DCC protocol</flag>
 		<flag name="dcc_voice">Support voice connections over DCC protocol</flag>
 		<flag name="ipc">Support inter-process communication between KVIrc processes</flag>
 		<flag name="phonon">Support Phonon for audio output</flag>
-		<flag name="qt-dbus">Support Qt-DBus</flag>
 		<flag name="transparency">Support pseudo-transparency</flag>
 	</use>
 </pkgmetadata>