New ebuild for 2.1.1

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

5 files changed, 148 insertions, 3 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index e41705493a51..d702adb2716b 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/wbar
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.5 2010/01/14 16:11:26 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.6 2011/02/24 17:52:50 signals Exp $
+
+*wbar-2.1.1 (24 Feb 2011)
+
+  24 Feb 2011; Kevin McCarthy <signals@gentoo.org> +wbar-2.1.1.ebuild,
+  +files/wbar-2.1.1-fix-warnings.patch, +files/wbar-2.1.1-opt-config.patch:
+  New ebuild for version 2.1.1. Added "gtk" USE flag to control
+  building of the GTK based wbar-config utility.
 
   14 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   files/wbar-1.3.3-Makefile.patch:
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
new file mode 100644
index 000000000000..096e44f923ff
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.1.1-fix-warnings.patch
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 000000000000..a33380b675cc
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.1.1-opt-config.patch
@@ -0,0 +1,51 @@
+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/metadata.xml b/x11-misc/wbar/metadata.xml
index 731225048652..a87858fce3e2 100644
--- a/x11-misc/wbar/metadata.xml
+++ b/x11-misc/wbar/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>signals@gentoo.org</email>
+    <name>Kevin McCarthy</name>
+  </maintainer>
+  <use>
+    <flag name="gtk">Enables the gtk-based wbar-config GUI</flag>
+  </use>
 </pkgmetadata>
+
diff --git a/x11-misc/wbar/wbar-2.1.1.ebuild b/x11-misc/wbar/wbar-2.1.1.ebuild
new file mode 100644
index 000000000000..a801ed2291b0
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.1.1.ebuild
@@ -0,0 +1,49 @@
+# 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.1 2011/02/24 17:52:50 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
+	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
+	eautoreconf
+}
+
+src_configure() {
+	econf --bindir=/usr/bin $(use_enable gtk wbar-config)
+}