gentoo auto-resync : 03:02:2023 - 21:11:18

9 files changed, 175 insertions, 50 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index e016773d6dd3..d525f2516aa2 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index f3d70ca680be..25e295020a22 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,7 +1,10 @@
 AUX graphite2-1.3.14-fix-cmake-files-libdir.patch 637 BLAKE2B 5bf2dfae7cf3af8a99a5095f618d3625d6f0f3b07f714c1101ac77058aa5ab969115cf2ce6a6164666488183fb5482d3f8b6fd8dea4df3ca1ecba9adb02788f2 SHA512 55805cecf9cde48079a81c8ffd93503dd9302f28140b640971ddee29e7a7da38840c826af072b5780372b56c0f0269cbda802e3e233139f086f5194cd8eb33a5
 AUX graphite2-1.3.14-fix-nodefaultlibs-deux.patch 4840 BLAKE2B fc543571ccc0c14c241eb36662c8eea9f3f28b2979c9936a7af60920ff0d951bb8a36ef5075881a25e3ed8e73781b538df5b7da97344ba36229f2defa3d928cd SHA512 3a0215f484ca9341e81194c2f5f73c9eb64f1322de5c3bb0e3d8615e7b7f1e4c9044c2db3855f3a68c04db9f1476d3f0115545925cb3f5f8082e5189ee9c2b6c
