diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /media-libs/freetype/freetype-2.10.4.ebuild | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'media-libs/freetype/freetype-2.10.4.ebuild')
-rw-r--r-- | media-libs/freetype/freetype-2.10.4.ebuild | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild index 6ede5206ae84..0575eaa7fb6e 100644 --- a/media-libs/freetype/freetype-2.10.4.ebuild +++ b/media-libs/freetype/freetype-2.10.4.ebuild @@ -16,7 +16,7 @@ if [[ "${PV}" != 9999 ]] ; then mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE+=" doc" else inherit autotools git-r3 @@ -148,6 +148,11 @@ src_prepare() { if ! use X; then sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die fi + + # Taken from upstream (https://bugs.gentoo.org/775881) + eapply "${FILESDIR}/${P}-slibtool_build_fix.patch" + eapply "${FILESDIR}/${P}-dont_hardcode_libtool.patch" + eapply "${FILESDIR}/ft2demos-2.10.4-install_target.patch" cd "${S}" || die fi @@ -204,15 +209,10 @@ multilib_src_compile() { multilib_src_install() { default - if multilib_is_native_abi && use utils; then + if multilib_is_native_abi && use utils ; then einfo "Installing utils" - rm "${WORKDIR}"/ft2demos-${PV}/bin/README || die - dodir /usr/bin #654780 - local ft2demo - for ft2demo in ../ft2demos-${PV}/bin/*; do - ./libtool --mode=install $(type -P install) -m 755 "${ft2demo}" \ - "${ED}"/usr/bin || die - done + emake DESTDIR="${D}" FT2DEMOS=1 \ + TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install fi } |