Revision bump; added patch for kde support thanks to Evgeniy <dushistov@mail.ru> in bug 83091.

Package-Manager: portage-2.0.51.16

5 files changed, 182 insertions, 2 deletions

diff --git a/x11-terms/root-tail/ChangeLog b/x11-terms/root-tail/ChangeLog
index 8fb914a127e5..03d2bbfd3a6b 100644
--- a/x11-terms/root-tail/ChangeLog
+++ b/x11-terms/root-tail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/root-tail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.26 2005/02/19 08:13:03 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/ChangeLog,v 1.27 2005/02/24 10:59:21 ka0ttic Exp $
+
+*root-tail-1.2-r2 (24 Feb 2005)
+
+  24 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/root-tail-1.2-kde.patch, +root-tail-1.2-r2.ebuild:
+  Revision bump; added patch for kde support thanks to Evgeniy
+  <dushistov@mail.ru> in bug 83091.
 
   19 Feb 2005; Markus Rothe <corsair@gentoo.org> root-tail-1.2-r1.ebuild:
   Stable on ppc64
diff --git a/x11-terms/root-tail/Manifest b/x11-terms/root-tail/Manifest
index b5cbb74841cd..5c5948ba8f62 100644
--- a/x11-terms/root-tail/Manifest
+++ b/x11-terms/root-tail/Manifest
@@ -1,6 +1,19 @@
-MD5 a22a9b71b446091894fa4900a7f53b28 ChangeLog 3632
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 42e0472cb9251c307261588778689316 root-tail-1.2-r2.ebuild 877
 MD5 c572bd9a65706253fa0bfefdc4699619 root-tail-1.2-r1.ebuild 768
 MD5 ac82ac29a67025a863f3d258d3d6d680 root-tail-1.1.ebuild 673
+MD5 49ec7f7e0b5c98a3b727678d20e673f5 ChangeLog 3874
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 f8b36716748f19ede695042176e3648b files/digest-root-tail-1.2-r1 64
+MD5 f8b36716748f19ede695042176e3648b files/digest-root-tail-1.2-r2 64
 MD5 bc94057d9203dc8c6a01efb2172f5a15 files/digest-root-tail-1.1 64
