Use the new ffmpeg virtual, bug 362105. QA Fix: use has_version instead of built_with_use.

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

6 files changed, 49 insertions, 25 deletions

diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 5c291f36d80a..df72b181b361 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-softdevice
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.66 2009/11/21 19:42:25 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.67 2011/04/06 17:29:09 idl0r Exp $
+
+  06 Apr 2011; Christian Ruppert <idl0r@gentoo.org>
+  vdr-softdevice-0.5.0.20080922.ebuild, vdr-softdevice-0.5.0.20090218.ebuild,
+  vdr-softdevice-0.5.0.20090630.ebuild:
+  Use the new ffmpeg virtual, bug 362105. QA Fix: use has_version instead of
+  built_with_use.
 
   21 Nov 2009; Markus Meier <maekke@gentoo.org>
   vdr-softdevice-0.5.0.20090630.ebuild:
diff --git a/media-plugins/vdr-softdevice/Manifest b/media-plugins/vdr-softdevice/Manifest
index 1a82f1b80c21..e64857f4b0f4 100644
--- a/media-plugins/vdr-softdevice/Manifest
+++ b/media-plugins/vdr-softdevice/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX confd 431 RMD160 14e9370497da9ff23e81a315dd92985e4fb861c3 SHA1 f58d4504300662d6a00324091c5d2e22f9f1feb2 SHA256 5a82e32365ff3c77dfdad50884be7ae6f7d5f54e249c69308fc041cdce61290e
 AUX patches-0.4.0/new-ffmpeg-extern-c.diff 1526 RMD160 ff074327176d72b3e65b7f5f61c615c196d95d6d SHA1 0293a877b0c03012be2e246e1f91fd06c1cb17ec SHA256 4840b91d58672a9f98a04d84fa68e5e74baab9728f31907ab47a55cdfd9d06b0
@@ -10,15 +10,19 @@ AUX vdr-softdevice-0.5.0.20080922-offsett.patch 1298 RMD160 ac28491ce13a8d06dc8b
 DIST vdr-softdevice-cvs-20080922.tar.bz2 161453 RMD160 8640c1f3aaf8b0edc994247382bfbf390e514fad SHA1 6d87279fe51a04cff50b949daf32d744ca72efc4 SHA256 95588510261069c3d71f466350bb8eee524d70f2b84ba5120745f01b011c8de5
 DIST vdr-softdevice-cvs-20090218.tar.bz2 161620 RMD160 273b55bd4dd551b82714724aa097a5ac2a0f0521 SHA1 059080d76529cccfe78fb4503731158622c308e5 SHA256 79f03506b40da140ad31be0849a9e33f7fb223eaa5f070fa1ade906b863548f6
 DIST vdr-softdevice-cvs-20090630.tar.bz2 162845 RMD160 2855c6e7177a770982efabd0c81fea03ce0e72de SHA1 c3930fbdefa8e15a7949745e82fa92865817f9b1 SHA256 02b6c4277bcc77df2e488bb0ba3efd59c4fcaa61ec6f3ba88ccf77c4e1d5a609
-EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3566 RMD160 f4fb258bf79f7969e5f4a894bc57ea0227fb02cb SHA1 8307b7065d0bc1f44ec9a9d20c99c70baec390e8 SHA256 b9443de9249cb7c12510eaba76de19c14793f5fc9451c43afb3b817d1717ef72
-EBUILD vdr-softdevice-0.5.0.20090218.ebuild 3313 RMD160 734363deaaa61357aa7e6dafcf8ae40949571e9b SHA1 6ba937eed366bdc6cfdcc09b5a547ae84d1dbb7d SHA256 d58aff20d0192177e2a70e1ed8aeabbf23cc8ae4166ffa0fa9bbba848adbac7a
-EBUILD vdr-softdevice-0.5.0.20090630.ebuild 3037 RMD160 19b111a8753ce7683822e5659fe45b4d8160751e SHA1 a2135b91ab2e5e3efe65279f7f5c54756334deef SHA256 b1c56484efda6604fd4fc73ba236cb554763512b434f6a66125d00172e799e15
-MISC ChangeLog 15057 RMD160 96a6de19d75788ba2f73dd2463ba4c1a0ec2fd25 SHA1 cc25481e3119dc026b1cbafe8c34d342081d8c83 SHA256 f0f945889aae670687092372a2df577e763eda52a16beab725ac9323fc12c731
+EBUILD vdr-softdevice-0.5.0.20080922.ebuild 3557 RMD160 a443a97cf78f58bfcb0474a75faf78139fc53b8e SHA1 67620bcc9f3aa96eb42881beca7e7d32281739c5 SHA256 78de7bf66e2c80bbc2b2e8fad1b4d690a62f73fd542b4e8d7d482f66f84e2ae1
+EBUILD vdr-softdevice-0.5.0.20090218.ebuild 3304 RMD160 1e06268ef3d3f294cf94125e4f0f353d7531019c SHA1 fb639dc710a1a744c8560f755deaae27f4bf7469 SHA256 f9008695370525d61a3f42d01f9e99516dc5f3f87d24078fd704b7ec19b3919f
+EBUILD vdr-softdevice-0.5.0.20090630.ebuild 3028 RMD160 9d613cb5306db61b90970a4ad4f35c8c384ffceb SHA1 7cffb56b1a9575298efa397e43752ed164a023b3 SHA256 b5b82876ffe0e0ff371ac0a0a299dab2f51b7e7c02c0e0930fa64a93f3c61cd7
+MISC ChangeLog 15322 RMD160 853ef2a3daefe4c15b345ba9300496ec12b83f73 SHA1 9073a1e4b1d0144f8a057b344509174b50d7dd9e SHA256 adc3562672bc60d045ea46bd24fe4233fb110242798823c115181634f8e6c056
 MISC metadata.xml 315 RMD160 9ff61fc577af435ee1e4c8cc622a7495ee2b6932 SHA1 514ba8e35690751b2d1d8cfba2c4162152f07d0f SHA256 0e99bf3f1538b2fef87bd304d896b78a5ddfb8a75277550c261801dcd3c4e279
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAksIQrEACgkQkKaRLQcq0GIY/QCXYlZUn+26ICAIU9B1ST+dY9VK
-MQCgnonr+Kui3+/6VQ4Bx3yYAVsSHw8=
-=V+Pk
+iQEcBAEBCAAGBQJNnKLrAAoJEMOx0zmdw4Z18lgIAJfiEvEDWA4GDZ5TystwdMSk
+/tjilEb0vM2i3HoO7iw6BsMhEei8ri9flMAWsbYyjI/Z9Af4BafyPP3YBlFmOU0T
+iQrisNRNpy8V+AgvLTz8J7iyNNLEr5Jl7J/aNRT+wZUu3ZccsXE0OlHzIjCjEjEF
+5CmeSWPgI0QS8IzZBK8E2nZMSkGMjvnPffl47lj8L1yle4WmqGmRJYV709at0q72
+j3lru88tCF4MAppJ/g+gHTGL44y39GLrDJNifM4PT1onTpgVdc19N5yYp8gYgiW4
+128mQBdx+FQ+wV4eiv5dAIeMmnr/AFX0yxAGi1oMzpfACc1Ak6O2E/rqf5lN30o=
+=JOOX
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
index 4bea868641de..4dc0a3338c8a 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.4 2009/01/13 20:41:28 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20080922.ebuild,v 1.5 2011/04/06 17:29:09 idl0r Exp $
 
 EAPI=1
 
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 x86"
 IUSE="+xv fbcon directfb mmx mmxext xinerama"
 
 RDEPEND=">=media-video/vdr-1.3.36
