[gentoo-commits] repo/gentoo:master commit in: net-misc/cbqinit/files/, net-misc/cbqinit/

[Austin English]

commit:     fb358b8c7a84f7b146cb1132ff8c709a877d2acb
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 23:16:00 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May  4 00:08:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb358b8c

net-misc/cbqinit: use #!/sbin/openrc-run instead of #!/sbin/runscript

Gentoo-Bug: https://bugs.gentoo.org/573846

Package-Manager: portage-2.2.26

 net-misc/cbqinit/cbqinit-0.7.3-r2.ebuild | 35 ++++++++++++++++++++++++++++++++
 net-misc/cbqinit/files/rc_cbqinit        | 17 ----------------
 net-misc/cbqinit/files/rc_cbqinit-r1     |  4 ++--
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r2.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r2.ebuild
new file mode 100644
index 0000000..71296e3
--- /dev/null
+++ b/net-misc/cbqinit/cbqinit-0.7.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Sets up class-based queue traffic control (QoS) with iproute2"
+HOMEPAGE="http://www.sourceforge.net/projects/cbqinit"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="sys-apps/iproute2"
+DEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${P} "${S}"/cbqinit || die
+	grep '^#' cbqinit > README
+}
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-gentoo.patch
+	default
+}
+
+src_install() {
+	dosbin cbqinit
+	newinitd "${FILESDIR}"/rc_cbqinit-r1 cbqinit
+	dodoc "${FILESDIR}"/cbq-1280.My_first_shaper.sample README
+}

diff --git a/net-misc/cbqinit/files/rc_cbqinit b/net-misc/cbqinit/files/rc_cbqinit
deleted file mode 100644
index e4e7351..0000000
--- a/net-misc/cbqinit/files/rc_cbqinit
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting cbqinit"
-	/usr/sbin/cbqinit start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cbqinit"
-	/usr/sbin/cbqinit stop
-	eend $?
-}

diff --git a/net-misc/cbqinit/files/rc_cbqinit-r1 b/net-misc/cbqinit/files/rc_cbqinit-r1
index b6ffad8..2c811a5 100644
--- a/net-misc/cbqinit/files/rc_cbqinit-r1
+++ b/net-misc/cbqinit/files/rc_cbqinit-r1
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {