polynomial-c 14/08/30 10:32:59
Modified: ChangeLog screen-4.2.1-r2.ebuild screen-9999.ebuild
screen-4.0.3-r8.ebuild
Log:
Don't depend on sys-apps/openrc for /run support (bug #520706). Synced live
ebuild with latest release ebuild
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0x981CA6FC)
Revision Changes Path
1.199 app-misc/screen/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?rev=1.199&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?rev=1.199&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/ChangeLog?r1=1.198&r2=1.199
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- ChangeLog 26 Aug 2014 16:07:14 -0000 1.198
+++ ChangeLog 30 Aug 2014 10:32:59 -0000 1.199
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/screen
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.198
2014/08/26 16:07:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.199
2014/08/30 10:32:59 polynomial-c Exp $
+
+ 30 Aug 2014; Lars Wendler <[email protected]> screen-4.0.3-r8.ebuild,
+ screen-4.2.1-r2.ebuild, screen-9999.ebuild:
+ Don't depend on sys-apps/openrc for /run support (bug #520706). Synced live
+ ebuild with latest release ebuild.
26 Aug 2014; Jeroen Roovers <[email protected]> screen-4.2.1-r2.ebuild:
Run make in src_compile() instead of in src_configure(). Fix one parallel
1.4 app-misc/screen/screen-4.2.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild?rev=1.4&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild?r1=1.3&r2=1.4
Index: screen-4.2.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.2.1-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- screen-4.2.1-r2.ebuild 26 Aug 2014 16:07:14 -0000 1.3
+++ screen-4.2.1-r2.ebuild 30 Aug 2014 10:32:59 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=5
@@ -20,8 +20,7 @@
selinux? ( sec-policy/selinux-screen )"
DEPEND="${RDEPEND}
sys-apps/texinfo"
-RDEPEND="${RDEPEND}
- >=sys-apps/openrc-0.11.6"
+RDEPEND="${RDEPEND}"
pkg_setup() {
# Make sure utmp group exists, as it's used later on.
@@ -123,7 +122,7 @@
elog "applications. Please check /etc/screenrc for information
on these changes."
fi
- # add /var/run/screen in case it doesn't exist yet. This should solve
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
# problems like bug #508634 where tmpfiles.d isn't in effect.
local rundir="${EROOT%/}/tmp/screen"
if [[ ! -d ${rundir} ]] ; then
1.4 app-misc/screen/screen-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?rev=1.4&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?rev=1.4&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-9999.ebuild?r1=1.3&r2=1.4
Index: screen-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- screen-9999.ebuild 10 Mar 2014 21:21:35 -0000 1.3
+++ screen-9999.ebuild 30 Aug 2014 10:32:59 -0000 1.4
@@ -1,8 +1,8 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.3
2014/03/10 21:21:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-9999.ebuild,v 1.4
2014/08/30 10:32:59 polynomial-c Exp $
-EAPI=4
+EAPI=5
EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
EGIT_BOOTSTRAP="cd src; ./autogen.sh"
@@ -25,8 +25,7 @@
selinux? ( sec-policy/selinux-screen )"
DEPEND="${RDEPEND}
sys-apps/texinfo"
-RDEPEND="${RDEPEND}
- >=sys-apps/openrc-0.11.6"
+RDEPEND="${RDEPEND}"
S="${WORKDIR}"/${P}/src
@@ -46,15 +45,15 @@
# Fix manpage.
sed -i \
-e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
-e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
-e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
+ -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
doc/screen.1 \
- || die "sed doc/screen.1 failed"
+ || die
# reconfigure
- eautoconf
+ eautoreconf
}
src_configure() {
@@ -66,7 +65,7 @@
use debug && append-cppflags "-DDEBUG"
econf \
- --with-socket-dir="${EPREFIX}/run/screen" \
+ --with-socket-dir="${EPREFIX}/tmp/screen" \
--with-sys-screenrc="${EPREFIX}/etc/screenrc" \
--with-pty-mode=0620 \
--with-pty-group=5 \
@@ -74,11 +73,14 @@
--enable-telnet \
--enable-colors256 \
$(use_enable pam)
+}
- LC_ALL=POSIX emake term.h
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
emake osdef.h
emake -C doc screen.info
+ default
}
src_install() {
@@ -99,7 +101,8 @@
fi
dodir /etc/tmpfiles.d
- echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}"
>"${ED}"/etc/tmpfiles.d/screen.conf
+ echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
+ >"${ED}"/etc/tmpfiles.d/screen.conf
insinto /usr/share/screen
doins terminfo/{screencap,screeninfo.src}
@@ -126,5 +129,18 @@
elog "applications. Please check /etc/screenrc for information
on these changes."
fi
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT%/}/tmp/screen"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
ewarn "This revision changes the screen socket location to /run/screen."
}
1.7 app-misc/screen/screen-4.0.3-r8.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild?rev=1.7&view=markup
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
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild?r1=1.6&r2=1.7
Index: screen-4.0.3-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r8.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screen-4.0.3-r8.ebuild 10 Mar 2014 21:21:35 -0000 1.6
+++ screen-4.0.3-r8.ebuild 30 Aug 2014 10:32:59 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
EAPI=4
@@ -22,7 +22,7 @@
selinux? ( sec-policy/selinux-screen )"
DEPEND="${RDEPEND}"
RDEPEND="${RDEPEND}
- >=sys-apps/openrc-0.11.6"
+ !<sys-apps/openrc-0.11.6"
pkg_setup() {
# Make sure utmp group exists, as it's used later on.
