Simpler checking of wxGTK USE flags, wrt bug #146756

Package-Manager: portage-2.1-r2

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index e247138644e6e848e55d1f0d45f8cf70eba1b77d..651600f098d8858e2e9a0c4f64c64e985c5051af 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.54 2006/09/06 18:46:00 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.55 2006/09/07 22:06:11 beandog Exp $
+
+  07 Sep 2006; Steve Dibb <beandog@gentoo.org> mkvtoolnix-1.7.0.ebuild:
+  Simpler checking of wxGTK USE flags, wrt bug #146756
 
 *mkvtoolnix-1.7.0 (06 Sep 2006)
 

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a14d77bbe7104709b9dc30338a253db19a69170f..8815e236c509bece27337d1250e244963315d019 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -9,14 +9,14 @@ EBUILD mkvtoolnix-1.6.5.ebuild 1580 RMD160 85f7c609870b4bc9d5fc88de79f191b76d60c
 MD5 2b4bce4ba60a04cf88abb25236d580b2 mkvtoolnix-1.6.5.ebuild 1580
 RMD160 85f7c609870b4bc9d5fc88de79f191b76d60cb9c mkvtoolnix-1.6.5.ebuild 1580
 SHA256 c21d954de91a675d8dea23833ada8f6c144aeef9c96d1574cb3d0ec8e4f6917b mkvtoolnix-1.6.5.ebuild 1580
-EBUILD mkvtoolnix-1.7.0.ebuild 1516 RMD160 746221032ce100b2e9fe1783f5a79346e8cfbb4b SHA1 96e9b2f66997f8ee322fbe072842e21cba32b5e9 SHA256 fa754e34a010f4cdf1a4231e314def4485d56a3e4e2d325357b0b4dcf276dea7
-MD5 e3a5e3b0a647a2ef349f0fdc58522e0d mkvtoolnix-1.7.0.ebuild 1516
-RMD160 746221032ce100b2e9fe1783f5a79346e8cfbb4b mkvtoolnix-1.7.0.ebuild 1516
-SHA256 fa754e34a010f4cdf1a4231e314def4485d56a3e4e2d325357b0b4dcf276dea7 mkvtoolnix-1.7.0.ebuild 1516
-MISC ChangeLog 8810 RMD160 92bb9c260b0b9b3ac252aa6f7105a4d0186f10fc SHA1 c318a2fef1edb609b92ccefde1738888aa07a194 SHA256 040398ba482e1e070f31d18bf0ceba91c26c1758e59052cd94562df85c77c833
-MD5 745683db91d94f2404229003d3f39ff6 ChangeLog 8810
-RMD160 92bb9c260b0b9b3ac252aa6f7105a4d0186f10fc ChangeLog 8810
-SHA256 040398ba482e1e070f31d18bf0ceba91c26c1758e59052cd94562df85c77c833 ChangeLog 8810
+EBUILD mkvtoolnix-1.7.0.ebuild 1568 RMD160 2988488eafa60032b605fff8f6d80e924c497996 SHA1 89100bd1d5b061f56b5ae9d04cf79c93687c28f9 SHA256 6b8caaf3ed14969480beedbcbda086ac2a358ff955b839b394bd5b5f0f0397c1
+MD5 45296401b702a348ba7e02bbbab9a779 mkvtoolnix-1.7.0.ebuild 1568
+RMD160 2988488eafa60032b605fff8f6d80e924c497996 mkvtoolnix-1.7.0.ebuild 1568
+SHA256 6b8caaf3ed14969480beedbcbda086ac2a358ff955b839b394bd5b5f0f0397c1 mkvtoolnix-1.7.0.ebuild 1568
+MISC ChangeLog 8938 RMD160 3f3423ea4fd7713a9fb1f31c96e3f7cca0fd6c73 SHA1 042c0a5f85b1c679dc67d5055f7a2c44ba6e3628 SHA256 8f87c9f76a5aca0d468df393fa0767ad767ef259ada528b13831e0a1eb6201b8
+MD5 7e8aec03676da03455c8e0b875431e27 ChangeLog 8938
+RMD160 3f3423ea4fd7713a9fb1f31c96e3f7cca0fd6c73 ChangeLog 8938
+SHA256 8f87c9f76a5aca0d468df393fa0767ad767ef259ada528b13831e0a1eb6201b8 ChangeLog 8938
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253

diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
index d9e5a3e0205276c28524a76359bbc3a52a42c5b2..7c67a9f01f70aae8d9f2697ccc8d35e29aa75102 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild,v 1.1 2006/09/06 18:46:00 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.7.0.ebuild,v 1.2 2006/09/07 22:06:11 beandog Exp $
 
-inherit eutils wxwidgets flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -25,9 +25,11 @@ DEPEND=">=dev-libs/libebml-0.7.7
        lzo? ( dev-libs/lzo )"
 
 pkg_setup() {
-       WX_GTK_VER="2.6"
        if use wxwindows; then
-               need-wxwidgets gtk2 || die "You must compile wxGTK with X useflag."
+               if ! built_with_use x11-libs/wxGTK X; then
+                       eerror "You must compile wxGTK with X useflag."
+                       die "Fix the USE flags on wxGTK and re-merge"
+               fi
                # wxWidgets does not like --as-needed
                filter-ldflags -Wl,--as-needed --as-needed
        fi