Stop using epatch in src_compile, use toolchain-funcs for CC and some more.

Package-Manager: portage-2.1.4

6 files changed, 83 insertions, 64 deletions

diff --git a/x11-plugins/wmtz/ChangeLog b/x11-plugins/wmtz/ChangeLog
index a05793c0d682..c985727d77f9 100644
--- a/x11-plugins/wmtz/ChangeLog
+++ b/x11-plugins/wmtz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmtz
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.16 2007/07/22 04:24:31 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/ChangeLog,v 1.17 2008/01/12 13:36:30 drac Exp $
+
+  12 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  -files/wmtz-0.7-gcc34.patch, +files/wmtz-0.7.patch, -files/wmtz.c.patch,
+  wmtz-0.7.ebuild:
+  Stop using epatch in src_compile, use toolchain-funcs for CC and some more.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; wmtz-0.7.ebuild:
   Drop virtual/x11 references.
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
index b6786c1f1b96..24e5a327c984 100644
--- a/x11-plugins/wmtz/Manifest
+++ b/x11-plugins/wmtz/Manifest
@@ -1,20 +1,16 @@
-AUX wmtz-0.7-gcc34.patch 336 RMD160 d2996f4e753510f9757c3f6df045199873683560 SHA1 f2e6814365e1572a49a9f60fa1384606a9071a0e SHA256 640ddff0d6c8f33e6aae666aee2a2192126f11ff61d7efc27a09281f708fa84b
-MD5 f44970f0cb57d7fca808329d20d45902 files/wmtz-0.7-gcc34.patch 336
-RMD160 d2996f4e753510f9757c3f6df045199873683560 files/wmtz-0.7-gcc34.patch 336
-SHA256 640ddff0d6c8f33e6aae666aee2a2192126f11ff61d7efc27a09281f708fa84b files/wmtz-0.7-gcc34.patch 336
-AUX wmtz.c.patch 465 RMD160 842e4631fcbbdd33889b37f805532255775dbd76 SHA1 02acd43d7d941187448f1d08aa63311e8d416846 SHA256 33b02b6364e47d2c064f30c859fc4174861ba366c05ccb1968832929ec070eb5
-MD5 87d237cba796423d80d030a210401ed0 files/wmtz.c.patch 465
-RMD160 842e4631fcbbdd33889b37f805532255775dbd76 files/wmtz.c.patch 465
-SHA256 33b02b6364e47d2c064f30c859fc4174861ba366c05ccb1968832929ec070eb5 files/wmtz.c.patch 465
+AUX wmtz-0.7.patch 1305 RMD160 cf83b40f13aaeaacc57dbac6dd6fa4f743a5877a SHA1 07559f1b85305000e98e7eb37a96cfb3e03ded9e SHA256 07039bcd9811362e2f20a5b51b512fabbb4133f3d982c27c7b8145fd5d9aaf17
+MD5 2078e9f04b090ea87509e0a30e4e414a files/wmtz-0.7.patch 1305
+RMD160 cf83b40f13aaeaacc57dbac6dd6fa4f743a5877a files/wmtz-0.7.patch 1305
+SHA256 07039bcd9811362e2f20a5b51b512fabbb4133f3d982c27c7b8145fd5d9aaf17 files/wmtz-0.7.patch 1305
 DIST wmtz-0.7.tar.gz 26350 RMD160 c8707f3ff3c7078077fcefa9afaf0fc6cc8286a1 SHA1 4cfd67a1357ff6c1b54b64296cb5b79c63727d4a SHA256 cb09e64a9823b3da71e542d7cc66e6cbd0135809bee1e565d18acdcf0565823a
