From: Carsten Lohrke Date: Wed, 11 Apr 2007 20:57:02 +0000 (+0000) Subject: Fix bug #135363. Fixes for the KDE bugs #54020, #118932, #131176, #130676, #140876... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6d7bf02d46cac1a526f8e255c2dd0850f284a4f;p=gentoo.git Fix bug #135363. Fixes for the KDE bugs #54020, #118932, #131176, #130676, #140876 and #141339. Package-Manager: portage-2.1.2.3 --- diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest index 2ce34991d08f..ed24f8e9e24c 100644 --- a/kde-base/kdepim/Manifest +++ b/kde-base/kdepim/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da SHA1 d8396dcda5d2ed6c5cb2fad66c1a2cb98a1a8752 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636 MD5 970d8db800a3bb39be0c7f4a41c35e06 files/kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da files/kmail-3.5.5-dimap-mail-loss.patch 9870 @@ -22,20 +19,29 @@ MD5 f8cf5ed206715c532af984790df240c1 files/libkcal-3.5.2-fixes.diff 1620 RMD160 3e915689d11700ac717ff265c5bb47e07f62ccc1 files/libkcal-3.5.2-fixes.diff 1620 SHA256 74f09abc0133576508e0617f51b574201789ef60080500effbe6fd9bb97dea5b files/libkcal-3.5.2-fixes.diff 1620 DIST kdepim-3.5-patchset-02.tar.bz2 4208 RMD160 93e1e0c760278b233ff3d7096154168f6fbcf65a SHA1 7b4e565a7376a66fc49198c014c95bd445806b0b SHA256 8c91e5359e58710b5bc8e51b30058f41870a93bbda8b1a5fffc1af91a82128dd +DIST kdepim-3.5-patchset-03.tar.bz2 121475 RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 SHA1 2c924af34a5bb3562b17b861b63df59c0341298f SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047 DIST kdepim-3.5.6.tar.bz2 13643798 RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb SHA1 a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 EBUILD kdepim-3.5.5-r2.ebuild 1394 RMD160 62e071086049d63642630e1875c515c58c80cc0b SHA1 57b9cc16f781438b8f2999ec83732b1acde3c3a9 SHA256 6465856eb5a96928ddf421792a03e94e7d921b7cfaf7ac0f1a60a9584b7c5530 MD5 589b7e5885df81e36a8de43eebbb0edf kdepim-3.5.5-r2.ebuild 1394 RMD160 62e071086049d63642630e1875c515c58c80cc0b kdepim-3.5.5-r2.ebuild 1394 SHA256 6465856eb5a96928ddf421792a03e94e7d921b7cfaf7ac0f1a60a9584b7c5530 kdepim-3.5.5-r2.ebuild 1394 +EBUILD kdepim-3.5.5-r3.ebuild 1414 RMD160 a80c07bd4b32f6da9cde0435e229e1d1128c95e9 SHA1 6d03d1426cb7874583695ed47e315a1d00bfd37f SHA256 7c010f4cdfee8dcb7bc2db710c1d692ac34ebe15e1e4b994d6fdb090b206d8a7 +MD5 70603caa962c6914a3e0d69eea0699ff kdepim-3.5.5-r3.ebuild 1414 +RMD160 a80c07bd4b32f6da9cde0435e229e1d1128c95e9 kdepim-3.5.5-r3.ebuild 1414 +SHA256 7c010f4cdfee8dcb7bc2db710c1d692ac34ebe15e1e4b994d6fdb090b206d8a7 kdepim-3.5.5-r3.ebuild 1414 EBUILD kdepim-3.5.6-r1.ebuild 1470 RMD160 2045dc4c207f5558a1f9813b803b4c732dd68bf7 SHA1 dec0e859e39424080742e7d1def2cc6fe462c04c SHA256 6036b77fe82df2a396377cb68acb06801a8da4ddf9801638e56d0f435e915419 MD5 5ebeef50fbd5e5a3871ef562bfedd1ef kdepim-3.5.6-r1.ebuild 1470 RMD160 2045dc4c207f5558a1f9813b803b4c732dd68bf7 kdepim-3.5.6-r1.ebuild 1470 SHA256 6036b77fe82df2a396377cb68acb06801a8da4ddf9801638e56d0f435e915419 kdepim-3.5.6-r1.ebuild 1470 -MISC ChangeLog 34129 RMD160 083439fa958a876b598ac5cab5fba2bcd071148e SHA1 43343fdaa26c0efa6668faa586816b7f6b15aefc SHA256 a96f7a8fdbeb55fbb72c15bea7d107898f3d2953d5f06aa3376543557c0e166b -MD5 62d2b599f5ad171389db4310f228aecf ChangeLog 34129 -RMD160 083439fa958a876b598ac5cab5fba2bcd071148e ChangeLog 34129 -SHA256 a96f7a8fdbeb55fbb72c15bea7d107898f3d2953d5f06aa3376543557c0e166b ChangeLog 34129 +EBUILD kdepim-3.5.6-r2.ebuild 1497 RMD160 6bf27cc8a6dc162ed7aad6599f29f34ebc7baec7 SHA1 1c28e10aa8287d5377116dd8fabdd1aba40e8078 SHA256 b041b2435d560841f9b12ab571996ad2a4ad0621cca69974abdf54e93059da93 +MD5 c645c239bed9e030e58c9262b43c366c kdepim-3.5.6-r2.ebuild 1497 +RMD160 6bf27cc8a6dc162ed7aad6599f29f34ebc7baec7 kdepim-3.5.6-r2.ebuild 1497 +SHA256 b041b2435d560841f9b12ab571996ad2a4ad0621cca69974abdf54e93059da93 kdepim-3.5.6-r2.ebuild 1497 +MISC ChangeLog 34551 RMD160 9a9e76c3753345982195d7c692ef164fed078e77 SHA1 76f62666dd997b844165e27f7ced08f7ccd816d7 SHA256 08a6892f95fa8d72846450e13109859a9aaea556990601435099e997d2e08698 +MD5 049e061f63682093f6bed32cbfc09fdf ChangeLog 34551 +RMD160 9a9e76c3753345982195d7c692ef164fed078e77 ChangeLog 34551 +SHA256 08a6892f95fa8d72846450e13109859a9aaea556990601435099e997d2e08698 ChangeLog 34551 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156 @@ -43,13 +49,12 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata MD5 939bf9063c2f05a9b84f772672c50bf3 files/digest-kdepim-3.5.5-r2 512 RMD160 d09ee629a4a4c699812d2f6a3b38281b25d64673 files/digest-kdepim-3.5.5-r2 512 SHA256 ebffdd3be2555ec32588c07decab3d399ca0fcf3434b64d83ae8051e3f59eda1 files/digest-kdepim-3.5.5-r2 512 +MD5 a03ff9f965e3ecf739528bfa25b1d0ce files/digest-kdepim-3.5.5-r3 518 +RMD160 cb3d7f30954922ea16073756b3a34d3ff34aebae files/digest-kdepim-3.5.5-r3 518 +SHA256 d7398d31a2fdc87e4fef7674d8d800e7962df250f169df3478e2848672e31e9c files/digest-kdepim-3.5.5-r3 518 MD5 694e2129c1e464bcf0badea11d1112f5 files/digest-kdepim-3.5.6-r1 512 RMD160 ed8995a24cee7a13bdb6d24bcd2d9e15fe476e0c files/digest-kdepim-3.5.6-r1 512 SHA256 3e201f5c33c8c0db49abffc1cc77b21375548b371d9205d58cd372bc611cb3c5 files/digest-kdepim-3.5.6-r1 512 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFFxyECAiZjviIA2XgRAmLSAJ9uS9P0V3kraEoeCqC8c4fT9u5WiwCgyHWG -Xt/HCqujBIETlXgjHcOL9pg= -=qQ4L ------END PGP SIGNATURE----- +MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-kdepim-3.5.6-r2 518 +RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-kdepim-3.5.6-r2 518 +SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-kdepim-3.5.6-r2 518 diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog index ac76874a487d..b97460317554 100644 --- a/kde-base/libkdepim/ChangeLog +++ b/kde-base/libkdepim/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/libkdepim # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.74 2007/02/05 11:51:30 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.75 2007/04/11 20:57:02 carlo Exp $ + +*libkdepim-3.5.6-r1 (11 Apr 2007) + + 11 Apr 2007; Carsten Lohrke +libkdepim-3.5.6-r1.ebuild: + Fix bug #135363. Fixes for the KDE bugs #54020, #118932, #131176, #130676, + #140876 and #141339. 05 Feb 2007; Diego Pettenò -files/libkdepim-3.5.2-call_qt3_designer.diff, diff --git a/kde-base/libkdepim/files/digest-libkdepim-3.5.6-r1 b/kde-base/libkdepim/files/digest-libkdepim-3.5.6-r1 new file mode 100644 index 000000000000..e27a0017b6a2 --- /dev/null +++ b/kde-base/libkdepim/files/digest-libkdepim-3.5.6-r1 @@ -0,0 +1,6 @@ +MD5 48f1592b07f784df47280baa0c8356b0 kdepim-3.5-patchset-03.tar.bz2 121475 +RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 kdepim-3.5-patchset-03.tar.bz2 121475 +SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b kdepim-3.5-patchset-03.tar.bz2 121475 +MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798 +RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798 +SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798 diff --git a/kde-base/libkdepim/libkdepim-3.5.6-r1.ebuild b/kde-base/libkdepim/libkdepim-3.5.6-r1.ebuild new file mode 100644 index 000000000000..3af574b235e0 --- /dev/null +++ b/kde-base/libkdepim/libkdepim-3.5.6-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.6-r1.ebuild,v 1.1 2007/04/11 20:57:02 carlo Exp $ + +KMNAME=kdepim +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdepim-3.5-patchset-03.tar.bz2" + +DESCRIPTION="common library for KDE PIM apps" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="" + +DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal) + !<=kde-base/kmail-3.5.6-r1" + +RDEPEND="${DEPEND}" + +KMCOPYLIB="libkcal libkcal" +KMEXTRA="libemailfunctions/ + pixmaps" +KMEXTRACTONLY="kmail/hi16-app-kmail.png + kmail/hi22-app-kmail.png + kmail/hi32-app-kmail.png + kmail/hi48-app-kmail.png + kmail/hi64-app-kmail.png + kmail/hi128-app-kmail.png" + +src_unpack() { + kde-meta_src_unpack + # Call Qt 3 designer + sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" ${S}/libkdepim/kcmdesignerfields.cpp || die "sed failed" +} + +src_install() { + kde-meta_src_install + + # Install KMail icons with libkdepim to work around bug #136810. + for res in 16 22 32 48 64 128 ; do + dodir ${KDEDIR}/share/icons/hicolor/${res}x${res}/apps/ + cp kmail/hi${res}-app-kmail.png "${D}/${KDEDIR}/share/icons/hicolor/${res}x${res}/apps/kmail.png" + done +} \ No newline at end of file