gentoo auto-resync : 12:06:2023 - 02:18:43

5 files changed, 2 insertions, 201 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8be284c75bd3..80b311885689 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index 9ad99a46a38c..ae2b8d886334 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -3,5 +3,5 @@ AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300db
 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
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
-EBUILD enblend-4.2.0_p20161007-r5.ebuild 1877 BLAKE2B 0ce6af637b3e3b783990f7a689bbc900719b8ec077434171d2b7644d4dce5b98fae834d898563cfacf24b97b6594b9379ede1c91c30b55043454d4a60f946894 SHA512 e77b94d09941fd659c31c5589e0ec6d5cf5c7ec6b8c14d1bbd24f0155b9412107591c5ecd02de436c8e3da947b259292201c78977afdb1061bba53ecb2323a73
+EBUILD enblend-4.2.0_p20161007-r5.ebuild 1886 BLAKE2B eacb5b3448d6d4ed63452f5162460d938a4ee7d7828cd804ac8f0f2f9cb1c7d6c79e91fe57c380a4cba458f238566a7486de53a69a3fcbd8337df74d44c010b9 SHA512 1de20ffd1f39ba34c4d91881f6eb7cd1c3e02fee9ed8a1bc37aec27cd7692723a30866b2c6cb72a56eb1811270f28d0468124cf94510c0a960c9ca1701134dd1
 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
index 5d63ad16e3c3..582627f70f78 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
@@ -37,7 +37,7 @@ RDEPEND="
 	media-libs/tiff:=
 	media-libs/vigra[openexr]
 	sci-libs/gsl:=
-	debug? ( dev-libs/dmalloc )
+	debug? ( dev-libs/dmalloc[threads] )
 	tcmalloc? ( dev-util/google-perftools )
 "
 DEPEND="${RDEPEND}
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 477993dc7f32..952fe9adea39 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,8 +1,6 @@
 AUX inkscape-1.2.1-poppler-22.09.0.patch 3129 BLAKE2B ad2125d617b7e06618ec97301add563fbf1aa99873a6da144438ac94cd79e715be3f7403e3af7769bbd13614bccbe855ac3c76dcac9f533fb745a6c538444b54 SHA512 937dd6662e86ee13d04ff5c2007d71f10bf7ed84f8a8a8162138d054076b85d9b2c835f55dc217b7abd688ee4524711f3ef907a5dce641beacd0e9f8c6514de9
 AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17
-DIST inkscape-1.2.1.tar.xz 98048464 BLAKE2B 2de10beb5a90ba81e2f212710dc78fce7c72acef5d004ab86f443b97dcf12e65fb755d7a2655520bd94561a71664dc75abd1ebf9e6bbba14c912cac487b7f18c SHA512 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
-EBUILD inkscape-1.2.1-r2.ebuild 5251 BLAKE2B fe6bfdbdc8de16ead4e418b91ac13a188d67c3607e7ddf3fa875b749df77894a4de8f96a6be990ae158c222d32ba4e3c2f6242e82224393d40cf98477a97b22c SHA512 070d799f453068cd4c1604fffbae7922373aeb386e9b7522c7860bba61ba82f4a81e342fd494a97b94931f8608d1e29ae48b05d076c89950b50fb7e942ec4a7a
 EBUILD inkscape-1.2.2-r4.ebuild 5248 BLAKE2B a62930236da7e5f2c84af678aa88abb031fb10ebc40c7113843b3b414fa1ce935fc868153a3c2e2ec353fd2102b3ec252f4e9925ef815b9fb946c19d8762ac3a SHA512 647372b52e794b88a899a5f07aae5f919bd9346875af34471a6d685a02e9b1058c75d6bc98c1c937cc941f60ca95ba120a8eb029471172ec63516490444d85fd
 EBUILD inkscape-1.2.2.ebuild 5189 BLAKE2B 62a14c92e245ec737176aa3015bd508068fe0c12436f1487f5140bd0f6bf50f4ffed82abd67cb35b2b2814ea0fad9eea3c2b5f634784be5a1c64f8040d48ad55 SHA512 0aaf8dc62bc796b78ec7076fa9d6b6f2c75e767b98e251345e5b7727d65827a23dd55d3ee08fbff7650ef3533f7bf7692a2ab294299bfd36c8d01be3b63f9560
 EBUILD inkscape-9999.ebuild 5094 BLAKE2B 15003a777c8ef1b39e77dba97d05b3f828dcd1787f3b3d06fe922cf2101f995b858aca9ddb52d6c873169630b9aafa73b9d088fba2f111a0695973748508ed87 SHA512 fef7b6151c95c9f551ca06f913a98bc5f3bda19ef39cc29329b325bdc68011af2cdf02227599773c1140a16880bd5e8e4d6398c80ca21626db0140073579140e