-EBUILD wmtz-0.7.ebuild 937 RMD160 b1c30da70a0a56d75ffa1c0dff7a7eed25254430 SHA1 3289ea9d2429e26d19f2e5f1dfeac263f44a8d65 SHA256 6da6e621d1f3b19b9bc70df787af77b0a121071c62bba048eae56b31c2b248ab
-MD5 2fd624692669193775f5002008ae0589 wmtz-0.7.ebuild 937
-RMD160 b1c30da70a0a56d75ffa1c0dff7a7eed25254430 wmtz-0.7.ebuild 937
-SHA256 6da6e621d1f3b19b9bc70df787af77b0a121071c62bba048eae56b31c2b248ab wmtz-0.7.ebuild 937
-MISC ChangeLog 1944 RMD160 0a4ac030258286eb4e54dc7b497ca80621b6236e SHA1 5d36009ca0ae5d7d02bf432067bcfa7e4c942497 SHA256 06120871cdb6d3661128a18b0ac46e907f143c3967e2bdc75412b8ac7dc11ef3
-MD5 583f5f3bfa174b85e1af573f59d4c27f ChangeLog 1944
-RMD160 0a4ac030258286eb4e54dc7b497ca80621b6236e ChangeLog 1944
-SHA256 06120871cdb6d3661128a18b0ac46e907f143c3967e2bdc75412b8ac7dc11ef3 ChangeLog 1944
+EBUILD wmtz-0.7.ebuild 928 RMD160 c6cb72012807cf1df9006c6eb5fcd0ef72455fa6 SHA1 5ec44bc170f9db737cfeb0fb4f26bbe4e4be4880 SHA256 d6a134508a68275a91283cd59abd72beb911a0de07632c8b2e1ed8700a57b8b7
+MD5 0e87bbd59efe34b09f7d48cb20b05dfd wmtz-0.7.ebuild 928
+RMD160 c6cb72012807cf1df9006c6eb5fcd0ef72455fa6 wmtz-0.7.ebuild 928
+SHA256 d6a134508a68275a91283cd59abd72beb911a0de07632c8b2e1ed8700a57b8b7 wmtz-0.7.ebuild 928
+MISC ChangeLog 2161 RMD160 1bfeca75b3b0c7dd806a0b6329cd9cfb32a06de4 SHA1 4c2287d5bad2749b421b7dc63c4b1df1be434236 SHA256 bdc6e2478888e3e4b1b6da61e00b001362143a1f6454a3671e9cf8282586805d
+MD5 10937ca0360aeb1b3e46bb3db53a029b ChangeLog 2161
+RMD160 1bfeca75b3b0c7dd806a0b6329cd9cfb32a06de4 ChangeLog 2161
+SHA256 bdc6e2478888e3e4b1b6da61e00b001362143a1f6454a3671e9cf8282586805d ChangeLog 2161
 MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c metadata.xml 165
