Fix wxsvg dependency to account for the removal of the ffmpeg USE flag in

later versions.
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

3 files changed, 22 insertions, 8 deletions

diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index bec46178c2a4..9d5288db10f8 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvdstyler
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.39 2009/10/14 07:16:49 dragonheart Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.40 2010/02/17 05:51:05 dirtyepic Exp $
+
+  17 Feb 2010; Ryan Hill <dirtyepic@gentoo.org> dvdstyler-1.7.4.ebuild:
+  Fix wxsvg dependency to account for the removal of the ffmpeg USE flag in
+  later versions.
 
 *dvdstyler-1.7.4 (14 Oct 2009)
 
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 1782e4b31b81..5d31c23ad0ef 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX dvdstyler-1.7.2-skipxmlvalidation.patch 623 RMD160 a836ceffdfbf625b2d3c75585ad98eb8e6ecf4bb SHA1 7580daa5da0efc89f82b36837f2a55352ce79d31 SHA256 5e620ae9b3e9bd3491c3e6e2fab13622abd11d6bd433ab94fd8b9adbe8a3e020
 AUX dvdstyler-1.7.3_beta3_p1-link_to_wxgtk_adv.patch 562 RMD160 1d144d5c002a32fd988f592200c38aee7aaadcbd SHA1 e1c7e2eac69b19fcd007360c39c89c8f9f2cb2cd SHA256 5a7c17c60a35393fdfcaf19ada8f8e62c56ddef690127f020928e41e9b45f7f7
 AUX dvdstyler-1.7.4-autoconf.patch 3058 RMD160 d3f3263edfb55729a6e8ecb83b00126e328fa25b SHA1 5a386c3a8ecd6afb58cc19653e4a65f3b46b2f2d SHA256 b85ca996bb831f79d2e61497d09f19313db097207935d3727f145354f8108143
@@ -7,7 +10,14 @@ DIST DVDStyler-1.7.4.tar.bz2 1652556 RMD160 e8d769aad270b391d814ef83cba0e951fe18
 DIST DVDStyler-1.7.4rc1.tar.bz2 1647217 RMD160 2f85415e685108413cdbc4549bd5c9041c147591 SHA1 ad2099776a7b4d07f6b78057ada5310022677859 SHA256 bc89c436eab0ad5018901c2ee8bbde8d15efe5ad5463ee7356fd4c66b7a5a64f
 EBUILD dvdstyler-1.7.2.ebuild 1400 RMD160 dad81acc10cf1a0e3397afbdb66229216f0d5b74 SHA1 59300cd8728d83700ca2f9c51245e5fbe9672f82 SHA256 48c503494159cfd1d82248cea9f66dd94b4491fdba69693b88ad93afbcd350a9
 EBUILD dvdstyler-1.7.3_beta3_p1.ebuild 1579 RMD160 a2e4ba734e0d2c2c6e8e9e927a3bcf700df3dba5 SHA1 b468288068cc04a0fdc7789e5c685e89bb309a31 SHA256 3635c707cfd6e8420275cc308f704a46b87f61bb2381bc5136bc19b73cc3948a
-EBUILD dvdstyler-1.7.4.ebuild 1392 RMD160 ec193c6a18c7797e7ad62a4ce2f0f43b7f076c1b SHA1 e411afb557320a6c9f94fb367275f710fe2ee847 SHA256 511302f3041d657b8660be3916a8edf37d790109c07911433b2d38fd1034c7b2
+EBUILD dvdstyler-1.7.4.ebuild 1425 RMD160 c6348e01be6f8472afb34fde7b41f67ed56a6679 SHA1 5dba123a38a3d6a1d75b45fb9e36545fdbe33abb SHA256 c6348212f1243eec4ffe56aa47a030443494929f5cf24f5f687bf8b85f31b5f4
 EBUILD dvdstyler-1.7.4_rc1.ebuild 1360 RMD160 c2233b71d730cfa2178fbcb17996644c7a205c2b SHA1 b45be81aacbec7418452e0eb1f65449f98011010 SHA256 b4985b71db0414a17f2e7172f9af1cdba7cdd36027406fc1c1087a0da62358dc
-MISC ChangeLog 7702 RMD160 bc3f03da7291463421d42fe72f23b44fb64da5ad SHA1 f201016efb450370c19757f8fb67cb0ee86d8081 SHA256 047265e2124a8be03da8a89d9af254a9e70ac155964d84a69498d8a791872cde
+MISC ChangeLog 7867 RMD160 5ab345d3c63fcd547839f7649f1dc85faddd1bc6 SHA1 01340f90afbb8be69ad4a8f19fe728d4b2c55316 SHA256 36427732e465ffb2e46a1095bea9af101059507337a41196ccc9195b695c555a
 MISC metadata.xml 253 RMD160 4017dbee50ab0fca6eee1ae8103bdcba5e3ec08c SHA1 eba5ea7101cd9bb7d2e8acbd28507cd49268d8b2 SHA256 4d56e96fb54c7825dbf341dbac673b7bbae83b48ee32352091126c632ac09239
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkt7hFQACgkQiqiDRvmkBmJ+MQCfXgM1XqXSzGzAcmP/yV2xx2zQ
+3lMAoLeHlubCNaarkQnl/SDrCl9qu6X5
+=W2/V
+-----END PGP SIGNATURE-----
diff --git a/media-video/dvdstyler/dvdstyler-1.7.4.ebuild b/media-video/dvdstyler/dvdstyler-1.7.4.ebuild
index 552ca4299221..ecaad5d25b26 100644
--- a/media-video/dvdstyler/dvdstyler-1.7.4.ebuild
+++ b/media-video/dvdstyler/dvdstyler-1.7.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.7.4.ebuild,v 1.1 2009/10/14 07:16:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-1.7.4.ebuild,v 1.2 2010/02/17 05:51:05 dirtyepic Exp $
 
 EAPI=2
 inherit autotools wxwidgets eutils
@@ -18,8 +18,8 @@ IUSE="debug gnome"
 
 COMMON_DEPEND=">=media-video/ffmpeg-0.5[encode]
 	>=media-video/xine-ui-0.99.1
-	x11-libs/wxGTK:2.8
-	>=media-libs/wxsvg-1[ffmpeg]
+	x11-libs/wxGTK:2.8[X]
+	|| ( >=media-libs/wxsvg-1.0.2 >=media-libs/wxsvg-1[ffmpeg] )
 	>=media-libs/libexif-0.6.16
 	gnome? ( >=gnome-base/libgnomeui-2 )"
 RDEPEND="${COMMON_DEPEND}