Version bump.

(Portage version: 2.0.51.20-r5)

6 files changed, 57 insertions, 5 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 41dd982d1444..befc7efe2bfd 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.18 2005/04/28 08:33:10 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.19 2005/04/29 23:00:09 robbat2 Exp $
+
+*bridge-utils-1.0.6 (29 Apr 2005)
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +bridge-utils-1.0.6.ebuild:
+  Version bump - now uses baselayout's bridge stuff.
 
   28 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
   bridge-utils-1.0.4.ebuild:
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index af6f2ab952ff..5ad72dcb8f53 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,10 +1,12 @@
 MD5 0d6d3f3c84b9fd514a08af08ba76ad0f bridge-utils-1.0.4.ebuild 1169
+MD5 b170a561cca7fa8dd39c9bc187fcb1fa bridge-utils-1.0.6.ebuild 1266
 MD5 2a1ab08fdef916039ca1dcacd812e6ec bridge-utils-0.9.6.ebuild 1081
 MD5 04cb0fb1066d0e15cde1f9c3cfe48db3 bridge-utils-0.9.6-r1.ebuild 1168
 MD5 f2948e2241be3fdf5c11de61f5bc6562 ChangeLog 2835
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6 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 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6-r1 69
 MD5 2247ac780a2897505fa460ba9b322d86 files/bridge.rc 939
diff --git a/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild b/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild
index 573b5cea102f..e06f597d85c4 100644
--- a/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild
+++ b/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-0.9.6-r1.ebuild,v 1.6 2004/07/01 20:48:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild,v 1.7 2005/04/29 23:00:09 robbat2 Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
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 e07243d80b94..93568032986e 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-2004 Gentoo Foundation
+# 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-0.9.6.ebuild,v 1.9 2004/07/01 20:48:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.10 2005/04/29 23:00:09 robbat2 Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild
new file mode 100644
index 000000000000..c3db2b52d1d7
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.0.6.ebuild
@@ -0,0 +1,43 @@
+# 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.ebuild,v 1.1 2005/04/29 23:00:09 robbat2 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/"
+
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
+
+IUSE=""
+RDEPEND="virtual/libc 
+	>=sys-fs/sysfsutils-1.0
+	>=sys-apps/baselayout-1.11.6*"
+DEPEND="${RDEPEND} virtual/os-headers"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+src_compile() {
+	# use santitized headers and not headers from /usr/src
+	econf \
+		--prefix=/ \
+		--libdir=/usr/lib \
+		--includedir=/usr/include \
+		--with-linux-headers=/usr/include \
+		|| 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/digest-bridge-utils-1.0.6 b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6
new file mode 100644
index 000000000000..0c80ead242a4
--- /dev/null
+++ b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.6
@@ -0,0 +1 @@
+MD5 9b7dc52656f5cbec846a7ba3299f73bd bridge-utils-1.0.6.tar.gz 81937