From b17a3ef12038de50228bade1f05502c74e135321 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Sep 2020 14:09:07 +0100 Subject: gentoo resync : 02.09.2020 --- media-gfx/darktable/Manifest | 11 +- media-gfx/darktable/darktable-2.6.2.ebuild | 15 +-- media-gfx/darktable/darktable-3.0.2-r1.ebuild | 151 -------------------------- media-gfx/darktable/darktable-3.0.2.ebuild | 2 +- media-gfx/darktable/darktable-3.2.1.ebuild | 2 +- media-gfx/darktable/darktable-9999.ebuild | 2 +- media-gfx/darktable/metadata.xml | 1 - 7 files changed, 11 insertions(+), 173 deletions(-) delete mode 100644 media-gfx/darktable/darktable-3.0.2-r1.ebuild (limited to 'media-gfx/darktable') diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index ed17ffb8e996..2f12a53d6fbc 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -9,9 +9,8 @@ DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac -EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80 -EBUILD darktable-3.0.2-r1.ebuild 3888 BLAKE2B e402484fa08d1bbb949ad7381d6b0f0a370fd5c644b9fcbf2e190f65b4eded72580a28decb556795ce7aec7a147a3a147ba601162484358925f6f61e69f826df SHA512 d8e34da86742f2fe5cf2e04023dd0ca2b2ec9d22cff984eefca8246fe5dc5dab4c9633e4aa0585376e5c943617e1808b7f04b9355c162652446f42f2b1783f24 -EBUILD darktable-3.0.2.ebuild 3781 BLAKE2B b541810d2da2a8758a77e6d9e4f2e3370c79f099f29b4aa884776b6a515eb5a5f76aa0854821e135eb7271db34ae6d2f0e581f1b896e17e958daa05aa889fc2a SHA512 e88070a5dd82642ea2fa3e1418587f185ab492da20d729db6ebda6b00f74b79fc313789cbb4a87e4f071f9c1da4040041a6477291aace42b2529b5640408dbbc -EBUILD darktable-3.2.1.ebuild 3815 BLAKE2B ea75d2707a1248dccf730abea89407e790a644cfc60eac6de1ac45529c32ff4c0b623047087bc971c685bee89a4c4874be640ff629569167c1fd8bec71a3117d SHA512 397bb4bbb8eeadcd6bf998fbf7ef5d8d4b7c53b2c4422a9eaf1ead57db9945b4b992e72573cc2ad7766003202ebf345450299761ecccd93c52366a717785285c -EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af -MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166 +EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b +EBUILD darktable-3.0.2.ebuild 3776 BLAKE2B 2148441c564365ed0cf732ca101f7ebbcfb99812bf01170164b8ebcd1d77dcc345ce08784fb3a9c2d8eefc27b9a410d449c45a5ce93449bb87295829156c4e2b SHA512 8cde8a2a1b6fbec34d918f5380068801be7b8cb4a8e8bc8d47bf51281c8f333aaefd63418769beec9b72efb8a9fac59422fe35ef570f25606a2d789e415f988e +EBUILD darktable-3.2.1.ebuild 3810 BLAKE2B edeaeaeb1d291965a30e95177c39716952572640aeb7dcd42d7ad153cbb4c46c7c9dbafc1961ab32d42863f5c0ada9214d40c9ac41e4eb6b6529863749036224 SHA512 a6427900ba11b3c9acd249c7e14383dd8525e01f8a1baead0a39af8ab75af801a223a4e7613cba341d9ae94ea4b3be9b2f5c24f1270b22cccad81846bada28a0 +EBUILD darktable-9999.ebuild 3264 BLAKE2B a287e05dbbc18377966713eae4272ba0856fd53f43853060e0ccb4a36c0f37e8b8725b258abd17e6f1cb7f278209144fea75c656e3da519007497367ef3a9d8c SHA512 e821a987dde08ccb26d7d94f660abd02965ee0699b5ba30dfe1e33c9b2b6bea540a0cd9a8b2eb255af563cf0bb71bf21d14ffd3c91a22f1380907d5b23a12507 +MISC metadata.xml 967 BLAKE2B b87460be69114c3aa5b23813e4c9750fa03c748343142b880858fa26f9251ba6d9a427eb05d6a6ad16ced258dd5f4376f53f67e4b0345fd1d5bd26c064a8c5c5 SHA512 1ef671b139bbb1019380d0d84ab9a705c145def53186866aba6d2f48d0d1cc107bd1bb5a010706dbefcf7d46a9cbaf350dd85d55b609b8d5b8e2e1566197aa1f diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.2.ebuild index ee670e718387..394e2f5295a8 100644 --- a/media-gfx/darktable/darktable-2.6.2.ebuild +++ b/media-gfx/darktable/darktable-2.6.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit cmake flag-o-matic pax-utils toolchain-funcs xdg +inherit cmake flag-o-matic toolchain-funcs xdg DOC_PV="2.6.0" MY_PV="${PV/_/}" @@ -21,7 +21,7 @@ KEYWORDS="amd64 x86" LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet -nls opencl openmp openexr pax_kernel webp +nls opencl openmp openexr webp ${LANGS// / l10n_}" BDEPEND=" @@ -123,15 +123,6 @@ src_install() { fi done fi - - if use pax_kernel && use opencl ; then - pax-mark Cm "${ED}"/usr/bin/${PN} || die - eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" - eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" - eqawarn "must be modified and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is broken by this modification," - eqawarn "please open a bug." - fi } pkg_postinst() { diff --git a/media-gfx/darktable/darktable-3.0.2-r1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild deleted file mode 100644 index 5b83be05e128..000000000000 --- a/media-gfx/darktable/darktable-3.0.2-r1.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake flag-o-matic toolchain-funcs xdg - -DOC_PV="3.0.0" -MY_PV="${PV/_/}" -MY_P="${P/_/.}" - -DESCRIPTION="A virtual lighttable and darkroom for photographers" -HOMEPAGE="https://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 ~arm64 ~x86" -LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl" -# TODO add lua once dev-lang/lua-5.2 is unmasked -IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet - lto nls opencl openmp openexr tools webp - ${LANGS// / l10n_}" - -BDEPEND=" - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext ) -" -COMMON_DEPEND=" - dev-db/sqlite:3 - dev-libs/json-glib - dev-libs/libxml2:2 - >=dev-libs/pugixml-1.8:0= - gnome-base/librsvg:2 - >=media-gfx/exiv2-0.25-r2:0=[xmp] - media-libs/lcms:2 - >=media-libs/lensfun-0.2.3:0= - media-libs/libpng:0= - media-libs/tiff:0 - net-libs/libsoup:2.4 - net-misc/curl - sys-libs/zlib:= - virtual/jpeg:0 - x11-libs/cairo - >=x11-libs/gtk+-3.22:3 - x11-libs/pango - colord? ( x11-libs/colord-gtk:0= ) - cups? ( net-print/cups ) - flickr? ( media-libs/flickcurl ) - geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) - gnome-keyring? ( >=app-crypt/libsecret-0.18 ) - gphoto2? ( media-libs/libgphoto2:= ) - graphicsmagick? ( media-gfx/graphicsmagick ) - jpeg2k? ( media-libs/openjpeg:2= ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - 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 - "${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch - "${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch - "${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch -) - -S="${WORKDIR}/${P/_/~}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # Bug #695658 - if tc-is-gcc; then - test-flags-CC -floop-block &> /dev/null || \ - die "Please switch to a gcc version built with USE=graphite" - fi - - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - fi -} - -src_prepare() { - use cpu_flags_x86_sse3 && append-flags -msse3 - - sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_CURVE_TOOLS=$(usex tools) - -DBUILD_NOISE_TOOLS=$(usex tools) - -DBUILD_PRINT=$(usex cups) - -DCUSTOM_CFLAGS=ON - -DRAWSPEED_ENABLE_LTO=$(usex lto) - -DUSE_CAMERA_SUPPORT=$(usex gphoto2) - -DUSE_COLORD=$(usex colord) - -DUSE_FLICKR=$(usex flickr) - -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DUSE_KWALLET=$(usex kwallet) - -DUSE_LIBSECRET=$(usex gnome-keyring) - -DUSE_LUA=OFF - -DUSE_MAP=$(usex geolocation) - -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_BUILD_TYPE="RELWITHDEBINFO" - cmake_src_configure -} - -src_install() { - cmake_src_install - use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf - - if use nls ; then - for lang in ${LANGS} ; do - if ! use l10n_${lang}; then - rm -r "${ED}"/usr/share/locale/${lang/-/_} || die - fi - done - fi -} - -pkg_postinst() { - xdg_pkg_postinst - - elog - elog "When updating a major version," - elog "please bear in mind that your edits will be preserved during this process," - elog "but it will not be possible to downgrade any more." - elog - ewarn "It will not be possible to downgrade!" - ewarn -} diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild index 482ed841310f..4fd99f7da34f 100644 --- a/media-gfx/darktable/darktable-3.0.2.ebuild +++ b/media-gfx/darktable/darktable-3.0.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet diff --git a/media-gfx/darktable/darktable-3.2.1.ebuild b/media-gfx/darktable/darktable-3.2.1.ebuild index 2ed26c6f2cd4..49e44beeb082 100644 --- a/media-gfx/darktable/darktable-3.2.1.ebuild +++ b/media-gfx/darktable/darktable-3.2.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64" LANGS=" de es fr he it pl pt-BR ru sl" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild index 422d45185bb7..b94745a602bc 100644 --- a/media-gfx/darktable/darktable-9999.ebuild +++ b/media-gfx/darktable/darktable-9999.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.darktable.org/" LICENSE="GPL-3 CC-BY-3.0" SLOT="0" -#KEYWORDS="~amd64 ~x86" +#KEYWORDS="~amd64 ~arm64" LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml index 08c6f2bb31f8..63e4e905d37f 100644 --- a/media-gfx/darktable/metadata.xml +++ b/media-gfx/darktable/metadata.xml @@ -15,7 +15,6 @@ Enable encrypted storage of passwords with kde-frameworks/kwallet Enable link-time optimisations in the RawSpeed library Enable opencl support - Triggers paxmarking of main darktable binary Install tools for generating base curves and noise profiles -- cgit v1.2.3