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

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 83 insertions, 32 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/Manifest b/x11-plugins/wmbutton/Manifest
index a2f23d7af696..0ff89f21d401 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -3,17 +3,18 @@ Hash: SHA256
 
 AUX sample.wmbutton 659 SHA256 55541666900f478a2c1f73d5fc6fb6bc9ee02687657f830251ce42f480b211d0 SHA512 fc828740001b2280f49b916cd1fc803cb1d606d36a7fdeca0aafa9d892d377ed68eebb996efe7bb96eff6f5ea281e4431182e2831605f6167a39cb2be878063f WHIRLPOOL 3034474f397987af61b2eee5013cbbae1f7467592831f65eefd12cfb3728e059ad1f905e4a864be8383c2ae33343f27007bf7f940ffe1c7196f47222cf40bc4b
 AUX wmbutton-0.6.1-Makefile.patch 802 SHA256 59e6455bbfc81ebae7e18bd848741b2f04c1867467d1fea5b875a3fc8cea5057 SHA512 54e6d51af3ccf66ccc6eac760ee24da205184aa13dd17616ccf781c245f7a4c89d629e67465090391e03ff0057f3264187279eb346c868d5178b830d5ef41935 WHIRLPOOL c0bcdb2949026f9884e775b953e33d104741ca5703dc5f101e54af4f5b5d35d3f3e2e5a2289431b6e0a40f13dedd06d9786fb6353be9b1ede033f8f688a1c35b
-AUX wmbutton-cflags.patch 483 SHA256 4e0eb4e021725a28835b5505546c6af27698468034d61eecfd083a11b10df8be SHA512 47088c90b4559fbfb33a94559816745ae39ca887d716a52e442a3364b8fa7857a35983432c4bcf744ebcc7b3d06b068911075fec21b98129a35c1b3ecaf86163 WHIRLPOOL 77e0db5868c4d13b7358d9b01cfdb2cac510a7c53a9fe9da464941cbafa84140a69fce6b921a58cf286be8160cd5e4ad6509ccd8a1edf9fa1188d6bcb09b1071
-AUX wmbutton.desktop 242 SHA256 e8640bc403a8dda5d9e0d3917989e6c357bae1321ee38de107d6693b4b39148e SHA512 b801dc2c280bdd503244adb3dcdb6ba60a9448c07957ea086aaf30f200606af14543a41db0219062bb9f200b736b2bf33379d2e5d8e140cba0b2cbb78b8034a2 WHIRLPOOL 152dc9f48a9ffc4eed240f58c9435084d84d7fb956cb67eb15c2ac66337440ea27bd260d885a4577a51866f0119d073236654d1b35be767c651cca8a26d73e1e
+AUX wmbutton-0.7.0-Makefile.patch 753 SHA256 3916ca01a8c71e6211ace763913d3e6f8fb8562f73970f337bfb1be8463164c3 SHA512 f62306dfbba48a960a1e198f7c50a4e828405642d852dd543b4cf6ffd2e297266bac71c386d176a35c060dcc6f6c126a4af52a0f83772a4ebed1b55dbe880b8c WHIRLPOOL 1ee2f31b27372f47b817893b6a7f3555bfb383f2510d060c43a439cf85a04b26b3e08c5136cccb0e10519e18f276051fbf19e38a09142a3fc649ae8ac03bf227
 DIST wmbutton-0.6.1.tar.gz 48404 SHA256 423c99bff4657b968cd14913097e8ac821a6b238b150fb4eacb36d661739a09f
