[gentoo-commits] proj/kde:master commit in: kde-base/nepomuk-core/files/, kde-base/nepomuk-core/

["Johannes Huber" <johu@gentoo.org>]

commit:     af596d07eca3289d73ab80c782330eb2694a4725
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 11:19:47 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 11:19:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=af596d07

[kde-base/nepomuk-core] Use subslot for media-gfx/exiv2

Package-Manager: portage-2.2.7

---
 kde-base/nepomuk-core/files/libav_fix.patch           | 19 -------------------
 .../nepomuk-core/nepomuk-core-4.11.49.9999.ebuild     |  2 +-
 .../nepomuk-core/nepomuk-core-4.12.49.9999.ebuild     |  2 +-
 kde-base/nepomuk-core/nepomuk-core-9999.ebuild        |  2 +-
 4 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/kde-base/nepomuk-core/files/libav_fix.patch b/kde-base/nepomuk-core/files/libav_fix.patch
deleted file mode 100644
index 108310d..0000000
--- a/kde-base/nepomuk-core/files/libav_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur a/services/fileindexer/indexer/ffmpegextractor.cpp b/services/fileindexer/indexer/ffmpegextractor.cpp
---- a/services/fileindexer/indexer/ffmpegextractor.cpp	2013-06-10 20:50:24.000000000 +0200
-+++ b/services/fileindexer/indexer/ffmpegextractor.cpp	2013-06-23 20:36:27.336844353 +0200
-@@ -158,12 +158,12 @@
-                 subRes.addProperty( NFO::height(), codec->height );
- 
-                 int aspectRatio = codec->sample_aspect_ratio.num;
--                int frameRate = stream->r_frame_rate.num;
-+                double frameRate = stream->avg_frame_rate.num;
- 
-                 if( codec->sample_aspect_ratio.den )
-                     aspectRatio /= codec->sample_aspect_ratio.den;
--                if( stream->r_frame_rate.den )
--                    frameRate /= stream->r_frame_rate.den;
-+                if( stream->avg_frame_rate.den )
-+                    frameRate /= stream->avg_frame_rate.den;
- 
-                 subRes.addProperty( NFO::aspectRatio(), aspectRatio );
-                 subRes.addProperty( NFO::frameRate(), frameRate );

diff --git a/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.11.49.9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
 	>=dev-libs/shared-desktop-ontologies-0.11.0
 	>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
 	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2 )
+	exif? ( media-gfx/exiv2:= )
 	ffmpeg? ( virtual/ffmpeg )
 	pdf? ( app-text/poppler[qt4] )
 	taglib? ( media-libs/taglib )

diff --git a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-4.12.49.9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
 	>=dev-libs/shared-desktop-ontologies-0.11.0
 	>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
 	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2 )
+	exif? ( media-gfx/exiv2:= )
 	ffmpeg? ( virtual/ffmpeg )
 	pdf? ( app-text/poppler[qt4] )
 	taglib? ( media-libs/taglib )

diff --git a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
index f8a5388..85bbead 100644
--- a/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
+++ b/kde-base/nepomuk-core/nepomuk-core-9999.ebuild
@@ -14,7 +14,7 @@ DEPEND="
 	>=dev-libs/shared-desktop-ontologies-0.11.0
 	>=dev-libs/soprano-2.9.3[dbus,raptor,redland,virtuoso]
 	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2 )
+	exif? ( media-gfx/exiv2:= )
 	ffmpeg? ( virtual/ffmpeg )
 	pdf? ( app-text/poppler[qt4] )
 	taglib? ( media-libs/taglib )