[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/

2015-07-12 Thread Andreas Hüttel
commit: 55d3305c95cb34c8a7d181d9c66180ef00e98868
Author: Andreas K. Huettel (dilfridge) dilfridge AT gentoo DOT org
AuthorDate: Sun Jul 12 22:14:38 2015 +
Commit: Andreas Hüttel dilfridge AT gentoo DOT org
CommitDate: Sun Jul 12 22:14:38 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=55d3305c

[kde-base/korganizer] moved to main tree

Package-Manager: portage-2.2.20

 kde-base/korganizer/korganizer-4.4.2015.06.ebuild | 62 ---
 1 file changed, 62 deletions(-)

diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild 
b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
deleted file mode 100644
index 2d77e48..000
--- a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME=kdepim
-KDE_HANDBOOK=optional
-inherit kde4-meta
-
-DESCRIPTION=A Personal Organizer for KDE (noakonadi branch)
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
-IUSE=debug
-
-DEPEND=
-   $(add_kdebase_dep kdepimlibs '' 4.6)
-   $(add_kdebase_dep libkdepim)
-   sys-libs/zlib
-
-RDEPEND=${DEPEND}
-   $(add_kdeapps_dep ktimezoned '' 4.14.3)
-
-
-KMLOADLIBS=libkdepim
-KMEXTRA=kdgantt1
-
-# xml targets from kmail are being uncommented by kde4-meta.eclass
-KMEXTRACTONLY=
-   kmail/
-   knode/org.kde.knode.xml
-   kaddressbook/org.kde.KAddressbook.Core.xml
-
-
-# bug 378151
-RESTRICT=test
-
-src_unpack() {
-   if use kontact; then
-   KMEXTRA=${KMEXTRA}
-   kontact/plugins/planner/
-   kontact/plugins/specialdates/
-   
-   fi
-
-   kde4-meta_src_unpack
-}
-
-src_prepare() {
-   use handbook  epatch ${FILESDIR}/${PN}-4.4.2015.06-handbook.patch
-
-   kde4-meta_src_prepare
-}
-
-pkg_postinst() {
-   kde4-meta_pkg_postinst
-
-   if ! has_version kde-base/kdepim-kresources:${SLOT}; then
-   echo
-   elog For groupware functionality, please install 
kde-base/kdepim-kresources:${SLOT}
-   echo
-   fi
-}



[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/

2015-07-07 Thread Johannes Huber
commit: f6b47611459b1e8ba1e2afe58536f6b3c5853610
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jul  6 16:14:47 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Tue Jul  7 21:08:38 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f6b47611

[kde-base/korganizer] doc dir not extracted if USE=-handbook

Package-Manager: portage-2.2.18

 ...rganizer-4.10.0-handbook.patch = korganizer-4.14.10-handbook.patch} | 0
 kde-base/korganizer/korganizer-4.14.10.ebuild   | 2 +-
 kde-base/korganizer/korganizer-4.4.2015.06.ebuild   | 2 +-
 kde-base/korganizer/korganizer-4..ebuild| 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch 
b/kde-base/korganizer/files/korganizer-4.14.10-handbook.patch
similarity index 100%
rename from kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
rename to kde-base/korganizer/files/korganizer-4.14.10-handbook.patch

diff --git a/kde-base/korganizer/korganizer-4.14.10.ebuild 
b/kde-base/korganizer/korganizer-4.14.10.ebuild
index 8de685e..3e45694 100644
--- a/kde-base/korganizer/korganizer-4.14.10.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.10.ebuild
@@ -68,7 +68,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch ${FILESDIR}/${PN}-4.10.0-handbook.patch
+   use handbook  epatch ${FILESDIR}/${PN}-4.14.10-handbook.patch
 
kde4-meta_src_prepare
 }

diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild 
b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
index afe5411..2d77e48 100644
--- a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -46,7 +46,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch ${FILESDIR}/${PN}-4.4.2015.06-handbook.patch
+   use handbook  epatch ${FILESDIR}/${PN}-4.4.2015.06-handbook.patch
 
kde4-meta_src_prepare
 }

diff --git a/kde-base/korganizer/korganizer-4..ebuild 
b/kde-base/korganizer/korganizer-4..ebuild
index 9e9a6b7..63da843 100644
--- a/kde-base/korganizer/korganizer-4..ebuild
+++ b/kde-base/korganizer/korganizer-4..ebuild
@@ -68,7 +68,7 @@ src_unpack() {
 }
 
 src_prepare() {
-   epatch ${FILESDIR}/${PN}-4.10.0-handbook.patch
+   use handbook  epatch ${FILESDIR}/${PN}-4.14.10-handbook.patch
 
kde4-meta_src_prepare
 }



[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/, kde-base/korganizer/files/

2015-07-05 Thread Johannes Huber
commit: 8c395672e51a03efffe590e330650c9fbdbda5d5
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Jul  5 09:56:28 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jul  5 20:44:48 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c395672

[kde-base/korganizer] Build handbook

Fixes bug 550500

Package-Manager: portage-2.2.18

 .../korganizer/files/korganizer-4.10.0-handbook.patch  | 16 
 .../files/korganizer-4.4.2015.06-handbook.patch| 18 ++
 kde-base/korganizer/korganizer-4.14.10.ebuild  |  6 ++
 kde-base/korganizer/korganizer-4.4.2015.06.ebuild  |  6 ++
 kde-base/korganizer/korganizer-4..ebuild   |  6 ++
 5 files changed, 52 insertions(+)

diff --git a/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch 
b/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
new file mode 100644
index 000..a365d05
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.10.0-handbook.patch
@@ -0,0 +1,16 @@
+--- a/doc/CMakeLists.txt   2015-06-25 19:47:38.0 +0200
 b/doc/CMakeLists.txt   2015-07-05 11:50:37.584637940 +0200
+@@ -28,9 +28,10 @@
+ 
+ if(BUILD_kmail)
+   add_subdirectory(kmail)
+-  if(BUILD_korganizer)
+-add_subdirectory(korganizer)
+-  endif()
++endif()
++
++if(BUILD_korganizer)
++  add_subdirectory(korganizer)
+ endif()
+ 
+ if(BUILD_knode)

diff --git a/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch 
b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
new file mode 100644
index 000..a3050cc
--- /dev/null
+++ b/kde-base/korganizer/files/korganizer-4.4.2015.06-handbook.patch
@@ -0,0 +1,18 @@
+--- a/doc/CMakeLists.txt   2015-06-29 21:11:05.0 +0200
 b/doc/CMakeLists.txt   2015-07-05 12:29:51.517209734 +0200
+@@ -32,11 +32,12 @@
+ 
+ if(BUILD_kmail)
+   add_subdirectory(kmail)
+-  if(BUILD_korganizer)
+-add_subdirectory(korganizer)
+-  endif(BUILD_korganizer)
+ endif(BUILD_kmail)
+ 
++if(BUILD_korganizer)
++  add_subdirectory(korganizer)
++endif(BUILD_korganizer)
++
+ if(BUILD_knode)
+   add_subdirectory(knode)
+ endif(BUILD_knode)

diff --git a/kde-base/korganizer/korganizer-4.14.10.ebuild 
b/kde-base/korganizer/korganizer-4.14.10.ebuild
index c769653..8de685e 100644
--- a/kde-base/korganizer/korganizer-4.14.10.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.10.ebuild
@@ -67,6 +67,12 @@ src_unpack() {
kde4-meta_src_unpack
 }
 
+src_prepare() {
+   epatch ${FILESDIR}/${PN}-4.10.0-handbook.patch
+
+   kde4-meta_src_prepare
+}
+
 src_install() {
kde4-meta_src_install
# colliding with kdepim-common-libs

diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild 
b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
index f14b16f..afe5411 100644
--- a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -45,6 +45,12 @@ src_unpack() {
kde4-meta_src_unpack
 }
 
+src_prepare() {
+   epatch ${FILESDIR}/${PN}-4.4.2015.06-handbook.patch
+
+   kde4-meta_src_prepare
+}
+
 pkg_postinst() {
kde4-meta_pkg_postinst
 

diff --git a/kde-base/korganizer/korganizer-4..ebuild 
b/kde-base/korganizer/korganizer-4..ebuild
index e637075..9e9a6b7 100644
--- a/kde-base/korganizer/korganizer-4..ebuild
+++ b/kde-base/korganizer/korganizer-4..ebuild
@@ -67,6 +67,12 @@ src_unpack() {
kde4-meta_src_unpack
 }
 
+src_prepare() {
+   epatch ${FILESDIR}/${PN}-4.10.0-handbook.patch
+
+   kde4-meta_src_prepare
+}
+
 src_install() {
kde4-meta_src_install
# colliding with kdepim-common-libs



[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/

2015-07-01 Thread Andreas Hüttel
commit: 6809c695d422df705d0e0517f78af2105fadb1f3
Author: Andreas K. Huettel (dilfridge) dilfridge AT gentoo DOT org
AuthorDate: Wed Jul  1 14:55:39 2015 +
Commit: Andreas Hüttel dilfridge AT gentoo DOT org
CommitDate: Wed Jul  1 14:55:39 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6809c695

[kde-base/korganizer] Add 4.4-noakonadi snapshot

Package-Manager: portage-2.2.20

 kde-base/korganizer/korganizer-4.4.2015.06.ebuild | 56 +++
 1 file changed, 56 insertions(+)

diff --git a/kde-base/korganizer/korganizer-4.4.2015.06.ebuild 
b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
new file mode 100644
index 000..1d21210
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.4.2015.06.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
/var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.11.1.ebuild,v 1.13 
2015/06/04 18:44:44 kensington Exp $
+
+EAPI=5
+
+KMNAME=kdepim
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION=A Personal Organizer for KDE (noakonadi branch)
+KEYWORDS=
+IUSE=debug
+
+DEPEND=
+   $(add_kdebase_dep kdepimlibs '' 4.6)
+   $(add_kdebase_dep libkdepim)
+   sys-libs/zlib
+
+RDEPEND=${DEPEND}
+   $(add_kdeapps_dep ktimezoned '' 4.14.3)
+
+
+KMLOADLIBS=libkdepim
+KMEXTRA=kdgantt1
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY=
+   kmail/
+   knode/org.kde.knode.xml
+   kaddressbook/org.kde.KAddressbook.Core.xml
+
+
+# bug 378151
+RESTRICT=test
+
+src_unpack() {
+   if use kontact; then
+   KMEXTRA=${KMEXTRA}
+   kontact/plugins/planner/
+   kontact/plugins/specialdates/
+   
+   fi
+
+   kde4-meta_src_unpack
+}
+
+pkg_postinst() {
+   kde4-meta_pkg_postinst
+
+   if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+   echo
+   elog For groupware functionality, please install 
kde-base/kdepim-kresources:${SLOT}
+   echo
+   fi
+}



[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/

2015-03-29 Thread Johannes Huber
commit: 2f3644c73c23f2edddcffcba3539d3197fd43793
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sun Mar 29 12:12:49 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Mar 29 12:12:49 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f3644c7

[kde-base/korganizer] Allow RDEPEND on kde-apps/ktimezoned, bug #538638

Package-Manager: portage-2.2.18

 kde-base/korganizer/korganizer-4.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/korganizer/korganizer-4.14.6.ebuild 
b/kde-base/korganizer/korganizer-4.14.6.ebuild
index 62fe099..d20f396 100644
--- a/kde-base/korganizer/korganizer-4.14.6.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.6.ebuild
@@ -19,7 +19,7 @@ DEPEND=
sys-libs/zlib
 
 RDEPEND=${DEPEND}
-   $(add_kdebase_dep ktimezoned '' 4.14.3)
+   || ( $(add_kdebase_dep ktimezoned '' 4.14.3) $(add_kdeapps_dep 
ktimezoned) )
 
 
 RESTRICT=test



[gentoo-commits] proj/kde:master commit in: kde-base/korganizer/

2015-02-21 Thread Michael Palimaka
commit: 3438744dcddabd2e13dc6b17d39797d325075b86
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sat Feb 21 15:45:12 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Sat Feb 21 15:45:55 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3438744d

[kde-base/korganizer] Manually specify minimum versions to avoid unresolvable 
dependencies in out-of-band releases.

Package-Manager: portage-2.2.17

---
 kde-base/korganizer/korganizer-4.14.5.ebuild | 2 +-
 kde-base/korganizer/korganizer-4..ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/korganizer/korganizer-4.14.5.ebuild 
b/kde-base/korganizer/korganizer-4.14.5.ebuild
index 22f45dd..de0a297 100644
--- a/kde-base/korganizer/korganizer-4.14.5.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.5.ebuild
@@ -19,7 +19,7 @@ DEPEND=
sys-libs/zlib
 
 RDEPEND=${DEPEND}
-   $(add_kdebase_dep ktimezoned)
+   $(add_kdebase_dep ktimezoned '' 4.14.3)
 
 
 RESTRICT=test

diff --git a/kde-base/korganizer/korganizer-4..ebuild 
b/kde-base/korganizer/korganizer-4..ebuild
index 1a535e7..ce483dd 100644
--- a/kde-base/korganizer/korganizer-4..ebuild
+++ b/kde-base/korganizer/korganizer-4..ebuild
@@ -19,7 +19,7 @@ DEPEND=
sys-libs/zlib
 
 RDEPEND=${DEPEND}
-   $(add_kdebase_dep ktimezoned)
+   $(add_kdebase_dep ktimezoned '' 4.14.3)
 
 
 RESTRICT=test