commit: 13cc021ade3a4a769c1ad789fb73f351fbd45a54
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 23:34:48 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 12:55:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13cc021a
media-gfx/graphite2: Drop old and de-stabilise hppa
Security stabilisation timeout.
Gentoo-bug: 621724
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-gfx/graphite2/Manifest | 1 -
...hite2-1.3.8-rule-length-test-overflow-fix.patch | 22 ----
...raphite2-1.3.9-increase-pDest-reservation.patch | 22 ----
media-gfx/graphite2/graphite2-1.3.8-r1.ebuild | 120 ---------------------
4 files changed, 165 deletions(-)
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index 57d14930ba8..d2054c7aafc 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,2 +1 @@
DIST graphite2-1.3.10.tgz 3889647 SHA256
90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae SHA512
d6d578feaa2d9304dc9bcd3926958070b8c23b27437a9fcb801e08e62f33a5549b7a6aa9636c7f8eb80a2a2c6d5cac97d58050fb30fd102b9fd0f8c558f4252b
WHIRLPOOL
8a10ae32a7f02ad9e64982ece9b4b5169355f52160f8b9f00d1a892f785bbe14c2fdde24f5e84f6b8cbd7012edaf91b639beeeba400a3f6432b2436278a5df06
-DIST graphite2-1.3.8.tgz 3885841 SHA256
9f3f25b3a8495ce0782e77f69075c0dd9b7c054847b9bf9ff130bec38f4c8cc2 SHA512
df8a3a7b67b356092fe8d4f62b7cd6d45ee7fe2b614699b0f8b29dc2441e00675021fdaec24cef4629c5294b33d6b269d596bc869fae8257f8f2e935c9db3639
WHIRLPOOL
88420608db053bd4d66b852a54eeb19359910c786ef1785e303e68f0d0d5b840b4a5cdcb7e17ae6c2064563d02b03a7be43ae203184218a8ac4d9dd40c17c56f
diff --git
a/media-gfx/graphite2/files/graphite2-1.3.8-rule-length-test-overflow-fix.patch
b/media-gfx/graphite2/files/graphite2-1.3.8-rule-length-test-overflow-fix.patch
deleted file mode 100644
index 624442fbb16..00000000000
---
a/media-gfx/graphite2/files/graphite2-1.3.8-rule-length-test-overflow-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 56157cf9845d13452068c297205f96b946126cc2 Mon Sep 17 00:00:00 2001
-From: Martin Hosken <martin_hos...@sil.org>
-Date: Mon, 4 Apr 2016 16:04:16 +0700
-Subject: [PATCH] Resolve rule length test overflow
-
----
- src/Pass.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Pass.cpp b/src/Pass.cpp
-index 7289406..1c9c73c 100644
---- a/src/Pass.cpp
-+++ b/src/Pass.cpp
-@@ -635,7 +635,7 @@ bool Pass::testPassConstraint(Machine & m) const
- bool Pass::testConstraint(const Rule & r, Machine & m) const
- {
- const uint16 curr_context = m.slotMap().context();
-- if (unsigned(r.sort - r.preContext) > m.slotMap().size() - curr_context
-+ if (unsigned(r.sort + curr_context - r.preContext) > m.slotMap().size()
- || curr_context - r.preContext < 0) return false;
-
- vm::slotref * map = m.slotMap().begin() + curr_context - r.preContext;
diff --git
a/media-gfx/graphite2/files/graphite2-1.3.9-increase-pDest-reservation.patch
b/media-gfx/graphite2/files/graphite2-1.3.9-increase-pDest-reservation.patch
deleted file mode 100644
index fdd7e7ec4f0..00000000000
--- a/media-gfx/graphite2/files/graphite2-1.3.9-increase-pDest-reservation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1ce331d5548b98ed8b818532b2556d6f2c7a3b83 Mon Sep 17 00:00:00 2001
-From: Martin Hosken <martin_hos...@sil.org>
-Date: Thu, 9 Mar 2017 22:04:04 +0000
-Subject: [PATCH] Ensure features have enough space. Fix from Mozilla
-
----
- src/FeatureMap.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/FeatureMap.cpp b/src/FeatureMap.cpp
-index b8c8405..83bd5f6 100644
---- a/src/FeatureMap.cpp
-+++ b/src/FeatureMap.cpp
-@@ -275,7 +275,7 @@ bool FeatureRef::applyValToFeature(uint32 val, Features &
pDest) const
- else
- if (pDest.m_pMap!=&m_pFace->theSill().theFeatureMap())
- return false; //incompatible
-- pDest.reserve(m_index);
-+ pDest.reserve(m_index+1);
- pDest[m_index] &= ~m_mask;
- pDest[m_index] |= (uint32(val) << m_bits);
- return true;
diff --git a/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
b/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
deleted file mode 100644
index 2c5dd10cac5..00000000000
--- a/media-gfx/graphite2/graphite2-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ~sh sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos
~x86-macos ~x64-solaris"
-IUSE="perl 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"
- "${FILESDIR}/${PN}-1.3.8-rule-length-test-overflow-fix.patch"
- "${FILESDIR}/${PN}-1.3.9-increase-pDest-reservation.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
- cd contrib/perl || die
- # SRC_TEST=do
- # Perl tests fail due to missing POD coverage...
- 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
-}
