Thanks to 6thpink and Bernard Cafarelli for porting bubblemon to GTK+-2.0 in bug 175730.

Package-Manager: portage-2.1.2.7

5 files changed, 192 insertions, 15 deletions

diff --git a/x11-misc/bubblemon/ChangeLog b/x11-misc/bubblemon/ChangeLog
index c54b1399b2b4..33c28129716d 100644
--- a/x11-misc/bubblemon/ChangeLog
+++ b/x11-misc/bubblemon/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/bubblemon
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.22 2007/02/21 23:34:01 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.23 2007/05/28 14:56:32 drac Exp $
+
+*bubblemon-1.46-r1 (28 May 2007)
+
+  28 May 2007; Samuli Suominen <drac@gentoo.org>
+  +files/bubblemon-1.46-gtk.patch, +bubblemon-1.46-r1.ebuild:
+  Thanks to 6thpink and Bernard Cafarelli for porting bubblemon to GTK+-2.0 in
+  bug 175730.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest
index fbce638d3f47..133ad4e6ef74 100644
--- a/x11-misc/bubblemon/Manifest
+++ b/x11-misc/bubblemon/Manifest
@@ -1,15 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX bubblemon-1.46-gtk.patch 3463 RMD160 3ce7b44770d70f892fca5c736cf88ef0e91a53d9 SHA1 629ccecc31df2652a2f05be9cec1b023add140a0 SHA256 76e971e8cc25d2bdcea6fd230c642d8bba988448ed3e6c8934876082397e8b81
+MD5 d84613ebc50402cada4b1bb7cc239267 files/bubblemon-1.46-gtk.patch 3463
+RMD160 3ce7b44770d70f892fca5c736cf88ef0e91a53d9 files/bubblemon-1.46-gtk.patch 3463
+SHA256 76e971e8cc25d2bdcea6fd230c642d8bba988448ed3e6c8934876082397e8b81 files/bubblemon-1.46-gtk.patch 3463
 DIST bubblemon-dockapp-1.46.tar.gz 40001 RMD160 79e8be36cd11a2c6f4998cd747b6125696603a81 SHA1 172de9ea7d78e4578143469187a72da8f836647a SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf
+EBUILD bubblemon-1.46-r1.ebuild 954 RMD160 a9138ff90cae415b4122a48d2ee36eba1922724c SHA1 4304e93a441da4fdbb75e722d0894ef8f77505c4 SHA256 ec8b2e4f3f6b8fff35b61f92daec552236a94d2fc0a625f0a8af094035a421c8
+MD5 de6ae9e39715af3c2ca1d3bd660c62f8 bubblemon-1.46-r1.ebuild 954
+RMD160 a9138ff90cae415b4122a48d2ee36eba1922724c bubblemon-1.46-r1.ebuild 954
+SHA256 ec8b2e4f3f6b8fff35b61f92daec552236a94d2fc0a625f0a8af094035a421c8 bubblemon-1.46-r1.ebuild 954
 EBUILD bubblemon-1.46.ebuild 772 RMD160 dc6202f29efad132c25255cfdea20ebd4b163070 SHA1 a898fdf700f0395ceb707fd2fffb68cb34de2aa1 SHA256 a2e05199b7b47fdc00bc8d591f8a3f12ee26cdfd4e921e55ccc3761def945f14
 MD5 199813afbeec8ec8bc426b2174b68869 bubblemon-1.46.ebuild 772
 RMD160 dc6202f29efad132c25255cfdea20ebd4b163070 bubblemon-1.46.ebuild 772
 SHA256 a2e05199b7b47fdc00bc8d591f8a3f12ee26cdfd4e921e55ccc3761def945f14 bubblemon-1.46.ebuild 772
