public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2011-08-10 22:00 Andreas Hüttel
  0 siblings, 0 replies; 29+ messages in thread
From: Andreas Hüttel @ 2011-08-10 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2306f5d32557f9b6b091f0524c0bb0b1e0927769
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Aug 10 22:00:53 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 22:00:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2306f5d3

[app-cdr/k3b] Needs handbook dependencies, bug 378127

(Portage version: 2.1.10.10/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-cdr/k3b/k3b-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index d8677f4..0637755 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=4
 
 CMAKE_MIN_VERSION=2.8.0
 MULTIMEDIA_REQUIRED=always
+KDE_HANDBOOK=always
 KDE_SCM="git"
 KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2011-08-12 22:37 Maciej Mrozowski
  0 siblings, 0 replies; 29+ messages in thread
From: Maciej Mrozowski @ 2011-08-12 22:37 UTC (permalink / raw
  To: gentoo-commits

commit:     dcb034603d6c8fdf10dde9b2c430a5564e9e582f
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 22:36:03 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 22:36:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dcb03460

[app-cdr/k3b] Sync with tree

---
 app-cdr/k3b/k3b-9999.ebuild |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 0637755..65c694e 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -4,10 +4,11 @@
 
 EAPI=4
 
-CMAKE_MIN_VERSION=2.8.0
-MULTIMEDIA_REQUIRED=always
-KDE_HANDBOOK=always
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="optional"
 KDE_SCM="git"
+
 KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
 	se sk sl sv th tr uk zh_CN zh_TW"
@@ -28,7 +29,7 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
 KEYWORDS=""
-IUSE="debug dvd emovix encode ffmpeg flac mad lame musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
+IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
@@ -63,6 +64,7 @@ src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_K3BSETUP=OFF
 		$(cmake-utils_use debug K3B_DEBUG)
+		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		$(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
 		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-05-19 18:08 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2012-05-19 18:08 UTC (permalink / raw
  To: gentoo-commits

commit:     c4cf872536698c59ce3e04efa790c973af218718
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat May 19 18:07:59 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Sat May 19 18:07:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c4cf8725

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |   27 ++++++++++++++-------------
 1 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index f04c92b..585c448 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -9,13 +9,14 @@ WEBKIT_REQUIRED="always"
 KDE_HANDBOOK="optional"
 KDE_SCM="git"
 
-KDE_LINGUAS="ast be bg ca ca@valencia cs csb da de el en_GB eo es et eu fi fr ga
+# Translations are only in the tarballs, not in the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
 	se sk sl sv th tr uk zh_CN zh_TW"
 
-if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-	DOCS=( FAQ PERMISSIONS README RELEASE_HOWTO )
+	DOCS=( FAQ PERMISSIONS README )
 	S=${WORKDIR}/${P/_*}
 else
 	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
@@ -29,23 +30,23 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="4"
 KEYWORDS=""
-IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack musicbrainz sndfile sox taglib vcd vorbis +wav"
+IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis +wav"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
+	encode? ( lame? ( media-sound/lame ) )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( >=media-libs/flac-1.2[cxx] )
-	encode? ( lame? ( media-sound/lame ) )
 	mad? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
-	musicbrainz? ( media-libs/musicbrainz:1 )
 	sndfile? ( media-libs/libsndfile )
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
 RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools
@@ -62,28 +63,28 @@ DOCS+=( ChangeLog )
 
 src_configure() {
 	mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
 		-DK3B_BUILD_K3BSETUP=OFF
-		$(cmake-utils_use debug K3B_DEBUG)
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		$(cmake-utils_use musicbrainz K3B_ENABLE_MUSICBRAINZ)
+		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		$(cmake-utils_use debug K3B_DEBUG)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
 		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		-DK3B_BUILD_API_DOCS=OFF
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
 	)
 
 	if use encode; then
 		mycmakeargs+=(
-			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
 			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 		)
 	fi
 



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-05-22 21:37 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2012-05-22 21:37 UTC (permalink / raw
  To: gentoo-commits

commit:     74d19d18e8f517cde5ad2b66cd64e6fb20867c23
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 21:37:05 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue May 22 21:37:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=74d19d18

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 585c448..8e7d874 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -61,6 +61,16 @@ RDEPEND="${DEPEND}
 
 DOCS+=( ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg.patch"
+	"${FILESDIR}/${P}-libavformat54.patch"
+)
+
+REQUIRED_USE="
+	lame? ( encode )
+	sox? ( encode )
+"
+
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
@@ -86,6 +96,12 @@ src_configure() {
 			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
 			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 		)
+	else
+		mycmakeargs+=(
+			-DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
+			-DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
+			-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
+		)
 	fi
 
 	kde4-base_src_configure



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-05-23 20:00 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2012-05-23 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     f3220de8dc71524725c0f44bab84f71f70f363e1
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 19:58:46 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May 23 19:58:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f3220de8

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 8e7d874..aa78058 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -36,9 +36,9 @@ DEPEND="
 	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
-	encode? ( lame? ( media-sound/lame ) )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( >=media-libs/flac-1.2[cxx] )
+	lame? ( media-sound/lame )
 	mad? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	sndfile? ( media-libs/libsndfile )
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
 		encode? ( media-video/transcode[dvd] )
 	)
 	emovix? ( media-video/emovix )
-	encode? ( sox? ( media-sound/sox ) )
+	sox? ( media-sound/sox )
 	vcd? ( media-video/vcdimager )
 "
 
@@ -66,11 +66,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-libavformat54.patch"
 )
 
-REQUIRED_USE="
-	lame? ( encode )
-	sox? ( encode )
-"
-
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
@@ -83,23 +78,21 @@ src_configure() {
 		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
 		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
 	)
 
 	if use encode; then
 		mycmakeargs+=(
-			$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
-			$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
 			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 		)
 	else
 		mycmakeargs+=(
-			-DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
-			-DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
 			-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
 		)
 	fi



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-05-23 22:01 Maciej Mrozowski
  0 siblings, 0 replies; 29+ messages in thread
From: Maciej Mrozowski @ 2012-05-23 22:01 UTC (permalink / raw
  To: gentoo-commits

commit:     3202c37f0b37f5757994e2ade3fd44318b302ac9
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 21:59:52 2012 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Wed May 23 21:59:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3202c37f

[app-cdr/k3b] Sync with tree. Remove encode and wav USE flags

---
 app-cdr/k3b/k3b-9999.ebuild |   26 ++++++++------------------
 app-cdr/k3b/metadata.xml    |    1 -
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index aa78058..ceae714 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -28,9 +28,9 @@ DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
-SLOT="4"
 KEYWORDS=""
-IUSE="debug dvd emovix encode ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis +wav"
+SLOT="4"
+IUSE="debug dvd emovix ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
+		media-video/transcode[dvd]
 	)
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
@@ -69,34 +69,24 @@ PATCHES=(
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
 		-DK3B_BUILD_K3BSETUP=OFF
+		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
 		$(cmake-utils_use debug K3B_DEBUG)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
 		$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
 		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use wav K3B_BUILD_WAVE_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 	)
-
-	if use encode; then
-		mycmakeargs+=(
-			$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
-		)
-	else
-		mycmakeargs+=(
-			-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=OFF
-		)
-	fi
-
 	kde4-base_src_configure
 }
 

diff --git a/app-cdr/k3b/metadata.xml b/app-cdr/k3b/metadata.xml
index 9ba1d92..3ff95ab 100644
--- a/app-cdr/k3b/metadata.xml
+++ b/app-cdr/k3b/metadata.xml
@@ -5,6 +5,5 @@
 <herd>media-optical</herd>
 <use>
 	<flag name="emovix">Enable burning support for eMoviX images</flag>
-	<flag name="wav">Enable support for reading WAVE files</flag>
 </use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-08-25 15:41 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2012-08-25 15:41 UTC (permalink / raw
  To: gentoo-commits

commit:     625ff2c3451c90b33090c8c4a04235e80a6dd094
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 25 15:40:22 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Aug 25 15:40:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=625ff2c3

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.11.11/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 4910264..14dc655 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug dvd emovix ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
+IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
@@ -37,7 +37,7 @@ DEPEND="
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? ( virtual/ffmpeg )
 	flac? ( >=media-libs/flac-1.2[cxx] )
-	lame? ( media-sound/lame )
+	mp3? ( media-sound/lame )
 	mad? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	sndfile? ( media-libs/libsndfile )
@@ -64,19 +64,24 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.0.2-libavformat54.patch"
 )
 
+REQUIRED_USE="
+	mp3? ( encode )
+	sox? ( encode )
+"
+
 src_configure() {
 	mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
 		-DK3B_BUILD_K3BSETUP=OFF
 		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
 		$(cmake-utils_use debug K3B_DEBUG)
 		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
 		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
 		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
-		$(cmake-utils_use lame K3B_BUILD_LAME_ENCODER_PLUGIN)
+		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
 		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
 		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
 		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2012-09-11 13:45 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2012-09-11 13:45 UTC (permalink / raw
  To: gentoo-commits

commit:     562008839925fbf198bb210f34ab6ac101e68aa7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 11 13:44:30 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 11 13:44:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=56200883

[app-cdr/k3b] Sync with portage.

(Portage version: 2.1.11.14/git/Linux x86_64, unsigned Manifest commit)

---
 app-cdr/k3b/k3b-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 9039128..de5acc2 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="${DEPEND}
 	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
-		media-video/transcode[dvd]
+		encode? ( media-video/transcode[dvd] )
 	)
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2013-06-27 21:04 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2013-06-27 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     9a0f515b6020ff5a01a65e1e33d3c02d4551b82d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 27 20:47:57 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun 27 20:47:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9a0f515b

[app-cdr/k3b] EAPI 5.

Package-Manager: portage-2.2.0_alpha185

---
 app-cdr/k3b/k3b-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 68cfdb1..f50954b 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 MULTIMEDIA_REQUIRED="always"
 WEBKIT_REQUIRED="always"


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2014-09-09 16:31 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2014-09-09 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     bf239a96c109b98ed8ea5038631ab6cf80c0d099
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Aug 24 11:44:41 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 16:29:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf239a96

[app-cdr/k3b] Add KF5 version

---
 app-cdr/k3b/k3b-9999.ebuild | 124 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
new file mode 100644
index 0000000..b1442a6
--- /dev/null
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_BRANCH="kf5"
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="true"
+
+# Translations are only in the tarballs, not in the git repo
+if [[ ${PV} != *9999* ]]; then
+	KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
+	se sk sl sv th tr uk zh_CN zh_TW"
+
+	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
+	DOCS=( FAQ PERMISSIONS README )
+	S=${WORKDIR}/${P/_*}
+else
+	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
+fi
+
+inherit kde5
+
+DESCRIPTION="The CD/DVD Kreator for KDE"
+HOMEPAGE="http://www.k3b.org/"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS=""
+SLOT="5"
+IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep solid)
+	$(add_kdebase_dep libkcddb)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qttest:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	media-libs/libsamplerate
+	dvd? ( media-libs/libdvdread )
+	ffmpeg? ( virtual/ffmpeg )
+	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 )
+"
+#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	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 )
+"
+
+DOCS+=( ChangeLog )
+
+REQUIRED_USE="
+	mp3? ( encode )
+	sox? ( encode )
+"
+
+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
+		$(cmake-utils_use debug K3B_DEBUG)
+		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
+		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
+		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
+		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
+		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
+		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
+		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
+		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
+		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
+		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
+		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	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 the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2014-09-09 16:31 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2014-09-09 16:31 UTC (permalink / raw
  To: gentoo-commits

commit:     5390ce3fe073bb9df71dc33e1746515f118f05d1
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Aug 23 23:09:07 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 16:29:38 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5390ce3f

[app-cdr/k3b] Prepare for KF5 version

---
 app-cdr/k3b/{k3b-9999.ebuild => k3b-4.9999.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-4.9999.ebuild
similarity index 100%
rename from app-cdr/k3b/k3b-9999.ebuild
rename to app-cdr/k3b/k3b-4.9999.ebuild


^ permalink raw reply	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2014-09-09 16:34 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2014-09-09 16:34 UTC (permalink / raw
  To: gentoo-commits

commit:     de5b738d55f4f30cff1fb8a50bf5da4baa5f9458
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  9 16:33:21 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep  9 16:33:21 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=de5b738d

[app-cdr/k3b] Tidy.

Package-Manager: portage-2.2.10

---
 app-cdr/k3b/k3b-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index b1442a6..a6e24d9 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -5,8 +5,6 @@
 EAPI=5
 
 EGIT_BRANCH="kf5"
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
 KDE_HANDBOOK="true"
 
 # Translations are only in the tarballs, not in the git repo
@@ -28,9 +26,9 @@ DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS=""
 SLOT="5"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+KEYWORDS=""
+IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_frameworks_dep karchive)


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2014-09-14 19:25 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2014-09-14 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     932ebeb233486846e0e1c416a8a552cc52c73311
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 14 19:25:24 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Sep 14 19:25:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=932ebeb2

[app-cdr/k3b] Block SLOT 4 due to file collisions

Package-Manager: portage-2.2.12

---
 app-cdr/k3b/k3b-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index a6e24d9..1250394 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
 	vcd? ( media-video/vcdimager )
+	!app-cdr/k3b:4
 "
 
 DOCS+=( ChangeLog )


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2014-11-24 12:48 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2014-11-24 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     42f249a23445909e78b8573e962aaabcbc7179ab
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 12:48:13 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 12:48:13 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=42f249a2

[app-cdr/k3b] Update for KDE Applications.

9999 becomes master and 5.9999 becomes frameworks branch.

Package-Manager: portage-2.2.14

---
 .../k3b/{k3b-4.9999.ebuild => k3b-5.9999.ebuild}   | 37 ++++++++++++++++------
 app-cdr/k3b/k3b-9999.ebuild                        | 35 ++++++--------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app-cdr/k3b/k3b-4.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
similarity index 78%
rename from app-cdr/k3b/k3b-4.9999.ebuild
rename to app-cdr/k3b/k3b-5.9999.ebuild
index 56df9c6..2aa83d3 100644
--- a/app-cdr/k3b/k3b-4.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -4,9 +4,8 @@
 
 EAPI=5
 
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="true"
 
 # Translations are only in the tarballs, not in the git repo
 if [[ ${PV} != *9999* ]]; then
@@ -21,18 +20,35 @@ else
 	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
 fi
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
+SLOT="5"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
-	$(add_kdebase_dep libkcddb)
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qttest:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? ( virtual/ffmpeg )
@@ -44,8 +60,8 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
+#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools
@@ -56,6 +72,7 @@ RDEPEND="${DEPEND}
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
 	vcd? ( media-video/vcdimager )
+	!app-cdr/k3b:4
 "
 
 DOCS+=( ChangeLog )
@@ -86,11 +103,11 @@ src_configure() {
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 	)
-	kde4-base_src_configure
+	kde5_src_configure
 }
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	kde5_pkg_postinst
 
 	echo
 	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 1250394..56df9c6 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI=5
 
-EGIT_BRANCH="kf5"
-KDE_HANDBOOK="true"
+MULTIMEDIA_REQUIRED="always"
+WEBKIT_REQUIRED="always"
+KDE_HANDBOOK="optional"
 
 # Translations are only in the tarballs, not in the git repo
 if [[ ${PV} != *9999* ]]; then
@@ -20,35 +21,18 @@ else
 	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
 fi
 
-inherit kde5
+inherit kde4-base
 
 DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
 KEYWORDS=""
-IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+SLOT="4"
+IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep solid)
 	$(add_kdebase_dep libkcddb)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qttest:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? ( virtual/ffmpeg )
@@ -60,8 +44,8 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
-#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
 RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools
@@ -72,7 +56,6 @@ RDEPEND="${DEPEND}
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
 	vcd? ( media-video/vcdimager )
-	!app-cdr/k3b:4
 "
 
 DOCS+=( ChangeLog )
@@ -103,11 +86,11 @@ src_configure() {
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 	)
-	kde5_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	kde4-base_pkg_postinst
 
 	echo
 	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2015-02-12 22:43 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2015-02-12 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     cffd39fd7c6c123da42874c64464afabbe8c6b87
Author:     Karol Herbst <git <AT> karolherbst <DOT> de>
AuthorDate: Thu Feb 12 14:22:19 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Feb 12 22:42:55 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cffd39fd

[app-cdr/k3b] fix failing patch

Package-Manager: portage-2.2.17

---
 app-cdr/k3b/k3b-5.9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
index 522967e..8e6423a 100644
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -82,7 +82,11 @@ REQUIRED_USE="
 	sox? ( encode )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9999-tests-optional.patch" )
+src_prepare() {
+	# we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
+	epatch "${FILESDIR}/${PN}-5.9999-tests-optional.patch"
+	kde5_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2015-04-27 15:58 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2015-04-27 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     06c6632e2ba8e916de679489250cae590541527c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 15:57:50 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 15:57:50 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=06c6632e

[app-cdr/k3b] Migrate to new-style ffmpeg/libav USE flags.

Package-Manager: portage-2.2.18

 app-cdr/k3b/k3b-5.9999.ebuild | 7 +++++--
 app-cdr/k3b/k3b-9999.ebuild   | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
index 8e6423a..a0ac01c 100644
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
 KEYWORDS=""
-IUSE="dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_frameworks_dep karchive)
@@ -51,7 +51,10 @@ DEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( virtual/ffmpeg )
+	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 )

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index dacbb69..b2cd543 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -29,13 +29,16 @@ HOMEPAGE="http://www.k3b.org/"
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug dvd emovix encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
 	$(add_kdebase_dep libkcddb)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
-	ffmpeg? ( virtual/ffmpeg )
+	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 )


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2015-06-27 20:44 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2015-06-27 20:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3f0b6dfadd1fd2190a14be22d0111852e36003fb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 20:45:44 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:45:44 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f0b6dfa

