Fix issue with 2 Main.cc files and respect for CXXFLAGS. Thanks to xarthisius.

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

4 files changed, 36 insertions, 12 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index 31d104a6314c..03a9610943ec 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/wbar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.7 2011/03/13 15:12:35 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.8 2011/03/14 21:18:10 signals Exp $
+
+  14 Mar 2011; Kevin McCarthy <signals@gentoo.org> wbar-2.1.1.ebuild,
+  files/wbar-2.1.1-as-needed.patch:
+  Fix issue with 2 Main.cc files and respect for CXXFLAGS. Thanks to
+  xarthisius.
 
   13 Mar 2011; Kevin McCarthy <signals@gentoo.org> wbar-2.1.1.ebuild,
   +files/wbar-2.1.1-as-needed.patch:
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index a73bec0718c5..6c4ea71fe02f 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,11 +1,11 @@
 AUX wbar-1.3.3-Makefile.patch 1508 RMD160 a7416d94a67f820f96316e8273da32c12dbdfb9a SHA1 63337c992f0093d43c3c440c0ff775f932f89bc3 SHA256 58ca7d843ed96a0fccfb49af0a9f052f3182eadad6383ff9315dfa96d4aeaf1d
 AUX wbar-1.3.3-gcc43.patch 615 RMD160 d8eec115fa99059e4db63a6dda382fa6b03e79a4 SHA1 f60366d437db34d39b5c8a9c363b2333a6652d24 SHA256 5ad3425e4ba870166f1b410499b912daa1e0120e0a88fbd6f5a7f23f96c5d5cf
-AUX wbar-2.1.1-as-needed.patch 475 RMD160 392bb254226e9b630aacf290fef53fde2c528822 SHA1 392eee27e281fbe93b811187038834dc4832ed7c SHA256 e5a8837468719d2f7c3931e2ec7fabc8dbeaa0207c5491df1554e80fd11ca6b6
+AUX wbar-2.1.1-as-needed.patch 913 RMD160 470be02e1ccaf8689da8681eaf20439cef91f5cd SHA1 e16fefc2c5b10b3fdd51ab78e3b205985d16aa4c SHA256 e45812064681ca4b8b993dbb21ae57fb85936f354ca1e2fabdb6c835ca474d23
 AUX wbar-2.1.1-fix-warnings.patch 1027 RMD160 d17bc2025b45ed14deb61ddd98fae7fd60deb234 SHA1 686130080cb849756d2718a879fa86f4266643cd SHA256 10ab8e71aa1d1d635ad2d7bbf026d22a0a78732d63cacb8423686f6f59595a54
 AUX wbar-2.1.1-opt-config.patch 1221 RMD160 03c65c8cb9d12d43249f9bd61ce3130603826dc4 SHA1 8707315c44710eccbb93dc6da93d5421f7437b9e SHA256 e1d0e0ff0c95a2bf84f92c54b523aaaa9c72755a54de14514d26d7c19d5a409e
 DIST wbar-1.3.3.tbz2 429098 RMD160 9edda727b6701af71763ea7df25c370757c08f3b SHA1 743dff28bd7d2d37523a1314b6f4c9320f109f48 SHA256 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee550cae381ba64cb79eb4b
 DIST wbar-2.1.1.tar.gz 579693 RMD160 fa24ddc8217302b60a9d87715d4ea79b92438621 SHA1 52718df8d57f48abda01647d0252d58bf98d8c7a SHA256 9a619767595a1e61a69c9cfbd1f29afd62c9ed2edc748e87b4f47c2b0bbf3e18
 EBUILD wbar-1.3.3.ebuild 914 RMD160 c880974a454d8348e4df13df00d67596233be998 SHA1 b09380267eb32ea34f91b00e43f3eb2daaf723a8 SHA256 850aaacde34f32017067b52a5a6fd2bce1ffa53dfeec0ba95c6cf77df8cfe4e4
