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

(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)

7 files changed, 13 insertions, 210 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/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() {