[gentoo-commits] proj/qt:master commit in: app-text/goldendict/files/, app-text/goldendict/

[Michael Palimaka]

commit:     1ea676d637f96fbf715e19c30e3dc8b4deb5f474
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 17:14:36 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 17:14:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=1ea676d6

app-text/goldendict: switch to Qt 5

Based on work by Gleb.

Gentoo-bug: 574464

Package-Manager: portage-2.3.2

 ...endict-9999-qtsingleapplication-unbundle.patch} | 14 ++---
 app-text/goldendict/goldendict-9999.ebuild         | 68 ++++++++++++----------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-9999-qtsingleapplication-unbundle.patch
similarity index 55%
rename from app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
rename to app-text/goldendict/files/goldendict-9999-qtsingleapplication-unbundle.patch
index 407b261..01fdb3b 100644
--- a/app-text/goldendict/files/goldendict-36a761108-qtsingleapplication-unbundle.patch
+++ b/app-text/goldendict/files/goldendict-9999-qtsingleapplication-unbundle.patch
@@ -1,16 +1,16 @@
---- goldendict.pro.orig	2014-11-02 12:42:07.845942253 +0800
-+++ goldendict.pro	2014-11-02 12:44:22.965590774 +0800
-@@ -24,7 +24,8 @@
+--- a/goldendict.pro
++++ b/goldendict.pro
+@@ -36,7 +36,8 @@
+ QT += sql
  CONFIG += exceptions \
      rtti \
-     stl \
--    help
-+    help \
+-    stl
++    stl \
 +    qtsingleapplication
  OBJECTS_DIR = build
  UI_DIR = build
  MOC_DIR = build
-@@ -548,5 +549,3 @@
+@@ -632,5 +633,3 @@
  TS_OUT ~= s/.ts/.qm/g
  PRE_TARGETDEPS += $$TS_OUT
  

diff --git a/app-text/goldendict/goldendict-9999.ebuild b/app-text/goldendict/goldendict-9999.ebuild
index 94b2722..b52d986 100644
--- a/app-text/goldendict/goldendict-9999.ebuild
+++ b/app-text/goldendict/goldendict-9999.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-LANGSLONG="ar_SA bg_BG cs_CZ de_DE el_GR lt_LT ru_RU zh_CN"
+EAPI=6
 
-inherit qt4-r2 git-r3
+inherit eutils git-r3 qmake-utils
 
 DESCRIPTION="Feature-rich dictionary lookup program"
 HOMEPAGE="http://goldendict.org/"
@@ -14,43 +13,40 @@ EGIT_REPO_URI="https://github.com/goldendict/goldendict.git"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug kde"
+IUSE="debug ffmpeg libav"
 
 RDEPEND="
 	>=app-text/hunspell-1.2
 	dev-libs/eb
-	dev-qt/qtcore:4[exceptions]
-	dev-qt/qtgui:4[exceptions]
-	dev-qt/qthelp:4[exceptions]
-	dev-qt/qtsingleapplication[qt4]
-	dev-qt/qtsvg:4[exceptions]
-	dev-qt/qtwebkit:4[exceptions]
-	media-libs/libao
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtsingleapplication[qt5]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtwidgets:5
 	media-libs/libogg
 	media-libs/libvorbis
 	sys-libs/zlib
 	x11-libs/libXtst
-	!kde? ( || (
-		>=dev-qt/qtphonon-4.5:4[exceptions]
-		media-libs/phonon[qt4]
-	) )
-	kde? ( media-libs/phonon[qt4] )
+	ffmpeg? (
+		media-libs/libao
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	 "${FILESDIR}/${PN}-36a761108-qtsingleapplication-unbundle.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qtsingleapplication-unbundle.patch" )
 
 src_prepare() {
-	qt4-r2_src_prepare
+	default
 
-	# don't install duplicated stuff and fix installation path
+	# fix installation path
 	sed -i \
-		-e '/desktops2/d' \
-		-e '/icons2/d' \
 		-e '/PREFIX = /s:/usr/local:/usr:' \
 		${PN}.pro || die
 
@@ -58,14 +54,24 @@ src_prepare() {
 	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
 }
 
+src_configure() {
+	local myconf=()
+
+	if ! use ffmpeg && ! use libav ; then
+		myconf+=("DISABLE_INTERNAL_PLAYER=1")
+	fi
+
+	eqmake5 "${myconf[@]}"
+}
+
 src_install() {
-	qt4-r2_src_install
+	dobin ${PN}
+	domenu redist/${PN}.desktop
+	doicon redist/icons/${PN}.png
+
+	insinto /use/share/apps/${PN}/locale
+	doins locale/*.qm
 
-	# install translations
-	insinto /usr/share/apps/${PN}/locale
-	for lang in ${LANGSLONG}; do
-		if use linguas_${lang%_*}; then
-			doins locale/${lang}.qm
-		fi
-	done
+	insinto /usr/share/${PN}/help
+	doins help/*.qch
 }