[gentoo-commits] repo/gentoo:master commit in: app-cdr/k3b/, app-cdr/k3b/files/

[Andreas Sturmlechner]

commit:     bb0dc71e01d7b67a7f7516bfe52406dec5b1caf9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 21:23:32 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 23:02:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0dc71e

app-cdr/k3b: Remove Qt4WebKit dependency

Package-Manager: portage-2.3.3

 app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch |  41 +++++++++
 app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch  |  62 ++++++++++++++
 app-cdr/k3b/k3b-2.0.3-r5.ebuild              | 124 +++++++++++++++++++++++++++
 3 files changed, 227 insertions(+)

diff --git a/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch b/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch
new file mode 100644
index 0000000000..d9784372e3
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.3-fixuifiles.patch
@@ -0,0 +1,41 @@
+From a0a527c450a49d031ceb0e7a832523b4717ba96c Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@××××××.org>
+Date: Sun, 15 Feb 2015 20:29:13 +0100
+Subject: fixuifiles
+
+---
+ src/projects/base_k3baudiocdtextwidget.ui | 3 ---
+ src/projects/base_k3baudiotrackwidget.ui  | 3 ---
+ 2 files changed, 6 deletions(-)
+
+diff --git a/src/projects/base_k3baudiocdtextwidget.ui b/src/projects/base_k3baudiocdtextwidget.ui
+index 611f4c7..5798d57 100644
+--- a/src/projects/base_k3baudiocdtextwidget.ui
++++ b/src/projects/base_k3baudiocdtextwidget.ui
+@@ -4,9 +4,6 @@
+   <exportmacro></exportmacro>
+   <class>base_K3bAudioCdTextWidget</class>
+   <widget class="QWidget" name="K3bAudioCDTextWidget" >
+-    <property name="windowTitle" >
+-      <string>K3bAudioCDTextWidget</string>
+-    </property>
+     <layout class="QVBoxLayout" >
+       <item>
+         <widget class="QGroupBox" name="m_groupCdText" >
+diff --git a/src/projects/base_k3baudiotrackwidget.ui b/src/projects/base_k3baudiotrackwidget.ui
+index 6024213..1c96281 100644
+--- a/src/projects/base_k3baudiotrackwidget.ui
++++ b/src/projects/base_k3baudiotrackwidget.ui
+@@ -4,9 +4,6 @@
+   <exportmacro></exportmacro>
+   <class>base_K3bAudioTrackWidget</class>
+   <widget class="QWidget" name="K3bAudioTrackWidget" >
+-    <property name="windowTitle" >
+-      <string>K3bAudioTrackWidget</string>
+-    </property>
+     <layout class="QHBoxLayout" >
+       <property name="margin" >
+         <number>0</number>
+-- 
+cgit v0.11.2
+

