1 |
polynomial-c 14/08/30 10:32:59 |
2 |
|
3 |
Modified: ChangeLog screen-4.2.1-r2.ebuild screen-9999.ebuild |
4 |
screen-4.0.3-r8.ebuild |
5 |
Log: |
6 |
Don't depend on sys-apps/openrc for /run support (bug #520706). Synced live ebuild with latest release ebuild |
7 |
|
8 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) |
9 |
|
10 |
Revision Changes Path |
11 |
1.199 app-misc/screen/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?rev=1.199&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?rev=1.199&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?r1=1.198&r2=1.199 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v |
20 |
retrieving revision 1.198 |
21 |
retrieving revision 1.199 |
22 |
diff -u -r1.198 -r1.199 |
23 |
--- ChangeLog 26 Aug 2014 16:07:14 -0000 1.198 |
24 |
+++ ChangeLog 30 Aug 2014 10:32:59 -0000 1.199 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for app-misc/screen |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.198 2014/08/26 16:07:14 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.199 2014/08/30 10:32:59 polynomial-c Exp $ |
30 |
+ |
31 |
+ 30 Aug 2014; Lars Wendler <polynomial-c@g.o> screen-4.0.3-r8.ebuild, |
32 |
+ screen-4.2.1-r2.ebuild, screen-9999.ebuild: |
33 |
+ Don't depend on sys-apps/openrc for /run support (bug #520706). Synced live |
34 |
+ ebuild with latest release ebuild. |
35 |
|
36 |
26 Aug 2014; Jeroen Roovers <jer@g.o> screen-4.2.1-r2.ebuild: |
37 |
Run make in src_compile() instead of in src_configure(). Fix one parallel |
38 |
|
39 |
|
40 |
|
41 |
1.4 app-misc/screen/screen-4.2.1-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild?rev=1.4&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild?rev=1.4&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild?r1=1.3&r2=1.4 |
46 |
|
47 |
Index: screen-4.2.1-r2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v |
50 |
retrieving revision 1.3 |
51 |
retrieving revision 1.4 |
52 |
diff -u -r1.3 -r1.4 |
53 |
--- screen-4.2.1-r2.ebuild 26 Aug 2014 16:07:14 -0000 1.3 |
54 |
+++ screen-4.2.1-r2.ebuild 30 Aug 2014 10:32:59 -0000 1.4 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2014 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v 1.3 2014/08/26 16:07:14 jer Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v 1.4 2014/08/30 10:32:59 polynomial-c Exp $ |
60 |
|
61 |
EAPI=5 |
62 |
|
63 |
@@ -20,8 +20,7 @@ |
64 |
selinux? ( sec-policy/selinux-screen )" |
65 |
DEPEND="${RDEPEND} |
66 |
sys-apps/texinfo" |
67 |
-RDEPEND="${RDEPEND} |
68 |
- >=sys-apps/openrc-0.11.6" |
69 |
+RDEPEND="${RDEPEND}" |
70 |
|
71 |
pkg_setup() { |
72 |
# Make sure utmp group exists, as it's used later on. |
73 |
@@ -123,7 +122,7 @@ |
74 |
elog "applications. Please check /etc/screenrc for information on these changes." |
75 |
fi |
76 |
|
77 |
- # add /var/run/screen in case it doesn't exist yet. This should solve |
78 |
+ # Add /tmp/screen in case it doesn't exist yet. This should solve |
79 |
# problems like bug #508634 where tmpfiles.d isn't in effect. |
80 |
local rundir="${EROOT%/}/tmp/screen" |
81 |
if [[ ! -d ${rundir} ]] ; then |
82 |
|
83 |
|
84 |
|
85 |
1.4 app-misc/screen/screen-9999.ebuild |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?rev=1.4&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?rev=1.4&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?r1=1.3&r2=1.4 |
90 |
|
91 |
Index: screen-9999.ebuild |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v |
94 |
retrieving revision 1.3 |
95 |
retrieving revision 1.4 |
96 |
diff -u -r1.3 -r1.4 |
97 |
--- screen-9999.ebuild 10 Mar 2014 21:21:35 -0000 1.3 |
98 |
+++ screen-9999.ebuild 30 Aug 2014 10:32:59 -0000 1.4 |
99 |
@@ -1,8 +1,8 @@ |
100 |
# Copyright 1999-2014 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.3 2014/03/10 21:21:35 swegener Exp $ |
103 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.4 2014/08/30 10:32:59 polynomial-c Exp $ |
104 |
|
105 |
-EAPI=4 |
106 |
+EAPI=5 |
107 |
|
108 |
EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git" |
109 |
EGIT_BOOTSTRAP="cd src; ./autogen.sh" |
110 |
@@ -25,8 +25,7 @@ |
111 |
selinux? ( sec-policy/selinux-screen )" |
112 |
DEPEND="${RDEPEND} |
113 |
sys-apps/texinfo" |
114 |
-RDEPEND="${RDEPEND} |
115 |
- >=sys-apps/openrc-0.11.6" |
116 |
+RDEPEND="${RDEPEND}" |
117 |
|
118 |
S="${WORKDIR}"/${P}/src |
119 |
|
120 |
@@ -46,15 +45,15 @@ |
121 |
# Fix manpage. |
122 |
sed -i \ |
123 |
-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
124 |
- -e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \ |
125 |
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \ |
126 |
-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \ |
127 |
-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \ |
128 |
- -e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \ |
129 |
+ -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \ |
130 |
doc/screen.1 \ |
131 |
- || die "sed doc/screen.1 failed" |
132 |
+ || die |
133 |
|
134 |
# reconfigure |
135 |
- eautoconf |
136 |
+ eautoreconf |
137 |
} |
138 |
|
139 |
src_configure() { |
140 |
@@ -66,7 +65,7 @@ |
141 |
use debug && append-cppflags "-DDEBUG" |
142 |
|
143 |
econf \ |
144 |
- --with-socket-dir="${EPREFIX}/run/screen" \ |
145 |
+ --with-socket-dir="${EPREFIX}/tmp/screen" \ |
146 |
--with-sys-screenrc="${EPREFIX}/etc/screenrc" \ |
147 |
--with-pty-mode=0620 \ |
148 |
--with-pty-group=5 \ |
149 |
@@ -74,11 +73,14 @@ |
150 |
--enable-telnet \ |
151 |
--enable-colors256 \ |
152 |
$(use_enable pam) |
153 |
+} |
154 |
|
155 |
- LC_ALL=POSIX emake term.h |
156 |
+src_compile() { |
157 |
+ LC_ALL=POSIX emake comm.h term.h |
158 |
emake osdef.h |
159 |
|
160 |
emake -C doc screen.info |
161 |
+ default |
162 |
} |
163 |
|
164 |
src_install() { |
165 |
@@ -99,7 +101,8 @@ |
166 |
fi |
167 |
|
168 |
dodir /etc/tmpfiles.d |
169 |
- echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf |
170 |
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \ |
171 |
+ >"${ED}"/etc/tmpfiles.d/screen.conf |
172 |
|
173 |
insinto /usr/share/screen |
174 |
doins terminfo/{screencap,screeninfo.src} |
175 |
@@ -126,5 +129,18 @@ |
176 |
elog "applications. Please check /etc/screenrc for information on these changes." |
177 |
fi |
178 |
|
179 |
+ # Add /tmp/screen in case it doesn't exist yet. This should solve |
180 |
+ # problems like bug #508634 where tmpfiles.d isn't in effect. |
181 |
+ local rundir="${EROOT%/}/tmp/screen" |
182 |
+ if [[ ! -d ${rundir} ]] ; then |
183 |
+ if use multiuser || use prefix ; then |
184 |
+ tmpfiles_group="root" |
185 |
+ else |
186 |
+ tmpfiles_group="utmp" |
187 |
+ fi |
188 |
+ mkdir -m 0775 "${rundir}" |
189 |
+ chgrp ${tmpfiles_group} "${rundir}" |
190 |
+ fi |
191 |
+ |
192 |
ewarn "This revision changes the screen socket location to /run/screen." |
193 |
} |
194 |
|
195 |
|
196 |
|
197 |
1.7 app-misc/screen/screen-4.0.3-r8.ebuild |
198 |
|
199 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild?rev=1.7&view=markup |
200 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild?rev=1.7&content-type=text/plain |
201 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild?r1=1.6&r2=1.7 |
202 |
|
203 |
Index: screen-4.0.3-r8.ebuild |
204 |
=================================================================== |
205 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v |
206 |
retrieving revision 1.6 |
207 |
retrieving revision 1.7 |
208 |
diff -u -r1.6 -r1.7 |
209 |
--- screen-4.0.3-r8.ebuild 10 Mar 2014 21:21:35 -0000 1.6 |
210 |
+++ screen-4.0.3-r8.ebuild 30 Aug 2014 10:32:59 -0000 1.7 |
211 |
@@ -1,6 +1,6 @@ |
212 |
# Copyright 1999-2014 Gentoo Foundation |
213 |
# Distributed under the terms of the GNU General Public License v2 |
214 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.6 2014/03/10 21:21:35 swegener Exp $ |
215 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v 1.7 2014/08/30 10:32:59 polynomial-c Exp $ |
216 |
|
217 |
EAPI=4 |
218 |
|
219 |
@@ -22,7 +22,7 @@ |
220 |
selinux? ( sec-policy/selinux-screen )" |
221 |
DEPEND="${RDEPEND}" |
222 |
RDEPEND="${RDEPEND} |
223 |
- >=sys-apps/openrc-0.11.6" |
224 |
+ !<sys-apps/openrc-0.11.6" |
225 |
|
226 |
pkg_setup() { |
227 |
# Make sure utmp group exists, as it's used later on. |