old

Package-Manager: portage-2.2.3/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

8 files changed, 17 insertions, 223 deletions

diff --git a/net-misc/bridge-utils/ChangeLog b/net-misc/bridge-utils/ChangeLog
index afa3cb27b92a..0c593210a16b 100644
--- a/net-misc/bridge-utils/ChangeLog
+++ b/net-misc/bridge-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/bridge-utils
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.68 2013/09/14 07:42:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bridge-utils/ChangeLog,v 1.69 2013/09/14 19:28:31 ssuominen Exp $
+
+  14 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> -bridge-utils-1.2.ebuild,
+  -bridge-utils-1.4.ebuild, -files/bridge-utils-1.0.6-allow-without-sysfs.patch,
+  -files/bridge-utils-1.0.6-dont-error-on-no-ports.patch, -files/bridge.conf,
+  -files/bridge.rc:
+  old
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> bridge-utils-1.5.ebuild:
   Stable for ia64, wrt bug #483892
diff --git a/net-misc/bridge-utils/Manifest b/net-misc/bridge-utils/Manifest
index fcdf37240c48..0ba954df8b12 100644
--- a/net-misc/bridge-utils/Manifest
+++ b/net-misc/bridge-utils/Manifest
@@ -1,33 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX bridge-utils-1.0.6-allow-without-sysfs.patch 1013 SHA256 94189e72b9e3a87cf0d2aadc81ad833a9c0bd22153625eac172cb7f5585e0bef SHA512 1a546830a680264657f51fdba25102c497471bad7064bb9ef082cd0636ec608f3b40c985518ebb08e299fe1c50eab2dad28c7e5a4e0a9917dc5bea2e5fd78794 WHIRLPOOL 56ad5ca693ef0f9fe5cee3396902cc99bd0c0e01e4922df6cc0a1c29ea186c460203b2e9e41780718995b05c10cc51ed7a2c43a31c2a1349ae23c14ec048052a
-AUX bridge-utils-1.0.6-dont-error-on-no-ports.patch 330 SHA256 12987879314b68d49adbc650c565cdaf12e5a0d9280de158e367ca194ef70226 SHA512 e7e0b67f5a5a068a776c8ddea7b729ca6b14a5df17fa343bf253e4b672593b5e6491536e59334f4bed63a0df10bc0ba705921bdef34273edb7daf0a614f7bb2e WHIRLPOOL ac724f2767ef973a810743e118191482f5af398ca165157856f7d0c7fd0d28d88d7a63e0cfba9406907d8f715e721d3a6a288717c25b2de385ef92d08ee6800e
 AUX bridge-utils-1.5-linux-3.8.patch 435 SHA256 ce60b2328784307ad7a408fad96c0e0165b7740d1e4aaadb3cf2d6e6feaef235 SHA512 dea1668cc0b76b1f88e7040262e3056db278000df2680e8d3a1596b6821e7f8213a0e67ae26ffc23950b848c2ccc5dabf61baf6c40159eecfb7c22118dec2635 WHIRLPOOL 056fdf262ac2765a6996d54da8014d1f52d72d646ac215476dfb14bdb983fd0c8283ff61a056d3d909ef9a9cd1f0cb7cc08db112e4f477204d8a94371edf84ea
