Diff freetype-2.9.1-r4 with a freetype-2.10.1

/usr/portage/media-libs/freetype/freetype-2.10.1.ebuild 2020-03-26 18:41:00.000000000 +0300
1 1
# Copyright 1999-2020 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=6
4
EAPI=7
5 5

  
6
inherit flag-o-matic libtool multilib multilib-build multilib-minimal toolchain-funcs
6
inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs
7 7

  
8 8
DESCRIPTION="A high-quality and portable font engine"
9 9
HOMEPAGE="https://www.freetype.org/"
10 10
IUSE="X +adobe-cff bindist bzip2 +cleartype_hinting debug fontforge harfbuzz infinality png static-libs utils"
11 11

  
12 12
if [[ "${PV}" != 9999 ]] ; then
13
	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
14
		mirror://nongnu/freetype/${P/_/}.tar.bz2
15
		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.bz2
16
			mirror://nongnu/freetype/ft2demos-${PV}.tar.bz2 )
17
		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.bz2
18
			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.bz2 )"
19
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
13
	SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz
14
		mirror://nongnu/freetype/${P/_/}.tar.xz
15
		utils?	( mirror://sourceforge/freetype/ft2demos-${PV}.tar.xz
16
			mirror://nongnu/freetype/ft2demos-${PV}.tar.xz )
17
		doc?	( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz
18
			mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )"
19
	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
20 20
	IUSE+=" doc"
21 21
else
22 22
	inherit autotools git-r3
......
26 26
SLOT="2"
27 27
RESTRICT="!bindist? ( bindist )" # bug 541408
28 28

  
29
RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
29
RDEPEND="
30
	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
30 31
	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
31 32
	harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )
32 33
	png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] )
......
37 38
			>=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]
38 39
		)
39 40
	)"
40
DEPEND="${RDEPEND}
41
	virtual/pkgconfig"
41
DEPEND="${RDEPEND}"
42
BDEPEND="
43
	virtual/pkgconfig
44
"
42 45
PDEPEND="infinality? ( media-libs/fontconfig-infinality )"
43 46

  
44 47
PATCHES=(
45
	# This is the same as the 01 patch from infinality
46
	"${FILESDIR}"/${PN}-2.7-enable-valid.patch
47

  
48 48
	"${FILESDIR}"/${PN}-2.4.11-sizeof-types.patch # 459966
49 49
)
50 50

  
......
74 74
}
75 75

  
76 76
src_fetch() {
77
	_egit_repo_handler fetch
77
	_egit_repo_handler ${EBUILD_PHASE}
78 78
}
79 79

  
80 80
src_unpack() {
81
	_egit_repo_handler unpack
81
	_egit_repo_handler ${EBUILD_PHASE}
82 82
}
83 83

  
84 84
src_prepare() {
......
97 97

  
98 98
	default
99 99

  
100
	# This is the same as the 01 patch from infinality
101
	sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die
102

  
100 103
	enable_option() {
101 104
		sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \
102 105
			include/${PN}/config/ftoption.h \
......
150 153

  
151 154
	# we need non-/bin/sh to run configure
152 155
	if [[ -n ${CONFIG_SHELL} ]] ; then
153
		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
156
		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \
154 157
			"${S}"/builds/unix/configure || die
155 158
	fi
156 159

  
......
207 210
		local ft2demo
208 211
		for ft2demo in ../ft2demos-${PV}/bin/*; do
209 212
			./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \
210
				"${ED%/}"/usr/bin || die
213
				"${ED}"/usr/bin || die
211 214
		done
212 215
	fi
213 216
}
......
219 222
		local header
220 223
		find src/truetype include/freetype/internal -name '*.h' | \
221 224
		while read header; do
222
			mkdir -p "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
223
			cp ${header} "${ED%/}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
225
			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
226
			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die
224 227
		done
225 228
	fi
226 229

  
Thank you!