gentoo auto-resync : 01:01:2025 - 06:30:57

4 files changed, 199 insertions, 96 deletions

diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 99b9fbd5622b..85d694be95ef 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 1f99b271dbc4..019685ede8ec 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -9,11 +9,12 @@ AUX aseprite-1.3.2_shared_fmt.patch 1576 BLAKE2B 79480979ad9ef65b4f448e45397ddfb
 AUX aseprite-1.3.2_shared_json11.patch 1974 BLAKE2B ccdf9d22544e2eaaad16909fd594bae37151dd885863885fc0138e14c55e74ebab04c1a575a6a48553d1a707e05b6985a3f5a2d4513bee9aeb385c59ea31afee SHA512 775f963876822bafc4a064be02dfccfefcd7841a5354935412b2a644222dfcaccb54f343b50343267c5f9d07299392686dc5fcb2bd0f7f2a60358de21550ce41
 AUX aseprite-1.3.2_shared_webp.patch 3174 BLAKE2B f3415a4a08236dd42254c9e3cc97337904f268bec28c71efcb8723bf547482bea3b30d8639a520c8e2370b81514dd882d603046fa6c1cb8a6a6186f57b5ad57c SHA512 01c7b2f6d2a2c1140067412d258718ea5fbeea21e6874fe21f659b239255976c85e93c9669ea18255e6a6c76c402d5948e748b9c22a13f4269d0f99d708a0a50
 AUX aseprite-1.3.2_strict-aliasing.patch 1438 BLAKE2B e7d63e22b4e1c1ab21526b51dabb9d6def6d017346037f0001538d309f0d3628cd460bb0f4628240639792c8c293a9a858dfcb31d4f57a7c56583511bb6b2d3a SHA512 00f16ec56d2ed6ec84def9c88be0cd575452bf64c533b395fc7951fce1136b93b47a4afa373531cc68730a554b627777145f062ec21694de1322dca88c783dcc
+AUX aseprite-1.3.5-no-fetch-in-cmake-kthx.patch 4430 BLAKE2B 485270024f22600887c33e20c36ed5e0f863fc78979915a72faa12e4f9c9bb16ba1f7034e34fd33ad6c92b8dd39a51d6047eb67a8cba791ad38dc21950d12058 SHA512 6eb5a57c7c4c4fd504abe5fc812053e1731ef1340f983f050c275cf15ab83dfd2defda30b821efc56e35efab90ea3282f7e46ffd13edcb920cdcbe4979570a1d
 AUX aseprite-1.3.5_laf-strict-aliasing.patch 5164 BLAKE2B 6b7628505b10a2ffd991a3f5b7c38455da544b53ed845fafde7cf1b531021a1b261fa8c4b8d71b27f3fad0110e2305af321c5345cef68929ee556c26688b58bc SHA512 38d4b731bbf6bb76950b86d484dc51d89cd6f686e5ad4ce6942ba4df0aa58c6e9fe85f476f922b626f5b42b9c24a3f25faad668fec7457974f444831d5e0d160
 AUX skia-m102_remove_angle2.patch 644 BLAKE2B 11705c6376ad85303b8d64e6046e6e31191774d940458ddc64b8bf2d2e998168d3f1c8cd4361d623c040a03fd948ee4e0b6189c774522ae255cd0f2f572bf4c0 SHA512 bc587d92286528cbaec140a0492d5381a1dfce8263e4a2c2231b1e28778e3e5919b3896ccae416faa1b39f34517b6ada77ccaf671d25ae7d3c552a7991f5bb45
 DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f
 DIST Aseprite-v1.3.5-Source.zip 64189695 BLAKE2B f796f688f0ba565ae32fde2e8d84e39b610f451054440ced078ce1fc847a9208460b45aa6efa059a56c9e0603b4fd156cc476a2c40715ec2c37181e39c06a401 SHA512 885386e84c55b84cc85ffbf16f7269ac1640458abe973c3aa2e3eabd807ea3e1e06ee6e6dfaffff9dd7b09d3b37bd9ac41821152838cd80742edd4d53302c0e3
 DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075
 EBUILD aseprite-1.2.40.ebuild 5852 BLAKE2B 304c13646d338ac0a049ae753a731fd740d2e55efa9177cdb01063338420b6f6aa8508c644696fa31e14a8abf8fe79367545068e33eca1c39c16b9769b07441f SHA512 16152159dad23c1965a4604c0512b36fc6699efd45ba7aa1548175477a52346d366c05b67ef99707f48857ca39d662cb4dc6156d3c93727ff178e8aab7f374f1