[app-cdr/k3b] Drop unused KDE_LINGUAS

Package-Manager: portage-2.2.20

 app-cdr/k3b/k3b-5.9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
index 08a5e16..c80697e 100644
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ b/app-cdr/k3b/k3b-5.9999.ebuild
@@ -9,10 +9,6 @@ KDE_HANDBOOK="true"
 KDE_TEST="true"
 # Translations are only in the tarballs, not in the git repo
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
-	se sk sl sv th tr uk zh_CN zh_TW"
-
 	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
 	DOCS=( FAQ PERMISSIONS README )
 	S=${WORKDIR}/${P/_*}


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2015-06-27 21:11 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2015-06-27 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     d748bc8f539e39318f8b5ebf4534edc0716370df
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 21:01:40 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 21:01:40 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d748bc8f

[app-cdr/k3b ] Drop SLOT 4

Package-Manager: portage-2.2.20

 app-cdr/k3b/k3b-5.9999.ebuild | 128 ------------------------------------------
 app-cdr/k3b/k3b-9999.ebuild   |  47 +++++++++++-----
 2 files changed, 33 insertions(+), 142 deletions(-)

diff --git a/app-cdr/k3b/k3b-5.9999.ebuild b/app-cdr/k3b/k3b-5.9999.ebuild
deleted file mode 100644
index c80697e..0000000
--- a/app-cdr/k3b/k3b-5.9999.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="kf5"
-KDE_HANDBOOK="true"
-KDE_TEST="true"
-# Translations are only in the tarballs, not in the git repo
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-	DOCS=( FAQ PERMISSIONS README )
-	S=${WORKDIR}/${P/_*}
-else
-	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
-
-inherit kde5
-
-DESCRIPTION="The CD/DVD Kreator for KDE"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS=""
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qttest:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	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 )
-"
-#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	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 )
-	!app-cdr/k3b:4
-"
-
-DOCS+=( ChangeLog )
-
-REQUIRED_USE="
-	mp3? ( encode )
-	sox? ( encode )
-"
-
-src_prepare() {
-	# we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
-	epatch "${FILESDIR}/${PN}-tests-optional.patch"
-	kde5_src_prepare
-}
-
-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
-		$(cmake-utils_use debug K3B_DEBUG)
-		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
-		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
-		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
-		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
-		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
-	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 the cdrom device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 36fefb0..c80697e 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -4,16 +4,11 @@
 
 EAPI=5
 
