public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-04-27 15:24 Manuel Rüger
  0 siblings, 0 replies; 8+ messages in thread
From: Manuel Rüger @ 2015-04-27 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     3d779b6b2f74b3ce7b0da1aa250273a22a8df048
Author:     Karol Herbst <git <AT> karolherbst <DOT> de>
AuthorDate: Thu Mar 26 18:00:36 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 08:38:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d779b6b

[kde-apps/kdepimlibs] added KF5 based version

Package-Manager: portage-2.2.18

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 85 ++++++++++++++++++++++++++++++
 kde-apps/kdepimlibs/metadata.xml           |  9 ++++
 2 files changed, 94 insertions(+)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
new file mode 100644
index 0000000..416ef9c
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS=""
+LICENSE="LGPL-2.1"
+IUSE="designer prison ssl test"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kldap)
+	app-office/akonadi-server
+	dev-libs/libxml2
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	media-libs/phonon[qt5]
+	prison? ( media-libs/prison:5 )
+	ssl? ( dev-libs/cyrus-sasl )
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kservice)
+	$(add_kdeapps_dep kmime)
+	dev-qt/qtdbus:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+"
+DEPEND="
+	${COMMON_DEPEND}
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep kmbox)
+	dev-libs/boost
+	dev-libs/libxslt
+	x11-misc/shared-mime-info
+	designer? ( dev-qt/designer )
+"
+
+src_prepare() {
+	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
+	for d in $(find "${S}" -maxdepth 1 -type d); do
+		pushd "$d"
+		kde5_src_prepare
+		popd
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer Qt5Designer)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package ssl Sasl2)
+		$(cmake-utils_use_build test TESTING)
+	)
+	kde5_src_configure
+}

diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
new file mode 100644
index 0000000..34055f7
--- /dev/null
+++ b/kde-apps/kdepimlibs/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>kde</herd>
+	<use>
+		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
+		<flag name="prison">Enable support for QRcodes in contacts</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-05-23 16:13 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-05-23 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     8f76837dbbe5c541ad2f4b66a69cec8b0d4f820b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun May 17 18:16:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat May 23 16:12:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8f76837d

[kde-apps/kdepimlibs] Fix DEPENDs, use KDE_HANDBOOK, KDE_TEST

Package-Manager: portage-2.2.18

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 61 +++++++++++++++---------------
 1 file changed, 30 insertions(+), 31 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index 416ef9c..809a7af 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -4,68 +4,67 @@
 
 EAPI=5
 
+KDE_HANDBOOK=true
+KDE_TEST=true
 inherit kde5
 
 DESCRIPTION="Common library for KDE PIM apps"
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="designer prison ssl test"
+IUSE="designer prison ssl"
 
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-COMMON_DEPEND="
+RDEPEND="
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
 	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
+	$(add_kdeapps_dep kmbox)
+	$(add_kdeapps_dep kmime)
 	app-office/akonadi-server
 	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/phonon[qt5]
+	x11-misc/shared-mime-info
+	designer? ( dev-qt/designer:5 )
 	prison? ( media-libs/prison:5 )
 	ssl? ( dev-libs/cyrus-sasl )
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kservice)
-	$(add_kdeapps_dep kmime)
-	dev-qt/qtdbus:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="
-	${COMMON_DEPEND}
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep kmbox)
-	dev-libs/boost
-	dev-libs/libxslt
-	x11-misc/shared-mime-info
-	designer? ( dev-qt/designer )
 "
