Rename qt-webkit to webkit per bug #415135

(Portage version: 2.1.10.62/cvs/Linux x86_64)

5 files changed, 17 insertions, 14 deletions

diff --git a/net-irc/kvirc/ChangeLog b/net-irc/kvirc/ChangeLog
index 1a806b8b1164..d38cd51be5a8 100644
--- a/net-irc/kvirc/ChangeLog
+++ b/net-irc/kvirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/kvirc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.144 2012/05/03 06:27:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/ChangeLog,v 1.145 2012/05/25 23:11:54 hwoarang Exp $
+
+  25 May 2012; Markos Chandras <hwoarang@gentoo.org> kvirc-4.2_pre5816.ebuild,
+  kvirc-4.2_pre6066.ebuild, kvirc-9999.ebuild, metadata.xml:
+  Rename qt-webkit to webkit per bug #415135
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> kvirc-4.2_pre5816.ebuild,
   kvirc-4.2_pre6066.ebuild, kvirc-9999.ebuild:
diff --git a/net-irc/kvirc/kvirc-4.2_pre5816.ebuild b/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
index 9821035d416a..931307012528 100644
--- a/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
+++ b/net-irc/kvirc/kvirc-4.2_pre5816.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre5816.ebuild,v 1.5 2012/05/03 06:27:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre5816.ebuild,v 1.6 2012/05/25 23:11:54 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://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 qt-webkit +ssl theora +transparency"
+IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus webkit +ssl theora +transparency"
 
 RDEPEND=">=dev-libs/crypto++-5.6.0-r1
 	sys-libs/zlib
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/crypto++-5.6.0-r1
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6 ) )
 	qt-dbus? ( >=x11-libs/qt-dbus-4.6 )
-	qt-webkit? ( >=x11-libs/qt-webkit-4.6 )
+	webkit? ( >=x11-libs/qt-webkit-4.6 )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.6.4
@@ -85,7 +85,7 @@ src_configure() {
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
 		$(cmake-utils_use_want qt-dbus QTDBUS)
-		$(cmake-utils_use_want qt-webkit QTWEBKIT)
+		$(cmake-utils_use_want webkit QTWEBKIT)
 		$(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-4.2_pre6066.ebuild b/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
index cfe1bdaa15ce..7f2cf3e4af09 100644
--- a/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
+++ b/net-irc/kvirc/kvirc-4.2_pre6066.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre6066.ebuild,v 1.4 2012/05/03 06:27:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-4.2_pre6066.ebuild,v 1.5 2012/05/25 23:11:54 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -14,7 +14,7 @@ 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 qt-webkit +ssl theora +transparency"
+IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus webkit +ssl theora +transparency"
 
 RDEPEND="sys-libs/zlib
 	x11-libs/libX11
@@ -30,7 +30,7 @@ RDEPEND="sys-libs/zlib
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6 ) )
 	qt-dbus? ( >=x11-libs/qt-dbus-4.6 )
-	qt-webkit? ( >=x11-libs/qt-webkit-4.6 )
+	webkit? ( >=x11-libs/qt-webkit-4.6 )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.6.4
@@ -84,7 +84,7 @@ src_configure() {
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
 		$(cmake-utils_use_want qt-dbus QTDBUS)
-		$(cmake-utils_use_want qt-webkit QTWEBKIT)
+		$(cmake-utils_use_want webkit QTWEBKIT)
 		$(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 40e6561f1381..74de5dc2af43 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.32 2012/05/03 06:27:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/kvirc/kvirc-9999.ebuild,v 1.33 2012/05/25 23:11:54 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ ESVN_PROJECT="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 qt-webkit +ssl theora +transparency"
+IUSE="audiofile dcc_video +dcc_voice debug doc gsm +ipc ipv6 kde +nls oss +perl +phonon profile +python +qt-dbus webkit +ssl theora +transparency"
 
 RDEPEND="sys-libs/zlib
 	x11-libs/libX11
@@ -32,7 +32,7 @@ RDEPEND="sys-libs/zlib
 	perl? ( dev-lang/perl )
 	phonon? ( || ( media-libs/phonon >=x11-libs/qt-phonon-4.6 ) )
 	qt-dbus? ( >=x11-libs/qt-dbus-4.6 )
-	qt-webkit? ( >=x11-libs/qt-webkit-4.6 )
+	webkit? ( >=x11-libs/qt-webkit-4.6 )
 	ssl? ( dev-libs/openssl )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.6.4
@@ -87,7 +87,7 @@ src_configure() {
 		$(cmake-utils_use_want profile MEMORY_PROFILE)
 		$(cmake-utils_use_want python PYTHON)
 		$(cmake-utils_use_want qt-dbus QTDBUS)
-		$(cmake-utils_use_want qt-webkit QTWEBKIT)
+		$(cmake-utils_use_want webkit QTWEBKIT)
 		$(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/metadata.xml b/net-irc/kvirc/metadata.xml
index 33aba9fab8ad..af4e29da2e6e 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -11,7 +11,6 @@
 		<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="qt-webkit">Support Qt-WebKit</flag>
 		<flag name="transparency">Support pseudo-transparency</flag>
 	</use>
 </pkgmetadata>