Move from x11-misc to x11-plugins. Delete the SLOT with dependency of (conflicting) libpanelapplet-2.0.

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

6 files changed, 388 insertions, 0 deletions

diff --git a/x11-plugins/bubblemon/ChangeLog b/x11-plugins/bubblemon/ChangeLog
new file mode 100644
index 000000000000..b149aecb711e
--- /dev/null
+++ b/x11-plugins/bubblemon/ChangeLog
@@ -0,0 +1,155 @@
+# ChangeLog for x11-plugins/bubblemon
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bubblemon/ChangeLog,v 1.1 2011/12/03 16:01:52 ssuominen Exp $
+
+  03 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +bubblemon-1.46-r2.ebuild, +files/bubblemon-1.46-asneeded.patch,
+  +files/bubblemon-1.46-gtk.patch, +files/bubblemon-1.46-no_display.patch,
+  -bubblemon-2.0.14.ebuild:
+  Move from x11-misc to x11-plugins. Delete the SLOT with dependency of 
+  (conflicting) libpanelapplet-2.0.
+
+  06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  files/bubblemon-1.46-no_display.patch:
+  Update -no_display.patch patch wrt #310399 by Roman Dobosz.
+
+*bubblemon-1.46-r2 (20 Mar 2010)
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +bubblemon-1.46-r2.ebuild, +files/bubblemon-1.46-no_display.patch:
+  Fix showing up wrt #310399 by Roman Dobosz.
+
+  20 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  bubblemon-1.46-r1.ebuild, +files/bubblemon-1.46-asneeded.patch:
+  Fix building with -Wl,--as-needed.
+
+  10 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
+  bubblemon-1.46-r1.ebuild, bubblemon-2.0.14.ebuild:
+  Transfer Prefix keywords
+
+  23 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+  bubblemon-2.0.14.ebuild:
+  Fix test suite wrt #295753
+
+*bubblemon-2.0.14 (18 Jul 2009)
+
+  18 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +bubblemon-2.0.14.ebuild:
+  Version bump.
+
+*bubblemon-2.0.9 (18 Jan 2009)
+
+  18 Jan 2009; Krzysiek Pawlik <nelchael@gentoo.org>
+  -bubblemon-2.0.8-r1.ebuild, +bubblemon-2.0.9.ebuild:
+  Version bump, ebuild by Tiziano Müller <dev-zero@gentoo.org>, bug #235710.
+  Fixes also bug #229065: missing gnome-base/libgtop from DEPEND.
+
+*bubblemon-2.0.8-r1 (15 Jan 2008)
+
+  15 Jan 2008; Samuli Suominen <drac@gentoo.org> -bubblemon-2.0.8.ebuild,
+  +bubblemon-2.0.8-r1.ebuild:
+  Revision bump to new slot wrt #205937.
+
+*bubblemon-2.0.8 (09 Jan 2008)
+
+  09 Jan 2008; Krzysiek Pawlik <nelchael@gentoo.org>
+  +bubblemon-2.0.8.ebuild:
+  Version bump.
+
+  06 Jan 2008; Samuli Suominen <drac@gentoo.org> bubblemon-1.46-r1.ebuild:
+  Add missing pkgconfig dep wrt #204599
+
+  30 Jun 2007; Raúl Porcel <armin76@gentoo.org> bubblemon-1.46-r1.ebuild:
+  alpha/x86 stable wrt #183638
+
+  29 Jun 2007; Lars Weiler <pylon@gentoo.org> bubblemon-1.46-r1.ebuild:
+  Stable on ppc; bug #183638.
+
+  29 Jun 2007; Christoph Mende <angelos@gentoo.org>
+  bubblemon-1.46-r1.ebuild:
+  Stable on amd64 wrt bug #183638
+
+  29 Jun 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  bubblemon-1.46-r1.ebuild:
+  Stable on sparc wrt #183638
+
+  28 May 2007; Samuli Suominen <drac@gentoo.org>
+  files/bubblemon-1.46-gtk.patch:
+  QA. Don't prestrip binary.
+
+*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
+
+  14 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org> -bubblemon-1.41.ebuild:
+  Remove old version.
+
+  07 Feb 2006; Simon Stelling <blubb@gentoo.org> bubblemon-1.46.ebuild:
+  stable on amd64
+
+  07 Feb 2006; Aron Griffis <agriffis@gentoo.org> bubblemon-1.46.ebuild:
+  Mark 1.46 stable on alpha
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> bubblemon-1.46.ebuild:
+  Stable on ppc.
+
+  02 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> bubblemon-1.46.ebuild:
+  Stable on sparc
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> bubblemon-1.46.ebuild:
+  Stable on x86.
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org> bubblemon-1.41.ebuild,
+  bubblemon-1.46.ebuild:
+  Fixed dodoc not to install COPYING and/or INSTALL.
+
+*bubblemon-1.46 (19 Jun 2005)
+
+  19 Jun 2005; Jonathan Smith <smithj@gentoo.org> -bubblemon-1.4-r1.ebuild,
+  +bubblemon-1.46.ebuild:
+  version bump and old ebuild cleanout
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> bubblemon-1.41.ebuild:
+  stable on amd64, fixes #85669
+
+  06 Jul 2004; Frank van de Pol <fvdpol@gentoo.org> bubblemon-1.41.ebuild:
+  Added ~amd64 keyword. Fixed IUSE="". Closes bug #56005.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> bubblemon-1.4-r1.ebuild,
+  bubblemon-1.41.ebuild:
+  glibc -> libc, add sed-4 dep
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bubblemon-1.41.ebuild:
+  Added IUSE=
+
+  05 Feb 2004; Aron Griffis <agriffis@gentoo.org> bubblemon-1.41.ebuild:
+  stable on alpha
+
+  03 Nov 2003; Abhishek Amit <abhishek@gentoo.org> metadata.xml:
+  Added metadata.xml
+
+*bubblemon-1.41 (02 Nov 2003)
+
+  02 Nov 2003; Markus Nigbur <pyrania@gentoo.org> bubblemon-1.41.ebuild:
+  Version bump.
+
+  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> bubblemon-1.4-r1.ebuild:
+  Fixing sed state. closes #25300.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*bubblemon-1.4-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r2.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r2.ebuild
new file mode 100644
index 000000000000..dbd793066c7d
--- /dev/null
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/bubblemon/bubblemon-1.46-r2.ebuild,v 1.1 2011/12/03 16:01:52 ssuominen Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+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 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${PN}-dockapp-${PV}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gtk.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-no_display.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake GENTOO_CFLAGS="${CFLAGS}"
+}
+
+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-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
new file mode 100644
index 000000000000..3988f3796964
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
@@ -0,0 +1,30 @@
+--- Makefile
++++ Makefile
+@@ -32,14 +32,12 @@
+ OBJS = bubblemon.o
+ BUBBLEMON = bubblemon
+ 
+-LDFLAGS = -shared -Wl
+-
+ STRIP = strip
+ 
+-CC = gcc
++CC ?= gcc
+ INSTALLMAN = -m 644
+ 
+-
++LIBS = -lX11
+ 
+ # special things for Linux
+ ifeq ($(OS), Linux)
+@@ -91,8 +89,8 @@
+ all: $(BUBBLEMON)
+ 
+ bubblemon: clean_obj
+-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
+-		$(LIBS) $(GTK2_LIBS) $(SRCS)
++	$(CC) $(LDFLAGS) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
++		$(SRCS) $(LIBS) $(GTK2_LIBS)
+ 
+ clean_obj:
+ 	rm -rf *.o
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
new file mode 100644
index 000000000000..3383c9f5baed
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -0,0 +1,122 @@
+--- bubblemon.c
++++ bubblemon.c
+@@ -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);
+--- Makefile
++++ Makefile
+@@ -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,21 @@
+     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)
+ 
+-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-plugins/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
new file mode 100644
index 000000000000..f50d4f50d5ec
--- /dev/null
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/310399
+
+--- bubblemon.c
++++ bubblemon.c
+@@ -44,7 +44,7 @@
+  */
+ #define _GNU_SOURCE
+ 
+-#define VERSION "1.41"
++#define VERSION "1.46"
+ 
+ /* general includes */
+ #include <stdio.h>
+@@ -276,6 +276,8 @@
+ 
+ int main(int argc, char **argv)
+ {
++    /* This is needed to proper dockapp work on >=GTK+-2.18 */
++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+     char execute[256];
+     int proximity = 0;
+     int ch;
+@@ -607,10 +609,7 @@
+ 
+     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);
+-#endif
+ 
+     /* We begin with zero bubbles */
+     bm.n_bubbles = 0;
diff --git a/x11-plugins/bubblemon/metadata.xml b/x11-plugins/bubblemon/metadata.xml
new file mode 100644
index 000000000000..b1a9efc4f2f0
--- /dev/null
+++ b/x11-plugins/bubblemon/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-dock</herd>
+</pkgmetadata>