-MULTIMEDIA_REQUIRED="always"
-WEBKIT_REQUIRED="always"
-KDE_HANDBOOK="optional"
-
+EGIT_BRANCH="kf5"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
 # Translations are only in the tarballs, not in the git repo
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="ast be bg 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 km ko ku lt mai nb nds nl nn oc pa pl pt pt_BR ro ru
-	se sk sl sv th tr uk zh_CN zh_TW"
-
 	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
 	DOCS=( FAQ PERMISSIONS README )
 	S=${WORKDIR}/${P/_*}
@@ -21,18 +16,35 @@ else
 	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
 fi
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
+SLOT="5"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep solid)
 	$(add_kdeapps_dep libkcddb)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qttest:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? (
@@ -47,8 +59,8 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
+#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
 RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdelibs 'udev,udisks(+)')
 	app-cdr/cdrdao
 	media-sound/cdparanoia
 	virtual/cdrtools
@@ -59,6 +71,7 @@ RDEPEND="${DEPEND}
 	emovix? ( media-video/emovix )
 	sox? ( media-sound/sox )
 	vcd? ( media-video/vcdimager )
+	!app-cdr/k3b:4
 "
 
 DOCS+=( ChangeLog )
@@ -68,6 +81,12 @@ REQUIRED_USE="
 	sox? ( encode )
 "
 
