cleanup and gcc 3.3 fix, closes #29633

8 files changed, 67 insertions, 40 deletions

diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog
index 287c51dc5a2a..ef4314a897e9 100644
--- a/x11-wm/blackbox/ChangeLog
+++ b/x11-wm/blackbox/ChangeLog
@@ -1,12 +1,18 @@
 # ChangeLog for x11-wm/blackbox
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.23 2003/09/25 18:05:31 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.24 2003/10/09 17:17:40 tseng Exp $
+
+*blackbox-0.65.0-r2 (09 Oct 2003)
+
+  09 Oct 2003; ,,, <brandon@gentoo.org> blackbox-0.65.0-r1.ebuild,
+  blackbox-0.65.0-r2.ebuild, blackbox-0.65.0.ebuild, files/blackbox-gcc.patch:
+  Cleanup and fix for gcc 3.3, closes #29633
 
   26 Sep 2003; Martin Holzer <mholzer@gentoo.org> blackbox-0.65.0-r1.ebuild:
   added more docs. Closes #29560.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *blackbox-0.65.0-r1 (26 Oct 2002)
 
   5 Nov 2002; Matt Keadle <mkeadle@gentoo.org> blackbox-0.65.0-r1
@@ -22,10 +28,10 @@
   Patch created by Michael Langley (ownx).
 
 *blackbox-0.65.0 (19 Sep 2002)
-  
+
   19 Sep 2002; Spider <spider@gentoo.org> blackbox-0.65.0.ebuild : bump version
   this is it, the final one
-  
+
 *blackbox-0.65.0_beta7 (05 Sep 2002)
   05 Sep 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta7.ebuild :
   version bump, sorry for the delay
@@ -33,7 +39,7 @@
 *blackbox-0.65.0_beta5 (09 aug 2002)
   09 Aug 2002 ; Spider <spider@gentoo.org> blackbox-0.65.0_beta5.ebuild :
   version bump
-  
+
 *blackbox-0.65.0_beta3-r1 (18 Jul 2002)
     18 Jul 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta3-r1.ebuild :
     and the eclass version
@@ -42,7 +48,7 @@
 *blackbox-0.65.0_beta3 (18 Jul 2002)
   18 Jul 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta3.ebuild :
   new version
-  repomaned 
+  repomaned
 
 *blackbox-0.62.1-r3 (14 Jul 2002)
 
@@ -55,14 +61,14 @@
   eclassed.
 
 *blackbox-0.65.0_alpha8 (17 Jun 2002)
-  17 Jun 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha8.ebuild: 
+  17 Jun 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha8.ebuild:
   new version. forgot to add this about a week ago ;)
 
 *blackbox-0.65.0_alpha7 (02 Jun 2002)
   02 May 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha7.ebuild:
    bump said the alpha and version updated
 
-    
+
 *blackbox-0.65.0_alpha6 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha6.ebuild:
   latest, greatest, better than ever, and compiles on gcc 3.x
@@ -74,7 +80,7 @@
 
 *blackbox-0.65.0_alpha2-r1 (27 Apr 2002)
   27 Apr 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha2-r1.ebuild:
-  fix $P Mangling to use MY_P and be nice to portage  
+  fix $P Mangling to use MY_P and be nice to portage
 
 *blackbox-0.65.0_alpha2 (26 Apr 2002)
   26 Apr 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha2.ebuild:
@@ -91,7 +97,7 @@
 *blackbox-0.62.1-r1 (14 Feb 2002)
 
   14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  Added /etc/X11/Sessions/blackbox, which adds blackbox to the auto-updated session 
+  Added /etc/X11/Sessions/blackbox, which adds blackbox to the auto-updated session
   list in kdm and gdm.
 
 *blackbox-0.62.1 (2 Feb 2002)
@@ -103,7 +109,7 @@
 *blackbox-0.61.1-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
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 0973abc56a3c..5bd39f45137e 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,12 +1,9 @@
-MD5 50180c2d94c79d1199f5a7cb297b13b4 ChangeLog 3964
+MD5 5774f03cfcd8c9556ccc4e3135508855 ChangeLog 4171
 MD5 50e5e9b00b161ee7255693dfe0b6b416 blackbox-0.62.1-r3.ebuild 523
-MD5 5dc572701dc315a3ea117dfaab73a3fc blackbox-0.65.0.ebuild 537
-MD5 d4be0e4b492c1f1ec35884816fed4552 blackbox-0.65.0-r2.ebuild 1040
-MD5 feca52353b831f0e6921405d121f5c17 blackbox-0.65.0-r1.ebuild 1013
+MD5 bb9594ba9f8b174866cbb896b9566f18 blackbox-0.65.0-r2.ebuild 1037
+MD5 416452bedba085c06bd2502510370e1a metadata.xml 162
 MD5 91258a5cccf70f183b73a6a4d56b6470 files/blackbox 28
 MD5 7dc8c76692461cd5acad10bef25ed108 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929
 MD5 fc3613b857857499c38d000736f08411 files/digest-blackbox-0.62.1-r3 67
-MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0 67
-MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r1 67
-MD5 d11aab10833513b5f80932257f6c9152 files/blackbox-gcc.patch 793
+MD5 d3a006919ef6641fd6e9326d741acb49 files/blackbox-gcc.patch 1115
 MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r2 67
diff --git a/x11-wm/blackbox/blackbox-0.65.0-r1.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r2.ebuild
index 6166184d68bd..f7f8fb1d659f 100644
--- a/x11-wm/blackbox/blackbox-0.65.0-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.65.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r1.ebuild,v 1.5 2003/09/26 05:42:39 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r2.ebuild,v 1.1 2003/10/09 17:17:40 tseng Exp $
 
 IUSE="nls"
 
@@ -19,7 +19,8 @@ mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	patch -p0 < ${FILESDIR}/blackbox-0.65.0-mousewheel_focus-workspace.patch
+	epatch ${FILESDIR}/blackbox-0.65.0-mousewheel_focus-workspace.patch
+	epatch ${FILESDIR}/blackbox-gcc.patch
 	cd ${S}/data
 	mv README README.data
 }
@@ -28,7 +29,7 @@ pkg_postinst() {
 	ewarn
 	ewarn "This build of Blackbox makes use of the mousewheel patch, allowing you"
 	ewarn "to use the mousewheel chage workspace or application focus."
-	ewarn "It is known to have a few issues. For a default install of Blackbox"
+	ewarn "It is known to have a few issues. For a  install of Blackbox"
 	ewarn "you may emerge ${PN}-${PV}."
 	ewarn
 }
diff --git a/x11-wm/blackbox/blackbox-0.65.0.ebuild b/x11-wm/blackbox/blackbox-0.65.0.ebuild
deleted file mode 100644
index 1ef6a4de3382..000000000000
--- a/x11-wm/blackbox/blackbox-0.65.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0.ebuild,v 1.6 2003/09/06 04:16:43 msterret Exp $
-
-IUSE="nls"
-
-inherit commonbox
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A small, fast, full-featured window manager for X"
-SRC_URI="mirror://sourceforge/blackboxwm/${P}.tar.gz"
-HOMEPAGE="http://blackboxwm.sf.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc "
-
-mydoc="AUTHORS LICENSE README ChangeLog* TODO*"
diff --git a/x11-wm/blackbox/files/blackbox-gcc.patch b/x11-wm/blackbox/files/blackbox-gcc.patch
new file mode 100644
index 000000000000..b1f56216e220
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-gcc.patch
@@ -0,0 +1,37 @@
+--- blackbox-0.65.0/src/Window.cc	2002-09-17 11:23:35.000000000 -0400
++++ Window.cc	2003-10-09 13:09:22.993741976 -0400
+@@ -55,6 +55,7 @@
+ #include "Window.hh"
+ #include "Windowmenu.hh"
+ #include "Workspace.hh"
++#include <assert.h>
+ 
+ 
+ /*
+@@ -2050,7 +2051,7 @@
+     if (decorations & Decor_Titlebar) {
+       if (functions & Func_Close)   // close button is controlled by function
+         decorations |= Decor_Close; // not decor type
+-    } else { 
++    } else {
+       if (flags.shaded) // we can not be shaded if we lack a titlebar
+         shade();
+     }
+@@ -2986,7 +2987,7 @@
+   // do not leave a shaded window as an icon unless it was an icon
+   if (flags.shaded && ! flags.iconic)
+     current_state = NormalState;
+-  
++
+   setState(current_state);
+ 
+   restoreGravity(client.rect);
+@@ -3099,7 +3100,7 @@
+     if (decorations & Decor_Titlebar) {
+       if (functions & Func_Close)   // close button is controlled by function
+         decorations |= Decor_Close; // not decor type
+-    } else { 
++    } else {
+       if (flags.shaded) // we can not be shaded if we lack a titlebar
+         shade();
+     }
diff --git a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r1 b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r1
deleted file mode 100644
index ac23630d0dc1..000000000000
--- a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 08560fa287c68d65fbe894696d04deaf blackbox-0.65.0.tar.gz 292950
diff --git a/x11-wm/blackbox/files/digest-blackbox-0.65.0 b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r2
index ac23630d0dc1..ac23630d0dc1 100644
--- a/x11-wm/blackbox/files/digest-blackbox-0.65.0
+++ b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r2
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
new file mode 100644
index 000000000000..682bce3394bf
--- /dev/null
+++ b/x11-wm/blackbox/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>commonbox</herd>
+</pkgmetadata>