Rename obsolete USE="v4l2" to USE="v4l" wrt #385241

Package-Manager: portage-2.2.0_alpha71_p73/cvs/Linux x86_64

5 files changed, 30 insertions, 32 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 203c6c3e88f0..5819a087d2e6 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.295 2011/10/28 19:03:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.296 2011/10/30 15:34:32 ssuominen Exp $
+
+  30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> kopete-4.6.3.ebuild,
+  kopete-4.6.5.ebuild, kopete-4.7.2.ebuild:
+  Rename obsolete USE="v4l2" to USE="v4l" wrt #385241
 
   28 Oct 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kopete-4.7.1.ebuild:
   Drop KDEpim 4.6.1 and KDE 4.7.1
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 649009a9e8fc..51b0c17ac8ec 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,28 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 DIST kdenetwork-4.6.3.tar.bz2 8693954 RMD160 a70c031107dd56eda618b91482b814e14425cb1d SHA1 6f140dca442be815eda4fb79d51efd9e4588a1f1 SHA256 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb
 DIST kdenetwork-4.6.5.tar.bz2 8685421 RMD160 eaa0e86ac527a7bc7a70c7eeedb651ff2cccf799 SHA1 cc398063da61f9f9ef0db4455dc0c989a4e68a25 SHA256 5029442447524dc83b080d11fbc4a533f3135bbaf7350b1b5f56289d8f913588
 DIST kdenetwork-4.7.2.tar.bz2 9945067 RMD160 50c6703d021db1ffd516f886b42d42291f725d6c SHA1 59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c SHA256 c61606a0cad9620ac235725594c7d9d0231268dc372e4d16d411f9aff1f3c36f
