Add font_pkg_setup to pkg_setup so the eclass sets up the prefix compat variables correctly

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 28 insertions, 9 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 2f5c3a57c5ea..e1216d9b0a2a 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-fonts/terminus-font
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.71 2009/12/22 11:50:45 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.72 2010/02/11 19:31:07 halcy0n Exp $
+
+  11 Feb 2010; Mark Loeser <halcy0n@gentoo.org> terminus-font-4.28.ebuild,
+  terminus-font-4.30.ebuild:
+  Add font_pkg_setup to pkg_setup so the eclass sets up the prefix compat
+  variables correctly
 
 *terminus-font-4.30 (22 Dec 2009)
 
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index b371a12c07c0..c32ae9a2a1cf 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST terminus-font-4.28-ao2.diff.gz 3559 RMD160 ce574b7db845733d4829cbebbfac8b16c6aebba1 SHA1 986225c06981276b457e6a1624459e5dd8becc43 SHA256 ec49f123d447f269a1fdee6afca7efc85ac2faf04277ab2a1385063c985074fc
 DIST terminus-font-4.28-cm2.diff.gz 1428 RMD160 e9080fa0b5a008cf27cc3728fa7771d74c21afeb SHA1 aaa3d88a3dcf01b9c10f70d1cc0de3209f423d03 SHA256 9c29419e8221b95785234a5e7a6032c16d866e2fc29f20062b68ea4c183b8e02
 DIST terminus-font-4.28-dv1.diff.gz 1098 RMD160 509d723378b7357456fd150ba507414075327638 SHA1 a53b91226ddba21abeefd756b698ac363c43e27d SHA256 dec607b66ecd31ada8800e5c16af24692e7c5acb9e5f528156a57232a9c7b194
@@ -22,7 +25,14 @@ DIST terminus-font-4.30-kx3-ij1.diff.gz 1533 RMD160 d0dcd9fe3b5baf9d75972c53f3dc
 DIST terminus-font-4.30-kx3-ka2.diff.gz 1060 RMD160 ded6be39049d8371531016ea6304149aa67d9183 SHA1 c48c55bb07264206da89957459208b18933c50d7 SHA256 9933acd1ca3408e653012f1da86e78a5189b5131f6189792850326214812af45
 DIST terminus-font-4.30-kx3.diff.gz 3135 RMD160 0744f53720b1f9196e1122f85dd9f3d5b347b323 SHA1 3dccf0b9bdc37e9ec80de3109d7ecc741ea2edb6 SHA256 6672e498b85614cb6a5d01c3576e0a1511962b2d6d6ae3f55ea2dd53c57bcfcf
 DIST terminus-font-4.30.tar.gz 267236 RMD160 d7835e99012895b15f295fc1d19551c9ed241354 SHA1 472dbdc8ee7fa42ea8f91e41e9f154f23f9453b9 SHA256 ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a
-EBUILD terminus-font-4.28.ebuild 3318 RMD160 07816f183c209f05ecd14ed272620ef7ebec5595 SHA1 2c782b167ca6d4277b73f530b94327829706fe6d SHA256 11d89a13cc6e5b7908b8a66f34874bff28de303afe75a55bb1428a0ec88affe5
-EBUILD terminus-font-4.30.ebuild 3336 RMD160 aa3a222f1159c7e215860d2eb9bfea8097f70805 SHA1 2e9e898b7d33b3769434ff9f9ba05c9cb02175fe SHA256 fade6487ad8593cea0e4be6ee4b8808507a81e4807e5aec41854de389e4dd2a0
-MISC ChangeLog 9971 RMD160 14786bae0a57d1a6eeb47bf9436d1fe4bba70737 SHA1 882c20f521335224f10a429e804c62eac70837c4 SHA256 3ff859d9370c995cbf8e6065f60df790bf0b2d031e4de957718263fa5d9a8338
+EBUILD terminus-font-4.28.ebuild 3340 RMD160 7c2f72a7ff8a415c56b29f6d5fd249c2e23788aa SHA1 9e8cc9a74b069173abb79e4b3f865da62a1dab48 SHA256 dd2c5b7620e4354aa2de88994b623ed4c23aa948fd0412747cf4b5a43005ca48
+EBUILD terminus-font-4.30.ebuild 3357 RMD160 8714e954af41cc7930bda2a80dee4c615473630c SHA1 a0bf67c02428a28ca051145526cf5bb294a1fdcc SHA256 b0d623ae06d33230a8222e039ce1b064dfcb8ad3e40dd9f23fcf0e4737483d9b
+MISC ChangeLog 10176 RMD160 965a9c80a7a968b196c01f9f4cdeec55e794110d SHA1 3a53e1d0e72cad6b11f0d7df33ef10b4e477d74a SHA256 98e9ff1e45bc7c3382b07f3cc704c4b87c15fb721a07990964bc043ca15b07c0
 MISC metadata.xml 1209 RMD160 648af213e6fb7cf5534a70321f9503880cf3c83c SHA1 080bfa0f77967db05f7a7e573def6ffcb54de3e4 SHA256 b1ca206f987ec5775072d0ae38430cd791b2a0aec156a56eeb9a6d7870220aa7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkt0WwMACgkQCRZPokWLroRA3QCeO0csCKBshNyvH/VkvL0Z/1LD
+OkoAoOFj7azdPW5T0dLhWvAZwKFcdBNG
+=9Bz8
+-----END PGP SIGNATURE-----
diff --git a/media-fonts/terminus-font/terminus-font-4.28.ebuild b/media-fonts/terminus-font/terminus-font-4.28.ebuild
index 65e48ab07c65..ed30f0bb6c7c 100644
--- a/media-fonts/terminus-font/terminus-font-4.28.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.28.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.28.ebuild,v 1.9 2009/06/05 16:59:12 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.28.ebuild,v 1.10 2010/02/11 19:31:07 halcy0n Exp $
 
 EAPI="1"
 
@@ -42,6 +42,8 @@ pkg_setup() {
 		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
 		die "Either disable X use flag or enabled pcf."
 	fi
+
+	font_pkg_setup
 }
 
 src_unpack() {
diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
index a430f8ba9ae7..cc88559d6587 100644
--- a/media-fonts/terminus-font/terminus-font-4.30.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.30.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.1 2009/12/22 11:50:45 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.2 2010/02/11 19:31:07 halcy0n Exp $
 
 EAPI="1"
 
@@ -42,6 +42,8 @@ pkg_setup() {
 		eerror "Fonts which works with Xserver are intalled only if pcf is enabled."
 		die "Either disable X use flag or enabled pcf."
 	fi
+
+	font_pkg_setup
 }
 
 src_unpack() {