Version bump.

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

4 files changed, 101 insertions, 9 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index 0b24b554a80a..9eb863d46246 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2011/04/15 20:11:55 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.10 2011/05/06 13:56:14 signals Exp $
+
+*wbar-2.1.3 (06 May 2011)
+
+  06 May 2011; Kevin McCarthy <signals@gentoo.org> +wbar-2.1.3.ebuild,
+  +files/wbar-2.1.3-as-needed.patch:
+  Version bump.
 
   15 Apr 2011; Kevin McCarthy <signals@gentoo.org> wbar-2.1.1.ebuild:
   Removed -Werror from CFLAGS.
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 9d592e18086c..fc6ba61e87fb 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -6,20 +6,23 @@ AUX wbar-1.3.3-gcc43.patch 615 RMD160 d8eec115fa99059e4db63a6dda382fa6b03e79a4 S
 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
+AUX wbar-2.1.3-as-needed.patch 1005 RMD160 a7276428843cbc5015f74c008f9f8fccea3633f1 SHA1 541dbac51b44cf6af3745d93cc8f4a340de55da9 SHA256 75cce10fe3e4d6488b3b0a9881916634e92b5d09cbfc07000f350392847ec13d
 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
+DIST wbar-2.1.3.tar.gz 368531 RMD160 cced1418b13770931fec88909d906a3fbf5f4b99 SHA1 68a8c5abb6fde59311d2172eef1f16968a81c8c1 SHA256 380458e6953023f233d744dbc805dd593fc42732df3bc8a19ddb1f5d402e2337
 EBUILD wbar-1.3.3.ebuild 914 RMD160 c880974a454d8348e4df13df00d67596233be998 SHA1 b09380267eb32ea34f91b00e43f3eb2daaf723a8 SHA256 850aaacde34f32017067b52a5a6fd2bce1ffa53dfeec0ba95c6cf77df8cfe4e4
 EBUILD wbar-2.1.1.ebuild 1510 RMD160 26a104eb3a5174a60d5fcc114a5948343cfe31b7 SHA1 c6ada0630311e4856a60f3c3b12b8a65413b9f30 SHA256 e515a9edfe36986472e3612b20b9ad46ed66d941b3cc4136b8251645059b9bb6
-MISC ChangeLog 1697 RMD160 3c323511b1371eec1cb1ab01a7470c34660f9d5c SHA1 79986d32940650bd9a5fa1e3c28df47f363e5c5f SHA256 c730e516f606f7ee1c3c97f5a145d8cefdbdf49d246a6bafe1e34467bb656348
+EBUILD wbar-2.1.3.ebuild 1237 RMD160 16f846843b0504bcb435dd01de32b0db62ac41e3 SHA1 5aff63c1698a8cbc5c8ce9d8154b562f6262b5e8 SHA256 84f71e6de11ebe955633c112b9697b65257bac3d25015c421a07e41cfea686cd
+MISC ChangeLog 1850 RMD160 a544e110ec7345f94a5c9ea90f50765006d2ee5b SHA1 8d63bc8a83fdb1e0d942b3389d02eb220af247b7 SHA256 39d4f7851a2c4151dfeb569f94071c98ff26e477c0dd49fb9850a0455a520440
 MISC metadata.xml 352 RMD160 ffdf34658cdb5eeee016af1eebb4ff0462c003ed SHA1 b0fc4e372dc02c88d08a0786693a901d805509a3 SHA256 8d748a544a218b994c3478cd8821991f1af935361c0387c8e05c988f93b2efb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNqKaXAAoJEMxKBLrQri3oYzMIAIGRiNPp9ej3zri5hchFEvC4
