summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Olexa <darkside@gentoo.org>2010-03-15 20:14:49 +0000
committerJeremy Olexa <darkside@gentoo.org>2010-03-15 20:14:49 +0000
commitb2db5b3640af52434d496a757341d8e3fc3380b0 (patch)
tree9148e83ff51ac5aff6d8d50639af7bbe2224c188 /media-fonts
parentold (diff)
downloadgentoo-2-b2db5b3640af52434d496a757341d8e3fc3380b0.tar.gz
gentoo-2-b2db5b3640af52434d496a757341d8e3fc3380b0.tar.bz2
gentoo-2-b2db5b3640af52434d496a757341d8e3fc3380b0.zip
Since my last commit moved this ebuild to EAPI3, add a src_prepare, and src_compile function
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-fonts')
-rw-r--r--media-fonts/terminus-font/ChangeLog6
-rw-r--r--media-fonts/terminus-font/terminus-font-4.30.ebuild11
2 files changed, 10 insertions, 7 deletions
diff --git a/media-fonts/terminus-font/ChangeLog b/media-fonts/terminus-font/ChangeLog
index 67ff997d0cfe..4bebcdf12375 100644
--- a/media-fonts/terminus-font/ChangeLog
+++ b/media-fonts/terminus-font/ChangeLog
@@ -1,6 +1,10 @@
# 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.73 2010/03/15 19:54:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/ChangeLog,v 1.74 2010/03/15 20:14:49 darkside Exp $
+
+ 15 Mar 2010; Jeremy Olexa <darkside@gentoo.org> terminus-font-4.30.ebuild:
+ Since my last commit moved this ebuild to EAPI3, add a src_prepare, and
+ src_compile function
15 Mar 2010; Jeremy Olexa <darkside@gentoo.org> terminus-font-4.30.ebuild:
Convert to EAPI3 and add EPREFIX where needed, bug 309603
diff --git a/media-fonts/terminus-font/terminus-font-4.30.ebuild b/media-fonts/terminus-font/terminus-font-4.30.ebuild
index 368122b24b4c..f20bf1ea51fd 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-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.3 2010/03/15 19:54:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/terminus-font/terminus-font-4.30.ebuild,v 1.4 2010/03/15 20:14:49 darkside Exp $
EAPI="3"
@@ -46,10 +46,7 @@ pkg_setup() {
font_pkg_setup
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# Upstream patches. Some of them are suggested to be applied by default
# dv - de NOT like latin g, but like caps greek delta
# ve NOT like greek beta, but like caps latin B
@@ -71,7 +68,7 @@ src_unpack() {
use width && epatch "${WORKDIR}"/${P}-cm2.diff
}
-src_compile() {
+src_configure() {
# selfwritten configure script
./configure \
--prefix="${EPREFIX}"/usr \
@@ -79,7 +76,9 @@ src_compile() {
--acmdir="${EPREFIX}"/usr/share/consoletrans \
--unidir="${EPREFIX}"/usr/share/consoletrans \
--x11dir="${EPREFIX}"/${FONTDIR} || die
+}
+src_compile() {
if use psf; then emake psf txt || die; fi
if use raw-font-data; then emake raw || die; fi
if use pcf; then emake pcf || die; fi