Point directly to Qt5 tools to fix bug #532600, and actually build experimental mkvto...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index 69d53c7fe3d35479648059c69ecdcca7466c7174..d8915362a2620fd5455d9c671377ae237c902845 100644 (file)
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.213 2015/01/19 20:26:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.214 2015/01/31 14:27:20 yngwin Exp $
+
+  31 Jan 2015; Ben de Groot <yngwin@gentoo.org> mkvtoolnix-7.5.0.ebuild:
+  Point directly to Qt5 tools to fix bug #532600, and actually build
+  experimental mkvtoolnix-gui.
 
   19 Jan 2015; Hans de Graaff <graaff@gentoo.org> mkvtoolnix-7.4.0-r1.ebuild,
   mkvtoolnix-7.5.0.ebuild:

diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 22869f67634027da1a80feed5953a444b7b82294..8937043cffdfacb14d39070d54593fe6f11f87d7 100644 (file)
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -10,13 +10,25 @@ DIST mkvtoolnix-7.5.0.tar.xz 5266996 SHA256 17baf799c7a047c9d7026db237b7e7020296
 EBUILD mkvtoolnix-6.6.0.ebuild 2124 SHA256 d85a5cf968972ea40fe08ae64e5c86a18e6ccbd62787a908f4e30524c5701d86 SHA512 b3c22836b30bdc1bfd60c4b4969ddfa09fa11fb57f3e6184a68ca4f398b4cead7d72cdb5df7394996c95e23b6c83a2373c838efda4d3b07d9c4064687dd70981 WHIRLPOOL 1dbcb589914de13a7b5631350abaa185f281ee47a309cad0c7816addbcbd07b8fbc6fd04f91d960072a7739e352bb5cd4dce634b4d676393a41af2462ced9009
 EBUILD mkvtoolnix-7.3.0.ebuild 2829 SHA256 2a5d60dbd2ae6e8d6d80a5bbd9fe528111d783e3e85fe8f38f32c3fcc5355aed SHA512 5886347781106926d94ef6fa4106692ecd299f9b491429bbccef6344eae9e364a40d72393420c437f4001242ce91a6246c1bae1813f26d26eb81663c8c3574d5 WHIRLPOOL 7c70d5e5ac4b965e1faadc00858c3fdd7a520fa105d2f9a3bdbd11fefb47eadac3278299a4b109187977821a33e9d06d47e405ec401d3368876d15fe2287f05e
 EBUILD mkvtoolnix-7.4.0-r1.ebuild 2822 SHA256 1da6ab90ee31b8e6763446f099467fce1a22061f00a9caadfc2abd28c84aaadb SHA512 52eef643f6a65e367914c78ba6523cb4f05b5e0628b3d99d6212c03d219a823de495d73529124b1459fc959c60977b5d271d5d1ec84a5da0c0ed4f3e180625b7 WHIRLPOOL 01b165eb0fffe95f88b9bf32b5efcd40e0a5bc1913f1d1848569359cfdb72c50afb5904a75878aea9f5c8fc654f8714fef795820563de01c704ed5f8ffe07125