-BqDHhxMvycA4zIKwtwpfpVEqbUaeX5bU+cwCFXo0nh5KmMM7Djx7DbRzKv9bAsC9
-QBPs+hfDI5RObS/AVuFj71O+ZAVweL0MoI69U7GSFhS+r63xSZj4mRdXel6vt2n0
-5vAAR4AY31xHTstjIchu95vSwB388yHlSL/0rC5A38QjgdCKZGZko15AYDf1OlI0
-bdfZZn+pBvxedKob+QXSuRJ/qx18aCx6KxkseTHgM0NtRSaXgqiv39vqE/L6zHLh
-1EQ1aCR1EvdECy+WxlX9ejYaHMq4r/ZwS49dIbrbDa+ezMBn753AmPyamT/dNpM=
-=/leH
+iQEcBAEBCAAGBQJNw/4HAAoJEMxKBLrQri3ouqoIAJYuOHkexxGoZK8h7rb+KXWa
+/1s+4GCLm4zroVPJ9lH/v8aLB3noDUIeoWf2W0nYgbSP99CWLkLxlyhRYwfaLZHQ
+IdWw/oF2xS49xwCmVgv8/Aj6z8THUnGJ95Iwuj7LgxHN5Q6ZdcGODxSULgzrUB7D
+lTau340PKKphXMttCkiaZ/BmRteel+m9PK+m6V7L9k0xGplpLLhnNiNTniBwPbhm
+Szpv54qRXbqFERccdTMsiolm4d0nW5cRCdwAimP4pMtp44k8akozwa5wMlmD2er1
+vMFgxrnSra5zCLHe6Y7JDpy+Bv/QdV7uU9qaxw6aG3UVB7+WOPDoVtoDDQWGO2w=
+=JUk9
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch b/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch
new file mode 100644
index 000000000000..3e917a670e0b
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch
@@ -0,0 +1,36 @@
+Fix automake issues with having two Main.cc
+Fix building with --as-needed
+
+https://bugs.gentoo.org/358557
+
+Patch provided by xarthisius@gentoo.org for 2.1.1
+Patch adapted to 2.1.3 by Kevin McCarthy <signals@gentoo.org>
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -27,7 +27,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)
+ endif
+ 
+@@ -42,11 +42,12 @@
+ $(top_srcdir)/src/utils/OptParser.h \
+ $(top_srcdir)/src/utils/i18n.h
+ 
+-wbar_CPPFLAGS = @modules_CFLAGS@ -I$(top_srcdir)/src/utils
+-wbar_LDFLAGS = @modules_LIBS@
++AM_CPPFLAGS = -I$(top_srcdir)/src/utils
++wbar_CXXFLAGS = @modules_CFLAGS@
++wbar_LDADD = @modules_LIBS@
+ 
+ if WBAR_CONFIG
+-wbar_config_CPPFLAGS = @gui_modules_CFLAGS@ -I$(top_srcdir)/src/utils
+-wbar_config_LDFLAGS = @gui_modules_LIBS@
++wbar_config_CXXFLAGS = @gui_modules_CFLAGS@
++wbar_config_LDADD = @gui_modules_LIBS@
+ endif
+ 
diff --git a/x11-misc/wbar/wbar-2.1.3.ebuild b/x11-misc/wbar/wbar-2.1.3.ebuild
new file mode 100644
index 000000000000..efe1282a965a
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.1.3.ebuild
@@ -0,0 +1,47 @@
+# 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.3.ebuild,v 1.1 2011/05/06 13:56:14 signals Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A fast, lightweight quick launch bar."
+HOMEPAGE="http://code.google.com/p/wbar/"
+SRC_URI="http://wbar.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="media-libs/imlib2
+	x11-libs/libX11
+	gtk? ( dev-libs/atk
+		dev-libs/glib:2
+		dev-libs/libxml2
+		gnome-base/libglade
+		media-libs/fontconfig
+		media-libs/freetype
+		media-libs/libpng
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool"
+
+src_prepare() {
+	epatch	"${FILESDIR}"/${P}-as-needed.patch
+	if ! use gtk; then
+		# Remove wbar-config from default cfg.
+		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 (See as-needed.patch)
+	mv "${S}"/src/config/Main.cc "${S}"/src/config/Main-config.cc || die
+}
+
+src_configure() {
+	econf --bindir=/usr/bin $(use_enable gtk wbar-config)
+}