1 |
jlec 14/05/21 06:38:17 |
2 |
|
3 |
Modified: ChangeLog distcc-3.2_rc1.ebuild |
4 |
distcc-3.1-r9.ebuild |
5 |
Log: |
6 |
sys-devel/distcc: Bump to new python eclasses and bump to EAPI=5 |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.236 sys-devel/distcc/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.236&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?rev=1.236&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/ChangeLog?r1=1.235&r2=1.236 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v |
20 |
retrieving revision 1.235 |
21 |
retrieving revision 1.236 |
22 |
diff -u -r1.235 -r1.236 |
23 |
--- ChangeLog 16 May 2014 19:53:04 -0000 1.235 |
24 |
+++ ChangeLog 21 May 2014 06:38:17 -0000 1.236 |
25 |
@@ -1,6 +1,10 @@ |
26 |
# ChangeLog for sys-devel/distcc |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.235 2014/05/16 19:53:04 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.236 2014/05/21 06:38:17 jlec Exp $ |
30 |
+ |
31 |
+ 21 May 2014; Justin Lecher <jlec@g.o> distcc-3.1-r9.ebuild, |
32 |
+ distcc-3.2_rc1.ebuild: |
33 |
+ Bump to new python eclasses and bump to EAPI=5 |
34 |
|
35 |
16 May 2014; Jeroen Roovers <jer@g.o> distcc-3.0-r4.ebuild, |
36 |
distcc-3.1-r5.ebuild, distcc-3.1-r6.ebuild, distcc-3.1-r7.ebuild, |
37 |
|
38 |
|
39 |
|
40 |
1.8 sys-devel/distcc/distcc-3.2_rc1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild?rev=1.8&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild?rev=1.8&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild?r1=1.7&r2=1.8 |
45 |
|
46 |
Index: distcc-3.2_rc1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v |
49 |
retrieving revision 1.7 |
50 |
retrieving revision 1.8 |
51 |
diff -u -r1.7 -r1.8 |
52 |
--- distcc-3.2_rc1.ebuild 19 Jan 2014 01:53:44 -0000 1.7 |
53 |
+++ distcc-3.2_rc1.ebuild 21 May 2014 06:38:17 -0000 1.8 |
54 |
@@ -1,14 +1,15 @@ |
55 |
# Copyright 1999-2014 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.7 2014/01/19 01:53:44 vapier Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.2_rc1.ebuild,v 1.8 2014/05/21 06:38:17 jlec Exp $ |
59 |
|
60 |
-EAPI="3" |
61 |
-PYTHON_DEPEND="2:2.5" |
62 |
+EAPI=5 |
63 |
|
64 |
-inherit autotools eutils fdo-mime flag-o-matic multilib python systemd toolchain-funcs user |
65 |
+PYTHON_COMPAT=( python2_7 ) |
66 |
+ |
67 |
+inherit autotools eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user |
68 |
|
69 |
MY_P="${P/_}" |
70 |
-DESCRIPTION="a program to distribute compilation of C code across several machines on a network" |
71 |
+DESCRIPTION="Distribute compilation of C code across several machines on a network" |
72 |
HOMEPAGE="http://distcc.org/" |
73 |
SRC_URI="http://distcc.googlecode.com/files/${MY_P}.tar.bz2" |
74 |
|
75 |
@@ -19,7 +20,8 @@ |
76 |
|
77 |
RESTRICT="test" |
78 |
|
79 |
-RDEPEND="dev-libs/popt |
80 |
+RDEPEND=" |
81 |
+ dev-libs/popt |
82 |
avahi? ( >=net-dns/avahi-0.6[dbus] ) |
83 |
gnome? ( |
84 |
>=gnome-base/libgnome-2 |
85 |
@@ -40,11 +42,11 @@ |
86 |
S="${WORKDIR}/${MY_P}" |
87 |
|
88 |
DCCC_PATH="/usr/$(get_libdir)/distcc/bin" |
89 |
+DISTCC_VERBOSE="0" |
90 |
|
91 |
pkg_setup() { |
92 |
enewuser distcc 240 -1 -1 daemon |
93 |
- python_set_active_version 2 |
94 |
- python_pkg_setup |
95 |
+ python-single-r1_pkg_setup |
96 |
} |
97 |
|
98 |
src_prepare() { |
99 |
@@ -61,10 +63,9 @@ |
100 |
# Bugs #120001, #167844 and probably more. See patch for description. |
101 |
use hardened && epatch "${FILESDIR}/distcc-hardened.patch" |
102 |
|
103 |
- python_convert_shebangs -r $(python_get_version) . |
104 |
sed -i \ |
105 |
-e "/PATH/s:\$distcc_location:${EPREFIX}${DCCC_PATH}:" \ |
106 |
- -e "s:@PYTHON@:${EPREFIX}$(PYTHON -a):" \ |
107 |
+ -e "s:@PYTHON@:${EPYTHON}:" \ |
108 |
pump.in || die "sed failed" |
109 |
|
110 |
sed \ |
111 |
@@ -77,7 +78,7 @@ |
112 |
} |
113 |
|
114 |
src_configure() { |
115 |
- local myconf="--disable-Werror" |
116 |
+ local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" |
117 |
# More legacy stuff? |
118 |
[ "$(gcc-major-version)" = "2" ] && filter-lfs-flags |
119 |
|
120 |
@@ -89,16 +90,15 @@ |
121 |
$(use_with gtk) \ |
122 |
$(use_with gnome) \ |
123 |
$(use_with gssapi auth) \ |
124 |
- --with-docdir="${EPREFIX}/usr/share/doc/${PF}" \ |
125 |
- ${myconf} || die "econf failed" |
126 |
+ ${myconf} |
127 |
} |
128 |
|
129 |
src_install() { |
130 |
- emake DESTDIR="${D}" install || die |
131 |
+ default |
132 |
|
133 |
- dobin "${FILESDIR}/3.0/distcc-config" || die |
134 |
+ dobin "${FILESDIR}/3.0/distcc-config" |
135 |
|
136 |
- newinitd "${FILESDIR}/3.1/init" distccd || die |
137 |
+ newinitd "${FILESDIR}/3.1/init" distccd |
138 |
systemd_dounit "${FILESDIR}/distccd.service" |
139 |
systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
140 |
|
141 |
|
142 |
|
143 |
|
144 |
1.10 sys-devel/distcc/distcc-3.1-r9.ebuild |
145 |
|
146 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild?rev=1.10&view=markup |
147 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild?rev=1.10&content-type=text/plain |
148 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild?r1=1.9&r2=1.10 |
149 |
|
150 |
Index: distcc-3.1-r9.ebuild |
151 |
=================================================================== |
152 |
RCS file: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild,v |
153 |
retrieving revision 1.9 |
154 |
retrieving revision 1.10 |
155 |
diff -u -r1.9 -r1.10 |
156 |
--- distcc-3.1-r9.ebuild 16 May 2014 19:53:04 -0000 1.9 |
157 |
+++ distcc-3.1-r9.ebuild 21 May 2014 06:38:17 -0000 1.10 |
158 |
@@ -1,12 +1,12 @@ |
159 |
# Copyright 1999-2014 Gentoo Foundation |
160 |
# Distributed under the terms of the GNU General Public License v2 |
161 |
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild,v 1.9 2014/05/16 19:53:04 jer Exp $ |
162 |
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-3.1-r9.ebuild,v 1.10 2014/05/21 06:38:17 jlec Exp $ |
163 |
|
164 |
EAPI=5 |
165 |
|
166 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
167 |
|
168 |
-inherit eutils fdo-mime flag-o-matic multilib python-single-r1 toolchain-funcs user systemd |
169 |
+inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user |
170 |
|
171 |
DESCRIPTION="Distribute compilation of C code across several machines on a network" |
172 |
HOMEPAGE="http://distcc.org/" |
173 |
@@ -82,7 +82,7 @@ |
174 |
systemd_dounit "${FILESDIR}/distccd.service" |
175 |
systemd_install_serviced "${FILESDIR}/distccd.service.conf" |
176 |
|
177 |
- cp "${FILESDIR}/3.1/conf" "${T}/distccd" |
178 |
+ cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die |
179 |
if use avahi; then |
180 |
cat >> "${T}/distccd" <<-EOF |
181 |
|
182 |
@@ -118,7 +118,7 @@ |
183 |
if use gtk; then |
184 |
einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" |
185 |
einfo "This is to have a little sensability in naming schemes between distccmon programs" |
186 |
- mv "${D}/usr/bin/distccmon-gnome" "${D}/usr/bin/distccmon-gui" || die |
187 |
+ mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die |
188 |
dosym distccmon-gui /usr/bin/distccmon-gnome |
189 |
fi |