net-irc/inspircd: bump to 2.0.20

New maintainer added to metadata under proxy-maintainers herd,
init file renamed to expand in any '{P}', new patch for fix-path-builds,
ebuild and patch by new maintainer via bug #545034, rm 2.0.17

Package-Manager: portage-2.2.20.1

5 files changed, 24 insertions, 21 deletions

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 6edbc5b99a8a..e319fcd048af 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,2 @@
-DIST inspircd-2.0.17.tar.gz 744743 SHA256 a5d42a6568df341b67a386f93dc92ccb8e1d1308c19ea2deb4c5424b11c6dde8 SHA512 4eddc927a682794cad1e85a747eefd269aa0c6c88a373e1c38902ff689f5c02da44b31e7ec1dc1f97c08c5cc7cc26be62b32a0831ca2d53f81c5662394325a5e WHIRLPOOL af7dae1282a442332badb6254dcf10bec63a55a7dcf717c7246389ff47f051b453d5ff47edc2e635c2cbd22bafc7d6109c3c63f67dbe714e1f054c60e0905522
 DIST inspircd-2.0.18.tar.gz 747846 SHA256 45168ed075e66b379cdb9bae01652a23a33304817363e519fcbb1a194783295d SHA512 64e5d71da5d96afd1261b2a771f27f0c38b505812753a636c51d604f6166ab8a49106ae2da8291ecd86f894d2cfea63e9fcb105efdd7ce137bdf083235db7021 WHIRLPOOL c86846a170705590ae8b44023feb3adaa636c7af1d9e33a0cf560b1ebe5cc14740636c82e8c65e0f12357d9863ef36a66f0efa6aa20d2780bcef5ddd53888a6b
+DIST inspircd-2.0.20.tar.gz 728970 SHA256 5156e2da5da4cfa377705ecd633aee41cdcd785d12627497d55cab5f70dd686f SHA512 85463f7df379e5c7e190b4cc7ea67a80d5c4e5799c68abf2329e8204239dbed7258d11c97e5138039a8002f18ca0bd75ffc5c362b02cc27170adaf8cda6acc7e WHIRLPOOL 7eb8d3ca23c203431794ac18e65037e696638f54a0df8f2efbf590e87017e31f7a4f37926352cb4a613e6d58fb0d76ebf44a78ca6d39d093d66b46b57330b541
diff --git a/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
index a4e12bbda61f..ea1eca65f8d6 100644
--- a/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-2.0.20-fix-path-builds.patch
@@ -1,6 +1,6 @@
 diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example	2014-07-24 14:24:00.000000000 +0200
-+++ b/docs/conf/inspircd.conf.example	2014-08-09 10:21:01.439999954 +0200
+--- a/docs/conf/inspircd.conf.example	2015-05-10 00:24:10.000000000 -0500
++++ b/docs/conf/inspircd.conf.example	2015-07-27 05:22:26.107849785 -0500
 @@ -412,11 +412,11 @@
  
  # This file has all the information about oper classes, types and o:lines.
@@ -57,8 +57,8 @@ diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
  
  #########################################################################
 diff -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk	2014-07-24 14:24:00.000000000 +0200
-+++ b/make/template/main.mk	2014-08-09 10:24:59.039999948 +0200
+--- a/make/template/main.mk	2015-05-10 00:24:10.000000000 -0500
++++ b/make/template/main.mk	2015-07-27 05:22:26.107849785 -0500
 @@ -34,7 +34,7 @@
  SYSTEM = @SYSTEM@
  BUILDPATH = @BUILD_DIR@
@@ -71,7 +71,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
 @@ -51,9 +51,9 @@
  INSTMODE_LIB = 0644
  
- @IFEQ $(CC) icc
+ @IFEQ $(CC) icpc
 -  CXXFLAGS += -Wshadow
 +  MYCXXFLAGS += -Wshadow
  @ELSE
@@ -106,7 +106,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
 -  CXXFLAGS += -O2
 +@IFEQ $(DEBUGLEVEL) 0
 +  MYCXXFLAGS += -O2
