Version bump. Fix underlinking wrt #367549. Thanks to Diego Elio Pettenò <flameeyes@gentoo.org> for the report. Drop old.

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

8 files changed, 22 insertions, 227 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index 9eb863d46246..ff1d9a4a13a9 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,15 @@
 # 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.10 2011/05/06 13:56:14 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.11 2011/05/17 10:54:41 xarthisius Exp $
+
+*wbar-2.2.1 (17 May 2011)
+
+  17 May 2011; Kacper Kowalik <xarthisius@gentoo.org> -wbar-2.1.1.ebuild,
+  -files/wbar-2.1.1-as-needed.patch, -files/wbar-2.1.1-fix-warnings.patch,
+  -files/wbar-2.1.1-opt-config.patch, -wbar-2.1.3.ebuild,
+  -files/wbar-2.1.3-as-needed.patch, +wbar-2.2.1.ebuild:
+  Version bump. Fix underlinking wrt #367549. Thanks to Diego Elio Pettenò
+  <flameeyes@gentoo.org> for the report. Drop old.
 
 *wbar-2.1.3 (06 May 2011)
 
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index fc6ba61e87fb..34646f5cbb45 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -1,28 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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 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
+DIST wbar-2.2.1.tar.gz 369545 RMD160 cbc82b7c56f9a72ca9d50bd494c4f302e12da880 SHA1 b68829964947702da9bb49f9afe66d66a866ddad SHA256 f022ecaf3a3d7ca2a26153a5f4a1c2044582c53fc260e74c470159820be31e5c
 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
-EBUILD wbar-2.1.3.ebuild 1237 RMD160 16f846843b0504bcb435dd01de32b0db62ac41e3 SHA1 5aff63c1698a8cbc5c8ce9d8154b562f6262b5e8 SHA256 84f71e6de11ebe955633c112b9697b65257bac3d25015c421a07e41cfea686cd
-MISC ChangeLog 1850 RMD160 a544e110ec7345f94a5c9ea90f50765006d2ee5b SHA1 8d63bc8a83fdb1e0d942b3389d02eb220af247b7 SHA256 39d4f7851a2c4151dfeb569f94071c98ff26e477c0dd49fb9850a0455a520440
+EBUILD wbar-2.2.1.ebuild 1105 RMD160 fa901a7a0f900ec3cec95d9cb5b4f2ad2c16e526 SHA1 b4c3204eb056133994bf0d8aa0360b2187fe5e6b SHA256 26219bad68f5d0288b8deb488fe39725c7ad16912aba8016fb88fe9b78766d0a
+MISC ChangeLog 2272 RMD160 d2ba24c2f182d0d86b6e2d5ed3ac5e73375ffdf1 SHA1 9dcf8e4f454d860cd87201fae67ea60b21010cf7 SHA256 388ed14c5b9c97e5a9cc24ecd768090019a649f0ada6219ca2b1997ab88e6a3b
 MISC metadata.xml 352 RMD160 ffdf34658cdb5eeee016af1eebb4ff0462c003ed SHA1 b0fc4e372dc02c88d08a0786693a901d805509a3 SHA256 8d748a544a218b994c3478cd8821991f1af935361c0387c8e05c988f93b2efb4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNw/4HAAoJEMxKBLrQri3ouqoIAJYuOHkexxGoZK8h7rb+KXWa
