Re-apply the linkx11 patch, should fix bug 364675

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/app-office/krita/ChangeLog b/app-office/krita/ChangeLog
index 460437ede07e9536c787d520d7489fad18c90340..62a32852a1c3f38c1de2abf947d6fabf85cbac07 100644 (file)
--- a/app-office/krita/ChangeLog
+++ b/app-office/krita/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-office/krita
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.135 2011/06/01 21:46:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/ChangeLog,v 1.136 2011/08/08 21:04:33 dilfridge Exp $
+
+  08 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> krita-2.3.3.ebuild:
+  Re-apply the linkx11 patch, should fix bug 364675
 
   01 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> -krita-2.2.2.ebuild,
   -krita-2.2.2-r1.ebuild, -files/krita-2.2.2-exiv2.patch,

diff --git a/app-office/krita/Manifest b/app-office/krita/Manifest
index 5ca05cb3cb73b6c94a39a8e304422382dab7471b..8d28e193e95cf54effc5edb4f7745542370cd728 100644 (file)
--- a/app-office/krita/Manifest
+++ b/app-office/krita/Manifest
@@ -3,23 +3,23 @@ Hash: SHA512
 
 AUX krita-2.3.1-linkx11.patch 679 RMD160 60cf0e7f5c8bccef490804befbcd65ca542fe727 SHA1 bfc3ca41a18a9b8dd794ab7b1bc055daef2174f8 SHA256 84a21f5799315723d3fb70bab3240046c8069899e8ae123b862572d1da08b17f
 DIST koffice-2.3.3.tar.bz2 75688999 RMD160 d91fadd686e7f4b773031b642c89c012690f754f SHA1 53eaac4d17922e9fff8cc8028612e581003e1add SHA256 31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099
-EBUILD krita-2.3.3.ebuild 1396 RMD160 59757cba5711270766d25165b5ef4fb5eec337cb SHA1 2dec7085368786b8639140927c3a18e9f5eb7435 SHA256 e9a2762fe33ee3f73c261110b464362d5bae71af09d304ca412d8ecd7ff0dcae
-MISC ChangeLog 16506 RMD160 2b7dc92508c07bf65177af8fd0fc77ef90ebf4b1 SHA1 ab33934124bcb3e4b78eab1acd4ae1943644a8b3 SHA256 f060ce07764f31fdd29a47dd3651014a1a45d46d407793c2627ddd917aaf6723
+EBUILD krita-2.3.3.ebuild 1450 RMD160 5f9f7fb056be6005d34e7711c7644f19d2b0dba3 SHA1 1ffdfc4a432a3ac7346b92d4ee5f2e25cb46eaa8 SHA256 9e2f9325b20e47713e0a1bd153661d6157043e7d84d3f2ba54cadf69c3e3ae02
+MISC ChangeLog 16636 RMD160 2d606d303cfecc882404c308c59c18d9c53acb9c SHA1 b2c593f143b3b4a22c7838feff616ca108d272a4 SHA256 0319eb2e2e1c53407f31bec1b9faec90f235e108823d7c82373efe47c5f39aa0
 MISC metadata.xml 379 RMD160 645c35ed94997af82a8575a07787eb097b2793f4 SHA1 27de1f0e93c2ab13086610395f5868cdd2a7a917 SHA256 cb16908b934ceaa242edba6fcdec7a187f5c8ae6fba345fc131bbb64cd11204c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN5rMnAAoJENwGBM22xffeHI0P/026FnhHxqjrcH/YDWIEl6lw
-e1JcoEjOSZsu7dW0xqChG72aeRjeN2p+7ejQQfOmALTxxyAaQ9hIwBJ0LCH9LCBX
-hW4hlBRSUnGwx7SROx5bqHT6vn7iRjUK0kLV87Hqoak0xGOg74Cty04SgrKtK9h2
-CavJ2t++MoW90OwLbkgDNqFITHsiZu04y/+VoNvapsuUFI62MTEJ8fYhffFlmcJ8
-KKwuD5dt0OX81h0jnayaca8+dmmyc8ndtF8HZ2hFMQKpZHWV7opjol/iGBRzQNos
-j979+hd1pWSwvMY6EcrBDbfwtdeN8B4su4ZlwvEDHqsphSoWzrr2IlFYxWLz5EpC
-a/vZMoWw1aS1vb2vw4hyITm+30wI84GS5Eoglc3Zg8T+0YyUgrIWSAUixPfC3eIi
-ACVdBKw5Jp9MpbehSfgLTgS96/lfJ1Ugrs6N4EuJrbTwtiJ+OI5cKv0AMN6L3Sp0
-T538znVHhb7QKSLpqKzmlfvv6CBvpxWtqHSsYuChkJdpgryYwHPns89TFbyixh84
-RRlkZaxfTI9XJZEQlCsa5dmVYS420XGPhzXhojsEetm3zD7s2rSWLM4coEdaFNvE
-dbGx3HFks5d5YkJNMwEkpUBVrHTWuVkhSGDCgBita4uLG0BTvv5MchVDUBAZdRH3
-e5sSVG8ocDeGTEIDbTGI
-=3929
+iQIcBAEBCgAGBQJOQE91AAoJENwGBM22xffe96EP/RQdJyWpK/9Wo6S8hSz+7D/I
+9L6RL0XM6NIM4QNuBU2bLQVtH93ge1dNNCiWjCDfe/IYARzVdoxU4WCCqm/eRCUB
+j5RMvGlBbeVtQTrsWXeTKAnG5J9CHvw6epsHkkxll89YJELY6OdXkZICpa5DpQKu
+/mu1oU/SXBzu/oHtnPLcn4Fwd+1MIBoBPpbNMBpfLZNv+ATNk7mmvWGqc2wZerIU
++Hx9iBaYbvW48pIWJY2hY0513OUSUKauJ/se9PG2dLPMm0lwquMinLTNRhMZHmLc
+Y+pKvv/nDj+i2vuBrydxGFlXj8Feyz4up79WV6FXVsGXAaXvCqn01pDBbzg1s3CU
+xFdiZSRXyMZigf8MW9kQz56HN8BrWzsYche+d/H5XqvpVw1JSaatp3EuzxBQX89V
+l13xWhhOFG4xCzzHD48UVmEooEURMcMFZp99rJ2u1TWUeTuIAoRS0qWCuZ4oGLr1
+9jVfceIxAUP6BZRMWZD9wL4rWn/EIGb93U9+B5JShl3WOkBHdIE5E/INjuxA+vcb
+PXnwa3E4+D/0DVS2kUqX9y2PVfmfJlYKkHXM+6i0ultk/BIxZIdJEA7JTZqKPwiQ
+Ydy347wRWUxcptL3aiiZ1oEIwy9Mv3y8FnZEPd0AtOd9iD61l/zbsCmCYD4s6Lyf
+qEnkKwcWmcDh2MnMP4Qm
+=RgMY
 -----END PGP SIGNATURE-----

diff --git a/app-office/krita/krita-2.3.3.ebuild b/app-office/krita/krita-2.3.3.ebuild
index 04db35173fce861d2410603184101cf5d9643209..da5b136de211ea04eacad63f3c490c0abc3598fc 100644 (file)
--- a/app-office/krita/krita-2.3.3.ebuild
+++ b/app-office/krita/krita-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.3.ebuild,v 1.3 2011/05/09 23:13:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/krita/krita-2.3.3.ebuild,v 1.4 2011/08/08 21:04:33 dilfridge Exp $
 
 EAPI=3
 
@@ -28,6 +28,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-linkx11.patch" )
+
 KMEXTRACTONLY="
        KoConfig.h.cmake
        libs/