Fix for Prefix, transfer Prefix keywords

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

4 files changed, 32 insertions, 21 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/Manifest b/media-libs/freetype/Manifest
index 3871db859465..b5493be014fa 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -17,14 +17,14 @@ DIST freetype-1.4_pre20080316.tar.bz2 1199805 RMD160 5fb5b0737de968602008991c80d
 DIST freetype-2.4.6.tar.bz2 1487579 RMD160 9b01c88a53549af59c40d9dd5846cc5a34cbc181 SHA1 9d874398118c805478e81d80449dc4aa5a40b6f2 SHA256 24a4a57f3a6859887e91f90f93f754cfc7bf9ab9246a3a696435a0c6a7a1e92a
 DIST freetype-doc-2.4.6.tar.bz2 106666 RMD160 7075c46a21877549f3b4a1c85a6c0cce6a78e7f5 SHA1 6a067385da60857d89ae96760a750c78a8756afd SHA256 e34420cd7706b7b2357a3250ef685cdfbfad1d5284584127148c87ec40ba9524
 DIST ft2demos-2.4.6.tar.bz2 163000 RMD160 11057b0199c77cee2525f8166d12a3b11cf88458 SHA1 367e7904654671f1dcdb6efaf1e18ff7e3bd0d2c SHA256 5e1caebc0e95a610011a6c928533c36d09d1b4811c401988c3b3f50b3d06f381
-EBUILD freetype-1.4_pre20080316-r2.ebuild 3811 RMD160 50e9146f86b280a8b487a9bf10f5c5a86457a5da SHA1 8f0d640c5879750dab079c79357fddef7324ee33 SHA256 0086e81f79c162424d73e1046bb4ae4c7da9b4d7e25757ebd0b6910b4141a4b7
-EBUILD freetype-2.4.6.ebuild 3445 RMD160 12f3911fd846795cd2689567ffc6ff2801cadca0 SHA1 980c761c626bde909cfa1deb7be400de20a6d30b SHA256 a11695b9f6086b3396a3b2c5d0f414fb0849634a923cab311f377d1591079a31
-MISC ChangeLog 45835 RMD160 a5bce3eddf781a0f8e519cb6b4f677518215586e SHA1 2929ed2f71b838752c5bdb1ffd57bd933e065712 SHA256 8319e2ed6817042f591ddf5cf542aa09f20dbab3eb68b5aaaac42baba7625efc
+EBUILD freetype-1.4_pre20080316-r2.ebuild 3891 RMD160 4b2d3b82dae59499479d31590526fffc5cba4e5e SHA1 c487f19016a4677af5e7467dc1f1f8888d16937f SHA256 fc725b19adfd196b9e2b0865e0f351a3a6f34eebca6da4f985f8a9effcec6711
+EBUILD freetype-2.4.6.ebuild 3866 RMD160 fafe09afd77b70788ea4dafeecc9cedfcb185852 SHA1 ee74033712bae91a4fa9afeebc3e3d0453d8a169 SHA256 20833ff105a278f9ea9761cf05098c9209aee2b9f6e4197f1f9c175168f70356
+MISC ChangeLog 45989 RMD160 a65bb361350fa7951aab2d7abbfc83fecebb505f SHA1 75d59602b0e407f77400636e50e7c8b0c87ae39a SHA256 82a7d176a6b5853b6409678334523ce8cae321acc4ec1574b4c6732cac4e0315
 MISC metadata.xml 670 RMD160 00400b78ad55a3e482260adfbbadffb5ba31f798 SHA1 9bbe2110c782cb2c559b07f0fb9d72720142a737 SHA256 a2a2d457514a52a3f36a68c87fd757dfe6af2d368d1c3287783e30cb22b33398
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5RW4sACgkQiqiDRvmkBmJkTwCcC3NjgKd8ESxsP4lOF7DWGqVU
-HlEAoLm4DlZvb2Ms1n1G/1JricPbUgLK
-=SN8E
+iEYEARECAAYFAk5ae6sACgkQX3X2B8XHTomPywCfVZOeD4Nhd1J1dsuIjMB3TN9z
+erUAn0+foLryAjtIAmKkTrptOn4PfaGQ
+=f08Q
 -----END PGP SIGNATURE-----
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