-EBUILD aseprite-1.3.5.ebuild 5829 BLAKE2B 99566a0b3974803e468cac620625d695fd6e9cb72103fff26249fd6b8865742dc015f055a02e5bc6b5b4a19328319c09ea3cb59f824efe5dca3ee6eb10c9c601 SHA512 b46bf3f82bf311c51c54cf1ae48c09e61d99a7c2fa4a20d8d0a7171ec1d5fdb8ded9e7f0729af5d202be5f15c660566ee4b281b59cd45cf6b7b843f0912e1af7
+EBUILD aseprite-1.3.5-r1.ebuild 5949 BLAKE2B 407e4faa2a766090e9f6fff44c6986970bedad48d0dcc3de5e6c40eac66f4a2dd332fe421e4643436556613515b7f28c3136a86e444ff6a405d100368e6c60f4 SHA512 81d33a305c8b66eb9d76c1195375a61bc14c39478c1eed98f649ca49e341f6902a94f4746b6f2a109df8709f49eef3178c64d5898bb87fd26f61d9881168962e
 MISC metadata.xml 489 BLAKE2B a7c8e63d627aed0bbdcab626fd6b15941b1597b56abe3de87d172a919008122cfa9ee29dc10256c5722e6cea243d836a8d3bb9918f1d1d1963bc299d04fab285 SHA512 beb3ca2b414414980370e02138e0ec8bc931d4807fabb403e21a244365c4af65a5830dc6465d2a3798d56eec360930444a71a549d4d6d4a03f292bf3946bab79
diff --git a/dev-games/aseprite/aseprite-1.3.5.ebuild b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
index 8717c09abd5e..88154dc12a39 100644
--- a/dev-games/aseprite/aseprite-1.3.5.ebuild
+++ b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-
 inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg-utils
 
 SKIA_VER="m102"
@@ -20,12 +19,11 @@ SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-
 # See https://github.com/aseprite/aseprite#license
 LICENSE="Aseprite-EULA MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="kde test webp"
+KEYWORDS="~amd64 x86"
+IUSE="test webp"
 RESTRICT="bindist mirror !test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
 	app-arch/libarchive:=
 	app-text/cmark:=
 	dev-libs/libfmt:=
@@ -42,33 +40,22 @@ CDEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXi
 	x11-libs/libxcb:=
-	kde? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		kde-frameworks/kio:5
-	)
-	webp? ( media-libs/libwebp:= )"
-RDEPEND="
-	${CDEPEND}
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
 "
