version bump and amd64 stable wrt #150645

Package-Manager: portage-2.1.4
RepoMan-Options: --force

5 files changed, 97 insertions, 6 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/Manifest b/x11-plugins/wmbutton/Manifest
index 3dfc46bf8b66..d6280f02390c 100644
--- a/x11-plugins/wmbutton/Manifest
+++ b/x11-plugins/wmbutton/Manifest
@@ -2,6 +2,10 @@ AUX sample.wmbutton 659 RMD160 4e9672a88fdb677588a9048c46e0da237dd7f2c5 SHA1 e69
 MD5 7d562ae9a457c07a11b6c6038769dc6f files/sample.wmbutton 659
 RMD160 4e9672a88fdb677588a9048c46e0da237dd7f2c5 files/sample.wmbutton 659
 SHA256 55541666900f478a2c1f73d5fc6fb6bc9ee02687657f830251ce42f480b211d0 files/sample.wmbutton 659
+AUX wmbutton-0.6.1-Makefile.patch 802 RMD160 6863f53fda628ca4aba4d661c4bffba919146e37 SHA1 2c8554b0a635afb847ca826ec3a9ee2255d980fa SHA256 59e6455bbfc81ebae7e18bd848741b2f04c1867467d1fea5b875a3fc8cea5057
+MD5 d539a2612dc3a28716a2685f83a504a9 files/wmbutton-0.6.1-Makefile.patch 802
+RMD160 6863f53fda628ca4aba4d661c4bffba919146e37 files/wmbutton-0.6.1-Makefile.patch 802
+SHA256 59e6455bbfc81ebae7e18bd848741b2f04c1867467d1fea5b875a3fc8cea5057 files/wmbutton-0.6.1-Makefile.patch 802
 AUX wmbutton-cflags.patch 483 RMD160 755069a2d7ed744093c59525f6e82be0be20ef81 SHA1 d9fd34145e2cad224ba3f18e7280d7b53ee1c4b8 SHA256 4e0eb4e021725a28835b5505546c6af27698468034d61eecfd083a11b10df8be
 MD5 76263f6d447775d0a50f3a42e9e8299e files/wmbutton-cflags.patch 483
 RMD160 755069a2d7ed744093c59525f6e82be0be20ef81 files/wmbutton-cflags.patch 483
@@ -11,15 +15,20 @@ MD5 1bbe314d935c36bdb0cc7e80141624c9 files/wmbutton.desktop 242
 RMD160 10d002ff678107abd4ebfcfe4331a748948f8e7c files/wmbutton.desktop 242
 SHA256 e8640bc403a8dda5d9e0d3917989e6c357bae1321ee38de107d6693b4b39148e files/wmbutton.desktop 242
 DIST wmbutton-0.5.tar.gz 52316 RMD160 b1abc488f1ce31d12466c3aaf8b307c6e9e91ee1 SHA1 ad41fd466b94ebaa8a40f9a5e75790ea9ff73fae SHA256 09f85d36bccd3d1fee146adefb77053b9b69ec33aca23e8148632d604bc4acd8
+DIST wmbutton-0.6.1.tar.gz 48404 RMD160 1ed0d5170b7cba7a8a30144825bb2722959e97ea SHA1 4bbedb18dd8de1c644551cdc8cc151421d56f30c SHA256 423c99bff4657b968cd14913097e8ac821a6b238b150fb4eacb36d661739a09f
 DIST wmbutton-buttons.xpm 25003 RMD160 21d64d252466a8e9c609bdd59dd1035ddc422a02 SHA1 89b986d3d4cf89e981e71d3b6a231debcb35d4af SHA256 357de6947c75339ed8156bd09287f82ef46dad22d16b1c82f7bbce12fd287318
 EBUILD wmbutton-0.5.ebuild 1043 RMD160 5ca810f46d66964dc0c4bfbfa3698b840cad9642 SHA1 d8b3259c666cef12959906b197528286b5704d9e SHA256 b94a6ca4a41520f704b41650e71614a6fc594930b9b5f4abdddb1f42dd62a201
 MD5 d16062605a5bf49d4071d8f584f88d1f wmbutton-0.5.ebuild 1043
 RMD160 5ca810f46d66964dc0c4bfbfa3698b840cad9642 wmbutton-0.5.ebuild 1043
 SHA256 b94a6ca4a41520f704b41650e71614a6fc594930b9b5f4abdddb1f42dd62a201 wmbutton-0.5.ebuild 1043
-MISC ChangeLog 1515 RMD160 1f173c925d721076d9c2228333e5f2628b7bb33d SHA1 2b677405fbfca331065dec69620b15b3017bc15e SHA256 2c098e3173280c7e38723ee4bfb1df112443ea3805257243c3139ce7d36f9249
-MD5 fd4b768e083f5c008921e8e4b9379472 ChangeLog 1515
-RMD160 1f173c925d721076d9c2228333e5f2628b7bb33d ChangeLog 1515
-SHA256 2c098e3173280c7e38723ee4bfb1df112443ea3805257243c3139ce7d36f9249 ChangeLog 1515
+EBUILD wmbutton-0.6.1.ebuild 1068 RMD160 0b2931b3035d2c98dbe790dd9997ee5599845246 SHA1 57544324921cdb581da4fc5a1e0afc56ba356dd1 SHA256 56cde873ff2533cdf7162842f417a6a769a88695e9ebc58f098b618524b3e1df
+MD5 3230142d52e5a54635de0758b47dfae0 wmbutton-0.6.1.ebuild 1068
+RMD160 0b2931b3035d2c98dbe790dd9997ee5599845246 wmbutton-0.6.1.ebuild 1068
+SHA256 56cde873ff2533cdf7162842f417a6a769a88695e9ebc58f098b618524b3e1df wmbutton-0.6.1.ebuild 1068
+MISC ChangeLog 1707 RMD160 864decdd8ba1643ef5147df2faf16203d372c264 SHA1 fdf8d0b1270804b15a0fe92671155f1f2e04d88f SHA256 e3aaf9d8b0ada7b543b87973f52ab2f8cc7708f1ea6ec5e47f93d544ac5d2953
+MD5 02fa9d12eb17e8bf794dc9c240087101 ChangeLog 1707
+RMD160 864decdd8ba1643ef5147df2faf16203d372c264 ChangeLog 1707
+SHA256 e3aaf9d8b0ada7b543b87973f52ab2f8cc7708f1ea6ec5e47f93d544ac5d2953 ChangeLog 1707
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
@@ -27,3 +36,6 @@ SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b metadata
 MD5 137f4c16471faf9cb4a7f9b4e834960d files/digest-wmbutton-0.5 473
 RMD160 b692f517218940951b8b54f48f58c18eab62e0c9 files/digest-wmbutton-0.5 473
 SHA256 ee4674d0af9e5e350c319646f1a24018c4ff23472cdb8f2d1959dd33c2e554c6 files/digest-wmbutton-0.5 473
+MD5 2f2c20b265a3d6fd7e46230b1f719b67 files/digest-wmbutton-0.6.1 479
+RMD160 25ef796d300a2efd37420c078cc667c78ff92049 files/digest-wmbutton-0.6.1 479
+SHA256 4feb5dfb1aa7cf81965e9c4d339b40c9cefb7d276f4bcac5fc4b4cb1f9c76589 files/digest-wmbutton-0.6.1 479
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
+}