Port some changes from the new snapshot ebuild to the regular ebuild.

(Portage version: 2.1.3.3)

3 files changed, 15 insertions, 7 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index 07d9a569b851..c66786709378 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/screen
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.135 2007/08/07 19:50:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.136 2007/08/07 19:59:29 swegener Exp $
+
+  07 Aug 2007; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild,
+  screen-4.0.3_p20070403.ebuild:
+  Port some changes from the new snapshot ebuild to the regular ebuild.
 
 *screen-4.0.3_p20070403 (07 Aug 2007)
 
diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild
index f318659ca212..80c63a4f442b 100644
--- a/app-misc/screen/screen-4.0.3.ebuild
+++ b/app-misc/screen/screen-4.0.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 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.ebuild,v 1.15 2007/04/22 21:04:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.16 2007/08/07 19:59:29 swegener Exp $
+
+WANT_AUTOCONF="2.5"
 
 inherit eutils flag-o-matic toolchain-funcs pam autotools
 
@@ -19,8 +21,7 @@ RDEPEND=">=sys-libs/ncurses-5.2
 		sec-policy/selinux-screen
 		>=sec-policy/selinux-base-policy-20050821
 	)"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	# Make sure utmp group exists, as it's used later on.
@@ -69,8 +70,8 @@ src_unpack() {
 		doc/screen.1 \
 		|| die "sed doc/screen.1 failed"
 
-	# configure as delivered with screen is made with autoconf-2.5
-	WANT_AUTOCONF=2.5 eautoconf
+	# reconfigure
+	eautoconf
 }
 
 src_compile() {
diff --git a/app-misc/screen/screen-4.0.3_p20070403.ebuild b/app-misc/screen/screen-4.0.3_p20070403.ebuild
index 4b747c904aef..a43f1596acf1 100644
--- a/app-misc/screen/screen-4.0.3_p20070403.ebuild
+++ b/app-misc/screen/screen-4.0.3_p20070403.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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_p20070403.ebuild,v 1.1 2007/08/07 19:50:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3_p20070403.ebuild,v 1.2 2007/08/07 19:59:29 swegener Exp $
 
 WANT_AUTOCONF="2.5"
 
@@ -125,4 +125,7 @@ pkg_postinst() {
 	elog "Some dangerous key bindings have been removed or changed to more safe values."
 	elog "We enable some xterm hacks in our default screenrc, which might break some"
 	elog "applications. Please check /etc/screenrc for information on these changes."
+
+	ewarn "Please terminate your running screen sessions, as screen now uses sockets"
+	ewarn "instead of fifos and the new version can't attach to the old sessions."
 }