commit: edc6502c0c953bd5f2d1a0bf770ee19ec08f8abe Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Fri Jan 26 00:10:14 2018 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Jan 26 00:10:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edc6502c
x11-misc/kaqaz: add missing USE dependency Also, port to EAPI 6. Closes: https://bugs.gentoo.org/645722 Package-Manager: Portage-2.3.19, Repoman-2.3.6 x11-misc/kaqaz/files/kaqaz-1.2.0-qt55.patch | 4 ++-- .../kaqaz-1.2.0-unbundle-qtsingleapplication.patch | 8 ++++---- ...kaqaz-1.2.0-r2.ebuild => kaqaz-1.2.0-r3.ebuild} | 22 +++++++++++++--------- 3 files changed, 19 insertions(+), 15 deletions(-) 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 f7e13f6b5d4..8d9adc40022 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 01689167ecd..31bcc61e11d 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 similarity index 78% rename from x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild rename to x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild index 97b38180dce..83bec081ae5 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 }