diff --git a/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch b/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch
new file mode 100644
index 0000000000..8fae168131
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-2.0.3-no-webkit.patch
@@ -0,0 +1,62 @@
+commit 54f92d12cccac60c378d114869762d1a3ad75435
+Author: Radek Novacek <rnovacek at redhat.com>
+Date:   Fri May 4 13:04:48 2012 +0200
+
+    Don't use webkit on RHEL
+
+ k3b-2.0.2-no-webkit.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++
+ k3b.spec                  |   11 +++++++-
+ 2 files changed, 62 insertions(+), 2 deletions(-)
+---
+diff -up a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt	2012-05-04 12:30:46.634241618 +0200
++++ b/src/CMakeLists.txt	2012-05-04 12:30:56.980516383 +0200
+@@ -287,7 +287,6 @@ target_link_libraries(k3b_bin
+   ${KDE4_KUTILS_LIBS}
+   ${KDE4_KDE3SUPPORT_LIBS}
+   ${KDE4_SOLID_LIBS}
+-  ${QT_QTWEBKIT_LIBRARY}
+   ${X11_LIBRARIES}
+   )
+ 
+diff -up a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
+--- a/src/k3bdiskinfoview.cpp	2012-05-04 12:29:13.994781781 +0200
++++ b/src/k3bdiskinfoview.cpp	2012-05-04 13:10:07.748401670 +0200
+@@ -34,7 +34,6 @@
+ #include <qpalette.h>
+ #include <qpixmap.h>
+ #include <QtGui/QTextBrowser>
+-#include <QtWebKit/QWebView>
+ 
+ #include <klocale.h>
+ #include <kstandarddirs.h>
+@@ -61,7 +60,7 @@ K3b::DiskInfoView::DiskInfoView( QWidget
+                               Device::STATE_ALL|Device::STATE_NO_MEDIA|Device::STATE_UNKNOWN,
+                               parent )
+ {
+-    m_infoView = new QWebView( this );
++    m_infoView = new QTextBrowser( this );
+     setMainWidget( m_infoView );
+ }
+ 
+diff -up a/src/k3bdiskinfoview.h b/src/k3bdiskinfoview.h
+--- a/src/k3bdiskinfoview.h	2012-05-04 12:50:25.753604831 +0200
++++ b/src/k3bdiskinfoview.h	2012-05-04 13:09:15.232985545 +0200
+@@ -19,7 +19,7 @@
+ 
+ #include "k3bmediacontentsview.h"
+ 
+-class QWebView;
++class QTextBrowser;
+ 
+ namespace K3b {
+ class DiskInfoView : public MediaContentsView
+@@ -38,7 +38,7 @@ private:
+     QString createIso9660InfoItems( const Iso9660SimplePrimaryDescriptor& iso );
+     QString createTrackItems( const Medium& medium );
+ 
+-    QWebView* m_infoView;
++    QTextBrowser* m_infoView;
+ };
+ }
+ 

diff --git a/app-cdr/k3b/k3b-2.0.3-r5.ebuild b/app-cdr/k3b/k3b-2.0.3-r5.ebuild
new file mode 100644
index 0000000000..fb43b56029
--- /dev/null
+++ b/app-cdr/k3b/k3b-2.0.3-r5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MULTIMEDIA_REQUIRED="always"
+KDE_HANDBOOK="optional"
+
+KDE_LINGUAS="ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et eu fi fr
+ga gl he hi hne hr hu is it ja kk km ko ku lt lv mai mr ms nb nds nl nn oc pa pl
+pt pt_BR ro ru se sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk
+zh_CN zh_TW"
+
+inherit kde4-base
+
+DESCRIPTION="Full-featured burning and ripping application by KDE"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://kde/stable/${PN}/${P}a.tar.xz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
+
+CDEPEND="
+	$(add_kdeapps_dep libkcddb)
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( >=media-libs/flac-1.2[cxx] )
+	mp3? ( media-sound/lame )
+	mad? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	sndfile? ( media-libs/libsndfile )
+	taglib? ( >=media-libs/taglib-1.5 )
+	vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${CDEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${CDEPEND}
+	app-cdr/cdrdao
+	kde-frameworks/kdelibs:4[udev,udisks(+)]
+	media-sound/cdparanoia
+	virtual/cdrtools
+	dvd? (
+		>=app-cdr/dvd+rw-tools-7
+		encode? ( media-video/transcode[dvd] )
+	)
+	emovix? ( media-video/emovix )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+REQUIRED_USE="
+	mp3? ( encode )
+	sox? ( encode )
+"
+
+DOCS=( ChangeLog FAQ PERMISSIONS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libav-11.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-flac.patch
+	"${FILESDIR}"/${P}-fixuifiles.patch
+	"${FILESDIR}"/${P}-sndfile.patch
+	"${FILESDIR}"/${P}-ffmpeg-3.patch
+	"${FILESDIR}"/${P}-gcc7.patch
+	"${FILESDIR}"/${P}-dvdrip.patch
+	# TODO: upstream
+	"${FILESDIR}"/${P}-no-webkit.patch
+)
+
+src_prepare() {
+	kde4-base_src_prepare
+
+	# bug 558640
+	sed -i -e "/^add_subdirectory( doc )/d" CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_K3BSETUP=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DK3B_DEBUG=$(usex debug)
+		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
+		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
+		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
+		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
+		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
+		-DK3B_ENABLE_TAGLIB=$(usex taglib)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
+	)
+
+	kde4-base_src_configure
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	echo
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on optical device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}