summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-09-12 13:17:53 +0100
committerSam James <sam@gentoo.org>2022-09-12 15:17:44 +0100
commit819abe5658b4ba7193f93e07c76878902bc6fa1c (patch)
tree275de1aef8d1594a03bcce48cf4f42237271e875 /media-libs/freetype
parentnet-im/signal-desktop-bin: remove old version (diff)
downloadgentoo-819abe5658b4ba7193f93e07c76878902bc6fa1c.tar.gz
gentoo-819abe5658b4ba7193f93e07c76878902bc6fa1c.tar.bz2
gentoo-819abe5658b4ba7193f93e07c76878902bc6fa1c.zip
media-libs/freetype: fix ecompress collision
Closes: https://bugs.gentoo.org/869803 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/freetype')
-rw-r--r--media-libs/freetype/freetype-2.12.1-r1.ebuild (renamed from media-libs/freetype/freetype-2.12.1.ebuild)3
-rw-r--r--media-libs/freetype/freetype-9999.ebuild5
2 files changed, 7 insertions, 1 deletions
diff --git a/media-libs/freetype/freetype-2.12.1.ebuild b/media-libs/freetype/freetype-2.12.1-r1.ebuild
index 2b84c3cb6dbe..db6c3c0ecd1a 100644
--- a/media-libs/freetype/freetype-2.12.1.ebuild
+++ b/media-libs/freetype/freetype-2.12.1-r1.ebuild
@@ -172,6 +172,9 @@ src_prepare() {
cd "${S}" || die
fi
+ # bug #869803
+ rm docs/reference/sitemap.xml.gz || die
+
# we need non-/bin/sh to run configure
if [[ -n ${CONFIG_SHELL} ]] ; then
sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 7e8918903023..011cc4310aba 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -160,6 +160,9 @@ src_prepare() {
cd "${S}" || die
fi
+ # bug #869803
+ rm docs/reference/sitemap.xml.gz || die
+
# we need non-/bin/sh to run configure
if [[ -n ${CONFIG_SHELL} ]] ; then
sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \