5 files changed, 103 insertions, 8 deletions
diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index ac014c75b1ca..4a6caf993947 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.27 2005/07/12 13:39:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.28 2005/08/05 19:30:05 robbat2 Exp $
+
+*bridge-utils-1.0.6-r3 (05 Aug 2005)
+
+  05 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/bridge-utils-1.0.6-allow-without-sysfs.patch,
+  +bridge-utils-1.0.6-r3.ebuild:
+  Bug #69292: Make it possible to compile without sysfs, so the new versions
+  work well for 2.4 users.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org>
   bridge-utils-1.0.6-r2.ebuild:
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 5be4afe46de9..c49e2188ba4f 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,13 +1,16 @@
-MD5 794c4dffb1190d74c751b16cb07a12e3 ChangeLog 4379
-MD5 cc3eb091df9ed82c98ec18b221b951a9 bridge-utils-1.0.6-r2.ebuild 1395
 MD5 0d6d3f3c84b9fd514a08af08ba76ad0f bridge-utils-1.0.4.ebuild 1169
-MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
-MD5 2c6ca210a0063810c357673b36d2eac0 bridge-utils-1.0.6.ebuild 1268
+MD5 cc3eb091df9ed82c98ec18b221b951a9 bridge-utils-1.0.6-r2.ebuild 1395
 MD5 b9d5cf5a4a11a82972f20d974423c918 bridge-utils-0.9.6-r2.ebuild 1104
-MD5 bccc629ec82d45006faa7d2e7cfe900f files/bridge.conf 106
-MD5 2247ac780a2897505fa460ba9b322d86 files/bridge.rc 939
-MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r2 69
+MD5 2c6ca210a0063810c357673b36d2eac0 bridge-utils-1.0.6.ebuild 1268
+MD5 e65bac146ce8a3acf4ab57f816122af1 bridge-utils-1.0.6-r3.ebuild 1607
+MD5 b9f8b38bf308bcdbc9249d0992c514cf ChangeLog 4665
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6-r2 69
+MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6-r3 69
 MD5 be13eee50cb73dfb7574dc9d439e247e files/digest-bridge-utils-1.0.4 70
 MD5 69312e372ac3b1c445dd53c8abf3cd57 files/digest-bridge-utils-1.0.6 69
+MD5 bccc629ec82d45006faa7d2e7cfe900f files/bridge.conf 106
 MD5 dad9b29868d4bf5b8fe41be9fef393be files/bridge-utils-1.0.6-dont-error-on-no-ports.patch 330
+MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r2 69
+MD5 2247ac780a2897505fa460ba9b322d86 files/bridge.rc 939
+MD5 b66b10664a696ad5234f798c99fac2fa files/bridge-utils-1.0.6-allow-without-sysfs.patch 1013
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..c2db8fb6edcb
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-1.0.6-r3.ebuild,v 1.1 2005/08/05 19:30:05 robbat2 Exp $
+
+# I think you want CONFIG_BRIDGE in your kernel to use this ;)
+
+inherit eutils
+
+DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
+HOMEPAGE="http://bridge.sourceforge.net/"
+
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
+
+IUSE="sysfs"
+
+RDEPEND="virtual/libc
+		 virtual/baselayout"
+DEPEND="${RDEPEND}
+		sysfs? ( >=sys-fs/sysfsutils-1.0 )
+		virtual/os-headers
+		=sys-devel/autoconf-2.5*"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-dont-error-on-no-ports.patch
+	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-allow-without-sysfs.patch
+	cd ${S} && WANT_AUTOCONF=2.5 autoconf || die "Failed to run autoconf"
+}
+
+src_compile() {
+	# use santitized headers and not headers from /usr/src
+	econf \
+		--prefix=/ \
+		--libdir=/usr/lib \
+		--includedir=/usr/include \
+		--with-linux-headers=/usr/include \
+		`use_with sysfs` \
+		|| die "econf failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	emake install DESTDIR="${D}"
+	#einstall prefix=${D} libdir=${D}/usr/lib includedir=${D}/usr/include
+	dodoc AUTHORS ChangeLog README THANKS TODO
+	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
+}
+
+pkg_postinst () {
+	ewarn "This package no longer provides a seperate init script."
+	ewarn "Please utilize the new bridge support in baselayout."
+}
diff --git a/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch b/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch
new file mode 100644
index 000000000000..a54901a3752a
--- /dev/null
+++ b/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch
@@ -0,0 +1,27 @@
+This patch provides a means of forcing bridge-utils to compile without sysfs.
+Patch by Robin H. Johnson <robbat2@gentoo.org>
+--- bridge-utils-1.0.6.orig/configure.in	2005-03-16 12:15:46.000000000 -0800
++++ bridge-utils-1.0.6/configure.in	2005-08-05 12:19:48.000000000 -0700
+@@ -26,12 +26,17 @@
+ AC_CHECK_FUNCS(if_nametoindex if_indextoname)
+ 
+ dnl Check for libsysfs
++
++AC_ARG_WITH( sysfs,       [  --without-sysfs              Disallow use of libsysfs],[],[])
++
++if test "${with_sysfs}" != "no" ; then
+ AC_CHECK_HEADER(sysfs/libsysfs.h,
+-	[AC_CHECK_LIB(sysfs, sysfs_open_directory, 
+-	              [AC_DEFINE(HAVE_LIBSYSFS)
+-		       LIBS="$LIBS -lsysfs"],
+-		      [AC_MSG_WARN([Missing sysfs library!])])],
+-	[AC_MSG_WARN([Missing /usr/include/sysfs/libsysfs.h])])
++		[AC_CHECK_LIB(sysfs, sysfs_open_directory, 
++			[AC_DEFINE(HAVE_LIBSYSFS)
++			LIBS="$LIBS -lsysfs"],
++			[AC_MSG_WARN([Missing sysfs library!])])],
++		[AC_MSG_WARN([Missing /usr/include/sysfs/libsysfs.h])])
++fi
+ 
+ 
+ AC_SUBST(KERNEL_HEADERS)
diff --git a/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r3 b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r3
new file mode 100644
index 000000000000..0c80ead242a4
--- /dev/null
+++ b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6-r3
@@ -0,0 +1 @@
+MD5 9b7dc52656f5cbec846a7ba3299f73bd bridge-utils-1.0.6.tar.gz 81937