Backport linux-info config checks to stable revision, fix up dupe of some checks.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 23 insertions, 72 deletions

diff --git a/net-misc/htbinit/ChangeLog b/net-misc/htbinit/ChangeLog
index 43d43852a9c0..2f7e732c6f93 100644
--- a/net-misc/htbinit/ChangeLog
+++ b/net-misc/htbinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/htbinit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.14 2010/01/10 08:13:42 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.15 2011/11/16 00:18:15 robbat2 Exp $
+
+  16 Nov 2011; Robin H. Johnson <robbat2@gentoo.org> htbinit-0.8.5-r1.ebuild,
+  htbinit-0.8.5-r2.ebuild:
+  Backport linux-info config checks to stable revision, fix up dupe of some
+  checks.
 
 *htbinit-0.8.5-r2 (10 Jan 2010)
 
diff --git a/net-misc/htbinit/Manifest b/net-misc/htbinit/Manifest
index 0cd6c359a950..3a7d4796502c 100644
--- a/net-misc/htbinit/Manifest
+++ b/net-misc/htbinit/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX htb.init-v0.8.5_tos.patch 1656 RMD160 ea02de55e1d0a9ba7f510bd6ad4edce457a9d6a7 SHA1 bd5d20fe21bd864037439d34af155311a600771d SHA256 0b2b595d4fbf9aeac17646bbfc999009431a97061ccd995bd08c2edd26e51afb
 AUX htb.init_find_fix.patch 1165 RMD160 701827b114f6d5235254a2dc0fd5dbaf9bdd7f00 SHA1 ba2e51d966b447be745eb46901fd1c07dd80cd24 SHA256 23b55a4d946d75d44fc697537a6fc9d381df15bf041644dd5b9518b43827c2c6
 AUX htb.sysconfig 7137 RMD160 9a210c11c57adc8ebffa5db6b1dbe561020d63c8 SHA1 3c91415cb2b3867e8e18ad55ce836b88f5ee362c SHA256 69cfa9cb9818da69ac61808fdf0933eef911f6bd58494e3514142c6061e7cc6f
@@ -11,17 +8,8 @@ AUX prio_rule.patch 636 RMD160 7ddb72d87155f43ed2c2af1a2cbbfdf0c643156c SHA1 182
 AUX rc_htbinit 1079 RMD160 2f84fcba33d36efd3733e30c04f734e250e3827b SHA1 f29b214a494cf12fffa88b5ede1be55189ec61d8 SHA256 ea58fe4fd99adf3fc3eee3db5e3663e3e8abcc25b44ccc96c2d839ad54cfb524
 AUX timecheck_fix.patch 1221 RMD160 2099a1513edb0662c4389d86ce9cc45031d548e8 SHA1 ae33b259bd1e6afadcc0e2a062b751a5358b78d1 SHA256 af5579df10eb67a37f6a9d9b042d2347e483cff4b89b47c76cc9c17b2f68d68a
 DIST htb.init-v0.8.5 32038 RMD160 46a7f4c3e606828b3e26c29a2a0e87cef63d85b2 SHA1 edb7833188083a582bba11c5299d2dbccbecdcb8 SHA256 acfda369dff72b9073a8b70f2b05b1397a61a1cdb23970e5ed216d632ff33586
-EBUILD htbinit-0.8.5-r1.ebuild 2690 RMD160 7f5c586d794c2a7460788b462935bee0b91d407f SHA1 656096b75a6f3f0f3626175baa0e75251de48d4b SHA256 2f48bf326f10f7945f5c0c6a7815699fc082455ad8eccf2875dab3e968fb7ebd
-EBUILD htbinit-0.8.5-r2.ebuild 1808 RMD160 aae93b876b867f41fcbb67daca8724e81af695e7 SHA1 14473260c9110c8918296d715530301db693a42a SHA256 f4d6c2211b62f897d48727de1b4e9108568567f1980722c849fe7363108c80e8
+EBUILD htbinit-0.8.5-r1.ebuild 1695 RMD160 4be3244f99d1bf796ee9a55de26bab292bbcf3c1 SHA1 9db959ce70e8ff3cd7a116d4fdb4ea4737daa2f8 SHA256 9631c44bc523866a006376d845579309a40d0e687de1efe7793ca1871b08f427
+EBUILD htbinit-0.8.5-r2.ebuild 1726 RMD160 eb2148cb429ce0aa698b3ed5e015fad90ee345aa SHA1 820624bf615ed556f21cd2ace1278d469a4ab9b7 SHA256 0b3a0c3a889d05ce3e522d2ea00cfee77712574fcca9e29e3f6a153a363dba0e
 EBUILD htbinit-0.8.5.ebuild 1347 RMD160 4081ac8e80e957b5a737ef7fddc2bb426492c32f SHA1 54f24e759ba62aa7c7cc710a410a86a694a0866d SHA256 9e8b8f4cd6596e972c8cc264d8cf7e14364faeaa75fcd9ab59bdbb889a2d1fb1