-MISC ChangeLog 2617 RMD160 087ee8e07b823f35186f787127c7fcf5ce62a803 SHA1 c86d9039effc08189de1d89ca7154013d4276aee SHA256 8129e1af2355559db0d8fa025cc3984c9ce8b19a986ae7fbc450721c92ffaca7
-MD5 97fda0eaafbd53da43557f9432cc9553 ChangeLog 2617
-RMD160 087ee8e07b823f35186f787127c7fcf5ce62a803 ChangeLog 2617
-SHA256 8129e1af2355559db0d8fa025cc3984c9ce8b19a986ae7fbc450721c92ffaca7 ChangeLog 2617
+MISC ChangeLog 2855 RMD160 bf870fff8162175e2d7237b97bf4be03a11f4708 SHA1 a1f7ce305131b7f4dffe568566c8b8fd7bcae191 SHA256 ea41d471019f38025432fa12b3c0ffbf8d0466a3c88c7bab5de21b289703dd5e
+MD5 fca17c0dbd46ba729429216cd5501a7d ChangeLog 2855
+RMD160 bf870fff8162175e2d7237b97bf4be03a11f4708 ChangeLog 2855
+SHA256 ea41d471019f38025432fa12b3c0ffbf8d0466a3c88c7bab5de21b289703dd5e ChangeLog 2855
 MISC metadata.xml 475 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 SHA1 f2d0cb73e5f48d43773179277def5e21b0863fd2 SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd
 MD5 02ca957f8c970d5cd91927128ee317df metadata.xml 475
 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 metadata.xml 475