diff --git a/x11-plugins/wmtz/files/wmtz-0.7-gcc34.patch b/x11-plugins/wmtz/files/wmtz-0.7-gcc34.patch
deleted file mode 100644
index 2eeb153626a0..000000000000
--- a/x11-plugins/wmtz/files/wmtz-0.7-gcc34.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- wmtz-0.7/wmtz/wmtz.c.old	2004-09-18 11:52:09.487481335 -0700
-+++ wmtz-0.7/wmtz/wmtz.c	2004-09-18 11:52:45.805696921 -0700
-@@ -478,6 +478,7 @@
- 		   but_stat = -1;
-                    break;
- 	    default:
-+	    break;
- 	  }
-         }  
- 
-@@ -528,6 +529,7 @@
- 	    exit(0);
- 	    break;
- 	default:
-+	break;
-       }
-     return;
- }
diff --git a/x11-plugins/wmtz/files/wmtz-0.7.patch b/x11-plugins/wmtz/files/wmtz-0.7.patch
new file mode 100644
index 000000000000..adb5c68f1b6c
--- /dev/null
+++ b/x11-plugins/wmtz/files/wmtz-0.7.patch
@@ -0,0 +1,48 @@
+diff -ur wmtz-0.7.orig/wmtz/Makefile wmtz-0.7/wmtz/Makefile
+--- wmtz-0.7.orig/wmtz/Makefile	2001-03-11 15:57:59.000000000 +0200
++++ wmtz-0.7/wmtz/Makefile	2008-01-12 15:24:29.000000000 +0200
+@@ -1,5 +1,5 @@
+ CC = gcc
+-LIBDIR = -L/usr/X11R6/lib
++LIBDIR = -L/usr/lib
+ LIBS   = -lXpm -lXext -lX11 -lm
+ FLAGS = -O2
+ DESTDIR = /usr/local
+@@ -10,7 +10,7 @@
+ 
+ 
+ .c.o:
+-	$(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
++	$(CC) -I/usr/include $(FLAGS) -c -Wall $< -o $*.o
+ 
+ wmtz: $(OBJS)
+ 	$(CC) $(FLAGS) -o wmtz $^ -lXext $(LIBDIR) $(LIBS)
+diff -ur wmtz-0.7.orig/wmtz/wmtz.c wmtz-0.7/wmtz/wmtz.c
+--- wmtz-0.7.orig/wmtz/wmtz.c	2001-04-16 22:26:34.000000000 +0300
++++ wmtz-0.7/wmtz/wmtz.c	2008-01-12 15:17:37.000000000 +0200
+@@ -51,8 +51,7 @@
+ #define STRSIZE 10
+ #define LMST 1
+ #define GMST 0
+-#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7
+-http://www.geocities.com/jl1n/wmtz/wmtz.html\""
++#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\""
+ 
+ 
+ /*
+@@ -479,6 +478,7 @@
+ 		   but_stat = -1;
+                    break;
+ 	    default:
++	    break;
+ 	  }
+         }  
+ 
+@@ -529,6 +529,7 @@
+ 	    exit(0);
+ 	    break;
+ 	default:
++	break;
+       }
+     return;
+ }
diff --git a/x11-plugins/wmtz/files/wmtz.c.patch b/x11-plugins/wmtz/files/wmtz.c.patch
deleted file mode 100644
index 7ae6edf247fb..000000000000
--- a/x11-plugins/wmtz/files/wmtz.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- wmtz.c	2001-04-16 21:26:34.000000000 +0200
-+++ wmtz.c_	2004-04-07 14:15:06.171481088 +0200
-@@ -51,8 +51,7 @@
- #define STRSIZE 10
- #define LMST 1
- #define GMST 0
--#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7
--http://www.geocities.com/jl1n/wmtz/wmtz.html\""
-+#define ABOUT "xmessage -center -buttons \"Close\" \"WMTZ - Window Maker Time Zone dockapp v0.7\nhttp://www.geocities.com/jl1n/wmtz/wmtz.html\""
- 
- 
- /*
diff --git a/x11-plugins/wmtz/wmtz-0.7.ebuild b/x11-plugins/wmtz/wmtz-0.7.ebuild
index d88e47bde948..e2784c8aa007 100644
--- a/x11-plugins/wmtz/wmtz-0.7.ebuild
+++ b/x11-plugins/wmtz/wmtz-0.7.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.16 2007/07/22 04:24:31 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmtz/wmtz-0.7.ebuild,v 1.17 2008/01/12 13:36:30 drac Exp $
 
-inherit eutils toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
-IUSE=""
 DESCRIPTION="dockapp that shows the time in multiple timezones."
-SRC_URI="http://www.geocities.com/jl1n/wmtz/${P}.tar.gz"
 HOMEPAGE="http://www.geocities.com/jl1n/wmtz/wmtz.html"
+SRC_URI="http://www.geocities.com/jl1n/wmtz/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc ~sparc"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
@@ -19,23 +19,23 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xextproto"
 
+S=${WORKDIR}/${P}/${PN}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	#apply both patches to compile with gcc-3.4 closing bug #64556
-	epatch ${FILESDIR}/wmtz-0.7-gcc34.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
 }
 
 src_compile() {
-	cd ${S}/wmtz
-	epatch ${FILESDIR}/wmtz.c.patch
-	emake FLAGS="$CFLAGS" || die
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
+		LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
 }
 
 src_install () {
-	dobin wmtz/wmtz
+	dobin ${PN}
+	doman ${PN}.1
 	insinto /etc
-	doins wmtz/wmtzrc
-	dodoc BUGS CHANGES README
+	doins wmtzrc
+	dodoc ../{BUGS,CHANGES,README}
 }