From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/
Date: Thu, 11 Sep 2014 21:52:59 +0000 (UTC) [thread overview]
Message-ID: <1410472109.030c9a707d29f8ab381730d914642de664f36914.johu@gentoo> (raw)
commit: 030c9a707d29f8ab381730d914642de664f36914
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 11 21:48:29 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 21:48:29 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=030c9a70
[app-office/akonadi-server] Adapt upstream changes
Package-Manager: portage-2.2.12
---
.../akonadi-server/akonadi-server-9999.ebuild | 56 +++++++---------------
app-office/akonadi-server/metadata.xml | 3 --
2 files changed, 18 insertions(+), 41 deletions(-)
diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/app-office/akonadi-server/akonadi-server-9999.ebuild
index 93bc60a..d5e29ad 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/app-office/akonadi-server/akonadi-server-9999.ebuild
@@ -5,8 +5,7 @@
EAPI=5
if [[ $PV = *9999* ]]; then
- scm_eclass=git-r3
- EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+ EGIT_REPONAME="${PN/-server/}"
SRC_URI=""
KEYWORDS=""
else
@@ -15,52 +14,40 @@ else
S="${WORKDIR}/${P/-server/}"
fi
-inherit cmake-utils ${scm_eclass}
+KDE_TESTS=true
+VIRTUALDBUS_TEST=true
+inherit kde5
DESCRIPTION="The server part of Akonadi"
HOMEPAGE="http://pim.kde.org/akonadi"
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres sqlite test"
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+# TODO: new optional dep see ENABLE_ASAN
CDEPEND="
- dev-libs/boost:=
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5[mysql?,postgres?]
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
x11-misc/shared-mime-info
- qt4? (
- >=dev-qt/qtcore-4.8.5:4
- >=dev-qt/qtdbus-4.8.5:4
- >=dev-qt/qtgui-4.8.5:4
- >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
- >=dev-qt/qttest-4.8.5:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5[mysql?,postgres?]
- dev-qt/qttest:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- soprano? ( dev-libs/soprano[-qt4,qt5] )
- )
- soprano? ( dev-libs/soprano )
sqlite? ( dev-db/sqlite:3 )
"
DEPEND="${CDEPEND}
dev-libs/libxslt
- >=dev-util/automoc-0.9.88
test? ( sys-apps/dbus )
"
RDEPEND="${CDEPEND}
postgres? ( dev-db/postgresql-server )
"
-RESTRICT="test"
-
pkg_setup() {
# Set default storage backend in order: MySQL, SQLite PostgreSQL
# reverse driver check to keep the order
@@ -94,19 +81,12 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=OFF
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
- $(cmake-utils_use test AKONADI_BUILD_TESTS)
- $(cmake-utils_use_with soprano)
$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
- $(cmake-utils_use qt5 QT5_BUILD)
)
- cmake-utils_src_configure
-}
-
-src_test() {
- export $(dbus-launch)
- cmake-utils_src_test
+ kde5_src_configure
}
src_install() {
@@ -118,7 +98,7 @@ EOF
insinto /usr/share/config/akonadi
doins "${T}"/akonadiserverrc
- cmake-utils_src_install
+ kde5_src_install
}
pkg_postinst() {
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index 3142906..a23f444 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
- <use>
- <flag name="soprano">Enable deprecated <pkg>dev-libs/soprano</pkg>, needed for nepomuk search</flag>
- </use>
</pkgmetadata>
next reply other threads:[~2014-09-11 21:53 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-11 21:52 Johannes Huber [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-07-22 12:36 [gentoo-commits] proj/kde:master commit in: app-office/akonadi-server/ Michael Palimaka
2014-12-30 16:39 Elias Probst
2014-09-12 19:03 Johannes Huber
2014-08-10 11:43 Johannes Huber
2014-07-20 14:22 Andreas Hüttel
2014-07-18 15:01 Johannes Huber
2014-07-18 13:58 Manuel Rüger
2014-04-21 13:23 Johannes Huber
2014-04-21 12:32 Johannes Huber
2014-03-29 19:50 Johannes Huber
2014-03-19 21:53 Johannes Huber
2014-03-08 15:09 Johannes Huber
2013-12-18 18:02 Johannes Huber
2013-12-09 4:10 Chris Reffett
2013-11-24 0:22 Johannes Huber
2013-10-14 22:00 Andreas Hüttel
2013-10-13 17:03 Johannes Huber
2013-09-08 13:50 Michael Palimaka
2013-07-10 19:59 Johannes Huber
2013-06-12 21:18 Johannes Huber
2013-06-03 15:32 Michael Palimaka
2013-06-01 15:58 Michael Palimaka
2013-05-08 18:39 Johannes Huber
2013-03-20 13:25 Michael Palimaka
2013-03-11 16:21 Michael Palimaka
2013-03-03 16:14 Michael Palimaka
2013-02-06 20:17 Andreas Hüttel
2013-02-06 16:03 Chris Reffett
2013-02-06 15:59 Chris Reffett
2013-01-04 7:50 Alexey Shvetsov
2013-01-04 7:45 Alexey Shvetsov
2012-11-25 16:35 Andreas Hüttel
2012-11-16 19:05 Alexey Shvetsov
2012-07-25 21:15 Johannes Huber
2012-06-28 13:14 Andreas Hüttel
2012-01-25 19:15 Johannes Huber
2012-01-24 22:57 Andreas Hüttel
2012-01-18 12:25 Johannes Huber
2011-12-21 0:00 Johannes Huber
2011-10-23 2:07 Jonathan Callen
2011-07-18 11:49 Jorge Manuel B. S. Vicetto
2011-07-11 21:38 Alexey Shvetsov
2011-06-29 9:06 Alexey Shvetsov
2011-05-24 5:57 Jorge Manuel B. S. Vicetto
2011-04-05 23:43 Tomas Chvatal
2011-04-05 23:27 Tomas Chvatal
2011-02-17 16:55 Tomas Chvatal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410472109.030c9a707d29f8ab381730d914642de664f36914.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox