Don't depend on sys-apps/openrc for /run support (bug #520706). Synced live ebuild with latest release ebuild

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 55 insertions, 25 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 0bd4158ee17a..edc81afbeebe 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -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 <polynomial-c@gentoo.org> 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 <jer@gentoo.org> screen-4.2.1-r2.ebuild:
   Run make in src_compile() instead of in src_configure(). Fix one parallel
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 1e417b193546..a8769628b83e 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -19,15 +19,25 @@ DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33e
 DIST screen-4.2.1.tar.gz 1062485 SHA256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 SHA512 30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WHIRLPOOL 7d4209651a016a9ab91aec385532c6ebd7a6d96a60342721f3a53752924c3fb72aa3d648ad665b67fab0a78d6019396abe13e04f556c7e5e9f71bf3238e64cc5
 EBUILD screen-4.0.3-r6.ebuild 4845 SHA256 29116c76a3a9779d630ed4d6bdfbb40710089b90b67c7ae9e3ff60d0d0011e05 SHA512 63eb380ff6624c3c9218cfe8013f2a051d401cdbac225ba6c65991fd1c2894c91a96c8b2a09715c075a3d801ee54c228fa2935501eeab824d82bbb1051981b52 WHIRLPOOL 5698d4cd010792ff4e20af04c2df7fb8cf59f2377170976bbeb03f251dfd75168f7a29641c888237e1db79e0d1881fb3761c1c25bc3faa5ac3ac3fcd48febffc
 EBUILD screen-4.0.3-r7.ebuild 4869 SHA256 41b6ffaf1ff6bbe2ce7a90661d3745e3fda74fbfc2c226184c0152848f895f05 SHA512 86e290b01290c2ba1c156ccc9d3b650f5613c83e3ec7e237fa2a2de97471c722f501a87b86a1ef67d5e810459f42f6e6cd055980de3970d191e428545e549349 WHIRLPOOL cc9721338d96bcad79066b4a63cfdbd745f895fb49cd06e4eaf6351fc9d6eb6bd322a081abbfa8352312be2f1da30f46a7d0b4b9acac79da6bc9e38a87dabacb
-EBUILD screen-4.0.3-r8.ebuild 5187 SHA256 0ced20043992f770364ad996b97d2c4f82433fcac15d6870075bf58c147efd19 SHA512 81c96886127cfb428fbab965e20e23dd3f492bd7f3224f5f4ad030b99d334d37978068218da540d6093ef4870ae87a974a3546cd0eb54197a60b1500e02fa88c WHIRLPOOL 5f581b990ed190e34efd1a1d49385b748095f6ec87f2e31c74d3386f49cf7615526501e02eca931b96f1199a51fb161b49bc4db58ccafadeb045782e6a0b861e
-EBUILD screen-4.2.1-r2.ebuild 3868 SHA256 f005a48893d3a951c8e22504ad01fa19bb2150e4eb10c6ab34b554932408785b SHA512 9cfd962c9dd3676203eb9a845ceaa003be55b546614ee044c1b5852f2d608ae77e158a7a90e6a48a2bf3ac566e810db6813c6af37fd5e76f1ae65570d22e492f WHIRLPOOL cb5826e3621066d0af940a854a29d174eb966a733e45ed8d0ea02a3f33d83c7c8c843e7faf9c6a6910875c00430a5bec4c2ad9e9b70a8692606e2368d130533d
-EBUILD screen-9999.ebuild 3406 SHA256 63e115673afd760696fa4d9ff99fdea528ee107e7b1746bff2350faf404ad4bb SHA512 ac702fa4f23b0922c8c6fad4ad04c6b5e5a188c638a8c6ed7872fcc8d7283058c93b9ec4ff4ac22685af30df2ac3df25f254c512e7642c92aea6231a1258a935 WHIRLPOOL 82b58666d08a223baf223dc13962c85916943b86c1a44dd69808c29d0348c233e79b482803dfea5ac6d0b0c77680cca354c7dbedef6009f1be8bd2270a034fcf
-MISC ChangeLog 28744 SHA256 734548638036317457d0699f9c3feeddadcc0dc72d7fd3138954a04011900ec9 SHA512 20f2dee65a0de576978ca073643676c4351daf03c5304ed8b0a687ae2d6be7cb0625a26e7eb442f5f7b1f723bf044e8469ad561c2903f75ad2a171429c29105d WHIRLPOOL 3e337b7c56d743f5209e9e3ca116ae8b448b84ac7fe3d1c21f89a9398e4cd1de2b935513badb1cee54b7b2f082895d397b805315ebfb28fd9f6db7e9490e6a48
+EBUILD screen-4.0.3-r8.ebuild 5191 SHA256 28de300e32922cc7c235b3f48f6f79f1cf26a91652e22dc4260511784c2d5674 SHA512 d6a8ae7ab63dec935c29ca3cf8f7efa6dd1418e685dfbe9972d888110087e8f2cedae8dfbf3203ed5c313a5107ec489664c22afd336dee9707cdbb8f6a68eab1 WHIRLPOOL 2917d54beb99bd8af394eaea3107c9dbf6db5dcf54f2fae3620b7391629f6c4f989f5d2d7d4d83cc239f7907dd99efa5b77857e1d4235bfb6bd907c9a6313702
+EBUILD screen-4.2.1-r2.ebuild 3847 SHA256 885d772186980965ad85325dd978859647ed6a338b01f90a620e57e069ac8dfd SHA512 148bcd71843b5e4e293cbecb330d70e5e292429e6d45171fcb3f069f7a2c863059b290cdfeca2b3cdbb72f33b0cef3b4fc44b79cb6349b41179fe067f9086a53 WHIRLPOOL ef34473d71d532a455bf75cc25ae768cd5fa037e29ddd31b943f40241b731e46b56177d2d369e3bb0e10444e432cab8b015630f26ea5d3a883984b61ba8aabef
+EBUILD screen-9999.ebuild 3771 SHA256 1201ef63e70553700e82502dae05ddcea508bffcf5fa69e04cc86c468cb06b8f SHA512 d2cbdc291ce7ff8d62e26e49035262f6da8971645907cfd79a8deba77e4e038c84b54941bca030e32ddd79f08ca813860bdacb3d0651ce9eb7a61393c1a57d2c WHIRLPOOL fa5424184a14c324868d16fc634c163815b3759990a06be1a91f33990f642591cde368cf214f7d9c3d9325157866c15750797e6b749ade415eff20a9b009a8ef
+MISC ChangeLog 28993 SHA256 a92d33adb17c3d862bc729492753399034325b0719b125b0f5abfb4315acd820 SHA512 e469ec857a22ffa66a2a88bcc1dd7d4cefa30e9353530d9f3a3fa6db52765a464d06eec77b5e0dc6ad537387f03ae61229f91e92ef8295acc74dddb9d30df814 WHIRLPOOL 6e937853d70d49e672d711435ab1f9f7505d954adcc7ab26e29dd3d5e706a21379e01f40b48e2427d46c77a75cdfc329808f117c15f4d27fbb1fbd00493b0ee9
 MISC metadata.xml 1717 SHA256 3b683391c778841993813e38bc255e9fb7d36afc6c160b231fef4956ad6820dc SHA512 b6adab02c25cc3fac41f897c031fcd6265d1e8f4f2091501514b8469aecdbfe5efe7b2d2c66eef76bc2dd55dbb12de5f06f09ab3192fda5606cc249562820103 WHIRLPOOL 3f366cfca6b408350c0ea2d069fad9943a479033419f58558a93c58ecced96e518c0f3c59b8a71cef8fb4807b85eca7435c83beb2e1060b69931c4305fffa4d1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlP8sLMACgkQVWmRsqeSphPY8gCfS5kS27a4sC5fRCUo4Kq3qE2W
