Include a compability patch for autoconf-2.62, bug #217311. Drop bindnow-flags, bug #214245.

Package-Manager: portage-2.1.5_rc2

5 files changed, 46 insertions, 11 deletions

diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog
index c66786709378..57463aede531 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.136 2007/08/07 19:59:29 swegener Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.137 2008/04/11 18:44:35 swegener Exp $
+
+  11 Apr 2008; Sven Wegener <swegener@gentoo.org>
+  +files/screen-4.0.3-config.h-autoconf-2.62.patch, screen-4.0.3.ebuild,
+  screen-4.0.3_p20070403.ebuild:
+  Include a compability patch for autoconf-2.62, bug #217311. Drop
+  bindnow-flags, bug #214245.
 
   07 Aug 2007; Sven Wegener <swegener@gentoo.org> screen-4.0.3.ebuild,
   screen-4.0.3_p20070403.ebuild:
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 850a8cf70e62..a8ed81e44c5d 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.0.2-64bit-time.patch 298 RMD160 3278d227f1f5c5bce8b7369e9c44fd7e35ac804c SHA1 ab4f298c3c46fe9dad550009def0db8c44b13d22 SHA256 d974e14a1d8e32a0a05b211cd76d9335a066c6b85538505f1d95f25209c99057
 AUX 4.0.2-no-libelf.patch 555 RMD160 4af1c158b0a4e0124fec8347090bf5d25634fdf5 SHA1 fe33038030600e60369374b994c47e68e2bb6bd3 SHA256 56cc1f7b2d02ba230501c7c87da170fa791639cb1f36b2b0b87d8644e5372059
 AUX 4.0.2-no-pty.patch 392 RMD160 d29aec55c6b76f66a8340096f627afe2e4dca3e8 SHA1 bd1328e0dbb321397692846b5c2ac62df1885a9c SHA256 edc29bc7b7bea89c2f937ca9c95f2ce51b437e4ea042741d9f4ac6d7954178d5
@@ -6,11 +9,19 @@ AUX 4.0.2-nonblock.patch 423 RMD160 30a75e2b89542ec8a878855cf633ac3c04f799fd SHA
 AUX 4.0.2-windowlist-multiuser-fix.patch 491 RMD160 7e28be8f2bc71705b4ff0d8028adb4ad4cd22cd5 SHA1 2d7b190b933900e1b0c302b37d526fafb373de31 SHA256 edec52981859cfad0a2d780352405dc7575ad7901bc101d25e95baccf1060cc7
 AUX screen-4.0.1-int-overflow-fix.patch 930 RMD160 b82fe493ccdc75bcfa97bf36e86f37ff5056565e SHA1 e516e056515a5e10cd470a8f951a94c512827515 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0
 AUX screen-4.0.1-vsprintf.patch 480 RMD160 cc80e7353e19d7d82dc506ae3a5eaaedba4db1ca SHA1 b1bf4b8f45236dc63de748699671679ce7237a59 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd
+AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 RMD160 b83b905014431c5671d8624f5b471414e8738d8f SHA1 7335c01e9f12bb2414a4e023bcb739453375f493 SHA256 71897394211d9e00e008f7c34b3a37bff0cfa54bcfa31a23e849c7021471ca2f
 AUX screen-4.0.3_p20070403-map.patch 653 RMD160 bdaa002ee7a4abb095699010b366686b59d2192d SHA1 0b61346efa6ae6ed988e71d71b21c1d8e94236d9 SHA256 74db74a79ce4dfe1223f53562b0c331b94544ae85262e834356fc0c9f0d0997e
 AUX screenrc 10343 RMD160 35b7e7d73ac941cee4a97a53ef448d29080c7e3d SHA1 551a179a0e4ba7de065c641cdc5f1274f355e3fe SHA256 bf54fdf6aad3cf4af1cf68b885ef345b2b3129826132c5497b2362f50039ae30
 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 4232 RMD160 2e24d2fb3b2822e8fc33fb184eacf89a525f82c1 SHA1 a323dfc1e98a831ab33a43594768e0710e01f52b SHA256 d25d06b4f48eb94dc138b6df70d180c54b78b576a045890481f0a3424fc4bc0d
