Upstream fix for building qt4 gui without wxwindows

Package-Manager: portage-2.1.2.2

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index aa13b4b9ba5d3c00ff705bd839f4b21a148590f1..dad1a47fe44038e54ebe45e0c4740abdc2b4e564 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.73 2007/03/13 19:55:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.74 2007/03/15 23:20:08 aballier Exp $
+
+  15 Mar 2007; Alexis Ballier <aballier@gentoo.org>
+  files/mkvtoolnix-2.0.2-qt4.patch, mkvtoolnix-2.0.2.ebuild:
+  Upstream fix for building qt4 gui without wxwindows
 
   13 Mar 2007; Alexis Ballier <aballier@gentoo.org>
   +files/mkvtoolnix-2.0.2-qt4.patch, mkvtoolnix-2.0.2.ebuild:

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index ca92ecbd6307c8ea2ed5658c0c35b5ee97497880..b93c6e76ea1e017d4add82af99b96e87b616aed6 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX mkvtoolnix-2.0.2-qt4.patch 497 RMD160 12acefb7108b2731a78e6b06b8ae5da8106f9fd5 SHA1 a1b6eab033a2f79cf15a02f8d7e3d403c161b10b SHA256 c24e0618a6515831337bd099eb641d077c1cf067a3c8d1632459cd3c4ab2b09f
-MD5 35b4fd6e37ec1fedac0ad27ccbc6a138 files/mkvtoolnix-2.0.2-qt4.patch 497
-RMD160 12acefb7108b2731a78e6b06b8ae5da8106f9fd5 files/mkvtoolnix-2.0.2-qt4.patch 497
-SHA256 c24e0618a6515831337bd099eb641d077c1cf067a3c8d1632459cd3c4ab2b09f files/mkvtoolnix-2.0.2-qt4.patch 497
+AUX mkvtoolnix-2.0.2-qt4.patch 2090 RMD160 618d01138a0de16444011da4156c8485295e65d7 SHA1 eaf349639da9ad1080c5e9697f034477a2e42095 SHA256 4bac2cfc5b557d373cc82ef8b1c8f6372aa2901f6a636d695165cd736be81c8e
+MD5 7b267513b6887e45de515424a122d7b7 files/mkvtoolnix-2.0.2-qt4.patch 2090
+RMD160 618d01138a0de16444011da4156c8485295e65d7 files/mkvtoolnix-2.0.2-qt4.patch 2090
+SHA256 4bac2cfc5b557d373cc82ef8b1c8f6372aa2901f6a636d695165cd736be81c8e files/mkvtoolnix-2.0.2-qt4.patch 2090
 DIST mkvtoolnix-1.8.1.tar.bz2 665710 RMD160 e3b6f61cd3ab73b679bd8fe82a6d3aad5bfe06e9 SHA1 2e5f9f1ea352a4cd8d2e6b195cb06fe21286ef46 SHA256 2e43be38e8d7c4eff6fe09973b6fccb44e1aba83f93d1046f83cd10061969578
 DIST mkvtoolnix-2.0.0.tar.bz2 739166 RMD160 400a355646a04cd1ba0c30f2ca1536893e6bf508 SHA1 42f12c238e399eca8327d1059ed344c46492ca8c SHA256 73c1c60f08ac7e1409952eeff6e52a69ec76b11220dbb161dfdc1d34a66c3136
 DIST mkvtoolnix-2.0.2.tar.bz2 756652 RMD160 01ea703dfe6e15f9cf121fa0752d059b01a79c15 SHA1 6a4b1e62786fb6e5f426fe3a6ddc667034868212 SHA256 1fce872d1c3ee29ee583dae7c2fb4052343099533bfdd26f1b18f3c6cb2e9473
@@ -16,14 +16,14 @@ EBUILD mkvtoolnix-2.0.0.ebuild 1560 RMD160 81d8fc92f4901828ce11b3e9f28305cc8ec08
 MD5 6d678827a4f5e4a034d11087216f4a48 mkvtoolnix-2.0.0.ebuild 1560
 RMD160 81d8fc92f4901828ce11b3e9f28305cc8ec08f90 mkvtoolnix-2.0.0.ebuild 1560
 SHA256 c8b05f574fed2fe238f4b67dbff9889daf6168df29747b349b69952962dc496b mkvtoolnix-2.0.0.ebuild 1560
