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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 48 insertions, 19 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/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>