gentoo auto-resync : 14:09:2022 - 23:11:36

6 files changed, 189 insertions, 1 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b8499f97e434..6ceec14a0034 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index fff6f8e24993..720ea7ddeefe 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,8 +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 3003 BLAKE2B cf30d38d53f1dbb4dd6bcc774ebb922356b52e727bed9bd8fff272a49148f13eb74bcadeabfd5aadce4e3b51dcd657d0b9e174955378bff4d10e32487eea0336 SHA512 31893edd6098ee59e313509c73583e48adf8423f7d1f046be6bcc8d10237aabbe10b8565da839350b04b2f3b92e16b1d6977cff70c7699fb07b7a9de6ef68068
 AUX graphite2-1.3.14-fix-nodefaultlibs.patch 2396 BLAKE2B 0f845e6556486cfe5320d51fd0f5338caa8a068e84b48f60d09291659e70520ae3303c0d06050c5ff2a3c713919d835a615d2c0ad79c11aad4504375d8e3eb63 SHA512 d7e1c97ef8b4bc871075e61d58934b612ae7330a34b26aee1c3701e90d0d46bafb431c32c740ae276e5c153e330d8e9c27d4df6e2fdeee61dd229e6b6655aebd
 AUX graphite2-1.3.14-no-libtool-file.patch 2336 BLAKE2B a349e721264de1477aee5aa3e62d264b26c4665383fbe564de7b3a0420b77fcf8ce90a65a650fc9e2144969a2f00abe7ff7c9ebe6f53c7b2fdc3271fbd55f6ce SHA512 3553e237808bf981cf35e9fa8de7b77fa1ce87c72733c806df8e523ea624a0e5e2ad87a0b4cfb9330e7cace0fb016c2c729085de2d21e959790955fd370f378e
 AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965
 AUX graphite2-1.35-fix-gcc-linking.patch 697 BLAKE2B 3f4f181477e5f2f5db85f0b5c76dfb2b471c41cb42bfce9a4663fc8aab7035371690077c45cff580c6a700a65466f866944e34127b307f6ef44035f47a65fabd SHA512 f8a8481f5e8e0178e38e8b8dff2e2b1d2f3143d1f1eca6b3b2ea15ea087651dff150fae8166ceaf18eb3995bb480f09e185ddf89b4ad6e352e1085d4655c71b7
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
 EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3075 BLAKE2B 7ab6cf0bf0b47adcc07f5553328bbc69921e51d069161fe4e57b6054af25ffa9597e3e7b47dfcb5ab9cf46c94f7a55ab029fb1c067f1c9b61d8ebe684bbae581 SHA512 cbf4c9d901d6f796de0d13ad247029b7d6b80cb469ed147fb394f7abc2042351178b639f0214d1803ada5b5f696327525f27a33c7fcd54c53abd5e4adfd3d34c
+EBUILD graphite2-1.3.14_p20210810-r2.ebuild 3089 BLAKE2B e845ce2b9735633eea5e522d6e4f73bccf1b689b440953e920934b5685ec3122f69b2e06b37d17469a28c367defb3be9e72dcc7099e80a98dc690f4e174cd0c2 SHA512 4b8ef20d2935f7a916d66de9d357de403dbfd071cc7881319dac9dc184fe83ca8ff70e5505f318bf8aa9aead24d5f242c653a0b1f580ae94e9a5ef93300c1f68
 MISC metadata.xml 393 BLAKE2B 27dcc3bcbc5a0ec32bb751ec3bb8788c2c85d5d7743f0243749a88ace9b5a3faaa10adc84731dbec3e37208efef41e3d4124de57005345927e848a7cbca6b098 SHA512 1086491557aff2d6f3552829550db85332c809d20ec1e3517bfa311fdfb2a5386cc4b624481b4fd7db7e48ab39bb5d76e048461352b74cdecf89d904ef52590b
