Remove old. Clean up some patches.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

18 files changed, 29 insertions, 407 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index 46d12185406a..14d3441f6f7e 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-misc/wbar
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.34 2014/10/22 07:01:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.35 2014/10/22 07:18:13 jer Exp $
+
+  22 Oct 2014; Jeroen Roovers <jer@gentoo.org> -wbar-1.3.3.ebuild,
+  -wbar-2.2.2.ebuild, -wbar-2.3.0.ebuild, -wbar-2.3.1.ebuild,
+  -wbar-2.3.3.ebuild, wbar-2.3.4-r1.ebuild, wbar-2.3.4-r2.ebuild,
+  -files/wbar-1.3.3-Makefile.patch, -files/wbar-1.3.3-gcc43.patch,
+  -files/wbar-2.3.0-cfg.patch, -files/wbar-2.3.1-desktopfile.patch,
+  -files/wbar-2.3.1-nowerror.patch, -files/wbar-2.3.1-version.patch,
+  files/wbar-2.3.3-cfg.patch, files/wbar-2.3.3-nowerror.patch,
+  files/wbar-2.3.3-test.patch, files/wbar-2.3.4-automake-1.13.patch:
+  Remove old. Clean up some patches.
 
 *wbar-2.3.4-r2 (22 Oct 2014)
 
