From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- media-libs/harfbuzz/Manifest | 6 +- media-libs/harfbuzz/harfbuzz-2.6.1.ebuild | 115 ------------------------------ media-libs/harfbuzz/harfbuzz-2.6.4.ebuild | 2 +- media-libs/harfbuzz/harfbuzz-9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 121 deletions(-) delete mode 100644 media-libs/harfbuzz/harfbuzz-2.6.1.ebuild (limited to 'media-libs/harfbuzz') diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 31b66d7596fc..ee8b3a808bd6 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,7 +1,5 @@ AUX harfbuzz-2.6.1-gcc-9.patch 468 BLAKE2B 5f0b42d7a834f5b59c79adcbc2fb67e9aa1fa97fb6e6e135c7c88d20780d0a75ad8784c5ed3473cad8a1bb5f1c6f3c8475e7984e555eef1720ac9de387f95b83 SHA512 8dec55d5cb97c3aae2e6885cddc06db9629e6e5336ffc1b3cc263c8ad88e499833570210868dfb6e42c0dbf0326f239d1ac4ee1914f6f84712d1f93350da1912 -DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06 DIST harfbuzz-2.6.4.tar.xz 5967468 BLAKE2B 24d215324a408a724f47a901c4a56605144d15373518bd52643ece83705d0c63582a80635ecef6a6d8d2f5f39c750076d553fb39aaa8c0dd41702ee910c32f24 SHA512 d8664bb64fda11ff7646693070637e3827f8b3d1de50e11ecf108ce4d19c878b26b2ba4cff278da6e6cc0cb431e1630d9eaa7c32a9bebb9655a7aa8dabf7114f -EBUILD harfbuzz-2.6.1.ebuild 3073 BLAKE2B 8d38a24809483963a96e685a10c481cbe7de379c4286ebd6b1f2e4f7884c6b28bbd373a4b3b77439e0b1d8e316966afe20c2f7334f6d814596f22de44f0fbda3 SHA512 44147b15ea83a2a3493fd36e87f082ffb68f1c5f3d5c0977042e5bfae711d0d7ba5e42fd984082829a72d363ec226d1f46e1d98b07f62f0142e3f99b7cb91ad2 -EBUILD harfbuzz-2.6.4.ebuild 3035 BLAKE2B 2105b34d683bae161837dc85a30ef86d2c4acfdad35fbfeefa771f77266410bafaa366e9cda6a7259468d917a758a99d33d7e88e22bc2954d75fecb563d1c473 SHA512 201394159bda2791a93e5d6bce7ad0d06a17e3203c6e3726628e9e7bbf1eab668a4d3e5b10f07733bbbbf63b67a3f01c03a835eb11b0c2bed9820a6cbcfa6f3a -EBUILD harfbuzz-9999.ebuild 3052 BLAKE2B 7bddf0786714c39b3217051fec34c62a18c02b2f10e260e58bd2835691749697b8d0668a261f32049c7a2e07e74be50cfe59fe82ca0a35d99a381f166d246e3b SHA512 215d36533252522c727712da8c7182ac01938a28a40d51b2befaf02bf2b6a9ad1fa7981c95fd855b14d8ddccd9007d143cee880aa7e245d7c86a8dea8b83e1e9 +EBUILD harfbuzz-2.6.4.ebuild 3031 BLAKE2B 6dc0820449927f7323cedcdb16c843b7d548695f53bb40aa1a57a994897e6cc79d86cd4205c67796a5d3ab07ae7dc42ac215bdf9e33ebb2a62f7e9f33aaf3d73 SHA512 163e5e15ab58531d6ed13484315435a35ae8227366f9f8074519384cfee804aa76d1fd14184efb67ed38aadcf0ff1a7f86faf73d42dc756e5d55b14c8c52f0e3 +EBUILD harfbuzz-9999.ebuild 3048 BLAKE2B 6ae69bc76d59125bb5b8bcba90e0fb34d1829a8092d8d230fd2832bbadcf29561c61fc0b79691bcd3895288cfaaba00c4b656fdf0d112457d1d438e8862cdcf5 SHA512 381341116d281e16702a398ba25fd733a4bb9a269e2d775c348363778f6587a79742688385fd0f058cbf54dce2612fc87aba1416d81e6c4f5323c475b2e2853c MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild deleted file mode 100644 index e187ade993df..000000000000 --- a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils - -DESCRIPTION="An OpenType text shaping engine" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz" - -if [[ ${PV} = 9999 ]] ; then - EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git" - inherit git-r3 autotools -else - SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz" - 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" -fi - -LICENSE="Old-MIT ISC icu" -SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416 - -IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype" -RESTRICT="!test? ( test )" -REQUIRED_USE="introspection? ( glib )" - -RDEPEND=" - cairo? ( x11-libs/cairo:= ) - glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] ) - graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] ) - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.34:= ) - truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND} - test? ( ${PYTHON_DEPS} ) -" -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -# eautoreconf requires gobject-introspection-common -# ragel needed if regenerating *.hh files from *.rl -if [[ ${PV} = 9999 ]] ; then - DEPEND+=" - >=dev-libs/gobject-introspection-common-1.34 - dev-util/ragel - " -fi - -PATCHES=( - "${FILESDIR}"/${P}-gcc-9.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup - if ! use debug ; then - append-cppflags -DHB_NDEBUG - fi -} - -src_prepare() { - default - - xdg_environment_reset - - if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then - # on Darwin/Solaris we need to link with g++, like automake defaults - # to, but overridden by upstream because on Linux this is not - # necessary, bug #449126 - sed -i \ - -e 's/\/CXXLINK/' \ - src/Makefile.am || die - sed -i \ - -e '/libharfbuzz_la_LINK = /s/\/CXXLINK/' \ - src/Makefile.in || die - sed -i \ - -e '/AM_V_CCLD/s/\/CXXLINK/' \ - test/api/Makefile.in || die - fi - - [[ ${PV} == 9999 ]] && eautoreconf - elibtoolize # for Solaris - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-fontconfig #609300 - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with glib) - $(use_with introspection gobject) - $(use_with graphite graphite2) - $(use_with icu) - $(multilib_native_use_enable introspection) - $(use_with truetype freetype) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die -} diff --git a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild index 99e5ac1e9122..0efff7bc4152 100644 --- a/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild +++ b/media-libs/harfbuzz/harfbuzz-2.6.4.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 autotools else SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz" - 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild index aee517e2a1ce..ba04a2d32be2 100644 --- a/media-libs/harfbuzz/harfbuzz-9999.ebuild +++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]] ; then inherit git-r3 autotools else SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.xz" - 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="Old-MIT ISC icu" -- cgit v1.2.3