Inherit toolchain-funcs to get CC for 2.2 and 2.4. Marking 2.2 x86 stable for bug...

Package-Manager: portage-2.0.52-r1

diff --git a/media-gfx/jhead/ChangeLog b/media-gfx/jhead/ChangeLog
index cfd0ab8a898d8a03ee873c7588639a1b7f09fd3f..bcbd06736ba912d66229197ebc0b00b0277182b2 100644 (file)
--- a/media-gfx/jhead/ChangeLog
+++ b/media-gfx/jhead/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/jhead
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.24 2005/09/13 17:02:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/ChangeLog,v 1.25 2005/11/10 18:15:19 vanquirius Exp $
+
+  10 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> jhead-2.2.ebuild,
+  jhead-2.4.ebuild:
+  Inherit toolchain-funcs to get CC for 2.2 and 2.4. Marking 2.2 x86 stable
+  for bug 110242, on Renat Lumpau's <rl03 at gentoo dot org> request.
 
   13 Sep 2005; Aron Griffis <agriffis@gentoo.org> jhead-2.2.ebuild:
   Mark 2.2 stable on alpha

diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 2fd8f90668fc7fd8dbc75a09144b2c560e3d8847..adab9bff52cc25b078bb49f853d49c7b6cb68bd1 100644 (file)
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,9 +1,9 @@
-MD5 7c442c24e3c0ea8b5cef31f731c8bedf jhead-2.2.ebuild 750
-MD5 199a5521e9c8ee57b65c95babc67efd5 jhead-2.4.ebuild 822
+MD5 56963d2de901ca65f3fa7d2898b890d6 jhead-2.4.ebuild 865
 MD5 4609656bb2447d6d858e23376fe1cb83 jhead-2.0.ebuild 647
+MD5 3cf2d38b8e2e389c0096da7033de7b80 jhead-2.2.ebuild 801
+MD5 5b73742a5af7902c9ad38c5534a5b8c0 ChangeLog 3033
 MD5 daf676490886bcebc03a96609cd21923 metadata.xml 227
-MD5 05f98717257b97d1fad3a7b54a2516db ChangeLog 2794
-MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
+MD5 7b4626f3d33f81e78651e4e78cd6032c files/jhead-2.4-gcc4.diff 5559
 MD5 d2ee1c3e7a9ca19f96c0f78ee48cbc9a files/digest-jhead-2.0 60
+MD5 914162d5ed1fd8cf9f24104fff013410 files/digest-jhead-2.2 60
 MD5 89f78d6efa8594f34ceb1a4a20b61803 files/digest-jhead-2.4 60
-MD5 7b4626f3d33f81e78651e4e78cd6032c files/jhead-2.4-gcc4.diff 5559

diff --git a/media-gfx/jhead/jhead-2.2.ebuild b/media-gfx/jhead/jhead-2.2.ebuild
index 9aa188993b8f981351701d9fd79f478af363bded..34f3183c9fdedd5a3e84c4a2cbde42d2320ee4c6 100644 (file)
--- a/media-gfx/jhead/jhead-2.2.ebuild
+++ b/media-gfx/jhead/jhead-2.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.2.ebuild,v 1.6 2005/09/13 17:02:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.2.ebuild,v 1.7 2005/11/10 18:15:20 vanquirius Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
@@ -8,7 +10,7 @@ SRC_URI="http://www.sentex.net/~mwandel/jhead/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ~ppc-macos ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~ppc ~ppc-macos ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
@@ -20,6 +22,7 @@ src_unpack() {
 }
 
 src_compile() {
+       export CC="$(tc-getCC)"
        emake || die
 }
 

diff --git a/media-gfx/jhead/jhead-2.4.ebuild b/media-gfx/jhead/jhead-2.4.ebuild
index 9dca654feb85c1ea2efa2f391eb030a121c9b834..5afca1eb4d9ffec8dbc9033cf7f64b286f4247ee 100644 (file)
--- a/media-gfx/jhead/jhead-2.4.ebuild
+++ b/media-gfx/jhead/jhead-2.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.4.ebuild,v 1.1 2005/09/10 19:04:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/jhead/jhead-2.4.ebuild,v 1.2 2005/11/10 18:15:20 vanquirius Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
 HOMEPAGE="http://www.sentex.net/~mwandel/jhead/"
@@ -18,11 +18,12 @@ RDEPEND="virtual/libc
 
 src_unpack() {
        unpack ${A}; cd ${S}
-       epatch ${FILESDIR}/${P}-gcc4.diff
+       epatch "${FILESDIR}"/${P}-gcc4.diff
        sed -i "s:-O3 -Wall:${CFLAGS}:" makefile || die
 }
 
 src_compile() {
+       export CC="$(tc-getCC)"
        emake || die
 }