Convert to EAPI3 and add EPREFIX where needed, bug 309603

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 14 insertions, 21 deletions

diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index e1216d9b0a2a..67ff997d0cfe 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-fonts/terminus-font
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.73 2010/03/15 19:54:21 darkside Exp $
+
+  15 Mar 2010; Jeremy Olexa <darkside@gentoo.org> terminus-font-4.30.ebuild:
+  Convert to EAPI3 and add EPREFIX where needed, bug 309603
 
   11 Feb 2010; Mark Loeser <halcy0n@gentoo.org> terminus-font-4.28.ebuild,
   terminus-font-4.30.ebuild:
diff --git a/media-fonts/terminus-font/Manifest b/media-fonts/terminus-font/Manifest
index 5c7fc48fa4b6..7f2abf0afdf2 100644
--- a/media-fonts/terminus-font/Manifest
+++ b/media-fonts/terminus-font/Manifest
@@ -1,6 +1,3 @@
------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
@@ -26,13 +23,6 @@ DIST terminus-font-4.30-kx3-ka2.diff.gz 1060 RMD160 ded6be39049d8371531016ea6304
 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 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
+EBUILD terminus-font-4.30.ebuild 3456 RMD160 04a7ffc5d4acd4380ba2514724b528d6535f8cd4 SHA1 7bf6d4ce5bc1dfb1f65174fca8ef319952851ca5 SHA256 208192b8a9c64163b19e39d91c385300b1a299b5fc1f1edfb0e04f2fb094ab1d
+MISC ChangeLog 10315 RMD160 1494d04305469c9977f18ce5e21a51c2cef372e8 SHA1 a67c2d2c05f0e43d801880db4563b42c1d163950 SHA256 584f5db3ef2e105bea21df58ce6ee32b78e77447bd56985a133b7f89c413d961
 MISC metadata.xml 1210 RMD160 482c71c57abd30d4f39d5a701af80a0f2c14b867 SHA1 4eeceb65135e59a6344daff5696b57eb6537e537 SHA256 52607b7eb4be346a553675b968b3e27e0273f7229856e860ad5d2eb7dd466797
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuZX6gACgkQdz7hIScOURGshQCcC6XiwC/58hOvhbJFwET0PAdJ
-zWoAn2jXt5SMMAhELD+ZvIoyMdcvZrqB
-=rPAw
------END PGP SIGNATURE-----
diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
index cc88559d6587..368122b24b4c 100644
--- a/media-fonts/terminus-font/terminus-font-4.30.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.30.ebuild
@@ -1,8 +1,8 @@
 # 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.2 2010/02/11 19:31:07 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.3 2010/03/15 19:54:21 darkside Exp $
 
-EAPI="1"
+EAPI="3"
 
 inherit eutils font
 
@@ -23,7 +23,7 @@ SRC_URI="http://www.is-vn.bg/hamster/${P}.tar.gz
 			"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="a-like-o ru-dv +ru-g quote ru-i ru-k width bolddiag +psf raw-font-data +pcf"
 
 DEPEND="dev-lang/perl
@@ -74,11 +74,11 @@ src_unpack() {
 src_compile() {
 	# selfwritten configure script
 	./configure \
-		--prefix=/usr \
-		--psfdir=/usr/share/consolefonts \
-		--acmdir=/usr/share/consoletrans \
-		--unidir=/usr/share/consoletrans \
-		--x11dir=${FONTDIR} || die
+		--prefix="${EPREFIX}"/usr \
+		--psfdir="${EPREFIX}"/usr/share/consolefonts \
+		--acmdir="${EPREFIX}"/usr/share/consoletrans \
+		--unidir="${EPREFIX}"/usr/share/consoletrans \
+		--x11dir="${EPREFIX}"/${FONTDIR} || die
 
 	if use psf; then emake psf txt || die; fi
 	if use raw-font-data; then emake raw || die; fi