[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Mikle Kolyada]

commit: 3ceeb5eb87c84ffc3761506d88c9ff2ca8c21901
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr 25 17:42:46 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr 25 17:43:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ceeb5eb

app-text/goldendict:

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada  gentoo.org>

 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index cbbb665fe20..d8de7892396 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ 
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"
+IUSE="debug ffmpeg "
 
 RDEPEND="
app-arch/bzip2
@@ -39,8 +39,7 @@ RDEPEND="
x11-libs/libXtst
ffmpeg? (
media-libs/libao
-   libav? ( media-video/libav:0= )
-   !libav? ( media-video/ffmpeg:0= )
+   media-video/ffmpeg:0=
)
 "
 DEPEND="${RDEPEND}"

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Andreas Sturmlechner]

commit: 6b21d067eabef6c2220f40d2e75cf8ea554aa0db
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Dec 23 22:03:01 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec 23 22:47:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b21d067

app-text/goldendict: EAPI-7 bump, eutils -> desktop, fix USE-dep

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index 866b4e88ea6..cbbb665fe20 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV=${PV^^}
 MY_PV=${MY_PV/_/-}
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Feature-rich dictionary lookup program"
 HOMEPAGE="http://goldendict.org/;
@@ -26,7 +26,7 @@ RDEPEND="
dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
-   dev-qt/qtsingleapplication[qt5(+)]
+   dev-qt/qtsingleapplication[qt5(+),X]
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
@@ -43,7 +43,8 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
 "
