Adding a patch to force the use of wxgtk 2.6, thanks to Philantrop <wk@mailstation...

Package-Manager: portage-2.1.2_rc2

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index ecfbf1167c1562a21bef19b3b08f37aad5da9848..9cf6f808ee110436d19ccd838c830ed82379dbcb 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2006/11/18 10:31:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.65 2006/11/19 12:37:08 aballier Exp $
+
+  19 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/mkvtoolnix-1.8.0-wxgtk.patch, mkvtoolnix-1.8.0.ebuild:
+  Adding a patch to force the use of wxgtk 2.6, thanks to Philantrop
+  <wk@mailstation.de>, bug #155600
 
   18 Nov 2006; Alexis Ballier <aballier@gentoo.org> mkvtoolnix-1.8.0.ebuild:
   Adding missing libpcre dep wrt bug #155553

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 513835c4576e4076e1433c9c73e68965eb8ff08d..ba4d24bba836c5feb6d5e9b1b49e00e10796f062 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,20 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mkvtoolnix-1.8.0-wxgtk.patch 713 RMD160 df59654bcdeefb9be382f219a7fa66ae55059a5a SHA1 7bbda35880f9147bd75e661d2a42a632314b50d4 SHA256 363d1de512917a68f83cd546e09f0cc67b2eca6b89feccc48ee8fddd4727ab8e
+MD5 8fef133877898630fa0e75f37735cdbe files/mkvtoolnix-1.8.0-wxgtk.patch 713
+RMD160 df59654bcdeefb9be382f219a7fa66ae55059a5a files/mkvtoolnix-1.8.0-wxgtk.patch 713
+SHA256 363d1de512917a68f83cd546e09f0cc67b2eca6b89feccc48ee8fddd4727ab8e files/mkvtoolnix-1.8.0-wxgtk.patch 713
 DIST mkvtoolnix-1.7.0.tar.bz2 655481 RMD160 0c90a44f0b6df466a4799ed8fa2f99791059c7fb SHA1 c705af2778faac3e5244015646e331e811500b26 SHA256 da8e5654bc511e23512fc23bba587ccd70a7096d554d6eee290b7985fe057219
 DIST mkvtoolnix-1.8.0.tar.bz2 665809 RMD160 c0cd5a01c7cb9464418d029202367d7e07c958a2 SHA1 febc8cb8d3783b3d14343bb6dacc61d31a499765 SHA256 e96a0fd4af265adceb3903c570e886ea6151dcc31eedfe6b6de613549798c693
 EBUILD mkvtoolnix-1.7.0.ebuild 1388 RMD160 8fac0eb964177faafe2bdd1650284e558920e5f0 SHA1 9618c5686aae412607823ab180a0fe58546814c0 SHA256 8f83ee409227ec6fa124d29485792f51dd8f4d4bfc672782e3287230c060500a
 MD5 f37e3fe32f9e238539f24cfec8a8822d mkvtoolnix-1.7.0.ebuild 1388
 RMD160 8fac0eb964177faafe2bdd1650284e558920e5f0 mkvtoolnix-1.7.0.ebuild 1388
 SHA256 8f83ee409227ec6fa124d29485792f51dd8f4d4bfc672782e3287230c060500a mkvtoolnix-1.7.0.ebuild 1388
