commit: 1eea1d15c7b6269d78f6719ca2222d803b7ef381
Author: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 02:06:14 2014 +0000
Commit: Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Mon May 12 02:08:02 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1eea1d15
[kde-base/ffmpegthumbs,mplayerthumbs,dolphin,kdemultimedia-meta] Cleanups from
bug 509634.
1. Add kdebase-kioslaves as RDEPEND of all thumbnailers:
- kde-base/ffmpegthumbs
- kde-base/mplayerthumbs
- kde-base/thumbnailers
2. Remove any PDEPEND to dolphin/konqueror from all thumbnailers (mplayerthumbs
for the record)
3. Favour +ffmpeg over 'mplayer' in kdemultimedia-meta (current setup in that
meta "conflicts" with default preference in dolphin ebuild)
---
kde-base/dolphin/dolphin-4.13.1.ebuild | 2 --
kde-base/dolphin/dolphin-4.13.49.9999.ebuild | 2 --
kde-base/dolphin/dolphin-4.9999.ebuild | 2 --
kde-base/ffmpegthumbs/ffmpegthumbs-4.13.1.ebuild | 4 +++-
kde-base/ffmpegthumbs/ffmpegthumbs-4.13.49.9999.ebuild | 4 +++-
kde-base/ffmpegthumbs/ffmpegthumbs-4.9999.ebuild | 4 +++-
kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.1.ebuild | 2 +-
kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.49.9999.ebuild | 2 +-
kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9999.ebuild | 2 +-
kde-base/mplayerthumbs/mplayerthumbs-4.13.1.ebuild | 7 ++-----
kde-base/mplayerthumbs/mplayerthumbs-4.13.49.9999.ebuild | 7 ++-----
kde-base/mplayerthumbs/mplayerthumbs-4.9999.ebuild | 7 ++-----
kde-base/thumbnailers/thumbnailers-4.13.1.ebuild | 4 +++-
kde-base/thumbnailers/thumbnailers-4.13.49.9999.ebuild | 4 +++-
kde-base/thumbnailers/thumbnailers-4.9999.ebuild | 4 +++-
15 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/kde-base/dolphin/dolphin-4.13.1.ebuild
b/kde-base/dolphin/dolphin-4.13.1.ebuild
index ec81829..c060c2e 100644
--- a/kde-base/dolphin/dolphin-4.13.1.ebuild
+++ b/kde-base/dolphin/dolphin-4.13.1.ebuild
@@ -25,8 +25,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kfind)
-"
-PDEPEND="
thumbnail? (
$(add_kdebase_dep thumbnailers)
|| (
diff --git a/kde-base/dolphin/dolphin-4.13.49.9999.ebuild
b/kde-base/dolphin/dolphin-4.13.49.9999.ebuild
index 732971f..657bd44 100644
--- a/kde-base/dolphin/dolphin-4.13.49.9999.ebuild
+++ b/kde-base/dolphin/dolphin-4.13.49.9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kfind)
-"
-PDEPEND="
thumbnail? (
$(add_kdebase_dep thumbnailers)
|| (
diff --git a/kde-base/dolphin/dolphin-4.9999.ebuild
b/kde-base/dolphin/dolphin-4.9999.ebuild
index add04f0..ae92f6b 100644
--- a/kde-base/dolphin/dolphin-4.9999.ebuild
+++ b/kde-base/dolphin/dolphin-4.9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kfind)
-"
-PDEPEND="
thumbnail? (
$(add_kdebase_dep thumbnailers)
|| (
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.1.ebuild
b/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.1.ebuild
index f234aed..e0704ff 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.1.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.1.ebuild
@@ -13,4 +13,6 @@ IUSE="debug"
DEPEND="
virtual/ffmpeg
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.49.9999.ebuild
b/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.49.9999.ebuild
index a450d43..1f164ab 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.49.9999.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.13.49.9999.ebuild
@@ -13,4 +13,6 @@ IUSE="debug"
DEPEND="
virtual/ffmpeg
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
diff --git a/kde-base/ffmpegthumbs/ffmpegthumbs-4.9999.ebuild
b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9999.ebuild
index a450d43..1f164ab 100644
--- a/kde-base/ffmpegthumbs/ffmpegthumbs-4.9999.ebuild
+++ b/kde-base/ffmpegthumbs/ffmpegthumbs-4.9999.ebuild
@@ -13,4 +13,6 @@ IUSE="debug"
DEPEND="
virtual/ffmpeg
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.1.ebuild
b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.1.ebuild
index d7cfd1f..b883232 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.1.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
http://multimedia.kde.org/
"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ffmpeg +mplayer"
+IUSE="+ffmpeg mplayer"
RDEPEND="
$(add_kdebase_dep dragon)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.49.9999.ebuild
b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.49.9999.ebuild
index b329286..3380379 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.49.9999.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.13.49.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
http://multimedia.kde.org/
"
KEYWORDS=""
-IUSE="ffmpeg +mplayer"
+IUSE="+ffmpeg mplayer"
RDEPEND="
$(add_kdebase_dep dragon)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9999.ebuild
b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9999.ebuild
index b329286..3380379 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9999.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-4.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
http://multimedia.kde.org/
"
KEYWORDS=""
-IUSE="ffmpeg +mplayer"
+IUSE="+ffmpeg mplayer"
RDEPEND="
$(add_kdebase_dep dragon)
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.13.1.ebuild
b/kde-base/mplayerthumbs/mplayerthumbs-4.13.1.ebuild
index f8c3904..96058c5 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.13.1.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.13.1.ebuild
@@ -11,14 +11,11 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux"
IUSE="debug"
RDEPEND="
- || (
- $(add_kdebase_dep dolphin)
- $(add_kdebase_dep konqueror)
- )
+ $(add_kdebase_dep kdebase-kioslaves)
"
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DENABLE_PHONON_SUPPORT=ON
)
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.13.49.9999.ebuild
b/kde-base/mplayerthumbs/mplayerthumbs-4.13.49.9999.ebuild
index 1c2d8d1..ecb4ef6 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.13.49.9999.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.13.49.9999.ebuild
@@ -11,14 +11,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- || (
- $(add_kdebase_dep dolphin)
- $(add_kdebase_dep konqueror)
- )
+ $(add_kdebase_dep kdebase-kioslaves)
"
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DENABLE_PHONON_SUPPORT=ON
)
diff --git a/kde-base/mplayerthumbs/mplayerthumbs-4.9999.ebuild
b/kde-base/mplayerthumbs/mplayerthumbs-4.9999.ebuild
index 1c2d8d1..ecb4ef6 100644
--- a/kde-base/mplayerthumbs/mplayerthumbs-4.9999.ebuild
+++ b/kde-base/mplayerthumbs/mplayerthumbs-4.9999.ebuild
@@ -11,14 +11,11 @@ KEYWORDS=""
IUSE="debug"
RDEPEND="
- || (
- $(add_kdebase_dep dolphin)
- $(add_kdebase_dep konqueror)
- )
+ $(add_kdebase_dep kdebase-kioslaves)
"
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DENABLE_PHONON_SUPPORT=ON
)
diff --git a/kde-base/thumbnailers/thumbnailers-4.13.1.ebuild
b/kde-base/thumbnailers/thumbnailers-4.13.1.ebuild
index 97ad9f9..90f2dbc 100644
--- a/kde-base/thumbnailers/thumbnailers-4.13.1.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.13.1.ebuild
@@ -15,7 +15,9 @@ DEPEND="
$(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkexiv2)
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
S="${WORKDIR}/${KMNAME}-${PV}"
diff --git a/kde-base/thumbnailers/thumbnailers-4.13.49.9999.ebuild
b/kde-base/thumbnailers/thumbnailers-4.13.49.9999.ebuild
index 4fd5c8d..f20aa0f 100644
--- a/kde-base/thumbnailers/thumbnailers-4.13.49.9999.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.13.49.9999.ebuild
@@ -15,7 +15,9 @@ DEPEND="
$(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkexiv2)
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
S="${WORKDIR}/${KMNAME}-${PV}"
diff --git a/kde-base/thumbnailers/thumbnailers-4.9999.ebuild
b/kde-base/thumbnailers/thumbnailers-4.9999.ebuild
index 4fd5c8d..f20aa0f 100644
--- a/kde-base/thumbnailers/thumbnailers-4.9999.ebuild
+++ b/kde-base/thumbnailers/thumbnailers-4.9999.ebuild
@@ -15,7 +15,9 @@ DEPEND="
$(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkexiv2)
"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdebase-kioslaves)
+"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
S="${WORKDIR}/${KMNAME}-${PV}"
