Ported to GTK+-2.0.

Package-Manager: portage-2.1.4

5 files changed, 121 insertions, 6 deletions

diff --git a/x11-plugins/wmfishtime/ChangeLog b/x11-plugins/wmfishtime/ChangeLog
index 08e8c8488d10..886a80d775e4 100644
--- a/x11-plugins/wmfishtime/ChangeLog
+++ b/x11-plugins/wmfishtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmfishtime
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.15 2007/02/21 23:33:05 jokey Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.16 2008/01/12 14:39:07 drac Exp $
+
+*wmfishtime-1.24-r1 (12 Jan 2008)
+
+  12 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wmfishtime-1.24-gtk.patch, +wmfishtime-1.24-r1.ebuild:
+  Ported to GTK+-2.0.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index 259884d5f9b4..5b2823a7177b 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -1,12 +1,20 @@
+AUX wmfishtime-1.24-gtk.patch 1884 RMD160 ecfa813ee49205d7773fe622228860225fe4cadb SHA1 384092b0d1cda44f39de420cdce1d4a6495d3972 SHA256 93bfe8894fbd62110279fb4b98631f7d4077924ca393fb25030085a438337e73
+MD5 ffc0488ad6c77c0c69a490f3dc0278ed files/wmfishtime-1.24-gtk.patch 1884
+RMD160 ecfa813ee49205d7773fe622228860225fe4cadb files/wmfishtime-1.24-gtk.patch 1884
+SHA256 93bfe8894fbd62110279fb4b98631f7d4077924ca393fb25030085a438337e73 files/wmfishtime-1.24-gtk.patch 1884
 DIST wmfishtime-1.24.tar.gz 21895 RMD160 9c705351ecbc28e15fd8e3b73712940fdb73baf1 SHA1 f5c730102787bac48b19bb5418a70333cbe22c31 SHA256 7d92889d295558acd8af79f4d74c6fa7c980ac1010b7f0691249a117b34bba07
+EBUILD wmfishtime-1.24-r1.ebuild 868 RMD160 bbfc6eba34deb874cc612f1c795ae1fec156136d SHA1 a2f45d95cd6fd36fdad1f43e2778995df3920a87 SHA256 08378df8fc02fd55c51fdc4129bdaaa972c29a3954b8709361b822f6394a46d5
+MD5 b50a6ce2861f35ab9ae794cda993efe1 wmfishtime-1.24-r1.ebuild 868
+RMD160 bbfc6eba34deb874cc612f1c795ae1fec156136d wmfishtime-1.24-r1.ebuild 868
+SHA256 08378df8fc02fd55c51fdc4129bdaaa972c29a3954b8709361b822f6394a46d5 wmfishtime-1.24-r1.ebuild 868
 EBUILD wmfishtime-1.24.ebuild 845 RMD160 3823be9369d6d1ec04bbd302d881412656c8ff0b SHA1 f11790b0fac6f1f5c6302b282f9bcb8a66e361bd SHA256 05bf66c4b7682a378bcdf96484d7628c5a999035029fa6d42fb7d3b25604cd06
 MD5 16602e3da3d071a9d077f7b2785f2424 wmfishtime-1.24.ebuild 845
 RMD160 3823be9369d6d1ec04bbd302d881412656c8ff0b wmfishtime-1.24.ebuild 845
 SHA256 05bf66c4b7682a378bcdf96484d7628c5a999035029fa6d42fb7d3b25604cd06 wmfishtime-1.24.ebuild 845
-MISC ChangeLog 2119 RMD160 632385542051b54d967955c01df98ad697530f10 SHA1 7d03535cb1d775ffa408c2b8f7f5882a7ad052e5 SHA256 be846d0eaba8ddac1aba4563ff56add9192cbb956d337f007df55627ebc7fc93
-MD5 0b3ffa7e882ade52f8e573c0a5a0034a ChangeLog 2119
-RMD160 632385542051b54d967955c01df98ad697530f10 ChangeLog 2119
-SHA256 be846d0eaba8ddac1aba4563ff56add9192cbb956d337f007df55627ebc7fc93 ChangeLog 2119
+MISC ChangeLog 2289 RMD160 e69d250068fd75bac650a450ce734a1176f7f134 SHA1 05360c6d88870117222007f58fe287c29451f6cd SHA256 b94d0c13d8fbc98b7da4cff4cae2ccaf6ee73ad3f0a59b5e683b6988803453e0
+MD5 2eb77e8436590181101b19e94c63d375 ChangeLog 2289
+RMD160 e69d250068fd75bac650a450ce734a1176f7f134 ChangeLog 2289
+SHA256 b94d0c13d8fbc98b7da4cff4cae2ccaf6ee73ad3f0a59b5e683b6988803453e0 ChangeLog 2289
 MISC metadata.xml 396 RMD160 cba926ac579cdb4d135c5338b6597dd49ed5b120 SHA1 f32024f42bb6a9d6e032a67d9177cd94b4bcc2fb SHA256 408da5ae70622c2703307535092ef871ac1f9cb3abe178a18c7d2f0a462f452f
 MD5 aeefe0a88d62157055bc87ee91bd2eb9 metadata.xml 396
 RMD160 cba926ac579cdb4d135c5338b6597dd49ed5b120 metadata.xml 396
