From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58A0D138334 for ; Mon, 10 Dec 2018 09:10:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C34EE0AE9; Mon, 10 Dec 2018 09:10:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50E88E0AE9 for ; Mon, 10 Dec 2018 09:10:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66931335C8E for ; Mon, 10 Dec 2018 09:10:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A70244F for ; Mon, 10 Dec 2018 09:10:54 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1544433046.ee8c4575ac629d9211dd570809b4efb213be2ecf.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/harfbuzz/, media-libs/harfbuzz/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/harfbuzz/Manifest media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch media-libs/harfbuzz/harfbuzz-1.7.6.ebuild X-VCS-Directories: media-libs/harfbuzz/ media-libs/harfbuzz/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: ee8c4575ac629d9211dd570809b4efb213be2ecf X-VCS-Branch: master Date: Mon, 10 Dec 2018 09:10:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8195a6dc-5b5a-4e97-9852-aaf655acf2bc X-Archives-Hash: e87b0eb29bae30049c7630e9cf643d41 commit: ee8c4575ac629d9211dd570809b4efb213be2ecf Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 10 09:10:46 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 10 09:10:46 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee8c4575 media-libs/harfbuzz: Removed old. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-libs/harfbuzz/Manifest | 1 - .../harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch | 22 ---- media-libs/harfbuzz/harfbuzz-1.7.6.ebuild | 116 --------------------- 3 files changed, 139 deletions(-) diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest index 36e1b26f12e..3dc22c7aa77 100644 --- a/media-libs/harfbuzz/Manifest +++ b/media-libs/harfbuzz/Manifest @@ -1,4 +1,3 @@ -DIST harfbuzz-1.7.6.tar.bz2 2586909 BLAKE2B 0ae5902b9fe00a4f05a5dc407d698195920454efff79be10f1d85af5430d8bde7df071ba226b978c860d1dd8778a8259f330ab633a1aaa416a4451888fa9ae6a SHA512 259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68 DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e639e25ece971646963acbdb10be05b82c4faea33688b1a3edfda4c3fe45b97e5ef87d7ca6d9776268b43ef23a7ee SHA512 4cb605c47617dd06d4a2e8ae01e44969f5addacee47ef5212442645c6229298d5080f85b0aca6a2fbedfd2007c679acad6a4b3e9389df1b3a6232bf6ef961577 DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19 DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818 diff --git a/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch b/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch deleted file mode 100644 index a9187561849..00000000000 --- a/media-libs/harfbuzz/files/harfbuzz-1.7.6-test_fixup.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 93b03119da8674a3eddb7879857e9f17fa16fd2a Mon Sep 17 00:00:00 2001 -From: violet-sippial <38817272+violet-sippial@users.noreply.github.com> -Date: Sat, 28 Apr 2018 20:29:13 +0200 -Subject: [PATCH] [subset] Do not compare ttx progress output in the tests - -Suppress progress messages of ttx. This avoids comparing this output to the reference file which lets the test fail. ---- - test/subset/run-tests.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py -index 0b119fee6..1cd1a19f6 100755 ---- a/test/subset/run-tests.py -+++ b/test/subset/run-tests.py -@@ -80,6 +80,7 @@ def run_test(test, should_check_ots): - def run_ttx(file): - print ("ttx %s" % file) - cli_args = ["ttx", -+ "-q", - "-o-", - file] - return cmd(cli_args) diff --git a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild deleted file mode 100644 index 8db52ea298e..00000000000 --- a/media-libs/harfbuzz/harfbuzz-1.7.6.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit flag-o-matic libtool ltprune 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.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-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 fontconfig +glib +graphite icu +introspection static-libs test +truetype" -REQUIRED_USE="introspection? ( glib )" - -RDEPEND=" - cairo? ( x11-libs/cairo:= ) - fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] ) - 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} - dev-util/gtk-doc-am - virtual/pkgconfig - test? ( ${PYTHON_DEPS} ) -" -# 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}-test_fixup.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 - - # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190 - sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed" - - # bug 618772 - append-cxxflags -std=c++14 -} - -multilib_src_configure() { - # harfbuzz-gobject only used for instrospection, bug #535852 - local myeconfargs=( - --without-coretext - --without-uniscribe - $(use_enable static-libs static) - $(multilib_native_use_with cairo) - $(use_with fontconfig) - $(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 - prune_libtool_files --modules -}