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

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

[Andreas Hüttel]

commit:     4a95d850442f7fb9737aa434ab1d191d3f534249
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 22:49:51 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 22:50:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4a95d850

[kde-base/kdepim-kresources] seems to need "new" addressbook

 kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
index 457ef74..d19aaf8 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
@@ -14,7 +14,8 @@ KEYWORDS=""
 
 DEPEND="
 	$(add_kdebase_dep kdepimlibs '' 4.6)
-	$(add_kdebase_dep libkdepim '' 4.4.2015)
+	$(add_kdebase_dep libkdepim '')
+	$(add_kdebase_dep kaddressbook '' 4.4.2015)
 "
 RDEPEND="${DEPEND}"
 

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

[Andreas Hüttel]

commit:     9db1be11582e029f15e34e3862ffe6be3a7e0d6f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 22:11:55 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 22:11:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9db1be11

[kde-base/kdepim-kresources] moved to main tree

Package-Manager: portage-2.2.20

 .../kdepim-kresources-4.4.2015.06.ebuild           | 48 ----------------------
 1 file changed, 48 deletions(-)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
deleted file mode 100644
index fa0387a..0000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection (noakonadi branch)"
-IUSE="debug"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs '' 4.6)
-	$(add_kdebase_dep libkdepim '')
-	$(add_kdebase_dep kaddressbook '' 4.4.2015)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	kaddressbook/common/
-	kmail/
-	knotes/
-	korganizer/version.h
-"
-
-KMLOADLIBS="libkdepim"
-
-src_prepare() {
-	local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"
-
-	pushd kaddressbook/common
-	# create the kabprefs_base.h file
-	"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
-	popd
-
-	kde4-meta_src_prepare
-}
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/{groupwise,slox}/*.h
-}

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

[Andreas Hüttel]

commit:     f22de3aac2533c9258d2f4aab36e4923faaf695d
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  2 07:24:21 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 07:24:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=f22de3aa

[kde-base/kdepim-kresources] fix build following KDE 4.3

 .../kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
index d19aaf8..7b1dfda 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
@@ -20,14 +20,25 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 KMEXTRACTONLY="
+	kaddressbook/common/
 	kmail/
 	knotes/
 	korganizer/version.h
-	kaddressbook/common/kabprefs.h
 "
 
 KMLOADLIBS="libkdepim"
 
+src_prepare() {
+	local kconfig_compiler="${EKDEDIR}/bin/kconfig_compiler"
+
+	pushd kaddressbook/common
+	# create the kabprefs_base.h file
+	"${kconfig_compiler}" kaddressbook.kcfg kabprefs_base.kcfgc
+	popd
+
+	kde4-meta_src_prepare
+}
+
 src_install() {
 	kde4-meta_src_install
 

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

[Andreas Hüttel]

commit:     2a7b63b0804edec61ea750c5c9cf1fd4bad7ef8f
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 21:31:53 2015 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 21:43:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a7b63b0

[kde-base/kdepim-kresources] Add 4.4-noakonadi snapshot. Untested.

Package-Manager: portage-2.2.20

 .../kdepim-kresources-4.4.2015.06.ebuild           | 36 ++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
new file mode 100644
index 0000000..17a2206
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.4.2015.06.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.4.11.1.ebuild,v 1.9 2014/04/05 18:13:24 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection (noakonadi branch)"
+IUSE="debug"
+KEYWORDS=""
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim '' 4.4.2015)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	korganizer/version.h
+	kaddressbook/common/kabprefs.h
+"
+
+KMLOADLIBS="libkdepim"
+
+src_install() {
+	kde4-meta_src_install
+
+	# Install headers needed by kdepim-wizards, egroupware stuff gone
+	insinto "${PREFIX}"/include/${PN}
+	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/{groupwise,slox}/*.h
+}

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

[Johannes Huber]

commit:     19e8730d7f48145be1a13d8c159032379437e303
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 08:14:11 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 08:14:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=19e8730d

[kde-base/kdepim-kresources] Remove header file install, kdepim-wizards gone. Fix bug 397579.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../kdepim-kresources-9999.ebuild                  |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
index 6c4b1ab..9140c63 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-9999.ebuild
@@ -26,11 +26,3 @@ KMEXTRACTONLY="
 "
 
 KMLOADLIBS="kdepim-common-libs"
-
-src_install() {
-	kde4-meta_src_install
-
-	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
-	insinto "${PREFIX}"/include/${PN}
-	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h
-}