gentoo resync : 29.12.2022

4 files changed, 2 insertions, 255 deletions

diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 04eae1cda26c..f584a36079c5 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -3,9 +3,6 @@ AUX graphite2-1.3.14-fix-nodefaultlibs.patch 2396 BLAKE2B 0f845e6556486cfe5320d5
 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.tgz 6630061 BLAKE2B 72bf6736aaa8476a89e44ef53c5b6c94f45d815fe1a451ba6b3696bfe023971210975dee4a9c8cb3042f36442e4efecf5baf171ef4230ad2b10694a89865f918 SHA512 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
 DIST graphite2-1.3.14_p20210810.tar.gz 6656693 BLAKE2B 63a7d96b58f2779d8a4a353e1a986212b884fdf780fedcb83b22dcef2f7678d44c88c14ece2d09dc745df505a4a3825ce61d7c84bd05fd4e98c23d6e86e9326d SHA512 be54c1386578970cf65c1860336a113268181753c1e2a139e37ceeafcfa76e3162086879c54094d70cd0d36ad5852a95390aaa69572d875921e9481f1ae508ff
-EBUILD graphite2-1.3.14-r1.ebuild 2994 BLAKE2B 85a0519e9610d966b043b1ac73c58d17a1cd4729e71369dca175e3ca283a273ae2e00c552372258c20f862c250846d7f29bd252b187a2c12bbaf87595b09d5fa SHA512 8bebde5715ed78ffa35d3466638a00a57009fb16f38c330d1214e6237b4543eac9fa9b3e3919251425699641d504d13262dfd2a8042b8254da04dca6a18c7805
-EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3083 BLAKE2B 8918442b2f8922fbd1f3467e7c2bb7d9a1437c3bcec15e2f88dbaf11fe2117a88b315489eaf76a439e95ef3f084986976388f28bf3b71317e61ea8e049dd8cb0 SHA512 e27158732ecaa1a04627705446a0c0516dd78d6dcad777b1495b239e0df7c9f5a28bd5528e143826bd1ec6899e6ff47e078c27a294b63cd03c7e18a0c15a1d97
-EBUILD graphite2-1.3.14_p20210810.ebuild 3024 BLAKE2B f99caacdcf8a058683ef8e2ab0d1c26ce783ced212c2bea130193dfa735e0276980d76ba359aba48dab757e37c005e45f89c1c19b6c23743747620985df63ed0 SHA512 e02a9f36ba1a9f9645b5f8132991c4c28342a7d590982afcbe70120f3bfc17518f7e75260590a05fb8bd037932b8e10e2fe871f00e0a414e8b29af92423feccf
+EBUILD graphite2-1.3.14_p20210810-r1.ebuild 3075 BLAKE2B 7ab6cf0bf0b47adcc07f5553328bbc69921e51d069161fe4e57b6054af25ffa9597e3e7b47dfcb5ab9cf46c94f7a55ab029fb1c067f1c9b61d8ebe684bbae581 SHA512 cbf4c9d901d6f796de0d13ad247029b7d6b80cb469ed147fb394f7abc2042351178b639f0214d1803ada5b5f696327525f27a33c7fcd54c53abd5e4adfd3d34c
 MISC metadata.xml 337 BLAKE2B a406b2f1af9217abda601c1a860904b7897c5646bc145befae7e87038a42e6b60f5290cb7258469de61761b67f74e12eef1e5a632aad219978d021e045eaa6da SHA512 1d7d7bc940d89cad512580d43120946e028c7866f844dbbc9242b0c29bdb1058f181c38eb63bdd50007afb0e95adade98e5a5f234964c1e1dfb8d15bda961c2f
diff --git a/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
deleted file mode 100644
index a7f8c0258cdd..000000000000
--- a/media-gfx/graphite2/graphite2-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{7,8,9} )
-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="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="
-	perl? ( dev-lang/perl:= )
-	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"
-)
-
-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
-
-	# make tests optional
-	if ! use test; then
-		sed -e '/tests/d' -i CMakeLists.txt || die
-	fi
-}
-
-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 -i -e 's:${GRAPHITE_LINK_FLAGS}:-lssp_nonshared &:' "${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
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
index db5ce2836552..26c1304fa62e 100644
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.14_p20210810-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+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 )"
 
diff --git a/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild b/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild
deleted file mode 100644
index 47a0ef22b350..000000000000
--- a/media-gfx/graphite2/graphite2-1.3.14_p20210810.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 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 ~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"
-)
-
-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
-}