-/1s+4GCLm4zroVPJ9lH/v8aLB3noDUIeoWf2W0nYgbSP99CWLkLxlyhRYwfaLZHQ
-IdWw/oF2xS49xwCmVgv8/Aj6z8THUnGJ95Iwuj7LgxHN5Q6ZdcGODxSULgzrUB7D
-lTau340PKKphXMttCkiaZ/BmRteel+m9PK+m6V7L9k0xGplpLLhnNiNTniBwPbhm
-Szpv54qRXbqFERccdTMsiolm4d0nW5cRCdwAimP4pMtp44k8akozwa5wMlmD2er1
-vMFgxrnSra5zCLHe6Y7JDpy+Bv/QdV7uU9qaxw6aG3UVB7+WOPDoVtoDDQWGO2w=
-=JUk9
+iJwEAQECAAYFAk3SU/oACgkQIiMqcbOVdxSnmgP9HMiE3PMn2Ac2Ty0IiCO/5tz7
+UDe58Zz8KCT2gi0O9Y8GwO93LcrJCPvo/R+iP5aUEyGCfdO9EWZDyeBUe13okilX
+0gGFIQ9PEZD9N+DKoeYaqXkxjGv7W+bGi9Ym1iXWE4WGJO9h2Pqz56hdAqEdPrUU
+8pjZYhh/Up8tZ13sIOs=
+=X+/W
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 93fc68a4991c..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix automake issues with having two Main.cc
-Fix building with --as-needed
-
-https://bugs.gentoo.org/358557
-
-Patch provided by xarthisius@gentoo.org
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -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_LDFLAGS = @modules_LIBS@
-+AM_CPPFLAGS = -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/files/wbar-2.1.1-fix-warnings.patch b/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch
deleted file mode 100644
index 096e44f923ff..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix unused result on fgets() in Run.cc and "format not a string
-literal" on gtk_message_dialog_new() in Functions.cc
-
-These are just warinings, but cause compile failures with -Wall -Werror
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- src/config/Run.cc
-+++ src/config/Run.cc
-@@ -33,7 +33,8 @@
-     if (process)
-     {
-         char spid[50];
--        fgets(spid, sizeof(spid), process);
-+        char* tmp;
-+        tmp=fgets(spid, sizeof(spid), process);
-         pclose(process);
- 
-         pid = atoi(spid);
---- src/config/Functions.cc
-+++ src/config/Functions.cc
-@@ -680,7 +680,7 @@
-                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                   GTK_MESSAGE_ERROR,
-                                   GTK_BUTTONS_OK,
--                                  (_("Error save config in ") + filename).c_str());
-+                                  "%s",(_("Error save config in ") + filename).c_str());
- 
-         gtk_dialog_run (GTK_DIALOG (dialog));
-         gtk_widget_destroy (dialog);
diff --git a/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch b/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch
deleted file mode 100644
index a33380b675cc..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Add --disable-wbar-config to support "gtk" USE flag.
-Setting it will disable building and installing the gtk-based
-config program.
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -60,9 +60,15 @@
- AC_SUBST(modules_CFLAGS)
- AC_SUBST(modules_LIBS)
- 
--PKG_CHECK_MODULES(gui_modules, [gtk+-2.0 libglade-2.0])
--AC_SUBST(gui_modules_CFLAGS)
--AC_SUBST(gui_modules_LIBS)
-+AC_ARG_ENABLE(wbar-config, AS_HELP_STRING([--disable-wbar-config],
-+	[build without the GTK+ configuration interface]),[use_wbar_config=$enableval],
-+	[use_wbar_config=yes])
-+if test "$use_wbar_config" = "yes"; then
-+	PKG_CHECK_MODULES(gui_modules, [gtk+-2.0 libglade-2.0])
-+	AC_SUBST(gui_modules_CFLAGS)
-+	AC_SUBST(gui_modules_LIBS)
-+fi
-+AM_CONDITIONAL([WBAR],[test "$use_wbar_config" = "yes"])
- 
- CPPFLAGS="${CPPFLAGS} -Wall -Wunused -Werror -g -O2"
- 
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -1,6 +1,10 @@
- CLEANFILES = *~
- 
-+if WBAR
- bin_PROGRAMS = wbar wbar-config
-+else
-+bin_PROGRAMS = wbar
-+endif
- 
- wbar_SOURCES = \
- $(top_srcdir)/src/core/Bar.cc \
---- Makefile.am
-+++ Makefile.am
-@@ -1,4 +1,7 @@
- CLEANFILES = *~ po/*~
-+if WBAR
- SUBDIRS = src po pixmaps etc share
--
-+else
-+SUBDIRS = src po pixmaps etc
-+endif
- 
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
deleted file mode 100644
index 3e917a670e0b..000000000000
--- a/x11-misc/wbar/files/wbar-2.1.3-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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.1.ebuild b/x11-misc/wbar/wbar-2.1.1.ebuild
deleted file mode 100644
index 40f2e27dee5d..000000000000
--- a/x11-misc/wbar/wbar-2.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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.4 2011/04/15 20:11:55 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}-fix-warnings.patch\
-		"${FILESDIR}"/${P}-opt-config.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
-	sed -i \
-		-e 's^truetype/dustin/PenguinAttack^corefonts/arial^' \
-		-e 's^openoffice.png^ooffice.png^' \
-		etc/wbar.cfg.in || die "Fixing font in cfg."
-	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
-	sed -i configure.ac -e "s/-Werror//" || die #Don't -Werror
-	eautoreconf
-	# Fix build issue reported by xarthisius
-	mv "${S}"/src/config/Main.cc "${S}"/src/config/Main-config.cc || die
-}
-
-src_configure() {
-	econf --bindir=/usr/bin $(use_enable gtk wbar-config)
-}
diff --git a/x11-misc/wbar/wbar-2.1.3.ebuild b/x11-misc/wbar/wbar-2.2.1.ebuild
index efe1282a965a..977b4e3c9f81 100644
--- a/x11-misc/wbar/wbar-2.1.3.ebuild
+++ b/x11-misc/wbar/wbar-2.2.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.3.ebuild,v 1.1 2011/05/06 13:56:14 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.2.1.ebuild,v 1.1 2011/05/17 10:54:41 xarthisius Exp $
 
 EAPI=4
 inherit autotools eutils
@@ -30,16 +30,14 @@ 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
+	sed -i -e '/Werror/d' src/Makefile.am || die
+	sed -i configure.ac -e "s/imlib2/& x11/" || die #367549
 	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() {