+AUX graphite2-1.3.14-fix-nodefaultlibs.patch 1029 BLAKE2B ba35d7c4a6200626035bac940749740cdda89b5c8cf3c37428578214de8ba647331b454ab75d92a4d333d702a39e335c716010299a2ca2dd07a678d8d08eea93 SHA512 5ddcec369ea8bc8e7ea935d3cecc936a148cf275314008b6993574f18c77a3bf7689fd551ac119f82b15ddf365b23ad168726facd5ba78bd611b196b2cf614a2
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
+AUX graphite2-1.3.5-fix-gcc-linking.patch 580 BLAKE2B 7ab4d1848e0b0fdbd682fc81747a426c9bee7e2d0f72991dc963c955ba910035c6246d88f7eaded9c4a742a10470fd304ab2dd3fb1750795b8b9791ccfc0cfb8 SHA512 1e01c764f72204f30c916dcdc4f5bc7a4757d73275bb2007bf0c1f2e9898f138aa6c0581addc587e125cf6cbf9d5db725cb3d8a69875978a14ab316d2d561467
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3032 BLAKE2B a247b15f51be2e871396ea037c55d1085053781f518e62d23fd2f251cb25296eaf0ad187a864701812d2dce90a480fb44be55cad27982a131a14c570fbe2f8a0 SHA512 90a54f29e5a12fdfc87b6afb1c90e793c9d3dbc75f9171358f024c2e64c01af59cb23cf46fa28b1f7e390b2629c374fd5ec6379064b2456dda0069046d761d51
+EBUILD graphite2-1.3.14_p20210810-r3.ebuild 3145 BLAKE2B 97382f67bc420d5c500b910c58cc79001cb2fbd6389fb48dfbfe59c48d4c360211676bfd1cf5e24df6e35d7762fe73ccb445d1ee6687dac3ce8fb138a681ddeb SHA512 65a359911161ca92e5684e77c2866b3d9997ae6e0ca0ff951ca710f32e4bb75f85d221eeec9ac251b985d7ba128dae8f0c3571317f9f440bf727c1c495d426da
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
new file mode 100644
index 000000000000..c55f67c44f55
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs.patch
@@ -0,0 +1,26 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,7 @@
+                 LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
+         else()
+             set_target_properties(graphite2 PROPERTIES
+-                LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++                LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+ 
+             if (GRAPHITE2_SANITIZERS)
+                 target_link_libraries(graphite2 c gcc_s)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -51,9 +51,9 @@
+             LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}")
+     else()
+         set_target_properties(graphite2-base PROPERTIES
+-            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++            LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+         set_target_properties(graphite2-file PROPERTIES
+-            LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
++            LINK_FLAGS      "${GRAPHITE_LINK_FLAGS}")
+     endif()
+ 
+     set_target_properties(graphite2-base PROPERTIES
+
diff --git a/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch
new file mode 100644
index 000000000000..e4413d1f9a61
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.5-fix-gcc-linking.patch
@@ -0,0 +1,17 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -127,12 +127,7 @@
+             set_target_properties(graphite2 PROPERTIES
+                 LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}")
+ 
+-            if (GRAPHITE2_SANITIZERS)
+-                target_link_libraries(graphite2 c gcc_s)
+-            else()
+-                target_link_libraries(graphite2 c gcc)
+-            endif()
+-
++            target_link_libraries(graphite2 c gcc_s)
+             if (BUILD_SHARED_LIBS)
+                 nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+             endif ()
+
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
new file mode 100644
index 000000000000..bd53468cf978
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+COMMIT=80c52493ef42e6fe605a69dcddd2a691cd8a1380
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_COMPAT=( python3_{9..10} )
+inherit perl-module python-any-r1 cmake-multilib
+
+DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
+HOMEPAGE="https://scripts.sil.org/cms/scripts/page.php?site_id=projects&item_id=graphite_home"
+SRC_URI="https://github.com/silnrsi/graphite/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/graphite-${COMMIT}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="perl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="perl? ( dev-lang/perl:= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/glib:2 )
+"
+BDEPEND="
+	perl? (
+		dev-lang/perl
+		dev-perl/Locale-Maketext-Lexicon
+		dev-perl/Module-Build
+	)
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/fonttools[${PYTHON_USEDEP}]')
+		media-libs/fontconfig
+		perl? ( virtual/perl-Test-Simple )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-cmake-files-libdir.patch"
+	"${FILESDIR}/${PN}-1.3.14-no-libtool-file.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs-deux.patch"
+	"${FILESDIR}/${PN}-1.3.14-fix-nodefaultlibs.patch"
+	"${FILESDIR}/${PN}-1.3.5-fix-gcc-linking.patch"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	python_has_version "dev-python/fonttools[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	cmake_src_prepare
+	use test || cmake_comment_add_subdirectory tests
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		# Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+		-DGRAPHITE2_VM_TYPE=direct
+	)
+	# https://sourceforge.net/p/silgraphite/bugs/49/
+	[[ ${CHOST} == powerpc*-apple* ]] && mycmakeargs+=(
+		-DGRAPHITE2_NSEGCACHE:BOOL=ON
+	)
+
+	if use elibc_musl ; then
+		# bug #829690
+		if use ppc || use x86 ; then
+			sed -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' \
+				-i "${S}"/src/CMakeLists.txt || die
+		fi
+	fi
+
+	cmake_src_configure
+
+	# fix perl linking
+	if multilib_is_native_abi && use perl; then
+		# we rely on the fact that cmake_src_configure sets BUILD_DIR
+		sed -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \
+			-i "${S}"/contrib/perl/Build.PL || die
+	fi
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_configure
+		perl-module_src_compile
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cmake_src_test
+	else
+		einfo "Cannot test since python is not multilib."
+	fi
+}
+
+src_test() {
+	cmake-multilib_src_test
+	if use perl; then
+		# Perl tests fail due to missing POD coverage...
+		perl_rm_files "contrib/perl/t/pod.t" "contrib/perl/t/pod-coverage.t"
+		cd contrib/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install() {
+	cmake-multilib_src_install
+	if use perl; then
+		cd contrib/perl || die
+		perl-module_src_install
+		perl_delete_localpod
+	fi
+}
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index ae63dfd137e1..09fdf24c68c3 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
 DIST ristretto-0.12.4.tar.bz2 619084 BLAKE2B c04d09b8475a46e89a2151cc46121ec9960f52ba8e861c474a46a8bda470c6620dfe2c38a35a80c075d830b7d4d3b80c435ebe1baf10bb913e20d26945d1701c SHA512 666e127646b9f30bed54d8605c4892d302b15dff39e8b532ebb3da22dc5700414e6d7bcb29d8d66f6a8a7d487cff50b0a0cc610d8b4616479397ebf987ff409b
-EBUILD ristretto-0.12.3.ebuild 899 BLAKE2B 22909ebbf5a641d6b26ccc1e3595a388086bb0dfd981d565cf042868a96c2e816dee6f5420b2549ed06401e6e5822b5070ea6e30f595e66c61e97c0ec4c81fb4 SHA512 e171f72e986df77de173def2b98fad78bd7c8f504a82ff956eea1da6dd849ea2add21d073e12ffdbc460570c0939c4b594d249bbfe98da9ba306c81786c1e8c0
 EBUILD ristretto-0.12.4.ebuild 899 BLAKE2B aac782b2f470476e31569056c436160caabb9c41166f8dfe02182fad70b209bdf925105e7229f6c4925092d62059798dd807beabb95633add6dac5cdb90d0b36 SHA512 e73bf19c0f18e55dba40807be7731c5d35669e8c89709f78c142beb18f96bb6a6dd8efa0bf95dc44b66678ae9820c8e4d9ff6199316d5a986323c186ca3ef637
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.3.ebuild b/media-gfx/ristretto/ristretto-0.12.3.ebuild
deleted file mode 100644
index a6016ef6eba1..000000000000
--- a/media-gfx/ristretto/ristretto-0.12.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.46:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.16:0=
-	>=xfce-base/libxfce4util-4.16:0=
-	>=xfce-base/xfconf-4.12.1:0=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index bf0e6eeebc63..dcec9df87c94 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 635 BLAKE2B 26b2ae79ac190852f5151dd912247806927ba3648406d2e0030811e90a7dd3b997babbb6df04585c4e37002e75e9a2194ebb4124b9f043162f8147d1fa280a3b SHA512 0b5c252b1cc4e40350aa8e2fe87d838b7ca96fa126ab8dd9197e00aba6c6e47e8b43f35d0efd75047f6993ca7563aa4e23a0d550413532bf60184b30052770e5
+EBUILD scour-0.38.2-r1.ebuild 667 BLAKE2B 97b305b80b844d56e81553e522a098156651dd817934c8469fa8f15b78fb7c33db9f29d4148896e2ba612ed35a44aa1f042b78b55ae317ea15e30204d978cde2 SHA512 40b6c20657e429b6dc130c9995fda6297221175732a7dd5149cc0b21985e186ce2ee96c478a3d046223aa6bc20c5ee1e2e5e86b936e0fd610c8345964b731388
 MISC metadata.xml 282 BLAKE2B 6620cd1197d43d2a968e882186c2e144bf20ee709d4f3c812cec56f48899477fda8fbdd7f198d5e2bc9e9a3b7e8f72b547013e31b6d0d2fdc6271dc7680d48e1 SHA512 41c21e7c62696f6a337d3ed21585284972244e0cbb6b92247a1f745e75ce1a901d4b290f0e99ac6f866f110c08d926375f107e4eabbae000c918fe9f939af2cd
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2-r1.ebuild
index cced72566648..30d85af79f5f 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
 inherit distutils-r1
 
 DESCRIPTION="Take an SVG file and produce a cleaner and more concise file"