quick fix to enable successful compile on >=gcc3x systems

6 files changed, 6 insertions, 66 deletions

diff --git a/x11-misc/bbapm/ChangeLog b/x11-misc/bbapm/ChangeLog
index 10c678879636..bfbbfc8f53f4 100644
--- a/x11-misc/bbapm/ChangeLog
+++ b/x11-misc/bbapm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/bbapm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/ChangeLog,v 1.8 2003/03/02 23:13:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/ChangeLog,v 1.9 2003/06/19 13:21:09 mkeadle Exp $
+
+  19 Jun 2003; mkeadle <mkeadle@gentoo.org> bbapm-0.0.1-r3.ebuild:
+  quick fix to enable successful compile on >=gcc3x systems
 
 *bbapm-0.0.1-r3 (12 Dec 2002)
 
diff --git a/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild
deleted file mode 100644
index 66968d4f12ae..000000000000
--- a/x11-misc/bbapm/bbapm-0.0.1-r1.ebuild
+++ /dev/null
@@ -1,31 +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-misc/bbapm/bbapm-0.0.1-r1.ebuild,v 1.11 2003/02/13 17:06:31 vapier Exp $
-
-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"
-
-DEPEND=">=x11-wm/blackbox-0.61
-	>=sys-apps/apmd-3.0.1"
-
-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/bbapm-0.0.1-r2.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r2.ebuild
deleted file mode 100644
index f5507341494b..000000000000
--- a/x11-misc/bbapm/bbapm-0.0.1-r2.ebuild
+++ /dev/null
@@ -1,31 +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-misc/bbapm/bbapm-0.0.1-r2.ebuild,v 1.10 2003/02/13 17:06:37 vapier Exp $
-
-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"
-
-DEPEND="virtual/blackbox
-	>=sys-apps/apmd-3.0.1"
-
-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/bbapm-0.0.1-r3.ebuild b/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild
index e17162127bc8..ee75e0db18bf 100644
--- a/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild
+++ b/x11-misc/bbapm/bbapm-0.0.1-r3.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-misc/bbapm/bbapm-0.0.1-r3.ebuild,v 1.4 2003/03/02 23:13:32 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbapm/bbapm-0.0.1-r3.ebuild,v 1.5 2003/06/19 13:21:09 mkeadle Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,6 +20,7 @@ DEPEND="virtual/blackbox
 src_unpack() {
 
 	unpack ${A}; cd ${S}
+	sed -i -e 's:friend:friend class:' LinkedList.hh
 	epatch ${FILESDIR}/${P}-gcc3.patch
 
 }
diff --git a/x11-misc/bbapm/files/digest-bbapm-0.0.1-r1 b/x11-misc/bbapm/files/digest-bbapm-0.0.1-r1
deleted file mode 100644
index 7303b78f3fd1..000000000000
--- a/x11-misc/bbapm/files/digest-bbapm-0.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d2629959bd907696c7765b7c34bc54f bbapm-0.0.1.tar.gz 61376
diff --git a/x11-misc/bbapm/files/digest-bbapm-0.0.1-r2 b/x11-misc/bbapm/files/digest-bbapm-0.0.1-r2
deleted file mode 100644
index 7303b78f3fd1..000000000000
--- a/x11-misc/bbapm/files/digest-bbapm-0.0.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d2629959bd907696c7765b7c34bc54f bbapm-0.0.1.tar.gz 61376