summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-03 16:03:34 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-03 16:03:34 +0000
commit60dbc778c3527e27f72195e1b913e0cbf7538f62 (patch)
tree3d0930c910c6e90908b30e39a330563b66982230
parentSet same keywords (diff)
downloadhistorical-60dbc778c3527e27f72195e1b913e0cbf7538f62.tar.gz
historical-60dbc778c3527e27f72195e1b913e0cbf7538f62.tar.bz2
historical-60dbc778c3527e27f72195e1b913e0cbf7538f62.zip
moved to x11-plugins
-rw-r--r--x11-misc/bubblemon/ChangeLog148
-rw-r--r--x11-misc/bubblemon/Manifest10
-rw-r--r--x11-misc/bubblemon/bubblemon-1.46-r1.ebuild43
-rw-r--r--x11-misc/bubblemon/bubblemon-1.46-r2.ebuild44
-rw-r--r--x11-misc/bubblemon/bubblemon-2.0.14.ebuild37
-rw-r--r--x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch30
-rw-r--r--x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch124
-rw-r--r--x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch33
-rw-r--r--x11-misc/bubblemon/metadata.xml6
9 files changed, 0 insertions, 475 deletions
diff --git a/x11-misc/bubblemon/ChangeLog b/x11-misc/bubblemon/ChangeLog
deleted file mode 100644
index e4db8d5a8e21..000000000000
--- a/x11-misc/bubblemon/ChangeLog
+++ /dev/null
@@ -1,148 +0,0 @@
-# ChangeLog for x11-misc/bubblemon
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/ChangeLog,v 1.39 2010/06/06 06:31:24 ssuominen Exp $
-
- 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-misc/bubblemon/Manifest b/x11-misc/bubblemon/Manifest
deleted file mode 100644
index d83757858170..000000000000
--- a/x11-misc/bubblemon/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX bubblemon-1.46-asneeded.patch 509 RMD160 04963a864f93254345e6ca02bb71fadda4df822b SHA1 8f19a9e9a7d570e513364bba88a4d09d20e016ea SHA256 6b6502b6e1b0e82b38bc4b28161039705eb24785b122594adacc769138ba2017
-AUX bubblemon-1.46-gtk.patch 3435 RMD160 45e2d5d562237ec1b45553a21cc003796058dccd SHA1 ed04fadb80b5942f5358986881de53ced0d26984 SHA256 6e02353acaebba6d0b0d2fc51ad200e5d499523e933586c41770bf4b652208b1
-AUX bubblemon-1.46-no_display.patch 720 RMD160 0d02f03573c3c1e00db88a1023cce15f3c22abf6 SHA1 5e38dc8d409537698e5c57f79150c70c1882fc96 SHA256 1085f400745c845c2a18c8cb68ec50897a4767c24b35dab479eb5faabe5707dc
-DIST bubblemon-2.0.14.tar.gz 221193 RMD160 1a175178b6ca4f74d3c8d60e2112d03423266c85 SHA1 66990aef47eb4a6fc6197c2ccb82f2ab3d605baf SHA256 720641a930005468fbfefe055b2aa77a2c02c6c2df050794223dce40afb5e261
-DIST bubblemon-dockapp-1.46.tar.gz 40001 RMD160 79e8be36cd11a2c6f4998cd747b6125696603a81 SHA1 172de9ea7d78e4578143469187a72da8f836647a SHA256 f928073d3c69b2668e89b93cdcca5f390437831aab3eac3aa2129f8713e79dbf
-EBUILD bubblemon-1.46-r1.ebuild 1078 RMD160 6578f3d4b018ed3965ffbae2a6cb1a6666e54846 SHA1 62a755d430169045f5395c2904c59ea7c30ed67d SHA256 9a1325bcf11bab03ea486cec1f873538508cd24eb7c08d0f454641f2b975da05
-EBUILD bubblemon-1.46-r2.ebuild 1123 RMD160 b9b0dce3cc3e089783cc9a4c45e6275eb31bdf69 SHA1 633d2082ba6f6918acc6757a64ddc3eec0477b23 SHA256 7870d5662e47f77c34ec95e435d3ffbb5a87fef4a17cfa1b59210fca880cdf3b
-EBUILD bubblemon-2.0.14.ebuild 1046 RMD160 dbbe89e2a1295d8cabcb11d067f457768ed41bf2 SHA1 1521a85db81495f866c501e2b5fba911e769698a SHA256 d8c92836f6a4d6279674b8d936365437f629fee076933eca885524eb8456ddc5
-MISC ChangeLog 5021 RMD160 c96f6734594746ffc5d57dc248e2b2203203d3da SHA1 6fb9858927a0ec8108d025c1081f62cececea885 SHA256 d589beb19b12fffdcee0255ca1ea6fc3b905f313156097733794f4c2cfa640c4
-MISC metadata.xml 475 RMD160 e1a44b901b512304f79749d9fc6e169e39ee7637 SHA1 f2d0cb73e5f48d43773179277def5e21b0863fd2 SHA256 3e736094fe08714e3ad07d7264f2fb0963c06d278975ee53227c73d8227ac3dd
diff --git a/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
deleted file mode 100644
index 1ac3b3a0bcd9..000000000000
--- a/x11-misc/bubblemon/bubblemon-1.46-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 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.9 2010/03/20 17:00:03 ssuominen Exp $
-
-EAPI=2
-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
-}
-
-src_compile() {
- tc-export CC
- emake GENTOO_CFLAGS="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
- dobin bubblemon || die
-
- dodoc ChangeLog README doc/Xdefaults.sample
-
- insinto /usr/share/${PN}
- doins misc/*.{xcf,wav} || die
-
- exeinto /usr/share/${PN}
- doexe misc/wakwak.sh || die
-}
diff --git a/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild b/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild
deleted file mode 100644
index b4dbf68ed94b..000000000000
--- a/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-1.46-r2.ebuild,v 1.1 2010/03/20 17:13:16 ssuominen Exp $
-
-EAPI=2
-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}" || die "emake failed."
-}
-
-src_install() {
- dobin bubblemon || die
-
- dodoc ChangeLog README doc/Xdefaults.sample
-
- insinto /usr/share/${PN}
- doins misc/*.{xcf,wav} || die
-
- exeinto /usr/share/${PN}
- doexe misc/wakwak.sh || die
-}
diff --git a/x11-misc/bubblemon/bubblemon-2.0.14.ebuild b/x11-misc/bubblemon/bubblemon-2.0.14.ebuild
deleted file mode 100644
index fc0f9bfeb459..000000000000
--- a/x11-misc/bubblemon/bubblemon-2.0.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bubblemon/bubblemon-2.0.14.ebuild,v 1.3 2010/01/10 18:39:54 fauli Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit gnome2
-
-DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
-HOMEPAGE="http://www.nongnu.org/bubblemon"
-SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2
- gnome-base/gnome-panel
- gnome-base/libgnomeui
- gnome-base/libgtop"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- nls? ( dev-util/intltool
- sys-devel/gettext )"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog TRANSLATIONS README TODO"
- G2CONF="$(use_enable nls)"
-}
-
-src_prepare() {
- gnome2_src_prepare
- # Fix test suite wrt #295753
- echo gnome/GNOME_BubblemonApplet.server.in >> po/POTFILES.skip
- sed -i -e 's:-g -O2 -Wall -Werror:-Wall:' configure || die "sed failed"
-}
diff --git a/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch
deleted file mode 100644
index 3988f3796964..000000000000
--- a/x11-misc/bubblemon/files/bubblemon-1.46-asneeded.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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-misc/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch
deleted file mode 100644
index fb7aa5981c33..000000000000
--- a/x11-misc/bubblemon/files/bubblemon-1.46-gtk.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -ur bubblemon-dockapp-1.46.orig/bubblemon.c bubblemon-dockapp-1.46/bubblemon.c
---- bubblemon-dockapp-1.46.orig/bubblemon.c 2003-10-01 03:37:32.000000000 +0300
-+++ bubblemon-dockapp-1.46/bubblemon.c 2007-05-28 18:10:43.000000000 +0300
-@@ -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 -ur bubblemon-dockapp-1.46.orig/Makefile bubblemon-dockapp-1.46/Makefile
---- bubblemon-dockapp-1.46.orig/Makefile 2003-10-04 03:22:07.000000000 +0300
-+++ bubblemon-dockapp-1.46/Makefile 2007-05-28 18:11:20.000000000 +0300
-@@ -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-misc/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch
deleted file mode 100644
index f50d4f50d5ec..000000000000
--- a/x11-misc/bubblemon/files/bubblemon-1.46-no_display.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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-misc/bubblemon/metadata.xml b/x11-misc/bubblemon/metadata.xml
deleted file mode 100644
index a8ab00927dd6..000000000000
--- a/x11-misc/bubblemon/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>desktop-misc</herd>
- <longdescription>bubblemon is a cute CPU/memory usage monitor. It displays CPU load as bubbles in a jar of water; the water level depends on how much memory is used. It features load average and memory info screens and a transparent CPU load meter. It supports Linux, FreeBSD, and Solaris.</longdescription>
-</pkgmetadata>