Updating to work with gcc3.x systems.

4 files changed, 119 insertions, 1 deletions

diff --git a/x11-misc/bbapm/ChangeLog b/x11-misc/bbapm/ChangeLog
index 8c34b4d765ba..575122db6a41 100644
--- a/x11-misc/bbapm/ChangeLog
+++ b/x11-misc/bbapm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/bbapm
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/ChangeLog,v 1.3 2002/12/09 04:41:49 manson Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/ChangeLog,v 1.4 2002/12/12 17:47:30 mkeadle Exp $
+
+*bbapm-0.0.1-r3 (12 Dec 2002)
+
+  12 Dec 2002; Matt Keadle <mkeadle@gentoo.org> bbapm-0.0.1-r3.ebuild
+  files/digest-bbapm-0.0.1-r3 files/bbapm-0.0.1-gcc3.patch
+
+  Patch created to successfuly build on gcc3.x systems.
 
 \* Autoupdate keywords (12-6-02)
   06 Dec 2002; Rodney Rees <manson@gentoo.org> changed sparc ~sparc keywords
diff --git a/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild
new file mode 100644
index 000000000000..197172efb3fc
--- /dev/null
+++ b/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild,v 1.1 2002/12/12 17:47:30 mkeadle Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="blackbox advanced power management tool"
+SRC_URI="http://bbtools.thelinuxcommunity.org/sources/${P}.tar.gz"
+HOMEPAGE="http://bbtools.thelinuxcommunity.org/contrib.phtml"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc"
+
+DEPEND="virtual/blackbox
+	>=sys-apps/apmd-3.0.1"
+
+src_unpack() {
+
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${P}-gcc3.patch
+
+}
+
+src_compile() {
+
+	./configure --prefix=/usr --host=${CHOST} || die
+	emake || die
+	
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO
+}
+
+pkg_postinst() {
+	cd ${ROOT}usr/X11R6/bin/wm
+	if [ ! "`grep bbapm blackbox`" ] ; then
+	sed -e "s/.*blackbox/exec \/usr\/X11R6\/bin\/bbapm \&\n&/" blackbox | cat > blackbox
+	fi
+}
diff --git a/x11-misc/bbapm/files/bbapm-0.0.1-gcc3.patch b/x11-misc/bbapm/files/bbapm-0.0.1-gcc3.patch
new file mode 100644
index 000000000000..1b9974e63612
--- /dev/null
+++ b/x11-misc/bbapm/files/bbapm-0.0.1-gcc3.patch
@@ -0,0 +1,68 @@
+--- Image.cc	1999-08-15 09:43:55.000000000 -0500
++++ Image.cc.new	2002-12-12 12:18:35.000000000 -0500
+@@ -225,12 +225,12 @@
+     }
+ 
+   if (control->doDither()) {
+-    short er, eg, eb, *or, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
++    short er, eg, eb, *gor, *og, *ob, *nor, *nog, *nob, *por, *pog, *pob;
+     unsigned short *ort, *ogt, *obt;
+     
+-    control->getDitherBuffers(width + 2, &or, &og, &ob, &nor, &nog, &nob,
++    control->getDitherBuffers(width + 2, &gor, &og, &ob, &nor, &nog, &nob,
+ 			      &ort, &ogt, &obt);
+-    if ((! or) || (! og) || (! ob) || (! nor) || (! nog) || (! nob) ||
++    if ((! gor)||(! og)||(! ob) || (! nor) || (! nog) || (! nob) ||
+ 	(! ort) || (! ogt) || (! obt)) {
+       fprintf(stderr,
+ 	      "BImage::renderXImage: error getting dither information\n");
+@@ -240,7 +240,7 @@
+     
+     x = width;
+ 
+-    por = or;
++    por = gor;
+     pog = og;
+     pob = ob;
+ 
+@@ -271,14 +271,14 @@
+       }
+       
+       for (x = 0; x < width; x++) {
+-	if (*(or + x) > 255) *(or + x) = 255;
+-	else if (*(or + x) < 0) *(or + x) = 0;
++	if (*(gor + x) > 255) *(gor + x) = 255;
++	else if (*(gor + x) < 0) *(gor + x) = 0;
+ 	if (*(og + x) > 255) *(og + x) = 255;
+ 	else if (*(og + x) < 0) *(og + x) = 0;
+ 	if (*(ob + x) > 255) *(ob + x) = 255;
+ 	else if (*(ob + x) < 0) *(ob + x) = 0;
+ 	
+-	r = *(tr + *(or + x));
++	r = *(tr + *(gor + x));
+ 	g = *(tg + *(og + x));
+ 	b = *(tb + *(ob + x));
+ 	
+@@ -340,11 +340,11 @@
+ 	  return 0;
+ 	}
+ 
+-	er = *(or + x) - *(ort + *(or + x));
++	er = *(gor + x) - *(ort + *(gor + x));
+ 	eg = *(og + x) - *(ogt + *(og + x));
+ 	eb = *(ob + x) - *(obt + *(ob + x));
+ 	
+-	*(or + x + 1) += er;
++	*(gor + x + 1) += er;
+ 	*(og + x + 1) += eg;
+ 	*(ob + x + 1) += eb;
+ 	
+@@ -360,7 +360,7 @@
+       off += image->width;
+       idata = (pd += image->bytes_per_line);
+       
+-      por = or; or = nor; nor = por;
++      por = gor; gor = nor; nor = por;
+       pog = og; og = nog; nog = pog;
+       pob = ob; ob = nob; nob = pob;
+     }
diff --git a/x11-misc/bbapm/files/digest-bbapm-0.0.1-r3 b/x11-misc/bbapm/files/digest-bbapm-0.0.1-r3
new file mode 100644
index 000000000000..7303b78f3fd1
--- /dev/null
+++ b/x11-misc/bbapm/files/digest-bbapm-0.0.1-r3
@@ -0,0 +1 @@
+MD5 4d2629959bd907696c7765b7c34bc54f bbapm-0.0.1.tar.gz 61376