From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1014533-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7A3901382C5
for <garchives@archives.gentoo.org>; Mon, 2 Apr 2018 12:57:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 98E9CE0D86;
Mon, 2 Apr 2018 12:57:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6D6C1E0D86
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Apr 2018 12:57:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C9C76335DC3
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Apr 2018 12:57:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 19362275
for <gentoo-commits@lists.gentoo.org>; Mon, 2 Apr 2018 12:57:19 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <1522673824.06c9dbb68af57c6ab53a433c654b1050209cba9e.eva@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/darktable/darktable-9999.ebuild
X-VCS-Directories: media-gfx/darktable/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: 06c9dbb68af57c6ab53a433c654b1050209cba9e
X-VCS-Branch: master
Date: Mon, 2 Apr 2018 12:57:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 99fcdcb7-7ff9-4cd7-9167-6c70fffde604
X-Archives-Hash: 065a6bc613e7bcf75125e48ead254d2f
commit: 06c9dbb68af57c6ab53a433c654b1050209cba9e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 12:21:00 2018 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 12:57:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c9dbb6
media-gfx/darktable: sync live ebuild with recent ebuild changes
Package-Manager: Portage-2.3.27, Repoman-2.3.9
media-gfx/darktable/darktable-9999.ebuild | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 1c9bfe801f2..ffbe61010f4 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3 pax-utils eutils versionator
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils git-r3 pax-utils eutils versionator
EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
@@ -35,9 +35,8 @@ CDEPEND="
media-libs/tiff:0
net-libs/libsoup:2.4
net-misc/curl
+ sys-libs/zlib:=
virtual/jpeg:0
- virtual/glu
- virtual/opengl
x11-libs/cairo
>=x11-libs/gtk+-3.14:3
x11-libs/pango
@@ -48,7 +47,7 @@ CDEPEND="
gnome-keyring? ( >=app-crypt/libsecret-0.18 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
- jpeg2k? ( media-libs/openjpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
webp? ( media-libs/libwebp:0= )"
@@ -57,7 +56,11 @@ RDEPEND="${CDEPEND}
DEPEND="${CDEPEND}
dev-util/intltool
virtual/pkgconfig
- nls? ( sys-devel/gettext )"
+ nls? ( sys-devel/gettext )
+ opencl? (
+ >=sys-devel/clang-4
+ >=sys-devel/llvm-4
+ )"
pkg_pretend() {
if use openmp ; then
@@ -91,11 +94,13 @@ src_configure() {
-DUSE_OPENMP=$(usex openmp)
-DUSE_WEBP=$(usex webp)
)
+ CMAKE_BUILD_TYPE="RELWITHDEBINFO"
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
+ use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
for lang in ${LANGS} ; do
use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
@@ -117,10 +122,10 @@ pkg_preinst() {
pkg_postinst() {
gnome2_icon_cache_update
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
}
pkg_postrm() {
gnome2_icon_cache_update
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
}