Version bump with new homepage (also fixes #515186), remove some unused files

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

5 files changed, 75 insertions, 25 deletions

diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index 02c8aaa3205d..83bd1e815a6c 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmbutton
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.17 2014/08/10 20:05:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.18 2014/10/06 13:35:56 voyageur Exp $
+
+*wmbutton-0.7.0 (06 Oct 2014)
+
+  06 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org> +wmbutton-0.7.0.ebuild,
+  +files/wmbutton-0.7.0-Makefile.patch, -files/wmbutton.desktop,
+  -files/wmbutton-cflags.patch:
+  Version bump with new homepage (also fixes #515186), remove some unused files
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> wmbutton-0.6.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
new file mode 100644
index 000000000000..f9197842b44a
--- /dev/null
+++ b/x11-plugins/wmbutton/files/wmbutton-0.7.0-Makefile.patch
@@ -0,0 +1,26 @@
+--- Makefile.orig	2014-10-06 15:20:41.300883734 +0200
++++ Makefile	2014-10-06 15:22:08.936939085 +0200
+@@ -1,6 +1,6 @@
+ INCLUDES =-I/usr/include -I/usr/local/include
+-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
+ LIBS = -lX11 -lXpm -lXext
++CC = gcc
+ 
+ TARGET = wmbutton
+ OBJECTS = wmbutton.o wmb_libs.o
+@@ -14,13 +14,11 @@
+ INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755
+ INSTALL_FILE    = $(INSTALL) -p -o root -g root -m 644
+ 
+-CFLAGS += -Wall -O2
+-
+ .c.o:
+-	gcc -c ${CFLAGS} ${INCLUDES} $< -o $*.o
++	${CC} -c ${CFLAGS} ${INCLUDES} $< -o $*.o
+ 
+ ${TARGET}: ${OBJECTS}
+-	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
++	${CC} ${LDFLAGS} ${OBJECTS} ${LIBS} -o ${TARGET} 
+ 
+ clean::
+ 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmbutton/files/wmbutton-cflags.patch b/x11-plugins/wmbutton/files/wmbutton-cflags.patch
deleted file mode 100644
index 783933c60022..000000000000
--- a/x11-plugins/wmbutton/files/wmbutton-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2004-06-23 14:49:14.966324312 +0000
-+++ Makefile	2004-06-23 14:49:52.487620208 +0000
-@@ -6,10 +6,10 @@
- OBJECTS = wmbutton.o wmb_libs.o
- 
- .c.o:
--	gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-+	gcc -c -Wall ${INCLUDES} ${FLAGS} ${CFLAGS} $< -o $*.o
- 
- ${TARGET}: ${OBJECTS}
--	gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	gcc -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS} ${CFLAGS} 
- 
- clean::
- 	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff --git a/x11-plugins/wmbutton/files/wmbutton.desktop b/x11-plugins/wmbutton/files/wmbutton.desktop
deleted file mode 100644
index 368b90f81227..000000000000
--- a/x11-plugins/wmbutton/files/wmbutton.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=WmButton
-Comment=Dockapp with up to nine configurable buttons
-Comment[pl]=Dockapp z max dzięwięcioma konfigurowalnymi przyciskami
-Exec=wmbutton
-Type=Application
-Encoding=UTF-8
-Terminal=0
-Categories=Application;Utility;
diff --git a/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
new file mode 100644
index 000000000000..e341405d382a
--- /dev/null
+++ b/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.7.0.ebuild,v 1.1 2014/10/06 13:35:56 voyageur Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a dockapp application that displays nine configurable buttons"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmbutton"
+SRC_URI="http://windowmaker.org/dockapps/?download=${P}.tar.gz -> ${P}.tar.gz
+	branding? ( mirror://gentoo/${PN}-buttons.xpm )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="branding"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	use branding && cp "${DISTDIR}"/${PN}-buttons.xpm buttons.xpm
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README
+	use branding && dodoc "${FILESDIR}"/sample.wmbutton
+	use branding || dodoc sample.wmbutton
+}