summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-02-02 06:33:03 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-02-02 06:33:03 +0000
commit1297c87e8be5b42dff7c4df92a8b224a07b4e87f (patch)
treeeb115df7c0ae2eba657df50b641104ad38d5298a /media-libs/t1lib
parentAdd note about driconf 0.9.0 staying masked. (diff)
downloadgentoo-2-1297c87e8be5b42dff7c4df92a8b224a07b4e87f.tar.gz
gentoo-2-1297c87e8be5b42dff7c4df92a8b224a07b4e87f.tar.bz2
gentoo-2-1297c87e8be5b42dff7c4df92a8b224a07b4e87f.zip
Add tetex dependency for doc useflag, and make it decide whether to build documentation or not, instead of only deciding on install. Fix sed invokation to use -i option. Use emake instead of make.
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'media-libs/t1lib')
-rw-r--r--media-libs/t1lib/ChangeLog9
-rw-r--r--media-libs/t1lib/t1lib-5.0.2.ebuild13
2 files changed, 13 insertions, 9 deletions
diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index f90a0793ec63..d2c08facaf42 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/t1lib
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.44 2005/11/08 04:10:36 dang Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.45 2006/02/02 06:33:03 flameeyes Exp $
+
+ 02 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> t1lib-5.0.2.ebuild:
+ Add tetex dependency for doc useflag, and make it decide whether to build
+ documentation or not, instead of only deciding on install. Fix sed
+ invokation to use -i option. Use emake instead of make.
08 Nov 2005; <dang@gentoo.org> t1lib-5.0.2.ebuild:
Modular X deps
diff --git a/media-libs/t1lib/t1lib-5.0.2.ebuild b/media-libs/t1lib/t1lib-5.0.2.ebuild
index f6afaf51f579..865e8c03140a 100644
--- a/media-libs/t1lib/t1lib-5.0.2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.22 2005/12/31 10:34:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.23 2006/02/02 06:33:03 flameeyes Exp $
inherit eutils gnuconfig flag-o-matic libtool
@@ -24,6 +24,7 @@ RDEPEND="X? ( || ( (
virtual/x11 ) )"
DEPEND="${RDEPEND}
+ doc? ( virtual/tetex )
X? ( || ( (
x11-libs/libXfont
x11-proto/xproto
@@ -39,9 +40,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-gentoo.diff
- cd ${S}/doc
- mv Makefile.in Makefile.in-orig
- sed -e "s:dvips:#dvips:" Makefile.in-orig>Makefile.in
+ sed -i -e "s:dvips:#dvips:" ${S}/doc/Makefile.in
sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" ${S}/xglyph/xglyph.c
}
@@ -51,7 +50,7 @@ src_compile() {
use alpha && append-flags -mieee
- if [ ! -x /usr/bin/latex ] ; then
+ if ! use doc; then
myopt="without_doc"
else
addwrite /var/cache/fonts
@@ -61,7 +60,7 @@ src_compile() {
--datadir=/etc \
`use_with X x` \
|| die
- make ${myopt} || die
+ emake ${myopt} || die
}
src_install() {