Version bump, CVS snapshot, package.mask'ed for now.

Package-Manager: portage-2.1.3.3

5 files changed, 172 insertions, 9 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index c03639a12b48..07d9a569b851 100644
--- a/app-misc/screen/ChangeLog
+++ b/app-misc/screen/ChangeLog
@@ -1,6 +1,12 @@
 # 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.134 2007/06/01 06:53:31 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.135 2007/08/07 19:50:17 swegener Exp $
+
+*screen-4.0.3_p20070403 (07 Aug 2007)
+
+  07 Aug 2007; Sven Wegener <swegener@gentoo.org>
+  +files/screen-4.0.3_p20070403-map.patch, +screen-4.0.3_p20070403.ebuild:
+  Version bump, CVS snapshot, package.mask'ed for now.
 
   01 Jun 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
   modified ChangeLog to meet common format
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 207695476e6d..47b56b4fbc03 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -33,19 +33,28 @@ AUX screen-4.0.1-vsprintf.patch 480 RMD160 cc80e7353e19d7d82dc506ae3a5eaaedba4db
 MD5 304be93a4c3b72f2f761f45194059287 files/screen-4.0.1-vsprintf.patch 480
 RMD160 cc80e7353e19d7d82dc506ae3a5eaaedba4db1ca files/screen-4.0.1-vsprintf.patch 480
 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd files/screen-4.0.1-vsprintf.patch 480
+AUX screen-4.0.3_p20070403-map.patch 653 RMD160 bdaa002ee7a4abb095699010b366686b59d2192d SHA1 0b61346efa6ae6ed988e71d71b21c1d8e94236d9 SHA256 74db74a79ce4dfe1223f53562b0c331b94544ae85262e834356fc0c9f0d0997e
+MD5 bb34c3a92c66963ec77bd6c01ef9d2d7 files/screen-4.0.3_p20070403-map.patch 653
+RMD160 bdaa002ee7a4abb095699010b366686b59d2192d files/screen-4.0.3_p20070403-map.patch 653
+SHA256 74db74a79ce4dfe1223f53562b0c331b94544ae85262e834356fc0c9f0d0997e files/screen-4.0.3_p20070403-map.patch 653
 AUX screenrc 10357 RMD160 c4c68748b74207f7ee509de9f79262e3fedc66a8 SHA1 d72b16e1b54ba6e529912f0fd8f185f67aa79040 SHA256 1f454ad8acf59024ad2ad2acba2918a10d9c8fb3305a86ff53cd3049e9cef6cf
 MD5 3ddd5c55fd7f0891bb953fc229845898 files/screenrc 10357
 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
-MISC ChangeLog 18560 RMD160 eae835f0b99f9338dd6fcc1a8ddcd544f3d7624d SHA1 bbca177b231858e269c3f430ded262e8aa774fb6 SHA256 1ef035d4e3de0cdc86f17295795a785f37023c18f9eea222a7274aef24180152
-MD5 cc70ea40ea08df1fdd144d183d799628 ChangeLog 18560
-RMD160 eae835f0b99f9338dd6fcc1a8ddcd544f3d7624d ChangeLog 18560
-SHA256 1ef035d4e3de0cdc86f17295795a785f37023c18f9eea222a7274aef24180152 ChangeLog 18560
+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
 MISC metadata.xml 1525 RMD160 fcd6c6607111333349ac84d9890122e555f3241a SHA1 58684084d4230cc1962b0df579faaa66999c4a4f SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000
 MD5 537c3754e8f6422e4f7025358173ef2b metadata.xml 1525
 RMD160 fcd6c6607111333349ac84d9890122e555f3241a metadata.xml 1525
@@ -53,10 +62,13 @@ SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000 metadata
 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
+MD5 7db1472b0ff3d9c8a29166190a8e3f71 files/digest-screen-4.0.3_p20070403 268
+RMD160 74742546904fb77a843a011454fc938c556c2f3a files/digest-screen-4.0.3_p20070403 268
+SHA256 40df95fc623e6894c6d6771cc75de8f598ee1f72bd8a4062c1d37a7c7c8431b8 files/digest-screen-4.0.3_p20070403 268
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGX8JxNQqtfCuFneMRAhW7AJ9dXMTSiBwJXEzsq7lhP/6u1pkfBgCcCXR6
-LUVah3d0/XUzz/FqgqfIe0I=
-=KwcR
+iD8DBQFGuM0BI1lqEGTUzyQRAnf+AJ9xufZ3/rx7ntYL2eWaIcWHb1AQMwCfTxMq
+Gpd2ceTH6CP9hVuFeGNkgpU=
+=Rpxc
 -----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/digest-screen-4.0.3_p20070403 b/app-misc/screen/files/digest-screen-4.0.3_p20070403
