after a long time, fix qtscript check, bug 270923, kde bug 189367

Package-Manager: portage-2.2_rc49/cvs/Linux x86_64

5 files changed, 47 insertions, 8 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 130971c4f147..4719a2c67d43 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.345 2009/11/14 12:48:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.346 2009/11/14 15:20:30 tampakrap Exp $
+
+  14 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.2.0.ebuild,
+  amarok-2.2.1.ebuild, +files/amarok-qtscriptcheck.patch:
+  after a long time, fix qtscript check, bug 270923, kde bug 189367
 
 *amarok-2.2.1 (14 Nov 2009)
 
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index a088fbb014d4..d0c0cdcf0516 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,8 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
 AUX amarok-1.4.10-gcc44.patch 4085 RMD160 bda16ee1d016cd158654b3f80faa413eaa7a6543 SHA1 f5c7eeea6ff80d6e634465517face69f3f344516 SHA256 b94338af91e5a108c39b100162f38bfe53d6c94fb9ed4c175f09de68df1c1989
 AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
 AUX amarok-libmp4v2-2.patch 1317 RMD160 f2af142c7acca5d2f558d121fa4cd0ded2ea044c SHA1 14ab94f14e5be19f7ea5c6b83fdde768a1e5bcc1 SHA256 9a83dfdab7f393a802ec6394bf314736c7866391fb496b256c028bc81f86ce5c
 AUX amarok-libmp4v2.patch 2882 RMD160 f0786378bf963e8d10db49631bb0981facd9ed90 SHA1 a60289d7c852056c27ad2d03dc09b0500f428ac3 SHA256 df4c71a25381470411ac2223ec978989e1f3fa7e784de6a0b9e1cb53eed65e06
+AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d
 AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6
 DIST amarok-1.4.10-post20090130.diff.tar.bz2 4050 RMD160 e1b871213d7658081ffd396a1a208f97c3f10752 SHA1 8aa7492e91529ce1e01f3d2ee8183b7d7da7cb83 SHA256 64924546008abf88f7f776b27afe3de539defcd212c79c62c6abd90a7174dbe0
 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b
@@ -13,7 +17,14 @@ DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be715
 EBUILD amarok-1.4.10_p20090130-r3.ebuild 3198 RMD160 c88ab563457a4dc8c226d41a32dc8b0c9a8b7418 SHA1 f98f41ac480a9c8c0d99c939fc2de1aa514a4f6b SHA256 17a78dbb7d26439930a18b9148144d3862dce12bf3201d2872fde27ac75dd66f
 EBUILD amarok-2.1.1.ebuild 2393 RMD160 84f67da3d49ce3441eeb6721a8f2116ec6c98ab5 SHA1 475cf04b1e73ffd1cc1f2b4f40704e2a671e2fb6 SHA256 089d8d2565e96f102416de5c75852067da3a14bd886b6f59f6675fcf62e1cf08
 EBUILD amarok-2.1.ebuild 2391 RMD160 ac645af2b8dc7c7c96286f001159c78f5a53fa59 SHA1 c9fe7fb8589397e7c0f4b17bc9a14d5bde56c01e SHA256 2781df1df211f85489677a59c93784a01c6f246ae3557b89cf3c69279ea48249