diff --git a/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch b/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch
deleted file mode 100644
index c74caa011180..000000000000
--- a/x11-misc/wbar/files/wbar-1.3.3-Makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur wbar-1.3.3.orig/Makefile wbar-1.3.3/Makefile
---- wbar-1.3.3.orig/Makefile	2007-09-26 19:24:10.000000000 +0300
-+++ wbar-1.3.3/Makefile	2008-01-13 14:42:20.000000000 +0200
-@@ -1,6 +1,6 @@
- TARGET=wbar
--CXXFLAGS=`imlib2-config --cflags` -Wall -O2 #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
--LDFLAGS=`imlib2-config --libs`  -Wl,-O2
-+CXXFLAGS+=`imlib2-config --cflags` -Wall #-DCOS_ZOOM #-DLINEAR_TRASL -DNO_EXPAND #-DAVGFILTER
-+LIBS=`imlib2-config --libs` -lX11
- PREFIX=/usr/share/wbar
- 
- 	
-@@ -14,7 +14,7 @@
- $(objects): $(headers) Makefile
- 
- $(TARGET): $(objects) 
--	g++ $(LDFLAGS) -o $(@) $(objects)
-+	$(CXX) $(LDFLAGS) $(objects) $(LIBS) -o $(@)
- 	#strip $(@)
- 
- install: $(TARGET)
-@@ -23,16 +23,17 @@
- 		exit 1; \
- 	fi
- 
--	install -d $(PREFIX)
-+	install -d $(DESTDIR)$(PREFIX)
- 	awk '{if($$1 ~ /i:/ || ($$1 ~ /t:/ && NR<4)) print $$1" $(PREFIX)/"$$2; else print $$0;}' \
--		./dot.wbar > $(PREFIX)/dot.wbar
--	cp -a ./iconpack $(PREFIX)/iconpack
-+		./dot.wbar > $(DESTDIR)$(PREFIX)/dot.wbar
-+	cp -a ./iconpack $(DESTDIR)$(PREFIX)/iconpack
- 
- 	#ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.nuvoux/font.ttf
- 	#ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.ice/font.ttf
--	ln -fs $(PREFIX)/iconpack/comic.ttf $(PREFIX)/iconpack/wbar.osx/font.ttf
-+	ln -fs ../comic.ttf $(DESTDIR)$(PREFIX)/iconpack/wbar.osx/font.ttf
- 	
--	install ./wbar /usr/bin
-+	install -d $(DESTDIR)/usr/bin
-+	install ./wbar $(DESTDIR)/usr/bin
- 
- uninstall:
- 	if [ "`whoami`" != "root" ]; then \
diff --git a/x11-misc/wbar/files/wbar-1.3.3-gcc43.patch b/x11-misc/wbar/files/wbar-1.3.3-gcc43.patch
deleted file mode 100644
index 448a1afa9e39..000000000000
--- a/x11-misc/wbar/files/wbar-1.3.3-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur wbar-1.3.3.orig/IconLoader.cc wbar-1.3.3/IconLoader.cc
---- wbar-1.3.3.orig/IconLoader.cc	2006-12-29 03:54:29.000000000 +0200
-+++ wbar-1.3.3/IconLoader.cc	2008-06-19 14:09:10.000000000 +0300
-@@ -1,4 +1,5 @@
- extern "C" {
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-diff -ur wbar-1.3.3.orig/SuperBar.cc wbar-1.3.3/SuperBar.cc
---- wbar-1.3.3.orig/SuperBar.cc	2007-08-04 03:24:34.000000000 +0300
-+++ wbar-1.3.3/SuperBar.cc	2008-06-19 14:06:35.000000000 +0300
-@@ -1,3 +1,7 @@
-+extern "C" {
-+#include <stdlib.h>
-+};
-+
- #include "SuperBar.h"
- #include "SuperIcon.h"
- 
diff --git a/x11-misc/wbar/files/wbar-2.3.0-cfg.patch b/x11-misc/wbar/files/wbar-2.3.0-cfg.patch
deleted file mode 100644
index 92634c5ba50e..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.0-cfg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon May 14 16:18:26 UTC 2012
-Subject: remove wbar-config for -gtk
-
---- etc/wbar.cfg.in
-+++ etc/wbar.cfg.in
-@@ -2,10 +2,6 @@
- c: @PACKAGE_NAME@ @DEFAULT_ARGV@
- t: none
- 
--i: @PIXMAPDIR@/@PACKAGE_NAME@/wbar.png
--c: wbar-config
--t: Config
--
- i: @PIXMAPDIR@/@PACKAGE_NAME@/pidgin.png
- c: pidgin
- t: Pidgin
diff --git a/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch
deleted file mode 100644
index c42f6498e156..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 16:34:39 UTC 2012
-Subject: fix desktop file destination and QA issues
-
-diff --git a/configure.ac b/configure.ac
-index 0fc821c..2db7c02 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
- 
- AC_CONFIG_FILES([Makefile \
- share/Makefile \
-+share/wbar.desktop.in \
- etc/Makefile \
- etc/wbar.cfg \
- etc/wbar.desktop.in \
-diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 1bcb238..a433e0c 100644
---- a/etc/Makefile.am
-+++ b/etc/Makefile.am
-@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
- defaultdir = @DEFAULT_CONFIGDIR@
- default_DATA = $(wbarcfg:.cfg.in=.cfg)
- 
--autostartdir = @DEFAULT_CONFIGDIR@
-+autostartdir = $(sysconfdir)/xdg/autostart
- autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
- 
- @INTLTOOL_DESKTOP_RULE@
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 8472c3c..8ed7725 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -1,4 +1,5 @@
- etc/wbar.desktop.in
-+share/wbar.desktop.in
- share/wbar.glade
- src/config/Functions.cc
- src/config/Functions.h
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 327f139..a9fbd01 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -1,2 +1,2 @@
- etc/wbar.desktop.in.in
--
-+share/wbar.desktop.in.in
-diff --git a/share/Makefile.am b/share/Makefile.am
-index 87c736b..091935c 100644
---- a/share/Makefile.am
-+++ b/share/Makefile.am
-@@ -1,8 +1,16 @@
--CLEANFILES = *~
-+CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
- 
- gladedir = @GLADE_PACKAGE_DIR@
- glade_DATA = @PACKAGE@.glade
- 
--EXTRA_DIST = \
--$(glade_DATA)
-+desktopfilesdir = $(prefix)/share/applications
-+desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop)
-+
-+@INTLTOOL_DESKTOP_RULE@
- 
-+wbardesktop = wbar.desktop.in.in
-+
-+EXTRA_DIST = \
-+$(glade_DATA) \
-+$(wbardesktop) \
-+$(wbardesktop:.desktop.in.in=.desktop.in)
-diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
-new file mode 100644
-index 0000000..48fc33c
---- /dev/null
-+++ b/share/wbar.desktop.in.in
-@@ -0,0 +1,12 @@
-+[Desktop Entry]
-+_Name=Warlock Bar
-+Type=Application
-+Exec=@BINDIR@/@PACKAGE_NAME@
-+Terminal=false
-+Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png
-+_Comment=A light and fast launch bar.
-+Categories=Utility;
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=@PACKAGE_NAME@
-+X-GNOME-Bugzilla-Component=general
-+X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@
diff --git a/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch
deleted file mode 100644
index 1958f2b5c549..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 17:18:37 UTC 2012
-Subject: remove Werror
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -8,7 +8,6 @@
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
- 	-Wall \
- 	-Wunused \
--	-Werror \
- 	-I$(top_srcdir)/src/utils
- 
- if WBAR_CONFIG
diff --git a/x11-misc/wbar/files/wbar-2.3.1-version.patch b/x11-misc/wbar/files/wbar-2.3.1-version.patch
deleted file mode 100644
index a96c61bd5329..000000000000
--- a/x11-misc/wbar/files/wbar-2.3.1-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug 26 17:57:14 UTC 2012
-Subject: build system
-
-fix version -.-
-
---- configure.ac
-+++ configure.ac
-@@ -1,6 +1,6 @@
- dnl make yadickson soto
- 
--AC_INIT([wbar], [2.3.0])
-+AC_INIT([wbar], [2.3.1])
- AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ])
- 
- AM_CONFIG_HEADER(config.h)
diff --git a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
index 275560f8fd98..5ffd82869983 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-cfg.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Fri Sep 21 21:45:22 UTC 2012
 Subject: remove wbar-config for -gtk
 
