Respect CFLAGS/LDFLAGS when building plugins, bug #333975

Package-Manager: portage-2.2_rc73/cvs/Linux x86_64

3 files changed, 34 insertions, 15 deletions

diff --git a/x11-misc/keytouch/ChangeLog b/x11-misc/keytouch/ChangeLog
index d50eac4910b7..10dc8bacc1c4 100644
--- a/x11-misc/keytouch/ChangeLog
+++ b/x11-misc/keytouch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/keytouch
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.18 2010/01/10 08:17:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.19 2010/09/03 08:43:30 nyhm Exp $
+
+  03 Sep 2010; Tristan Heaven <nyhm@gentoo.org> keytouch-2.4.1.ebuild:
+  Respect CFLAGS/LDFLAGS when building plugins, bug #333975
 
   10 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> keytouch-2.4.1.ebuild:
   Bug #283320 cleanup: linux_config_exists before linux_chkconfig*.
diff --git a/x11-misc/keytouch/Manifest b/x11-misc/keytouch/Manifest
index 0c603604a478..0e2efc42ac8c 100644
--- a/x11-misc/keytouch/Manifest
+++ b/x11-misc/keytouch/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX keytouch 308 RMD160 385173862261870bfcae7d41649191b75bdc09d2 SHA1 9d70972cb23a232bb6089a8a6c1a987ff4960f8d SHA256 d90ca27fe293c463951000c24c366989cbaabadc3d476081848c9c31499626b3
 AUX keytouch-2.4.1-glibc28.patch 1023 RMD160 e8bcd25a6d61723c20d34b499d14bd4b2484522a SHA1 939c0d793e1578dd29e757a1b3ad5380a12c2d3a SHA256 ce6f228c237105ec8f022efcc4ff51ae35f08c397c0add548a0b2c096561fc21
 AUX keytouch-acpid 567 RMD160 e3e0b3d948671fc86c807c3e5082d5c934c7edde SHA1 e7f8541ce8f6d973c86976ef415ed244a408404e SHA256 080600fea04dab6a4fbedbdb1258960c69ae23d08016f7e01e51b4515d4650e6
 DIST keytouch-2.4.1.tar.gz 864995 RMD160 a135a654f349bef965bebc326f593bee70246a6b SHA1 f1f26dc95c21afd404aebe2b1066e75c8313ca80 SHA256 e9c1ff73c3912e161e7b556f22d659bb6adde4ae0cb0144449ffcd7fdcd97b5b
-EBUILD keytouch-2.4.1.ebuild 2335 RMD160 43ce61e4052e2a6581f7837175e73829171cc130 SHA1 79fce1dc4630c2f4769712e4a99cc31f62748548 SHA256 3bdc57f87dfe367f15c52f1420cc22a858b21eff36a5f942657431bfe5e03bd7
-MISC ChangeLog 2472 RMD160 9f451a4296e84912f51be2c742cddf0ca9a41bee SHA1 d4eb23d2bf2b5882390be9d799bde3e29061e102 SHA256 5e2900a0e3fb9312ab4c2f41d0ebfd6ab41eaebbf32b09136cea820bc5543d68
+EBUILD keytouch-2.4.1.ebuild 2421 RMD160 38ea3f0d2fdd229414e206e1551a9eef03876a55 SHA1 0f6d3a5ec78ad6f9a0113427efdfd61ca198ca11 SHA256 a15becdf2fc8d9394dbe77614a5e33ca02ceb327835797ecbe5ea1d72194560b
+MISC ChangeLog 2601 RMD160 31f7fc5f1cf81950f7d8028c93ae6b7561bb874e SHA1 3f3e4f1b86c6ac5fefcc02b40b38fdde54f38b18 SHA256 9481133c774e311ce25758c55cb98b89ddf5a3f06c5a266e39fd7ed111f894d8
 MISC metadata.xml 253 RMD160 33155d552badd3133f93e25bfcd82b62d296deb9 SHA1 b30245f00aae656e7a024b2ab4b8ad8e5549250f SHA256 2ddc2634b7e897546998869bcf0803bfbf4940cb75da9e45a2a8f421b4dabfd3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyAtTcACgkQdz7hIScOURFO5ACg9emk5HZMMTjHbZXirV+TGoz/
+GlcAn0kQwd87sFbbihge/QfVi8aruS/R
+=5sqQ
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/keytouch/keytouch-2.4.1.ebuild b/x11-misc/keytouch/keytouch-2.4.1.ebuild
index 6636c9fa075b..cb8c933b23f4 100644
--- a/x11-misc/keytouch/keytouch-2.4.1.ebuild
+++ b/x11-misc/keytouch/keytouch-2.4.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v 1.3 2010/01/10 08:17:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v 1.4 2010/09/03 08:43:30 nyhm Exp $
 
+EAPI=2
 inherit eutils linux-info
 
 DESCRIPTION="Easily configure extra keyboard function keys"
@@ -30,26 +31,35 @@ RDEPEND="${RDEPEND}
 	) )
 	!kde? ( x11-libs/gksu )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-glibc28.patch
 	sed -i \
 		's/install-data-local//1' \
 		keytouch{-acpid,d,-init}/Makefile.in \
 		|| die "sed failed"
+	sed -i \
+		-e '/^CFLAGS/s:\(.*\)=\(.*\)-O2:\1+=\2$(LDFLAGS):' \
+		{mxml,plugins}/Makefile.in \
+		|| die "sed failed"
 }
 
-src_compile() {
+d_iter() {
 	local d
 	for d in . keytouch-config keytouch-keyboard ; do
 		pushd ${d} > /dev/null
-		econf || die
-		emake || die "emake ${d} failed"
+		eval "${1}"
 		popd > /dev/null
 	done
 }
 
+src_configure() {
+	d_iter 'econf'
+}
+
+src_compile() {
+	d_iter 'emake || die "emake ${d} failed"'
+}
+
 src_install() {
 	if use acpi ; then
 		newinitd "${FILESDIR}"/${PN}-acpid ${PN} || die "newinitd failed"
@@ -62,11 +72,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog
 
-	local d
-	for d in . keytouch-config keytouch-keyboard ; do
-		emake -C ${d} DESTDIR="${D}" install \
-			|| die "emake install ${d} failed"
-	done
+	d_iter 'emake DESTDIR="${D}" install || die "emake install ${d} failed"'
 }
 
 pkg_postinst() {