Respect CC,CFLAGS,LDFLAGS wrt bug 334661. Thanks to Diego for the report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 32 insertions, 13 deletions

diff --git a/x11-misc/xkeycaps/ChangeLog b/x11-misc/xkeycaps/ChangeLog
index fd4a0a488915..7a85bf38fd7b 100644
--- a/x11-misc/xkeycaps/ChangeLog
+++ b/x11-misc/xkeycaps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/xkeycaps
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.20 2008/12/07 21:09:06 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.21 2010/08/27 17:04:29 xarthisius Exp $
+
+*xkeycaps-2.47-r1 (27 Aug 2010)
+
+  27 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> -xkeycaps-2.47.ebuild,
+  +xkeycaps-2.47-r1.ebuild:
+  Respect CC,CFLAGS,LDFLAGS wrt bug 334661. Thanks to Diego for the report.
 
 *xkeycaps-2.47 (07 Dec 2008)
 
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index feb315f429d0..ee4a0fe38878 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Imakefile.patch 664 RMD160 c7cf1a22e3dec7b9290ee84a8706698c06473763 SHA1 86cf5c126d4c52587edba70808c7efd7882d2f26 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935
 AUX xkeycaps-2.47-Imakefile.patch 758 RMD160 f73a937628fb10e769f05151293037679c2a5abc SHA1 8f418e41ad43ef3df0605f8a0b2ea75bcc9ea526 SHA256 6d82c2e6cfcdc12c27a64ea690485ae1b7ab8fbe2d678bbb0fafe2a4d60f38d6
 AUX xkeycaps-2.47-man.patch 639 RMD160 4c96acda11fc1ede4ff0a31bdc0b1d538f31eba4 SHA1 2980a0d0a79466ba1d72dc96a5b189c5fe9744e6 SHA256 c56ceda9483ebf96c040deff495a8c03a2a629c1a32d209817a331bd6182127b
 DIST xkeycaps-2.46.tar.Z 489439 RMD160 ee787ac4970204689ec54d14b6072235c7026acb SHA1 458133a394f63d84efacaf917254074005ce953d SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
 DIST xkeycaps_2.47.orig.tar.gz 351418 RMD160 52c5b817df837797595253409b25178acd014b3f SHA1 a018f8529f7199c818a7aea5e252b08622f90b7d SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
 EBUILD xkeycaps-2.46.ebuild 999 RMD160 9fcde8b88d17847c4436aec34cbd6c0f9f8e01d5 SHA1 b3c3962a9291469cf56cebacdf9da8c26b06b9a2 SHA256 96c2ee7cfe70883e43098ff46d2a26abf1501046c9ec13be8592d2f67423e6bf
-EBUILD xkeycaps-2.47.ebuild 1081 RMD160 1b24c57d29014302626b6f85016f146901b5b5ce SHA1 500efaa768591158250ed7b215a2db848197f541 SHA256 d7a2f5b3a45a373e87868aab1727ffc23c7995bcdf1daad51b3539711a318130
-MISC ChangeLog 2564 RMD160 989f9227077d62159e82b6abdffac3712586e818 SHA1 f0a7ccfca3a16feeca463030542a816c0f270f41 SHA256 9a329e9cf830a9d6c702ee8d6774267045449fa42e438246d317f21bf134270f
+EBUILD xkeycaps-2.47-r1.ebuild 1119 RMD160 0c8ff48e92705313e7e2150e2d034e88557b8610 SHA1 b347db22669ed11d85b22e4fb37f18302b1c5628 SHA256 2fdeae387ac18777c55cf832761a97667e9b34baa94e14f686e794a644e956b8
+MISC ChangeLog 2780 RMD160 225ae6c2a9dd18d8a6224e2c0fffa7b49132af3a SHA1 e778072eff11ad45b3acb5cf0f94620f23f97c90 SHA256 7605737a3c130d0a2c9363229d581370a242d743521040bdd323297f93fb31ae
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iJwEAQECAAYFAkx38CcACgkQIiMqcbOVdxQH7AP+JPBUsdtKdA5hQWGvIe6BGG/G
+oS28R6GnH349jv7o/O4qymFnijBkkeM1PtHJBsvl21KhYRuoQYBoOKcrl+JMVwjV
+UKk9RRiWXq+3ZII4ntJfwX41VOxI4IRMq/FJeAAfuokWMK6A1oOV+kt3sAcqnTSz
+AbIOrK8/CLq8CT9RBOk=
+=g1OJ
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
index 589e8e3e1acd..841cca8c90ea 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.47.ebuild,v 1.1 2008/12/07 21:09:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild,v 1.1 2010/08/27 17:04:29 xarthisius Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="GUI frontend to xmodmap"
 HOMEPAGE="http://packages.qa.debian.org/x/xkeycaps.html"
@@ -32,14 +32,15 @@ src_unpack() {
 }
 
 src_compile() {
-	xmkmf || die "xmkmf failed."
+	xmkmf || die
 	sed -i -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \
-		Makefile || die "sed failed."
-	emake || die "emake failed."
+		Makefile || die
+	emake EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" || die
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	newman ${PN}.man ${PN}.1
-	dodoc README *.txt
+	emake DESTDIR="${D}" install || die
+	newman ${PN}.man ${PN}.1 || die
+	dodoc README *.txt || die
 }