---- etc/wbar.cfg.in
-+++ etc/wbar.cfg.in
+--- a/etc/wbar.cfg.in
++++ b/etc/wbar.cfg.in
 @@ -2,8 +2,3 @@
  c: @PACKAGE_NAME@ @DEFAULT_ARGV@
  t: none
diff --git a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
index 1958f2b5c549..2cf163bc4642 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-nowerror.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Sun Aug 26 17:18:37 UTC 2012
 Subject: remove Werror
 
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -8,7 +8,6 @@
  	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
  	-Wall \
diff --git a/x11-misc/wbar/files/wbar-2.3.3-test.patch b/x11-misc/wbar/files/wbar-2.3.3-test.patch
index 8cc2612c1e4c..4468791a4202 100644
--- a/x11-misc/wbar/files/wbar-2.3.3-test.patch
+++ b/x11-misc/wbar/files/wbar-2.3.3-test.patch
@@ -2,8 +2,8 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Fri Sep 21 21:50:34 UTC 2012
 Subject: fix test phase
 
---- po/POTFILES.in
-+++ po/POTFILES.in
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
 @@ -1,3 +1,4 @@
 +etc/wbar.desktop.in
  share/wbar.desktop.in
diff --git a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
index ef3ee648a7e7..d8f59518ca16 100644
--- a/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
+++ b/x11-misc/wbar/files/wbar-2.3.4-automake-1.13.patch
@@ -1,5 +1,5 @@
---- wbar-2.3.4/configure.ac
-+++ wbar-2.3.4/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -3,7 +3,7 @@
  AC_INIT([wbar], [2.3.4])
  AM_INIT_AUTOMAKE([ filename-length-max=256 tar-ustar ])