-EBUILD screen-4.0.3_p20070403.ebuild 3758 RMD160 ddec84a7e4e5c6480c61b083c6da5ab632d59b2f SHA1 50432555abb3fbb8980678af3270aa264bbc6888 SHA256 4bed245b2739fcb94b713e5f0ec9be0a421246a7ae2921cf6fbcbe8e3e785c09
-MISC ChangeLog 18960 RMD160 4f82e367b8f3c9825bf0cbb5599aae5ba6a40d37 SHA1 dd16bf13ea845a0ac7734ea8590ee75bce0a391a SHA256 4de0b34460e0df233610c8e5491aa64c05db33b70338f895d2dc2042a64c0ed1
+EBUILD screen-4.0.3.ebuild 4307 RMD160 8573941a828f3fdb7d31358993947cdf58284963 SHA1 f94bf6d167bf2c3482b46f0e92b7ea618fe7a835 SHA256 1dbb72f43e979e90356d609e69f187f3c5e60827829e2e158ec1694e83746afe
+EBUILD screen-4.0.3_p20070403.ebuild 3833 RMD160 430801d89b62f988909378ca47f9859abeaf8303 SHA1 964f3a4fd6f7a8403a27cca876a971606f4bd517 SHA256 c3561e3e0074f95cc1d097b3bed10d385fe7d0dcfaf069ad61c6c7d8f5e22211
+MISC ChangeLog 19214 RMD160 6a8ae1590f364dcd3125575fb6566a0768f10673 SHA1 018cbb225ffb9e4798f2d48010cf06ea851941a9 SHA256 5d8becbf3390d89b4602bbee3e96f572efae75b21f082a0e16e8e0b02d64d9e5
 MISC metadata.xml 1525 RMD160 fcd6c6607111333349ac84d9890122e555f3241a SHA1 58684084d4230cc1962b0df579faaa66999c4a4f SHA256 de7b50d1be27be1afd45239960aab8294b6b9a9bfac9d27af7c2117fee9dd000
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFH/7GZI1lqEGTUzyQRAuDsAJ4gpwtKQQtSF0mBF5G3z1fd/sDWmwCgtU8D
+teCc2SnOzswkkM5+2OPhxmk=
+=ZPx1
+-----END PGP SIGNATURE-----
diff --git a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
new file mode 100644
index 000000000000..5605fdac7414
--- /dev/null
+++ b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
@@ -0,0 +1,14 @@
+compability for sys-devel/autoconf-2.62
+
+https://bugs.gentoo.org/show_bug.cgi?id=217311
+
+--- screen/config.h.in
++++ screen/config.h.in
+@@ -563,7 +563,6 @@
+  * If you are on a SYS V machine that restricts filename length to 14 
+  * characters, you may need to enforce that by setting NAME_MAX to 14
+  */
+-#undef NAME_MAX		/* KEEP_UNDEF_HERE override system value */
+ #undef NAME_MAX
+ 
+ /*
diff --git a/app-misc/screen/screen-4.0.3.ebuild b/app-misc/screen/screen-4.0.3.ebuild
index 80c63a4f442b..bac3981f3199 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-2007 Gentoo Foundation
+# Copyright 1999-2008 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.16 2007/08/07 19:59:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3.ebuild,v 1.17 2008/04/11 18:44:35 swegener Exp $
 
 WANT_AUTOCONF="2.5"
 
@@ -60,6 +60,9 @@ src_unpack() {
 	# Open tty in non-blocking mode
 	epatch "${FILESDIR}"/4.0.2-nonblock.patch
 
+	# compability for sys-devel/autoconf-2.62
+	epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
+
 	# Fix manpage.
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
@@ -76,7 +79,6 @@ src_unpack() {
 
 src_compile() {
 	append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-	append-ldflags $(bindnow-flags)
 
 	use nethack || append-flags "-DNONETHACK"
 	use debug && append-flags "-DDEBUG"
diff --git a/app-misc/screen/screen-4.0.3_p20070403.ebuild b/app-misc/screen/screen-4.0.3_p20070403.ebuild
index a43f1596acf1..fa0c8e47ed40 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
+# Copyright 1999-2008 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.2 2007/08/07 19:59:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3_p20070403.ebuild,v 1.3 2008/04/11 18:44:35 swegener Exp $
 
 WANT_AUTOCONF="2.5"
 
@@ -46,6 +46,9 @@ src_unpack() {
 	# Don't link against libelf even if it is found on the system
 	epatch "${FILESDIR}"/4.0.2-no-libelf.patch
 
+	# compability for sys-devel/autoconf-2.62
+	epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
+
 	# Fix manpage.
 	sed -i \
 		-e "s:/usr/local/etc/screenrc:/etc/screenrc:g" \
@@ -61,7 +64,6 @@ src_unpack() {
 
 src_compile() {
 	append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-	append-ldflags $(bindnow-flags)
 
 	use nethack || append-flags "-DNONETHACK"
 	use debug && append-flags "-DDEBUG"