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.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 40 insertions, 14 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/Manifest b/media-libs/t1lib/Manifest
index 6af1d8a05042..a1b0a5cd8d54 100644
--- a/media-libs/t1lib/Manifest
+++ b/media-libs/t1lib/Manifest
@@ -1,21 +1,43 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 10236f606faec715fd4dcddbc3239f91 ChangeLog 5963
+MD5 9f42f53e65de0253a1195f1c13f6fd98 ChangeLog 6245
+RMD160 ae3fac44d6c20a1b7654b9d00fcbb407ce72145f ChangeLog 6245
+SHA256 05ca9c842a70f1bdba6ea1d6b5b7ce80c236eab4691994415d1d0f4f32a30616 ChangeLog 6245
 MD5 817757abf473e739c3314daca2aecea2 files/digest-t1lib-1.3.1 64
+RMD160 9b88140c40d54d7870c853871bc90ceb6a0f9172 files/digest-t1lib-1.3.1 64
+SHA256 92d15b1f43e06ddc01f3df4b199190e8ac0efe40041d7209b0191172f6c2a6d3 files/digest-t1lib-1.3.1 64
 MD5 fd18dc7d703e77e595bc054f2f4c0f20 files/digest-t1lib-5.0.0-r2 64
+RMD160 b57749c4f70907e259c8a9de45d7d163fb3a6cf5 files/digest-t1lib-5.0.0-r2 64
+SHA256 7fd50d98c94dde6ecca86cfd3bc329b1ecf2d97f16d4279aea064b0805541387 files/digest-t1lib-5.0.0-r2 64
 MD5 60bcc4bc9f1f21b6f445e2dc1f462171 files/digest-t1lib-5.0.1 64
+RMD160 a63dca6cfce9d1167d087e194badf8e81f439fcb files/digest-t1lib-5.0.1 64
+SHA256 2a5cf6b089f279932ffafc00d0767b21f74f646c916da1f28661d99fc5364bd6 files/digest-t1lib-5.0.1 64
 MD5 31349cc7c0045a650519549f365906a9 files/digest-t1lib-5.0.2 64
+RMD160 b7998a12a782f64484c8bc8b76542c2d3c53cc23 files/digest-t1lib-5.0.2 64
+SHA256 7178ebb061d1bc8bfa2cf33c5cf1ac9e2cdf0a285cf85c4782268c24a11b3e53 files/digest-t1lib-5.0.2 64
 MD5 564c11663ec99286c576cedef39a854e files/t1lib-5.0.2-gentoo.diff 2619
+RMD160 15c0f89f625c0433ee05af1e5c08ce06904b1235 files/t1lib-5.0.2-gentoo.diff 2619
+SHA256 a336bc4b305b1635d665a746f47e77cbc8e79a836dbf784ec58d1c339df38c5b files/t1lib-5.0.2-gentoo.diff 2619
 MD5 295674d4bed87f5a7c2796e032ed561e metadata.xml 158
+RMD160 e563fdca0707ee5927deab77f2e5ef79816384ca metadata.xml 158
+SHA256 9a8722fb0b5a1992b3942e85f23df4e08f10cabc2d783ca887479abe115b3ea8 metadata.xml 158
 MD5 35648ba7f30da0dd70f62b377c0f43c5 t1lib-1.3.1.ebuild 1499
+RMD160 08c5f7e8cc4aad9c150d5f7293cdc77cad827c3e t1lib-1.3.1.ebuild 1499
+SHA256 0e60e7d812047d332d713584b4561820c33937cc5600369ef1813576a0eaad69 t1lib-1.3.1.ebuild 1499
 MD5 fa2259bc03feb894998a1f637f5213cb t1lib-5.0.0-r2.ebuild 1470
+RMD160 178e6d5be50b6692e95562f32ce609745596a643 t1lib-5.0.0-r2.ebuild 1470
+SHA256 bd07359720d7501a202069800ef098f1375fd68f5e6620da9b18e0d3bbc54159 t1lib-5.0.0-r2.ebuild 1470
 MD5 de8049a9df4d3f57b7fd2b7fa71aeaba t1lib-5.0.1.ebuild 1531
-MD5 8ab1bd0c1cf444fe39cf5f087d5597ad t1lib-5.0.2.ebuild 1880
+RMD160 be95ba36ed0e78c94c1a54684d305c34002dab84 t1lib-5.0.1.ebuild 1531
+SHA256 60fc008d4e25016c20a8b5d15accbe5fedeced82bd7d6cc5c8f9573de00c560f t1lib-5.0.1.ebuild 1531
+MD5 0d1810872c3f86463f0dbcdf692c5827 t1lib-5.0.2.ebuild 1842
+RMD160 e95fc8402916f0873535129d1043103d15b6e5ae t1lib-5.0.2.ebuild 1842
+SHA256 218b885ecd40f01ea84496ee915243dc6facf90dc3fb99408fd4dd3dc54f8b7d t1lib-5.0.2.ebuild 1842
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDtl7c2+ySkm8kpY0RAlaeAJwPnC8Xu85VYukRabL90zFZb+SA6wCgoqbb
-jvXydIrPuNDtu/sQrYQ6+Lk=
-=Dp3p
+iD8DBQFD4ae3AiZjviIA2XgRAop0AJ9gIyVPQvNtgqgPrNW6FddFONMAXwCeLpBV
+Ykw913FX1v7519NFyOhgiUw=
+=iAVD
 -----END PGP SIGNATURE-----
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() {