Fix building with USE="-lirc" when lirc is installed wrt #317605.

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

diff --git a/media-sound/rosegarden/ChangeLog b/media-sound/rosegarden/ChangeLog
index 360c51be7004d5a72dcebf07f9b03d338f850c4d..75cbd73a1af72d857a2dd4d10e1b0ec821890f81 100644 (file)
--- a/media-sound/rosegarden/ChangeLog
+++ b/media-sound/rosegarden/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/rosegarden
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.73 2010/04/28 06:12:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/ChangeLog,v 1.74 2010/04/28 09:04:33 ssuominen Exp $
+
+  28 Apr 2010; Samuli Suominen <ssuominen@gentoo.org>
+  rosegarden-10.04.ebuild:
+  Fix building with USE="-lirc" when lirc is installed wrt #317605.
 
 *rosegarden-10.04 (28 Apr 2010)
 

diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index 1d692e4a1deb75b606c37bfb4deb640d31e95e14..363e90141ddfbaec3fb53efe6b678e758fb1ef9b 100644 (file)
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -4,6 +4,6 @@ DIST rosegarden-10.02.1.tar.bz2 6188839 RMD160 53a7b48e1bba5e5c7ac98eee096f39602
 DIST rosegarden-10.04.tar.bz2 5926499 RMD160 8a5406ec5ab0a08701748a8261410018790ec65b SHA1 dd81e94ddf43464b0f04ee421a88ae08d0a49f5a SHA256 ee48f59c32d2773413a2450607db4a89b3b4437b3c2d7f166a6997306650cfdf
 EBUILD rosegarden-10.02.1.ebuild 1265 RMD160 57002c59c35011793ca1cf3cd4c9b9ed33f7cc0b SHA1 bd6226ca1837b1b7a6e17b2cde86eadcb6de2cf0 SHA256 6df6e9fca1a8109b54532ac4b9e4d9add83c1fa4780a415297c7fa94bb51d7f6
 EBUILD rosegarden-10.02_beta.ebuild 1223 RMD160 c49aee87a63fa9617330e8f3bfee641ed7ff3429 SHA1 bce4b8f285e33a6234ead634b6d44d13201b1fe7 SHA256 cccafa81b64eae539f9403b470afc8fd4c2becc44a24f5a541c6f9904a2eed08
-EBUILD rosegarden-10.04.ebuild 1361 RMD160 d1db456a29c4a0509eacc0b4d527cb51c4d4e1ba SHA1 b6a25b9d7c3e8ff991dce0acc7f68da9e9c3893b SHA256 cccd81714cd66972b61f4e7dd77f510ad0ba4dd0806dfe562218adf18d99da58
-MISC ChangeLog 11461 RMD160 79822ba78f3e8becfc387a69175b65923db18640 SHA1 e86cf9ebca73f369ab99d8bf8655315586b60eb8 SHA256 b558c636eae030746002e267189730107532bebaac999697e5c12651348c6eba
+EBUILD rosegarden-10.04.ebuild 1414 RMD160 68150228d2a382678c351f9e9e378797f747d7cc SHA1 6cd6a41d9191ee9e821c96c7659ceba1abdda96a SHA256 043e1169879b686df3795dca3f9cf64f856f7b5f39871f0e919d03c667adb494
+MISC ChangeLog 11611 RMD160 e95c39f299398ce45fad77033b52c0f5167bba1d SHA1 ebc647549b61be68224674bd2dc3739aff9cad43 SHA256 123be5605653a78d98eded2b9b8e420f613bc8721d16a24927f1098877914e16
 MISC metadata.xml 163 RMD160 c2b208c0913f8c5bd1148627b5c3c9e37b53060a SHA1 4195ac5ca8352b0f52be6ed92640e4365be5bf0d SHA256 39a67c65d2e7583b6ee9e20fcab1fd821e28c51134eb2f76a7fe0598a2c2b4cb

diff --git a/media-sound/rosegarden/rosegarden-10.04.ebuild b/media-sound/rosegarden/rosegarden-10.04.ebuild
index d1d32b598b67bd88f97ccb3264fb5b8c8406225b..da168f1ed148c09e525a2178306a822214cb8ebd 100644 (file)
--- a/media-sound/rosegarden/rosegarden-10.04.ebuild
+++ b/media-sound/rosegarden/rosegarden-10.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.04.ebuild,v 1.1 2010/04/28 06:12:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rosegarden/rosegarden-10.04.ebuild,v 1.2 2010/04/28 09:04:33 ssuominen Exp $
 
 EAPI=2
 inherit autotools fdo-mime multilib
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
        if ! use lirc; then
                sed -i \
+                       -e '/AC_CHECK_HEADER/s:lirc_client.h:dIsAbLe&:' \
                        -e '/AC_CHECK_LIB/s:lirc_init:dIsAbLe&:' \
                        configure.ac || die
        fi