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

Package-Manager: portage-2.1.3.3

4 files changed, 30 insertions, 22 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/Manifest b/app-misc/screen/Manifest
index 47b56b4fbc03..3a6cc70be69f 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -43,18 +43,18 @@ RMD160 c4c68748b74207f7ee509de9f79262e3fedc66a8 files/screenrc 10357
 SHA256 1f454ad8acf59024ad2ad2acba2918a10d9c8fb3305a86ff53cd3049e9cef6cf files/screenrc 10357
 DIST screen-4.0.3.tar.gz 840602 RMD160 8c3903c1642ae30fd9d5706298919428552f7754 SHA1 7bc6e2f0959ffaae6f52d698c26c774e7dec3545 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77
 DIST screen-4.0.3_p20070403.tar.gz 913917 RMD160 710d4a5df7b4df2efe5b0f0159f3986ec9f502c0 SHA1 3d3df821bcfbe5d3d7e910c3fc0f7036317dba35 SHA256 e624bea23c37e0efa10c89ab14a29bf7c5b95f328df55eeaa1bf472fe904610f
-EBUILD screen-4.0.3.ebuild 4305 RMD160 f187ff514f5d9633c196a51b083384ab1a009a46 SHA1 fb26222712c1b994cd5cc5e599e10df8f752a2ce SHA256 83678ab1d8c908ef8f949e0afbf4fdd3b640c772d802270b1a619f239d7a127b
-MD5 9bd0165f7b4da2c6d0f01481fac824af screen-4.0.3.ebuild 4305
-RMD160 f187ff514f5d9633c196a51b083384ab1a009a46 screen-4.0.3.ebuild 4305
-SHA256 83678ab1d8c908ef8f949e0afbf4fdd3b640c772d802270b1a619f239d7a127b screen-4.0.3.ebuild 4305
-EBUILD screen-4.0.3_p20070403.ebuild 3594 RMD160 e7cd616778571859e53cd8140c61696658268ed4 SHA1 f8fe8af79f261b539b17d0888f214c49a9aa5c9b SHA256 9bf037241c9b9798ca734a96374fe3b48f392adf612b4125f3f48a3c7f3fed85
-MD5 5d95f6f9c59a9848838fef59823934fd screen-4.0.3_p20070403.ebuild 3594
-RMD160 e7cd616778571859e53cd8140c61696658268ed4 screen-4.0.3_p20070403.ebuild 3594
-SHA256 9bf037241c9b9798ca734a96374fe3b48f392adf612b4125f3f48a3c7f3fed85 screen-4.0.3_p20070403.ebuild 3594
-MISC ChangeLog 18783 RMD160 f410d76b64f4ec7d364b09158c199e7a32741e9e SHA1 97711ba18c4e353373cc596c9ce1040adf516e41 SHA256 19ee198af32421a43392969825189163c1a555fd78745a086ac2adcdfc0d24d7
-MD5 637b9a45006be10413b25527de51e24b ChangeLog 18783
-RMD160 f410d76b64f4ec7d364b09158c199e7a32741e9e ChangeLog 18783
-SHA256 19ee198af32421a43392969825189163c1a555fd78745a086ac2adcdfc0d24d7 ChangeLog 18783
+EBUILD screen-4.0.3.ebuild 4232 RMD160 2e24d2fb3b2822e8fc33fb184eacf89a525f82c1 SHA1 a323dfc1e98a831ab33a43594768e0710e01f52b SHA256 d25d06b4f48eb94dc138b6df70d180c54b78b576a045890481f0a3424fc4bc0d
+MD5 c90e37dcb0af898b460b7a0571ccc940 screen-4.0.3.ebuild 4232
+RMD160 2e24d2fb3b2822e8fc33fb184eacf89a525f82c1 screen-4.0.3.ebuild 4232
+SHA256 d25d06b4f48eb94dc138b6df70d180c54b78b576a045890481f0a3424fc4bc0d screen-4.0.3.ebuild 4232
+EBUILD screen-4.0.3_p20070403.ebuild 3758 RMD160 ddec84a7e4e5c6480c61b083c6da5ab632d59b2f SHA1 50432555abb3fbb8980678af3270aa264bbc6888 SHA256 4bed245b2739fcb94b713e5f0ec9be0a421246a7ae2921cf6fbcbe8e3e785c09
+MD5 6343a04f87a60920e7b3f6766e1280d4 screen-4.0.3_p20070403.ebuild 3758
+RMD160 ddec84a7e4e5c6480c61b083c6da5ab632d59b2f screen-4.0.3_p20070403.ebuild 3758
+SHA256 4bed245b2739fcb94b713e5f0ec9be0a421246a7ae2921cf6fbcbe8e3e785c09 screen-4.0.3_p20070403.ebuild 3758
+MISC ChangeLog 18960 RMD160 4f82e367b8f3c9825bf0cbb5599aae5ba6a40d37 SHA1 dd16bf13ea845a0ac7734ea8590ee75bce0a391a SHA256 4de0b34460e0df233610c8e5491aa64c05db33b70338f895d2dc2042a64c0ed1
+MD5 a8c302b4f7ebc7a99e9eb7c81a5e85ba ChangeLog 18960
+RMD160 4f82e367b8f3c9825bf0cbb5599aae5ba6a40d37 ChangeLog 18960
+SHA256 4de0b34460e0df233610c8e5491aa64c05db33b70338f895d2dc2042a64c0ed1 ChangeLog 18960
 MISC metadata.xml 1525 RMD160 fcd6c6607111333349ac84d9890122e555f3241a SHA1 58684084d4230cc1962b0df579faaa66999c4a4f SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000
 MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
 RMD160 fcd6c6607111333349ac84d9890122e555f3241a metadata.xml 1525
@@ -68,7 +68,7 @@ SHA256 40df95fc623e6894c6d6771cc75de8f598ee1f72bd8a4062c1d37a7c7c8431b8 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGuM0BI1lqEGTUzyQRAnf+AJ9xufZ3/rx7ntYL2eWaIcWHb1AQMwCfTxMq
-Gpd2ceTH6CP9hVuFeGNkgpU=
-=Rpxc
+iD8DBQFGuM8nI1lqEGTUzyQRArCxAJ9PpBlDu4yzRKZE7Q+S0ZgE1WK7ewCeOzot
+nYtHE4ftISX3g5TlWxZkcFg=
+=mpro
 -----END PGP SIGNATURE-----
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."
 }