Little fix for bug #42548, cleanup

4 files changed, 13 insertions, 36 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 91ce422e40d9..9e3d176bf23b 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/bridge-utils
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.9 2003/04/24 13:24:17 phosphan Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.10 2004/02/25 07:42:02 phosphan Exp $
+
+  25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  bridge-utils-0.9.3-r1.ebuild, bridge-utils-0.9.6.ebuild:
+  Cleanup
+
+  25 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  bridge-utils-0.9.6.ebuild:
+  Added additional check for build success because of bug #42548
 
   24 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> bridge-utils-0.9.6.ebuild :
   Considered stable for x86
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.3-r1.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.3-r1.ebuild
deleted file mode 100644
index 486906f1781b..000000000000
--- a/net-misc/bridge-utils/bridge-utils-0.9.3-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/net-misc/bridge-utils/bridge-utils-0.9.3-r1.ebuild,v 1.7 2003/02/13 14:46:09 vapier Exp $
-
-# I think you want CONFIG_BRIDGE in your kernel to use this ;)
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-
-S=${WORKDIR}/${PN}
-SRC_URI="http://bridge.sourceforge.net/bridge-utils/${P}.tar.gz"
-
-DEPEND="virtual/glibc"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	make CFLAGS="${CFLAGS}" || die "compile problem"
-}
-
-src_install () {
-	dosbin brctl/brctl
-	doman doc/brctl.8
-
-	insinto /usr/include ; doins libbridge/libbridge.h
-	insinto /usr/lib ; doins libbridge/libbridge.a
-
-	dodoc AUTHORS COPYING ChangeLog README THANKS
-	dodoc doc/{FAQ,FIREWALL*,HOWTO,PROJECTS,SMPNOTES,TODO,WISHLIST}
-}
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
index b1068a42b505..bb2b0aa25cfd 100644
--- a/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.3 2003/09/05 22:01:48 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.4 2004/02/25 07:42:02 phosphan Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -18,6 +18,7 @@ KEYWORDS="x86"
 src_compile() {
 	econf --prefix=/ --libdir=/usr/lib --includedir=/usr/include
 	emake || die "make failed"
+	test -f brctl/brctl -a -f brctl/brctld || die "build not successful"
 }
 
 src_install () {
diff --git a/net-misc/bridge-utils/files/digest-bridge-utils-0.9.3-r1 b/net-misc/bridge-utils/files/digest-bridge-utils-0.9.3-r1
deleted file mode 100644
index 77144f487f25..000000000000
--- a/net-misc/bridge-utils/files/digest-bridge-utils-0.9.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af28120f91c75b6235eea61c904996d6 bridge-utils-0.9.3.tar.gz 29781