+DEPEND="${RDEPEND}
+	dev-libs/boost"
 
 src_prepare() {
+	use handbook || \
+		sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
+			-e '/^add_subdirectory(docs)/ s/^/#/' \
+			-i kioslave/CMakeLists.txt || die
 	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
 	for d in $(find "${S}" -maxdepth 1 -type d); do
 		pushd "$d"


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-06-07 21:43 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-06-07 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     6fb64597edf8cccdaffa838543338b0d40d57687
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  7 21:34:54 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun  7 21:34:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fb64597

[kde-apps/kdepimlibs] Raise DEPEND on app-office/akonadi-server

Package-Manager: portage-2.2.20

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index 809a7af..9b1fe04 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -42,7 +42,7 @@ RDEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	app-office/akonadi-server
+	>=app-office/akonadi-server-5.0.41
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-qt/qtdbus:5


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-07-16 18:34 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2015-07-16 18:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3d1c186b634fdf87594314150303689386def7ec
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Jul 15 23:23:03 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 18:01:56 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3d1c186b

[kde-apps/kdepimlibs] Add block against kde-base/kdepimlibs

Package-Manager: portage-2.2.20

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index 9b1fe04..9bd89cd 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="designer prison ssl"
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
 
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
@@ -57,8 +57,12 @@ RDEPEND="
 	prison? ( media-libs/prison:5 )
 	ssl? ( dev-libs/cyrus-sasl )
 "
-DEPEND="${RDEPEND}
-	dev-libs/boost"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-base/kdepimlibs
+"
 
 src_prepare() {
 	use handbook || \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-10-08 13:07 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-10-08 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     7f1c27e10b3c76cfd04c5ba9616caae99f664ecc
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 22:44:08 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 13:07:20 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7f1c27e1

kde-apps/kdepimlibs: Add USE=tools, fix KDE_DOC_DIR, add KDE_DOXYGEN

Package-Manager: portage-2.2.22

 kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild       | 11 +++++++++--
 kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 11 +++++++++--
 kde-apps/kdepimlibs/metadata.xml                    |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
index 8f05846..9751207 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
@@ -4,6 +4,9 @@
 
 EAPI=5
 
+KDE_DOC_DIR="kioslave/docs"
+KDE_DOX_DIR="akonadi"
+KDE_DOXYGEN=true
 KDE_HANDBOOK=true
 KDE_TEST=true
 inherit kde5
@@ -11,7 +14,7 @@ inherit kde5
 DESCRIPTION="Common library for KDE PIM apps"
 KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1"
-IUSE="designer prison ssl"
+IUSE="designer prison ssl tools"
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
@@ -43,7 +46,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -56,6 +58,7 @@ COMMON_DEPEND="
 	designer? ( dev-qt/designer:5 )
 	prison? ( media-libs/prison:5 )
 	ssl? ( dev-libs/cyrus-sasl )
+	tools? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -73,6 +76,10 @@ src_prepare() {
 		sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 			-e '/^add_subdirectory(docs)/ s/^/#/' \
 			-i kioslave/CMakeLists.txt || die
+
+	use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
+		-i akonadi/src/CMakeLists.txt
+
 	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
 	for d in $(find "${S}" -maxdepth 1 -type d); do
 		pushd "$d"

diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
index 1aeb6f1..5237534 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
@@ -4,6 +4,9 @@
 
 EAPI=5
 
+KDE_DOC_DIR="kioslave/docs"
+KDE_DOX_DIR="akonadi"
+KDE_DOXYGEN=true
 KDE_HANDBOOK=true
 KDE_TEST=true
 inherit kde5
@@ -11,7 +14,7 @@ inherit kde5
 DESCRIPTION="Common library for KDE PIM apps"
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="designer prison ssl"
+IUSE="designer prison ssl tools"
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT="test"
@@ -43,7 +46,6 @@ COMMON_DEPEND="
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -56,6 +58,7 @@ COMMON_DEPEND="
 	designer? ( dev-qt/designer:5 )
 	prison? ( media-libs/prison:5 )
 	ssl? ( dev-libs/cyrus-sasl )
+	tools? ( dev-libs/libxml2 )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
@@ -69,6 +72,10 @@ src_prepare() {
 		sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
 			-e '/^add_subdirectory(docs)/ s/^/#/' \
 			-i kioslave/CMakeLists.txt || die
+
+	use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
+		-i akonadi/src/CMakeLists.txt
+
 	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
 	for d in $(find "${S}" -maxdepth 1 -type d); do
 		pushd "$d"

diff --git a/kde-apps/kdepimlibs/metadata.xml b/kde-apps/kdepimlibs/metadata.xml
index 34055f7..24190e4 100644
--- a/kde-apps/kdepimlibs/metadata.xml
+++ b/kde-apps/kdepimlibs/metadata.xml
@@ -5,5 +5,6 @@
 	<use>
 		<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
 		<flag name="prison">Enable support for QRcodes in contacts</flag>
+		<flag name="tools">Install tools for developers and testing</flag>
 	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-10-08 13:07 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-10-08 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     4c45206dccfbee3f74d3becd156a9c6b7582b0e0
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct  7 22:41:38 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct  8 13:07:21 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4c45206d

kde-apps/kdepimlibs: Drop obsolete live ebuild

 kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 88 ------------------------------
 1 file changed, 88 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
deleted file mode 100644
index 1aeb6f1..0000000
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_TEST=true
-inherit kde5
-
-DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS=""
-LICENSE="LGPL-2.1"
-IUSE="designer prison ssl"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kldap)
-	$(add_kdeapps_dep kmbox)
-	$(add_kdeapps_dep kmime)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/phonon[qt5]
-	x11-misc/shared-mime-info
-	designer? ( dev-qt/designer:5 )
-	prison? ( media-libs/prison:5 )
-	ssl? ( dev-libs/cyrus-sasl )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-base/kdepimlibs:4
-"
-
-src_prepare() {
-	use handbook || \
-		sed -e '/^find_package.*KF5DocTools/ s/^/#/' \
-			-e '/^add_subdirectory(docs)/ s/^/#/' \
-			-i kioslave/CMakeLists.txt || die
-	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
-	for d in $(find "${S}" -maxdepth 1 -type d); do
-		pushd "$d"
-		kde5_src_prepare
-		popd
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer Qt5Designer)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package ssl Sasl2)
-		$(cmake-utils_use_build test TESTING)
-	)
-	kde5_src_configure
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2015-10-12 12:46 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2015-10-12 12:46 UTC (permalink / raw
  To: gentoo-commits

commit:     a7297fa4ef0bbcd8bfc81417473106385bf21c49
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 12:37:30 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 12:37:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a7297fa4

kde-apps/kdepimlibs: nitpicks

Package-Manager: portage-2.2.20.1

 kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild       | 13 +++++++------
 kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
index 9751207..0178c66 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
@@ -6,9 +6,9 @@ EAPI=5
 
 KDE_DOC_DIR="kioslave/docs"
 KDE_DOX_DIR="akonadi"
-KDE_DOXYGEN=true
-KDE_HANDBOOK=true
-KDE_TEST=true
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Common library for KDE PIM apps"
@@ -78,13 +78,14 @@ src_prepare() {
 			-i kioslave/CMakeLists.txt || die
 
 	use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
-		-i akonadi/src/CMakeLists.txt
+		-i akonadi/src/CMakeLists.txt || die
 
 	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
+	local d
 	for d in $(find "${S}" -maxdepth 1 -type d); do
-		pushd "$d"
+		pushd "${d}" > /dev/null || die
 		kde5_src_prepare
-		popd
+		popd > /dev/null || die
 	done
 }
 

diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
index 5237534..28fa97d 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
@@ -6,9 +6,9 @@ EAPI=5
 
 KDE_DOC_DIR="kioslave/docs"
 KDE_DOX_DIR="akonadi"
-KDE_DOXYGEN=true
-KDE_HANDBOOK=true
-KDE_TEST=true
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Common library for KDE PIM apps"
@@ -74,13 +74,14 @@ src_prepare() {
 			-i kioslave/CMakeLists.txt || die
 
 	use tools || sed -e "/add_subdirectory(xml)/ s/^/#/" \
-		-i akonadi/src/CMakeLists.txt
+		-i akonadi/src/CMakeLists.txt || die
 
 	# kdepimlibs contains many projects for which we have to run our kde5_src_prepare
+	local d
 	for d in $(find "${S}" -maxdepth 1 -type d); do
-		pushd "$d"
+		pushd "${d}" > /dev/null || die
 		kde5_src_prepare
-		popd
+		popd > /dev/null || die
 	done
 }
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/
@ 2016-04-03 19:22 Johannes Huber
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Huber @ 2016-04-03 19:22 UTC (permalink / raw
  To: gentoo-commits

commit:     2de4ee93cebf988f4ba13d64f975e83de3bc77f6
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  3 19:11:54 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Apr  3 19:11:54 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2de4ee93

kde-apps/kdepimlibs: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild
index 426e40e..923628e 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 CPPUNIT_REQUIRED="optional"
@@ -45,9 +45,9 @@ PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_build handbook doc)
-		$(cmake-utils_use_find_package ldap)
-		$(cmake-utils_use_find_package prison)
+		-DBUILD_doc=$(usex handbook)
+		$(cmake-utils_use_find_package ldap Ldap)
+		$(cmake-utils_use_find_package prison Prison)
 	)
 
 	kde4-base_src_configure


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-04-03 19:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-16 18:34 [gentoo-commits] proj/kde:master commit in: kde-apps/kdepimlibs/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2016-04-03 19:22 Johannes Huber
2015-10-12 12:46 Michael Palimaka
2015-10-08 13:07 Michael Palimaka
2015-10-08 13:07 Michael Palimaka
2015-06-07 21:43 Johannes Huber
2015-05-23 16:13 Michael Palimaka
2015-04-27 15:24 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox