Explicitly knock DISABLE_SINGLE_INCLUDES out of the compiler flags as this will not...

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

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 29af5906da9a2bd04b463e6ca526d6d9e854d3d1..b9d722d21b594267f22458f5763e309a30e1619c 100644 (file)
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.125 2010/06/13 19:20:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.126 2010/06/14 00:52:35 chainsaw Exp $
+
+  14 Jun 2010; <chainsaw@gentoo.org> gnome-power-manager-2.30.1.ebuild:
+  Explicitly knock DISABLE_SINGLE_INCLUDES out of the compiler flags as this
+  will not work correctly with stable libunique. Herd ack by leio on IRC.
 
 *gnome-power-manager-2.30.1 (13 Jun 2010)
 

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild
index 6ad23c80b06df24397ac0c93466fc7115eed0d51..3a1c9b12ceca7a6b2836c266699086fe2cb8da67 100644 (file)
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.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/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild,v 1.1 2010/06/13 19:20:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.30.1.ebuild,v 1.2 2010/06/14 00:52:35 chainsaw Exp $
 
 EAPI="2"
 
@@ -76,7 +76,9 @@ src_prepare() {
 
        # Fix crazy cflags
        sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-               || die "sed 1 failed"
+               || die "sed 1a failed"
+       sed 's:-DG.*DISABLE_SINGLE_INCLUDES::g' -i configure.ac configure \
+               || die "sed 1b failed"
 
        # Drop debugger CFLAGS
        sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' -i configure.ac \