diff --git a/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
new file mode 100644
index 000000000000..815301dd307b
--- /dev/null
+++ b/media-gfx/graphite2/files/graphite2-1.3.14-fix-nodefaultlibs-deux.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/870034
+https://bugs.gentoo.org/829690
+https://raw.githubusercontent.com/chimera-linux/cports/6d3cabd18bac6f4caaea08eaa928840552711c0c/main/graphite2/patches/clang.patch
+
+From chimera patch:
+"Clang has -nostdlib++, which can be used more effectively than disabling
+all and then hardcoding linking against libgcc (which we do not have)"
+
+Obsoletes graphite2-1.3.14-fix-nodefaultlibs.patch whose description was:
+```
+See https://github.com/silnrsi/graphite/pull/44.
+
+Drop -nodefaultlibs:
+- graphite is written in C++ which makes avoiding libstdc++ (or libc++) a dubious
+  goal;
+- this ends up breaking e.g. x86/musl because we need to inject -lssp_nonshared,
+  but it wouldn't be surprising if it broke other exotic targets too.
+```
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -47,12 +47,12 @@ else (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
+     set_target_properties(graphite2-base PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS          "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+     set_target_properties(graphite2-file PROPERTIES
+         COMPILE_FLAGS       "-Wall -Wextra  -Wno-class-memaccess -fno-rtti -fno-exceptions"
+         COMPILE_DEFINITIONS "GRAPHITE2_NTRACING${TELEMETRY}"
+-        LINK_FLAGS          "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS          "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE     C)
+ endif()
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -105,7 +105,7 @@ set_target_properties(graphite2 PROPERTIES  PUBLIC_HEADER "${GRAPHITE_HEADERS}"
+ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     set_target_properties(graphite2 PROPERTIES
+         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
+-        LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}"
++        LINK_FLAGS      "-nostdlib++ ${GRAPHITE_LINK_FLAGS}"
+         LINKER_LANGUAGE C)
+     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+         add_definitions(-mfpmath=sse -msse2)
+@@ -117,15 +117,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+     if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+         add_definitions(-Wimplicit-fallthrough -Wshorten-64-to-32)
+     endif()
+-    if (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-        target_link_libraries(graphite2 kernel32 msvcr90 mingw32 gcc user32)
+-    else (${CMAKE_CXX_COMPILER} MATCHES  ".*mingw.*")
+-	target_link_libraries(graphite2 c gcc_s)
+-    endif()
+     include(Graphite)
+-    if (BUILD_SHARED_LIBS)
+-        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
+-    endif ()
+     set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
+     if (0)
+         CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
new file mode 100644
index 000000000000..390f3b02fb00
--- /dev/null
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 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_{8..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.35-fix-gcc-linking.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"
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use test && python-any-r1_pkg_setup
+}
+
+python_check_deps() {
+	has_version -b "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/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 3e375d316bc7..aa301bfa3608 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,5 +1,5 @@
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27 SHA512 3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
 DIST kphotoalbum-5.9.1.tar.xz 11786912 BLAKE2B f772aebc84689cafa869ec368f0079884ea71d4e2dac61baedc50c3764489993992dde6a260daf328d4489645f87de403b47255a5e710a8c125dc621c5f8a623 SHA512 e273671bcb0501d62f911a127f63dbdbc94be2f9ef9073d769ecc97d737edf189a4c61c1216184a68528d0562e2287b23c8d6738bcafa3faf4cb724d57666476
 EBUILD kphotoalbum-5.8.1.ebuild 1621 BLAKE2B 319b7eca13c524566236b7691d36d1710a55d43e55a108563ad62e5b319d0b64854b5a5981eb3bdd358d79739cb60e0e5ed790f97f28ba742d0c9d12fc5d52be SHA512 14f99f6d63622c1211e465abded6ea0723a19d8a2458f6dabd6cd2c8a7caa7a9098c0d89ef44012764b973265b8e702ff04245c185957e0f4246dc441d2703c3
-EBUILD kphotoalbum-5.9.1.ebuild 1858 BLAKE2B 61ec51162602d795aec563f895241ef5f1d16e33f540415c2afb59e2329f957c21af0d03348603f78236127eda8e23e771be89745c0f785b322c87bac0bdf717 SHA512 2e2b2e2f086da6ce4225c6fb269d1ebefbbc27875d063fd289168b8216dcbb8ee003b1d90f4a745b8aeae41face1d7b1de3333192780184854324c6de2324fa2
+EBUILD kphotoalbum-5.9.1.ebuild 1883 BLAKE2B 723bf9292faceaee7f6c3ce25fa318591accf28573350b92f7393729a80dfcc92f9747621e26b483a3e3cd146f91bc5b2e3c2ef76d5f35c83f075f310af1a179 SHA512 1d52c8fa4dba197ae02b01ecc514b51819d133e3f4d642f040494d77ba783258e5778c1c25a4c298db73b327dcf09a4617e728e78cda4780c22bfc8452dac78e
 MISC metadata.xml 846 BLAKE2B d14f1b149c97f8abaf62de3073cfc0a997268ba872ee7bbf27f19a8008feaa24e3a5828e887535f8e5e73bc6e8abafed4ad2a8a535f3adb6dd80e1ce29cd73fb SHA512 e3016152d9976296589f7187c455f78d3bd2ce13f68fdb8b3d141bbedbceda809b59b071768d35eb1437717cce8c19ef6f9a6dced7274949beb161ec301ee0f8
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
index 2139581e1015..0fb036a61360 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.9.1.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.82.0
 QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"