gentoo auto-resync : 24:09:2024 - 01:25:19

4 files changed, 2 insertions, 160 deletions

diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 1020d6405521..0405a67f33ca 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -1,10 +1,7 @@
-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
 AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb6d4f83c4aaf55a2056fc571ee3973379327f6416a4667b7c5d1d94a5e6b26bfc49a0207608d3b5de0d99cd6678d298de605d6eae5ec731c874 SHA512 b2c3e5367d83bd1b2e0053dd41d92737834045969db32fd9e07f294a8cd5ca120fa913f9fc4fab70abea893d974d8e92fd1ace38845cd1324d21c2455c961ab4
 AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e
 AUX enblend-4.2.0_p20240424-doc-install-dir-fix.patch 1977 BLAKE2B bb747bd4d98f0d27d7930d0376ddcfef02186c998e869a0f3843e9fa32c2bf39fedb8074abdaa09d4a8425d2fb066ed2483ede75a3fddcba2d86f95042de3b25 SHA512 3c76b3fad97e918ac3849204d067c64c03e03dbbb61d4b4f35e5a7f0f895080f23518797d98050ca12fe101cde6f7476438fa59f89f736f84df23e1b9b5ecd1e
-DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
 DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894
-EBUILD enblend-4.2.0_p20161007-r6.ebuild 1896 BLAKE2B 4fefdf5984d6fe55a3dcf0e241b2bd60dbc2d671980b047ec35c236de101587b74be6c26dfb86bb091bf6de5353292cdf2980a5f0b59f8d6239cd50c451fe968 SHA512 6509c2e7d4e97f79be3b65f452c0211fb09dbf3327b943515acab7212476f353f91fc8a2ec48eb48e1591c749e416ad9d4bf8b5e8b82c2ee965da0c67d622b9b
-EBUILD enblend-4.2.0_p20240424.ebuild 1994 BLAKE2B b0265a0000b0f71ea0f3433fcdd54d27a2afd772cd941712f430b20346de82ac5c8a9091fcf0a2e426dae83f92e5a74f7266ad9bbe6c8749967640088330cc45 SHA512 4d4e47af88feaca19ef724abacecb97a1fdc6b2b994328dc0308f755148b2f6c0f040403da5aabf82838a5cb0ee6f6319fb79e1c17902efbdd82cf1b985ef391
+EBUILD enblend-4.2.0_p20240424.ebuild 1991 BLAKE2B 3848672da03b6b0bbda2f8cce23883328e9fba773b78e63043ca751d5be44c6bb980c3fe52525e10430a102f789245da0adccc2b4ce9884e337580682dfe2d82 SHA512 11540f7baa057d8ad2611d15a1ba6fcc0c700d270f8d58f5f27c618f9e24469c73e5dbba43d789db1dda812c7072d03516953808a8f5d17a8f32b5cacddeb6b3
 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild
deleted file mode 100644
index 76a89f6ab151..000000000000
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Image Blending with Multiresolution Splines"
-HOMEPAGE="http://enblend.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+ FDL-1.2+"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
-
-REQUIRED_USE="tcmalloc? ( !debug )"
-
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/texlive
-		dev-lang/perl
-		dev-perl/Readonly
-		dev-tex/hevea
-		gnome-base/librsvg
-		media-gfx/graphviz
-		>=media-gfx/fig2dev-3.2.9-r1
-		sci-visualization/gnuplot[cairo,gd]
-		virtual/imagemagick-tools[tiff]
-	)
-"
-RDEPEND="
-	media-libs/lcms:2
-	media-libs/tiff:=
-	media-libs/vigra[openexr]
-	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc[threads] )
-	tcmalloc? ( dev-util/google-perftools )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	media-libs/libpng:0
-	media-libs/libjpeg-turbo:=
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-gcc-10.patch
-	"${FILESDIR}"/${P}-doc-scaleable-fonts.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-		-DENABLE_DMALLOC=$(usex debug)
-		-DDOC=$(usex doc)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_TCMALLOC=$(usex tcmalloc)
-	)
-	if use doc; then
-		mycmakeargs+=(
-			-DINSTALL_HTML_DOC=ON
-			-DINSTALL_PDF_DOC=ON
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_compile() {
-	# To allow icon resizing with renderers (no way to disable)
-	addpredict /dev/dri
-
-	# To compile fonts in the temp directory
-	export VARTEXFONTS="${T}/fonts"
-
-	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
-	cmake_src_compile -j1
-}
diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
index 8dfc5ef79971..109b429e2424 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/enblend
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
 
 REQUIRED_USE="tcmalloc? ( !debug )"
diff --git a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
deleted file mode 100644
index c952eeb7780a..000000000000
--- a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo
-* Install html files in html subdir of doc dir
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,9 +11,6 @@
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
- 
- project(enblend)
--IF(NOT MSVC)
--  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
--ENDIF(NOT MSVC)
- # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
- # is checked
- # For now, reuse the hugin modules directory
-@@ -130,7 +127,6 @@
- ENDIF()
- 
- IF(CMAKE_COMPILER_IS_GNUCXX)
--  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
-   IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
-     ## Add needed Compiler and Linker flags for OSX
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
-@@ -154,20 +150,6 @@
-       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
-     ENDIF(CMAKE_CL_64)
- 
--    # compile everything for the static C runtime
--    FOREACH(TYPE C CXX)
--      # makefiles use blank configuration
--      FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO")
--        #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
--        SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}")
--        # fix up static libc flags
--        STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}")
--        # *FORCE* to override whats already placed into the cache
--        SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING
--          "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE)
--        #MESSAGE("New       CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}")
--      ENDFOREACH(CFG)
--    ENDFOREACH(TYPE)
-     # link only with the static C runtime !! THIS IS A MUST !!
-     SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
-     # ensure that the flags are not duplicated on subsequent runs
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -406,7 +406,7 @@
-         "${CMAKE_BINARY_DIR}/doc/enfuse.html"
-         ${ENBLEND_PNGFILES}
-         ${ENFUSE_PNGFILES}
--    DESTINATION ${DocumentsDirectory}
-+    DESTINATION ${DocumentsDirectory}/html
- )
- endif()
- 
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -102,7 +102,7 @@
- endif(OpenMP_CXX_FLAGS AND NOT MSVC)
- target_link_libraries(enblend ${common_libs} ${additional_libs})
- target_link_libraries(enfuse ${common_libs} ${additional_libs})
--install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
-+install(TARGETS enblend enfuse DESTINATION bin)
- 
- if(NOT WIN32)
-     # create enblend.1 and enfuse.1