-DIST wmbutton-buttons.xpm 25003 SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318
+DIST wmbutton-0.7.0.tar.gz 48381 SHA256 dd6d7a4188b9acd22538d04de2ce0a5e3822e91488a1521df4ff9d09a922f950 SHA512 dc631caca0b1ed6daf8781a0893464b91d788b3d0f81dc22a33d13715cda7becbb145d2d3d34ab93a9a343ed178171c376f81e2eb25e9436d1da8ee2d6455ce2 WHIRLPOOL 0b16fab3064ce98d1c6fda5e4856ec9b3b63b7733bc39ee4ab2a96faa7829e77f5e2a45b60124e4f1c91bfa1004c2b6cf3a8e38d8142daff11e34013a2576570
+DIST wmbutton-buttons.xpm 25003 SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318 SHA512 eb73812b8a4060a6bb13a477275224a2e6d50f7b77944f2f674c4995e0053f3d3c667d483c86dda98b69f398fd332e4c836ddf9eb3410e1e29b69449b874537c WHIRLPOOL ddc743a8d689ae46a44515e39531acc63a39534cbbf96184e6fa7e243dd1cee253ca10da65aec03391e6b6a92ddad72826bb1be56c6a301a786e90beddc4ba5f
 EBUILD wmbutton-0.6.1.ebuild 1083 SHA256 a21c14f8bdbd9c467fb8ce82025c066eea245711d3ce7038258e8e49a5eb4d7c SHA512 eec7617c4445be7d532827cf96f3a674ad0c5c231be38aaed2cc9d2dfbb7993dddc3178ab3e9b49eb4e299f400d62d447a17c8f7a3f535133e4a229afdffe741 WHIRLPOOL 08336f275dd5b7c2a1af98c3be9aad75614df9d53b3fccbc0307df4d3d7a89253c9bd273890886e66b0f35a0c6daabac640ba45a8a0fb7adcf1e9090f725ecbb
-MISC ChangeLog 2245 SHA256 0bc2b23f96bba8e6cb34c11c47a0527e7e11b6df1890d8cec2f1d361a1aa0de2 SHA512 dfb258259743117e8274faed96af3e14ce915cadd954c36dc31db5c1464dedb854467fbd208af0ac49b37b8e225cb69402c2b17336ebffc3ef87f120cc8f5b35 WHIRLPOOL ed1ae0b06d99b39408c653d0afb02644102d200f67f2aa5466ede18c6795fe5be25295c68a5ccf872069c7269f865751f39393348a776f7d5ad8a9cad77d778a
+EBUILD wmbutton-0.7.0.ebuild 1054 SHA256 a80cc1f16e1a0187b201e36994f7e279eebb81d576867ae734a9bc319727a82d SHA512 cb9781bc6a7b71209f2b82fd4b97011101b1448d89ec8bf5e41b906ccf9cddf48e0b56cf7e1cd86ad2258f8ab540ecea592048be86bab069b01816aef5626691 WHIRLPOOL 877af88af468346a7c6462bda7c2db4cec4444805bfb55e9865693169d29dc8d1a27d65c34c55805e62dee83518356b9f082fe32328956357f72716ce0b675b1
+MISC ChangeLog 2535 SHA256 2b080a739b5a9912f95d1b7ec9aa2785d4bdba80ea4c01568c3240e433451517 SHA512 ff5f8276173c9ebffd9eac2762d37f1b328ee575adfca8deaa1bcaa494f64faadc59adf303db9ee453d6fa10209b01964acd80b7976bd162a587a509f4693d98 WHIRLPOOL 1626d28d0edb864d7a027f2335ba259e782827b84c4d4f45ca98f9b4313a6884975ea0a88de2738291c4474b36e81251c3956ed8b0fd187fcbdf73fecccda4e5
 MISC metadata.xml 165 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b SHA512 dd0c867c49224060269f229cdd6cfe3c2b8a1f9ebb94d26605878d5b050d10cedb229a64ffd4c13e5c119bce3e236b14f5a9f6dac36a6ace50965f0887e5362a WHIRLPOOL 5f4139a044e2f8bc197f5d21ee51f21b8a5131b2eb145d88bda1dc3b04cf7d21ed89da77dc9b43496071d8098d5eee2b19da0fbc810ac15d379cec0420d99950
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0HgACgkQcaHudmEf86r1NwCfVJkL2jRawf6J2XvBIapwrac1
-TYsAnAgoUhtoyTbk4milqsJcfkUSQx3R
-=VfP7
+iF4EAREIAAYFAlQymsMACgkQFYEBGcdFJfJMdwEAm0LN8oYCIWVbUnEmR6LCd+67
+XecqpqI+ZwTRihlD+RgA/jbK4O+L1ULAzGxewXN0S0cfvyo4hsCwLbc+rC3Pzi6U
+=flHC
 -----END PGP SIGNATURE-----
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
+}