commit: d5ffc701f54533de94b405c9697e46a136365cef Author: Markus Meier <maekke <AT> gentoo <DOT> org> AuthorDate: Sat Nov 7 06:56:37 2015 +0000 Commit: Markus Meier <maekke <AT> gentoo <DOT> org> CommitDate: Sat Nov 7 06:56:37 2015 +0000 URL: https://gitweb.gentoo.org/dev/maekke.git/commit/?id=d5ffc701
media-gfx/darktable: sync live ebuild with changes from 2.0_rc1 Package-Manager: portage-2.2.23 Manifest-Sign-Key: 0x363AF1F7765A9D02 media-gfx/darktable/Manifest | 24 +++++++++++++++++++++++- media-gfx/darktable/darktable-9999.ebuild | 22 +++++++++------------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 7f531df..c625c0b 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST darktable-1.6.6.tar.xz 3097760 SHA256 f85e4b8219677eba34f5a41e1a0784cc6ec06576326a99f04e460a4f41fd21a5 SHA512 96f0371c0044c40e22c0cf729076032e487fd0af30d27d28ed42ea8bcc3e29971b09d9f628e3b734147265b02fa0243217e687a8e6237b2c0c14b9db330df09c WHIRLPOOL d04e77777fdcfdd5933d7c915375b7418647918af7ef4a5b19703724a113ee5fdfe8db6bb839e9638eecca6c0c9c7542088d12b45634fca57d3b453fa120d7f6 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 @@ -9,5 +12,24 @@ EBUILD darktable-1.6.7.ebuild 4046 SHA256 7cf1bc5ce53846951f50537cf263621c4a02ed EBUILD darktable-1.6.8.ebuild 4046 SHA256 7cf1bc5ce53846951f50537cf263621c4a02ed911fed06b8f1e2c32afd5a2724 SHA512 d68614204ff3cb3b028f1b60dff08dfdaf34bd497fe2beb495134ef6645273780468aa8ab6f8858b6ece23df1d85147ad006e70be4f0146b8de85debb5ecb475 WHIRLPOOL 3d0ced798479e764f7d1cd5e953a89178fa64e893ec3c721e2d6c094a9cdbb22673a08e718d051788fdcb9bad75319e32050f9ab8b5618f953f965b57f59f9a3 EBUILD darktable-1.6.9.ebuild 4046 SHA256 7cf1bc5ce53846951f50537cf263621c4a02ed911fed06b8f1e2c32afd5a2724 SHA512 d68614204ff3cb3b028f1b60dff08dfdaf34bd497fe2beb495134ef6645273780468aa8ab6f8858b6ece23df1d85147ad006e70be4f0146b8de85debb5ecb475 WHIRLPOOL 3d0ced798479e764f7d1cd5e953a89178fa64e893ec3c721e2d6c094a9cdbb22673a08e718d051788fdcb9bad75319e32050f9ab8b5618f953f965b57f59f9a3 EBUILD darktable-2.0_rc1.ebuild 4052 SHA256 99ef719de7375a572c3439f53b70197ca411d6ccd3e082866c769c8746422c87 SHA512 b80b8962d32f0ea4f35f17aa289442c8d76ac9770e2e2cdaa44e68e0711f2e078598a07c6a55e170d5ee181716f2aa3fe14b2aaffec6441474465bcb377db929 WHIRLPOOL af29cee2ed22105e89a67e502351780d59cbd78dd11212a36761f85938ec15daeff2b1f44577d3aaf7fa083f8ae8d77d38cf030b826781ecbbdf776d9e7acaae -EBUILD darktable-9999.ebuild 3805 SHA256 4d1228248d154c2488b8ec7204c9491d97c31824a1e0b4eb997071c61a3e15c1 SHA512 16949ad791cd12f36b417a5ab4509c1a95d3e5280c2631ab125a8894187c1d45da2a13817f76726d3f2207b49b05791198e08216429c065729557035aba02249 WHIRLPOOL 19ecefd43b296aee466ac9ded56ecc0e004a495e1c1620fb017fbdca6caa69ecec4625923eda9369b58d1ae00b3cd7cf09349801881a22d113ddfcd0c2f0ab1f +EBUILD darktable-9999.ebuild 3638 SHA256 48d4f40910d12ef58943d38e8745f7d0711b45ac86500c4a048b6ddaf7a218ae SHA512 3d2243b01fee3e58a25a71d44a6b27d35e0c5d6d99e9503aa34b67617e6796113be22abe3b74bd4eb6e717d7a2bb473b770b9cd7103ec96301e8ab7c9151cacb WHIRLPOOL 27de00327ee83ecf581b9ecc20664fa5ab99ebd77480afd9cbc61ff062569955af48cea9b878c309cd40727e3c7b6c2cac374b02c0f1168cc17c549be8ddf60b MISC metadata.xml 1183 SHA256 74075c6b1ec2b0d94214dffb780882acc4ebc5305d4a94fff7487b9630098be7 SHA512 34ceb0e19ac74ff04ceb3cca0bcdca9410323b0a69486eac134c965d3b89721d7154bde1fb18d86a6f2b44e5b29c526c795d20d757a12dfb02e88407dcf5b09c WHIRLPOOL a661e3b2cb39693e8349f075c839acc3256b513ee3c9ab07654aa91e07edd1ad583d939f6379f69aae7a6b0a32a608fad493cdafca0f4971c6bc59503f5f854d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.1 + +iQJ8BAEBCABmBQJWPaCkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyMDhFOEI5QzhFQzk5QTE1M0I0QkI3Mzc3 +QkU3NkVDMjU1N0I0NDNDAAoJEHvnbsJVe0Q8iNIQAIlNHK729w6hQUtWRgsHkxSz +k90vTlLBiQjk7e0Si3lwUNqnEg+ysiokOBt1BF05pDEvhWmdxTbZK8NYXx+zyim8 +wZkcAS71qJDtcekkAmyB7JlSYDRTgyyG0gmEktQd/GV6yAD1a+q36FwLIeKPf68D +2uh1stL9aHyzdPkRaiLUZAmHsO4pc8m/60nuXSgNTxQ1jWjgLUzhdmlnQiQcOyWE +8aKB7AL2D2qyXf2hJ/e47aKurDeFFlVcXl6BiJd2/EeJRzz6pLgPOf5tqv2hFpPS +yc0d7zSYkLJTjehN+wGnSEHV5yS0xTb4dPuzPSmpx7Ur93I2YeBpXNDiROOWpZu+ +Ao2n1e5gAY0uPM/yzP4z6qpQNyl5GoKZYFNHOZSUU12v4jh+RzBXwR1MJquptvNr +JbhaXRhpqS16o76UOpGhVIgjKgzSonxGnGmFJ7Iw7cEvsDd+WJPf1XzOeGhRkiJU +Dt2lO/2wkPUpj++9EzoHUmets7MnEitzMupEFJC6U+N0rFOpOwhOFwa1fJu04ig1 +5EY4qFkRs8UO50/+1iSFkpiEZkDIDdEdCX/QpwSFv/clkYfb9Yec4qvUe/1BY9iH +yLdoqSqjCKEonQSPN+4ywyEIfz6Gttf9WhwCGMyRyKfLeiL/KHKt6+lEUsohHAbv +xOPClAoO9KlFjHqDnjcv +=87O0 +-----END PGP SIGNATURE----- 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
