From 4d19ca7e56a572acc5461e34863e92c0c52d0043 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sun, 15 Mar 2009 13:11:26 +0000 Subject: Apply upstream requested patch for missing display in weekview. Remove old. Package-Manager: portage-2.2_rc25/cvs/Linux x86_64 --- kde-base/korganizer/ChangeLog | 10 +++- kde-base/korganizer/Manifest | 15 ++---- .../korganizer/files/4.2.1-r933657_weekview.patch | 18 +++++++ kde-base/korganizer/korganizer-4.2.1-r1.ebuild | 55 ++++++++++++++++++++++ kde-base/korganizer/korganizer-4.2.1.ebuild | 53 --------------------- 5 files changed, 85 insertions(+), 66 deletions(-) create mode 100644 kde-base/korganizer/files/4.2.1-r933657_weekview.patch create mode 100644 kde-base/korganizer/korganizer-4.2.1-r1.ebuild delete mode 100644 kde-base/korganizer/korganizer-4.2.1.ebuild (limited to 'kde-base') diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog index 55bf8fdc07f4..da3b7263ed87 100644 --- a/kde-base/korganizer/ChangeLog +++ b/kde-base/korganizer/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/korganizer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.111 2009/03/08 20:15:47 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.112 2009/03/15 13:11:25 scarabeus Exp $ + +*korganizer-4.2.1-r1 (15 Mar 2009) + + 15 Mar 2009; Tomas Chvatal + +files/4.2.1-r933657_weekview.patch, -korganizer-4.2.1.ebuild, + +korganizer-4.2.1-r1.ebuild: + Apply upstream requested patch for missing display in weekview. Remove + old. 08 Mar 2009; Alexey Shvetsov -korganizer-4.2.0.ebuild, -korganizer-4.2.0-r1.ebuild: diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest index fbadf1adff07..3c0ea29ca4b5 100644 --- a/kde-base/korganizer/Manifest +++ b/kde-base/korganizer/Manifest @@ -1,6 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX 4.2.1-r933657_weekview.patch 677 RMD160 26fe243acdf792007e672d4f24b471886fc24fc5 SHA1 fc0c00d80dd6e3badce9ad64c0eec2271d5727d0 SHA256 060fe32f7e5d46cc99446851180ebba79a8913b96b0eca0ee8d578b18a45f550 AUX korganizer-3.5.9-kdeenablefinal.patch 2046 RMD160 316dfdc39450a63ce97c6490c04d8f22ad5101da SHA1 2d047295901c4080aa958d269cd2354b16c618b7 SHA256 b8391aaa5854e4ddd63519d63354a2646651fffd190a88e503c3963051ece3c1 DIST kdepim-3.5-patchset-04.tar.bz2 133990 RMD160 9d9fd1e7b04512f1f28bba78d5eeadfc3e3280ba SHA1 ff535be3a60938382094642af18776a529620209 SHA256 8b1968a7bef8ab2efdb2d87e96943ce636775b76365bc1bc99e1e377f9abfc61 DIST kdepim-3.5.10.tar.bz2 14559901 RMD160 52a834dc8eb377d397404a16a09c8a59b568b305 SHA1 537da60fe3564ecc0ed2802e744fbf96386909a9 SHA256 95ec92023a25e4868e55389fa4648b337fed870d744d3b63022ed9838ff9b429 @@ -8,13 +6,6 @@ DIST kdepim-3.5.9.tar.bz2 14497974 RMD160 7c2cbd5b5f9075bc8dcc7998fc04bf9b297bfd DIST kdepim-4.2.1.tar.bz2 13562215 RMD160 5c98ae5a8ccc92ef08f739d59dba855fc00705dc SHA1 be97f4d34eb19b08c30988e07a75c24d5ccad08c SHA256 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c EBUILD korganizer-3.5.10.ebuild 1720 RMD160 a1e2527528c74993f998c61c5b2535e72fecbce8 SHA1 39a81e17c66ac48b7195585ef4f41cb6fa088a23 SHA256 cbf7ebc5f106f645b405da45a1e2af4981498b54b9f53065989d3af05de0c34f EBUILD korganizer-3.5.9.ebuild 1830 RMD160 7c538ae2a9b31984a55d58756768fb659737e06c SHA1 98c1dd485f59f662d82256c13e68e9181f4d614c SHA256 43b0c24a227c1e003a015d13ea6cbc7b2e1c02a126035c0b92ef7a2d0bf631d1 -EBUILD korganizer-4.2.1.ebuild 1292 RMD160 014a847309769c2bdf0a2adab2a2c12e5a3a55b0 SHA1 bf289d09384e754ffe066769aeca02557ebff8d6 SHA256 c49f652688ef193b432cead2c3ef91b3c69aa1d9e7256cafb780ed4914829319 -MISC ChangeLog 14517 RMD160 c9313ba203033248c74179ce089cdfcfced092b0 SHA1 9a646129388e484cc3d708a27174bde6a68092c2 SHA256 a30637d692804b795f5e4999455efdceffacdc722ebd8ae91a74a139f5d85489 +EBUILD korganizer-4.2.1-r1.ebuild 1351 RMD160 ca8a7629c5b051a5129fbeb73124a7d33c9aeb7d SHA1 ffd269cd9a740ee00bfa57489b806e407df436f2 SHA256 0699a94d0fa4444984d2f0351e266866ea204cd17515e8e06c1746b28b2bd3da +MISC ChangeLog 14785 RMD160 f2f0ace94539ec9708879555e89f89decdaa0b42 SHA1 75174aabcccd1746f3c14f1e0b22ad61c2f502b7 SHA256 e8fb4f9cbdc852a9b6829763ea8146443cd0787f644ad7141cee1ae47fbeb338 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkm0J5gACgkQ5BmOA85PVLiQpwCdGEa15hCpSKTsSMXMcrI6FELO -ohEAnA2jpxSGgkyjKoXazR7QC+kSfl/e -=S/TR ------END PGP SIGNATURE----- diff --git a/kde-base/korganizer/files/4.2.1-r933657_weekview.patch b/kde-base/korganizer/files/4.2.1-r933657_weekview.patch new file mode 100644 index 000000000000..9f0a90f2defb --- /dev/null +++ b/kde-base/korganizer/files/4.2.1-r933657_weekview.patch @@ -0,0 +1,18 @@ +Index: branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp +=================================================================== +--- branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp (revision 933656) ++++ branches/KDE/4.2/kdepim/korganizer/views/agendaview/koagendaview.cpp (revision 933657) +@@ -1544,8 +1544,12 @@ + KConfigGroup group = config->group( "Views" ); + + QList sizes = group.readEntry( "Separator AgendaView", QList() ); +- mSplitterAgenda->setSizes( sizes ); + ++ // the size depends on the number of plugins used ++ if ( sizes.count() >= 2 ) { ++ mSplitterAgenda->setSizes( sizes ); ++ } ++ + updateConfig(); + } + diff --git a/kde-base/korganizer/korganizer-4.2.1-r1.ebuild b/kde-base/korganizer/korganizer-4.2.1-r1.ebuild new file mode 100644 index 000000000000..126ff86b2a62 --- /dev/null +++ b/kde-base/korganizer/korganizer-4.2.1-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.2.1-r1.ebuild,v 1.1 2009/03/15 13:11:25 scarabeus Exp $ + +EAPI="2" + +KMNAME="kdepim" +inherit kde4-meta + +DESCRIPTION="A Personal Organizer for KDE" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="debug" + +DEPEND=" + app-crypt/gpgme + >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=] + >=kde-base/libkholidays-${PV}:${SLOT}[kdeprefix=] + kontact? ( >=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=] ) +" +RDEPEND="${DEPEND} + >=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=] +" + +KMLOADLIBS="libkdepim" +KMEXTRA="kdgantt1" + +# xml targets from kmail are being uncommented by kde4-meta.eclass +KMEXTRACTONLY=" + kaddressbook/org.kde.KAddressbook.Core.xml + kmail/ + knode/org.kde.knode.xml + libkholidays +" + +PATCHES=( "${FILESDIR}/${PV}-r933657_weekview.patch" ) + +src_unpack() { + if use kontact; then + KMLOADLIBS="${KMLOADLIBS} kontactinterfaces" + KMEXTRA="${KMEXTRA} kontact/plugins/planner" + fi + + kde4-meta_src_unpack +} + +src_prepare() { + if use kontact; then + # Fix target_link_libraries for now + sed -i -e's/kaddressbookprivate ${KDE4_KCAL_LIBS}/${KDE4_KCAL_LIBS}/' \ + kontact/plugins/planner/CMakeLists.txt \ + || die "Failed to remove kaddressbookprivate from link" + fi + + kde4-meta_src_prepare +} diff --git a/kde-base/korganizer/korganizer-4.2.1.ebuild b/kde-base/korganizer/korganizer-4.2.1.ebuild deleted file mode 100644 index 667a4c814a15..000000000000 --- a/kde-base/korganizer/korganizer-4.2.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.2.1.ebuild,v 1.2 2009/03/08 13:55:26 scarabeus Exp $ - -EAPI="2" - -KMNAME="kdepim" -inherit kde4-meta - -DESCRIPTION="A Personal Organizer for KDE" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug" - -DEPEND=" - app-crypt/gpgme - >=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=] - >=kde-base/libkholidays-${PV}:${SLOT}[kdeprefix=] - kontact? ( >=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=] ) -" -RDEPEND="${DEPEND} - >=kde-base/ktimezoned-${PV}:${SLOT}[kdeprefix=] -" - -KMLOADLIBS="libkdepim" -KMEXTRA="kdgantt1" - -# xml targets from kmail are being uncommented by kde4-meta.eclass -KMEXTRACTONLY=" - kaddressbook/org.kde.KAddressbook.Core.xml - kmail/ - knode/org.kde.knode.xml - libkholidays -" - -src_unpack() { - if use kontact; then - KMLOADLIBS="${KMLOADLIBS} kontactinterfaces" - KMEXTRA="${KMEXTRA} kontact/plugins/planner" - fi - - kde4-meta_src_unpack -} - -src_prepare() { - if use kontact; then - # Fix target_link_libraries for now - sed -i -e's/kaddressbookprivate ${KDE4_KCAL_LIBS}/${KDE4_KCAL_LIBS}/' \ - kontact/plugins/planner/CMakeLists.txt \ - || die "Failed to remove kaddressbookprivate from link" - fi - - kde4-meta_src_prepare -} -- cgit v1.2.3-65-gdbad