1 |
jlec 13/01/31 12:59:35 |
2 |
|
3 |
Modified: ChangeLog linkchecker-8.2.ebuild |
4 |
linkchecker-7.9.ebuild linkchecker-8.3.ebuild |
5 |
Log: |
6 |
net-analyzer/linkchecker: Call python_pkg_setup where necessary, #454820; fix usage of new python eclasses; make installation with USE=-nagios cleaner |
7 |
|
8 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 70EB7916) |
9 |
|
10 |
Revision Changes Path |
11 |
1.87 net-analyzer/linkchecker/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/ChangeLog?rev=1.87&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/ChangeLog?rev=1.87&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/ChangeLog?r1=1.86&r2=1.87 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v |
20 |
retrieving revision 1.86 |
21 |
retrieving revision 1.87 |
22 |
diff -u -r1.86 -r1.87 |
23 |
--- ChangeLog 16 Jan 2013 11:49:30 -0000 1.86 |
24 |
+++ ChangeLog 31 Jan 2013 12:59:35 -0000 1.87 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-analyzer/linkchecker |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.86 2013/01/16 11:49:30 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.87 2013/01/31 12:59:35 jlec Exp $ |
30 |
+ |
31 |
+ 31 Jan 2013; Justin Lecher <jlec@g.o> linkchecker-7.9.ebuild, |
32 |
+ linkchecker-8.2.ebuild, linkchecker-8.3.ebuild: |
33 |
+ Call python_pkg_setup where necessary, #454820; fix usage of new python |
34 |
+ eclasses; make installation with USE=-nagios cleaner |
35 |
|
36 |
16 Jan 2013; Justin Lecher <jlec@g.o> linkchecker-8.3.ebuild, |
37 |
metadata.xml: |
38 |
|
39 |
|
40 |
|
41 |
1.5 net-analyzer/linkchecker/linkchecker-8.2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild?rev=1.5&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild?rev=1.5&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild?r1=1.4&r2=1.5 |
46 |
|
47 |
Index: linkchecker-8.2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v |
50 |
retrieving revision 1.4 |
51 |
retrieving revision 1.5 |
52 |
diff -u -r1.4 -r1.5 |
53 |
--- linkchecker-8.2.ebuild 15 Jan 2013 16:17:54 -0000 1.4 |
54 |
+++ linkchecker-8.2.ebuild 31 Jan 2013 12:59:35 -0000 1.5 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2013 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.4 2013/01/15 16:17:54 jlec Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.2.ebuild,v 1.5 2013/01/31 12:59:35 jlec Exp $ |
60 |
|
61 |
EAPI=4 |
62 |
|
63 |
@@ -47,6 +47,10 @@ |
64 |
|
65 |
S="${WORKDIR}/${MY_P}" |
66 |
|
67 |
+pkg_setup() { |
68 |
+ python_pkg_setup |
69 |
+} |
70 |
+ |
71 |
src_prepare() { |
72 |
epatch \ |
73 |
"${FILESDIR}"/8.0-missing-files.patch \ |
74 |
|
75 |
|
76 |
|
77 |
1.8 net-analyzer/linkchecker/linkchecker-7.9.ebuild |
78 |
|
79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild?rev=1.8&view=markup |
80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild?rev=1.8&content-type=text/plain |
81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild?r1=1.7&r2=1.8 |
82 |
|
83 |
Index: linkchecker-7.9.ebuild |
84 |
=================================================================== |
85 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v |
86 |
retrieving revision 1.7 |
87 |
retrieving revision 1.8 |
88 |
diff -u -r1.7 -r1.8 |
89 |
--- linkchecker-7.9.ebuild 15 Jan 2013 16:17:54 -0000 1.7 |
90 |
+++ linkchecker-7.9.ebuild 31 Jan 2013 12:59:35 -0000 1.8 |
91 |
@@ -1,6 +1,6 @@ |
92 |
# Copyright 1999-2013 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v 1.7 2013/01/15 16:17:54 jlec Exp $ |
95 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-7.9.ebuild,v 1.8 2013/01/31 12:59:35 jlec Exp $ |
96 |
|
97 |
EAPI=4 |
98 |
|
99 |
@@ -47,6 +47,10 @@ |
100 |
|
101 |
S="${WORKDIR}/${MY_P}" |
102 |
|
103 |
+pkg_setup() { |
104 |
+ python_pkg_setup |
105 |
+} |
106 |
+ |
107 |
src_prepare() { |
108 |
epatch \ |
109 |
"${FILESDIR}"/7.4-missing-files.patch \ |
110 |
|
111 |
|
112 |
|
113 |
1.4 net-analyzer/linkchecker/linkchecker-8.3.ebuild |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild?rev=1.4&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild?rev=1.4&content-type=text/plain |
117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild?r1=1.3&r2=1.4 |
118 |
|
119 |
Index: linkchecker-8.3.ebuild |
120 |
=================================================================== |
121 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v |
122 |
retrieving revision 1.3 |
123 |
retrieving revision 1.4 |
124 |
diff -u -r1.3 -r1.4 |
125 |
--- linkchecker-8.3.ebuild 16 Jan 2013 11:49:30 -0000 1.3 |
126 |
+++ linkchecker-8.3.ebuild 31 Jan 2013 12:59:35 -0000 1.4 |
127 |
@@ -1,6 +1,6 @@ |
128 |
# Copyright 1999-2013 Gentoo Foundation |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.3 2013/01/16 11:49:30 jlec Exp $ |
131 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-8.3.ebuild,v 1.4 2013/01/31 12:59:35 jlec Exp $ |
132 |
|
133 |
EAPI=5 |
134 |
|
135 |
@@ -44,25 +44,21 @@ |
136 |
|
137 |
S="${WORKDIR}/${MY_P}" |
138 |
|
139 |
-DISTUTILS_NO_PARALLEL_BUILD=true |
140 |
- |
141 |
-src_prepare() { |
142 |
- epatch \ |
143 |
- "${FILESDIR}"/8.0-missing-files.patch \ |
144 |
- "${FILESDIR}"/${P}-unbundle.patch \ |
145 |
+python_prepare_all() { |
146 |
+ local PATCHES=( |
147 |
+ "${FILESDIR}"/8.0-missing-files.patch |
148 |
+ "${FILESDIR}"/${P}-unbundle.patch |
149 |
"${FILESDIR}"/${PN}-8.0-desktop.patch |
150 |
- distutils-r1_src_prepare |
151 |
+ ) |
152 |
+ distutils-r1_python_prepare_all |
153 |
} |
154 |
|
155 |
-src_compile() { |
156 |
- distutils-r1_src_compile |
157 |
- if use doc; then |
158 |
- emake -C doc/html |
159 |
- fi |
160 |
+python_compile_all() { |
161 |
+ use doc && emake -C doc/html |
162 |
} |
163 |
|
164 |
-src_install() { |
165 |
- distutils-r1_src_install |
166 |
+python_install_all() { |
167 |
+ distutils-r1_python_install_all |
168 |
if ! use X; then |
169 |
delete_gui() { |
170 |
rm -rf \ |
171 |
@@ -71,10 +67,12 @@ |
172 |
} |
173 |
python_foreach_impl delete_gui |
174 |
fi |
175 |
- if use doc; then |
176 |
- dohtml doc/html/* |
177 |
- fi |
178 |
+ use doc && dohtml doc/html/* |
179 |
use bash-completion && dobashcomp config/linkchecker-completion |
180 |
insinto /usr/$(get_libdir)/nagios/plugins |
181 |
- use nagios && doins linkchecker-nagios |
182 |
+ if use nagios; then |
183 |
+ doins linkchecker-nagios |
184 |
+ else |
185 |
+ rm -f "${ED}"/usr/bin/linkchecker-nagios* || die |
186 |
+ fi |
187 |
} |