-DEPEND="
-	${CDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( dev-cpp/gtest )
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	dev-build/gn
-	virtual/pkgconfig"
-
-DOCS=(
-	docs/ase-file-specs.md
-	docs/gpl-palette-extension.md
-	README.md
-)
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
 
-S="${WORKDIR}"
+DOCS=( docs/{ase-file-specs,gpl-palette-extension}.md README.md )
 
 PATCHES=(
 	"${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
@@ -78,9 +65,17 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.2.35_laf_fixes.patch"
 	"${FILESDIR}/${PN}-1.3.2_shared_fmt.patch"
 	"${FILESDIR}/${PN}-1.3.2_strict-aliasing.patch"
-	"${FILESDIR}"/aseprite-1.3.5_laf-strict-aliasing.patch
+	"${FILESDIR}/${P}_laf-strict-aliasing.patch"
+	"${FILESDIR}/${P}-no-fetch-in-cmake-kthx.patch" # bug 935448
 )
 
+src_unpack() {
+	mkdir "${S}" || die
+	pushd "${S}" > /dev/null || die
+		default
+	popd > /dev/null || die
+}
+
 src_prepare() {
 	cmake_src_prepare
 	# Skia: remove custom optimizations
@@ -111,82 +106,81 @@ src_configure() {
 	filter-lto
 
 	einfo "Skia configuration"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-
-	tc-export AR CC CXX
-
-	passflags() {
-		local _f _x
-		_f=( ${1} )
-		_x="[$(printf '"%s", ' "${_f[@]}")]"
-		myconf_gn+=( ${2}="${_x}" )
-	}
-
-	local myconf_gn=(
-		ar=\"${AR}\"
-		cc=\"${CC}\"
-		cxx=\"${CXX}\"
-
-		is_official_build=true
-		is_component_build=false
-		is_debug=false
-
-		skia_use_egl=false
-		skia_use_dawn=false
-		skia_use_dng_sdk=false
-		skia_use_metal=false
-		skia_use_sfntly=false
-		skia_use_wuffs=false
-
-		skia_enable_pdf=false
-		skia_enable_svg=false
-		skia_use_expat=false
-		skia_use_ffmpeg=false
-		skia_use_fontconfig=false
-		skia_use_freetype=true
-		skia_use_gl=true
-		skia_use_harfbuzz=true
-		skia_use_icu=false
-		skia_use_libjpeg_turbo_decode=true
-		skia_use_libjpeg_turbo_encode=true
-		skia_use_libpng_decode=true
-		skia_use_libpng_encode=true
-		skia_use_libwebp_decode=$(usex webp true false)
-		skia_use_libwebp_encode=$(usex webp true false)
-		skia_use_lua=false
-		skia_use_vulkan=false
-		skia_use_x11=false
-		skia_use_xps=false
-		skia_use_zlib=true
-	)
-
-	passflags "${CFLAGS}" extra_cflags_c
-	passflags "${CXXFLAGS}" extra_cflags_cc
-	passflags "${LDFLAGS}" extra_ldflags
-	myconf_gn="${myconf_gn[@]}"
-	set -- gn gen --args="${myconf_gn% }" out/Static
-	echo "$@"
-	"$@" || die
+	pushd skia-${SKIA_REV} > /dev/null || die
+		tc-export AR CC CXX
+
+		passflags() {
+			local _f _x
+			_f=( ${1} )
+			_x="[$(printf '"%s", ' "${_f[@]}")]"
+			myconf_gn+=( ${2}="${_x}" )
+		}
+
+		local myconf_gn=(
+			ar=\"${AR}\"
+			cc=\"${CC}\"
+			cxx=\"${CXX}\"
+
+			is_official_build=true
+			is_component_build=false
+			is_debug=false
+
+			skia_use_egl=false
+			skia_use_dawn=false
+			skia_use_dng_sdk=false
+			skia_use_metal=false
+			skia_use_sfntly=false
+			skia_use_wuffs=false
+
+			skia_enable_pdf=false
+			skia_enable_svg=false
+			skia_use_expat=false
+			skia_use_ffmpeg=false
+			skia_use_fontconfig=false
+			skia_use_freetype=true
+			skia_use_gl=true
+			skia_use_harfbuzz=true
+			skia_use_icu=false
+			skia_use_libjpeg_turbo_decode=true
+			skia_use_libjpeg_turbo_encode=true
+			skia_use_libpng_decode=true
+			skia_use_libpng_encode=true
+			skia_use_libwebp_decode=$(usex webp true false)
+			skia_use_libwebp_encode=$(usex webp true false)
+			skia_use_lua=false
+			skia_use_vulkan=false
+			skia_use_x11=false
+			skia_use_xps=false
+			skia_use_zlib=true
+		)
+
+		passflags "${CFLAGS}" extra_cflags_c
+		passflags "${CXXFLAGS}" extra_cflags_cc
+		passflags "${LDFLAGS}" extra_ldflags
+		myconf_gn="${myconf_gn[@]}"
+		set -- gn gen --args="${myconf_gn% }" out/Static
+		echo "$@"
+		"$@" || die
+	popd > /dev/null || die
 
 	einfo "Aseprite configuration"
-	cd "${WORKDIR}" || die
-
 	local mycmakeargs=(
 		-DENABLE_CCACHE=OFF
 		-DENABLE_DESKTOP_INTEGRATION=ON
+		-DENABLE_I18N_STRINGS=OFF
 		-DENABLE_STEAM=OFF
 		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_QT_THUMBNAILER="$(usex kde)"
+		-DENABLE_QT_THUMBNAILER=OFF
 		-DENABLE_UPDATER=OFF
 		-DENABLE_UI=ON
 		-DENABLE_WEBP="$(usex webp)"
 		-DLAF_WITH_EXAMPLES=OFF
 		-DLAF_WITH_TESTS="$(usex test)"
 		-DFULLSCREEN_PLATFORM=ON
-		-DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/"
-		-DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/"
-		-DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a"
-		-DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a"
+		-DSKIA_DIR="${S}/skia-${SKIA_REV}/"
+		-DSKIA_LIBRARY_DIR="${S}/skia-${SKIA_REV}/out/Static/"
+		-DSKIA_LIBRARY="${S}/skia-${SKIA_REV}/out/Static/libskia.a"
+		-DSKSHAPER_LIBRARY="${S}/skia-${SKIA_REV}/out/Static/libskshaper.a"
 		-DUSE_SHARED_CMARK=ON
 		-DUSE_SHARED_CURL=ON
 		-DUSE_SHARED_FMT=ON
@@ -207,11 +201,11 @@ src_configure() {
 
 src_compile() {
 	einfo "Skia compilation"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-	eninja -C out/Static
+	pushd skia-${SKIA_REV} > /dev/null || die
+		eninja -C out/Static
+	popd > /dev/null || die
 
 	einfo "Aseprite compilation"
-	cd "${WORKDIR}" || die
 	cmake_src_compile
 }
 
diff --git a/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch b/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch
new file mode 100644
index 000000000000..3607ddd18891
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch
@@ -0,0 +1,108 @@
+From 147777df737d3f26a05d48eff262c8cd15d7fb37 Mon Sep 17 00:00:00 2001
+From: David Capello <david@igara.com>
+Date: Wed, 6 Mar 2024 09:59:20 -0300
+Subject: [PATCH] Don't try to clone strings repo if Git isn't available (fix
+ #4357)
+
+  This can happen when the source code is downloaded as a .zip and the
+  Git command is not available to clone the strings repo.
+
+Don't clone strings repository by default (fix #4489)
+
+  New ENABLE_I18N_STRINGS option (off by default) to avoid compilation
+  errors cloning the strings repo (no connection, no git, etc.).
+
+Fix typo using ENABLE_I18N_STRINGS var
+
+(cherry picked from commit 50d4f9d8028dc56686b7f0720ef4775db7b2f782)
+(cherry picked from commit 064ddef1901b69c45a40a396b7444769e7fbb4c4)
+(cherry picked from commit 8817724e448a297507b9ef4e41c54c75fd99b543)
+---
+ CMakeLists.txt     |  1 +
+ src/CMakeLists.txt | 52 +++++++++++++++++++++++++++-------------------
+ 2 files changed, 32 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4945a70dd..64234b9ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(ENABLE_DRM          "Compile the DRM-enabled version (e.g. for automatic
+ option(ENABLE_STEAM        "Compile with Steam library" off)
+ option(ENABLE_DEVMODE      "Compile vesion for developers" off)
+ option(ENABLE_UI           "Compile UI (turn off to compile CLI-only version)" on)
++option(ENABLE_I18N_STRINGS "Clone i18n strings repo (https://github.com/aseprite/strings) to bin/data/strings.git" off)
+ option(FULLSCREEN_PLATFORM "Enable fullscreen by default" off)
+ option(ENABLE_CLANG_TIDY   "Enable static analysis" off)
+ option(ENABLE_CCACHE       "Use CCache to improve recompilation speed (optional)" on)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 708dc7c6d..28adf6ae4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -155,19 +155,27 @@ set(DATA_OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin/data)
+ ######################################################################
+ # Clone "strings" repo with translations into bin/data/strings.git
+ 
+-include(FetchContent)
+-
+-FetchContent_Declare(
+-  clone_strings
+-  GIT_REPOSITORY    https://github.com/aseprite/strings.git
+-  GIT_TAG           origin/main
+-  SOURCE_DIR        ${DATA_OUTPUT_DIR}/strings.git
+-  CONFIGURE_COMMAND ""
+-  BUILD_COMMAND     ""
+-  INSTALL_COMMAND   ""
+-  TEST_COMMAND      "")
+-FetchContent_MakeAvailable(clone_strings)
+-add_custom_target(clone_strings DEPENDS clone_strings)
++if(ENABLE_I18N_STRINGS)
++  include(FetchContent)
++  find_package(Git)
++  if(GIT_FOUND)
++    FetchContent_Declare(
++      clone_strings
++      GIT_REPOSITORY    https://github.com/aseprite/strings.git
++      GIT_TAG           origin/main
++      SOURCE_DIR        ${DATA_OUTPUT_DIR}/strings.git
++      CONFIGURE_COMMAND ""
++      BUILD_COMMAND     ""
++      INSTALL_COMMAND   ""
++      TEST_COMMAND      "")
++    FetchContent_MakeAvailable(clone_strings)
++    add_custom_target(clone_strings DEPENDS clone_strings)
++  else()
++    add_custom_target(clone_strings)
++  endif()
++else()
++  add_custom_target(clone_strings)
++endif()
+ 
+ ######################################################################
+ # Copy data/ directory target into bin/data/
+@@ -182,14 +190,16 @@ foreach(fn ${src_data_files})
+   list(APPEND out_data_files ${DATA_OUTPUT_DIR}/${fn})
+ endforeach()
+ 
+-# Copy original en.ini to strings.git/en.ini to keep it updated. We
+-# have to manually sync the "en.ini" file in the "strings" repo from
+-# the "aseprite" repo.
+-add_custom_command(
+-  OUTPUT ${DATA_OUTPUT_DIR}/strings.git/en.ini
+-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_DATA_DIR}/strings/en.ini ${DATA_OUTPUT_DIR}/strings.git/en.ini
+-  MAIN_DEPENDENCY ${SOURCE_DATA_DIR}/strings/en.ini)
+-list(APPEND out_data_files ${DATA_OUTPUT_DIR}/strings.git/en.ini)
++if(ENABLE_I18N_STRINGS AND GIT_FOUND)
++  # Copy original en.ini to strings.git/en.ini to keep it updated. We
++  # have to manually sync the "en.ini" file in the "strings" repo from
++  # the "aseprite" repo.
++  add_custom_command(
++    OUTPUT ${DATA_OUTPUT_DIR}/strings.git/en.ini
++    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_DATA_DIR}/strings/en.ini ${DATA_OUTPUT_DIR}/strings.git/en.ini
++    MAIN_DEPENDENCY ${SOURCE_DATA_DIR}/strings/en.ini)
++  list(APPEND out_data_files ${DATA_OUTPUT_DIR}/strings.git/en.ini)
++endif()
+ 
+ add_custom_command(
+   OUTPUT ${DATA_OUTPUT_DIR}/README.md
+-- 
+2.47.1