-MISC ChangeLog 2275 RMD160 aaa3f95af32a98765cba5c91cf81eefeeb016305 SHA1 2e25b0541c12d60e9e16bb08b04c0ebf2a5ba8d1 SHA256 512638daa740cd6c314d359e6c091c736b0a49c51e6173c8d001eee6656d9994
+MISC ChangeLog 2467 RMD160 dca949b7716f1249cf631d754181eb10c633922e SHA1 126cdc4c3b326da92b3eb265774fdbe3197b0762 SHA256 aac3a9d5491e346d8a895b34b793d195d8f62ab4b32a22a3d0a91a748fa82fc3
 MISC metadata.xml 1012 RMD160 a4c7cb75d621355e212bd2478fd4c15a770f8bcf SHA1 1045408f36ab6a14c76b98577f788a77f0814e3f SHA256 afc1f8150431644140157e7e62525bce72491a5d9c645742c8c0d57728047c5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rRcACgkQfXuS5UK5QB3fWgP/SPdsPabUb2DYSO6ruQCzXOHe
-MK/ZxfZsR4U69DDMXsYuA8pkpx9RoR7NKzt5h5qoW4MlFOe43GuoVWNk2lJ6Q5ww
-B33Y6g8azRcuNXAvyj+Te1wzOTKwtfmcTBKsHgkhaClQhK27nBHfy6HNPP9ztToH
-z7YmCSXbMD23/qYGzEI=
-=8e2i
------END PGP SIGNATURE-----
diff --git a/net-misc/htbinit/htbinit-0.8.5-r1.ebuild b/net-misc/htbinit/htbinit-0.8.5-r1.ebuild
index 7de1b9745d5f..ca6de3e275dd 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r1.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild,v 1.4 2010/10/28 10:08:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild,v 1.5 2011/11/16 00:18:15 robbat2 Exp $
 
-inherit eutils linux-mod
+inherit eutils linux-info
 
 DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2"
 HOMEPAGE="http://www.sourceforge.net/projects/htbinit"
@@ -18,55 +18,14 @@ DEPEND="sys-apps/iproute2"
 S=${WORKDIR}
 
 pkg_setup() {
-	linux-mod_pkg_setup
-
-	ebegin "Checking for SCH_HTB support"
-		linux_chkconfig_present NET_SCH_HTB
-		eend $?
-		if [[ $? -ne 0 ]] ; then
-			eerror "This version needs sch_htb support!"
-	        die "sch_htb support not detected!"
-		fi
-	ebegin "Checking for SCH_SFQ support"
-	linux_chkconfig_present NET_SCH_SFQ
-	eend $?
-	if [[ $? -ne 0 ]] ; then
-		eerror "This version needs sch_sfq support!"
-	        die "sch_sfqsupport not detected!"
-	fi
-	ebegin "Checking for CLS_FW support"
-		linux_chkconfig_present NET_CLS_FW
-		eend $?
-		if [[ $? -ne 0 ]] ; then
-			eerror "This version needs cls_fw support!"
-	        die "cls_fw support not detected!"
-		fi
-	ebegin "Checking for CLS_U32 support"
-		linux_chkconfig_present NET_CLS_U32
-		eend $?
-		if [[ $? -ne 0 ]] ; then
-			eerror "This version needs sch_u32 support!"
-	        die "sch_u32 support not detected!"
-		fi
-	ebegin "Checking for CLS_ROUTE support"
-		linux_chkconfig_present NET_CLS_ROUTE
-		eend $?
-		if [[ $? -ne 0 ]] ; then
-			eerror "This version needs cls_route support!"
-	        die "cls_route support not detected!"
-		fi
-
-	if use esfq; then
-		ebegin "Checking for NET_SCH_ESFQ support"
-		linux_chkconfig_present NET_SCH_ESFQ
-		eend $?
-
-		if [[ $? -ne 0 ]] ; then
-			eerror "This version needs sch_esfq support!"
-			eerror "See http://fatooh.org/esfq-2.6/"
-			die "sch_esfq support not detected!"
-		fi
-	fi
+	for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE ; do
+		CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
+		eval "export WARNING_${i}='module needed at runtime!'"
+	done
+	use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ"
+	WARNING_NET_SCH_ESFQ='module needed at runtime! Available at http://fatooh.org/esfq-2.6/'
+	export CONFIG_CHECK
+	linux-info_pkg_setup
 }
 
 src_unpack() {
diff --git a/net-misc/htbinit/htbinit-0.8.5-r2.ebuild b/net-misc/htbinit/htbinit-0.8.5-r2.ebuild
index 9e1526243509..3447bd4288ed 100644
--- a/net-misc/htbinit/htbinit-0.8.5-r2.ebuild
+++ b/net-misc/htbinit/htbinit-0.8.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild,v 1.1 2010/01/10 08:13:42 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild,v 1.2 2011/11/16 00:18:15 robbat2 Exp $
 
 EAPI=2
 inherit eutils linux-info
@@ -19,7 +19,6 @@ DEPEND="sys-apps/iproute2"
 S=${WORKDIR}
 
 pkg_setup() {
-	CONFIG_CHECK="~NET_SCH_HTB ~NET_SCH_SFQ ~NET_CLS_FW ~NET_CLS_U32 ~NET_CLS_ROUTE"
 	for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE ; do
 		CONFIG_CHECK="${CONFIG_CHECK} ~${i}"
 		eval "export WARNING_${i}='module needed at runtime!'"