version bump and src uri fix

6 files changed, 55 insertions, 10 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index 0e315f9f3457..5dc860ab0085 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/bridge-utils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.13 2004/04/26 12:29:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.14 2004/06/17 06:32:33 jhhudso Exp $
+
+  17 Jun 2004; Jared Hudson <jhhudso@gentoo.org> bridge-utils-0.9.6-r1.ebuild,
+  bridge-utils-0.9.6.ebuild, bridge-utils-1.0.4.ebuild:
+  Fixed SRC_URI to point to sourceforge's new bridge util location, set 0.9.6
+  to x86 and bumped bridge-utils to 1.0.4 (~x86)
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   bridge-utils-0.9.6-r1.ebuild, bridge-utils-0.9.6.ebuild:
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index 5fdf0ae94e3a..56835b5c7724 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,8 +1,10 @@
-MD5 e2f5005278237be3e69f77ee9c08ea2c bridge-utils-0.9.6.ebuild 1097
-MD5 e4364d5a51746fcc10c6643a4f0f68f5 bridge-utils-0.9.6-r1.ebuild 1185
-MD5 3d33954b275f65ab40a35d20b29c32fd ChangeLog 2195
+MD5 6a6079e4d8ef8d8e929286ba37c5d9e8 bridge-utils-0.9.6-r1.ebuild 1169
+MD5 6e7f1397bd7c7b2e70caca3d1732b9fd bridge-utils-1.0.4.ebuild 1163
 MD5 2c3158204cfb4b9c36b8bc78e8421b16 metadata.xml 223
-MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6 69
+MD5 b43ec71d8168240cd936e11a72d2cc5d ChangeLog 2371
+MD5 8738456a09525a23355896542068f2d3 bridge-utils-0.9.6.ebuild 1082
 MD5 bccc629ec82d45006faa7d2e7cfe900f files/bridge.conf 106
+MD5 be13eee50cb73dfb7574dc9d439e247e files/digest-bridge-utils-1.0.4 70
+MD5 ab89aefb5bcf4befdfb115be79139469 files/digest-bridge-utils-0.9.6 69
 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 7fc3a4a63368..dd0964166bf6 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 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-r1.ebuild,v 1.3 2004/04/26 12:29:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6-r1.ebuild,v 1.4 2004/06/17 06:32:33 jhhudso Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -8,12 +8,12 @@ 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"
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
 
 DEPEND="virtual/glibc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 src_compile() {
 	econf --prefix=/ --libdir=/usr/lib --includedir=/usr/include || die "econf failed"
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 58ee9fc53caa..f9135c2425b2 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 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.6 2004/04/26 12:29:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/bridge-utils-0.9.6.ebuild,v 1.7 2004/06/17 06:32:33 jhhudso Exp $
 
 # I think you want CONFIG_BRIDGE in your kernel to use this ;)
 
@@ -8,7 +8,7 @@ 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"
+SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
 
 DEPEND="virtual/glibc"
 LICENSE="GPL-2"
diff --git a/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild b/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild
new file mode 100644
index 000000000000..c9a65fe6eedb
--- /dev/null
+++ b/net-misc/bridge-utils/bridge-utils-1.0.4.ebuild
@@ -0,0 +1,37 @@
+# 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-1.0.4.ebuild,v 1.1 2004/06/17 06:32:33 jhhudso 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"
+
+DEPEND="virtual/glibc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+src_compile() {
+	econf --prefix=/ --libdir=/usr/lib --includedir=/usr/include || die "econf failed"
+	emake || die "make failed"
+}
+
+src_install () {
+	einstall prefix=${D} libdir=${D}/usr/lib includedir=${D}/usr/include
+	dodoc AUTHORS ChangeLog README THANKS
+	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,SMPNOTES,WISHLIST}
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bridge.rc bridge
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/bridge.conf bridge
+}
+
+pkg_postinst () {
+	ewarn "Gentoo now comes with a bridge init script. You can add it to"
+	ewarn "the boot runlevel. You can configure it in /etc/conf.d/bridge"
+}
diff --git a/net-misc/bridge-utils/files/digest-bridge-utils-1.0.4 b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.4
new file mode 100644
index 000000000000..687af1428982
--- /dev/null
+++ b/net-misc/bridge-utils/files/digest-bridge-utils-1.0.4
@@ -0,0 +1 @@
+MD5 2cab42847c4654e58c4d0ba114bfe2c2 bridge-utils-1.0.4.tar.gz 160605