-EBUILD wbar-2.1.1.ebuild 1277 RMD160 3893b3b7bb22bbfd1ad43da3979bfd7934b9ed93 SHA1 fcaa6a76ff38dfcf909d10a4116a69fd55622b89 SHA256 40f9ebe624c98124f9162e3291c2b258397972bc4de0a0d41dcb0a8644c1e27d
-MISC ChangeLog 1405 RMD160 39d11d6bd02910fdeac4be02978ccc506afe9c9e SHA1 4a49c51db4bda4332b0b9a93aada5921e74a5bde SHA256 f573c86d78d0285e5a5f956c82a05b10aa346c4e8cc126911af0f969fa7a8eae
+EBUILD wbar-2.1.1.ebuild 1450 RMD160 0a1a779470a9bb24285f27f1a7bb92444d8e4a65 SHA1 1ed6ebfc78f689396929b0eaa4de5ab41a93622a SHA256 caec624f1f6752c9862e5ec53c745ddbe0a26c805f2a8ad6c0a25eba6dc2877b
+MISC ChangeLog 1595 RMD160 6b1cc83fc10bad24716820a7a2e4e2588958b9dc SHA1 57e62e9527f5bea7cd330155882ecc6b8058dca0 SHA256 bf3def46a8d032130f3685a01e7c6c91b9b518b034a6237cdaa07e6acfdb3293
 MISC metadata.xml 352 RMD160 ffdf34658cdb5eeee016af1eebb4ff0462c003ed SHA1 b0fc4e372dc02c88d08a0786693a901d805509a3 SHA256 8d748a544a218b994c3478cd8821991f1af935361c0387c8e05c988f93b2efb4
diff --git a/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch b/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
index b0d1fba7f2bf..93fc68a4991c 100644
--- a/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
+++ b/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
@@ -1,17 +1,33 @@
-Put LIBS in LDADD instead of LDFLAGS so --as-needed works.
+Fix automake issues with having two Main.cc
+Fix building with --as-needed
 
-Patch by Kevin McCarthy <signals@gentoo.org>
+https://bugs.gentoo.org/358557
+
+Patch provided by xarthisius@gentoo.org
 
 --- src/Makefile.am
 +++ src/Makefile.am
-@@ -41,8 +41,8 @@
+@@ -22,7 +26,7 @@
+ $(top_srcdir)/src/config/Run.cc \
+ $(top_srcdir)/src/config/Functions.cc \
+ $(top_srcdir)/src/config/Functions.h \
+-$(top_srcdir)/src/config/Main.cc \
++$(top_srcdir)/src/config/Main-config.cc \
+ $(UTILS)
+ 
+ UTILS = \
+@@ -36,9 +40,11 @@
+ $(top_srcdir)/src/utils/OptParser.h \
  $(top_srcdir)/src/utils/i18n.h
  
- wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
+-wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
 -wbar_LDFLAGS = @modules_LIBS@
-+wbar_LDADD = @modules_LIBS@
++AM_CPPFLAGS = -I$(top_srcdir)/src/utils
  
- wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
+-wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
 -wbar_config_LDFLAGS = @gui_modules_LIBS@
++wbar_CXXFLAGS = @modules_CFLAGS@
++wbar_LDADD = @modules_LIBS@
++
++wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
 +wbar_config_LDADD = @gui_modules_LIBS@
- 
diff --git a/x11-misc/wbar/wbar-2.1.1.ebuild b/x11-misc/wbar/wbar-2.1.1.ebuild
index 16d87efc6e24..dfff9622dc84 100644
--- a/x11-misc/wbar/wbar-2.1.1.ebuild
+++ b/x11-misc/wbar/wbar-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.1.1.ebuild,v 1.2 2011/03/13 15:12:35 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.1.1.ebuild,v 1.3 2011/03/14 21:18:10 signals Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -42,7 +42,10 @@ src_prepare() {
 		sed -i -e '5,8d' \
 			etc/wbar.cfg.in || die "Removing wbar-config from cfg"
 	fi
+	sed -i configure.ac -e "/^CPPFLAGS/d" || die #respect flags
 	eautoreconf
+	# Fix build issue reported by xarthisius
+	mv "${S}"/src/config/Main.cc "${S}"/src/config/Main-config.cc || die
 }
 
 src_configure() {