+MD5 3ede80f52914b3650247dbea9ff963fb files/root-tail-1.2-kde.patch 3188
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCHbQUEZCkKN40op4RAm98AJ4pLqowu03Vp/pjNLeKuK0g79ZqqQCfVfKB
+FIIwNhUoeqX84prX1fIlUnU=
+=FF3U
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/root-tail/files/digest-root-tail-1.2-r2 b/x11-terms/root-tail/files/digest-root-tail-1.2-r2
new file mode 100644
index 000000000000..c2b467691268
--- /dev/null
+++ b/x11-terms/root-tail/files/digest-root-tail-1.2-r2
@@ -0,0 +1 @@
+MD5 5a4b3c4c7ab3bed1f4575e9688aac5de root-tail-1.2.tar.gz 20805
diff --git a/x11-terms/root-tail/files/root-tail-1.2-kde.patch b/x11-terms/root-tail/files/root-tail-1.2-kde.patch
new file mode 100644
index 000000000000..750edf2fefa0
--- /dev/null
+++ b/x11-terms/root-tail/files/root-tail-1.2-kde.patch
@@ -0,0 +1,125 @@
+diff -bBurN root-tail-1.2/config.h root-tail-my/config.h
+--- root-tail-1.2/config.h	2004-07-30 23:32:39.000000000 +0400
++++ root-tail-my/config.h	2005-02-23 13:02:48.878912688 +0300
+@@ -15,3 +15,4 @@
+ 
+ #define VERSION "1.2"
+ 
++#define KDE
+diff -bBurN root-tail-1.2/root-tail.c root-tail-my/root-tail.c
+--- root-tail-1.2/root-tail.c	2004-07-30 23:33:20.000000000 +0400
++++ root-tail-my/root-tail.c	2005-02-23 13:02:37.599627400 +0300
+@@ -148,6 +148,11 @@
+ regex_t *transformre;
+ #endif
+ 
++#ifdef KDE
++#define ATOM(a) XInternAtom(disp, #a, False)
++
++int screen, ScreenWidth, ScreenHeight;
++#endif
+ 
+ /* prototypes */
+ void list_files (int);
+@@ -227,7 +232,7 @@
+   return Color.pixel;
+ }
+ 
+-#ifndef USE_TOON_GET_ROOT_WINDOW
++#if !defined(USE_TOON_GET_ROOT_WINDOW) && !defined(KDE)
+ static void
+ find_root_window (Display *display, int screen_number)
+ {
+@@ -280,14 +285,91 @@
+         fprintf (stderr, "Can't query tree on root window 0x%lx", root);
+     }
+ }
+-#endif /* USE_TOON_GET_ROOT_WINDOW */
++#elif defined(KDE)
++static Window find_subwindow(Window win, int w, int h) {
++  unsigned int i, j;
++  Window troot, parent, *children;
++  unsigned int n;
++
++  /* search subwindows with same size as display or work area */
++
++  for (i=0; i<10; i++) {
++    XQueryTree(disp, win, &troot, &parent, &children, &n);
++
++    for (j=0; j<n; j++) {
++      XWindowAttributes attrs;
++
++      if (XGetWindowAttributes(disp, children[j], &attrs)) {
++        /* Window must be mapped and same size as display or work space */
++        if (attrs.map_state != 0 &&
++            ((attrs.width == ScreenWidth && attrs.height == ScreenHeight) ||
++             (attrs.width == w && attrs.height == h))) {
++          win = children[j];
++          break;
++        }
++      }
++    }
++
++    XFree(children);
++    if (j == n) break;
++  }
++
++  return win;
++}
++
++static void
++find_root_window (Display *display, int screen_number)
++{
++  Atom type;
++  int format, i;
++  unsigned long nitems, bytes;
++  unsigned int n;
++  root = RootWindow(display, screen_number);
++  Window win = root;
++  Window troot, parent, *children;
++  unsigned char *buf = NULL;
++
++  /* some window managers set __SWM_VROOT to some child of root window */
++
++  XQueryTree(display, root, &troot, &parent, &children, &n);
++  for (i=0; i<(int)n; i++) {
++    if (XGetWindowProperty(display, children[i], ATOM(__SWM_VROOT),
++          0, 1, False, XA_WINDOW, &type, &format, &nitems, &bytes,
++          &buf) == Success && type == XA_WINDOW) {
++      win = * (Window *) buf;
++      XFree(buf);
++      XFree(children);
++      fprintf(stderr, "torsmo: drawing to window from __SWM_VROOT property\n");
++      root=win;
++      return;
++    }
++
++    if (buf) {
++      XFree(buf);
++      buf = 0;
++    }
++  }
++  XFree(children);
++
++  /* get subwindows from root */
++  win = find_subwindow(root, -1, -1);
++
++  win = find_subwindow(win, width, height);
++
++  if (buf) { XFree(buf); buf = 0; }
++
++  root=win;
++}
++#endif /* USE_TOON_GET_ROOT_WINDOW && KDE*/
+ 
+ void
+ InitWindow (void)
+ {
+   XGCValues gcv;
+   unsigned long gcm;
++#ifndef KDE
+   int screen, ScreenWidth, ScreenHeight;
++#endif
+   struct logfile_entry *e;
+ 
+   if (!(disp = XOpenDisplay (dispname)))
diff --git a/x11-terms/root-tail/root-tail-1.2-r2.ebuild b/x11-terms/root-tail/root-tail-1.2-r2.ebuild
new file mode 100644
index 000000000000..6637caf94575
--- /dev/null
+++ b/x11-terms/root-tail/root-tail-1.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/root-tail/root-tail-1.2-r2.ebuild,v 1.1 2005/02/24 10:59:21 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="Terminal to display (multiple) log files on the root window"
+HOMEPAGE="http://www.goof.com/pcg/marc/root-tail.html"
+SRC_URI="http://www.goof.com/pcg/marc/data/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~ppc64"
+IUSE="kde"
+
+DEPEND="virtual/x11
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use kde && epatch ${FILESDIR}/${P}-kde.patch
+}
+
+src_compile() {
+	xmkmf -a
+	sed -i 's|/usr/X11R6/bin|/usr/bin|' Makefile || die "sed Makefile failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install install.man || die "make install failed"
+	dodoc Changes README
+}