Fix building against >=sys-libs/glibc-2.16 by Sergey Popov (bug #449672).

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 17 insertions, 54 deletions

diff --git a/dev-vcs/rcs/ChangeLog b/dev-vcs/rcs/ChangeLog
index 3cf43bd15ca4..e5a0a571b6e3 100644
--- a/dev-vcs/rcs/ChangeLog
+++ b/dev-vcs/rcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/rcs
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rcs/ChangeLog,v 1.13 2012/12/05 01:38:23 jer Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rcs/ChangeLog,v 1.14 2013/02/21 03:51:10 jer Exp $
+
+  21 Feb 2013; Jeroen Roovers <jer@gentoo.org> -rcs-5.7-r3.ebuild,
+  rcs-5.8.ebuild:
+  Fix building against >=sys-libs/glibc-2.16 by Sergey Popov (bug #449672).
 
   05 Dec 2012; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Change maintainer tag (bug #390951).
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index c99f0a156640..1e9d6bd8f0e8 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -2,17 +2,14 @@
 Hash: SHA256
 
 AUX rcs-5.8-include.patch 290 SHA256 2a59d3ec6774f0cc7bae406da48e2133c1cea9e0e24676b97de9bf42659d8667 SHA512 22c787d4c48dcb04add05735c519f1d6c5841419f80fbf6ced3982da2e7c355c32076572cf6e846d3db0a0d3b053cf621c53394ae1626fdced4be611cbc6e963 WHIRLPOOL 5c04fdc0b3fc8707ca318ba1f168d210168218246e247ca0ddbaf22790de79b96866c1a931a006892bfcadeb48d9d82d0660442295439736d2068296c2ac8968
-DIST rcs-5.7-debian.diff.bz2 54854 SHA256 4bdb93a25a0e88d46ef42423128f375883caba17423a272692749e2c8d346140 SHA512 c7cac27d5731776bcba23ac1698d909b15bf657ca4d1a466cf05c94699a4652fb5d4117a10fa35f185a6d40d137e7234ff190ac9551e1b216abab2fb50b95572 WHIRLPOOL 5a10b9b8ff01da7c22bbc50b4b567fe6f2f9de3d5855092fbaea233e633df3f78915ec351d65dfbbcae34ec6e198411d0cd55f0ba56c0d6c5347d16080b6c454
-DIST rcs-5.7.tar.gz 282413 SHA256 97b50630e308320ea91e2a4f35f648d5e95e1de121ff64d2f19b571c512169e4 SHA512 e9c4149eab79c088f75e8883f4b78067b216f16879d84f4a21885029a8c960432e3ecfec35e2616e3f2b0b29c27ea6a6c654777bbb9849a0f30f1e12c7de49e1 WHIRLPOOL 13f2101bd8f5c8fcaf6ed1e3c46eb127984a0839342701f45a0e85d959f59371e4d28f911cb39f240070beb2d7429c2815d9cf270d496947b6f6a9af66628721
 DIST rcs-5.8.tar.gz 1048576 SHA256 701be8ea2e070f28626b3766f024791f3ec51249c483490bef70920d1fb52260 SHA512 dd52669bc681d77f23191ac540fbd6f1ed6dfa4a1e8a10005c1bc8bb5b7f273a5850e6a71c137b0d06807cf550332e2fe1ea8b78ed8ba7d1b4d4dc435b502877 WHIRLPOOL 083665d073d9c8cb67c6645c2d45b1bbe5ca612182abee7f4cf3d749356448111d281766a4dc134e9b8317021cba51ddd400d0351df3af73d774acbfd8a9c370
-EBUILD rcs-5.7-r3.ebuild 1038 SHA256 d3917b0a75213510dd1cea4396684aeb93cde4eb7311364d28cec95ea25dc33f SHA512 a16c00df1dd04eeee79ea743863b7655724ce34437516d700bb791bf389fb61f9cccb237cd1b22f55e7152c0ec20a89bdfd9bffbab2a10acb40c43868d8c0be4 WHIRLPOOL 05414c5eefc239260dcc778890da8c8430d83e15860547411d3ba94bacb7030ef1666237f15724e02c905534111b5c3a89b3022e76fe51ab3298725049f5e904
-EBUILD rcs-5.8.ebuild 943 SHA256 877da2aefeb0b90b58e20172857178a090ee73cf1f8d6e96d7c93c843c8f2021 SHA512 463bf9fecb0e3f6859294c515e2e0c8f35c98df56c5f79243cfc7a28c90dd823e25f12c72971ead4a67dadec0cf0b7fb3c54ff630b1f92069510c5328798bd30 WHIRLPOOL 554190ec91972a9379d3dddbf79ae50aed86e41ba2ececa08dfe6249b90345bd5e54553127e6d67dbd10b7442d325ba6f4ecd35ac03fac4a3f77cd2d0080d453
-MISC ChangeLog 5862 SHA256 8c1c50c35092dece11e39d9edeecf9d0bfd4f6cbac2b5b42b6842029435f2c4e SHA512 48110503b5e30b33fe81a816d996c5ba7c160dde8f1af0186747b8941704f3a3a73a926cd634a78a39d2ed9b51100164f5db56cca20f7cba5843c7739304bda0 WHIRLPOOL 58a51387b483ff5647899e036167b6e7e26cbfc5d1700742d5f915f9e909b18515605c7ec70f0f0e18ce04935e91cd4c6e60f102dd33c5b560a67691e262f335
+EBUILD rcs-5.8.ebuild 1011 SHA256 800be145f3da368e9c2d0d5bef4fc635cdd6e3b17b508cd9d6899a8c02f6dc28 SHA512 b30c6b552d3bf6781b9750d454ab6805276ef79bde15c5f17b0dd1ca29c2555f8eb498f50ff86b3139f31f3abc562c1bb6d5ac64770be7b5e6d56090697935ff WHIRLPOOL d96cf7225acc1bbb9e222d3476822338031a952f4a36917a4b39370c64f885f6435612bbd12d7e51f5b55a13269c13d1f6d18c81102c53599ac6cc102c6010ea
+MISC ChangeLog 6024 SHA256 bebcfdf4bf50252ae18ff9a12da79bef8346eabe023c8ed790dc29ddbce7c6ed SHA512 99a695136b8ca42421e1961b10f1ccfff2d527487799e03621fcc7797c5e7ccc697438772465c4a814328e4f6db77e981e2514837152fb74cdc341b1f27c2ca0 WHIRLPOOL 755392034302203cddae59f02df5540b19e7689b5b7fe77b60ca4a4cb9e91924cd2edb6582dfd2b6d4b3dafd7fbdbbf7ea1de143ffa41a21f4d2232793221aba
 MISC metadata.xml 689 SHA256 f6fd50644c3529d962935b828bd48a8f8e32bc2f363014aa070d39e05271bb43 SHA512 6d8b556124ff73b44dc99064db86f07cfc75147332dd5f84ff7b39e0d5f1b1ab706156b3665f139638185e99ea034ee31ebfe8acdd34c92228c09db505d7c943 WHIRLPOOL fa0753f137552a1fc782437d8a60d71d8fd735f0fb5badce5585085a0ab1dceccb8a7183fb9e6c9b6807c429cd4eacc618a5b9c95185079e60bea9cca85148f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC+pZAACgkQVWmRsqeSphOHkQCfXsI7OYH14LOAFqYpj1Tye1xf
-q1oAn1O+rtu8BvtgoyBMJFXh0/WGN1Fh
-=Psgj
+iEYEAREIAAYFAlElma8ACgkQVWmRsqeSphMZPACcDHvRkm9f6t+HEbEu4NnSbubO
+VbkAnjGanSrHXAHKb1cmF0Z0KlhUTKsz
+=WPwL
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/rcs/rcs-5.7-r3.ebuild b/dev-vcs/rcs/rcs-5.7-r3.ebuild
deleted file mode 100644
index d0021aa207f4..000000000000
--- a/dev-vcs/rcs/rcs-5.7-r3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rcs/rcs-5.7-r3.ebuild,v 1.3 2010/10/02 20:10:05 grobian Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="Revision Control System"
-HOMEPAGE="http://www.gnu.org/software/rcs/"
-SRC_URI="mirror://gnu/rcs/${P}.tar.gz
-	mirror://gentoo/${P}-debian.diff.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="sys-apps/diffutils"
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-debian.diff
-}
-
-src_configure() {
-	# econf BREAKS this!
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--host=${CHOST} \
-		--with-diffutils || die
-}
-
-src_install() {
-	emake -j1 \
-		prefix="${ED}"/usr \
-		man1dir="${ED}"/usr/share/man/man1 \
-		man3dir="${ED}"/usr/share/man/man3 \
-		man5dir="${ED}"/usr/share/man/man5 \
-		install || die
-
-	dodoc ChangeLog CREDITS NEWS README REFS
-}
diff --git a/dev-vcs/rcs/rcs-5.8.ebuild b/dev-vcs/rcs/rcs-5.8.ebuild
index a5a4f36a1719..72a0774134c7 100644
--- a/dev-vcs/rcs/rcs-5.8.ebuild
+++ b/dev-vcs/rcs/rcs-5.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rcs/rcs-5.8.ebuild,v 1.8 2012/03/08 22:57:34 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rcs/rcs-5.8.ebuild,v 1.9 2013/02/21 03:51:10 jer Exp $
 
 EAPI="4"
 
@@ -22,6 +22,10 @@ RESTRICT="test"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-include.patch"
+
+	sed -i \
+		-e '/gets is a security hole/d' \
+		lib/stdio.in.h || die
 }
 
 src_install() {