diff --git a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild b/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
deleted file mode 100644
index 2caaf0b3ba7a..000000000000
--- a/media-gfx/inkscape/inkscape-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-MY_P="${P/_/}"
-inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
-
-if [[ ${PV} = 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
-else
-	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
-openmp postscript readline spell svg2 test visio wpg X"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-util/glib-utils
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	test? ( virtual/imagemagick-tools )
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12:0
-	>=dev-cpp/glibmm-2.54.1:2
-	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40:1.4
-	>=dev-libs/boehm-gc-7.1:=
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8:2
-	>=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.1.25
-	dev-libs/gdl:3
-	dev-libs/popt
-	media-gfx/potrace
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	net-libs/libsoup:2.4
-	sci-libs/gsl:=
-	>=x11-libs/pango-1.44
-	x11-libs/gtk+:3[X?]
-	X? ( x11-libs/libX11 )
-	$(python_gen_cond_dep '
-		dev-python/cachecontrol[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/lockfile[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		media-gfx/scour[${PYTHON_USEDEP}]
-	')
-	cdr? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libcdr
-	)
-	exif? ( media-libs/libexif )
-	imagemagick? (
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	readline? ( sys-libs/readline:= )
-	spell? ( app-text/gspell )
-	visio? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-		media-libs/libvisio
-	)
-	wpg? (
-		app-text/libwpg:0.3
-		dev-libs/librevenge
-	)
-"
-# These only use executables provided by these packages
-# See share/extensions for more details. inkscape can tell you to
-# install these so we could of course just not depend on those and rely
-# on that.
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	')
-	dia? ( app-office/dia )
-	postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	if [[ ${PV} = 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
-}
-
-src_prepare() {
-	cmake_src_prepare
-	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
-}
-
-src_configure() {
-	# aliasing unsafe wrt #310393
-	append-flags -fno-strict-aliasing
-
-	local mycmakeargs=(
-		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
-		-DWITH_NLS=ON
-		-DENABLE_POPPLER=ON
-		-DENABLE_POPPLER_CAIRO=ON
-		-DWITH_PROFILING=OFF
-		-DWITH_INTERNAL_2GEOM=ON
-		-DBUILD_TESTING=$(usex test)
-		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
-		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
-		-DWITH_GNU_READLINE=$(usex readline)
-		-DWITH_GSPELL=$(usex spell)
-		-DWITH_JEMALLOC=$(usex jemalloc)
-		-DENABLE_LCMS=ON
-		-DWITH_OPENMP=$(usex openmp)
-		-DBUILD_SHARED_LIBS=ON
-		-DWITH_SVG2=$(usex svg2)
-		-DWITH_LIBVISIO=$(usex visio)
-		-DWITH_LIBWPG=$(usex wpg)
-		-DWITH_X11=$(usex X)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# render_text*: needs patched Cairo / maybe upstream changes
-		# not yet in a release.
-		# test_lpe/test_lpe64: precision differences b/c of new GCC?
-		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
-		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
-	)
-
-	cmake_src_test -j1
-}
-
-src_install() {
-	cmake_src_install
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
-
-	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
-
-	local extdir="${ED}"/usr/share/${PN}/extensions
-
-	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
-		python_optimize "${ED}"/usr/share/${PN}/extensions
-	fi
-
-	# Empty directory causes sandbox issues, see bug #761915
-	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
-}