new file mode 100644
index 000000000000..23606335f174
--- /dev/null
+++ b/app-misc/screen/files/digest-screen-4.0.3_p20070403
@@ -0,0 +1,3 @@
+MD5 e6ca8768fc82c1cf14da3be256cf974f screen-4.0.3_p20070403.tar.gz 913917
+RMD160 710d4a5df7b4df2efe5b0f0159f3986ec9f502c0 screen-4.0.3_p20070403.tar.gz 913917
+SHA256 e624bea23c37e0efa10c89ab14a29bf7c5b95f328df55eeaa1bf472fe904610f screen-4.0.3_p20070403.tar.gz 913917
diff --git a/app-misc/screen/files/screen-4.0.3_p20070403-map.patch b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch
new file mode 100644
index 000000000000..36d7162b87f1
--- /dev/null
+++ b/app-misc/screen/files/screen-4.0.3_p20070403-map.patch
@@ -0,0 +1,14 @@
+diff -Nur screen-4.0.3_p20070403.orig/term.c screen-4.0.3_p20070403/term.c
+--- screen-4.0.3_p20070403.orig/term.c	2005-12-16 18:51:07.000000000 +0000
++++ screen-4.0.3_p20070403/term.c	2007-04-22 19:47:17.002355543 +0000
+@@ -230,8 +230,8 @@
+ /* define T_NAVIGATE */
+   { "kh", T_STR  }, KMAPDEF("\033[1~") KMAPMDEF("\201")
+   { "@1", T_STR  },
+-  { "kH", T_STR  }, KMAPDEF("\033[4~") KMAPMDEF("\205")
+-  { "@7", T_STR  },
++  { "kH", T_STR  },
++  { "@7", T_STR  }, KMAPDEF("\033[4~") KMAPMDEF("\205")
+   { "kN", T_STR  }, KMAPDEF("\033[6~") KMAPMDEF("\006")
+   { "kP", T_STR  }, KMAPDEF("\033[5~") KMAPMDEF("\002")
+   { "kI", T_STR  }, KMAPDEF("\033[2~")
diff --git a/app-misc/screen/screen-4.0.3_p20070403.ebuild b/app-misc/screen/screen-4.0.3_p20070403.ebuild
new file mode 100644
index 000000000000..4b747c904aef
--- /dev/null
+++ b/app-misc/screen/screen-4.0.3_p20070403.ebuild
@@ -0,0 +1,128 @@
+# 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 $
+
+WANT_AUTOCONF="2.5"
+
+inherit eutils flag-o-matic toolchain-funcs pam autotools
+
+DESCRIPTION="Screen is a full-screen window manager that multiplexes a physical terminal between several processes"
+HOMEPAGE="http://www.gnu.org/software/screen/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug nethack pam selinux multiuser"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	pam? ( virtual/pam )
+	selinux? (
+		sec-policy/selinux-screen
+		>=sec-policy/selinux-base-policy-20050821
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	# Make sure utmp group exists, as it's used later on.
+	enewgroup utmp 406
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# uclibc doesnt have sys/stropts.h
+	if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
+		epatch "${FILESDIR}"/4.0.2-no-pty.patch
+	fi
+
+	# Fix some keybindings
+	epatch "${FILESDIR}"/${P}-map.patch
+
+	# Don't use utempter even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-utempter.patch
+
+	# Don't link against libelf even if it is found on the system
+	epatch "${FILESDIR}"/4.0.2-no-libelf.patch
+
+	# Fix manpage.
+	sed -i \
+		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
+		-e "s:/usr/local/screens:/var/run/screen:g" \
+		-e "s:/local/etc/screenrc:/etc/screenrc:g" \
+		-e "s:/etc/utmp:/var/run/utmp:g" \
+		-e "s:/local/screens/S-:/var/run/screen/S-:g" \
+		doc/screen.1 \
+		|| die "sed doc/screen.1 failed"
+
+	eautoconf
+}
+
+src_compile() {
+	append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+	append-ldflags $(bindnow-flags)
+
+	use nethack || append-flags "-DNONETHACK"
+	use debug && append-flags "-DDEBUG"
+
+	econf \
+		--with-socket-dir=/var/run/screen \
+		--with-sys-screenrc=/etc/screenrc \
+		--with-pty-mode=0620 \
+		--with-pty-group=5 \
+		--enable-rxvt_osc \
+		--enable-telnet \
+		--enable-colors256 \
+		$(use_enable pam) \
+		|| die "econf failed"
+
+	LC_ALL=POSIX make term.h || die "Failed making term.h"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	dobin screen || die "dobin failed"
+	keepdir /var/run/screen || die "keepdir failed"
+
+	if use multiuser
+	then
+		fperms 4755 /usr/bin/screen || die "fperms failed"
+	else
+		fowners root:utmp /{usr/bin,var/run}/screen || die "fowners failed"
+		fperms 2755 /usr/bin/screen || die "fperms failed"
+	fi
+
+	insinto /usr/share/screen
+	doins terminfo/{screencap,screeninfo.src} || die "doins failed"
+	insinto /usr/share/screen/utf8encodings
+	doins utf8encodings/?? || die "doins failed"
+	insinto /etc
+	doins "${FILESDIR}"/screenrc || die "doins failed"
+
+	pamd_mimic_system screen auth || die "pamd_mimic_system failed"
+
+	dodoc \
+		README ChangeLog INSTALL TODO NEWS* patchlevel.h \
+		doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps} \
+		|| die "dodoc failed"
+
+	doman doc/screen.1 || die "doman failed"
+	doinfo doc/screen.info* || die "doinfo failed"
+}
+
+pkg_postinst() {
+	if use multiuser
+	then
+		chown root:0 "${ROOT}"/var/run/screen
+		chmod 0755 "${ROOT}"/var/run/screen
+	else
+		chown root:utmp "${ROOT}"/var/run/screen
+		chmod 0775 "${ROOT}"/var/run/screen
+	fi
+
+	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."
+}