From fb10d48124dd45af39bb19dec36a5144370f5384 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Wed, 17 Jan 2007 16:45:48 +0000 Subject: [PATCH] Adjust the tty addpredict code for bug #162536. Package-Manager: portage-2.1.2 --- app-misc/screen/ChangeLog | 7 +++++-- app-misc/screen/Manifest | 24 ++++++++++++------------ app-misc/screen/screen-4.0.3.ebuild | 8 ++++---- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index f0fe486d1026..595812c82545 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-misc/screen -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.127 2006/10/29 19:22:13 kloeri Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.128 2007/01/17 16:45:48 swegener Exp $ + + 17 Jan 2007; Sven Wegener screen-4.0.3.ebuild: + Adjust the tty addpredict code for bug #162536. 29 Oct 2006; Bryan Østergaard screen-4.0.3.ebuild: Stable on Alpha, bug 152770. diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index 36ffe317cefa..6c4ca160e4a9 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -43,14 +43,14 @@ EBUILD screen-4.0.2-r5.ebuild 4316 RMD160 d3bc71b17d549d95bf3c80c8bf6e58523d5594 MD5 09242090e85f7907690d9e75ff359d14 screen-4.0.2-r5.ebuild 4316 RMD160 d3bc71b17d549d95bf3c80c8bf6e58523d559438 screen-4.0.2-r5.ebuild 4316 SHA256 9be24caf361aa76ae483c9ea732dbf2c7521d4aa34e367465b762ea8d607f343 screen-4.0.2-r5.ebuild 4316 -EBUILD screen-4.0.3.ebuild 4339 RMD160 0da4d7d94ced71d23e7160c82f03bea5ec131589 SHA1 99549c3b413b4ed42c91e6c4e178317368e37ee0 SHA256 48af20d6ef68d69d0412f33f33a740470a7aeb52f58c9ec8a0033c58639b6628 -MD5 b9892a364132fea5d24887df76230f2b screen-4.0.3.ebuild 4339 -RMD160 0da4d7d94ced71d23e7160c82f03bea5ec131589 screen-4.0.3.ebuild 4339 -SHA256 48af20d6ef68d69d0412f33f33a740470a7aeb52f58c9ec8a0033c58639b6628 screen-4.0.3.ebuild 4339 -MISC ChangeLog 17909 RMD160 63630e7cebda2c74f1418b4e846c69bfecc2159f SHA1 5bf89828dbc18e385b196ef542ed0492bea2a08d SHA256 9e30cb391f8ee9c1945674e5fc883b9cbd004f33bacb0c62ef76fcecd51e4381 -MD5 ac6c9c1d008bb350098042888f026484 ChangeLog 17909 -RMD160 63630e7cebda2c74f1418b4e846c69bfecc2159f ChangeLog 17909 -SHA256 9e30cb391f8ee9c1945674e5fc883b9cbd004f33bacb0c62ef76fcecd51e4381 ChangeLog 17909 +EBUILD screen-4.0.3.ebuild 4355 RMD160 f0bd0e1b878ea884d324804875be30457e2a241f SHA1 3772f48f5240044171187025f799fa68f3dfe0d0 SHA256 704ba2d52caaf41972a5f7441c3cf3419fbfbfcaa0faf8d32ae91c1662282f86 +MD5 3e9d5f860f89d2f396b32cddf893870f screen-4.0.3.ebuild 4355 +RMD160 f0bd0e1b878ea884d324804875be30457e2a241f screen-4.0.3.ebuild 4355 +SHA256 704ba2d52caaf41972a5f7441c3cf3419fbfbfcaa0faf8d32ae91c1662282f86 screen-4.0.3.ebuild 4355 +MISC ChangeLog 18033 RMD160 81bf734ca47760143139a787bb314a0caec5096b SHA1 e08fb2868a8e485196aac332d085b922f2bdcc86 SHA256 d65b0771e5a49114b10bca6b2f0c632ef2cfa3c6e1085d2e40bdb12936c0e49d +MD5 edcb984d31afe59cb91e141542e1dac6 ChangeLog 18033 +RMD160 81bf734ca47760143139a787bb314a0caec5096b ChangeLog 18033 +SHA256 d65b0771e5a49114b10bca6b2f0c632ef2cfa3c6e1085d2e40bdb12936c0e49d ChangeLog 18033 MISC metadata.xml 1525 RMD160 fcd6c6607111333349ac84d9890122e555f3241a SHA1 58684084d4230cc1962b0df579faaa66999c4a4f SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000 MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525 RMD160 fcd6c6607111333349ac84d9890122e555f3241a metadata.xml 1525 @@ -62,9 +62,9 @@ MD5 f6a2b2cdc5be7c31bd01954f571723be files/digest-screen-4.0.3 238 RMD160 e331fb1ac0487e9d81ed72b75e4a24784d8c90cc files/digest-screen-4.0.3 238 SHA256 3d1d9450757a4993baf5b7b09d9eeaddcc0310e2087eefd35f960c9e106eefab files/digest-screen-4.0.3 238 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFTHMHamhnQswr0vIRAtQNAJ9eEXvvXZn8B1+YGD1nZoHBtziIeACglpGe -1wZUv+YJnic4seZtKByGIHY= -=KYEg +iD8DBQFFrlLFI1lqEGTUzyQRAupCAKCZPuhBgjx5GnhWajJ4ICRYT1HOqQCgweyZ +envA/b42l/F+zmkVK2stsXs= +=kVh1 -----END PGP SIGNATURE----- diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild index 22d1479fd072..1134336630cf 100644 --- a/app-misc/screen/screen-4.0.3.ebuild +++ b/app-misc/screen/screen-4.0.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# 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.10 2006/11/04 11:00:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.11 2007/01/17 16:45:48 swegener Exp $ inherit eutils flag-o-matic toolchain-funcs pam autotools @@ -74,8 +74,8 @@ src_unpack() { } src_compile() { - addpredict "$(tty)" - addpredict "${SSH_TTY}" + local TTY="$(tty)" + [[ -c ${TTY} ]] && addpredict "${TTY}" append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" append-ldflags $(bindnow-flags) -- 2.26.2