Fix compile with gcc-4.7 wrt bug #421409. Add geoip use flag wrt bug #413747. Update metadata.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

5 files changed, 60 insertions, 26 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 86ab864707b4..aa898bb00035 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.49 2012/05/21 09:39:41 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.50 2012/06/23 17:16:04 nimiux Exp $
+
+  23 Jun 2012; Chema Alonso <nimiux@gentoo.org> inspircd-2.0.6_rc1.ebuild,
+  +files/inspircd-2.0.6_rc1-gcc-4.7.patch, metadata.xml:
+  Fix compile for gcc-4.7 wrt bug #421409. Add geoip use flag wrt bug #413747.
+  Update longdescription, maintainer info and use flags in metadata.
 
   21 May 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   inspircd-2.0.5-r2.ebuild:
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 88d603c3250c..d8b3681ca2eb 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
 AUX inspircd-2.0.5-r1-fix-make-config.patch 3967 RMD160 189944c41944ad4e35a8d9ed5334652ad2242af4 SHA1 d0538be470e462785fe645adbe86d8fc5449b03c SHA256 2b7d9ac477190c521d1e8b2a9d1a81aa87c8f54322af68ddf31d814485f388aa
@@ -7,6 +7,7 @@ AUX inspircd-2.0.5-r1-init 884 RMD160 ec73c88838aed3de86d74952b16846f47ec9d721 S
 AUX inspircd-2.0.5-r2-fix-paths-build.patch 6004 RMD160 a3ea8bb281f5d3ca23ecfd5cfbd501e70cb33f0c SHA1 8e08c24b38ca253924ddeaee621f75c202111147 SHA256 099a6715ccacfd49dafcd46a0003eaf239c512dd6e9ffed69dfb1256e58a2309
 AUX inspircd-2.0.6-init 881 RMD160 e279fe91f213fb56851b63c676e3b96d868bd275 SHA1 95c4bc05f41691261e9ee5cc7eb0e0c0029d598e SHA256 b4a70f07020cddb8190126ff063a8e698bfc0e13a8fedd555ba3167da13cac68
 AUX inspircd-2.0.6_rc1-fix-path-builds.patch 4821 RMD160 49f20cf1c7b25e56f710da2056f5c69a094d3071 SHA1 ad31f729e0258304c5b60556097f8da2fc83e8b9 SHA256 0d332c24166aae07a5d7be5b6faf3ea14a4c0354889670989ba8475d1ff4ea76
+AUX inspircd-2.0.6_rc1-gcc-4.7.patch 313 RMD160 48040049d3dac67223203b7205fb0148a6712c26 SHA1 5ae3384cfc7e9c7c283dfa3113f78483d86f225f SHA256 20a0a308bab97277a5cd9cd0a22a5ca831c4dc8c6a813a456c088e2ba4fc80f7
 AUX inspircd-fix-config.patch 2656 RMD160 988ba38a32cc8da5c566326a02f362eaf7dc02f1 SHA1 3f94c4ea95ac5c11d717f02b82d64a398f212377 SHA256 ab88c2ef4b4670283a2e3f4c32d4fd212b508ab53899ee1694bb71df5f9d96a1
 AUX inspircd-init.d 754 RMD160 6bb390cf0bdcc10892886be7dbc7b1c40aecbe14 SHA1 fa4faa440dd85c0225ef343f12ba4e63f364bf4c SHA256 041986c91a218c1cdc4d88f78da915990dd4de565c9b3cca3cf2fb15ef38db8f
 DIST InspIRCd-1.2.8.tar.bz2 637194 RMD160 e2581b194419add2fe2918263a6d1d545cf8a4d0 SHA1 201d83459eddc899143b10c768378059c2669ae1 SHA256 fa856ddb6d7ab2b4dc6aa6b0f58bbb2360823ce296d4e9dd0f18d630d8c7cee5
