1 |
robbat2 11/11/16 00:18:15 |
2 |
|
3 |
Modified: ChangeLog htbinit-0.8.5-r2.ebuild |
4 |
htbinit-0.8.5-r1.ebuild |
5 |
Log: |
6 |
Backport linux-info config checks to stable revision, fix up dupe of some checks. |
7 |
|
8 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.15 net-misc/htbinit/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/ChangeLog?rev=1.15&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/ChangeLog?rev=1.15&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/ChangeLog?r1=1.14&r2=1.15 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v |
20 |
retrieving revision 1.14 |
21 |
retrieving revision 1.15 |
22 |
diff -p -w -b -B -u -u -r1.14 -r1.15 |
23 |
--- ChangeLog 10 Jan 2010 08:13:42 -0000 1.14 |
24 |
+++ ChangeLog 16 Nov 2011 00:18:15 -0000 1.15 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-misc/htbinit |
27 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.14 2010/01/10 08:13:42 robbat2 Exp $ |
29 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-misc/htbinit/ChangeLog,v 1.15 2011/11/16 00:18:15 robbat2 Exp $ |
31 |
+ |
32 |
+ 16 Nov 2011; Robin H. Johnson <robbat2@g.o> htbinit-0.8.5-r1.ebuild, |
33 |
+ htbinit-0.8.5-r2.ebuild: |
34 |
+ Backport linux-info config checks to stable revision, fix up dupe of some |
35 |
+ checks. |
36 |
|
37 |
*htbinit-0.8.5-r2 (10 Jan 2010) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.2 net-misc/htbinit/htbinit-0.8.5-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild?rev=1.2&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild?rev=1.2&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild?r1=1.1&r2=1.2 |
47 |
|
48 |
Index: htbinit-0.8.5-r2.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r2.ebuild,v |
51 |
retrieving revision 1.1 |
52 |
retrieving revision 1.2 |
53 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
54 |
--- htbinit-0.8.5-r2.ebuild 10 Jan 2010 08:13:42 -0000 1.1 |
55 |
+++ htbinit-0.8.5-r2.ebuild 16 Nov 2011 00:18:15 -0000 1.2 |
56 |
@@ -1,6 +1,6 @@ |
57 |
-# Copyright 1999-2010 Gentoo Foundation |
58 |
+# Copyright 1999-2011 Gentoo Foundation |
59 |
# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $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 $ |
61 |
+# $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 $ |
62 |
|
63 |
EAPI=2 |
64 |
inherit eutils linux-info |
65 |
@@ -19,7 +19,6 @@ DEPEND="sys-apps/iproute2" |
66 |
S=${WORKDIR} |
67 |
|
68 |
pkg_setup() { |
69 |
- CONFIG_CHECK="~NET_SCH_HTB ~NET_SCH_SFQ ~NET_CLS_FW ~NET_CLS_U32 ~NET_CLS_ROUTE" |
70 |
for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE ; do |
71 |
CONFIG_CHECK="${CONFIG_CHECK} ~${i}" |
72 |
eval "export WARNING_${i}='module needed at runtime!'" |
73 |
|
74 |
|
75 |
|
76 |
1.5 net-misc/htbinit/htbinit-0.8.5-r1.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild?rev=1.5&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild?rev=1.5&content-type=text/plain |
80 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild?r1=1.4&r2=1.5 |
81 |
|
82 |
Index: htbinit-0.8.5-r1.ebuild |
83 |
=================================================================== |
84 |
RCS file: /var/cvsroot/gentoo-x86/net-misc/htbinit/htbinit-0.8.5-r1.ebuild,v |
85 |
retrieving revision 1.4 |
86 |
retrieving revision 1.5 |
87 |
diff -p -w -b -B -u -u -r1.4 -r1.5 |
88 |
--- htbinit-0.8.5-r1.ebuild 28 Oct 2010 10:08:38 -0000 1.4 |
89 |
+++ htbinit-0.8.5-r1.ebuild 16 Nov 2011 00:18:15 -0000 1.5 |
90 |
@@ -1,8 +1,8 @@ |
91 |
-# Copyright 1999-2010 Gentoo Foundation |
92 |
+# Copyright 1999-2011 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
-# $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 $ |
95 |
+# $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 $ |
96 |
|
97 |
-inherit eutils linux-mod |
98 |
+inherit eutils linux-info |
99 |
|
100 |
DESCRIPTION="Sets up Hierachical Token Bucket based traffic control (QoS) with iproute2" |
101 |
HOMEPAGE="http://www.sourceforge.net/projects/htbinit" |
102 |
@@ -18,55 +18,14 @@ DEPEND="sys-apps/iproute2" |
103 |
S=${WORKDIR} |
104 |
|
105 |
pkg_setup() { |
106 |
- linux-mod_pkg_setup |
107 |
- |
108 |
- ebegin "Checking for SCH_HTB support" |
109 |
- linux_chkconfig_present NET_SCH_HTB |
110 |
- eend $? |
111 |
- if [[ $? -ne 0 ]] ; then |
112 |
- eerror "This version needs sch_htb support!" |
113 |
- die "sch_htb support not detected!" |
114 |
- fi |
115 |
- ebegin "Checking for SCH_SFQ support" |
116 |
- linux_chkconfig_present NET_SCH_SFQ |
117 |
- eend $? |
118 |
- if [[ $? -ne 0 ]] ; then |
119 |
- eerror "This version needs sch_sfq support!" |
120 |
- die "sch_sfqsupport not detected!" |
121 |
- fi |
122 |
- ebegin "Checking for CLS_FW support" |
123 |
- linux_chkconfig_present NET_CLS_FW |
124 |
- eend $? |
125 |
- if [[ $? -ne 0 ]] ; then |
126 |
- eerror "This version needs cls_fw support!" |
127 |
- die "cls_fw support not detected!" |
128 |
- fi |
129 |
- ebegin "Checking for CLS_U32 support" |
130 |
- linux_chkconfig_present NET_CLS_U32 |
131 |
- eend $? |
132 |
- if [[ $? -ne 0 ]] ; then |
133 |
- eerror "This version needs sch_u32 support!" |
134 |
- die "sch_u32 support not detected!" |
135 |
- fi |
136 |
- ebegin "Checking for CLS_ROUTE support" |
137 |
- linux_chkconfig_present NET_CLS_ROUTE |
138 |
- eend $? |
139 |
- if [[ $? -ne 0 ]] ; then |
140 |
- eerror "This version needs cls_route support!" |
141 |
- die "cls_route support not detected!" |
142 |
- fi |
143 |
- |
144 |
- if use esfq; then |
145 |
- ebegin "Checking for NET_SCH_ESFQ support" |
146 |
- linux_chkconfig_present NET_SCH_ESFQ |
147 |
- eend $? |
148 |
- |
149 |
- if [[ $? -ne 0 ]] ; then |
150 |
- eerror "This version needs sch_esfq support!" |
151 |
- eerror "See http://fatooh.org/esfq-2.6/" |
152 |
- die "sch_esfq support not detected!" |
153 |
- fi |
154 |
- fi |
155 |
+ for i in NET_SCH_HTB NET_SCH_SFQ NET_CLS_FW NET_CLS_U32 NET_CLS_ROUTE ; do |
156 |
+ CONFIG_CHECK="${CONFIG_CHECK} ~${i}" |
157 |
+ eval "export WARNING_${i}='module needed at runtime!'" |
158 |
+ done |
159 |
+ use esfq && CONFIG_CHECK="${CONFIG_CHECK} ~NET_SCH_ESFQ" |
160 |
+ WARNING_NET_SCH_ESFQ='module needed at runtime! Available at http://fatooh.org/esfq-2.6/' |
161 |
+ export CONFIG_CHECK |
162 |
+ linux-info_pkg_setup |
163 |
} |
164 |
|
165 |
src_unpack() { |