Fix breakage introduced by Prefix changes. 1.4 ebuild cannot be migrated to EAPI...

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

diff --git a/media-libs/freetype/ChangeLog b/media-libs/freetype/ChangeLog
index 28468c9a7aaac93944f4df67a2e79b0a16daef4e..60507fadcb33cbb612cda2037753babeb7d68bff 100644 (file)
--- a/media-libs/freetype/ChangeLog
+++ b/media-libs/freetype/ChangeLog
@@ -1,6 +1,12 @@
 # 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.306 2011/08/31 08:35:05 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/ChangeLog,v 1.307 2011/09/01 08:35:41 grobian Exp $
+
+  01 Sep 2011; Fabian Groffen <grobian@gentoo.org>
+  freetype-1.4_pre20080316-r2.ebuild:
+  Fix breakage introduced by Prefix changes. 1.4 ebuild cannot be migrated to
+  EAPI=3 easily, hence added defines for the missing vars when used outside
+  Prefix, bug #381037
 
   31 Aug 2011; Markus Duft <mduft@gentoo.org> freetype-2.4.6.ebuild:
   added eautoreconf for prefix platforms.

diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index ccba61618393c84020761dd98203de86a7a12a40..161b1ead67fc4b5cbfd13522c9f57e460803204c 100644 (file)
--- 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 3891 RMD160 4b2d3b82dae59499479d31590526fffc5cba4e5e SHA1 c487f19016a4677af5e7467dc1f1f8888d16937f SHA256 fc725b19adfd196b9e2b0865e0f351a3a6f34eebca6da4f985f8a9effcec6711
+EBUILD freetype-1.4_pre20080316-r2.ebuild 3938 RMD160 b5ef37affbbac946e29a9c636114f680d68f918f SHA1 86cbeb6af89b0cb6f9af2e9c02d85bd9d3cda431 SHA256 d988cb518156b9b672e6a97d480909a3a2fda1b0cd542dee3309f26655217d6c
 EBUILD freetype-2.4.6.ebuild 3944 RMD160 ea40270be9ce127457f3d7847e19a7c7032011bd SHA1 61f2c14ed785b19306bd8e27fc6dfe2b5e1c876f SHA256 d11626d2edb241fc8991bd2d9ab0e69d7697994e81aea1319082268068cb3944
-MISC ChangeLog 46099 RMD160 062c13902755d0a4020cd631ad75d0521d0b0def SHA1 5093d40eb2aaccd42e14d6ce9fa6ce90391239b6 SHA256 0e1beb441d15d40836fed9773c457b69c1ba4d63ba57f95451228ff8d0285dc9
+MISC ChangeLog 46367 RMD160 4e9e67af83e64813ad8d352e08c09c0c5cd49eff SHA1 4cd27be49a750e9087b62c13666307bf43de2c75 SHA256 8a0749822cc2da097a5592f2ba425103cfcc5d3e27fe0c618fb91217a9110353
 MISC metadata.xml 670 RMD160 00400b78ad55a3e482260adfbbadffb5ba31f798 SHA1 9bbe2110c782cb2c559b07f0fb9d72720142a737 SHA256 a2a2d457514a52a3f36a68c87fd757dfe6af2d368d1c3287783e30cb22b33398
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (SunOS)
 
-iEYEARECAAYFAk5d8kIACgkQaBSIl5HlrrJ+PgCfStlQaO0KJ96O1xkCHF+iflMr
-emEAn3T2WQOHtzrt4TjS+jwukoBuHpAk
-=ZT/Z
+iEYEARECAAYFAk5fQ+MACgkQX3X2B8XHTonSMACfbsuPw7tstnycj70jql5w9X3f
+cSkAmwdWixHNZIosBlYR3SEgw787nflW
+=itLX
 -----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 fd057c8c0c4b66c42ebb494b49bf926f6a9e0fcb..924955fcd6c8b9584094ec380e291ce62c842b96 100644 (file)
--- 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-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.8 2011/08/28 17:32:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.4_pre20080316-r2.ebuild,v 1.9 2011/09/01 08:35:41 grobian Exp $
 
 inherit autotools eutils libtool multilib
 
@@ -73,6 +73,7 @@ src_unpack() {
 }
 
 src_compile() {
+       use prefix || EPREFIX=
        use kpathsea && kpathseaconf="--with-kpathsea-lib=${EPREFIX}/usr/$(get_libdir) --with-kpathsea-include=${EPREFIX}/usr/include"
 
        # core
@@ -94,6 +95,7 @@ src_compile() {
 }
 
 src_install() {
+       use prefix || ED=${D}
        dodoc announce PATENTS README docs/*.txt docs/FAQ
        use doc && dohtml -r docs