@@ -20,13 +21,17 @@ EBUILD inspircd-2.0.4.ebuild 3517 RMD160 28b949471498f488313d1550247195a80ca2fc2
 EBUILD inspircd-2.0.5-r1.ebuild 2824 RMD160 c6f904bf7801c4bba301d65e0141e6511f29d5af SHA1 40511a20d151cc925ef3a185fa0dd963062219ee SHA256 75414d9322a17bf971cfb38c4eb4a887a45bc3c6b3ef1f2d91670e527a2a18a3
 EBUILD inspircd-2.0.5-r2.ebuild 2838 RMD160 82e8a4f94f8da3c4e2e2786ae1fc79e8266967d3 SHA1 85884dfec204c3c8676133e50083fcd54c7aa8be SHA256 c973cbe03ab53bdf062393165bf827f8e24c5752f99656d6192250258647d814
 EBUILD inspircd-2.0.5.ebuild 3230 RMD160 03a18afeb1b6128e2d32cecd0d5c2d5f88739324 SHA1 5b6d1ce6605826d14f851454e842be35df26239f SHA256 83bb52a4f4ffc57ecc89493389e6679d9304c746827e7b76ecfdf054e855913a
-EBUILD inspircd-2.0.6_rc1.ebuild 2965 RMD160 0f12588bf6e62dc983c713cf0f7ebb4a2934a2a5 SHA1 5dd44ff59505a25d5a86f48ed018e03d53d9a248 SHA256 b85ca9ff925a0465f46c01e73066a51536373797d545472f2e5c14537ba5d0ca
-MISC ChangeLog 9052 RMD160 4399bf150f2bff3f5bf2d41eea3b8d884a475aec SHA1 00ce723c76c8c419fd3eb04886cf6b493f70c3bc SHA256 6982dbc45d6080a48f243be8e9d74165e026db0c1a290b2fe0ac981629d40494
-MISC metadata.xml 910 RMD160 4d07c259e86ccc476ac921bee4cd0fdeac8379f9 SHA1 e42067b72bca0590cbde7212990c5de279083382 SHA256 77777a194d0e0eb697a0f0dd57b9bdc3b64dae3c021930f77035611b4fdda9f7
+EBUILD inspircd-2.0.6_rc1.ebuild 3088 RMD160 b11cdd0e096b3e511273a31d5058fbf34c90dee2 SHA1 4b8ebaf5f64331768a8c98c3d2a63ed47d2db0ce SHA256 1a5fc4f530e10bb33b6c372d6081a2a9e8e6ddfdc0cb6ef8ed015ccbdd902dd4
+MISC ChangeLog 9329 RMD160 f343fa12b2bf5a5b67f0ddc7af554bd148aa69f8 SHA1 57f6438db3445ae85aca67764df9780184368360 SHA256 7590c9926d450744ee5871f9394047097ec8dab0ffcdef134dc0fa9b8f101761
+MISC metadata.xml 1379 RMD160 9d358456674a36d8514f6b8a20dc0371507990a4 SHA1 35bbd48f150a6e0f83cd1e9f2b858844e44337db SHA256 6f296c9f2e66bea15aef45aac846f564eb4a3d4ef71d4c6d850723bfce4da0f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+6DVsACgkQuUQtlDBCeQKIpgCeNx8z7tqKhZtlPqRElvqkWqAH
-wqsAniOxy9jHfCITmluXBKt6FrJLzcpf
-=u6mk
+iQEcBAEBCAAGBQJP5fowAAoJEA2sAkrWKOU2dwkIAJsA3RiRMuAciHkukE/Sjm1u
+NN2WxeNsmwa6jQTYQeh2W4+bG57GIbvtBWeZ6+1rM1Cxxp3Q1nIWqwUwxV5OwWpv
+P512d/BsThBJtrm9CaKX+lTNL+8R0YLiVsp7eHoIC3/uBfx0dePjgNZT31TCU6Ef
+Sz+JzT1FRO4jSlott4s+38l0LrCTKKN/O/gkrsq41KAERK7nVezI5R42UK8OXqdj
+6XokZgkR/RTwosXcT/nMR2cI6luAgvNm4WLX/TegfTIU0iCf4nWr5hRcrK8YrSef
+kaOWAGKhEjdqqk40ir35JuyDL9nGHUKzUWYlnpYnsXJLQeOVqjX5oZBlM0V5tYw=
+=OJX5
 -----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch b/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch
