From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 23D65138336 for ; Fri, 15 Feb 2019 23:07:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14F7DE0882; Fri, 15 Feb 2019 23:07:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C8837E0882 for ; Fri, 15 Feb 2019 23:07:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 06801335CEC for ; Fri, 15 Feb 2019 23:07:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47770537 for ; Fri, 15 Feb 2019 23:07:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1550272052.e7dfedbdd050275ac4b7bef20cf76b244e142778.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/darktable/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/darktable/darktable-2.6.0.ebuild media-gfx/darktable/darktable-9999.ebuild X-VCS-Directories: media-gfx/darktable/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e7dfedbdd050275ac4b7bef20cf76b244e142778 X-VCS-Branch: master Date: Fri, 15 Feb 2019 23:07:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 26ce118a-cf7a-4a3f-9879-e7b7d1e2c7eb X-Archives-Hash: a829f1a985e9da5593b0a8d82ac14469 commit: e7dfedbdd050275ac4b7bef20cf76b244e142778 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Feb 15 20:54:52 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Feb 15 23:07:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7dfedbd media-gfx/darktable: Switch from gnome2-utils to xdg, EAPI-7 bump Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/darktable/darktable-2.6.0.ebuild | 40 ++++++++++++---------------- media-gfx/darktable/darktable-9999.ebuild | 42 ++++++++++++------------------ 2 files changed, 33 insertions(+), 49 deletions(-) diff --git a/media-gfx/darktable/darktable-2.6.0.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild index 73fbe302925..15acacacaad 100644 --- a/media-gfx/darktable/darktable-2.6.0.ebuild +++ b/media-gfx/darktable/darktable-2.6.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils +inherit cmake-utils flag-o-matic pax-utils toolchain-funcs xdg DOC_PV="2.6.0" MY_PV="${PV/_/}" @@ -26,7 +26,12 @@ ${LANGS// / l10n_}" # sse3 support is required to build darktable REQUIRED_USE="cpu_flags_x86_sse3" -CDEPEND=" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +COMMON_DEPEND=" dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 @@ -54,17 +59,17 @@ CDEPEND=" jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${CDEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${COMMON_DEPEND} opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 - )" + ) +" +RDEPEND="${COMMON_DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) +" PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch ) @@ -85,7 +90,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DCUSTOM_CFLAGS=ON -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) @@ -124,13 +128,8 @@ src_install() { fi } -pkg_preinst() { - gnome2_icon_savelist -} - pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst elog "when updating from the currently stable 1.6 series," elog "please bear in mind that your edits will be preserved during this process," @@ -138,8 +137,3 @@ pkg_postinst() { echo ewarn "It will not be possible to downgrade!" } - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index f0209f39d59..60e7af7a717 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils flag-o-matic git-r3 gnome2-utils pax-utils toolchain-funcs versionator xdg-utils +inherit cmake-utils flag-o-matic git-r3 pax-utils toolchain-funcs xdg EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git" @@ -22,7 +22,12 @@ ${LANGS// / l10n_}" # sse3 support is required to build darktable REQUIRED_USE="cpu_flags_x86_sse3" -CDEPEND=" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +COMMON_DEPEND=" dev-db/sqlite:3 dev-libs/json-glib dev-libs/libxml2:2 @@ -50,17 +55,17 @@ CDEPEND=" jpeg2k? ( media-libs/openjpeg:2= ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) - webp? ( media-libs/libwebp:0= )" -RDEPEND="${CDEPEND} - kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" -DEPEND="${CDEPEND} - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) + webp? ( media-libs/libwebp:0= ) +" +DEPEND="${COMMON_DEPEND} opencl? ( >=sys-devel/clang-4 >=sys-devel/llvm-4 - )" + ) +" +RDEPEND="${COMMON_DEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 ) +" pkg_pretend() { if use openmp ; then @@ -77,7 +82,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_PRINT=$(usex cups) - -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" -DCUSTOM_CFLAGS=ON -DUSE_CAMERA_SUPPORT=$(usex gphoto2) -DUSE_COLORD=$(usex colord) @@ -115,17 +119,3 @@ src_install() { eqawarn "please open a bug." fi } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -}