Fix building with newer glibc #251446 by Diego E. Pettenò.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 34 insertions, 15 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 20e55a880128..a41674399123 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/inspircd
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.26 2008/09/18 20:05:44 maekke Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.27 2009/01/14 05:12:18 vapier Exp $
+
+  14 Jan 2009; Mike Frysinger <vapier@gentoo.org>
+  +files/inspircd-1.1.19-build.patch, inspircd-1.1.19.ebuild:
+  Fix building with newer glibc #251446 by Diego E. Pettenò.
 
   18 Sep 2008; Markus Meier <maekke@gentoo.org> inspircd-1.1.19.ebuild:
   amd64 stable, bug #236658
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 4d62818b51ef..485d6fd60abf 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
+AUX inspircd-1.1.19-build.patch 263 RMD160 d00a39fef209b8cc0ea3f40704996600fa907e25 SHA1 16a3ac599e28f17b94593e945d9ff38b69620366 SHA256 e89742ed8347720b8b272a1e3d7d5e7a28441c8e0eb1f1d76473615aa31344a9
 DIST InspIRCd-1.0.7.tar.bz2 337187 RMD160 a7387cf88f08f0e9487d25db79d88cde9e9c8283 SHA1 5c8a35b11928c6ad85d905b1bc34de096aa2cf11 SHA256 0ce029e92a0a1713de1d0665d1143295a054a8d925fa724795d709493a8b8d7f
 DIST InspIRCd-1.1.14.tar.bz2 504766 RMD160 ee48f16b0360ef2ae397d8eb5a5c36027f47cc4d SHA1 a85bbdf5ef11ae44de69eb4df4cacc39a52e7a9e SHA256 de7c3fcf15bcab3a3bd9e41233854322022cdd1e0207fdd0f26d7e608209cf39
 DIST InspIRCd-1.1.19.tar.bz2 505193 RMD160 c1f6230286c28c889060b961ea272f306eab8170 SHA1 d5ba49126585efc91d9c5021c76d56b067d3cc8e SHA256 4e1394749096e92ac976160c8d82a2017e718d5edd0a86f6049b3d473023c64e
 EBUILD inspircd-1.0.7-r1.ebuild 3169 RMD160 fb15af7b8a61ba76ad2c767553dc644e0d2671ed SHA1 00271b5391f101caa04c4ee9870f2db10c6bc8f5 SHA256 5c5d69907141f0a8b96acda7a2f45b6a3bbba3a6735efc10e0c7b906010b31f5
 EBUILD inspircd-1.1.14.ebuild 2411 RMD160 ef780d64c9c7d86a96a18903c9cd3d0e857fc195 SHA1 bc78c7d7b302c9fd4eee6b924c9dcb2f4b536007 SHA256 bcc42a4f593940f5853f65e7128471f9decda576a5318c8659b68e4db2483015
-EBUILD inspircd-1.1.19.ebuild 3182 RMD160 e3046b79b3bab6a03f59a11426bae0b3f8f64f00 SHA1 b1f01e822fd24899212eb5a0a1533135c978ec6a SHA256 76b7764b09e53dc7c52cb5e433cc888641d54647789b40700721e0c7cb768915
-MISC ChangeLog 4901 RMD160 4d6c549536ec7ec46284bd607ac145092ac2d20d SHA1 071857337bf730e2c7765b12aa4e1bf146ecb9ef SHA256 be95b0b6d8abdb7e0276c0d14be698e658c83a5e485ff3c224e3568409294609
+EBUILD inspircd-1.1.19.ebuild 3233 RMD160 4b980c35ae0f404564a8ac749aabcdf37ad489d2 SHA1 b411473feb9cf60e44f837e0dfbd3ab4a0f93f4a SHA256 356e86055de64c28558f45279fd3983f24e4b38357fe63f99097f365457fbe7c
+MISC ChangeLog 5076 RMD160 4a2a2ebdbc81f8f4815409b4aaa8fd1bb2d544c8 SHA1 4bb45c8c602b103853b8000db2604e8f40cd2bbf SHA256 5ccba324282cd0708126e854a892ba5a18fa0cda365dfb32586b280e95fb225e
 MISC metadata.xml 566 RMD160 acf38b66074b87645c0128316e73f3fad3cc7abe SHA1 1dd1807bb553426c6044c749b1e9beb9a3196981 SHA256 3ccdf8fde306ec9f8e0ad240be4fab1f017116f3e6675fd1a978974b17e6bcaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjStOkACgkQkKaRLQcq0GIVYgCggVyX+EStp3VKAqTlXK3tUpYL
-CDoAn2Qah9kvV5LGLbghO9x1C6Qm16UF
-=UQ5R
+iEYEARECAAYFAkltdDgACgkQn/5bYzqsSmGQlwCfSBq0XqbgdD5I9mhxVoG+f37x
+DKEAn2GhgPIxEYXGb5LGNil+eiefzdLg
+=Rfay
 -----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-1.1.19-build.patch b/net-irc/inspircd/files/inspircd-1.1.19-build.patch
new file mode 100644
index 000000000000..1b45d357778c
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-1.1.19-build.patch
@@ -0,0 +1,14 @@
+fix building with newer glibc
+
+http://bugs.gentoo.org/251446
+
+--- src/configreader.cpp
++++ src/configreader.cpp
+@@ -13,6 +13,7 @@
+ 
+ #include "inspircd.h"
+ #include "configreader.h"
++#include <limits.h>
+ #include <sstream>
+ #include <fstream>
+ #include "xline.h"
diff --git a/net-irc/inspircd/inspircd-1.1.19.ebuild b/net-irc/inspircd/inspircd-1.1.19.ebuild
index 20041f5bbfdf..b904cdbeefd7 100644
--- a/net-irc/inspircd/inspircd-1.1.19.ebuild
+++ b/net-irc/inspircd/inspircd-1.1.19.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.19.ebuild,v 1.5 2008/09/18 20:05:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.19.ebuild,v 1.6 2009/01/14 05:12:18 vapier Exp $
 
 inherit eutils toolchain-funcs multilib # subversion
 
 DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
 HOMEPAGE="http://www.inspircd.org/"
 SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2
-mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
+	mirror://sourceforge/${PN}/InspIRCd-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="openssl gnutls ipv6 kernel_linux mysql postgres sqlite zlib ldap"
 
-RDEPEND="
-	dev-lang/perl
+RDEPEND="dev-lang/perl
 	openssl? ( dev-libs/openssl )
 	gnutls? ( net-libs/gnutls )
 	mysql? ( virtual/mysql )
@@ -24,11 +23,12 @@ RDEPEND="
 	ldap? ( net-nds/openldap )"
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/inspircd"
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch #251446
 
 	local SQL=0
 	cd src/modules
@@ -63,7 +63,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	# ./configure doesn't know --disable-gnutls, -ipv6 and -openssl options,
 	# so should be used only --enable-like.
 	local myconf=""
@@ -98,7 +97,8 @@ src_install() {
 		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
 		CONPATH="${D}/etc/inspircd" \
 		BINPATH="${D}/usr/bin" \
-		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher"
+		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher" \
+		|| die
 
 	insinto /usr/include/inspircd/
 	doins "${S}"/include/*