reinit the tree, so we can have metadata

6 files changed, 226 insertions, 0 deletions

diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
new file mode 100644
index 000000000000..35775bd1e291
--- /dev/null
+++ b/x11-plugins/wmfire/Manifest
@@ -0,0 +1,8 @@
+AUX wmfire-1.2.3-stringh.patch 352 SHA256 e3058bfc7c44584a405e16232747559e264153800e3b04309931ac5ce4cd1991 SHA512 bd0e66712cb88eb61dc4348d3f08775b6673598cb8e74a8d4c2cc437c6c9a515b1bd1568edda70d6b60f6e88da6eabe38c5bf800571ccc72c493bf367a435a94 WHIRLPOOL 087a1830879e1de58ce7eefdd4223a68c4b8d09d45321eb74121f1df9f3dd4841af2c6c835af3474f8479af839c1fc0906e0d7a5b6e056f3b26cad5f699302a3
+AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 SHA256 c54aeb288db41e4b753bf87b7d6f5330808c672ca94732e4f55e8673bd3c385b SHA512 2d0bdc693e53c9c8669f1277134629c3fb506f6c20d67121aef7a624878d56db7a5afa227aaca7c669d0f8ad999ceeadd48380a3f8e9d061ddb853d09f0eb539 WHIRLPOOL c2a577940ecc9085925809ed1f856c16f59d507cb6d6e251b362fe7a2c9982bd4c19785a750e1ced759e38a564953e5e47a478f405ab645e3d59197d77600e14
+AUX wmfire-1.2.4-no_display.patch 561 SHA256 12ea9b3631b174d8c38f8f4d5eef0479c6424d2274f52285e5f8d11cbe3ba64b SHA512 260aca5113d220afc5e4fa461ca891fec3e88d2c14040139f32a1849ead906eb6d313519392e45c3a22b4728b9ce1269254edbb3fc05488e3e4534bf56e1edb1 WHIRLPOOL 86647e5706d2e52309d319e25b3db0fa8eac850ba0de43c7350b8ada99e166d5b54541971e7c8aed29c93f5c5bd02ce456b4bc1b2bd6eabd06f3a7ece6901998
+DIST wmfire-1.2.4.tar.gz 91144 SHA256 e38b508519faf132273a9eaf75db56f1b14a5912667dd6843fc902d4a0ca2f80 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b WHIRLPOOL 0b2ea82d4af5408b8ec6c0724f766f86958ba5758306bdb17a940580cbbf699150874e8f15bcaeccc642d70ed825fe8aa6377479fdff62c2ffd75849746e589c
+EBUILD wmfire-1.2.4-r2.ebuild 918 SHA256 40799bccc5f2eb02be171bc61a2d6a26053eda62783266e0ab7f09e518cdf274 SHA512 3bad3a719e9a82283a5f7fbdeb13cd3cd06a3ac5a3e6787b054e32f9a4dc914d0e1be231132c29444e6f5cc596812e51d1ff9614717c99754a617aa1ff42a476 WHIRLPOOL 8b71ed84a159a319883d155175801b31c35d12eb7f01f4d97984e7568de6ffb9599ef9874352f2e890ed1a047e573d82d2b1af5aa13a5a0f1e82e94a9d5213dc
+MISC ChangeLog 3408 SHA256 c1304511ed2feeb7681b2de80f98ba89c574d4e5a6ba5d87f289483c6013bdf6 SHA512 d55e2aefa96adcc38f68253cfae55a85f59d182503d18c2f7ad131822f8d4d335b3b106bbe21b04dc9b656effdfe370f7410600e0600afbc22113034b28c53ec WHIRLPOOL 7a3ae53dfc4d08505e92b649c9615c047c71342658da5b9ec2795229dd49ddd7d0d030876e4c466d612d85c1e035a32115356368854b27b397904eaeff5bb901
+MISC ChangeLog-2015 3500 SHA256 0cf677fafcd60e2f6a7d42eecd5e1cf01310088fb834b242cc8725b9c16a93f8 SHA512 797b78f9710025c300286a06ff003737c82fce3030c5d1ea1bbcb05c27b64f1842ace9ceaa8850072045f5845c1c3bdef993e48a8f1f68ed2341fe291783a612 WHIRLPOOL 37ea61371bb0cd39d9656cb117850e64d5bbfb5ea08279444b9cad67cdb1726fe9f5be15a9f617fa6011d0f191087b4d4b8da313bd8e01c30a4e217cd453f012
+MISC metadata.xml 573 SHA256 7f743b8c59f796c1ad494a82879012659330d06f23daf3393a47af27dffb5f09 SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502 WHIRLPOOL ad6fbd4feea767759afeac52081f672d0791c23a8aa3c6f5a6013f1ae67b1d3a1d738b8c30da479a8fa0354281595be6576179a2b2c95b5acbd28cbb0ee85d2a
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch b/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch
new file mode 100644
index 000000000000..a0fcfdcdc6e3
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.3-stringh.patch
@@ -0,0 +1,11 @@
+diff -ur wmfire-1.2.3.orig/src/session.c wmfire-1.2.3/src/session.c
+--- wmfire-1.2.3.orig/src/session.c	2005-12-04 12:39:16.000000000 +0200
++++ wmfire-1.2.3/src/session.c	2008-01-12 13:26:04.000000000 +0200
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ 
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch
new file mode 100644
index 000000000000..2b389fecdd68
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-lastprocessor_SMP.patch
@@ -0,0 +1,130 @@
+--- wmfire-1.2.4/src/wmfire.c.orig	2005-12-04 11:39:16.000000000 +0100
++++ wmfire-1.2.4/src/wmfire.c	2012-02-27 15:48:05.136807354 +0100
+@@ -63,6 +63,10 @@
+ #define FIRE_NET	3
+ #define FIRE_FILE	4
+ 
++/* wbk 20120220 - cleaning up "next cpu" logic          */
++#define CPU_AV    -1 /* needs to be 1st CPU - 1         */
++#define CPU_NEXT  -2 /* arbitrary but must be < CPU_AV  */
++
+ #define NET_SPD_PPP	56
+ #define NET_SPD_ETH	100
+ 
+@@ -104,7 +108,8 @@
+ int update_mem();
+ int update_net();
+ int update_file();
+-int change_cpu(int);
++void change_cpu(int);
++int more_cpus();
+ void change_flame(int);
+ GdkCursor *setup_cursor();
+ void burn_spot(int, int, int);
+@@ -130,8 +135,7 @@
+ 
+ int monitor = FIRE_CPU;
+ int load = 100;
+-int cpu_av = 1;
+-int cpu_id = 0;
++int cpu_id = CPU_AV; /* wbk - special value instead of separate flag */
+ int cpu_nice = 1;
+ char net_dev[16] = "ppp0";
+ int net_spd = 0;
+@@ -224,8 +228,15 @@
+ 			next = 0;
+ 			
+ 			if (!lock) {
+-				if (monitor == FIRE_CPU && change_cpu(-1))
+-					monitor = FIRE_MEM;
++				if (monitor == FIRE_CPU)
++        {
++          /* First, check if we have more CPU's to monitor. If none,  *
++           * move along to FIRE_MEM. Regardless, after this check, we *
++           * call change_cpu() to increment or reset CPU number.      */
++          if (!more_cpus()) 
++            monitor = FIRE_MEM; 
++          change_cpu(CPU_NEXT);
++        }
+ 				else if (monitor == FIRE_MEM)
+ 					monitor = FIRE_NET;
+ 				else if (monitor == FIRE_NET)
+@@ -285,7 +296,7 @@
+ 
+ 	glibtop_get_cpu(&cpu);
+ 
+-	if (cpu_av) {
++	if (cpu_id == CPU_AV) {
+ 		if (cpu_nice)
+ 			load = cpu.user + cpu.nice + cpu.sys;
+ 		else
+@@ -383,30 +394,46 @@
+ /* Change CPU monitor                     */
+ /******************************************/
+ 
+-int
++void
+ change_cpu(int which)
+ {
+-	glibtop_cpu cpu;
++  /* wbk 20120221 - Changed return type to void. Use more_cpus()  *
++   * for tests instead. Mixing test logic with changing the CPU   *
++   * was causing CPU's to be skipped in calling function.         */
+ 
++  /* wbk - Even though we never use the cpu struct, I think this  *
++   * call may be necessary to set up glibtop_global_server?       */
++	glibtop_cpu cpu;
+ 	glibtop_get_cpu(&cpu);
+ 
+ 	/* This should work, but I have a lonely uniprocessor system */
++  /* wbk - tested with a quad core.                            */
+ 
+-	if (which >= 0) {
++	if (which != CPU_NEXT) /* was run with command-line CPU specifier */
+ 		cpu_id = which;
+-		cpu_av = 0;
+-	} else {
+-		cpu_id++;
+-		cpu_av = 0;
+-	}
++  else                   /* negative value "special case" for which */
++    cpu_id++; 
+ 
+-	if (cpu_id >= glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) {
+-		cpu_id = 0;
+-		cpu_av = 1;
+-		return 1;
+-	}
++  /* Since we already incremented cpu_id, we are comparing a        *
++   * 1-index with 0-index value essentially. But since GLIBTOP_NCPU *
++   * is 1-indexed, keep >= for it. (a bit of an oversimplification: *
++   * cpu_id is still definitely regarded as 0-indexed elsewhere. We *
++   * index an array with it later, so this is important)            */
++	if (cpu_id > glibtop_global_server->ncpu || cpu_id >= GLIBTOP_NCPU) 
++		cpu_id = CPU_AV;
+ 	
+-	return 0;
++	return;
++}
++
++int 
++more_cpus()
++{
++  /* returns positive if next CPU would be valid, Negative if       *
++   * already monitoring highest-numbered CPU or if more cores than  *
++   * glibtop supports.                                              */
++  int next_cpu = cpu_id + 1;
++  return !(next_cpu > glibtop_global_server->ncpu
++            || next_cpu >= GLIBTOP_NCPU);
+ }
+ 
+ /******************************************/
+@@ -494,7 +521,7 @@
+ 		if (proximity++ > 100) {
+ 
+ 			if (monitor == FIRE_CPU) {
+-				if (cpu_av) {
++        if (cpu_id == CPU_AV) {
+ 					/* Horizontal bar for average cpu */
+ 					memset(&bm.cmap[27 * XMAX + 20], 255, 16);
+ 					memset(&bm.cmap[28 * XMAX + 20], 255, 16);
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
new file mode 100644
index 000000000000..a2540a247cf6
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
@@ -0,0 +1,19 @@
+--- src/wmfire.c.orig	2010-06-28 23:53:35.000000000 +0200
++++ src/wmfire.c	2010-06-28 23:54:35.000000000 +0200
+@@ -150,6 +150,8 @@
+ int
+ main(int argc, char **argv)
+ {
++	/* This is needed to proper dockapp work on >=GTK+-2.18 */
++	setenv("GDK_NATIVE_WINDOWS", "1", 0);
+ 	GdkEvent *event;
+ 	GdkCursor *cursor;
+ 	int i;
+@@ -632,6 +634,7 @@
+ 
+ 	/* Moved after gdk_window_show due to change in GTK 2.4 */
+ 	XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++	gdk_window_show(bm.iconwin);
+ 
+ 	if (bm.x > 0 || bm.y > 0)
+ 		gdk_window_move(bm.win, bm.x, bm.y);
diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
new file mode 100644
index 000000000000..e031b46baced
--- /dev/null
+++ b/x11-plugins/wmfire/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+wmfire is an eye-candy dock applet for Window Maker that displays generated 
+fire, possibly according to how much load the system is experiencing, or from a 
+number somewhere in a file. wmfire requires very little CPU.
+</longdescription>
+<use>
+	<flag name="session">Enable session management</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
new file mode 100644
index 000000000000..b471cbf67420
--- /dev/null
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Load monitoring dockapp displaying dancing flame"
+HOMEPAGE="http://www.swanson.ukfsn.org/#wmfire"
+SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="session"
+
+RDEPEND="x11-libs/gtk+:2
+	gnome-base/libgtop:2
+	x11-libs/libX11
+	x11-libs/libXext
+	session? ( x11-libs/libSM
+		x11-libs/libICE )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.3-stringh.patch
+	epatch "${FILESDIR}"/${P}-no_display.patch
+	epatch "${FILESDIR}"/${P}-lastprocessor_SMP.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable session)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ALL_I_GET_IS_A_GREY_BOX AUTHORS ChangeLog NEWS README
+}