diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-16 08:34:11 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-16 08:34:11 +0000 |
| commit | 5fb8475093fbc2a4d7e3eb0942b252bfd74cbcf3 (patch) | |
| tree | ed6465cd7393320d8010a7f56771d2294dc6e224 | |
| parent | pull in net-libs/librpcsecgss for kerberos support #136486 (diff) | |
| download | gentoo-2-5fb8475093fbc2a4d7e3eb0942b252bfd74cbcf3.tar.gz gentoo-2-5fb8475093fbc2a4d7e3eb0942b252bfd74cbcf3.tar.bz2 gentoo-2-5fb8475093fbc2a4d7e3eb0942b252bfd74cbcf3.zip | |
Fix path for X binaries to /usr/bin, as per bug #140590.
(Portage version: 2.1.1_pre2-r8)
| -rw-r--r-- | media-fonts/monafont/ChangeLog | 6 | ||||
| -rw-r--r-- | media-fonts/monafont/monafont-2.90-r2.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/media-fonts/monafont/ChangeLog b/media-fonts/monafont/ChangeLog index b48e870aa074..3191e5c2a3fe 100644 --- a/media-fonts/monafont/ChangeLog +++ b/media-fonts/monafont/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-fonts/monafont # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.22 2006/07/11 19:55:21 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/ChangeLog,v 1.23 2006/07/16 08:34:11 flameeyes Exp $ + + 16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> + monafont-2.90-r2.ebuild: + Fix path for X binaries to /usr/bin, as per bug #140590. 11 Jul 2006; Aron Griffis <agriffis@gentoo.org> monafont-2.90-r2.ebuild: Mark 2.90-r2 stable on ia64 diff --git a/media-fonts/monafont/monafont-2.90-r2.ebuild b/media-fonts/monafont/monafont-2.90-r2.ebuild index 8efec5494b02..61685badd6e4 100644 --- a/media-fonts/monafont/monafont-2.90-r2.ebuild +++ b/media-fonts/monafont/monafont-2.90-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.2 2006/07/11 19:55:21 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.3 2006/07/16 08:34:11 flameeyes Exp $ inherit font @@ -16,7 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="truetype" -DEPEND="|| ( ( x11-apps/bdftopcf x11-apps/mkfontdir ) virtual/x11 ) +DEPEND="|| ( ( x11-apps/bdftopcf x11-apps/mkfontdir ) <virtual/x11-7 ) dev-lang/perl >=sys-apps/sed-4 app-arch/unzip" @@ -35,18 +35,18 @@ src_unpack() { src_compile() { PERL_BADLANG=0 ; LC_CTYPE=C export PERL_BADLANG LC_CTYPE - emake || die + emake X11BINDIR="/usr/bin" || die } src_install() { - make install X11FONTDIR="${D}/${FONTDIR}" || die - mkfontdir ${D}/${FONTDIR} - insinto ${FONTDIR} + make install X11BINDIR="/usr/bin" X11FONTDIR="${D}/${FONTDIR}" || die + mkfontdir "${D}/${FONTDIR}" + insinto "${FONTDIR}" newins fonts.alias.mona fonts.alias dodoc README* if use truetype ; then - DOCS=${WORKDIR}/README-ttf.txt + DOCS="${WORKDIR}/README-ttf.txt" font_src_install fi } |