Export CC so full compiler name is used. Missing libXpm depend wrt #371213 by Piotr Szymaniak

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

3 files changed, 34 insertions, 21 deletions

diff --git a/app-editors/ted/ChangeLog b/app-editors/ted/ChangeLog
index 3792af336c12..1175cfeb28ec 100644
--- a/app-editors/ted/ChangeLog
+++ b/app-editors/ted/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/ted
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.41 2011/10/04 21:35:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.42 2011/10/06 17:44:12 ssuominen Exp $
+
+  06 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> ted-2.21.ebuild:
+  Export CC so full compiler name is used. Missing libXpm depend wrt #371213 by
+  Piotr Szymaniak
 
   04 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> ted-2.21.ebuild:
   x86 stable wrt bug #385205
diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest
index e52ac852eab1..f9dd370aa9ce 100644
--- a/app-editors/ted/Manifest
+++ b/app-editors/ted/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX ted-2.20-libpng14.patch 358 RMD160 3e09bd37e0a8c526ff0ac730dd412c035e24cf0f SHA1 a0151fa107b9f79a69268c28900418cec395eba7 SHA256 eb480afa89079204bf6f9c7bbe5d039b01a2b427284ffba69e5e7dceab5228ae
 AUX ted-2.21-libpng15.patch 13063 RMD160 590afc9fd434a906fc68a4984942ba8895cced06 SHA1 ffdc9edbe8babc5b3cddb660ae5fa603620fb5c2 SHA256 90ecc97cad8c04d310f1dee7752ca320ccc37a30073b1cd82146224a32f720be
 DIST ted-2.20.src.tar.gz 3903673 RMD160 e42fa339dcd8d7821c816bc2ed090617320dca70 SHA1 77f63421ca3e0472312febb39c9f2b1bf2a59a42 SHA256 5cc58ccb7bc38f7f0dacc1dfc836a43d35ac94a32cde54275b583b2e4d6f5335
 DIST ted-2.21.src.tar.gz 3956815 RMD160 68935d62d216708c7053910f1261353176cf5c72 SHA1 303b15de1fe97e473c4b89a88b6e127ee81e07e9 SHA256 6c4bdebb8980fac00cf71ebc6c5f9bddee8ae13ab2327125dda95aa6948b363a
 EBUILD ted-2.20.ebuild 1191 RMD160 cb8ce9f09290c9b0c67f2dbbb1ff09945ba34a3e SHA1 b75a00472c1326c365a2b5a2e8cc7781728935e9 SHA256 74c87c54ee065cf90316c13d48abe7682e91798af29c1d94bdf7eac0af1ee5e9
-EBUILD ted-2.21.ebuild 1196 RMD160 22649c4bbe951e362333e81f4922401aa8ac77bf SHA1 33edc056528d29072894f4128a88ac6a75178653 SHA256 5621363b1c2d204cf55d09400c0ba076ace5f194c4025c1603a417058f6c6bd0
-MISC ChangeLog 4907 RMD160 7eb1054f403b94a87507c8eea485c986ca297426 SHA1 a2d663b91124fd40f374b3f4b76d5b5041f14df3 SHA256 b974afc56a6fab56bbcef2e40b5bcc045492e609e3d466ae45884a106fb33e75
+EBUILD ted-2.21.ebuild 1203 RMD160 13ae61ba33cbf033861f7e463ec9d6b7752abcb9 SHA1 b50f899eac579224a099a353d21631cc97da76f4 SHA256 f5594c7ad626014ce44f8a28a393723c57bbf031e9f27a376eb51b79d91bca50
+MISC ChangeLog 5076 RMD160 710e59483e6dddb48a39074c73b056010442cc08 SHA1 3b9f75309976ef3b6097e1b666c2c705f69c4cc4 SHA256 f9ecc2f60768593c7639f33fb1c964f245b764f02758cd2f44a0411a694cfe19
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6LfBgACgkQuUQtlDBCeQJcOgCfVPDRpf19LSb+tRcLoroCI5nB
-LYgAn2EKAeBlyGsGxA2Tgk9p67R0PxaP
-=3phH
+iQEcBAEBAgAGBQJOjekPAAoJEEdUh39IaPFNiG0IAINcZAvLFXNvrVzR/zVlso4a
+GGE6BVcZjYSxlsPL+K8JN+AHQb/9oZXt19Tmg0JssKyedxgvwow2Zelayg0VjhiY
+DxhDQUHREFL5h8++0xKauNT/fZmI1mPPcvPdoAjPJpwlvHGBcl/lQMb5dy66w+1g
++nvq48JT6tWWyo9X4rz0NwpIpXpzagE9mzMwuRFUh44Lclj6L+oK1bEWQuMnUDsr
+ajZyqS2TyT/nMgjNrEJgeJ7A23m+TX4JiPnwf+5Z3b+IAeXtuud3uRszzVeHFElI
+3K61QAafyEVGQLO7Yhkmib/t0czso+cGBFRk+4bS7X0n5GEKtH63xaW/lPBvZMo=
+=Bxl2
 -----END PGP SIGNATURE-----
diff --git a/app-editors/ted/ted-2.21.ebuild b/app-editors/ted/ted-2.21.ebuild
index 127189f1f757..0000a83c79ec 100644
--- a/app-editors/ted/ted-2.21.ebuild
+++ b/app-editors/ted/ted-2.21.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.5 2011/10/04 21:35:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.6 2011/10/06 17:44:12 ssuominen Exp $
 
-EAPI=2
-inherit eutils
+EAPI=4
+inherit eutils toolchain-funcs
 
 DESCRIPTION="X-based rich text editor"
 HOMEPAGE="http://www.nllgg.nl/Ted"
@@ -14,11 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND="x11-libs/gtk+:2
-	>=media-libs/tiff-3.5.7
+RDEPEND="x11-libs/gtk+:2
+	media-libs/tiff
 	virtual/jpeg
-	>=media-libs/libpng-1.2.3"
-RDEPEND="${DEPEND}"
+	media-libs/libpng
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S=${WORKDIR}/Ted-${PV}
 
@@ -28,24 +30,27 @@ src_prepare() {
 	sed -i -e 's|/Ted/|/share/Ted/|' \
 		"${S}"/appFrame/appFrameConfig.h.in \
 		"${S}"/Ted/tedConfig.h.in || die
+
 	mkdir lib || die
 }
 
 src_configure() {
-	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage
-	do
+	tc-export CC
+
+	local dir
+	for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do
 		cd "${S}"/${dir}
-		econf --cache-file=../config.cache || die "configure ${dir} failed"
+		econf --cache-file=../config.cache || die "configure in ${dir} failed"
 	done
 }
 
 src_compile() {
-	emake package.shared || die "make package.shared failed"
+	emake package.shared
 }
 
 src_install() {
-	cd "${S}"/tedPackage
-	RPM_BUILD_ROOT=${D} ./installTed.sh COMMON || die "install failed"
+	cd tedPackage
+	RPM_BUILD_ROOT=${D} ./installTed.sh COMMON || die
 
 	dodir /usr/share
 	mv "${D}"usr/Ted "${D}"usr/share/Ted