From edc6502c0c953bd5f2d1a0bf770ee19ec08f8abe Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 26 Jan 2018 11:10:14 +1100
Subject: 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 ++--
 x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild               | 51 --------------------
 x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild               | 55 ++++++++++++++++++++++
 4 files changed, 61 insertions(+), 57 deletions(-)
 delete mode 100644 x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
 create mode 100644 x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild

(limited to 'x11-misc/kaqaz')

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-r2.ebuild
deleted file mode 100644
index 97b38180dce6..000000000000
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils 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"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-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/qtpositioning:5
-	dev-qt/qtsingleapplication[qt5,X]
-	dev-qt/qtsensors:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-qt55.patch"
-	epatch "${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
-
-	rm -r sialantools/qtsingleapplication || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-}
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..83bec081ae59
--- /dev/null
+++ b/x11-misc/kaqaz/kaqaz-1.2.0-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+else
+	SRC_URI="https://github.com/sialan-labs/kaqaz/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+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[ssl]
+	dev-qt/qtpositioning:5
+	dev-qt/qtsingleapplication[qt5,X]
+	dev-qt/qtsensors:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-qt55.patch"
+	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
+)
+
+src_prepare() {
+	default
+	rm -r sialantools/qtsingleapplication || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+}
-- 
cgit v1.2.3-18-g5258