- @IFEQ $(CC) gcc
+ @IFEQ $(CC) g++
 -    CXXFLAGS += -g1
 +    MYCXXFLAGS += -g1
  @ENDIF
@@ -134,7 +134,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  
  @GNU_ONLY MAKEFLAGS += --no-print-directory
  
-@@ -128,10 +128,11 @@
+@@ -129,10 +129,11 @@
  @ENDIF
  
  @IFDEF PURE_STATIC
@@ -148,7 +148,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
  
  # Default target
-@@ -144,10 +145,10 @@
+@@ -145,10 +146,10 @@
      @GNU_ONLY TARGET = modules/$(M:.so=).so
  @ENDIF
  
@@ -161,7 +161,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  @ENDIF
  
  @IFEQ $(DBGOK) 0
-@@ -222,8 +223,8 @@
+@@ -223,8 +224,8 @@
  	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
  	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
  	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
@@ -172,7 +172,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
  	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
  @IFNDEF PURE_STATIC
-@@ -231,9 +232,9 @@
+@@ -232,9 +233,9 @@
  @ENDIF
  	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
  	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
@@ -185,7 +185,7 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  	@echo ""
  	@echo "*************************************"
  	@echo "*        INSTALL COMPLETE!          *"
-@@ -246,7 +247,7 @@
+@@ -247,7 +248,7 @@
  	@echo '  Data:' $(DATPATH)
  	@echo 'To start the ircd, run:' $(BASE)/inspircd start
  	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
@@ -195,9 +195,9 @@ diff -Nuar a/make/template/main.mk b/make/template/main.mk
  @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
  @BSD_ONLY RCS_FILES = src/version.sh
 diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl	2014-07-24 14:24:00.000000000 +0200
-+++ b/make/unit-cc.pl	2014-08-09 10:25:15.089999947 +0200
-@@ -97,7 +97,7 @@
+--- a/make/unit-cc.pl	2015-05-10 00:24:10.000000000 -0500
++++ b/make/unit-cc.pl	2015-07-27 05:22:26.107849785 -0500
+@@ -113,7 +113,7 @@
  	my $libs = '';
  	my $binary = $ENV{RUNCC};
  	if ($do_compile) {
diff --git a/net-irc/inspircd/files/inspircd-2.0.17-init b/net-irc/inspircd/files/inspircd-init
index 9c81a6bcc95f..9c81a6bcc95f 100644
--- a/net-irc/inspircd/files/inspircd-2.0.17-init
+++ b/net-irc/inspircd/files/inspircd-init
diff --git a/net-irc/inspircd/inspircd-2.0.17.ebuild b/net-irc/inspircd/inspircd-2.0.20.ebuild
index c1c011bccf4c..f49eb12bc072 100644
--- a/net-irc/inspircd/inspircd-2.0.17.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,17 +12,17 @@ SRC_URI="https://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
 
 RDEPEND="
 	dev-lang/perl
-	ssl? ( dev-libs/openssl )
+	ssl? ( dev-libs/openssl:= )
 	geoip? ( dev-libs/geoip )
 	gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 )
 	ldap? ( net-nds/openldap )
 	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql[server] )
+	postgres? ( dev-db/postgresql:= )
 	pcre? ( dev-libs/libpcre )
 	sqlite? ( >=dev-db/sqlite-3.0 )
 	tre? ( dev-libs/tre )"
@@ -95,7 +95,7 @@ src_install() {
 	dodir "/var/lib/${PN}"
 	dodir "/var/lib/${PN}/data"
 
-	newinitd "${FILESDIR}/${P}-init" "${PN}"
+	newinitd "${FILESDIR}/${PN}-init" "${PN}"
 	keepdir "/var/log/${PN}"/
 }
 
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index b503238f39f7..903a984cf634 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
+		<email>andrew.r.wilcox+gentoo@gmail.com</email>
+		<name>Andrew Wilcox></name>
+		<description>Proxy (user) maintainer, bugs to be assigned to him</description>
 	</maintainer>
 	<longdescription lang="en">
 		InspIRCd is a modular Internet Relay Chat (IRC) server written in C++