Fix building with KDE 4.4.x wrt #310491 by Marco DR.

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

diff --git a/media-sound/audex/ChangeLog b/media-sound/audex/ChangeLog
index 62969b683306fe5db447b312f81da74dc214b09e..af29e41981ae1033c688b147c85d825fa5d0138a 100644 (file)
--- a/media-sound/audex/ChangeLog
+++ b/media-sound/audex/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audex
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.8 2010/03/05 16:13:59 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/ChangeLog,v 1.9 2010/06/20 19:14:38 ssuominen Exp $
+
+  20 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  audex-0.72_beta1.ebuild, +files/audex-0.72_beta1-MkdirJob.patch:
+  Fix building with KDE 4.4.x wrt #310491 by Marco DR.
 
   05 Mar 2010; Dror Levin <spatz@gentoo.org> audex-0.72_beta1.ebuild:
   Fix HOMEPAGE and SRC_URI, bug 275162.

diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 8609561e6114e6be08463f0381e614c9ce2b9d93..f2c008123fdc7eb036edafaa4e23f83c431c5799 100644 (file)
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
+AUX audex-0.72_beta1-MkdirJob.patch 245 RMD160 5be4bc469936fd40aafa1ae268858ddfb18dfd9f SHA1 dc18f7bb3176ba99ca33098e59d22cafc29a8978 SHA256 5a6809ca4706a9bd6ca510bdeba270156dd8e66133283d93ec4c97453978c330
 DIST audex-0.72b1.tar.bz2 207987 RMD160 a79f50fa3687c2386fbf100bc75637948f6b7d48 SHA1 f91d58887aba9e4441d3e53db0fbc1ebc4f40573 SHA256 87a31cc95b7b1b587c6f091d8248b76128d249de7d758ae621c8376597ccd757
-EBUILD audex-0.72_beta1.ebuild 676 RMD160 e5b7d1405aa3f9f0085de2bee6d3a48d0327edc4 SHA1 58037b08eb47fa541e8ce50f61b0928245bb9f12 SHA256 0d259cf5af953b3611fade43b191065799f1f1b38053a31e37ff907d7f907f45
-MISC ChangeLog 1569 RMD160 44b89deea0c499ee900f03f23097d9bd8a1db5c6 SHA1 f884a423f7f54997326a3e5206f107bb33996531 SHA256 eb2b437d20ad7d88fc03d9e718d338e6d59ec558afc09335ed0a0a0cd983e2f4
+EBUILD audex-0.72_beta1.ebuild 725 RMD160 cef5e6bd83e82a3b734d9173ae3ec43e7323a66c SHA1 4d8baf0504954c9bd6e4e38ec5b726a95341be24 SHA256 66f786e891031ebb2edd8b8ec69d1610d4d14e50d58e4544c7b9dc513112c689
+MISC ChangeLog 1750 RMD160 9ff0b32fe0318074b964634f736a71ac933c963f SHA1 6addd3b58486ee84892b5a5c069db37bbb95445c SHA256 6c9b064462652251e7647c8eebcd16e83c8745efe1cb6e26dae7360c42382aac
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iQEcBAEBCgAGBQJLkS3SAAoJEAWF714uGAc6cesH/REViGS+sKwqGEHC1iuiL4Mv
-BRaZzObK/LhXSnLSf0fomSIuP+rlvtI7hf4GQ+vrT5xSAZ88YwTsqdMIOfGV4Lz6
-qy+EVv3RUFuimMU+ciD3juBGcgucTrs2FLXACAahMXmaTgLORmrSG1dnPCQMd6f/
-aoxwUXSlY3COcqdo/gdKn+EThH9nD5qYrAgM1utgYq2WvtvtRaj1feIIThSyb+Mr
-ivy87rEl5QL1OZlI9hhzJrKmTAGQPqZ85SeEHT6SB+jeYHWrDswCNlhBpi0VeMyH
-mQuNLrqD+Hf2ekICrHH9JDbF7M9nAD34ayjLene3I/PSF9IyZD86dhha5xutSbM=
-=n0L8
------END PGP SIGNATURE-----

diff --git a/media-sound/audex/audex-0.72_beta1.ebuild b/media-sound/audex/audex-0.72_beta1.ebuild
index 898b558d34bc3c459037909461a42cbfe7dfa59a..c95a5eff4a1947e3bc0336c6df815d41f86ca8a9 100644 (file)
--- a/media-sound/audex/audex-0.72_beta1.ebuild
+++ b/media-sound/audex/audex-0.72_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.72_beta1.ebuild,v 1.2 2010/03/05 16:13:59 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audex/audex-0.72_beta1.ebuild,v 1.3 2010/06/20 19:14:38 ssuominen Exp $
 
 EAPI="2"
 
@@ -22,4 +22,6 @@ DEPEND=">=kde-base/libkcddb-${KDE_MINIMAL}
        media-sound/cdparanoia"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+PATCHES=( "${FILESDIR}/${P}-MkdirJob.patch" )

diff --git a/media-sound/audex/files/audex-0.72_beta1-MkdirJob.patch b/media-sound/audex/files/audex-0.72_beta1-MkdirJob.patch
new file mode 100644 (file)
index 0000000..b526ee5
--- /dev/null
+++ b/media-sound/audex/files/audex-0.72_beta1-MkdirJob.patch
@@ -0,0 +1,12 @@
+http://websvn.kde.org/?view=revision&revision=1042286
+
+--- utils/upload.h
++++ utils/upload.h
+@@ -28,7 +28,6 @@
+ #include <KLocale>
+ #include <KUrl>
+ #include <KIO/Job>
+-#include <KIO/MkdirJob>
+ #include <KIO/SimpleJob>
+ #include <KIO/CopyJob>
+