-0q4AnA7tPooJp6/9L5gfdeEXBsKHXkmX
-=a3uJ
+iQIcBAEBCAAGBQJUAahdAAoJEPiazRVxLXTFm0oP+gL/5ezXrNWd5Ic6AQ9puoOO
+syULlfeYh1plCB0/eJb98o0mXpPwgaCpkb833es+TP+ATyYu50jB6BLUItFJx259
+Fz+AAF75E2qAC+bmsokUQ2fGqKIzCGm2gIzuI37zjC8TRwsJziDFjGIFeVLz3QaB
+sTNaUrfAq/L+w/taGDnxdFsvwZazJKOrFsb639v4fcvMhvKl5vUECbiASiIovobI
+WrRdZBn4HRpndHDTEgsZ8/XcEtZ9j4YqKrzOKyMJcWQWaHvuDCtZiHXwBq+K8RjE
+F/zVKdMqKfXOHlwHmcVrUEpYVEOOiAIZeyxGI6juzjIzXq0cL7qoxCN9AEta3HD5
+N7D9UuHOh0F6z1L1Egxk41DU3ij7bfiio3316mUwk2KkcNbxjlkU5nBnJTY5psYI
+m8iYOmz9UJYqdUnvadC4BO6KBJTvTs1qxJwbIBSJNJ9+6HLUTjq3F2ZrFSB0OKDW
+MDYuRebAR+jxzyXARfakPqU0/XaJr+7RW2E9QYjIIw4mmW5RRxlneIA781LvT7K/
+wvLHQWmfQNwmomsiqot8HGlvmPp5QedHbyDASPbQ1V9EWDEy0iI3kig6uqfdfizZ
+iKSnhoDxAQHqeyHDtnD3QTQZmJuranxDZBUhX/Uvm81zyeh0PoFGlbPM8Tf9hYnc
+pJYv9yUfWPU1QmzHpz/v
+=npxi
 -----END PGP SIGNATURE-----
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
index 810b5931c200..c5f264b4a9de 100644
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ b/app-misc/screen/screen-4.0.3-r8.ebuild
@@ -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 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	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.
diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild
index e10618766286..6b26bb69f9ff 100644
--- a/app-misc/screen/screen-4.2.1-r2.ebuild
+++ b/app-misc/screen/screen-4.2.1-r2.ebuild
@@ -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 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	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 @@ pkg_postinst() {
 		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
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 2d30e044494a..208dbd69d6c1 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -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 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	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 @@ src_prepare() {
 	# 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 @@ src_configure() {
 	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 @@ src_configure() {
 		--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 @@ src_install() {
 	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 @@ pkg_postinst() {
 		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."
 }