diff --git a/x11-misc/wbar/wbar-1.3.3.ebuild b/x11-misc/wbar/wbar-1.3.3.ebuild
deleted file mode 100644
index d3bf9f07cbbf..000000000000
--- a/x11-misc/wbar/wbar-1.3.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-1.3.3.ebuild,v 1.5 2014/08/10 20:04:28 slyfox Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="a (fast, light, and cool eye-candy) quick launch bar"
-HOMEPAGE="http://www.tecnologia-aplicada.com.ar/rodolfo"
-SRC_URI="http://www.tecnologia-aplicada.com.ar/rodolfo/${P}.tbz2
-	http://www.tecapli.com.ar/rodolfo/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/imlib2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README
-}
diff --git a/x11-misc/wbar/wbar-2.2.2.ebuild b/x11-misc/wbar/wbar-2.2.2.ebuild
deleted file mode 100644
index eaf14aafd918..000000000000
--- a/x11-misc/wbar/wbar-2.2.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.2.2.ebuild,v 1.4 2014/08/10 20:04:28 slyfox 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[X]
-	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
-	virtual/pkgconfig"
-
-src_prepare() {
-	if ! use gtk; then
-		# Remove wbar-config from default cfg.
-		sed -i -e '5,8d' etc/wbar.cfg.in || die
-	fi
-	sed -i -e '/Werror/d' src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --bindir=/usr/bin $(use_enable gtk wbar-config)
-}
diff --git a/x11-misc/wbar/wbar-2.3.0.ebuild b/x11-misc/wbar/wbar-2.3.0.ebuild
deleted file mode 100644
index e580d1c25e4d..000000000000
--- a/x11-misc/wbar/wbar-2.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.0.ebuild,v 1.7 2013/08/11 06:51:54 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="http://code.google.com/p/wbar/"
-SRC_URI="http://${PN}.googlecode.com/files/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	gtk? ( gnome-base/libglade
-		media-libs/freetype:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/${P}-cfg.patch
-}
-
-src_configure() {
-	append-flags -Wno-error
-	econf \
-		$(use_enable gtk wbar-config)
-}
diff --git a/x11-misc/wbar/wbar-2.3.1.ebuild b/x11-misc/wbar/wbar-2.3.1.ebuild
deleted file mode 100644
index cfa725692d8b..000000000000
--- a/x11-misc/wbar/wbar-2.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.1.ebuild,v 1.3 2013/08/11 06:51:54 ssuominen Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="http://code.google.com/p/wbar/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.orig.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	gtk? ( gnome-base/libglade
-		media-libs/freetype:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/${PN}-2.3.0-cfg.patch
-	epatch "${FILESDIR}"/${P}-{version,desktopfile,nowerror}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk wbar-config)
-}
diff --git a/x11-misc/wbar/wbar-2.3.3.ebuild b/x11-misc/wbar/wbar-2.3.3.ebuild
deleted file mode 100644
index 17deae47f7a0..000000000000
--- a/x11-misc/wbar/wbar-2.3.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.3.ebuild,v 1.3 2013/08/11 06:51:54 ssuominen Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="A fast, lightweight quick launch bar"
-HOMEPAGE="http://code.google.com/p/wbar/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	gtk? ( gnome-base/libglade
-		media-libs/freetype:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	use gtk || epatch "${FILESDIR}"/${P}-cfg.patch
-	epatch "${FILESDIR}"/${P}-{desktopfile,nowerror,test}.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable gtk wbar-config)
-}
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
index 2314c355dbcd..128a16905e52 100644
--- a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4-r1.ebuild,v 1.6 2013/08/31 19:07:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4-r1.ebuild,v 1.7 2014/10/22 07:18:13 jer Exp $
 
 EAPI=5
 
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
-	epatch "${FILESDIR}"/${PN}-2.3.3-{desktopfile,nowerror,test}.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
+		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
+		"${FILESDIR}"/${PN}-2.3.3-test.patch \
 		"${FILESDIR}"/${P}-automake-1.13.patch
 
 	sed -i \
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
index 2da87ab2c569..bd831f84955c 100644
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4-r2.ebuild,v 1.1 2014/10/22 07:01:57 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.4-r2.ebuild,v 1.2 2014/10/22 07:18:13 jer Exp $
 
 EAPI=5
 
@@ -30,7 +30,9 @@ src_prepare() {
 	use gtk || epatch "${FILESDIR}"/${PN}-2.3.3-cfg.patch
 
 	epatch \
-		"${FILESDIR}"/${PN}-2.3.3-{desktopfile,nowerror,test}.patch \
+		"${FILESDIR}"/${PN}-2.3.3-desktopfile.patch \
+		"${FILESDIR}"/${PN}-2.3.3-nowerror.patch \
+		"${FILESDIR}"/${PN}-2.3.3-test.patch \
 		"${FILESDIR}"/${P}-automake-1.13.patch \
 		"${FILESDIR}"/${P}-completion.patch