[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, kde-plasma/plasma-mediacenter/, kde-plasma/kfilemetadata/

[gentoo-commits] repo/gentoo:master commit in: profiles/updates/, kde-plasma/plasma-mediacenter/, kde-plasma/kfilemetadata/

[Michael Palimaka]

commit:     fe368f3fe006f0aa960dfe87012d1dc0487b2241
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 14:40:03 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 14:46:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe368f3f

kde-plasma/kfilemetadata: move to kde-frameworks.

 kde-plasma/kfilemetadata/Manifest                  |  1 -
 .../kfilemetadata/kfilemetadata-5.9.2.ebuild       | 48 ----------------------
 kde-plasma/kfilemetadata/metadata.xml              |  8 ----
 .../plasma-mediacenter-5.3.2.ebuild                |  2 +-
 profiles/updates/3Q-2015                           |  1 +
 5 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/kde-plasma/kfilemetadata/Manifest b/kde-plasma/kfilemetadata/Manifest
deleted file mode 100644
index 21d0431..0000000
--- a/kde-plasma/kfilemetadata/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kfilemetadata-5.9.2.tar.xz 120600 SHA256 0959a19591180216472c9c7845d180d2b16501b266c6ca10e438c745ca2e151c SHA512 f7c31b576c4473d7cb8a1edaf535682226eb1da3e84a44cee806b1b5abb1fc39f02930747debc64d92891335c53b5d49dd8f99e9d9516295eadda3a25a74efac WHIRLPOOL 80993f093721697cce37527ec7aa9ae72e686872f2ec18204347794d51ba62d2c7d45aeecf2d59c4b37a16e53d331bb0ca1430db10dc7fd6cef5577309263377

diff --git a/kde-plasma/kfilemetadata/kfilemetadata-5.9.2.ebuild b/kde-plasma/kfilemetadata/kfilemetadata-5.9.2.ebuild
deleted file mode 100644
index 93987a8..0000000
--- a/kde-plasma/kfilemetadata/kfilemetadata-5.9.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_TEST="true"
-inherit kde5
-
-# version scheme fail by upstream
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	PLASMA_VERSION=5.3.2
-	SRC_URI="mirror://kde/stable/plasma/${PLASMA_VERSION}/${PN}-${PV}.tar.xz"
-fi
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS=" ~amd64"
-IUSE="epub exif ffmpeg libav pdf taglib"
-
-# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtxml:5
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-"
-RDEPEND="${DEPEND}
-	!kde-base/kfilemetadata:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package epub EPub)
-		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package ffmpeg FFmpeg)
-		$(cmake-utils_use_find_package pdf PopplerQt5)
-		$(cmake-utils_use_find_package taglib Taglib)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-plasma/kfilemetadata/metadata.xml b/kde-plasma/kfilemetadata/metadata.xml
deleted file mode 100644
index cecf265..0000000
--- a/kde-plasma/kfilemetadata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-	<use>
-		<flag name="epub">Adds support for reading EPUB ebook metadata</flag>
-	</use>
-</pkgmetadata>

diff --git a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
index e57a87e..da523f5 100644
--- a/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
+++ b/kde-plasma/plasma-mediacenter/plasma-mediacenter-5.3.2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	media-libs/taglib
 	semantic-desktop? (
 		$(add_frameworks_dep baloo)
-		|| ( $(add_plasma_dep kfilemetadata) $(add_frameworks_dep kfilemetadata) )
+		$(add_frameworks_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}

diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015
index e429241..c4012cb 100644
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -6,3 +6,4 @@ move dev-java/biojava sci-biology/biojava
 move x11-plugins/bitlbee-steam net-im/bitlbee-steam
 move media-video/kdenlive kde-apps/kdenlive
 move kde-plasma/baloo kde-frameworks/baloo
+move kde-plasma/kfilemetadata kde-frameworks/kfilemetadata