[gentoo-commits] proj/kde:master commit in: kde-apps/libakonadi/

[Michael Palimaka]

commit:     76e0eb16fe712ab84a87130603cc90d58f4f2e74
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 17:06:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:21:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=76e0eb16

kde-apps/libakonadi: Patches go into PATCHES

Important: Requires b56904fffadd50e7f13d49d47797604fd0ecbc87

Package-Manager: portage-2.2.24

 kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild    | 11 ++++++-----
 kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild |  6 +++---
 kde-apps/libakonadi/libakonadi-9999.ebuild          |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild 
b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild
index a739078..dd646a1 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.0-r1.ebuild
@@ -60,16 +60,17 @@ else
        S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
 fi
 
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" \
-               "${FILESDIR}/${PN}-15.12.0-fix-possible-crash.patch"
+PATCHES=(
+       "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
+       "${FILESDIR}/${PN}-15.12.0-fix-possible-crash.patch"
+)
 
+src_prepare() {
+       kde5_src_prepare
        if ! use tools ; then
                sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
                        -i src/CMakeLists.txt || die
        fi
-
-       kde5_src_prepare
 }
 
 src_configure() {

diff --git a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild 
b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
index 589a9a1..d895446 100644
--- a/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-15.12.49.9999.ebuild
@@ -60,14 +60,14 @@ else
        S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
 fi
 
+PATCHES=( "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" )
+
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
+       kde5_src_prepare
        if ! use tools ; then
                sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
                        -i src/CMakeLists.txt || die
        fi
-
-       kde5_src_prepare
 }
 
 src_configure() {

diff --git a/kde-apps/libakonadi/libakonadi-9999.ebuild 
b/kde-apps/libakonadi/libakonadi-9999.ebuild
index 589a9a1..d895446 100644
--- a/kde-apps/libakonadi/libakonadi-9999.ebuild
+++ b/kde-apps/libakonadi/libakonadi-9999.ebuild
@@ -60,14 +60,14 @@ else
        S="${WORKDIR}/${KMNAME}-${PV}/akonadi"
 fi
 
+PATCHES=( "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch" )
+
 src_prepare() {
-       epatch "${FILESDIR}/${PN}-15.11.80-testtools-optional.patch"
+       kde5_src_prepare
        if ! use tools ; then
                sed -e "/add_subdirectory(xml)/ s/^/#DONT/" \
                        -i src/CMakeLists.txt || die
        fi
-
-       kde5_src_prepare
 }
 
 src_configure() {