gentoo resync : 25.01.2018

4 files changed, 22 insertions, 18 deletions

diff --git a/x11-misc/kaqaz/Manifest b/x11-misc/kaqaz/Manifest
index fbf4a7707386..0b6a4770064b 100644
--- a/x11-misc/kaqaz/Manifest
+++ b/x11-misc/kaqaz/Manifest
@@ -1,5 +1,5 @@
-AUX kaqaz-1.2.0-qt55.patch 235 BLAKE2B 70646382d76921edbfb294d58bf5f959557980a76432e41e92df7e595840aaf09e01d323d0225de73fa72131c1191f15428cf3402778722d4e0c61143c2f23e4 SHA512 4207b14df5e803670ff7688ad4970f0781e1322aefd65251ab1d47aec7bbf09b0c3520c77eab43452570c8b8b6aa609aa48dfdef0d0087a09b3b3e1de2bdfe3d
-AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1444 BLAKE2B e82a2a309e176b3b16f4740a6f4e37a06d0291d01401548405484882437d0599660c6347c97b70d17bfe63d17a58234fb036cf02c1d1572baeb84da453c69ba3 SHA512 feeed7837fa9890d245b30ec2004846ba0e51fe54f756465c141f90e9d48c647a85c9360194d24e4e315665227a7b9b996d79a363664a83bb08a2dc89d170f48
+AUX kaqaz-1.2.0-qt55.patch 239 BLAKE2B 78369f07e9acf49443a8e51cef13c144df605c8ec7087be525e3b41fd2c92dd534b080970066d55e47e5d7b34b6ec2d7fbeb229f7dd520988539ff59359dd698 SHA512 9f97f60532e89c41fd27be1db20471eba9465ed145fdd39f578918525801a385ba58a5a6a649ce47bff754dca7b46515337694e87c55a8198f8a236086867c50
+AUX kaqaz-1.2.0-unbundle-qtsingleapplication.patch 1452 BLAKE2B 7827185411a5531f0eeb320705261bc72b220456a97edc31133e038c64ca5eaa67e54f29ea66a0e44224018fab695def466a215ca9b92aed92f8c78d319ce4df SHA512 c35b4cda2f3895a20b01276b8ab80757182d6f825508a320480fdbb27bd58c9f8d2fa59a6b291f59c2eff0c4d948f3d960c88b144d34f8cba7605698a8b0d2c1
 DIST kaqaz-1.2.0.tar.gz 5824631 BLAKE2B 52e9f8ed5896ddf3415386364fa684927eccda2342d60971a64d4602fa4e83f387bbfd47c7898deb04a798fc0be0a8e905ac9cd2fa58bec12f43b0cd9e3f6f17 SHA512 447d4bb9dd413b07f1f05ab797fe3c277caa1afc7063dccc080ee274f266e07dd04c17b56cacd8baa6e67ba53e0012f2cf5d490493c5fbd24c3e6bfcbf1887c4
-EBUILD kaqaz-1.2.0-r2.ebuild 1074 BLAKE2B 743c2b6a0060b6a1c14bf1b93f5710b8f0a5addf18458c7bee97f73c795fed69042907bd0abe3f44ce5393deeb008c25fcc8b14700601172c2d4834108c84b2f SHA512 4ad48dd324cfbef944ca187a891f81e1fad783e799552563dfaddfa0fa7fe86adcc61a9f89250fcb54b6c0e1c9389e87fc0701c0df24c0da0e0704dca3f4a545
+EBUILD kaqaz-1.2.0-r3.ebuild 1069 BLAKE2B daf47925c752d250fc73ed73b4e2700df72aefd6b530d398c5bd5c496a76ceadd2768def61d1a304f9cf03bbc60b10124b850312e5cd9e36981e486fe7e409f1 SHA512 17ac62eaa5f5370df98bde1e5a789a9b5d000fbd5de8b9ba6ec4b5b0fb1a3d15059372fc9500181af345eff80c969be2403905c48b906792c663895c6b056026
 MISC metadata.xml 329 BLAKE2B 5790839b9df9a5edabcf80fecd9d9e8f1c6aa82ebf37d21d989a4bc28466bcfea950c59619f07eea447b09235db66e1607775cb2b3d0299ede1565fe7e4064e3 SHA512 d5a2685890a52c9815b94c233108510f21c57cae6d3ab3a03f869a99eb5cea3724de3597c9b47e23b8526e41164a7a54b9ab14029cf17a7fc3a4679d5957f3db
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
index f7e13f6b5d40..8d9adc400225 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch
@@ -2,8 +2,8 @@ Fix build with Qt 5.5.
 
 Gentoo-bug: 563678
 
---- databasedatatypes.h
-+++ databasedatatypes.h
+--- a/databasedatatypes.h
++++ b/databasedatatypes.h
 @@ -23,6 +23,7 @@
  #include <QColor>
  #include <QStringList>
diff --git a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
index 01689167ecd8..31bcc61e11db 100644
--- a/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
+++ b/x11-misc/kaqaz/files/kaqaz-1.2.0-unbundle-qtsingleapplication.patch
@@ -1,7 +1,7 @@
 Use system copy of qtsingleapplication.
 
---- sialantools/sialantools.pri
-+++ sialantools/sialantools.pri
+--- a/sialantools/sialantools.pri
++++ b/sialantools/sialantools.pri
 @@ -1,4 +1,5 @@
  QT += qml quick
 +CONFIG += qtsingleapplication
@@ -30,8 +30,8 @@ Use system copy of qtsingleapplication.
      }
  }
 
---- sialantools/sialanapplication.h
-+++ sialantools/sialanapplication.h
+--- a/sialantools/sialanapplication.h
++++ b/sialantools/sialanapplication.h
 @@ -22,7 +22,7 @@
  #include "sialan_macros.h"
  
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
index 97b38180dce6..83bec081ae59 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils qmake-utils
+EAPI=6
+
+inherit qmake-utils
 
 DESCRIPTION="Modern note manager"
 HOMEPAGE="https://github.com/sialan-labs/kaqaz/"
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/sialan-labs/kaqaz.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -19,12 +19,13 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-qt/qtcore:5
+RDEPEND="
+	dev-qt/qtcore:5
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgraphicaleffects:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtpositioning:5
 	dev-qt/qtsingleapplication[qt5,X]
 	dev-qt/qtsensors:5
@@ -35,10 +36,13 @@ RDEPEND="dev-qt/qtcore:5
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qt55.patch"
-	epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+PATCHES=(
+	"${FILESDIR}/${P}-qt55.patch"
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+)
 
+src_prepare() {
+	default
 	rm -r sialantools/qtsingleapplication || die
 }