Cleanup old keep only latest. Bump to eapi5 and use src_uri arrows.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

3 files changed, 13 insertions, 53 deletions

diff --git a/net-misc/cbqinit/ChangeLog b/net-misc/cbqinit/ChangeLog
index a36ac738ab4d..1edbc65d1c2e 100644
--- a/net-misc/cbqinit/ChangeLog
+++ b/net-misc/cbqinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/cbqinit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.22 2012/03/18 17:53:05 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/ChangeLog,v 1.23 2013/03/05 09:18:23 scarabeus Exp $
+
+  05 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> -cbqinit-0.7.2.ebuild,
+  cbqinit-0.7.3-r1.ebuild:
+  Cleanup old keep only latest. Bump to eapi5 and use src_uri arrows.
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> cbqinit-0.7.3-r1.ebuild:
   alpha/sparc stable wrt #404835
diff --git a/net-misc/cbqinit/cbqinit-0.7.2.ebuild b/net-misc/cbqinit/cbqinit-0.7.2.ebuild
deleted file mode 100644
index d77e75434d00..000000000000
--- a/net-misc/cbqinit/cbqinit-0.7.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# 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.16 2010/10/28 09:58:35 ssuominen Exp $
-
-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}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha hppa ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND="sys-apps/iproute2"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/cbq.init-v${PV} "${S}"
-}
-
-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|'
-}
-
-src_install() {
-	mv cbq.init-v${PV} cbqinit
-
-	exeinto /usr/sbin
-	doexe cbqinit
-
-	newinitd "${FILESDIR}"/rc_cbqinit cbqinit
-
-	insinto /etc/cbqinit/sample
-	newins "${FILESDIR}"/cbq-1280.My_first_shaper.sample cbq-1280.My_first_shaper
-
-	dodoc cbqinit
-}
-
-pkg_postinst() {
-	einfo 'Run "rc-update add cbqinit default" to run cbqinit at startup.'
-}
diff --git a/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild b/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild
index 3aa68e1b79fc..6448e00bbd2c 100644
--- a/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild
+++ b/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild,v 1.6 2012/03/18 17:53:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cbqinit/cbqinit-0.7.3-r1.ebuild,v 1.7 2013/03/05 09:18:23 scarabeus Exp $
+
+EAPI=5
 
 inherit eutils
 
 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}"
+SRC_URI="mirror://sourceforge/cbqinit/cbq.init-v${PV} -> ${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,13 +21,13 @@ DEPEND=""
 S=${WORKDIR}
 
 src_unpack() {
-	cp "${DISTDIR}"/cbq.init-v${PV} "${S}"/cbqinit || die
+	cp "${DISTDIR}"/${P} "${S}"/cbqinit || die
 	grep '^#' cbqinit > README
 	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_install() {
-	dosbin cbqinit || die
+	dosbin cbqinit
 	newinitd "${FILESDIR}"/rc_cbqinit-r1 cbqinit
 	dodoc "${FILESDIR}"/cbq-1280.My_first_shaper.sample README
 }