-EBUILD kopete-4.6.3.ebuild 4131 RMD160 37cf1858ccca843566c9fb92cd1f501c9d39d043 SHA1 00ce2ee80ba994cdd8b33c6f5cf648376defe8f2 SHA256 6957791cd96bbe0161cffa54514300a73caf23bac6dc6ba462f71c95b2a1cff7
-EBUILD kopete-4.6.5.ebuild 4132 RMD160 3fff256ed9201f9cafd0f165da0ec7bc6d9965f7 SHA1 06601a02e4f8fa165063c4e9234cab6e6e853d7a SHA256 65ba6bcdada2ea4c6d945a72233c55e2c95a35683fb05f83e1716f187e7e8fd7
-EBUILD kopete-4.7.2.ebuild 4134 RMD160 324df575ecd9915f3e58507ce34f68dd6de74773 SHA1 b485692ef58a7e0b97b45a9bb9ecfc61baef94f7 SHA256 b91fb5f52491200e579e61373b7e0e5f13ea98b1dfd95621f900e6382083f5cb
-MISC ChangeLog 43305 RMD160 2c935952ae5834244058721f62e824f41234cea3 SHA1 cc7b99fe8c67cd46e26fe70562ac085d1a99a121 SHA256 808a4acbbd05b3df2602eed691ebdb014138905753616069622e29c574d2415e
+EBUILD kopete-4.6.3.ebuild 4131 RMD160 0e3d4d072b9d990b697968d13b0c8a320ca4044f SHA1 c73151aa1d4768571c753c573f7ab8a04bfc2496 SHA256 2bb63a724a8e3d5dac6bd44d0e87373e297549ebd757b28e7aa221b44499367e
+EBUILD kopete-4.6.5.ebuild 4132 RMD160 a7d9afbb09714f88e60d12715f20a0b9e340c51a SHA1 10934fb87aa0e566af1cea50d5b56ccb2e891ac7 SHA256 e90d53fb37226d2957d83ed59db26fc5e590146047f4acb09622a367a84a6222
+EBUILD kopete-4.7.2.ebuild 4134 RMD160 bc5ce59d8dde081bdcc1be4181d84128bd7dd973 SHA1 948c62f334326a1b6133ad14072823e216ed7744 SHA256 e2e08c7eea57408edf42a9c8dbad6da9e92ea7d16c55c61f3faec11bf566eb92
+MISC ChangeLog 43479 RMD160 af51ab9e634c6a0b4498597b2a4f2a17c80556bd SHA1 56b8b09750ba935441f990084e9045a4b64d0ee1 SHA256 0255d31bce9395cbc97ca19f28209ab2d482a36e79655a73225af0edd035844a
 MISC metadata.xml 2522 RMD160 61b1418ddd502048a38062e3cfe3cff4a47944e7 SHA1 107a598bf20a9221886131a0810552352ec84d6c SHA256 7616e071f4e2a3e763e35ea6bb21e2aa185092c1e02039db3b29b89a8efecc86
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOqvzYAAoJENwGBM22xffeG+EP/3S/bY08ax+zAUeUD45BbczT
-wuOHvrkSatZwDrrEY+jmo37x91LWmpnXly4N+fJgd7bqW9Axsw48ZYTFI5C4CUL+
-q7oC3Uo6FsyPtk8BGIai/aI2OI7n7yoYFogGgaEyO+c4cGvnBSiwYExrI26Rbp7H
-ZC1lUe8hG2M/zJ6XcZrGeWjHUOzIOe9sGoFUddKMfjrAb41acxWmi1ht5v1VYVyl
-z4VkFqNmBYVVE8mwGAeZQbifCo6Btt7+pd1bnqL5u6JUf/qnse08fTtW43YqzC/i
-vr7X2lX/ZHjvax01R8ZHpiNKw1cbcHOy7jwPkLD+gnYdDklj+a2WHbk3HyDXQ8Yp
-VsrTldgKLjtknmRrCSmXN2h1zY0ZUGb9uHP5jV/WCI3qO8TXxTIjm8jmnFsqZRWN
-f3fUD24CDnz/IGyFFMAzeCJ44DXhQ61+uuErhhTA9insvyPgl1ca02tzp8P/ZWeC
-b1LqsHRn8MOz1o1mIlphjEG+FG0chWIrP4kCaVx0pGFk7DnHd2ebWkZr/Q1eKOJ+
-TmdaqFdB9Vpd7TuT+ePVXToC3Dlr8CCs+941C4U72+S/NY5LcRzMTQG7EraW84GW
-57GUexUP6WCYRZoo9c1l+AD553XpLpGHmVk3EJrgyTBohsmWZ+sJGO2GfB7xr6Tg
-gC1QeoGPAUvotUrNycb8
-=re7s
+iQEcBAEBAgAGBQJOrW6LAAoJEEdUh39IaPFNomwH/09NvUsp0HtkpcWd4IQiK5z8
+GcVwnGpMoDrUqYGihap8ODlZ7RxQ3cOPmFJ5v5PjlSpo9r3IVi6WSOuW5+X1bMz4
+YTVZigz9PfAtkjc+/V7R0Z1+X6FkH37Fa1pFnUt8rqGHMJlD5XBb/6OXhjku3AzL
+eq3X8axA7tkn9TqG7IlK+heuwYPYhsVh7vstGIZwijEBJKafNJ1QsKm3NN6yzUZA
+k9tL9Y965/gheiiD4CrmFYB+ACzvl7HLmJ8Ow0LdxTJt30v4ezob9QkB0JOjgNQl
+9m1XOzn8XxblxEMuyQUxOBniQNtNAdfuYVsvdhTeZ86MvSmw1kRXIme3eLbgokE=
+=nlA1
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-4.6.3.ebuild b/kde-base/kopete/kopete-4.6.3.ebuild
index 11551ed370dd..3f0832886b91 100644
--- a/kde-base/kopete/kopete-4.6.3.ebuild
+++ b/kde-base/kopete/kopete-4.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.3.ebuild,v 1.4 2011/06/26 01:54:32 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.3.ebuild,v 1.5 2011/10/30 15:34:32 ssuominen Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
diff --git a/kde-base/kopete/kopete-4.6.5.ebuild b/kde-base/kopete/kopete-4.6.5.ebuild
index 6ebf80aa03ad..f4b1ea327982 100644
--- a/kde-base/kopete/kopete-4.6.5.ebuild
+++ b/kde-base/kopete/kopete-4.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.5.ebuild,v 1.3 2011/08/15 21:09:38 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.5.ebuild,v 1.4 2011/10/30 15:34:32 ssuominen Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do
diff --git a/kde-base/kopete/kopete-4.7.2.ebuild b/kde-base/kopete/kopete-4.7.2.ebuild
index d8d91626d494..9ceae8171cad 100644
--- a/kde-base/kopete/kopete-4.7.2.ebuild
+++ b/kde-base/kopete/kopete-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.7.2.ebuild,v 1.1 2011/10/06 18:11:10 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.7.2.ebuild,v 1.2 2011/10/30 15:34:32 ssuominen Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do