@@ -75,10 +76,7 @@ src_prepare() {
 
 src_configure() {
local myconf=()
-
-   if ! use ffmpeg ; then
-   myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-   fi
+   use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
 
eqmake5 "${myconf[@]}"
 }

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

[Andreas Sturmlechner]

commit: 6ebfc3cd8d03ca088b865189634c5fc0efc7b9bd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 16 10:38:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 16 11:23:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebfc3cd

app-text/goldendict: Fix build with ffmpeg-4

Closes: https://bugs.gentoo.org/654882
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../files/goldendict-1.5.0-ffmpeg-4.patch  | 167 +
 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild |   1 +
 2 files changed, 168 insertions(+)

diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch 
b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
new file mode 100644
index 000..6e6d03675a4
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +-
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bd..56e8f788 100644
+--- a/ffmpegaudio.cc
 b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+   QByteArray audioData_;
+   QDataStream audioDataStream_;
+   AVFormatContext * formatContext_;
++  AVCodec * codec_;
+   AVCodecContext * codecContext_;
+   AVIOContext * avioContext_;
+   AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & 
audioData, QAtomicInt & isCan
+   audioData_( audioData ),
+   audioDataStream_( audioData_ ),
+   formatContext_( NULL ),
++  codec_( NULL ),
+   codecContext_( NULL ),
+   avioContext_( NULL ),
+   audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && 
LIBAVCODEC_VERSION_MINOR < 56 )
+   unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + 
FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + 
AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+   if ( !avioBuffer )
+   {
+ errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+   // Find audio stream, use the first audio stream if available
+   for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+   {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && 
LIBAVCODEC_VERSION_MINOR < 33 )
+ if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++  if ( formatContext_->streams[i]->codecpar->codec_type == 
AVMEDIA_TYPE_AUDIO )
++#endif
+ {
+   audioStream_ = formatContext_->streams[i];
+   break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+ return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && 
LIBAVCODEC_VERSION_MINOR < 33 )
+   codecContext_ = audioStream_->codec;
+-  AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+-  if ( !codec )
++  codec_ = avcodec_find_decoder( codecContext_->codec_id );
++  if ( !codec_ )
+   {
+ errorString = QObject::tr( "Codec [id: %1] not found." ).arg( 
codecContext_->codec_id );
+ return false;
+   }
++#else
++  codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++  if ( !codec_ )
++  {
++errorString = QObject::tr( "Codec [id: %1] not found." ).arg( 
audioStream_->codecpar->codec_id );
++return false;
++  }
++  codecContext_ = avcodec_alloc_context3( codec_ );
++  if ( !codecContext_ )
++  {
++errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++return false;
++  }
++  avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+ 
+-  ret = avcodec_open2( codecContext_, codec, NULL );
++  ret = avcodec_open2( codecContext_, codec_, NULL );
+   if ( ret < 0 )
+   {
+ errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( 
avErrorString( ret ) );
+ return false;
+   }
+ 
+-  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: 
%s\n", codec->long_name,
++  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: 
%s\n", codec_->long_name,
+   codecContext_->channels, codecContext_->sample_rate, 
av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+   return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+ 
+   // Closing a codec context without prior avcodec_open2() will result in
+   // a crash in ffmpeg
+-  if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++  if ( audioStream_ && codecContext_ && codec_ )
+   

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

[Andreas Sturmlechner]

commit: 80fbdf3ca74c97e0b1435a178cbf5d7b60ade213
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 17 21:40:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 17 22:02:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80fbdf3c

app-text/goldendict: Fix build with Qt 5.11

Reported-by: Viacheslav Ostroukh  ostroukh.me>
Tested-by: Viktor Levin  mail.ru>
Closes: https://bugs.gentoo.org/662094
Package-Manager: Portage-2.3.46, Repoman-2.3.10

 .../files/goldendict-1.5.0-qt-5.11.patch   | 56 ++
 app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild |  5 +-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch 
b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
new file mode 100644
index 000..247ec52931b
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
@@ -0,0 +1,56 @@
+From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
+From: Abs62 
+Date: Tue, 10 Apr 2018 18:44:43 +0300
+Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
+
+---
+ fulltextsearch.hh | 1 +
+ initializing.cc   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/fulltextsearch.hh b/fulltextsearch.hh
+index da7e2943..adf9619f 100644
+--- a/fulltextsearch.hh
 b/fulltextsearch.hh
+@@ -6,6 +6,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "dictionary.hh"
+ #include "ui_fulltextsearch.h"
+diff --git a/initializing.cc b/initializing.cc
+index 0db6909b..59e605d6 100644
+--- a/initializing.cc
 b/initializing.cc
+@@ -1,6 +1,7 @@
+ /* This file is (c) 2008-2012 Konstantin Isakov 
+  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+ 
++#include 
+ #include "initializing.hh"
+ #include 
+ 
+From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
+From: Perfect Gentleman 
+Date: Wed, 11 Apr 2018 00:04:12 +0700
+Subject: [PATCH] Update groups_widgets.hh
+
+fixes https://github.com/goldendict/goldendict/issues/991
+---
+ groups_widgets.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/groups_widgets.hh b/groups_widgets.hh
+index ce442fa2..2064e3bb 100644
+--- a/groups_widgets.hh
 b/groups_widgets.hh
+@@ -8,6 +8,7 @@
+ 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ 

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index 47c7916defc..e25c25eb062 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
+   "${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
+)
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Andreas Sturmlechner]

commit: 1abb702598becc25137483ba0e314b9043dc8f53
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb 19 19:52:21 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 22 10:45:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1abb7025

app-text/goldendict: Prepare for qtsingleapplication dropping qt5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...{goldendict-1.5.0_rc2-r1.ebuild => goldendict-1.5.0_rc2-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
similarity index 95%
rename from app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
rename to app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index 0ac7d9edbe8..47c7916defc 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
-   dev-qt/qtsingleapplication[qt5]
+   dev-qt/qtsingleapplication[qt5(+)]
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/files/

[Michael Palimaka]

commit: 607902584f58c0ac6742215ffba71fa77f839edc
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec  4 19:40:35 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec  6 13:03:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60790258

app-text/goldendict: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/6439

 .../files/goldendict-1.0.1-gcc-4.7.patch   | 40 --
 1 file changed, 40 deletions(-)

diff --git a/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch 
b/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
deleted file mode 100644
index 24995a221b3..000
--- a/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka 
-Date: Fri, 20 Jul 2012 03:27:38 +1000
-Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
-

- processwrapper.cc   | 4 
- qtsingleapplication/src/qtlocalpeer.cpp | 1 +
- 2 files changed, 5 insertions(+)
-
-diff --git a/processwrapper.cc b/processwrapper.cc
-index f7f3f19..86b985d 100644
 a/processwrapper.cc
-+++ b/processwrapper.cc
-@@ -2,6 +2,10 @@
- 
- #include 
- 
-+#if defined(Q_OS_UNIX)
-+#include 
-+#endif
-+
- #ifdef Q_OS_WIN32
- 
- #include 
-diff --git a/qtsingleapplication/src/qtlocalpeer.cpp 
b/qtsingleapplication/src/qtlocalpeer.cpp
-index 382d182..506c142 100644
 a/qtsingleapplication/src/qtlocalpeer.cpp
-+++ b/qtsingleapplication/src/qtlocalpeer.cpp
-@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
- #endif
- #if defined(Q_OS_UNIX)
- #include 
-+#include 
- #endif
- 
- namespace QtLP_Private {
--- 
-1.7.11.1
-

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Michael Palimaka]

commit: 763735ed7e001d9bb0e5b1dd33ca20c80618c615
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Sep 29 03:46:31 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Sep 29 03:46:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763735ed

app-text/goldendict: remove 1.0.1

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-text/goldendict/Manifest|  1 -
 app-text/goldendict/goldendict-1.0.1.ebuild | 66 -
 2 files changed, 67 deletions(-)

diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index 57ad4ccdc17..691e6189583 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,2 +1 @@
-DIST goldendict-1.0.1-src.tar.bz2 2705932 SHA256 
b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6 SHA512 
6c35f804063e14ffc9fe9fbd86e710582c550d10fcabb83e7fb0f65ccad1e18eaa31578a96f0aea67276453239b8035f5a694c7d081f9a6f7a822d2b75ebce55
 WHIRLPOOL 
f642692c5ac921d031e89a4512ac63eb665d5b3d02f2a4aea911566131188f877c173d4624eef073e3580e30d8291c1f0196d870738daf2be469783838305c4c
 DIST goldendict-1.5.0_rc2.tar.gz 19413751 SHA256 
bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde SHA512 
b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
 WHIRLPOOL 
f385a8536360b9401a67284d95be65d98d5f6b57d5af73852f5ec1af95c4ce36c9903e9ed04dbd67e7bf035b5b6745378344cc5efbb4923ce4ea31988f95f6ff

diff --git a/app-text/goldendict/goldendict-1.0.1.ebuild 
b/app-text/goldendict/goldendict-1.0.1.ebuild
deleted file mode 100644
index 8f0569d6aa3..000
--- a/app-text/goldendict/goldendict-1.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA bg_BG cs_CZ de_DE el_GR it_IT lt_LT ru_RU uk_UA vi_VN zh_CN"
-
-inherit l10n qt4-r2
-
-DESCRIPTION="Feature-rich dictionary lookup program"
-HOMEPAGE="http://goldendict.org/;
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-   >=app-text/hunspell-1.2
-   media-libs/libogg
-   media-libs/libvorbis
-   media-libs/phonon[qt4]
-   sys-libs/zlib
-   x11-libs/libX11
-   x11-libs/libXtst
-   >=dev-qt/qtcore-4.5:4[exceptions,qt3support]
-   >=dev-qt/qtgui-4.5:4[exceptions,qt3support]
-   >=dev-qt/qtwebkit-4.5:4[exceptions]
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig
-"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.7.patch" )
-
-src_prepare() {
-   qt4-r2_src_prepare
-
-   l10n_for_each_disabled_locale_do editpro
-
-   # do not install duplicates
-   sed -e '/[icon,desktop]s2/d' -i ${PN}.pro || die
-
-   # fix desktop file
-   sed -e '/^Categories=/s/;Applications$/;/' -i redist/${PN}.desktop || 
die
-}
-
-src_configure() {
-   PREFIX="${EPREFIX}"/usr eqmake4
-}
-
-src_install() {
-   qt4-r2_src_install
-   l10n_for_each_locale_do insqm
-}
-
-editpro() {
-   sed -e "s;locale/${1}.ts;;" -i ${PN}.pro || die
-}
-
-insqm() {
-   insinto /usr/share/apps/${PN}/locale
-   doins locale/${1}.qm
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Michael Palimaka]

commit: cc1888c53ca75eb52e927bed35f7c5be2751d8bf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Sep 29 03:46:08 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Sep 29 03:46:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc1888c5

app-text/goldendict: stabilise 1.5.0_rc2-r1 for amd64/x86

Bug: https://bugs.gentoo.org/625260
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
index ddc2b378630..0ac7d9edbe8 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ffmpeg libav"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Andreas Sturmlechner]

commit: eed689e9cdcdaf64dd4944c1d1241a0c5b3845c9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 28 19:25:50 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 28 19:26:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eed689e9

app-text/goldendict: USE=ffmpeg disables libav too, bug #603238

Remove libav from the DISABLE_INTERNAL_PLAYER conditional, as it
contradicts the DEPENDs setup.

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
index f49ddfb6ad2..ddc2b378630 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -72,7 +72,7 @@ src_prepare() {
 src_configure() {
local myconf=()
 
-   if ! use ffmpeg && ! use libav ; then
+   if ! use ffmpeg ; then
myconf+=( DISABLE_INTERNAL_PLAYER=1 )
fi
 

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Andreas Sturmlechner]

commit: 1c75ceb4385735bdc0de57ea2cee5ac3fc9197ec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 28 19:06:31 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 28 19:08:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c75ceb4

app-text/goldendict: Disable git execution in src_configure

Gentoo-bug: 603238

Package-Manager: Portage-2.3.8, Repoman-2.3.1

 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
index 503434c0a66..f49ddfb6ad2 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,11 @@ 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:' \

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Michael Palimaka]

commit: 2530edee316316a9f734722a876d003aa1aa0976
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Aug 30 13:44:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 30 14:05:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2530edee

app-text/goldendict: remote kde USE flag

Gentoo-bug: 629144
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 app-text/goldendict/goldendict-1.0.1.ebuild | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app-text/goldendict/goldendict-1.0.1.ebuild 
b/app-text/goldendict/goldendict-1.0.1.ebuild
index c9f4ad2d673..8f0569d6aa3 100644
--- a/app-text/goldendict/goldendict-1.0.1.ebuild
+++ b/app-text/goldendict/goldendict-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,23 +13,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug kde"
+IUSE="debug"
 
 RDEPEND="
>=app-text/hunspell-1.2
media-libs/libogg
media-libs/libvorbis
+   media-libs/phonon[qt4]
sys-libs/zlib
x11-libs/libX11
x11-libs/libXtst
>=dev-qt/qtcore-4.5:4[exceptions,qt3support]
>=dev-qt/qtgui-4.5:4[exceptions,qt3support]
>=dev-qt/qtwebkit-4.5:4[exceptions]
-   !kde? ( || (
-   >=dev-qt/qtphonon-4.5:4[exceptions]
-   media-libs/phonon[qt4]
-   ) )
-   kde? ( media-libs/phonon[qt4] )
 "
 DEPEND="${RDEPEND}
virtual/pkgconfig

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Göktürk Yüksek]

commit: 7a45b73577447057ddcd5060d78b2e4f8783603e
Author: Göktürk Yüksek  gentoo  org>
AuthorDate: Mon Mar  6 01:28:08 2017 +
Commit: Göktürk Yüksek  gentoo  org>
CommitDate: Mon Mar  6 01:50:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a45b735

app-text/goldendict: remove unresponsive proxied maintainer

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 app-text/goldendict/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index fce10001488..a53cce1009b 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -1,18 +1,10 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   nik...@gmx.us
-   Nikoli
-   

q...@gentoo.org
Gentoo Qt Project

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

goldendict/goldendict

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Michael Palimaka]

commit: 12665cb9019297686f4e960c03c41f6faa748b26
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Dec  4 17:07:44 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Dec  4 17:07:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12665cb9

app-text/goldendict: add missing dependency

Gentoo-bug: 601596

Package-Manager: portage-2.3.2

 app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
index 225d45b..3c11533 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
)
 "
 DEPEND="${RDEPEND}
+   dev-qt/linguist-tools:5
virtual/pkgconfig
 "
 

[gentoo-commits] repo/gentoo:master commit in: app-text/goldendict/

[Michael Palimaka]

commit: 6426caf38ee162b399ed88e3861c7d85ac6c1477
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Nov 28 19:48:47 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Nov 28 19:49:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6426caf3

app-text/goldendict: fix locale install location

Package-Manager: portage-2.3.2

 .../{goldendict-1.5.0_rc2.ebuild => goldendict-1.5.0_rc2-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
similarity index 97%
rename from app-text/goldendict/goldendict-1.5.0_rc2.ebuild
rename to app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
index fa47bf4..225d45b 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -79,7 +79,7 @@ src_install() {
domenu redist/${PN}.desktop
doicon redist/icons/${PN}.png
 
-   insinto /use/share/apps/${PN}/locale
+   insinto /usr/share/apps/${PN}/locale
doins locale/*.qm
 
insinto /usr/share/${PN}/help

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

[Michael Palimaka]

commit: f76f3775cec41cc173da7815c77b344ba5c93299
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Nov 20 23:16:46 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 26 18:45:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f76f3775

app-text/goldendict: Add 1.5.0_rc2 to have a Qt5 version

Ebuild taken from qt overlay.

Package-Manager: portage-2.3.0

 app-text/goldendict/Manifest   |  1 +
 ...endict-1.5.0-qtsingleapplication-unbundle.patch | 18 +
 app-text/goldendict/goldendict-1.5.0_rc2.ebuild| 87 ++
 app-text/goldendict/metadata.xml   |  2 +-
 4 files changed, 107 insertions(+), 1 deletion(-)

diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index 1a5b715..57ad4cc 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1 +1,2 @@
 DIST goldendict-1.0.1-src.tar.bz2 2705932 SHA256 
b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6 SHA512 
6c35f804063e14ffc9fe9fbd86e710582c550d10fcabb83e7fb0f65ccad1e18eaa31578a96f0aea67276453239b8035f5a694c7d081f9a6f7a822d2b75ebce55
 WHIRLPOOL 
f642692c5ac921d031e89a4512ac63eb665d5b3d02f2a4aea911566131188f877c173d4624eef073e3580e30d8291c1f0196d870738daf2be469783838305c4c
+DIST goldendict-1.5.0_rc2.tar.gz 19413751 SHA256 
bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde SHA512 
b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
 WHIRLPOOL 
f385a8536360b9401a67284d95be65d98d5f6b57d5af73852f5ec1af95c4ce36c9903e9ed04dbd67e7bf035b5b6745378344cc5efbb4923ce4ea31988f95f6ff

diff --git 
a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch 
b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
new file mode 100644
index ..01fdb3b
--- /dev/null
+++ 
b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
@@ -0,0 +1,18 @@
+--- a/goldendict.pro
 b/goldendict.pro
+@@ -36,7 +36,8 @@
+ QT += sql
+ CONFIG += exceptions \
+ rtti \
+-stl
++stl \
++qtsingleapplication
+ OBJECTS_DIR = build
+ UI_DIR = build
+ MOC_DIR = build
+@@ -632,5 +633,3 @@
+ TS_OUT ~= s/.ts/.qm/g
+ PRE_TARGETDEPS += $$TS_OUT
+ 
+-include( qtsingleapplication/src/qtsingleapplication.pri )
+-

diff --git a/app-text/goldendict/goldendict-1.5.0_rc2.ebuild 
b/app-text/goldendict/goldendict-1.5.0_rc2.ebuild
new file mode 100644
index ..fa47bf4
--- /dev/null
+++ b/app-text/goldendict/goldendict-1.5.0_rc2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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}
+   virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+   default
+
+   # 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 && ! use libav ; then
+   myconf+=( DISABLE_INTERNAL_PLAYER=1 )
+   fi
+
+   eqmake5 "${myconf[@]}"
+}
+
+src_install() {
+   dobin ${PN}
+   domenu redist/${PN}.desktop
+   doicon redist/icons/${PN}.png
+
+   insinto /use/share/apps/${PN}/locale
+   doins locale/*.qm
+
+   insinto /usr/share/${PN}/help
+   doins help/*.qch
+}

diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index 0746d64..fce1000 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -14,6 +14,6 @@
Proxy Maintainers


-   goldendict
+