-EBUILD mkvtoolnix-7.5.0.ebuild 2826 SHA256 f1bcb60a7a6a14b2b34712d2369e4006149f559a5cc27792c8060faa3fa399ed SHA512 2a031dda06a0f626de23ed212fbc11aee7c4541eedc6c922f1c3417e25109f5975b585e42bf0d2852086a3f6254e1976a0d98553bb11e7ff5f2c6371811e9b35 WHIRLPOOL b0fdd924e44b8c695b9b9399cf94de4ad75120a554d8f952d8089196e92107a8df9896fdcd333b07c89896c85d7a0467068613dda089cf8e4cf70c915b7646e6
-MISC ChangeLog 31351 SHA256 964f43941ff269ce3d0d1d638e77300f97a31ea2082bd3cfa2f159ea8c9f5d2e SHA512 0a901708f7bd818b2df66ea0424b8b18d10c58bea5901fcae1623ddbaf9545fdb2827828e8950f57b590ec805de99692f27cfbe26d55d221b10ace2d68b774b0 WHIRLPOOL ced017947a372ec2fd7d0e2d67705bc6a8379772ec6ba014d001f35932fba2f48d3964a5ed5f3c99d01d1948ef77969f6bfeaafa828de77dd629d76113011fb2
+EBUILD mkvtoolnix-7.5.0.ebuild 3107 SHA256 b1d5b0b8c4571831ab308572a18d8ca07881fb98f97e526faeb32b937e6994f1 SHA512 3f7d5200b7c29957da8336197d96e5748b40cdb0a112e964046cde96df3de6b291543b2819c9469d94d81c210359bbd91dd27fa23f68e28c9e23509c32dbef45 WHIRLPOOL e5ec09632f46b736599bb617601d879e95195294d3b6f2526bf3d8c5a5b4cf53a40d94a16f490cd289043f11ff1e2bd0692ff2f756d36b8f85991812e0a07df4
+MISC ChangeLog 31525 SHA256 48d9a1199bb80134e429fb86550e2013e69fdbaec9d157a8af2b9563d5a6a5f6 SHA512 f9a58ef299c865e824dff68e8c7a7013d7216d92769b2b256a82dc53239bdc7fb71873b81395f794ad19161e6f03585ada6ac54a87abae2f89bc898b5ae57863 WHIRLPOOL 0b1f0ff2feb9d3982808437529f95ca4a79a2e0b2ddef17caca8dfed133c5d7bbf5e0f310b07ee0e6ab6cf3eb9a096cad19e23fe38acbbfaca75e1d6a21f44e6
 MISC metadata.xml 158 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 SHA512 0bfb0265d3c42ba1958f8e589316112dba381e7701773668443cf0afe678a8d80675392efb2713e3d376b85b03a5b2bfb390c94411e0c6cf8a223b26aa9a04ca WHIRLPOOL 447b37b9f46058b1adc8d30a57460a8ab6b5ec149870c5ea385956cae9dd10a99b36e63526f2d13cabf13a4185f8b4e22a78156ab141a6e397bba298ab7efb2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iF4EAREIAAYFAlS9aIEACgkQiIP6VqMIqNdkGgD6AxLrI5vevbtzUbtexaJLKtKu
-S1QI0PanxtR2/JQcZIcA/3u8FyGfmC4knvUtTnV5bLFC/OhFxurcWWyoQ9ENfP90
-=vkgT
+iQJ8BAEBCABmBQJUzOZRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOvEoP/2OvjeEYbXaYI6HiB/f0jqb/
+DnimR/1eS01LSGqr3Z/NVOmVzLtvSO7gDNdZW2WGUfMzeP7fy4M7Z7cyYSBILx8U
+cgk7iPkQtDP+f4ZRRPRShKJxYzyZj17VzUoD4W/e21WWMiOgvQbuSqmzT+Vq1Ks9
+mjaGFWx8RTwHkbH8tRlvHzwOcGkjAmVyzVQ4V55KqVIUl6dxFhyVNKY8b88b5Oby
+dU3jjP7C+FxVlAYfMQOD0tgFYc5jA/YtupUH+bA6PQS9ZW4LXODNhPd2UZhjMJZl
+Tup06Mw56p1mThkmoI+rWU64iP8u7lYytEpWy6NvI9qAaYoFKFqA/k0ej9MBpbTW
+VArYzc7e/07frml7dmAK3xnAGxqDx0EuWhtcF7es+97a9rZdmGKtgmgnH1HcA0lI
+mSaawNyomfH1+UFC1nzDQVCs42exIcgUDsqI4lACx26lpIiHDrQoEoKM/fP2cZBf
+v6ch3px248Q717j4v8urtWALXVWZb227Iq1IndEjM/JYB8LIeH3MZ+ME5JZb1n+O
+KaQD3mKfNQz5MfBJjgvlje1XhZEkiOKLhXClCiNQ4f+TDwh/hgjC14NwI3LtoRoT
+uJtF26oOK890cBReOk6GRFnFkZfX654HEQUpKLV//jcjnYIYjSrRZwwQ0mw+LaDE
+kDmTAqgOxr1YIoBxwdhD
+=fp60
 -----END PGP SIGNATURE-----

diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
index a239a847f54ac2d0de9306519e833f285c972231..c9d5e9c0aa2e16da1bdbca4f688788cf96c6b4fc 100644 (file)
--- a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.3 2015/01/19 20:26:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.4 2015/01/31 14:27:20 yngwin Exp $
 
 EAPI=5
 WX_GTK_VER="3.0"
@@ -41,6 +41,7 @@ RDEPEND="
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
        )
        wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
 "
@@ -78,9 +79,17 @@ src_prepare() {
 src_configure() {
        local myconf
 
+       if use qt5 ; then
+               # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
+               myconf+="--with-moc=/usr/$(get_libdir)/qt5/bin/moc
+               --with-uic=/usr/$(get_libdir)/qt5/bin/uic
+               --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
+               --with-mkvtoolnix-gui"
+       fi
+
        if use wxwidgets ; then
                need-wxwidgets unicode
-               myconf="--with-wx-config=${WX_CONFIG}"
+               myconf+="--with-wx-config=${WX_CONFIG}"
        fi
 
        econf \