Fixed latex handling, reported by Andrey Grozin.

Package-Manager: portage-2.1.5_rc10

4 files changed, 19 insertions, 15 deletions

diff --git a/dev-embedded/avrdude/ChangeLog b/dev-embedded/avrdude/ChangeLog
index e4c05b6e7cd7..9d5a36bd8141 100644
--- a/dev-embedded/avrdude/ChangeLog
+++ b/dev-embedded/avrdude/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-embedded/avrdude
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.38 2007/12/21 08:27:06 calchan Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/ChangeLog,v 1.39 2008/05/13 08:35:05 calchan Exp $
+
+  13 May 2008; Denis Dupeyron <calchan@gentoo.org> avrdude-5.4.ebuild,
+  avrdude-5.5.ebuild:
+  Fixed latex handling, reported by Andrey Grozin.
 
   21 Dec 2007; Denis Dupeyron <calchan@gentoo.org> avrdude-5.5.ebuild:
   Re-added -j1 for compilation (see bug #202576).
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index 62d3676c347f..c86bcfa2b6a4 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -2,7 +2,7 @@ DIST avrdude-5.4.tar.gz 429687 RMD160 26af286bc4d4b9704eabdc371daf97b438b25a26 S
 DIST avrdude-5.5.tar.gz 453614 RMD160 29d7a3f86172e156c744747856c4c581dd78e62d SHA1 a97a5f520e6c1504d39cd77ebd72a367ac0f5e95 SHA256 4081053eab5475c7dc782ae6322fecb76582951319af432da110e3839e7b4b51
 DIST avrdude-doc-5.5.pdf 199919 RMD160 425226e8629e4e5c20987bc389f087d669e6f8a4 SHA1 b6a5a41dc6a6cdbc590db0e5e40ba3d0cb35a46d SHA256 851c462b9f560be63238befb0dbf4bdb2b0f11b9d272c2e0d7f06e63e37cd27a
 DIST avrdude-doc-5.5.tar.gz 26256 RMD160 6c5b298eaffceb78f3eb6d68ff9a70d37e6bc096 SHA1 a06a06852cdcf1ebe67efcd2584953f1bbe8d62b SHA256 26d7883172eb8c55604a7561270aa2ac7ec4760d8dfbb44087eaede35688ac5c
-EBUILD avrdude-5.4.ebuild 1031 RMD160 0a3103b218d571bbbed1f56a5e9b761d4c5c57b4 SHA1 d2da4a41c84956014be38aacdbedea11a35eff85 SHA256 d95a40d9d64a529895919cf42c73800903e9130bba48ec2713830019dba6932e
-EBUILD avrdude-5.5.ebuild 1587 RMD160 4569a1380abe28c46c923a060d93ca16b1f66a70 SHA1 1428fa1ce94d9a60d8cbe255205d800a6a6f0443 SHA256 f0449f6b3f0d6bc234b688499626e1fbe62013f1d435ba3a8ff39ad64f261c74
-MISC ChangeLog 4747 RMD160 405de741eda0edd89fbfdbe0369bf9870d981b58 SHA1 6bda069a1b548633fe0362a625819208017c90b8 SHA256 eb7ed500b11041507b387dc49326d4c4c40f6bed5a202e1c284331d69d6ce0e8
+EBUILD avrdude-5.4.ebuild 1081 RMD160 5450d48a5b407d2444a732db088eb26b8f780000 SHA1 1b315bc5399a5777e89a0a4882dee0f1114f8b8f SHA256 3b0124fadb7629dc7ff09cd565f4cab43201b97fcc3d7e283ec64a8446b45c45
+EBUILD avrdude-5.5.ebuild 1617 RMD160 2238c44f3d6274e2f7928913b5600fcf94b28734 SHA1 97f1d59b937d447758a36e2903acf6473d8e9508 SHA256 5003cd91565a298179ee6f41c3623eef2183f1b61c1187aa7f9bfe5c4ab8d0ce
+MISC ChangeLog 4892 RMD160 28fd8c00adfb3a0436eef5dece2ca178b1d78844 SHA1 da1faaf840d90fb9f8b67edabb043b348e71f6f0 SHA256 02a3f0a4864ae1c45df59a7357a44bad951d06917d8d0637b4fed66d22929c33
 MISC metadata.xml 263 RMD160 a02a2b7079d253bd9d8a61c4417c20327e9fb548 SHA1 3f0aff9e30bcc67c87b9ade8fdb10ed16f5559aa SHA256 5b8c9628b54bbe886fa3f1ce880c501edbbfc8ed6e02abfb6f486976356627b0
diff --git a/dev-embedded/avrdude/avrdude-5.4.ebuild b/dev-embedded/avrdude/avrdude-5.4.ebuild
index 90fc6aaf1e90..1efde6ffc71c 100644
--- a/dev-embedded/avrdude/avrdude-5.4.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.5 2007/08/13 20:14:23 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.4.ebuild,v 1.6 2008/05/13 08:35:05 calchan Exp $
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
@@ -15,7 +15,7 @@ RDEPEND="sys-libs/readline
 		sys-libs/ncurses
 		dev-libs/libusb"
 DEPEND="doc? ( app-text/texi2html
-			   virtual/tetex
+			   virtual/latex-base
 			   sys-apps/texinfo )
 		sys-devel/bison
 		sys-devel/flex
@@ -24,7 +24,7 @@ DEPEND="doc? ( app-text/texi2html
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	# let the build system re-generate these, bug #120194
@@ -33,11 +33,11 @@ src_unpack() {
 
 src_compile() {
 	econf $(use_enable doc) || die "econf failed"
-	emake || die "emake failed"
+	VARTEXFONTS="${T}/fonts" emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "emake install failed"
+	VARTEXFONTS="${T}/fonts" make DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS NEWS README ChangeLog*
 }
diff --git a/dev-embedded/avrdude/avrdude-5.5.ebuild b/dev-embedded/avrdude/avrdude-5.5.ebuild
index 38a76362b83a..55aab3585ba1 100644
--- a/dev-embedded/avrdude/avrdude-5.5.ebuild
+++ b/dev-embedded/avrdude/avrdude-5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.2 2007/12/21 08:27:06 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/avrdude/avrdude-5.5.ebuild,v 1.3 2008/05/13 08:35:05 calchan Exp $
 
 DESCRIPTION="AVR Downloader/UploaDEr"
 HOMEPAGE="http://savannah.nongnu.org/projects/avrdude"
@@ -16,7 +16,7 @@ IUSE="doc"
 RDEPEND="dev-libs/libusb"
 DEPEND="${RDEPEND}
 	doc? ( app-text/texi2html
-		virtual/tetex
+		virtual/latex-base
 		sys-apps/texinfo )"
 
 src_unpack() {
@@ -36,7 +36,7 @@ src_compile() {
 	# We build docs separately since the makefile doesn't do it in a really nice way
 	if use doc ; then
 		cd doc
-		emake -j1 || die "emake doc failed"
+		VARTEXFONTS="${T}/fonts" emake -j1 || die "emake doc failed"
 	fi
 }