Add patch by Paweł Stankowski <aambitny@gmail.com> to solve automagic Qt version...

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

diff --git a/media-libs/libmediaart/ChangeLog b/media-libs/libmediaart/ChangeLog
index f613072adc541f9bbb8fb6dad3d8f5a3bef8af52..409067d7ba44f1951999fa1e28f3cfa74381e11f 100644 (file)
--- a/media-libs/libmediaart/ChangeLog
+++ b/media-libs/libmediaart/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libmediaart
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediaart/ChangeLog,v 1.11 2014/10/11 12:17:18 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediaart/ChangeLog,v 1.12 2015/01/01 13:25:34 kensington Exp $
+
+  01 Jan 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/libmediaart-0.7.0-qt5.patch, libmediaart-0.7.0.ebuild:
+  Add patch by Paweł Stankowski <aambitny@gmail.com> to solve automagic Qt
+  version selection wrt bug #523122.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> libmediaart-0.4.0.ebuild:
   arm stable, bug #512012

diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 0a031155be43815a41be9672c5269142a7d82306..106c383266e271a483a0a61f123f9d0237fc006d 100644 (file)
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -1,16 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libmediaart-0.7.0-qt5.patch 1776 SHA256 97f5b5e052e41689147406e6a22de122b1003f90baec7db78ddf204c0a6d6dd9 SHA512 6c9b0b34ad7ac640e8c43657c45793a4fadb1bac0b0a67d2ad01c3cf5db3ef0d07707ae71b57489b83879295f8c15e03a2ff4b5e1dc559b7d5b8882fef28b784 WHIRLPOOL 63257ae08744e9501a8ed00dc7bde86a4d628b1877272142542a394726b121bf422b438c63fb41381b4c0ec21cb0c504d08729a1a45b748e7636c97bd1f11d8a
 DIST libmediaart-0.4.0.tar.xz 270220 SHA256 e8ec92a642f4df7f988364f6451adf89e1611d7379a636d8c7eff4ca21a0fd1c SHA512 7d3870b47f53a52597126a2f691b89eca9800bb82d7723601756fae57ba32b348b10135ffbabe1922de5dd4400fd41d69eac923d3df0de744a3a600c84dd46c7 WHIRLPOOL 59102f907d0702cd5ddc580b3d2878138bac82a5bfda4a3e30eee6ea8f2cfe36d2278a1158e586a11d9e72689429018229069632d5108168e0b902b2ccadf932
 DIST libmediaart-0.7.0.tar.xz 5811244 SHA256 3a9dffcad862aed7c0921579b93080d694b8a66f3676bfee8037867f653a1cd3 SHA512 94ca38ca2ec2bdd7f3a6f39c7f658053d8c46caba8bad97d004663da027c0308a305ce791b33af3d07e3fe8647a967b1ee1c6f808bbe1b4839844aa10cb0891a WHIRLPOOL 781237cff0511b937408f8f3cf72b336c32b84ec38f08d598e2eba56c89ce2b76deafb8705d41e5bc73f2f39833966dbd67f62bcb28e67108499d6d1bb72897b
 EBUILD libmediaart-0.4.0.ebuild 1332 SHA256 50cdbe21451b0f113f4698360fb8c49769708a48148887466ba80d7de6df2dc9 SHA512 dc02ed694f86416a3f26f9cb6ce93e2ac49b2b70a29c0f5244d73b90e419b7cef994b845a4d5a30a6fc304e66e0ae0b7366ac4153fffddd11e247e8b291e6054 WHIRLPOOL 1c2baba8dd40a5534eca553e2148b26cc8db6e29cef506f7450415fb80ba0529cc9e6625abf1980cece8cee39ccb064241f229b8528ca33af6a7dde736ce199c
-EBUILD libmediaart-0.7.0.ebuild 1333 SHA256 3909242d3fb49167324b4a9d336a653366d2cd06c49f9c6c5a81918410acb454 SHA512 17239cc12b5e9db317fcd0aeaccc38960f929b5b709d1344217995944509dbd28320005585bdbe6cb1799ea5f58181f64823cf3bbc9f15912d4a9404e7c1a287 WHIRLPOOL 10c496b02e726d11458a8e713267905be8a9789b3603bac1d2dfbe58dc7fc8c7e58b3e9c0c02cc10d20917651dda59a2f2c3c05d981ff1ac22579dd83050dc87
-MISC ChangeLog 1529 SHA256 04531ea4138c8c688e019ba49c50ff1efee4d315153c35dcc51375caf697abea SHA512 9e9c79f332855196dfaab9b923b1da260765620e99a6cf920af0f17b6601557d01dc1b62bb72fc3d720470fb9b90b8497c92e119affc730f144f202b2d274ae2 WHIRLPOOL d9d074ad85fef3b91acd3b3df812171010013986a3b364bb9f744c53e02afbd86295864a7d97ffe2627ca60cbcd86c43cdd64ba74dcb47f9ed010c3087d137a3
+EBUILD libmediaart-0.7.0.ebuild 1481 SHA256 748e7cc9dc9a024865a8633ffeaca362f755cd3dad18d79ec0799044c680046c SHA512 d9503f9ac8b15f1beafebac3eb725f9acb3e0ce0571067e6fadd28dc22aca6b5802df3562ef71d3d3d5880a4301f09ff5d6b793af0073c70f0a97035810e5bc9 WHIRLPOOL 9744bce482cfb35b090bf445b71834da5886b4802f295c434375241a9de9bb12eff43064f9803dc6c817a58a3ef211a3995166a3ce5fae2fdf89f80e7ec9a074
+MISC ChangeLog 1767 SHA256 6963e859c05d52ba74aea2e29c7e9fa97bb129bf27d388374b4bdb7084ea3da0 SHA512 5588a2c1c2350e9467a35b308047fe2bb1ba85713e69601093bc585c0a88199dfed5e0f96882f869486f64ac0a80234feabfbf1f8350d3824655c440b78cbd11 WHIRLPOOL f1d486ebc7983f74b62bd8df63fb672c15d0cbb8e127f7aee1da62afcd99745c5e2fef396512755134bbc5124ecb3da208a387e9b1055c4740aaa80e04be2a61
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlQ5H9AACgkQkKaRLQcq0GJjywCfdzR0rbgeIW+fZhvCTaX1nw1X
-L2IAn1KaxlJIpDaIEBqo+MLKZYm8slAQ
-=HlHb
+iQJiBAEBCABMBQJUpUrkRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7Or+D/0YbGcaU9fmfqQrL0wLJhN+i/znsiYPVZTerMd5oQPrxQI22Ta4DuFN71TS
+kajmBAYvD7arIId8hHZvYRKMDtFedhGxkV+aND3IwYkjus/gQvdEdpMn2tpdH9ef
+Eij2YaonlaYiHKSM5ppPWcp0fuVAS3sx9PsBb7n1owLvdrhAgFse+Dh1ffX8MHsz
+o8KpOhsOkPFsIdkkgsqmZadhPPLK7ak4cAGE38oekDE1JIed+nFg3lS1pejh5WaF
+HSxSO6/qFICtH9mmmp8skCmTyvK1fn1uFvP3yAwlRfyB1uMg0kXsb/x8Tunp+puN
+911xVTVnk4LAigceKotwjI8EG6mkoBQWdL2fJeB3PvuXLC/kB+z2NFxfCwqbMXPN
++x4Ti+DVvw82Vx80pMsCw6rIhug8xzve5454GSPU76/ESmQEVp8Kz6Gdi4647DSS
+0ykKjxdtUiuK034Sj2tc1JEuMbg6MHjY5pv7CEwqMCtz4/chcnP2SDDQ2zVx9aE4
+wZlBjXZs2G+zNBHrIbQmyHXwqk5MxFvOETsfdekjkQCjlP33X6wn+PkIqelLHESU
+OQm20A1/pwq+2Bz3naNMheIcL4rEg6UGmszCig/3064I0N45pNB37u559jOr0FBr
+Kx7cUPuALCjDH18nR7kLyrMVbzWgSdgyS7MkoDbRt4XNyyDETA==
+=Zchq
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
new file mode 100644 (file)
index 0000000..ecf9de9
--- /dev/null
+++ b/media-libs/libmediaart/files/libmediaart-0.7.0-qt5.patch
@@ -0,0 +1,47 @@
+Solves automagic selection of Qt version.
+
+https://bugs.gentoo.org/show_bug.cgi?id=523122
+https://bugzilla.gnome.org/show_bug.cgi?id=737174
+
+diff --git a/configure.ac b/configure.ac
+index e9ead09..3ee710a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -206,6 +206,10 @@ AC_ARG_ENABLE(qt,
+               AS_HELP_STRING([--enable-qt],
+                              [enable Qt support, (MP3 album art) [[default=auto]]]),,
+               [enable_qt=auto])
++AC_ARG_WITH(qt-version,
++            AS_HELP_STRING([--with-qt-version=major],
++                           [Force specific Qt version [[default=auto]]]),,
++            [with_qt_version=auto])
+ 
+ selected_for_media_art="no  (disabled)"
+ 
+@@ -218,14 +222,18 @@ if test "x$enable_qt" == "xyes" && test "x$enable_gdkpixbuf" == "xyes"; then
+ fi
+ 
+ if test "x$enable_qt" != "xno" && test "x$enable_gdkpixbuf" != "xyes"; then
+-   PKG_CHECK_MODULES(QT5,
+-                     [Qt5Gui >= $QT5_REQUIRED],
+-                     [have_qt5=yes],
+-                     [have_qt5=no])
+-   PKG_CHECK_MODULES(QT4,
+-                     [QtGui >= $QT4_REQUIRED],
+-                     [have_qt4=yes],
+-                     [have_qt4=no])
++   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x5"; then
++       PKG_CHECK_MODULES(QT5,
++                         [Qt5Gui >= $QT5_REQUIRED],
++                         [have_qt5=yes],
++                         [have_qt5=no])
++   fi
++   if test "x$with_qt_version" == "xauto" || test "x$with_qt_version" == "x4"; then
++       PKG_CHECK_MODULES(QT4,
++                         [QtGui >= $QT4_REQUIRED],
++                         [have_qt4=yes],
++                         [have_qt4=no])
++   fi
+ 
+    if test "x$have_qt5" = "xyes"; then
+       BACKEND_CFLAGS="$QT5_CFLAGS -fPIC"