-AUX bridge.conf 106 SHA256 db4b0898067342cee89b7cc938a24dbfccecc688e01c75097cbae1c1ea6af6c5 SHA512 3ee97868aa7e7b3a9b6cb0504649500fbeacbca68fa1f0ec5f836fd39abef5bbbd1b847e3d2e39c3c01e56949d9cb36dfd78f78d7671360d7cdd3bcbafac5d82 WHIRLPOOL 2b2d4be78f81cef56fc9da46810bc9e4fb9f788b693bdb70f1ed0eedc42311e82f7ba26afb080c90e0c096a66ba851f1b831dfd24ed2864beebbc32679bcdd10
-AUX bridge.rc 939 SHA256 1280585cb84c05dee625a40be8316f8e3a8e2c870b67a80ed278233b7571141e SHA512 c970b875086e7416012b8093089b384b79707223140520459875138233cf1223566cb620cdfb364f77afc962a99e7edcd4e9e4cfde78da432663e25e9e1c8e49 WHIRLPOOL 8f1680a043b6c0778fe365692cea4c56f83cefc1c2aa7e9e19e82946cc6e81e0514bfe218d13356a892cb7631576e42b376442246af431a21257c2fc37a608e6
-DIST bridge-utils-1.2.tar.gz 32261 SHA256 c93b9fab6b12a80bcf69114aab66d1d298455e9269c44f9e5f6430c142f9e349 SHA512 b5e93f75ecb08c3a4ad997ea536850ea7e48161e889b492506cbb9035557ae6594e066273f0bd5f0cc817108304aae1096016c26952f317d48d7431e2f667ac8 WHIRLPOOL f816d7ca80b2fc169b5bcc97b1165742b54f385b8b7645410ee9565da36028e2ea4a6ac804349092e8f398bc73c068f72347caa394917ab9a731714d5579a3eb
-DIST bridge-utils-1.4.tar.gz 32657 SHA256 876975e9bcc302aa8b829161ea3348b12b9b879f1db0dc98feaed8d0e5dd5933 SHA512 d890e66fd93cac086ee4fd5e3097caf3703656a4bb97936ca4c06defa923dcd006b9958bd9aa04fd051a4598d80aaa0b02f8a4e59d3d6f97e67ab1dc271703ca WHIRLPOOL 5a45abc10d8e865e66af867d83147cf0687dd884f08515d280671acde12d653d7bb15412614d3cfa92bcdf1d745ff3d91c7b93ecc18363301e31ea1630ec2bf9
 DIST bridge-utils-1.5.tar.gz 33243 SHA256 42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 SHA512 4e525fbd3defb509664ef3b728d9e5edfb92beaebdb5d7733d8203fb38cb3f4bb54d02dc1e28813889a2ee19c78b9b47da6d99c8032481a7fd7f104658dea7c3 WHIRLPOOL f11eb95ae9b562cb301bb1f657d87878f0a0729a2129b90fa5957747f078f3afe2ebdadd1eb7ea4a59e544acc8194cf1744126db9ba3f3704210bc18ee3480fa
-EBUILD bridge-utils-1.2.ebuild 1452 SHA256 bb3b73d012dc1e3e2527ea93148a227dc67525bdff4555e9a6af697f76429af7 SHA512 26c08bed9f94010c3b3523bb2b691f92b65c00afaf6d2c3a18778b02c8f734f778c96cf06042724d9b4c9c726cdb35885a13a0a5add6a92a97d91023ada982bd WHIRLPOOL 5f1353d59e33e97539c7852bc637b3f4c757377a04a1a557895c8141e9804ae5158677d8b695033a10de60a2f413a59abb1bc06cd439d6ca73364ec91a49494d
-EBUILD bridge-utils-1.4.ebuild 1550 SHA256 2366dfce567b25877b5b123731a368adb3f34cca5685676cf653804fd2f7f985 SHA512 bb16554f3aa1c8378dfd796f0f2fce9774247a083acf6a191d50e2426e349f129115e72f4ab17281cb1feec713eae8335576d072777b481452f15707aee425a2 WHIRLPOOL b01567dd00ca871e7bec162d387cacbc4a4ad6a29145690f48c5b3ff43421c78d805e3aa1da2c106599641004dcb2355adcff0fdf5ebb085c946a94ce62c7525
 EBUILD bridge-utils-1.5.ebuild 1348 SHA256 964593444fa0ce3b17971a6cced1129fe27e1f98561a51cf5fe7594be4380588 SHA512 38f1c65d21c7341216f9514ca4d63af34b16f9c42ba5b2f329620b683a6c5b561c6615a53d2cb227bbf5bc6ddab53350fefe00dd30294ab561207f34b8d97c73 WHIRLPOOL 9a9ab906e29948473611f0926144238a50be1f6064e70042a3b63489589bce7f34c3ee3b5493723f278c3f04f686df9eea9b9993f844b62f1df812344688a038
-MISC ChangeLog 9771 SHA256 e1625d0fe1e7c808569582d2d52028c3f04a19d0e9d0daf7116f7dcb33bb3587 SHA512 8fc019a835dda32d507257c33faf785067a55ab6000f334b56a6198b94aab716fd672edf8042ef949f7b3c09ddad9e1a421075801769f3f8751e1513a6601890 WHIRLPOOL 87b48cf0c346fd64539ecb0ea00d2220f42a3c8eba761b5b196b0b6bbf58a0cf110b86ef66d0157667eb11a4cb346df5a095fdd1eafe71b75fddd283b107cd2d
+MISC ChangeLog 10043 SHA256 d8a990a138f6371c79f30f85432c2fa28be3674dc030f96a8cccd6bb6a1045dd SHA512 645127cac4ddfa1aa2609b1f19c1f78b6b92239beee2755bae8d2dd2f5f2e6bc37a457a3eef25dc310a5c902d7318d2bb708d112cc482880fa73b7af4ec3fb6b WHIRLPOOL 95b5aedb759001d4ca347f5ef97612c87469ce983792f7f7970ae8aa891c6941af2f608424ce9982eca60f710d10964b3204ffe318a82c2e7b6f1da5158fa306
 MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSNBKvAAoJELp701BxlEWf/ucQAJOqAbGflq/mNlkJwQLselYl
