diff options
author | Mike Gilbert <floppym@gentoo.org> | 2014-12-14 19:40:58 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2014-12-14 19:40:58 +0000 |
commit | e6fc4f03e46d0175a479c5fc7b9bb9bf19d6e09d (patch) | |
tree | 145e9213747445903513a17e4ac7704f25cf0ff6 /media-libs/freetype | |
parent | Mask inkscape pre-releases. (diff) | |
download | gentoo-2-e6fc4f03e46d0175a479c5fc7b9bb9bf19d6e09d.tar.gz gentoo-2-e6fc4f03e46d0175a479c5fc7b9bb9bf19d6e09d.tar.bz2 gentoo-2-e6fc4f03e46d0175a479c5fc7b9bb9bf19d6e09d.zip |
Switch back to ${S} after sedding the ftdemos Makefile so that epatch_user works properly. If the user wants to patch ftdemos, they are SOL for now.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'media-libs/freetype')
-rw-r--r-- | media-libs/freetype/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/freetype/freetype-2.5.4.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog index b6758a0a3212..242cc958ea85 100644 --- a/media-libs/freetype/ChangeLog +++ b/media-libs/freetype/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/freetype # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.409 2014/12/13 13:29:03 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.410 2014/12/14 19:40:58 floppym Exp $ + + 14 Dec 2014; Mike Gilbert <floppym@gentoo.org> freetype-2.5.4.ebuild: + Switch back to ${S} after sedding the ftdemos Makefile so that epatch_user + works properly. If the user wants to patch ftdemos, they are SOL for now. 13 Dec 2014; Ben de Groot <yngwin@gentoo.org> freetype-2.5.4.ebuild: Prevent circular dependencies diff --git a/media-libs/freetype/freetype-2.5.4.ebuild b/media-libs/freetype/freetype-2.5.4.ebuild index 20bb2e437bb3..14a639d40b05 100644 --- a/media-libs/freetype/freetype-2.5.4.ebuild +++ b/media-libs/freetype/freetype-2.5.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.2 2014/12/13 13:29:03 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.5.4.ebuild,v 1.3 2014/12/14 19:40:58 floppym Exp $ EAPI=5 inherit autotools-multilib flag-o-matic multilib toolchain-funcs @@ -88,6 +88,7 @@ src_prepare() { if ! use X; then sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die fi + cd "${S}" || die fi # we need non-/bin/sh to run configure |