-EBUILD amarok-2.2.0.ebuild 2757 RMD160 71906d668cf69d405ddc8eba23f4fc90bbe71f46 SHA1 bba680a5d2652fa4ccd0ddf20b28b84bd41ee9d5 SHA256 51901b9596ee196a9d715acfd574537de94dd81b30f5be436ec8d2a5b1f3e159
-EBUILD amarok-2.2.1.ebuild 2776 RMD160 5d121c42c843e95455b1a492a5a3f6fa77e9662a SHA1 af9188443fbdb071d3e9c980aea7557a0c2f677f SHA256 64bfdc33c482f859988aebeecf1ed17c677ec11d907ac922466f595146a5b7c2
-MISC ChangeLog 55897 RMD160 286e902294e6ad074311c5993c6e85f27199bb5e SHA1 0fff9ba9a090e29c75ecd58599ebd734f204a4ad SHA256 cdc67acbcfb9e81b75fecd9f8153bf2b29d51255a48cc2342f57175b6d897487
+EBUILD amarok-2.2.0.ebuild 2760 RMD160 671c5f9228f9ae600aabe6c6448bf9fa7bdfd757 SHA1 02d340458f12dd79d7bcdd9717946a9c9b17fac2 SHA256 3a2ca481c3433417599b92940280d5516c3296a4212f3a5198abb4917062c8a9
+EBUILD amarok-2.2.1.ebuild 2773 RMD160 6a07a36b2459b8506e4cc313c77f01ddee1b0e86 SHA1 e10b48f50e61e708c12e02b30b2207af71518be1 SHA256 b108945fd5933b0c251e02ae0d9c26cf4afc82c8c87831eb637e3e86bac5fafd
+MISC ChangeLog 56099 RMD160 06561353dbaf25da98593ba1e465720871a1d526 SHA1 9532c6e00ee2cd28b8a04a152387b54e6c96d94f SHA256 d84e0bae35c22e22b132b9cc0c5d0d691f5a72906dbc9e50633488ed68ed8502
 MISC metadata.xml 2160 RMD160 60852f091cb201337c8322cad498466cd63fee1d SHA1 15af0f24c3490806e06700d05bf5341779b2b26b SHA256 49e722b9b2a370e01b0efc327486bc3e02446e0c2b4b8047dffad765a1992357
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.13 (GNU/Linux)
+
+iEYEARECAAYFAkr+yscACgkQjDdoMVfcAHigAwCgyK3VOGyKqa4OkIM62UMKdaAQ
+SrsAoIs32ljLBUdGdtMPI5xsgBkad0mV
+=YVB5
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.2.0.ebuild b/media-sound/amarok/amarok-2.2.0.ebuild
index 2006f463161c..0a82457e1f12 100644
--- a/media-sound/amarok/amarok-2.2.0.ebuild
+++ b/media-sound/amarok/amarok-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v 1.3 2009/11/09 18:18:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.0.ebuild,v 1.4 2009/11/14 15:20:30 tampakrap Exp $
 
 EAPI="2"
 
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
 	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
 "
 
-PATCHES=( "${FILESDIR}/disable_bindings_test.patch" )
+PATCHES=( "${FILESDIR}/amarok-qtscriptcheck.patch" )
 
 # Only really required for live ebuild, to skip git_src_prepare
 src_prepare() {
diff --git a/media-sound/amarok/amarok-2.2.1.ebuild b/media-sound/amarok/amarok-2.2.1.ebuild
index 0d6c5260fc8a..300212da877a 100644
--- a/media-sound/amarok/amarok-2.2.1.ebuild
+++ b/media-sound/amarok/amarok-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.1.ebuild,v 1.1 2009/11/14 12:48:52 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.2.1.ebuild,v 1.2 2009/11/14 15:20:30 tampakrap Exp $
 
 EAPI="2"
 
@@ -62,7 +62,7 @@ RDEPEND="${DEPEND}
 	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
 "
 
-PATCHES=( "${FILESDIR}/disable_bindings_test.patch" )
+PATCHES=( "${FILESDIR}/amarok-qtscriptcheck.patch" )
 
 # Only really required for live ebuild, to skip git_src_prepare
 src_prepare() {
diff --git a/media-sound/amarok/files/amarok-qtscriptcheck.patch b/media-sound/amarok/files/amarok-qtscriptcheck.patch
new file mode 100644
index 000000000000..643ec30f4eb4
--- /dev/null
+++ b/media-sound/amarok/files/amarok-qtscriptcheck.patch
@@ -0,0 +1,24 @@
+--- a/cmake/modules/bindingstest/QtScriptBindingsTest.cpp	2009-11-14 15:07:20.400971341 +0200
++++ b/cmake/modules/bindingstest/QtScriptBindingsTest.cpp	2009-11-14 16:13:48.156222032 +0200
+@@ -16,9 +16,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
+-#include <KDE/KApplication>
+-#include <KDE/KAboutData>
+-#include <KDE/KCmdLineArgs>
++#include <qt4/QtCore/QCoreApplication>
+ #include <QtScript/QScriptEngine>
+ #include <QtCore/QStringList>
+ #include <QtCore/QDebug>
+@@ -27,9 +25,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-    KAboutData about( "findgeneratorplugins", "", ki18n("Generator Exists?"), "1.0", ki18n("Find if the QtScript Plugins Are Installed"), KAboutData::License_LGPL_V2 );
+-    KCmdLineArgs::init( argc, argv, &about );
+-    KApplication app( false ); //no gui pls
++    QCoreApplication app( argc, argv ); //no gui pls
+     
+     QStringList allowedBindings;
+     allowedBindings << "qt.core" << "qt.gui" << "qt.sql" << "qt.xml" << "qt.uitools" << "qt.network";