-EBUILD mkvtoolnix-1.8.0.ebuild 1401 RMD160 6db658ea95520ae6030e00a8dccde3283e8b2ee9 SHA1 bf649f44628a696bd3560c4bcc39df822d5bf2e5 SHA256 cbb98058e0586e48ef8474a8e9f85248a3156b478c73abda0b12fdd20d098079
-MD5 2501b875aa1ed2daf0b17aceabc1e3a0 mkvtoolnix-1.8.0.ebuild 1401
-RMD160 6db658ea95520ae6030e00a8dccde3283e8b2ee9 mkvtoolnix-1.8.0.ebuild 1401
-SHA256 cbb98058e0586e48ef8474a8e9f85248a3156b478c73abda0b12fdd20d098079 mkvtoolnix-1.8.0.ebuild 1401
-MISC ChangeLog 9975 RMD160 78e2f59e70e37704f14a78d846a93d6b1cf377ca SHA1 ed0f7e2e58bd9b853bf69cafc207ba9cbce76c28 SHA256 2ae4279d239c67660470f0db8ce5ca11c48b861feab9c8632778f0e13c1ecf49
-MD5 12a6ee6fd218ccfc1099a6f97356e55e ChangeLog 9975
-RMD160 78e2f59e70e37704f14a78d846a93d6b1cf377ca ChangeLog 9975
-SHA256 2ae4279d239c67660470f0db8ce5ca11c48b861feab9c8632778f0e13c1ecf49 ChangeLog 9975
+EBUILD mkvtoolnix-1.8.0.ebuild 1483 RMD160 618c36a0e3cf7f904373ddc1990ecde27b02304f SHA1 ee040662b0409bef48aac65233344c47f15de9b7 SHA256 026c48981f4ea6a4d4436b9dd9e42453e4a93744d8ee974456a845ae41c853f7
+MD5 0b062d449b3f65f066b8f2ec4757fe39 mkvtoolnix-1.8.0.ebuild 1483
+RMD160 618c36a0e3cf7f904373ddc1990ecde27b02304f mkvtoolnix-1.8.0.ebuild 1483
+SHA256 026c48981f4ea6a4d4436b9dd9e42453e4a93744d8ee974456a845ae41c853f7 mkvtoolnix-1.8.0.ebuild 1483
+MISC ChangeLog 10196 RMD160 4bac4be6f7a4eae861a9fcf3f06f70cb45f1e9c1 SHA1 78eb0b8859c44cdd0feb4e211c87c32dc14e86a9 SHA256 46e0a54ce75589591eb10900c48cda3ee1182e9fe9a9a6634e7bd09fdab1455b
+MD5 4358ca32b59bd820320e5f09f5244a9d ChangeLog 10196
+RMD160 4bac4be6f7a4eae861a9fcf3f06f70cb45f1e9c1 ChangeLog 10196
+SHA256 46e0a54ce75589591eb10900c48cda3ee1182e9fe9a9a6634e7bd09fdab1455b ChangeLog 10196
 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf
 MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253
 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253
@@ -28,7 +32,7 @@ SHA256 da8bc03ec9ab1cdc96f1c58d7a6c0d570f9201e98b0d947de1aa1fde9302c6e0 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFXuCQvFcC4BYPU0oRAp+/AJ4/5LGIU8gfjZU4dZWVXlVgkvKJlgCgmv8E
-yWTYWmpZXQ0roZ35O7rURcI=
-=dnov
+iD8DBQFFYE9mvFcC4BYPU0oRAj1jAJ9yW9hPc5H/uaOSvYIQoivHGesyDQCfXFB+
+GNBs/LaAwKQ2ZPxPis8g0wI=
+=5Rzf
 -----END PGP SIGNATURE-----

diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-1.8.0-wxgtk.patch b/media-video/mkvtoolnix/files/mkvtoolnix-1.8.0-wxgtk.patch
new file mode 100644 (file)
index 0000000..2e616f3
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-1.8.0-wxgtk.patch
@@ -0,0 +1,18 @@
+--- mkvtoolnix-1.8.0/configure.old     2006-11-19 11:58:59.000000000 +0100
++++ mkvtoolnix-1.8.0/configure 2006-11-19 11:59:31.000000000 +0100
+@@ -10284,13 +10284,13 @@
+ 
+ 
+   wxw_ver_req_major=2
+-  wxw_ver_req_minor=4
++  wxw_ver_req_minor=6
+   wxw_ver_req_micro=0
+   wxw_min_ver=$wxw_ver_req_major.$wxw_ver_req_minor.$wxw_ver_req_micro
+ 
+   if test x"$enable_gui" = x"yes" -o x"$enable_gui" = "x"; then
+     # Extract the first word of "wx-config", so it can be a program name with args.
+-set dummy wx-config; ac_word=$2
++set dummy wx-config-2.6; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_WX_CONFIG+set}" = set; then

diff --git a/media-video/mkvtoolnix/mkvtoolnix-1.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-1.8.0.ebuild
index aaa334ffa21869a3b63aa6eedae62f1a23a97255..797288888b7e23971e64a076b288ddac48ec49e0 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-1.8.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # 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.8.0.ebuild,v 1.2 2006/11/18 10:31:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-1.8.0.ebuild,v 1.3 2006/11/19 12:37:08 aballier Exp $
 
 inherit eutils wxwidgets flag-o-matic
 
@@ -32,6 +32,13 @@ pkg_setup() {
        fi
 }
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}/${P}-wxgtk.patch"
+}
+
 src_compile() {
        # Don't run strip while installing stuff, leave to portage the job.
        econf \