-	>=media-video/ffmpeg-0.4.9_pre1
+	>=virtual/ffmpeg-0.4.9_pre1
 	directfb? (
 		dev-libs/DirectFB
 		dev-libs/DFB++
@@ -78,7 +78,7 @@ pkg_setup() {
 
 	# Check for ffmpeg relying on libtheora without pkg-config-file
 	# Bug #142250
-	if built_with_use media-video/ffmpeg theora	&& \
+	if has_version virtual/ffmpeg[theora] && \
 		has_version "<media-libs/libtheora-1.0_alpha4"; then
 
 			eerror "This package will not work when using ffmpeg with"
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
index 7fd20b3f7927..36cd6bd40d43 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.3 2009/03/03 11:56:11 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090218.ebuild,v 1.4 2011/04/06 17:29:09 idl0r Exp $
 
 EAPI=1
 
@@ -25,7 +25,7 @@ KEYWORDS="~amd64 x86"
 IUSE="+xv fbcon directfb mmx mmxext xinerama"
 
 RDEPEND=">=media-video/vdr-1.3.36
-	>=media-video/ffmpeg-0.4.9_pre1
+	>=virtual/ffmpeg-0.4.9_pre1
 	directfb? (
 		dev-libs/DirectFB
 		dev-libs/DFB++
@@ -77,7 +77,7 @@ pkg_setup() {
 
 	# Check for ffmpeg relying on libtheora without pkg-config-file
 	# Bug #142250
-	if built_with_use media-video/ffmpeg theora	&& \
+	if has_version virtual/ffmpeg[theora] && \
 		has_version "<media-libs/libtheora-1.0_alpha4"; then
 
 			eerror "This package will not work when using ffmpeg with"
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
index 3d42f6a694a3..149f4d0e5e96 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.3 2009/11/21 19:42:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.5.0.20090630.ebuild,v 1.4 2011/04/06 17:29:09 idl0r Exp $
 
 EAPI="2"
 
@@ -29,9 +29,9 @@ IUSE="+xv fbcon directfb mmx mmxext xinerama"
 # Bug #142250
 RDEPEND=">=media-video/vdr-1.3.36
 	|| (
-		>=media-video/ffmpeg-0.4.9_pre1[-theora]
+		>=virtual/ffmpeg-0.4.9_pre1[-theora]
 		(
-			>=media-video/ffmpeg-0.4.9_pre1[theora]
+			>=virtual/ffmpeg-0.4.9_pre1[theora]
 			>=media-libs/libtheora-1.0_alpha4
 		)
 	)
diff --git a/media-plugins/vdr-softplay/Manifest b/media-plugins/vdr-softplay/Manifest
index bd863b4783b4..ef976a72d52e 100644
--- a/media-plugins/vdr-softplay/Manifest
+++ b/media-plugins/vdr-softplay/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ffmpeg-0.4.9_p20080326-new_header.diff 777 RMD160 5851a83ff5730347c0de1bc987d9419ddd507086 SHA1 8e51ed8b8d4acddbaee6f4dd3ac5c773129e4a60 SHA256 0c701258bc3232a0c7e43b148eb8e136a67c89142cd2b6056391440804820e67
 AUX ffmpeg-linking.diff 427 RMD160 828bd5d7d5473074fbc09cf2b5ca400e8d05d569 SHA1 8528abf46beeb182ad2098faa22c863753664fee SHA256 a002fa739392ac5686f81cadeb51e9e390970e1d7b60718c6c42ad1a6a3f3bf2
 AUX vdr-softplay-0.0.2.20080421-glibc-2.10.patch 2202 RMD160 13e05017e66cbf8d4f1c3365616ee3756e8a08b2 SHA1 79dba94bfedbaf8c7b4a93203c6ddce27312b645 SHA256 090e2bd8ae8a65ec7670fccbe2473f0a65fab48a6f6703d9175a52da70ed33b8
 DIST vdr-softplay-cvs-20080421.tar.bz2 33358 RMD160 67d42b1c6076f721b9cd1aec6b111ab9ed743c09 SHA1 772610b8a92cdd6e07dbf062b4adf7c1bd458959 SHA256 b370936bcaf47806b421f83120c9f3020840a9691c365fa6db2726feefd02741
-EBUILD vdr-softplay-0.0.2.20080421.ebuild 1217 RMD160 2d50b5c560dd3c970db4f34edd277ec01d7c23ab SHA1 99655affb706ea43cf8271c4c2922e54dbf7a44c SHA256 03d26734c9276af21cdb23e494ed26c5cfd8f01d5bae39090f71116c5e9e06fe
-MISC ChangeLog 1497 RMD160 bbd878dfa0b1beffb5bf1ef41050a7ef11c77966 SHA1 79d011cbea10ff05f0dec4786f1a3baf8281d02f SHA256 ee7cadbe5b2c2e8e36625b341a2cf57b9693fe6a07cdeea3080fd62ad2c1c96b
+EBUILD vdr-softplay-0.0.2.20080421.ebuild 1209 RMD160 8bc9d8b925e4ba809b3fafc6fa8417101f018656 SHA1 2e5abdeff1c642bc50d4a80b65864f98e4a947c0 SHA256 f4aada2aa903d7fb01eabe7419680341f36ce3f1694f0095b6074835f58e0034
+MISC ChangeLog 1626 RMD160 4f2190392947ecfcd8e3af53963cb46159f5485f SHA1 c10bbc0f0618faa23919e5828bea07e8ea36e5e0 SHA256 39197b2d3cbc20fff1afa527a578a44f24f859caa819e40e48441483ff7ed8cf
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBCAAGBQJNnKNDAAoJEMOx0zmdw4Z1RjoIAJjTiWUuWIKtItU5Dh2c3V1n
+C7PufBOn9o7TygqPiwaamxXVGsr67VzQZCP/IXKVR3S5uemACzvO/qm7zwHyYNMy
++O+90w/AnFDv0EDmKAcZxFxl4YCgAluW04jTbBGouQn4Q3i1aFFqhJCWHYNRyv4h
+kVYjf1Ln2bKvMVlKhitq4jhlJwwfa3EtDk7ijJl7IXzkRHd/I/rq6rvBsG/pwS4Y
+GrjzCkZCJe0aBfRL4r4zDq4dVcQqH+Foy7uOA0kcszM8SOscQ3bHVMFgZC50MVgT
+4r62dWN7Voxn2FZiSdnZQYIrG8DOeCUlts1KiaGJ0eIEPUkVfOp9e49ksu5GIyE=
+=ftVh
+-----END PGP SIGNATURE-----