Rename qt-webkit to webkit per bug #415135

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

6 files changed, 42 insertions, 19 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/Manifest b/net-irc/kvirc/Manifest
index 3ade69b928dc..ab70522693ee 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,7 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST kvirc-4.2_pre5816.tar.xz 4541000 RMD160 064232041c5009f46aa7646dc623dac227d04042 SHA1 3704848df01028aebca2b206b79a8844f0a9c059 SHA256 438cebdb89834474b001953c87db7abe0a8a7f9035e5e01072e1697e5dc6a294
 DIST kvirc-4.2_pre6066.tar.xz 4539472 RMD160 f173af2ce7f2bc010ea55d5f47d18af14002320d SHA1 460fb70889f849f998019ea1389ce9dbfd4012e9 SHA256 5cbf819fb32d493305ed38939be69079a93bd14ec2c8d2de5f6c7529b321a62c
-EBUILD kvirc-4.2_pre5816.ebuild 2834 RMD160 572435962edeffeff0109758f4cf81d871606981 SHA1 c43e34071596a78cbaf9c12e6c7b561fb960285a SHA256 7673db01cd64e851f597ab333ac18f3fd3b67176fa8d86bd1974d1e5ed8961b2
-EBUILD kvirc-4.2_pre6066.ebuild 2845 RMD160 ddd6e87e237803e505cb624d79e4d08763b61b32 SHA1 c3595803bd8db1d8e8194017fdcf0a738b3c17b7 SHA256 6910c8fb1759494296e6b5f1ec84087a651409a6f02a216ef6aa1b3c9a64f44b
-EBUILD kvirc-9999.ebuild 2871 RMD160 f28cdc02497c02ed3a80a6a4a6e69451d49279ee SHA1 9d91371062652a5dfdb672fc2128e74fb4140b1a SHA256 fd9f9d973eff8621ce0e9466f436edf46327fdcc9513c8b2327790ba5522b3f9
-MISC ChangeLog 21716 RMD160 74db38ad7d36ff61253f8254e37c978387a6cffc SHA1 8ebe450d1459e5502b0c660081036766e5d62d1d SHA256 3df8fc9cb990154342b69f05296cc7c5c596eb9c335ff811cec0a14ec04e2e0c
-MISC metadata.xml 713 RMD160 bd67c59cc96788c03c0ab520d9ab42af682abf71 SHA1 33238f9ff1ba626b9ac34909688aebf595ebeb6f SHA256 48d4a0dee1f8de184352de07a28366be5e052353d4836424a8d4f21eebacac44
+EBUILD kvirc-4.2_pre5816.ebuild 2827 RMD160 8905ae5d6cec1441d23a31cd08f992dd2eab8a24 SHA1 aa12a86c8854f14922e698c2e8a26df86f60374a SHA256 3cee29b62628c35357c5df5b4396697f1ff83fcdb45ac7df0641ad3e27a0460d
+EBUILD kvirc-4.2_pre6066.ebuild 2838 RMD160 11aa3cc115f2a9aa6349161c983a92f84a91b5e1 SHA1 2a7b8845fbec1c8aa496ef2cd193b54317f68180 SHA256 71cc6c538417b0c4a8f0cfb303c58a86e335d122423d6fe1f18afeb65267dd03
+EBUILD kvirc-9999.ebuild 2864 RMD160 acb36dc59b7053912df48bb57909b3d16d266bdb SHA1 3ce10ea585b4ddc2ee9f5bbecad50f3181805b0d SHA256 9cc149c592f2a861732d162af4e6404e506fb5f47d3082852666c7f194a0f90f
+MISC ChangeLog 21904 RMD160 95ca63c5867031592f0ca4dfe1d1af4a3707a84f SHA1 3b3959b0873fc972aeb6e7863c6f824f349e0d43 SHA256 b0133f87bbd443459f72ebd257a755110181af4fe12139eabbc5deb90bac18fe
+MISC metadata.xml 663 RMD160 e756fc5e9909b508381a81a1cf6abf47a0e74a75 SHA1 01980a6d52e87b3ce608cf66d421ca5e0166b699 SHA256 1b5a7aeab834727a6050a0bafac593fae85783d87811bc9e9cf35362fd577bd3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPwBHAAAoJEPqDWhW0r/LCoFwP/1waG+68Yn6YuPERJQcYOtZE
+QX5mim1KNfY++Ju92VcytgIs5lRkJlkMHNHvu2eXfNho4HIlzTH2n60xndzi/AX3
+LkWooddNS3An7i2Pd0vfzwAPmcmaf7ZR8a6b+c7e1R8zF+tvHFDLHGXLGylIT7Bm
+qJM2ye/1VQz9gB3CwHGWxH2QoelgQH2pQ+SX7aP8/sDrO4RLb72GG6Fba0pj9P4n
+WbqZPTlMA4MdyYJocpqIuu9AwsGWEyUT8msAfPECzJEYqO8+wszcL/W8UGygAzIk
+p3QPL8nqf5uwQWgmufCCU2kCDkT89moGN6UsEJ9mIdI5q52l5ag/MgfyXJrpTv/Y
+dbYnc2trKx3SjnwbOaEKwyYJe8k889zDuaRW6jJwePljorIejbAqfUslZgnyVO7i
+BuDjGNg40PfmM0hAd2YzDkZ06edDXSm2XabrSzu4NJEGdcDf4+dNDljYZ9z4qCqA
+jpwZyKld3cNNBkYAlyl5IrtT9gGAyeTe9Ru1IkvZnaz32ghChdIcXa6wd3/t0JOr
+2SPRdSMbfztq7ybsLRXagxFg6oQdQg3hXdkwwJ/mBHa/lTSGmvBxPBHtWVr1Twpv
+ygTNo0PcfEka0w77g4clexp0RM/lk0qno9GXeNvkxpy0EzSY/vpNgc+0P0j+PA0o
+2avmR5Js1GHhMm97VKPA
+=95hg
+-----END PGP SIGNATURE-----
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>