From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- media-gfx/graphite2/Manifest | 4 +- media-gfx/graphite2/graphite2-1.3.10.ebuild | 119 ---------------------------- media-gfx/graphite2/graphite2-1.3.13.ebuild | 13 +-- 3 files changed, 8 insertions(+), 128 deletions(-) delete mode 100644 media-gfx/graphite2/graphite2-1.3.10.ebuild (limited to 'media-gfx/graphite2') diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest index 57d188d9892f..1d1d66e8d752 100644 --- a/media-gfx/graphite2/Manifest +++ b/media-gfx/graphite2/Manifest @@ -1,6 +1,4 @@ AUX graphite2-1.3.5-includes-libs-perl.patch 836 BLAKE2B 0429d214ff7fd9b903e1d3bcaf0af3e6b29a0269581390f64950e42e41280e482fc9cfda9bfe24ef166eb6c24d21377a15fca4264fec69d902d8ba18810bdb01 SHA512 26ab6dda13d758a5e4237c8b5d207d3c5111afbb11b2c3984cd742913c3c7932559b23b5ea9f774f1c6373eb0f761a9400dccc95876740b3cd06c44084a10965 -DIST graphite2-1.3.10.tgz 3889647 BLAKE2B c6db80950ed5f81d5ecf77003e23e6545c2824948bdc04aa3111747c0eb1ef074b09fe4c3ec20b68b00f75958ea39c5945a7fbe2fecde55ff32d22e517c91156 SHA512 d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b DIST graphite2-1.3.13.tgz 6664757 BLAKE2B 3faad44f7ba5e0729f722fd4589c5f6a4c53cffc2bb93615c8220d03c759dedf05924b1f56cafcf1c28e0a4b50fba0d319da30572fffde4baab6bc240528a0d3 SHA512 44ac2f353c1a795a55c78b4ff72df35a3a5a94700356c0eefe105d66cd499ac93f9cfd5ab7b3ea842b575156cb8df19e0b57ff8b9dbaee8a576319ff5889c131 -EBUILD graphite2-1.3.10.ebuild 2501 BLAKE2B 636ff39993801a16ba340cb932da05c3c8837f8fa5df259eaaa7d41525a1e9e46499c2e067f746d43d2f573924a455031f90c993e1f79ed5da661f606b811afe SHA512 8de1cde1422d657a472c584802384a8d1cc7bd44f74078921c684c4b6b36cba5d14527bf6d61810e8adbe107080e5c21e76c8254f5efa119fce17c02092163b1 -EBUILD graphite2-1.3.13.ebuild 2670 BLAKE2B e51fbf26d3c4e8f367811eed90251cfb22d7d4e0a686d681f3d32cd71693fd10c27801aaa8ec61c2147adaa52bd42c341251aad5c614af04cc708469e2139c3f SHA512 d53d7ea6700e365b24263f7358e39f8e9943fa35b052048843b9610cc1a730e92fc76ceebdf5eb9cb47d9fce0e729d6f34220355515d386867daf78dc58fc54f +EBUILD graphite2-1.3.13.ebuild 2663 BLAKE2B aec1ec8ebcff5ed41a50fa62bf1754297c544df79ec28a0ddc45233ea614f4d9050c4d13f9499bf1fcff8249b0d139c640b6471d4fc047bbe01affb6cb7c9277 SHA512 09cee62a4b873f485b6b473c01ee482ebfa7541129da656929a251dbde58135936c671aa16b02f87c81b6e8aad2aad21e1a58aafe12fcfaf60b6210c47750f0d MISC metadata.xml 336 BLAKE2B 7069f4f7bb9ecd39581528f3f6b072d2ebf2c32b24224b9ca5b69b138490e764b740768334954f5cfc25819cab55a50fbd0933dc77fb3397886aacfd105f0853 SHA512 ac8ae39ab005c1562818a97b64bfef48ab64e2a1993aa3eef4ee4b3066b32d9211787df1273e20cb767839e42364ed72b3e99c51bb65f0c88937564d5dbb5380 diff --git a/media-gfx/graphite2/graphite2-1.3.10.ebuild b/media-gfx/graphite2/graphite2-1.3.10.ebuild deleted file mode 100644 index 54c11d8e1d90..000000000000 --- a/media-gfx/graphite2/graphite2-1.3.10.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -GENTOO_DEPEND_ON_PERL="no" -inherit eutils perl-module python-any-r1 cmake-multilib - -DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems" -HOMEPAGE="http://graphite.sil.org/" -SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris" -IUSE="perl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - perl? ( dev-lang/perl:= ) -" -DEPEND="${RDEPEND} - perl? ( - dev-perl/Module-Build - dev-perl/Locale-Maketext-Lexicon - ) - test? ( - dev-libs/glib:2 - media-libs/fontconfig - $(python_gen_any_dep ' - dev-python/fonttools[${PYTHON_USEDEP}] - ') - ${PYTHON_DEPS} - perl? ( virtual/perl-Test-Simple ) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-1.3.5-includes-libs-perl.patch" -) - -pkg_setup() { - use perl && perl_set_version - use test && python-any-r1_pkg_setup -} - -python_check_deps() { - has_version "dev-python/fonttools[${PYTHON_USEDEP}]" -} - -src_prepare() { - cmake-utils_src_prepare - - # make tests optional - if ! use test; then - sed -i \ - -e '/tests/d' \ - CMakeLists.txt || die - fi -} - -multilib_src_configure() { - local mycmakeargs=( - "-DVM_MACHINE_TYPE=direct" - # https://sourceforge.net/p/silgraphite/bugs/49/ - $([[ ${CHOST} == powerpc*-apple* ]] && \ - echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON") - ) - - cmake-utils_src_configure - - # fix perl linking - if multilib_is_native_abi && use perl; then - # we rely on the fact that cmake-utils_src_configure sets BUILD_DIR - sed -i \ - -e "s:@BUILD_DIR@:\"${BUILD_DIR}/src\":" \ - "${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-utils_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 - - prune_libtool_files --all -} diff --git a/media-gfx/graphite2/graphite2-1.3.13.ebuild b/media-gfx/graphite2/graphite2-1.3.13.ebuild index cc89c7d3d94c..a297b8ce652c 100644 --- a/media-gfx/graphite2/graphite2-1.3.13.ebuild +++ b/media-gfx/graphite2/graphite2-1.3.13.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) +CMAKE_ECLASS=cmake GENTOO_DEPEND_ON_PERL="no" inherit perl-module python-any-r1 cmake-multilib @@ -14,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="perl test" RESTRICT="!test? ( test )" @@ -47,7 +48,7 @@ python_check_deps() { } src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # make tests optional if ! use test; then @@ -65,11 +66,11 @@ multilib_src_configure() { -DGRAPHITE2_NSEGCACHE:BOOL=ON ) - cmake-utils_src_configure + cmake_src_configure # fix perl linking if multilib_is_native_abi && use perl; then - # we rely on the fact that cmake-utils_src_configure sets BUILD_DIR + # 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 @@ -86,7 +87,7 @@ src_compile() { multilib_src_test() { if multilib_is_native_abi; then - cmake-utils_src_test + cmake_src_test else einfo "Cannot test since python is not multilib." fi -- cgit v1.2.3