From 77398e424e45d9e98c1cef3c43bdadb9d56e81ef Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Nov 2019 13:21:36 +0000 Subject: gentoo resync : 10.11.2019 --- media-gfx/enblend/Manifest | 2 +- .../enblend/enblend-4.2.0_p20161007-r1.ebuild | 45 +++++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) (limited to 'media-gfx/enblend') diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 7bbaf7be36a8..bb450e70049a 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,5 +1,5 @@ AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f849cfb9cb2e7e9ae2a10b2fcd4b56cd7b27888047567c3b95b40e3a8feefe7ee9209db49688800986cc895731e0949acd3bae1c SHA512 a22730295c44da4f9feb3d541b17f298adf98f0328cf01d6a85206087c782e1aebac6509968d1a5433efb5fc3d72e48301ec3d5a2516f01c1f6d923d5032ab03 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 -EBUILD enblend-4.2.0_p20161007-r1.ebuild 1762 BLAKE2B 91477734eec50b3e667d195c24b4bd53933177005c4d715ba1adea91e12980f5e1228fa8bc443b58a948169a2e0000b0d677ba0c6ca463350ed34c9a2664ae60 SHA512 6f09e5dbce73d1df08c435046f312bbd4793f73444ff029abd6f4439c9a7ace35a38d576e599318b7ade58639a1f61f700cdabf60cf8ef5d08372ff1211cad17 +EBUILD enblend-4.2.0_p20161007-r1.ebuild 1781 BLAKE2B 808148c7ce0e93683ed04bad57d4199acf0e362b96ac53761131c59eb84eb605c5defa25ac0a4cc089a1f51ca7886147fdb889dfd621d97f22a189ac99b4c05b SHA512 1e184f985dae258c7fd9f16138f0b9704daeac52f401a12f66286107dad7e4ca83772de5641e7fb6dcfa32525e687947344386bef257e00d6ee2b4c7789660dc MISC metadata.xml 336 BLAKE2B ca7263a1856bc0a6de0a9085fcaa0df5745cda2f678c36984fc2bf11218207214dbad308c39811213d7ce5d376228bc87a60adbfd4fee8f02b2119af0ebac207 SHA512 ac71d3806312b434087a0ce55eadd3db06091e11a195fe90da48570bdb4ad47bf50c864ae2b82e25acb08b6ce78ebc6dc8b33bdd064ee449efcb0995806f2eca diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild index b50a745f437a..51f0c069d6ee 100644 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild +++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit cmake-utils @@ -12,23 +12,12 @@ SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" LICENSE="GPL-2+ FDL-1.2+" SLOT="0" KEYWORDS="amd64 arm64 x86" -IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2" +IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc" REQUIRED_USE="tcmalloc? ( !debug )" -RDEPEND=" - media-libs/lcms:2 - media-libs/openexr:= - media-libs/tiff:0 - media-libs/vigra[openexr] - sci-libs/gsl:= - debug? ( dev-libs/dmalloc ) - tcmalloc? ( dev-util/google-perftools )" -DEPEND="${RDEPEND} - >=dev-libs/boost-1.62.0 - media-libs/libpng:0 +BDEPEND=" sys-apps/help2man - virtual/jpeg:0 virtual/pkgconfig doc? ( dev-lang/perl @@ -40,7 +29,22 @@ DEPEND="${RDEPEND} sci-visualization/gnuplot[gd] virtual/imagemagick-tools virtual/latex-base - )" + ) +" +RDEPEND=" + media-libs/lcms:2 + media-libs/openexr:= + media-libs/tiff:0 + media-libs/vigra[openexr] + sci-libs/gsl:= + debug? ( dev-libs/dmalloc ) + tcmalloc? ( dev-util/google-perftools ) +" +DEPEND="${RDEPEND} + >=dev-libs/boost-1.62.0 + media-libs/libpng:0 + virtual/jpeg:0 +" PATCHES=( "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch @@ -55,14 +59,17 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) -DENABLE_DMALLOC=$(usex debug) - -DENABLE_TCMALLOC=$(usex tcmalloc) -DDOC=$(usex doc) - -DINSTALL_HTML_DOC=$(usex doc) - -DINSTALL_PDF_DOC=$(usex doc) -DENABLE_OPENMP=$(usex openmp) - -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) + -DENABLE_TCMALLOC=$(usex tcmalloc) ) + if use doc; then + -DINSTALL_HTML_DOC=ON + -DINSTALL_PDF_DOC=ON + fi + cmake-utils_src_configure } -- cgit v1.2.3