Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/
Date: Mon, 02 Apr 2018 12:57:23
Message-Id: 1522673824.06c9dbb68af57c6ab53a433c654b1050209cba9e.eva@gentoo
1 commit: 06c9dbb68af57c6ab53a433c654b1050209cba9e
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 12:21:00 2018 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 12:57:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c9dbb6
7
8 media-gfx/darktable: sync live ebuild with recent ebuild changes
9
10 Package-Manager: Portage-2.3.27, Repoman-2.3.9
11
12 media-gfx/darktable/darktable-9999.ebuild | 19 ++++++++++++-------
13 1 file changed, 12 insertions(+), 7 deletions(-)
14
15 diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
16 index 1c9bfe801f2..ffbe61010f4 100644
17 --- a/media-gfx/darktable/darktable-9999.ebuild
18 +++ b/media-gfx/darktable/darktable-9999.ebuild
19 @@ -3,7 +3,7 @@
20
21 EAPI=6
22
23 -inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils versionator
24 +inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils git-r3 pax-utils eutils versionator
25
26 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
27
28 @@ -35,9 +35,8 @@ CDEPEND="
29 media-libs/tiff:0
30 net-libs/libsoup:2.4
31 net-misc/curl
32 + sys-libs/zlib:=
33 virtual/jpeg:0
34 - virtual/glu
35 - virtual/opengl
36 x11-libs/cairo
37 >=x11-libs/gtk+-3.14:3
38 x11-libs/pango
39 @@ -48,7 +47,7 @@ CDEPEND="
40 gnome-keyring? ( >=app-crypt/libsecret-0.18 )
41 gphoto2? ( media-libs/libgphoto2:= )
42 graphicsmagick? ( media-gfx/graphicsmagick )
43 - jpeg2k? ( media-libs/openjpeg:0 )
44 + jpeg2k? ( media-libs/openjpeg:2= )
45 opencl? ( virtual/opencl )
46 openexr? ( media-libs/openexr:0= )
47 webp? ( media-libs/libwebp:0= )"
48 @@ -57,7 +56,11 @@ RDEPEND="${CDEPEND}
49 DEPEND="${CDEPEND}
50 dev-util/intltool
51 virtual/pkgconfig
52 - nls? ( sys-devel/gettext )"
53 + nls? ( sys-devel/gettext )
54 + opencl? (
55 + >=sys-devel/clang-4
56 + >=sys-devel/llvm-4
57 + )"
58
59 pkg_pretend() {
60 if use openmp ; then
61 @@ -91,11 +94,13 @@ src_configure() {
62 -DUSE_OPENMP=$(usex openmp)
63 -DUSE_WEBP=$(usex webp)
64 )
65 + CMAKE_BUILD_TYPE="RELWITHDEBINFO"
66 cmake-utils_src_configure
67 }
68
69 src_install() {
70 cmake-utils_src_install
71 + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
72
73 for lang in ${LANGS} ; do
74 use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
75 @@ -117,10 +122,10 @@ pkg_preinst() {
76
77 pkg_postinst() {
78 gnome2_icon_cache_update
79 - fdo-mime_desktop_database_update
80 + xdg_desktop_database_update
81 }
82
83 pkg_postrm() {
84 gnome2_icon_cache_update
85 - fdo-mime_desktop_database_update
86 + xdg_desktop_database_update
87 }