-plgrMGe+KeLK5yekYRHUWDJa6v0yHcqUu7tAeywiQejHwdZmtTcAw8o4eXU3mMvs
-bTL3K6KChHfBAlXKrAkpnFij22hJgazGEODdVil0aubBQmLj/HAEqk1MlG/RERyg
-9+GDzojeiUZtpMEvmqElVtDcW6DK7VuI4GFn4SBDDo9QHRO74lcr4+d76KYM/Yb+
-uJ4H1Gp+NXhNaOEUV53wmk6MSMevEl67uutarkCp4IkaWrK+PTQIQ7R3rfN0KZ0I
-2zXeXa6Ztv4b5MVM55vDd3ytgsFU+oXGfR2Wk2zXZgz831JF4GUbw0WuxR0Zp5wo
-v0ceeGzqeVXaiH0yJ7BTub4ptajIWLuxQLb2NkiD17TjkQSboyYBQtkeRRG0moDq
-DwVmtDOprq1CD73b7EIvTQ8susqojq+WWe3PGNSH1QwzE/aFr8jVRU7t0M/dakGR
-/fEg+oJ7Pne4mW2umxwzYRzivuIco44NlS1xFIS/L5gI+htmgYuD8HmH0WvHtngz
-PKHbU48Q60YS3vWZvjilSL8E5S2SI0WEBaOnm0Zzp502f27IvLLy68Y2AgVY8hdi
-9qBci7ZZNYub2rlr6aD6W17SSz9hjv2rqNgosZaz4bkAacpQz00DkY9/4ejwR0l1
-dfQXwePkPU3+wgYIqO+z
-=P9hg
+iQEcBAEBCAAGBQJSNLjKAAoJEEdUh39IaPFNbwUH/A3N466sG0G++uY3im+K0T81
+x2rMMAwxj46VqNfUr9l4jo6kqXOiTaw2D+k4Mg3EkQ3qYht5dEiq0eeZl3z0tuD/
+V+pTXcRil9sC30i5pUzyQlzpsMX3b6LH5+oxKavx5lVTbbIv2VX6QG7v6wwsC5mr
+MZI7zTgu4qraB7rxQOTWRdK3ybk0OLjyDeL0Ow59kMggsigaSw8TOhrqsOqCJn0Q
+WA40hFqgf1tEDJE85Dipa9f4ASjCS+lENP1BSsPK0xaezUMfXl+pxA/AlGExZ8cq
+u25ix4ygsTEeHaKCSpaIgO2FH/O1QwzF5ZAWtxNkuZu16nmZ+a8/t/SAakNigUA=
+=yknD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/bridge-utils/bridge-utils-1.2.ebuild b/net-misc/bridge-utils/bridge-utils-1.2.ebuild
deleted file mode 100644
index ef352cd8b175..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 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.2.ebuild,v 1.12 2008/09/30 06:48:15 robbat2 Exp $
-
-# I think you want CONFIG_BRIDGE in your kernel to use this ;)
-
-inherit eutils autotools
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc x86"
-IUSE=""
-
-DEPEND="virtual/os-headers
-	>=sys-devel/autoconf-2.59"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	WANT_AUTOMAKE=1.9 eautomake || die "Failed to run autoconf"
-	WANT_AUTOCONF=2.5 eautoconf || die "Failed to run autoconf"
-}
-
-src_compile() {
-	# use santitized headers and not headers from /usr/src
-	econf \
-		--prefix=/ \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--with-linux-headers=/usr/include \
-		|| die "econf failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	#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 separate init script."
-	ewarn "Please utilize the new bridge support in baselayout."
-}
diff --git a/net-misc/bridge-utils/bridge-utils-1.4.ebuild b/net-misc/bridge-utils/bridge-utils-1.4.ebuild
deleted file mode 100644
index 8965a3795fda..000000000000
--- a/net-misc/bridge-utils/bridge-utils-1.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 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.4.ebuild,v 1.11 2013/09/06 06:00:31 robbat2 Exp $
-
-inherit toolchain-funcs eutils autotools linux-info
-
-DESCRIPTION="Tools for configuring the Linux kernel 802.1d Ethernet Bridge"
-HOMEPAGE="http://bridge.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bridge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ia64 ppc sparc x86 ~ppc64"
-IUSE=""
-
-DEPEND="virtual/os-headers"
-RDEPEND=""
-
-CONFIG_CHECK="~BRIDGE"
-WARNING_BRIDGE="CONFIG_BRIDGE is required to get bridge devices in the kernel"
-
-get_headers() {
-	CTARGET=${CTARGET:-${CHOST}}
-	dir=/usr/include
-	tc-is-cross-compiler && dir=/usr/${CTARGET}/usr/include
-	echo "${dir}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_compile() {
-	# use santitized headers and not headers from /usr/src
-	econf \
-		--prefix=/ \
-		--libdir=/usr/$(get_libdir) \
-		--includedir=/usr/include \
-		--with-linux-headers="$(get_headers)" \
-		|| die "econf failed"
-	emake || die "make failed"
-}
-
-src_install () {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog README THANKS TODO
-	dodoc doc/{FAQ,FIREWALL,HOWTO,PROJECTS,RPM-GPG-KEY,SMPNOTES,WISHLIST}
-	[ -f "${D}"/sbin/brctl ] || die "upstream makefile failed to install binary"
-}
-
-pkg_postinst () {
-	ewarn "This package no longer provides a separate 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
deleted file mode 100644
index a54901a3752a..000000000000
--- a/net-misc/bridge-utils/files/bridge-utils-1.0.6-allow-without-sysfs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/bridge-utils-1.0.6-dont-error-on-no-ports.patch b/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch
deleted file mode 100644
index 0cfc47d11796..000000000000
--- a/net-misc/bridge-utils/files/bridge-utils-1.0.6-dont-error-on-no-ports.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libbridge/libbridge_init.c.orig	2005-07-05 14:15:23.000000000 +0100
-+++ libbridge/libbridge_init.c		2005-07-05 14:28:30.000000000 +0100
-@@ -230,7 +230,8 @@
- 
- 	links = sysfs_get_dir_links(dir);
- 	if (!links) {
--		err = -ENOSYS;
-+		/* We may not have any ports assigned, so we don't error */
-+		err = errno;
- 		goto out;
- 	}
- 
diff --git a/net-misc/bridge-utils/files/bridge.conf b/net-misc/bridge-utils/files/bridge.conf
deleted file mode 100644
index 94bcb4cda1f6..000000000000
--- a/net-misc/bridge-utils/files/bridge.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#Examples
-#
-#bridge="br100 br1000"
-#
-#bridge_br100_devices="eth3 eth4"
-#bridge_br1000_devices="eth5 eth6"
diff --git a/net-misc/bridge-utils/files/bridge.rc b/net-misc/bridge-utils/files/bridge.rc
deleted file mode 100644
index 388e47356321..000000000000
--- a/net-misc/bridge-utils/files/bridge.rc
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	use modules
-}
-
-start() {
-	for b in ${bridge}
-	do
-		ebegin "Create Bridge ${b}"
-		/sbin/brctl addbr ${b} || {
-			retval=$?
-			eend ${retval} "Failed to create bridge ${b}"
-			continue
-		}
-		for i in $(eval echo \$\{bridge_${b}_devices\})
-		do
-			/sbin/brctl addif ${b} ${i} || {
-				retval=$?
-				eend ${retval} "Failed to add interface ${i}"
-				continue
-			}
-			ifconfig ${i} 0.0.0.0 promisc || \
-				eend $? "Failed to set up interface ${i}"
-		done
-	done
-}
-
-stop() {
-	for b in ${bridge}
-	do
-		ebegin "Destroy Bridge ${b}"
-		for i in $(eval echo \$\{bridge_${b}_devices\})
-		do
-			ifconfig ${i} down || \
-				eend $? "Failed to set down interface ${i}"
-			/sbin/brctl delif ${b} ${i} || {
-				retval=$?
-				eend ${retval} "Failed to del interface ${i}"
-				return ${retval}
-			}
-		done
-		/sbin/brctl delbr ${b} || \
-			eend ${retval} "Failed to destroy bridge ${b}"
-	done
-	eend $? "Failed to stop bridge"
-}