Fix for Prefix, transfer Prefix keywords

(Portage version: 2.2.01.19074-prefix/cvs/Darwin i386)

3 files changed, 25 insertions, 14 deletions

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index e374c4f22f1d..e19912ed2681 100644
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/freetype
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.304 2011/08/21 19:15:53 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.305 2011/08/28 17:32:21 grobian Exp $
+
+  28 Aug 2011; Fabian Groffen <grobian@gentoo.org>
+  freetype-1.4_pre20080316-r2.ebuild, freetype-2.4.6.ebuild:
+  Fix for Prefix, transfer Prefix keywords
 
   21 Aug 2011; Ryan Hill <dirtyepic@gentoo.org> freetype-2.4.6.ebuild,
   metadata.xml:
diff --git a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
index 329227d91282..fd057c8c0c4b 100644
--- a/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
+++ b/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.7 2010/10/10 16:53:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.8 2011/08/28 17:32:21 grobian Exp $
 
 inherit autotools eutils libtool multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="FTL"
 SLOT="1"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc nls kpathsea"
 
 COMMON_DEPEND="kpathsea? ( virtual/tex-base )"
@@ -73,7 +73,7 @@ src_unpack() {
 }
 
 src_compile() {
-	use kpathsea && kpathseaconf="--with-kpathsea-lib=/usr/$(get_libdir) --with-kpathsea-include=/usr/include"
+	use kpathsea && kpathseaconf="--with-kpathsea-lib=${EPREFIX}/usr/$(get_libdir) --with-kpathsea-include=${EPREFIX}/usr/include"
 
 	# core
 	einfo "Building core library..."
@@ -103,13 +103,13 @@ src_install() {
 	einfo "Installing core library..."
 	cd "${S}"/lib
 	emake -f arch/unix/Makefile \
-		prefix="${D}"/usr libdir="${D}"/usr/$(get_libdir) install \
+		prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) install \
 			|| die "lib install failed"
 
 	# install po files
 	einfo "Installing po files..."
 	cd "${S}"/po
-	emake prefix="${D}"/usr libdir="${D}"/usr/$(get_libdir) install \
+	emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) install \
 		|| die "po install failed"
 
 	# contrib (DESTDIR now works here)
diff --git a/media-libs/freetype/freetype-2.4.6.ebuild b/media-libs/freetype/freetype-2.4.6.ebuild
index 6a824dbbc393..c0b986d1e132 100644
--- a/media-libs/freetype/freetype-2.4.6.ebuild
+++ b/media-libs/freetype/freetype-2.4.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.6.ebuild,v 1.9 2011/08/21 19:15:53 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.4.6.ebuild,v 1.10 2011/08/28 17:32:21 grobian Exp $
 
 EAPI="4"
 
-inherit autotools-utils eutils flag-o-matic libtool
+inherit autotools-utils eutils flag-o-matic libtool multilib
 
 DESCRIPTION="A high-quality and portable font engine"
 HOMEPAGE="http://www.freetype.org/"
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.bz2
 
 LICENSE="FTL GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="X auto-hinter bindist bzip2 debug doc fontforge static-libs utils"
 
 DEPEND="sys-libs/zlib
@@ -74,6 +74,12 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	type -P gmake &> /dev/null && export GNUMAKE=gmake
+
+	# we need non-/bin/sh to run configure
+	[[ -n ${CONFIG_SHELL} ]] && \
+		sed -i -e "1s:^#![[:space:]]*/bin/sh:#!$CONFIG_SHELL:" \
+			"${S}"/builds/unix/configure
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_with bzip2)
@@ -84,7 +90,8 @@ src_compile() {
 
 	if use utils; then
 		cd "${WORKDIR}/ft2demos-${PV}"
-		emake
+		# fix for Prefix, bug #339334
+		emake X11_PATH="${EPREFIX}/usr/$(get_libdir)"
 	fi
 }
 
@@ -100,7 +107,7 @@ src_install() {
 		rm "${WORKDIR}"/ft2demos-${PV}/bin/README
 		for ft2demo in ../ft2demos-${PV}/bin/*; do
 			./builds/unix/libtool --mode=install $(type -P install) -m 755 "$ft2demo" \
-				"${D}"/usr/bin
+				"${ED}"/usr/bin
 		done
 	fi
 
@@ -109,8 +116,8 @@ src_install() {
 		einfo "Installing internal headers required for fontforge"
 		find src/truetype include/freetype/internal -name '*.h' | \
 		while read header; do
-			mkdir -p "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
-			cp ${header} "${D}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+			mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
+			cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})"
 		done
 	fi