commit: 780d4b828d654b678505481b8e52327adcc579e1
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 19:41:43 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 19:41:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780d4b82
media-gfx/darktable: version bump
- re-add USE=geo, bug #567556
Package-Manager: portage-2.3.2
media-gfx/darktable/Manifest | 1 +
...able-9999.ebuild => darktable-2.2.0_rc2.ebuild} | 78 ++++++++++++----------
media-gfx/darktable/darktable-9999.ebuild | 58 +++++++---------
3 files changed, 66 insertions(+), 71 deletions(-)
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index bd392d6..6bafd01 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,4 +1,5 @@
DIST darktable-1.6.9.tar.xz 3124940 SHA256
0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512
c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492
WHIRLPOOL
0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
DIST darktable-2.0.6.tar.xz 3018300 SHA256
2368c1865221032061645342ba8c00bcd6d224e9829a55bc610e6cb67de738c1 SHA512
6ed9fe1d031bff7d27051111997b5da1cbebaef35ebfff42a3f0e2c8ca9ac6c46fc271d13468df7b2dd887553e06454ca24030d226a725f04f5b0b4635e62355
WHIRLPOOL
d58dea18a3a75e16d8895b668a375d179ce6250cafeb399e89bb7f4baeeee25b8de2151d5eeed14030a8e154855b8d3d1e9789f33b9169b7905641858385cc4f
DIST darktable-2.0.7.tar.xz 2960436 SHA256
a9226157404538183549079e3b8707c910fedbb669bd018106bdf584b88a1dab SHA512
568db128bdf1d639d387f32a65ea40e0a706f16b6ec0915c9580255c0385033e3d80c3ddf5c15c3f8adccd1f23530f430c9eb28f9d2771f61ae5a5c479726928
WHIRLPOOL
2d8df1d69c367df83d7933c2b4d6a904b4a56c5f13ca67820263669067ee938dbddb514129827abeec02fd01b82a23512d57e95461f6a44e5327516205dae3c4
+DIST darktable-2.2.0.rc2.tar.xz 3265220 SHA256
f3ed739f79858a1ce2b3746bbab11994f5fb38db6e96941d84ba475beab890a6 SHA512
359207ba75d5ddccd3e0d4f397c1b3374ef5f5be63fc0ea6a1c63f916fbffdb384e4c665bbb085d5b4fae644519c7a1c85d37290f6774113011aa21459918f5a
WHIRLPOOL
accadeddb32ab61a9952d0e72b7de9c3bd15c7bd569fbc417c03b2e6d92b098bf81516e991bb3201c77d55043f7ad5d1bd8d4836885872d9cead65e5ded70a43
DIST darktable-usermanual-1.6.0.pdf 12827069 SHA256
f5c46dbf0a2dd2d391f92555abdefe735c6362e51a755b296d71779492b7e945 SHA512
39ee8c1b4f23883025750416d9d1f73d1dfbec0e6ac3eeef0f15778ced66a373c00b0a46cb3a54b1cfd6e04313313f63e8e3cd3d0cbea011acaa07a725d0ab02
WHIRLPOOL
49a234e57c14d23ccb85eadf2ad03c52eae7f90b0371dce025c04019a7a5cca41858084f735fe0965f93958ab83601571ab3e33acd27c2bcbd381bb0c9da4794
diff --git a/media-gfx/darktable/darktable-9999.ebuild
b/media-gfx/darktable/darktable-2.2.0_rc2.ebuild
similarity index 60%
copy from media-gfx/darktable/darktable-9999.ebuild
copy to media-gfx/darktable/darktable-2.2.0_rc2.ebuild
index c60365a..2637e94 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-2.2.0_rc2.ebuild
@@ -2,22 +2,27 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
+CMAKE_MIN_VERSION="3.0"
-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 fdo-mime
pax-utils eutils
-EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
+DOC_PV="1.6.0"
+MY_PV="${PV/_/}"
+MY_P="${P/_/.}"
DESCRIPTION="A virtual lighttable and darkroom for photographers"
HOMEPAGE="http://www.darktable.org/";
+SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
+ doc? (
https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf
-> ${PN}-usermanual-${DOC_PV}.pdf )"
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
-#KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl it ja nl pl pt-BR pt-PT ro ru sk sq sv
th uk zh-CN"
+KEYWORDS="~amd64 ~x86"
+LANGS=" af ca cs da de el es fi fr gl he hu it ja nl pl pt-BR pt-PT ro ru sk
sl sq sv th uk zh-CN"
# TODO add lua once dev-lang/lua-5.2 is unmasked
IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick
jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
+nls opencl openmp openexr pax_kernel webp
${LANGS// / l10n_}"
# sse3 support is required to build darktable
@@ -36,13 +41,15 @@ CDEPEND="
media-libs/tiff:0
net-misc/curl
virtual/jpeg:0
+ virtual/glu
+ virtual/opengl
x11-libs/cairo
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.14:3
x11-libs/pango
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
- geo? ( net-libs/libsoup:2.4 )
+ geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:0 )
@@ -51,11 +58,6 @@ CDEPEND="
)
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
- slideshow? (
- media-libs/libsdl
- virtual/glu
- virtual/opengl
- )
webp? ( media-libs/libwebp:0= )"
RDEPEND="${CDEPEND}
kde? ( kde-apps/kwalletd:4 )"
@@ -64,6 +66,8 @@ DEPEND="${CDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
+S="${WORKDIR}/${P/_/~}"
+
pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible
compiler"
@@ -73,44 +77,38 @@ pkg_pretend() {
src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
- sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
- -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
- -e "s:LICENSE::" \
- -i doc/CMakeLists.txt || die
-
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_use colord COLORD)
- $(cmake-utils_use_build cups PRINT)
- $(cmake-utils_use_use flickr FLICKR)
- $(cmake-utils_use_use geo GEO)
- $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
- $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use kde KWALLET)
- $(cmake-utils_use_use libsecret LIBSECRET)
- $(cmake-utils_use_use nls NLS)
- $(cmake-utils_use_use opencl OPENCL)
- $(cmake-utils_use_use openexr OPENEXR)
- $(cmake-utils_use_use openmp OPENMP)
- $(cmake-utils_use_build slideshow SLIDESHOW)
- $(cmake-utils_use_use webp WEBP)
- -DUSE_LUA=OFF
+ -DBUILD_PRINT=$(usex cups)
+ -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-DCUSTOM_CFLAGS=ON
- -DINSTALL_IOP_EXPERIMENTAL=ON
- -DINSTALL_IOP_LEGACY=ON
+ -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+ -DUSE_COLORD=$(usex colord)
+ -DUSE_FLICKR=$(usex flickr)
+ -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+ -DUSE_KWALLET=$(usex kde)
+ -DUSE_LIBSECRET=$(usex libsecret)
+ -DUSE_LUA=OFF
+ -DUSE_MAP=$(usex geo)
+ -DUSE_NLS=$(usex nls)
+ -DUSE_OPENCL=$(usex opencl)
+ -DUSE_OPENEXR=$(usex openexr)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENMP=$(usex openmp)
+ -DUSE_WEBP=$(usex webp)
)
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}
+ use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
done
if use pax_kernel && use opencl ; then
@@ -130,6 +128,12 @@ pkg_preinst() {
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
+
+ elog "when updating from the currently stable 1.6 series,"
+ elog "please bear in mind that your edits will be preserved during this
process,"
+ elog "but it will not be possible to downgrade from 2.0 to 1.6 any
more."
+ echo
+ ewarn "It will not be possible to downgrade!"
}
pkg_postrm() {
diff --git a/media-gfx/darktable/darktable-9999.ebuild
b/media-gfx/darktable/darktable-9999.ebuild
index c60365a..02f1814 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3
pax-utils eutils versionator
@@ -14,10 +14,10 @@ HOMEPAGE="http://www.darktable.org/";
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
#KEYWORDS="~amd64 ~x86"
-LANGS=" af ca cs da de el es fi fr gl it ja nl pl pt-BR pt-PT ro ru sk sq sv
th uk zh-CN"
+LANGS=" af ca cs da de el es fi fr gl he hu it ja nl pl pt-BR pt-PT ro ru sk
sl sq sv th uk zh-CN"
# TODO add lua once dev-lang/lua-5.2 is unmasked
IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick
jpeg2k kde libsecret
-nls opencl openmp openexr pax_kernel +slideshow webp
+nls opencl openmp openexr pax_kernel webp
${LANGS// / l10n_}"
# sse3 support is required to build darktable
@@ -36,13 +36,15 @@ CDEPEND="
media-libs/tiff:0
net-misc/curl
virtual/jpeg:0
+ virtual/glu
+ virtual/opengl
x11-libs/cairo
- x11-libs/gtk+:3
+ >=x11-libs/gtk+-3.14:3
x11-libs/pango
colord? ( x11-libs/colord-gtk:0= )
cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
- geo? ( net-libs/libsoup:2.4 )
+ geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
gphoto2? ( media-libs/libgphoto2:= )
graphicsmagick? ( media-gfx/graphicsmagick )
jpeg2k? ( media-libs/openjpeg:0 )
@@ -51,11 +53,6 @@ CDEPEND="
)
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
- slideshow? (
- media-libs/libsdl
- virtual/glu
- virtual/opengl
- )
webp? ( media-libs/libwebp:0= )"
RDEPEND="${CDEPEND}
kde? ( kde-apps/kwalletd:4 )"
@@ -73,35 +70,28 @@ pkg_pretend() {
src_prepare() {
use cpu_flags_x86_sse3 && append-flags -msse3
- sed -e "s:\(/share/doc/\)darktable:\1${PF}:" \
- -e "s:\(\${SHARE_INSTALL}/doc/\)darktable:\1${PF}:" \
- -e "s:LICENSE::" \
- -i doc/CMakeLists.txt || die
-
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_use colord COLORD)
- $(cmake-utils_use_build cups PRINT)
- $(cmake-utils_use_use flickr FLICKR)
- $(cmake-utils_use_use geo GEO)
- $(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
- $(cmake-utils_use_use graphicsmagick GRAPHICSMAGICK)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use kde KWALLET)
- $(cmake-utils_use_use libsecret LIBSECRET)
- $(cmake-utils_use_use nls NLS)
- $(cmake-utils_use_use opencl OPENCL)
- $(cmake-utils_use_use openexr OPENEXR)
- $(cmake-utils_use_use openmp OPENMP)
- $(cmake-utils_use_build slideshow SLIDESHOW)
- $(cmake-utils_use_use webp WEBP)
- -DUSE_LUA=OFF
+ -DBUILD_PRINT=$(usex cups)
+ -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
-DCUSTOM_CFLAGS=ON
- -DINSTALL_IOP_EXPERIMENTAL=ON
- -DINSTALL_IOP_LEGACY=ON
+ -DUSE_CAMERA_SUPPORT=$(usex gphoto2)
+ -DUSE_COLORD=$(usex colord)
+ -DUSE_FLICKR=$(usex flickr)
+ -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
+ -DUSE_KWALLET=$(usex kde)
+ -DUSE_LIBSECRET=$(usex libsecret)
+ -DUSE_LUA=OFF
+ -DUSE_MAP=$(usex geo)
+ -DUSE_NLS=$(usex nls)
+ -DUSE_OPENCL=$(usex opencl)
+ -DUSE_OPENEXR=$(usex openexr)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENMP=$(usex openmp)
+ -DUSE_WEBP=$(usex webp)
)
cmake-utils_src_configure
}
@@ -110,7 +100,7 @@ src_install() {
cmake-utils_src_install
for lang in ${LANGS} ; do
- use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
+ use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_}
done
if use pax_kernel && use opencl ; then