diff --git a/media-libs/libmediaart/libmediaart-0.7.0.ebuild b/media-libs/libmediaart/libmediaart-0.7.0.ebuild
index 4898b2531ac596c428a420402e2f9d14a07affeb..69aa78dce030b8fdec65a57efb6c3003a5aa3d86 100644 (file)
--- a/media-libs/libmediaart/libmediaart-0.7.0.ebuild
+++ b/media-libs/libmediaart/libmediaart-0.7.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediaart/libmediaart-0.7.0.ebuild,v 1.1 2014/09/23 13:17:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmediaart/libmediaart-0.7.0.ebuild,v 1.2 2015/01/01 13:25:34 kensington Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 VALA_USE_DEPEND="vapigen"
 VALA_MIN_API_VERSION="0.16"
 
-inherit gnome2 vala virtualx
+inherit autotools gnome2 vala virtualx
 
 DESCRIPTION="Manages, extracts and handles media art caches"
 HOMEPAGE="https://github.com/GNOME/libmediaart"
@@ -37,12 +37,16 @@ DEPEND="${RDEPEND}
 src_prepare() {
        use vala && vala_src_prepare
        gnome2_src_prepare
+       epatch "${FILESDIR}/${P}-qt5.patch"
+       eautoreconf
 }
 
 src_configure() {
        local myconf=""
-       if use qt4 -o use qt5 ; then
-               myconf="${myconf} --enable-qt"
+       if use qt4 ; then
+               myconf="${myconf} --enable-qt --with-qt-version=4"
+       elif use qt5 ; then
+               myconf="${myconf} --enable-qt --with-qt-version=5"
        else
                myconf="${myconf} --disable-qt"
        fi