-EBUILD mkvtoolnix-2.0.2.ebuild 1687 RMD160 eb9dd0c27c882ac5502bc470606f8e09a5d42af2 SHA1 d756f366b58174d3ab99c531729d1689f80bc09c SHA256 ed19f6cef2473cadf3b584926f28ad3456d98b0fbd61b83da6d8de585cc574db
-MD5 4616fec9389116ccb5586625b4258244 mkvtoolnix-2.0.2.ebuild 1687
-RMD160 eb9dd0c27c882ac5502bc470606f8e09a5d42af2 mkvtoolnix-2.0.2.ebuild 1687
-SHA256 ed19f6cef2473cadf3b584926f28ad3456d98b0fbd61b83da6d8de585cc574db mkvtoolnix-2.0.2.ebuild 1687
-MISC ChangeLog 11317 RMD160 8434bf4d51657e0ccbbf79ffaa68bd1c67824565 SHA1 407207ba62c720febf8b9e52b921a25d0ce21674 SHA256 9a933d5cb7e72eea91ebc0c6f538d72618990d51c5b6ebf57ae7818199191769
-MD5 b6a161494a1e2f6515c9767c39690962 ChangeLog 11317
-RMD160 8434bf4d51657e0ccbbf79ffaa68bd1c67824565 ChangeLog 11317
-SHA256 9a933d5cb7e72eea91ebc0c6f538d72618990d51c5b6ebf57ae7818199191769 ChangeLog 11317
+EBUILD mkvtoolnix-2.0.2.ebuild 1669 RMD160 237089799aa69e347474bcaedaa69cad476c44c9 SHA1 a9a781f7c7ed8f62ffdc0c1a8be88d8b30f1edfa SHA256 dddeea97484d080d8700de075d5e3aa8ed244bf5824b17ab7cfc01de156a7550
+MD5 2ef64965da2176c49641ef808146409c mkvtoolnix-2.0.2.ebuild 1669
+RMD160 237089799aa69e347474bcaedaa69cad476c44c9 mkvtoolnix-2.0.2.ebuild 1669
+SHA256 dddeea97484d080d8700de075d5e3aa8ed244bf5824b17ab7cfc01de156a7550 mkvtoolnix-2.0.2.ebuild 1669
+MISC ChangeLog 11485 RMD160 7c38a5878e4022ba54b89b666df634cda66c0705 SHA1 cbf9b369a32704d3d1d6058fcc1fe158e39ac95e SHA256 dac8c5ec123423f1517c9d9e17988845321b46fdd9eff1ebde8da0e4c42ee8d4
+MD5 d1d877bf65fc431a35b3254918f5a6d8 ChangeLog 11485
+RMD160 7c38a5878e4022ba54b89b666df634cda66c0705 ChangeLog 11485
+SHA256 dac8c5ec123423f1517c9d9e17988845321b46fdd9eff1ebde8da0e4c42ee8d4 ChangeLog 11485
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253
@@ -40,7 +40,7 @@ SHA256 52ea89bcaec4323be7c8410d165eb681158657d1f8ff7640946db6a3b3848457 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9wHGvFcC4BYPU0oRAp1gAKCVuhTJJ4+yOj6iQhfXdP4hX6s0uwCeOJFx
-IkBE88t80hMibeUbmp6mWLQ=
-=Ha6A
+iD8DBQFF+dR3vFcC4BYPU0oRAjyzAJ486RqWlEZ39ZYTrYtWBL/62gJYbwCcCiZ2
+PRv0YTRRfJm4bGFPj0CsxVw=
+=Xwn/
 -----END PGP SIGNATURE-----

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch b/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch
index fcdde62e2ea611cd28d34eb514c19ae76ec5264a..2a12015ce28f21d77fa49a5c852c08b26a7e6512 100644 (file)
--- a/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch
@@ -1,14 +1,68 @@
-Index: mkvtoolnix-2.0.2/configure.in
+Index: configure.in
 ===================================================================