+src_prepare() {
+	# we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
+	epatch "${FILESDIR}/${PN}-tests-optional.patch"
+	kde5_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
@@ -89,11 +108,11 @@ src_configure() {
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
 		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
 	)
-	kde4-base_src_configure
+	kde5_src_configure
 }
 
 pkg_postinst() {
-	kde4-base_pkg_postinst
+	kde5_pkg_postinst
 
 	echo
 	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2015-09-14 13:17 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2015-09-14 13:17 UTC (permalink / raw
  To: gentoo-commits

commit:     bb1d896a8c93b296a739aea2d3fce29a27323b61
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 13:17:28 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 13:17:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bb1d896a

app-cdr/k3b: add missing dependency.

Gentoo-bug: 560368

Package-Manager: portage-2.2.20.1

 app-cdr/k3b/k3b-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 45ed3ca..0391d2c 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -33,6 +33,7 @@ DEPEND="
 	$(add_frameworks_dep kcoreaddons)
 	$(add_frameworks_dep kdoctools)
 	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
 	$(add_frameworks_dep knotifyconfig)


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-01-04 16:21 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-01-04 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     135b6c8b86392808e936d743252860c4c5c9f294
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jan  2 18:47:13 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 16:21:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=135b6c8b

app-cdr/k3b: Patches go into PATCHES; force handbook optional

Important: Requires b56904fffadd50e7f13d49d47797604fd0ecbc87

Package-Manager: portage-2.2.24

 app-cdr/k3b/k3b-9999.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 47fd6cd..390e160 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -5,10 +5,10 @@
 EAPI=5
 
 EGIT_BRANCH="kf5"
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 # Translations are only in the tarballs, not in the git repo
-if [[ ${PV} != *9999* ]]; then
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
 	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
 	DOCS=( FAQ PERMISSIONS README )
 	S=${WORKDIR}/${P/_*}
@@ -31,7 +31,6 @@ DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdoctools)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
@@ -43,7 +42,6 @@ DEPEND="
 	$(add_kdeapps_dep libkcddb)
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qttest:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
 	media-libs/libsamplerate
@@ -60,7 +58,6 @@ DEPEND="
 	taglib? ( >=media-libs/taglib-1.5 )
 	vorbis? ( media-libs/libvorbis )
 "
-#	$(add_frameworks_dep kdelibs 'udev,udisks(+)')
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
 	media-sound/cdparanoia
@@ -82,11 +79,7 @@ REQUIRED_USE="
 	sox? ( encode )
 "
 
-src_prepare() {
-	# we have to patch first, because some doc sed magic in kde5.eclass will make the patch invalid
-	epatch "${FILESDIR}/${PN}-tests-optional.patch"
-	kde5_src_prepare
-}
+PATCHES=( "${FILESDIR}/${PN}-tests-optional.patch" )
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-01-13 18:19 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-01-13 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     85c973b6ae60887bab4b1db6fe935ce5cecd0aa2
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 18:18:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 18:18:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=85c973b6

app-cdr/k3b: KDE_BUILD_TYPE is not defined until after inherit kde5

Package-Manager: portage-2.2.26

 app-cdr/k3b/k3b-9999.ebuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 390e160..460e5e8 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -7,14 +7,6 @@ EAPI=5
 EGIT_BRANCH="kf5"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
-# Translations are only in the tarballs, not in the git repo
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-	DOCS=( FAQ PERMISSIONS README )
-	S=${WORKDIR}/${P/_*}
-else
-	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
 
 inherit kde5
 
@@ -26,6 +18,15 @@ SLOT="5"
 KEYWORDS=""
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
+# Translations are only in the tarballs, not in the git repo
+if [[ ${KDE_BUILD_TYPE} != live ]] ; then
+	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
+	DOCS=( FAQ PERMISSIONS README )
+	S=${WORKDIR}/${P/_*}
+else
+	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
+fi
+
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-03-28 12:24 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2016-03-28 12:24 UTC (permalink / raw
  To: gentoo-commits

commit:     89f057e8ae6ebfc5aa988a6b57b86c37d7835918
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 11:48:49 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 11:48:49 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=89f057e8

app-cdr/k3b: EAPI 6

Package-Manager: portage-2.2.28

 app-cdr/k3b/k3b-9999.ebuild | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 09824ce..0da7023 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -2,19 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 EGIT_BRANCH="kf5"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
-
 inherit kde5
 
 DESCRIPTION="The CD/DVD Kreator for KDE"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
 KEYWORDS=""
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
@@ -89,20 +87,21 @@ src_configure() {
 		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		$(cmake-utils_use debug K3B_DEBUG)
-		$(cmake-utils_use dvd K3B_ENABLE_DVD_RIPPING)
-		$(cmake-utils_use encode K3B_BUILD_EXTERNAL_ENCODER_PLUGIN)
-		$(cmake-utils_use ffmpeg K3B_BUILD_FFMPEG_DECODER_PLUGIN)
-		$(cmake-utils_use flac K3B_BUILD_FLAC_DECODER_PLUGIN)
-		$(cmake-utils_use mp3 K3B_BUILD_LAME_ENCODER_PLUGIN)
-		$(cmake-utils_use mad K3B_BUILD_MAD_DECODER_PLUGIN)
-		$(cmake-utils_use musepack K3B_BUILD_MUSE_DECODER_PLUGIN)
-		$(cmake-utils_use sndfile K3B_BUILD_SNDFILE_DECODER_PLUGIN)
-		$(cmake-utils_use sox K3B_BUILD_SOX_ENCODER_PLUGIN)
-		$(cmake-utils_use taglib K3B_ENABLE_TAGLIB)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_DECODER_PLUGIN)
-		$(cmake-utils_use vorbis K3B_BUILD_OGGVORBIS_ENCODER_PLUGIN)
+		-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 vorbix)
+		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
 	)
