From 1abb702598becc25137483ba0e314b9043dc8f53 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Mon, 19 Feb 2018 20:52:21 +0100
Subject: app-text/goldendict: Prepare for qtsingleapplication dropping qt5

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild | 92 ----------------------
 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 92 ++++++++++++++++++++++
 2 files changed, 92 insertions(+), 92 deletions(-)
 delete mode 100644 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
 create mode 100644 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
deleted file mode 100644
index 0ac7d9edbe8c..000000000000
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV^^}
-MY_PV=${MY_PV/_/-}
-inherit eutils qmake-utils
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg libav"
-
-RDEPEND="
-	app-arch/bzip2
-	>=app-text/hunspell-1.2:=
-	dev-libs/eb
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5]
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/libvorbis
-	media-libs/tiff:0
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-	ffmpeg? (
-		media-libs/libao
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# disable git
-	sed -i \
-		-e '/git describe/s/^/#/' \
-		${PN}.pro || die
-
-	# fix installation path
-	sed -i \
-		-e '/PREFIX = /s:/usr/local:/usr:' \
-		${PN}.pro || die
-
-	# add trailing semicolon
-	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
-}
-
-src_configure() {
-	local myconf=()
-
-	if ! use ffmpeg ; then
-		myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-	fi
-
-	eqmake5 "${myconf[@]}"
-}
-
-src_install() {
-	dobin ${PN}
-	domenu redist/${PN}.desktop
-	doicon redist/icons/${PN}.png
-
-	insinto /usr/share/apps/${PN}/locale
-	doins locale/*.qm
-
-	insinto /usr/share/${PN}/help
-	doins help/*.qch
-}
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
new file mode 100644
index 000000000000..47c7916defc8
--- /dev/null
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV^^}
+MY_PV=${MY_PV/_/-}
+inherit eutils qmake-utils
+
+DESCRIPTION="Feature-rich dictionary lookup program"
+HOMEPAGE="http://goldendict.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug ffmpeg libav"
+
+RDEPEND="
+	app-arch/bzip2
+	>=app-text/hunspell-1.2:=
+	dev-libs/eb
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+)]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/libvorbis
+	media-libs/tiff:0
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+	ffmpeg? (
+		media-libs/libao
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# disable git
+	sed -i \
+		-e '/git describe/s/^/#/' \
+		${PN}.pro || die
+
+	# fix installation path
+	sed -i \
+		-e '/PREFIX = /s:/usr/local:/usr:' \
+		${PN}.pro || die
+
+	# add trailing semicolon
+	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
+}
+
+src_configure() {
+	local myconf=()
+
+	if ! use ffmpeg ; then
+		myconf+=( DISABLE_INTERNAL_PLAYER=1 )
+	fi
+
+	eqmake5 "${myconf[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu redist/${PN}.desktop
+	doicon redist/icons/${PN}.png
+
+	insinto /usr/share/apps/${PN}/locale
+	doins locale/*.qm
+
+	insinto /usr/share/${PN}/help
+	doins help/*.qch
+}
-- 
cgit v1.2.3-65-gdbad