closing bug 21014

4 files changed, 16 insertions, 7 deletions

diff --git a/net-misc/cbqinit/ChangeLog b/net-misc/cbqinit/ChangeLog
index 8f1350943868..b285f3201467 100644
--- a/net-misc/cbqinit/ChangeLog
+++ b/net-misc/cbqinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/cbqinit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.3 2003/02/12 08:19:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.4 2003/05/15 15:58:33 phosphan Exp $
+
+  15 May 2003; Patrick Kursawe <phosphan@gentoo.org> cbqinit-0.7.2.ebuild,
+  cbqinit-0.7.ebuild:
+  ip and tc were moved from /usr/sbin to /sbin - the ebuilds changed the path to
+  the old place.
 
 *cbqinit-0.7.2 (10 Feb 2003)
    
diff --git a/net-misc/cbqinit/Manifest b/net-misc/cbqinit/Manifest
new file mode 100644
index 000000000000..d8cf1a8d1f4d
--- /dev/null
+++ b/net-misc/cbqinit/Manifest
@@ -0,0 +1,7 @@
+MD5 ff40837bc7996e4dfa0e87d31b8f13df cbqinit-0.7.2.ebuild 1229
+MD5 7ef9eccf21d7a1c85206bba5e1c7c072 cbqinit-0.7.ebuild 1106
+MD5 581c1622284f403b11a4ff23feb233aa ChangeLog 744
+MD5 36312b31d2218761e171ebcaf2db04e8 files/cbq-1280.My_first_shaper.sample 79
+MD5 20829547e7a1bb95dcbe6b56119650dd files/digest-cbqinit-0.7 57
+MD5 fa0a999eda33e423e9f27ad78dc8208e files/digest-cbqinit-0.7.2 59
+MD5 bf58f1ad519fe89dc6c6b90eabb3c860 files/rc_cbqinit 188
diff --git a/net-misc/cbqinit/cbqinit-0.7.2.ebuild b/net-misc/cbqinit/cbqinit-0.7.2.ebuild
index 50194d1ad5ca..7c551dc58dd5 100644
--- a/net-misc/cbqinit/cbqinit-0.7.2.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.2.ebuild,v 1.2 2003/02/13 14:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.2.ebuild,v 1.3 2003/05/15 15:58:33 phosphan Exp $
 
 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
@@ -22,8 +22,7 @@ src_compile() {
 	mv cbq.init-v${PV} cbq.init-v${PV}.orig
 	sed <cbq.init-v${PV}.orig >cbq.init-v${PV} \
 		-e 's|CBQ_PATH=${CBQ_PATH:-/etc/sysconfig/cbq}|CBQ_PATH=/etc/cbqinit|' \
-		-e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|' \
-		-e 's|-x /sbin/tc -a -x /sbin/ip|-x /usr/sbin/tc -a -x /usr/sbin/ip|'
+		-e 's|CBQ_CACHE=${CBQ_CACHE:-/var/cache/cbq.init}|CBQ_CACHE=/var/cache/cbqinit|' 
 }
 
 src_install() {
diff --git a/net-misc/cbqinit/cbqinit-0.7.ebuild b/net-misc/cbqinit/cbqinit-0.7.ebuild
index b4a9cce2fdc4..5459dc3c6f37 100644
--- a/net-misc/cbqinit/cbqinit-0.7.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.ebuild,v 1.4 2003/03/27 02:24:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.ebuild,v 1.5 2003/05/15 15:58:33 phosphan Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
@@ -23,8 +23,6 @@ src_compile() {
 	sed -i \
 		-e 's|^CBQ_PATH=.*|CBQ_PATH=/etc/cbqinit|' \
 		-e 's|CBQ_CACHE=.*|CBQ_CACHE=/var/cache/cbqinit|' \
-		-e 's|/sbin/tc|/usr/sbin/tc|' \
-		-e 's|/sbin/ip|/usr/sbin/ip|' \
 		cbq.init-v${PV}
 }