@@ -17,10 +22,6 @@ SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd metadata
 MD5 3f0ea1956b0b145a3db88943f26457e8 files/digest-bubblemon-1.46 265
 RMD160 96825844d8cd85073a0936cbfec3d0ce06837adc files/digest-bubblemon-1.46 265
 SHA256 f6eba542097a657310d72219bf33bc891b6a17e8ff1f3e13d79254faa526df30 files/digest-bubblemon-1.46 265
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3NaAz974XjDVpbkRArc5AKDPkpj8m0QBo1DoRw7QaFst53ByRgCdFuZv
-lIPJO3rpMqf8DU/iq9H6+sc=
-=DG2S
------END PGP SIGNATURE-----
+MD5 3f0ea1956b0b145a3db88943f26457e8 files/digest-bubblemon-1.46-r1 265
+RMD160 96825844d8cd85073a0936cbfec3d0ce06837adc files/digest-bubblemon-1.46-r1 265
+SHA256 f6eba542097a657310d72219bf33bc891b6a17e8ff1f3e13d79254faa526df30 files/digest-bubblemon-1.46-r1 265
diff --git a/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
new file mode 100644
index 000000000000..b745a5dca26e
--- /dev/null
+++ b/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild,v 1.1 2007/05/28 14:56:32 drac Exp $
+
+inherit eutils
+
+DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/gtk+-2"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-dockapp-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gtk.patch
+}
+
+src_compile() {
+	emake GENTOO_CFLAGS="${CFLAGS}" || die "emake failed."
+}
+
+src_install () {
+	dobin bubblemon
+
+	dodoc ChangeLog README doc/Xdefaults.sample
+
+	insinto /usr/share/${PN}
+	doins misc/{*.xcf,*.wav}
+
+	exeinto /usr/share/${PN}
+	doexe misc/wakwak.sh
+}
diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch
new file mode 100644
index 000000000000..e86111c924ac
--- /dev/null
+++ b/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -0,0 +1,125 @@
+diff -Naur bubblemon-dockapp-1.46.orig/bubblemon.c bubblemon-dockapp-1.46/bubblemon.c
+--- bubblemon-dockapp-1.46.orig/bubblemon.c	2003-10-01 02:37:32.000000000 +0200
++++ bubblemon-dockapp-1.46/bubblemon.c	2007-05-28 16:11:57.000000000 +0200
+@@ -58,6 +58,7 @@
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+ #include <X11/Xresource.h>
++#include <gtk/gtk.h>
+ 
+ #include "include/master.xpm"
+ #include "include/bubblemon.h"
+@@ -575,7 +576,7 @@
+     attri.colormap = gdk_colormap_get_system();
+     attri.wmclass_name = "bubblemon";
+     attri.wmclass_class = "bubblemon";
+-    attri.window_type = GDK_WINDOW_TOPLEVEL;
++    attri.window_type = GDK_WINDOW_CHILD;
+ 
+     bm.iconwin = gdk_window_new(bm.win, &attri,
+ 				GDK_WA_TITLE | GDK_WA_WMCLASS);
+@@ -593,7 +594,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);
+ 
+@@ -606,6 +606,7 @@
+     gdk_window_set_back_pixmap(bm.iconwin, bm.pixmap, False);
+ 
+     gdk_window_show(bm.win);
++    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
+ #ifdef KDE_DOCKAPP
+     /* makes the dockapp visible inside KDE wm */
+     gdk_window_show(bm.iconwin);
+diff -Naur bubblemon-dockapp-1.46.orig/Makefile bubblemon-dockapp-1.46/Makefile
+--- bubblemon-dockapp-1.46.orig/Makefile	2003-10-04 02:22:07.000000000 +0200
++++ bubblemon-dockapp-1.46/Makefile	2007-05-28 16:12:26.000000000 +0200
+@@ -11,30 +11,49 @@
+ 
+ # no user serviceable parts below
+ EXTRA += $(WMAN)
++# gtk cflags and gtk lib flags
++GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
++GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs)
++
++
+ # optimization cflags
+-CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA}
++#CFLAGS = -O3 -Wall ${EXTRA}
++CFLAGS = ${GENTOO_CFLAGS} ${EXTRA}
++
+ # profiling cflags
+-# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
++# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO
+ # test coverage cflags
+-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
++# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
+ 
+ 
+-SHELL=sh
++SHELL = sh
+ OS = $(shell uname -s)
++SRCS = bubblemon.c
+ OBJS = bubblemon.o
++BUBBLEMON = bubblemon
++
++LDFLAGS = -shared -Wl
++
++STRIP = strip
++
+ CC = gcc
++INSTALLMAN = -m 644
++
++
+ 
+ # special things for Linux
+ ifeq ($(OS), Linux)
+-    OBJS += sys_linux.o
+-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+-    INSTALL = -m 755
++	SRCS += sys_linux.c
++	OBJS += sys_linux.o
++	INSTALL = -m 755
++	INSTALLMAN = -m 644
+ endif
+ 
+ # special things for FreeBSD
+ ifeq ($(OS), FreeBSD)
++	SRCS += sys_freebsd.c
+     OBJS += sys_freebsd.o
+-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -lkvm
++    LIBS = -lkvm
+     INSTALL = -c -g kmem -m 2755 -o root
+ endif
+ 
+@@ -62,17 +81,22 @@
+     ifeq ($(COMPILER), gcc)
+ 	CFLAGS=-O3 -Wall
+     endif
+-    CFLAGS +=`gtk-config --cflags` ${EXTRA}
++    CFLAGS += ${EXTRA}
++	SRCS += sys_sunos.c
+     OBJS += sys_sunos.o
+-    LIBS = `gtk-config --libs` -lkstat -lm
++    LIBS = -lkstat -lm
+     INSTALL = -m 755
+ endif
+ 
++all: $(BUBBLEMON)
+ 
+-all: bubblemon
++bubblemon: clean_obj
++	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
++		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(STRIP) $(BUBBLEMON)
+ 
+-bubblemon: $(OBJS)
+-	$(CC) $(CFLAGS) -o bubblemon $(OBJS) $(LIBS)
++clean_obj:
++	rm -rf *.o
+ 
+ clean:
+ 	rm -f bubblemon *.o *.bb* *.gcov gmon.* *.da *~
diff --git a/x11-misc/bubblemon/files/digest-bubblemon-1.46-r1 b/x11-misc/bubblemon/files/digest-bubblemon-1.46-r1
new file mode 100644
index 000000000000..f90255b28757
--- /dev/null
+++ b/x11-misc/bubblemon/files/digest-bubblemon-1.46-r1
@@ -0,0 +1,3 @@
+MD5 f1f86fe5c725bf3a6f5fef8709992931 bubblemon-dockapp-1.46.tar.gz 40001
+RMD160 79e8be36cd11a2c6f4998cd747b6125696603a81 bubblemon-dockapp-1.46.tar.gz 40001
+SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf bubblemon-dockapp-1.46.tar.gz 40001