+
 	kde5_src_configure
 }
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-04-04 17:46 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2016-04-04 17:46 UTC (permalink / raw
  To: gentoo-commits

commit:     968b94c7875864b045393e26d870724fb386f9a7
Author:     Tamas Jantvik <tsjk <AT> hotmail <DOT> com>
AuthorDate: Mon Apr  4 06:19:44 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Apr  4 17:45:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=968b94c7

app-cdr/k3b: Fix typo

 app-cdr/k3b/k3b-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 0da7023..352b56d 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -98,7 +98,7 @@ src_configure() {
 		-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 vorbix)
+		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
 		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
 	)
 


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-07-15 11:19 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2016-07-15 11:19 UTC (permalink / raw
  To: gentoo-commits

commit:     ac21fa7d9172fb31ea03bcc28bac5cdda11fd23a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 11:18:24 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 11:18:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ac21fa7d

app-cdr/k3b: Frameworks merged to master

Package-Manager: portage-2.3.0

 app-cdr/k3b/k3b-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 352b56d..e1c882e 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-EGIT_BRANCH="kf5"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-07-29 22:26 Johannes Huber
  0 siblings, 0 replies; 29+ messages in thread
From: Johannes Huber @ 2016-07-29 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     74bfe4c1896b792b983fb2e54e2fc2cfc499e4dd
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 22:26:22 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 22:26:22 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=74bfe4c1

app-cdr/k3b: Use kf5 branch

Package-Manager: portage-2.3.0

 app-cdr/k3b/k3b-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 7de8828..21e7a97 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
+EGIT_BRANCH="kf5"
 inherit kde5
 
 DESCRIPTION="The CD/DVD Kreator for KDE"


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-08-18 12:48 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-08-18 12:48 UTC (permalink / raw
  To: gentoo-commits

commit:     d4bfcf8f3ab84f71ca7cf2815016761da368093d
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 10:00:55 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 12:48:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4bfcf8f

app-cdr/k3b: Frameworks merged to master

Package-Manager: portage-2.2.28

 app-cdr/k3b/k3b-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 21e7a97..e7ebdb5 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -6,10 +6,9 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
-EGIT_BRANCH="kf5"
 inherit kde5
 
-DESCRIPTION="The CD/DVD Kreator for KDE"
+DESCRIPTION="Full-featured CD/DVD/Blu-ray burning and ripping application based on KDE Frameworks"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-08-18 17:22 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-08-18 17:22 UTC (permalink / raw
  To: gentoo-commits

commit:     8ad276cdc7344411bdd51c3d5e7304874e0c1923
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 17:21:47 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 17:22:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ad276cd

app-cdr/k3b: trim description

Package-Manager: portage-2.3.0

 app-cdr/k3b/k3b-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index e7ebdb5..88750c1 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="Full-featured CD/DVD/Blu-ray burning and ripping application based on KDE Frameworks"
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
 HOMEPAGE="http://www.k3b.org/"
 
 LICENSE="GPL-2 FDL-1.2"


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-08-31 14:41 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-08-31 14:41 UTC (permalink / raw
  To: gentoo-commits

commit:     9bc266ff9c274c828a34cf272253e4b76868999b
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Aug 26 20:24:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 14:41:09 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9bc266ff

app-cdr/k3b: Fix DEPENDs, drop obsolete config option, KDE_TEST=optional

Drop long obsolete setting of SRC_URI and S variables
Drop long obsolete K3B_BUILD_K3BSETUP config variable, fixes warning
Modernise pkg_postinst message, optical media evolved beyond CD-ROM

Package-Manager: portage-2.2.28

 app-cdr/k3b/k3b-9999.ebuild | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 88750c1..3a13bd3 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -5,43 +5,46 @@
 EAPI=6
 
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
+KDE_TEST="optional"
 inherit kde5
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
 HOMEPAGE="http://www.k3b.org/"
+[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS=""
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
-# Translations are only in the tarballs, not in the git repo
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
-	SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.bz2"
-	DOCS=( FAQ PERMISSIONS README )
-	S=${WORKDIR}/${P/_*}
-else
-	DOCS=( FAQ.txt PERMISSIONS.txt README.txt )
-fi
+DOCS=( {FAQ,PERMISSIONS,README}.txt )
 
 DEPEND="
 	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
 	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kfilemetadata)
 	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
 	$(add_frameworks_dep knotifyconfig)
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
 	$(add_kdeapps_dep libkcddb)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
 	$(add_qt_dep qtwebkit)
 	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread )
 	ffmpeg? (
@@ -80,7 +83,6 @@ REQUIRED_USE="
 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
@@ -106,14 +108,13 @@ pkg_postinst() {
 	kde5_pkg_postinst
 
 	echo
-	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
 	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 the cdrom device(s)."
+	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
 }


^ permalink raw reply related	[flat|nested] 29+ messages in thread

* [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/
@ 2016-12-14 11:27 Michael Palimaka
  0 siblings, 0 replies; 29+ messages in thread
From: Michael Palimaka @ 2016-12-14 11:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2db18c1ffa943fbdc069c5e2a0a526bf1a467e65
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Dec 12 15:39:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 11:27:35 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2db18c1f

app-cdr/k3b: Consolidate DOCS array

Package-Manager: portage-2.3.0

 app-cdr/k3b/k3b-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app-cdr/k3b/k3b-9999.ebuild b/app-cdr/k3b/k3b-9999.ebuild
index 3a13bd3..aa1f485 100644
--- a/app-cdr/k3b/k3b-9999.ebuild
+++ b/app-cdr/k3b/k3b-9999.ebuild
@@ -16,8 +16,6 @@ LICENSE="GPL-2 FDL-1.2"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis"
 
-DOCS=( {FAQ,PERMISSIONS,README}.txt )
-
 DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kbookmarks)
@@ -73,13 +71,13 @@ RDEPEND="${DEPEND}
 	!app-cdr/k3b:4
 "
 
-DOCS+=( ChangeLog )
-
 REQUIRED_USE="
 	mp3? ( encode )
 	sox? ( encode )
 "
 
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
 src_configure() {
 	local mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF


^ permalink raw reply related	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2016-12-14 11:27 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-24 12:48 [gentoo-commits] proj/kde:master commit in: app-cdr/k3b/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2016-12-14 11:27 Michael Palimaka
2016-08-31 14:41 Michael Palimaka
2016-08-18 17:22 Michael Palimaka
2016-08-18 12:48 Michael Palimaka
2016-07-29 22:26 Johannes Huber
2016-07-15 11:19 Johannes Huber
2016-04-04 17:46 Johannes Huber
2016-03-28 12:24 Johannes Huber
2016-01-13 18:19 Michael Palimaka
2016-01-04 16:21 Michael Palimaka
2015-09-14 13:17 Michael Palimaka
2015-06-27 21:11 Johannes Huber
2015-06-27 20:44 Johannes Huber
2015-04-27 15:58 Michael Palimaka
2015-02-12 22:43 Johannes Huber
2014-09-14 19:25 Johannes Huber
2014-09-09 16:34 Michael Palimaka
2014-09-09 16:31 Michael Palimaka
2014-09-09 16:31 Michael Palimaka
2013-06-27 21:04 Johannes Huber
2012-09-11 13:45 Michael Palimaka
2012-08-25 15:41 Michael Palimaka
2012-05-23 22:01 Maciej Mrozowski
2012-05-23 20:00 Michael Palimaka
2012-05-22 21:37 Michael Palimaka
2012-05-19 18:08 Michael Palimaka
2011-08-12 22:37 Maciej Mrozowski
2011-08-10 22:00 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox