gcc33 fix0rs

5 files changed, 96 insertions, 16 deletions

diff --git a/x11-plugins/wmcp/ChangeLog b/x11-plugins/wmcp/ChangeLog
index 3a5de0e84aea..50aa3a64acb7 100644
--- a/x11-plugins/wmcp/ChangeLog
+++ b/x11-plugins/wmcp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmcp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.2 2003/02/12 09:40:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/ChangeLog,v 1.3 2003/09/24 22:27:00 seemant Exp $
+
+  24 Sep 2003; Seemant Kulleen <seemant@gentoo.org> wmcp-1.2.8.ebuild,
+  files/makefile.diff, files/wmcp-1.2.8-gcc33.patch,
+  files/wmcp-1.2.8-makefile.patch:
+  gcc-3.3 fixes by: Christopher Culver <crculver@users.sourceforge.net> in bug
+  #29157. Also, the patches are renamed to make more sense
 
 *wmcp-1.2.8 (04 Oct 2002)
 
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index 28911f7d07f2..4ec476017557 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,4 +1,5 @@
-MD5 d88455043d54038032007d191bbbf783 ChangeLog 495
-MD5 7cdd0e1a31cfef429796f33746816c5a wmcp-1.2.8.ebuild 687
+MD5 b3aa88514f77658c3179115df55bce34 wmcp-1.2.8.ebuild 770
+MD5 190805c016c353e59331b979356ed3b5 ChangeLog 794
+MD5 bdcccfed4408157d33483585f88c7ccc files/wmcp-1.2.8-makefile.patch 446
 MD5 47184d848f1e3cd7af6cbbf1da2ebdca files/digest-wmcp-1.2.8 60
-MD5 bdcccfed4408157d33483585f88c7ccc files/makefile.diff 446
+MD5 58db56f4ed82092432d3db3cc07748da files/wmcp-1.2.8-gcc33.patch 2397
diff --git a/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch b/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch
new file mode 100644
index 000000000000..018d28217971
--- /dev/null
+++ b/x11-plugins/wmcp/files/wmcp-1.2.8-gcc33.patch
@@ -0,0 +1,74 @@
+diff -urN wmcp-1.2.8/wmcp.c wmcp-1.2.8-new/wmcp.c
+--- wmcp-1.2.8/wmcp.c	1999-05-26 23:38:49.000000000 -0700
++++ wmcp-1.2.8-new/wmcp.c	2003-09-24 15:22:25.000000000 -0700
+@@ -806,38 +806,38 @@
+ void show_usage()
+ {
+ 
+-fprintf(stderr,"
+-
+-%s
+-This software is GPL -- do as you wish with it.
+-
+-Origional Author:
+-   Ben Cohen <buddog@aztec.asu.edu>
+-
+-Contributors:
+-   Thomas Nemeth <tnemeth@multimania.com>
+-   Craig Maloney <craig@ic.net>
+-   Gert Beumer <Gert@scintilla.utwente.nl>
+-
+-
+-
+-usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]
+-            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]
+-
+-
+--g    geometry:    ie: 64x64+10+10
+--d    dpy:         Display. ie: 127.0.0.1:0.0
+--n    workspaces:  How many buttons to start with.
+--a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).
+--w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)
+--s    y/n:         Shaped window: yes or no (default y)
+--c                 Sends CTRL + ALT + Key (default only sends ALT + key)
+--v                 Verbose. 0=off, 1=on (default 0)
+--x                 Number of buttons on the x-direction (1,2,3, or 4)
+--y                 Number of buttons in the y-direction (1,2,3, or 4)
+--h                 Help. This screen.
+-
+-
++fprintf(stderr," \
++\
++%s\
++This software is GPL -- do as you wish with it.\
++\
++Origional Author:\
++   Ben Cohen <buddog@aztec.asu.edu>\
++\
++Contributors:\
++   Thomas Nemeth <tnemeth@multimania.com>\
++   Craig Maloney <craig@ic.net>\
++   Gert Beumer <Gert@scintilla.utwente.nl>\
++\
++\
++\
++usage: wmcp [-g geometry] [-d dpy] [-n workspaces] [-a alt key] [-v]\
++            [-c] [-w i/n/w] [-s y/n] [-x #] [-y #] [-h]\
++\
++\
++-g    geometry:    ie: 64x64+10+10\
++-d    dpy:         Display. ie: 127.0.0.1:0.0\
++-n    workspaces:  How many buttons to start with.\
++-a    alt key:     integer 1-4 defining ModXMask (default 1 Mod1Mask).\
++-w    i/n/w:       Window State: Iconic, Normal, Withdrawn (default Withdrawn)\
++-s    y/n:         Shaped window: yes or no (default y)\
++-c                 Sends CTRL + ALT + Key (default only sends ALT + key)\
++-v                 Verbose. 0=off, 1=on (default 0)\
++-x                 Number of buttons on the x-direction (1,2,3, or 4)\
++-y                 Number of buttons in the y-direction (1,2,3, or 4)\
++-h                 Help. This screen.\
++\
++\
+ ",VERSION);
+ 
+ exit(-1);
diff --git a/x11-plugins/wmcp/files/makefile.diff b/x11-plugins/wmcp/files/wmcp-1.2.8-makefile.patch
index 273dd23877ba..273dd23877ba 100644
--- a/x11-plugins/wmcp/files/makefile.diff
+++ b/x11-plugins/wmcp/files/wmcp-1.2.8-makefile.patch
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index 344f3b402109..00da5a13cf22 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -1,37 +1,36 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.3 2003/02/13 17:28:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcp/wmcp-1.2.8.ebuild,v 1.4 2003/09/24 22:27:00 seemant Exp $
 
-S="${WORKDIR}/${P}"
+inherit eutils
 
+IUSE=""
+
+S=${WORKDIR}/${P}
 DESCRIPTION="A pager dockapp"
-HOMEPAGE="http://www.the.page.doesnt.seem.to.exist.anymore.com"
+HOMEPAGE="http://www.dockapps.com/file.php/id/158"
 SRC_URI="http://linux-sea.tucows.webusenet.com/files/x11/dock/${P}.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ~amd64 ~ia64 ~ppc ~sparc ~alpha ~hppa ~mips ~arm"
 
 DEPEND="virtual/glibc
 	virtual/x11"
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	patch -p1 < ${FILESDIR}/makefile.diff || die "patch failed"
-
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-gcc33.patch
 }
 
 src_compile() {
-
 	make || die "make failed"
-
 }
 
 src_install() {
-
 	cd ${S}
 	dobin wmcp
-
+	dodoc README
 }