Added gcc34 patch and ~ppc64 to KEYWORDS

5 files changed, 68 insertions, 5 deletions

diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog
index 3303057614c9..c3f2892c5228 100644
--- a/x11-wm/blackbox/ChangeLog
+++ b/x11-wm/blackbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/blackbox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.36 2004/06/24 23:40:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.37 2004/12/31 10:24:11 corsair Exp $
+
+*blackbox-0.65.0-r4 (31 Dec 2004)
+
+  31 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  +files/blackbox-0.65.0-gcc34.patch, +blackbox-0.65.0-r4.ebuild:
+  Added gcc34 patch from bug #64747 and marked new revision as ~ppc64
 
   06 May 2004; Brandon Hale <tseng@gentoo.org> blackbox-0.65.0-r3.ebuild:
   Remove explicit S= and remove NLS from IUSE.
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 305b5a83a334..b6ba8d7c9906 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,8 +1,11 @@
-MD5 bb11ee4c69b3d99ff467ee1618b8f900 blackbox-0.65.0-r3.ebuild 1042
 MD5 9bb384260ac56ecbbe248d4f7932c4b7 ChangeLog 5436
+MD5 bb11ee4c69b3d99ff467ee1618b8f900 blackbox-0.65.0-r3.ebuild 1042
 MD5 f08ee46f534b31a6aeb54f5a129e3842 metadata.xml 409
-MD5 7dc8c76692461cd5acad10bef25ed108 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929
+MD5 0dd6e49e7d75789cc503d892004dddc8 blackbox-0.65.0-r4.ebuild 1092
 MD5 91258a5cccf70f183b73a6a4d56b6470 files/blackbox 28
-MD5 099195818052833a934a42dd8f434453 files/disable_rootcommand.patch 395
-MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r3 67
+MD5 7dc8c76692461cd5acad10bef25ed108 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929
 MD5 d3a006919ef6641fd6e9326d741acb49 files/blackbox-gcc.patch 1115
+MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r3 67
+MD5 099195818052833a934a42dd8f434453 files/disable_rootcommand.patch 395
+MD5 35f17799af496f27b77f504b08cd9b21 files/blackbox-0.65.0-gcc34.patch 670
+MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r4 67
diff --git a/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild
new file mode 100644
index 000000000000..d093f2d05aa5
--- /dev/null
+++ b/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild,v 1.1 2004/12/31 10:24:11 corsair Exp $
+
+IUSE=""
+
+inherit commonbox eutils
+
+DESCRIPTION="A small, fast, full-featured window manager for X - with mousewheel patch"
+SRC_URI="mirror://sourceforge/blackboxwm/${P}.tar.gz"
+HOMEPAGE="http://blackboxwm.sf.net/"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+MYCONF="--disable-nls"
+
+mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	epatch ${FILESDIR}/blackbox-0.65.0-mousewheel_focus-workspace.patch
+	epatch ${FILESDIR}/blackbox-gcc.patch
+	cd ${S}
+	epatch ${FILESDIR}/disable_rootcommand.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+	cd ${S}/data
+	mv README README.data
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Please note that NLS support is now *disabled*, as it is"
+	ewarn "horribly broken."
+	ewarn "RootCommand is now DISABLED to close a large"
+	ewarn "security hole."
+	ewarn
+}
diff --git a/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch b/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch
new file mode 100644
index 000000000000..b885a20df0d0
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.65.0-gcc34.patch
@@ -0,0 +1,15 @@
+--- src/Timer.hh.orig   2002-08-23 14:50:54.000000000 -0400
++++ src/Timer.hh        2004-04-11 01:23:27.000000000 -0400
+@@ -98,9 +98,10 @@
+   ~_timer_queue(void) {}
+ 
+   void release(const _Tp& value) {
+-    c.erase(std::remove(c.begin(), c.end(), value), c.end());
++    _Base::c.erase(std::remove(_Base::c.begin(), _Base::c.end(), value),
++                       _Base::c.end());
+     // after removing the item we need to make the heap again
+-    std::make_heap(c.begin(), c.end(), comp);
++    std::make_heap(_Base::c.begin(), _Base::c.end(), _Base::comp);
+   }
+   bool empty(void) const { return _Base::empty(); }
+   size_t size(void) const { return _Base::size(); }
diff --git a/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4 b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4
new file mode 100644
index 000000000000..ac23630d0dc1
--- /dev/null
+++ b/x11-wm/blackbox/files/digest-blackbox-0.65.0-r4
@@ -0,0 +1 @@
+MD5 08560fa287c68d65fbe894696d04deaf blackbox-0.65.0.tar.gz 292950