---- mkvtoolnix-2.0.2.orig/configure.in
-+++ mkvtoolnix-2.0.2/configure.in
-@@ -1018,8 +1018,7 @@ AC_ARG_ENABLE([qt],
+--- configure.in       (revision 3516)
++++ configure.in       (working copy)
+@@ -935,9 +935,13 @@
+   AC_ARG_ENABLE([gui],
+     AC_HELP_STRING([--enable-gui],[compile mkvinfo's GUI and mmg (yes)]))
+ 
++  AC_ARG_ENABLE([wxwidgets],
++    AC_HELP_STRING([--enable-wxwidgets],[compile the wxWidgets version of the GUIs (yes)]))
++
+   wxw_min_ver=2.6.0
+ 
+-  if test x"$enable_gui" = x"yes" -o x"$enable_gui" = "x"; then
++  if test '(' x"$enable_wxwidgets" = xyes -o x"$enable_wxwidgets" = x ')' -a \
++    '(' x"$enable_gui" = xyes -o x"$enable_gui" = x ')'; then
+     AC_ARG_WITH(wx_config,
+       AC_HELP_STRING([--with-wx-config=prog],
+         [use prog instead of looking for wx-config]),
+@@ -985,7 +989,7 @@
+           AC_MSG_RESULT($wxwversion ok)
+           have_wxwindows=yes
+           USE_WXWIDGETS=yes
+-          opt_features_yes="$opt_features_yes\n   * GUIs"
++          opt_features_yes="$opt_features_yes\n   * GUIs (wxWidgets version)"
+         else
+           AC_MSG_RESULT(no: test program could not be compiled)
+         fi
+@@ -1000,7 +1004,7 @@
+   fi
+ 
+   if test x"$have_wxwindows" != "xyes" ; then
+-    opt_features_no="$opt_features_no\n   * GUIs"
++    opt_features_no="$opt_features_no\n   * GUIs (wxWidgets version)"
+   fi
+ 
+ AC_SUBST(WXWIDGETS_CFLAGS)
+@@ -1014,7 +1018,7 @@
+ dnl
+ 
+ AC_ARG_ENABLE([qt],
+-  AC_HELP_STRING([--enable-qt],[compile the Qt version of the GUIs]))
++  AC_HELP_STRING([--enable-qt],[compile the Qt version of the GUIs (no)]))
  
  qt_min_ver=4.0.0
  
--if test x"$enable_qt" = "xyes" -a \
--  '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
-+if test x"$enable_qt" = "xyes"; then
-   dnl Find moc.
-   AC_ARG_WITH(moc,
-     AC_HELP_STRING([--with-moc=prog],[use prog instead of looking for moc]),
+@@ -1158,7 +1162,7 @@
+      AC_DEFINE(HAVE_QT, 1, [Define if Qt is present])
+      have_qt=yes
+      USE_QT=yes
+-     opt_features_yes="$opt_features_yes (Qt version)"
++     opt_features_yes="$opt_features_yes\n   * GUIs (Qt version)"
+      AC_MSG_RESULT(yes)
+     else
+       AC_MSG_RESULT(no: test program could not be compiled)
+@@ -1166,6 +1170,11 @@
+   fi
+ fi
+ 
++if test x"$have_qt" != "xyes" ; then
++  opt_features_no="$opt_features_no\n   * GUIs (Qt version)"
++fi
++
++
+ AC_SUBST(MOC)
+ AC_SUBST(UIC)
+ AC_SUBST(QT_CFLAGS)
+

diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild
index bd356eef5223ea190e8faf7871265b1ab1e94513..1c8e6d7ac55990e2a885f33056146b505a8bb2c8 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild,v 1.2 2007/03/13 19:55:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild,v 1.3 2007/03/15 23:20:08 aballier Exp $
 
 inherit eutils wxwidgets flag-o-matic qt4 autotools
 
@@ -37,10 +37,8 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
 
-       if use qt4; then
-               epatch "${FILESDIR}/${P}-qt4.patch"
-               eautoreconf
-       fi
+       epatch "${FILESDIR}/${P}-qt4.patch"
+       eautoreconf
 }
 
 src_compile() {
@@ -48,7 +46,7 @@ src_compile() {
        econf \
                $(use_enable lzo) \
                $(use_enable bzip2 bz2) \
-               $(use_enable wxwindows gui) \
+               $(use_enable wxwindows wxwidgets) \
                $(use_enable debug) \
                $(use_with flac) \
                $(use_enable qt4 qt) \