commit: fd702858962c4b44e0611fdcdb2eb3ec371696bd
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Apr 16 15:22:37 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:48:09 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fd702858
media-gfx/digikam: Sync ebuilds, qtsql[mysql] optional
Gentoo-bug: 580018
Package-Manager: portage-2.2.27
media-gfx/digikam/digikam-5.0.0_beta5.ebuild | 21 ++++++---------------
media-gfx/digikam/digikam-9999.ebuild | 25 ++++++++++++++++++-------
2 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
b/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
index d8da5cb..29961c9 100644
--- a/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-5.0.0_beta5.ebuild
@@ -8,11 +8,10 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
KDE_DOXYGEN=true
KDE_TEST=true
fi
-
inherit kde5
DESCRIPTION="Digital photo management application"
-HOMEPAGE="http://www.digikam.org/";
+HOMEPAGE="https://www.digikam.org/";
LICENSE="GPL-2"
KEYWORDS=""
@@ -49,17 +48,17 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_frameworks_dep solid)
$(add_kdeapps_dep libkexiv2)
- dev-libs/boost[threads]
- dev-libs/expat
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql')
+ $(add_qt_dep qtsql 'mysql?')
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+ dev-libs/boost[threads]
+ dev-libs/expat
>=media-gfx/exiv2-0.24:=
media-libs/jasper
media-libs/lcms:2
@@ -84,18 +83,16 @@ COMMON_DEPEND="
)
semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
mysql? ( virtual/mysql )
- video? ( dev-qt/qtmultimedia[widgets] )
+ video? ( $(add_qt_dep qtmultimedia 'widgets') )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
)
"
-
DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
sys-devel/gettext
"
-
RDEPEND="${COMMON_DEPEND}
media-plugins/kipi-plugins:5
!media-gfx/digikam:4
@@ -105,7 +102,6 @@ RESTRICT=test
# bug 366505
src_prepare() {
-
undetect_lib() {
local _use=${1}
local _name=${2}
@@ -118,11 +114,9 @@ src_prepare() {
undetect_lib scanner KSANE
kde5_src_prepare
-
}
src_configure() {
-
# LQR = only allows to choose between bundled/external
local mycmakeargs=(
-DENABLE_OPENCV3=ON
@@ -137,17 +131,14 @@ src_configure() {
)
kde5_src_configure
-
}
src_install() {
-
kde5_src_install
if use doc; then
# install the api documentation
insinto /usr/share/doc/${PF}/
- doins -r ${CMAKE_BUILD_DIR}/api/html
+ doins -r "${S}"/apidocs/html
fi
-
}
diff --git a/media-gfx/digikam/digikam-9999.ebuild
b/media-gfx/digikam/digikam-9999.ebuild
index d45ce50..29961c9 100644
--- a/media-gfx/digikam/digikam-9999.ebuild
+++ b/media-gfx/digikam/digikam-9999.ebuild
@@ -4,21 +4,32 @@
EAPI=6
-KDE_DOXYGEN="true"
-KDE_TEST="true"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+ KDE_DOXYGEN=true
+ KDE_TEST=true
+fi
inherit kde5
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
DESCRIPTION="Digital photo management application"
HOMEPAGE="https://www.digikam.org/";
-[[ ${KDE_BUILD_TYPE} = live ]] ||
SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
KEYWORDS=""
IUSE="addressbook gphoto2 kipi lensfun marble semantic-desktop mysql scanner
video X"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+
+ 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.bz2"
+
+ S="${WORKDIR}/${MY_P}/core"
+
+fi
+
COMMON_DEPEND="
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -42,7 +53,7 @@ COMMON_DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtscript)
- $(add_qt_dep qtsql 'mysql')
+ $(add_qt_dep qtsql 'mysql?')
$(add_qt_dep qtwebkit)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
