gentoo resync : 31.03.2018

3 files changed, 2 insertions, 171 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0ccaf72e9730..0d36b40975ba 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -6,7 +6,6 @@ AUX digikam-5.7.0-mariadb-10.2-2.patch 3714 BLAKE2B b08c0544def660bfef87c68204bf
 AUX digikam-5.7.0-qt-5.9.3.patch 1137 BLAKE2B bf369d28083de46d11444eea8ddd35ccc1aa8d052bcd48d8da04a14737d404238717cc70eec7681931f46a455f2e1b441fd1851d3df12d19d8f5653fcc9b2847 SHA512 bfd453d6f4212dfd3e2402d0bba73f9498c04264a7199119fe117a9af834aa95bd12ac8cb2df8be063a8120bbfe159d52f96229692ac7258c4128909dbbffe61
 DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef SHA512 626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb SHA512 f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
-EBUILD digikam-5.7.0-r1.ebuild 4783 BLAKE2B dbb3bb6471c7dcf6d0652caef80ede410055cefa8cab29bfbd8f8018a0385f17a2ed8a97a5036777acc4a5738f445348049c38082c48955ea67863fc55d0b8e1 SHA512 538610991e4f7780ee908a81444f970ae70b0c01ea53af6d800c2db2d382b4e76d513caaa53560bce282d7362c6defbb90295bbafb272aa09285b1131ec08794
-EBUILD digikam-5.7.0-r3.ebuild 4936 BLAKE2B e09c667b8d39afa27c9e0d09f16db10463fbff130e56b419bf42e32d273709b942aad6ca970548e0de2ac32c08f693cfd5fcdb0d22a101a6795c83392827c60b SHA512 e5fd9e8ce6d9815b995476b26c14cb7bcbabab3ee6e2aa8e165a9660dedd63358558a0028824f0bf3b4a044c66e0d113831a5ba22f435499d11907e7cd504418
+EBUILD digikam-5.7.0-r3.ebuild 4934 BLAKE2B 95967205db7ba14d2d7ebe29ba6d6b42d63182c73b2deee3b32f2024195a437f41a7947db5f8f76a2f9d7e6a1e56f390dcd47c8657de4f83614ef07fbb12985a SHA512 97a73b97fcc7f898f22fa11fed4eb5c72c74ab1657e2d82f9e3b6ada4cb698d19bab5559b7b01e371b604ccd1a72edf55c72bfb93c9de42c7b9595b13219746f
 EBUILD digikam-5.9.0.ebuild 4763 BLAKE2B 516702edbb305434a4681b489cd46a7799f4fedbc2b915648eaa2058b97b520cf450ea0b67b4ecc3998e03ca858144cdda25e896d14594073a143e0e101d95f3 SHA512 ff4a0cabcfa5c945e440ab92cc0edab541b8eabf799466b959a975f3a9c2607afc9d1c1fb1973a37cd60c845169b40882696208f925f36b00da9a28126661076
 MISC metadata.xml 962 BLAKE2B 918fd2665df0b74bfcac369d306bd8989723db59dd436085ba7ad24e640401b8f39d2005674c4ef85c1875d2b31c9603af9b8ee7465b11f94b09ba9c93a6d9f2 SHA512 c8998f630fca57844cb258b42d6d557c7a6c65f8b0b90caf44225b62827e24eeaaa6defdf1334c7b7c80a1132aac96e178fe3b18ab59035534b605aed4665bab
diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
deleted file mode 100644
index 745baaf753b7..000000000000
--- a/media-gfx/digikam/digikam-5.7.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KDE_HANDBOOK="true"
-	KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/"
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	SRC_BRANCH=stable
-	[[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-	SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-	S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui '-gles2')
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql 'mysql?')
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/expat
-	>=media-gfx/exiv2-0.26:=
-	media-libs/lcms:2
-	media-libs/liblqr
-	media-libs/libpng:0=
-	media-libs/opencv:=[-qt4(-)]
-	|| ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 )
-	media-libs/tiff:0
-	virtual/jpeg:0
-	addressbook? (
-		$(add_kdeapps_dep akonadi-contacts)
-		$(add_kdeapps_dep kcontacts)
-	)
-	calendar? ( <kde-apps/kcalcore-17.11.80:5 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	jpeg2k? ( media-libs/jasper:= )
-	kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
-	lensfun? ( media-libs/lensfun )
-	marble? (
-		$(add_frameworks_dep kbookmarks)
-		$(add_kdeapps_dep marble)
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtnetwork)
-	)
-	mediaplayer? ( media-libs/qtav[opengl] )
-	mysql? ( virtual/mysql[server] )
-	opengl? (
-		$(add_qt_dep qtopengl)
-		virtual/opengl
-	)
-	panorama? ( $(add_frameworks_dep threadweaver) )
-	scanner? ( $(add_kdeapps_dep libksane) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	X? (
-		$(add_qt_dep qtx11extras)
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/eigen:3
-	dev-libs/boost[threads]
-	sys-devel/gettext
-	panorama? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/kipi-plugins:5
-	panorama? ( media-gfx/hugin )
-	!media-gfx/digikam:4
-"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.9.3.patch" )
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_pretend
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	kde5_pkg_setup
-}
-
-# FIXME: Unbundle libraw (libs/rawengine/libraw)
-src_prepare() {
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		# prepare the translations
-		mv "${WORKDIR}/${MY_P}/po" po || die
-		find po -name "*.po" -and -not -name "digikam.po" -delete || die
-		echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die
-		echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die
-		echo "add_subdirectory( po )" >> CMakeLists.txt || die
-
-		if use handbook; then
-			# subdirs need to be preserved b/c relative paths...
-			# doc-translated is, in fact, broken, and ignored
-			mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die
-			echo "find_package(KF5DocTools REQUIRED)" >> CMakeLists.txt || die
-			echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die
-		fi
-	fi
-
-	if ! use marble; then
-		punt_bogus_dep Qt5 Network
-	fi
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_APPSTYLES=ON
-		-DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-		-DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-		-DENABLE_MYSQLSUPPORT=$(usex mysql)
-		-DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no)
-		$(cmake-utils_use_find_package calendar KF5CalendarCore)
-		$(cmake-utils_use_find_package gphoto2 Gphoto2)
-		$(cmake-utils_use_find_package jpeg2k Jasper)
-		$(cmake-utils_use_find_package kipi KF5Kipi)
-		$(cmake-utils_use_find_package lensfun LensFun)
-		$(cmake-utils_use_find_package marble Marble)
-		$(cmake-utils_use_find_package mediaplayer QtAV)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package openmp OpenMP)
-		$(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-		$(cmake-utils_use_find_package scanner KF5Sane)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
index b9dcb0e75128..fb65507f36be 100644
--- a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
+++ b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer semantic-desktop mysql opengl openmp +panorama scanner X"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-${MY_PV}
 	SRC_BRANCH=stable