new file mode 100644
index 000000000000..e0bb11aa10bc
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.6_rc1-gcc-4.7.patch
@@ -0,0 +1,11 @@
+diff -Nur a/include/inspircd.h b/include/inspircd.h
+--- a/include/inspircd.h	2012-04-09 15:38:53.000000000 +0200
++++ b/include/inspircd.h	2012-06-23 18:05:15.059901531 +0200
+@@ -43,6 +43,7 @@
+ #include <cstring>
+ #include <climits>
+ #include <cstdio>
++#include <unistd.h>
+ 
+ #include <sstream>
+ #include <string>
diff --git a/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild b/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
index df4cae4a8778..055c38b919f4 100644
--- a/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild,v 1.1 2012/04/12 20:17:22 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.6_rc1.ebuild,v 1.2 2012/06/23 17:16:04 nimiux Exp $
 
 EAPI=4
 
@@ -8,17 +8,18 @@ inherit eutils flag-o-matic multilib versionator
 
 MY_PV="$(delete_version_separator 3)"
 DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="http://www.inspircd.org/"
+HOMEPAGE="http://inspircd.github.com/"
 SRC_URI="http://github.com/inspircd/inspircd/downloads/InspIRCd-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ipv6 ldap mysql postgres sqlite ssl"
+IUSE="geoip gnutls ipv6 ldap mysql postgres sqlite ssl"
 
 RDEPEND="
 	dev-lang/perl
 	ssl? ( dev-libs/openssl )
+	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
@@ -38,6 +39,7 @@ src_prepare() {
 	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
 
 	epatch "${FILESDIR}/${PF}-fix-path-builds.patch"
+	epatch "${FILESDIR}/${PF}-gcc-4.7.patch"
 }
 
 src_configure() {
@@ -46,12 +48,13 @@ src_configure() {
 	local egnutls="--enable-gnutls"
 	local dipv6="--disable-ipv6"
 
-	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+	use geoip && extras="${extras}m_geoip.cpp,"
 	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
 	use ldap && extras="${extras}m_ldapauth.cpp,"
 	use mysql && extras="${extras}m_mysql.cpp,"
 	use postgres && extras="${extras}m_pgsql.cpp,"
 	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
 
 	# allow inspircd to be built by root
 	touch .force-root-ok || die
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 771c8e57f2a1..993327eb9bf2 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,24 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
+	<maintainer>
 		<email>nimiux@gentoo.org</email>
 		<name>Chema Alonso</name>
 	</maintainer>
-    <maintainer>
-        <email>brain@brainbox.cc</email>
+	<maintainer>
+		<email>brain@brainbox.cc</email>
 		<name>Craig Edwards</name>
-		<description>Formerly indirectly maintaining through hansmi@gentoo.org -
-looking for a new proxy maintainer</description>
-    </maintainer>
+		<description>Proxy-Maintainer</description>
+	</maintainer>
+	<longdescription lang="en">
+		InspIRCd is a modular Internet Relay Chat (IRC) server written in C++
+		for Linux, BSD, Windows and Mac OS X systems which was created from
+		scratch to be stable, modern and lightweight.
+	</longdescription>
+	<longdescription lang="es">
+		InspIRCd es un servidor Internet Relay Chat (IRC) escrito en C++
+		para sistemas Linux, BSD, Windows y Mac OS X que se creó desde cero
+		para ser estable, moderno y ligero.
+	</longdescription>
 	<use>
-		<flag name='gnutls'>Enable TLS support</flag>
-		<flag name='ipv6'>Enable support for IP version 6</flag>
-		<flag name='ldap'>Enable LDAP support</flag>
-		<flag name='mysql'>Enable MySQL database backend</flag>
-		<flag name='openssl'>Enable SSL support</flag>
-		<flag name='postgres'>Enable PostgreSQL database backend</flag>
-		<flag name='sqlite'>Enable Sqlite database backend</flag>
-		<flag name='ssl'>Enable SSL support</flag>
+		<flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
+		<flag name="gnutls">Enable TLS support</flag>
+		<flag name="ipv6">Enable support for IP version 6</flag>
+		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="mysql">Enable MySQL database backend</flag>
+		<flag name="openssl">Enable SSL support (obsolete)</flag>
+		<flag name="postgres">Enable PostgreSQL database backend</flag>
+		<flag name="sqlite">Enable Sqlite database backend</flag>
+		<flag name="ssl">Enable SSL support</flag>
 	</use>
 </pkgmetadata>