version bump and amd64 stable wrt #150645

(Portage version: 2.1.4, RepoMan options: --force)

4 files changed, 81 insertions, 2 deletions

diff --git a/x11-plugins/wmbutton/ChangeLog b/x11-plugins/wmbutton/ChangeLog
index f33a9b2e3909..fcd4d76b11d4 100644
--- a/x11-plugins/wmbutton/ChangeLog
+++ b/x11-plugins/wmbutton/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmbutton
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.11 2007/07/22 05:20:32 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/ChangeLog,v 1.12 2008/01/13 06:46:13 drac Exp $
+
+*wmbutton-0.6.1 (13 Jan 2008)
+
+  13 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wmbutton-0.6.1-Makefile.patch, +wmbutton-0.6.1.ebuild:
+  Version bump and amd64 stable because of #150645.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmbutton-0.5.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmbutton/files/digest-wmbutton-0.6.1 b/x11-plugins/wmbutton/files/digest-wmbutton-0.6.1
new file mode 100644
index 000000000000..197c2cd8c634
--- /dev/null
+++ b/x11-plugins/wmbutton/files/digest-wmbutton-0.6.1
@@ -0,0 +1,6 @@
+MD5 b4e8d35709252306739ccc1a2a826c08 wmbutton-0.6.1.tar.gz 48404
+RMD160 1ed0d5170b7cba7a8a30144825bb2722959e97ea wmbutton-0.6.1.tar.gz 48404
+SHA256 423c99bff4657b968cd14913097e8ac821a6b238b150fb4eacb36d661739a09f wmbutton-0.6.1.tar.gz 48404
+MD5 542aee10cbc05b839c1f6d09f98b6406 wmbutton-buttons.xpm 25003
+RMD160 21d64d252466a8e9c609bdd59dd1035ddc422a02 wmbutton-buttons.xpm 25003
+SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318 wmbutton-buttons.xpm 25003
diff --git a/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch b/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch
new file mode 100644
index 000000000000..7654c8cd40e7
--- /dev/null
+++ b/x11-plugins/wmbutton/files/wmbutton-0.6.1-Makefile.patch
@@ -0,0 +1,27 @@
+diff -ur wmbutton-0.6.1.orig/Makefile wmbutton-0.6.1/Makefile
+--- wmbutton-0.6.1.orig/Makefile	2005-01-16 17:12:54.000000000 +0200
++++ wmbutton-0.6.1/Makefile	2008-01-13 08:15:02.000000000 +0200
+@@ -1,19 +1,17 @@
+-INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
+-LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
++INCLUDES =-I/usr/include/X11
+ LIBS = -lX11 -lXpm -lXext
++CC = gcc
+ 
+ TARGET = wmbutton
+ OBJECTS = wmbutton.o wmb_libs.o
+ 
+-CFLAGS += -c -Wall -O2
+-
+ all: ${TARGET} tags
+ 
+ .c.o:
+-	gcc ${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/wmbutton-0.6.1.ebuild b/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild
new file mode 100644
index 000000000000..8bce6fea69f8
--- /dev/null
+++ b/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbutton/wmbutton-0.6.1.ebuild,v 1.1 2008/01/13 06:46:13 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a dockapp application that displays nine configurable buttons."
+HOMEPAGE="http://www.freshports.org/x11/wmbutton"
+SRC_URI="ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${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"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	use branding && cp ${DISTDIR}/${PN}-buttons.xpm buttons.xpm
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc README 
+	use branding && dodoc "${FILESDIR}"/sample.wmbutton
+	use branding || newdoc .wmbutton sample.wmbutton
+}