commit: 0956ff7dcf2a7c8c48021981a4279acb471dfffa
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 14:44:19 2015 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 14:44:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0956ff7d
media-gfx/darktable: version bump
this also fixes bug #566190
Package-Manager: portage-2.2.25
media-gfx/darktable/Manifest | 1 +
...ktable-9999.ebuild => darktable-2.0_rc1.ebuild} | 34 ++++++++++++----------
media-gfx/darktable/darktable-9999.ebuild | 22 ++++++--------
3 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 83132a1..f9a206b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,4 +2,5 @@ DIST darktable-1.6.6.tar.xz 3097760 SHA256
f85e4b8219677eba34f5a41e1a0784cc6ec06
DIST darktable-1.6.7.tar.xz 3113804 SHA256
a75073b49df0a30cd2686624feeb6210bc083bc37112ae6e045f8523db4c4c98 SHA512
6fadc62dc9ac0dd8b11d7d1a1ef1c23bd07abb7e66159d0bd26dd4bb9b36162e390c4f1559dd7c433c18dd55ebff98157234137567e12467995f7f26915b0ea0
WHIRLPOOL
69228b8c734b53b17483ae453df8cd73caf78b5fcbcee6b5cae5f8396c5dd1038ba6036048ab50e15c85cc35adeac0bd49de03f3acb30dbcb822fae2e02b73bf
DIST darktable-1.6.8.tar.xz 3118776 SHA256
b676f81bd8cc661a8f76e03ad449da4444f770b6bec3e9accf013c636f690905 SHA512
8811e8f931299b4fb86d3611696061404253985328178231902e749dc55b4f02d5193ce2e2eaf8c6351f9f7374870bcbdc55b145dfb75cd7669556494b457bbb
WHIRLPOOL
acfe83ebcc697904246a11583d0ff521365639d2006629e76123db93c35ea7ed39cbd7fed54470e5ed0e27cc6b28d70559738d68f36c31be63391c539c5323cb
DIST darktable-1.6.9.tar.xz 3124940 SHA256
0f721e9d298a9407f6c0325d9c95b9dc37fa60f3b6a2f2e3b5675ff97c423173 SHA512
c0e8e83cf1cb10b663e5486f2bdde3cba2db5dbaabacd260999be1173c67618023e785e9087a517959835459f8d54c245d190f63a9422a17f3472f5aa316d492
WHIRLPOOL
0a2446ff7f98cf0297c5948009414dbf828f1cc60a9fb117f1e110f454dd68df611310bd9ff287f1f2345a8ee9818c1918b4ac7791aeb094c01e71a1ecdfce9d
+DIST darktable-2.0.rc1.tar.xz 2912620 SHA256
412f17131c8674e266c91c933de1aa2b04c2ab7efdc04a60b00faf3abffc0446 SHA512
b94b40fa06f6ece6b7082d42ff91c4a338eb5d942d58b8941835b5d151cc5723faa44c1dc172ccd804fe23197b4e0f1d83b3c95b79bcfebe3cee20cfc5bfe407
WHIRLPOOL
10dda638fa54074e6b95e6e814d9c61c3963782d3787ce681c0cbbe90bd9683e8bf45cc49287725210b3572ed6df2d5234e3ba6c16a94a25533b56fe5c683b20
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.0_rc1.ebuild
similarity index 77%
copy from media-gfx/darktable/darktable-9999.ebuild
copy to media-gfx/darktable/darktable-2.0_rc1.ebuild
index e2ddc61..b591883 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-2.0_rc1.ebuild
@@ -4,20 +4,25 @@
EAPI=5
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3
pax-utils eutils
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime
pax-utils eutils versionator
-EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
+DOC_PV="1.6.0"
+MY_PV="$(replace_version_separator 2 "")"
+MY_P="${PN}-$(replace_version_separator 2 ".")"
+MY_P_S="${PN}-$(replace_version_separator 2 "~")"
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=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+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 zh_CN"
# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k
kde libsecret
-nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services
webp
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick
jpeg2k kde libsecret
+nls opencl openmp openexr pax_kernel +slideshow webp
${LANGS// / linguas_}"
# sse3 support is required to build darktable
@@ -25,8 +30,9 @@ REQUIRED_USE="cpu_flags_x86_sse3"
CDEPEND="
dev-db/sqlite:3
- >=dev-libs/glib-2.28:2
+ dev-libs/json-glib
dev-libs/libxml2:2
+ dev-libs/pugixml:0=
gnome-base/librsvg:2
media-gfx/exiv2:0=[xmp]
media-libs/lcms:2
@@ -36,10 +42,10 @@ CDEPEND="
net-misc/curl
virtual/jpeg:0
x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/pango
colord? ( x11-misc/colord:0= )
+ cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geo? ( net-libs/libsoup:2.4 )
gphoto2? ( media-libs/libgphoto2:= )
@@ -47,7 +53,6 @@ CDEPEND="
jpeg2k? ( media-libs/openjpeg:0 )
libsecret? (
>=app-crypt/libsecret-0.18
- dev-libs/json-glib
)
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
@@ -56,7 +61,6 @@ CDEPEND="
virtual/glu
virtual/opengl
)
- web-services? ( dev-libs/json-glib )
webp? ( media-libs/libwebp:0= )"
RDEPEND="${CDEPEND}
x11-themes/gtk-engines:2
@@ -66,6 +70,8 @@ DEPEND="${CDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
+S="${WORKDIR}/${MY_P_S}"
+
pkg_pretend() {
if use openmp ; then
tc-has-openmp || die "Please switch to an openmp compatible
compiler"
@@ -86,6 +92,7 @@ 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)
@@ -93,15 +100,11 @@ src_configure() {
$(cmake-utils_use_use jpeg2k OPENJPEG)
$(cmake-utils_use_use kde KWALLET)
$(cmake-utils_use_use libsecret LIBSECRET)
- $(cmake-utils_use_use libsecret GLIBJSON)
$(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 !rawspeed DONT_USE_RAWSPEED)
- $(cmake-utils_use_use squish SQUISH)
$(cmake-utils_use_build slideshow SLIDESHOW)
- $(cmake-utils_use_use web-services GLIBJSON)
$(cmake-utils_use_use webp WEBP)
-DUSE_LUA=OFF
-DCUSTOM_CFLAGS=ON
@@ -113,6 +116,7 @@ src_configure() {
src_install() {
cmake-utils_src_install
+ use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
for lang in ${LANGS} ; do
use linguas_${lang} || rm -r "${ED}"/usr/share/locale/${lang}
diff --git a/media-gfx/darktable/darktable-9999.ebuild
b/media-gfx/darktable/darktable-9999.ebuild
index e2ddc61..feca19e 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3
pax-utils eutils
+inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime git-r3
pax-utils eutils versionator
EGIT_REPO_URI="git://github.com/darktable-org/darktable.git"
@@ -14,10 +14,10 @@ HOMEPAGE="http://www.darktable.org/";
LICENSE="GPL-3 CC-BY-3.0"
SLOT="0"
#KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de el es fr it ja nl pl pt_BR pt_PT ru sq sv uk"
+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 zh_CN"
# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k
kde libsecret
-nls opencl openmp openexr pax_kernel +rawspeed +slideshow +squish web-services
webp
+IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick
jpeg2k kde libsecret
+nls opencl openmp openexr pax_kernel +slideshow webp
${LANGS// / linguas_}"
# sse3 support is required to build darktable
@@ -25,8 +25,9 @@ REQUIRED_USE="cpu_flags_x86_sse3"
CDEPEND="
dev-db/sqlite:3
- >=dev-libs/glib-2.28:2
+ dev-libs/json-glib
dev-libs/libxml2:2
+ dev-libs/pugixml:0=
gnome-base/librsvg:2
media-gfx/exiv2:0=[xmp]
media-libs/lcms:2
@@ -36,10 +37,10 @@ CDEPEND="
net-misc/curl
virtual/jpeg:0
x11-libs/cairo
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:2
+ x11-libs/gtk+:3
x11-libs/pango
colord? ( x11-misc/colord:0= )
+ cups? ( net-print/cups )
flickr? ( media-libs/flickcurl )
geo? ( net-libs/libsoup:2.4 )
gphoto2? ( media-libs/libgphoto2:= )
@@ -47,7 +48,6 @@ CDEPEND="
jpeg2k? ( media-libs/openjpeg:0 )
libsecret? (
>=app-crypt/libsecret-0.18
- dev-libs/json-glib
)
opencl? ( virtual/opencl )
openexr? ( media-libs/openexr:0= )
@@ -56,7 +56,6 @@ CDEPEND="
virtual/glu
virtual/opengl
)
- web-services? ( dev-libs/json-glib )
webp? ( media-libs/libwebp:0= )"
RDEPEND="${CDEPEND}
x11-themes/gtk-engines:2
@@ -86,6 +85,7 @@ 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)
@@ -93,15 +93,11 @@ src_configure() {
$(cmake-utils_use_use jpeg2k OPENJPEG)
$(cmake-utils_use_use kde KWALLET)
$(cmake-utils_use_use libsecret LIBSECRET)
- $(cmake-utils_use_use libsecret GLIBJSON)
$(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 !rawspeed DONT_USE_RAWSPEED)
- $(cmake-utils_use_use squish SQUISH)
$(cmake-utils_use_build slideshow SLIDESHOW)
- $(cmake-utils_use_use web-services GLIBJSON)
$(cmake-utils_use_use webp WEBP)
-DUSE_LUA=OFF
-DCUSTOM_CFLAGS=ON