@@ -14,3 +22,6 @@ SHA256 408da5ae70622c2703307535092ef871ac1f9cb3abe178a18c7d2f0a462f452f metadata
 MD5 38ac84307135b5bbdf4a9d8d474763b4 files/digest-wmfishtime-1.24 244
 RMD160 0a634fb2e42a4dbbf019792bcf9c804aa9a8e87a files/digest-wmfishtime-1.24 244
 SHA256 55cdaa876a847e316ac7a7dff2710999981196251971ed192cf68cfe3be0fe21 files/digest-wmfishtime-1.24 244
+MD5 38ac84307135b5bbdf4a9d8d474763b4 files/digest-wmfishtime-1.24-r1 244
+RMD160 0a634fb2e42a4dbbf019792bcf9c804aa9a8e87a files/digest-wmfishtime-1.24-r1 244
+SHA256 55cdaa876a847e316ac7a7dff2710999981196251971ed192cf68cfe3be0fe21 files/digest-wmfishtime-1.24-r1 244
diff --git a/x11-plugins/wmfishtime/files/digest-wmfishtime-1.24-r1 b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.24-r1
new file mode 100644
index 000000000000..781cad5bd388
--- /dev/null
+++ b/x11-plugins/wmfishtime/files/digest-wmfishtime-1.24-r1
@@ -0,0 +1,3 @@
+MD5 8723b7c6a58b8c41a1dd5973ede4b296 wmfishtime-1.24.tar.gz 21895
+RMD160 9c705351ecbc28e15fd8e3b73712940fdb73baf1 wmfishtime-1.24.tar.gz 21895
+SHA256 7d92889d295558acd8af79f4d74c6fa7c980ac1010b7f0691249a117b34bba07 wmfishtime-1.24.tar.gz 21895
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
new file mode 100644
index 000000000000..a2c8342938f5
--- /dev/null
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch
@@ -0,0 +1,60 @@
+diff -ur wmfishtime-1.24.orig/fishmon.c wmfishtime-1.24/fishmon.c
+--- wmfishtime-1.24.orig/fishmon.c	2004-05-13 02:55:59.000000000 +0300
++++ wmfishtime-1.24/fishmon.c	2008-01-12 16:19:34.000000000 +0200
+@@ -648,6 +648,7 @@
+ 
+     /* make a copy for the iconwin - parameters are the same */
+     memcpy(&attri, &attr, sizeof(GdkWindowAttr));
++    attri.window_type = GDK_WINDOW_CHILD;
+ 
+     sizehints.flags = USSize;
+     sizehints.width = 64;
+@@ -679,7 +680,6 @@
+     wmhints.window_group = win;
+     wmhints.flags =
+ 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+-    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+ 
+     bm.gc = gdk_gc_new(bm.win);
+ 
+@@ -693,6 +693,8 @@
+ 
+     gdk_window_show(bm.win);
+ 
++    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++
+ #undef MASK
+ }				/* make_new_fishmon_dockapp */
+ 
+diff -ur wmfishtime-1.24.orig/Makefile wmfishtime-1.24/Makefile
+--- wmfishtime-1.24.orig/Makefile	2001-05-26 23:49:41.000000000 +0300
++++ wmfishtime-1.24/Makefile	2008-01-12 16:22:30.000000000 +0200
+@@ -2,11 +2,11 @@
+ DESTDIR =
+ 
+ # where to install this program
+-PREFIX = $(DESTDIR)/usr/X11R6
++PREFIX = $(DESTDIR)/usr
+ 
+ # no user serviceable parts below this line
+ # optimization cflags
+-CFLAGS = -O3 -Wall `gtk-config --cflags` ${EXTRA}
++CFLAGS += -Wall `pkg-config gtk+-2.0 --cflags` ${EXTRA}
+ # profiling cflags
+ # CFLAGS=-ansi -pedantic -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
+ # test coverage cflags
+@@ -16,7 +16,7 @@
+ CC = gcc
+ SHELL = sh
+ OBJS = fishmon.o
+-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
++LIBS = `pkg-config gtk+-2.0 --libs`
+ INSTALL = -m 755
+ 
+ all: wmfishtime
+@@ -30,4 +30,4 @@
+ # You're going to have to be root to do this!
+ install:
+ 	install $(INSTALL) wmfishtime $(PREFIX)/bin
+-	install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1
++	install $(INSTALL) wmfishtime.1 $(PREFIX)/share/man/man1
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r1.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r1.ebuild
new file mode 100644
index 000000000000..c696fc517251
--- /dev/null
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.24-r1.ebuild,v 1.1 2008/01/12 14:39:07 drac Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gtk.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ALL_I_GET_IS_A_GRAY_BOX AUTHORS ChangeLog CODING README
+}