Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

5 files changed, 375 insertions, 9 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 5a3078bf1eea..36b0a1f8d151 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.95 2014/03/05 10:10:26 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.96 2014/05/15 15:45:35 nimiux Exp $
+
+*inspircd-2.0.16 (15 May 2014)
+
+  15 May 2014; Chema Alonso <nimiux@gentoo.org> +inspircd-2.0.16.ebuild,
+  +files/inspircd-2.0.16-fix-path-builds.patch, +files/inspircd-2.0.16-init:
+  Version bump
 
   05 Mar 2014; Chema Alonso <nimiux@gentoo.org> -inspircd-2.0.13.ebuild,
   -files/inspircd-2.0.13-fix-path-builds.patch, -files/inspircd-2.0.13-init,
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index fa4c75a47e05..a3bf255ca813 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -3,18 +3,22 @@ Hash: SHA256
 
 AUX inspircd-2.0.15-fix-path-builds.patch 7327 SHA256 cd5cc3ce576702e752ecd4bae9aa07e6784ed03428eedf748c63ab119940007f SHA512 6edb2ce79a8bf7fceb697d7f37097f47f35a3c0df0b19e685713f26c73c109fc6a07dc8dda1f072a89d48f01d403b111fd4be18535b6d649ad28585fae05bdc0 WHIRLPOOL 7014dbcda3986fa806124dfc6e3d06823aaab2b821892bfab8874860cb83390b6d00334b0512dd42f44a05d34171ce6dad604d539bfe799dde67cf91afddd958
 AUX inspircd-2.0.15-init 917 SHA256 15faeb543973ae5bb2d97677b18d2604330327989e9abe264739665e8a1ba7d9 SHA512 b893c361a7022a9ba0f7ffb9d5e433f77ba1eb528a2a5b8d5eb7bc63b9ee010ef791573c5f3aa8dc938eb0b8b44bcccc73f32450e7cd3ead8c0388105af2c570 WHIRLPOOL c39ece92dba12f57b5ab712dae7cc4795dc5fa98d00857de43704ee41de2bcb8cb7e0cc44da4b71d32f0471ba85e0618a5177f240ed7587fed690001a082d45b
+AUX inspircd-2.0.16-fix-path-builds.patch 7327 SHA256 a0f3b3faf5856fb8c9173eed094b9c84f00e5c98fe81b7e86e1ab4f6f0a538d1 SHA512 c0888c2e7ca19ec55e5b46773c318b4e3deff1f7bb32750ecc1eebf690fddf86a2723c8f0c0baafcb3eaa169cd09627e3adce522e0d187fb256b5c8b2f86f841 WHIRLPOOL d3aae69f6f3d79f095c4c00a4dfc31f18df9201bf629104cb466327c8352d1acbc73c45f920259fb18a5e06d54c64cc3bcfc4464d600ac1d22bddd5386922d2f
+AUX inspircd-2.0.16-init 917 SHA256 96441bda464d7386713e51ab1f7639c86d21740c432083d8fe9c8aeba12b3c03 SHA512 0e06b8005206957d59876de5f64c4dd8f0130f6d7a398ac27fcce9d92f31332142d15ee1cce1b59efdf84d69ae9d3d8f5780445d9afe8c75cfe84f79c4e01209 WHIRLPOOL b12c9f9a571b83fb40beed975caaef22062b554e57c227cbb3b58937ca4f50cbb75b2d636dae02653dd58c595b78a87b55ab22d6e742e11de0dd514c26cc8e32
 DIST inspircd-2.0.15.tar.gz 743719 SHA256 bb4fa81fcbec3861c9bf59f88d14348957bae42b240be85a03f4fac0cc2786ea SHA512 95a2dfbc6a98a4ced9068a0f79cf8439cf92867779b75b7aea33ddec45183d669e833e78eb0b826174f6350a65bc2e44f95473ef1b78ea26c8d74c4833610cc1 WHIRLPOOL b8a5baa7cdd837da969de949314fb8bf0461fa89249585d9bced135705479ea7755ed05ba5dbb748808e8b03fc514943ed576dbce5fa2538645948b03a907acd
+DIST inspircd-2.0.16.tar.gz 743739 SHA256 557caf236e5dadada4295abb45208186aa5e3ca68edd3cc639776a5b4f280e03 SHA512 979e0e815221d9a494eadb656aee26c0090e4e117d9f56e5f18043ed19a175263e8232fe52443310f3b7cedcc54bd493e534aed936535f0ce1635090dd7a5201 WHIRLPOOL bf1104f4ccb5422c7b5124c7b4c625bab5debf34197f8f909296f7ea6fe7e2633a698fb817b398adc25267112830d89003f3655d14e9bfab5e184ccd4f30cec6
 EBUILD inspircd-2.0.15.ebuild 3073 SHA256 b39d5b235b41a9ef60accf8b4b448e3d5fbde33e5af058f719d4296ac6e19cf1 SHA512 5c40de56c1c396f09a5aa58f635d8e2a42cba54efac222b3b10fa20ee5152d9433e132d13a010469a9cec391b58d405a3a32fba19f2dc2ec4b9bd294455b9432 WHIRLPOOL 95b9846d68864ba877c94692035a0660fa8885b314184cde89e857c625d5d214b3f2d5aa3368a986b12ca3f20a9af89b39c8f4ab905c3374b865339e68f21c06
-MISC ChangeLog 16450 SHA256 2d758bc9815cc35ddfa3d45d5c7060dbacab3bc91aa0f51c67592f03ce7f7f44 SHA512 5c671f89966c1319611d7b20b93baad9642de11e13c2bb4ed4da9fe1c3cff5e848689825f638f2ca4cd1f9628cc8fe15ace37daff69926e8313b0ebaff5de093 WHIRLPOOL 84131c6d3113542dab57af038f70c06266b31625f9e239c3da99ce000ff513e7eef997a57c9b47a97f1d64fde62afb93280e230e845c6efde3bf96c04e4f7ea2
+EBUILD inspircd-2.0.16.ebuild 3078 SHA256 ae0ba173cecd7071b2e1a6039ccbf57adb0990ddb4930f985836454ad2a06a65 SHA512 8da3cddc99da300ced7c9a4e98a9aa2b808f80a238b19189142ce8563305abcddd1994c442192129c3ede76d420d5708ee65f877e992f709b5ede985b21d6bb0 WHIRLPOOL 8893179ef05c395d0a632866a6fdac4f5c0c1b5be8cf1b6d69c910d1debfb6217354cf8ec784dd0667e37ae5f6820541069bd54ca477869f69c7500a81e1de69
+MISC ChangeLog 16648 SHA256 f7f5ac3125a9efbd70825ac30a11d3718764b6aabc35dce697d4b81081f94102 SHA512 9527b0587c71addc5fd409e911d7fc2022996bec5488b791e2199750cc753e24a604de3f24f1498266a2dfd288720204e00dd73256d6e217479f3d97ee6b39d0 WHIRLPOOL 51cd62462bf726180e78f7e6e088b796da93f80dc047b96ad9ad3f03a3bdc14790e7484ef063079754c68203befe3f169b3735478959d218f79ae499f78c2634
 MISC metadata.xml 1678 SHA256 e6f968762672f557e56e3738a12e9b12a6dc3adb603f5369cb65904601f0ae8a SHA512 b335ee15d2480b45b1d889d2036b045efd168586e4643a223bff5ceedf04b91fffafd6ea8ee7c46649769719529c3e6e972e8a5c761354847b6a161b48fbfa26 WHIRLPOOL ea6af77a612fb122cec0bcf75989d0366a4a054e1fe8826eeb4b9d2eed68b5a77206fef118ee72c9d43e447e0885a79d80f0503b0b2c4b76498feaa33b1ef606
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTFvhIAAoJEA2sAkrWKOU287UH+gOCMZvofny5nddbPPP+q7ZU
-JJYRADel2ezPzbaUJxAgSs49Y8XDftA/ghNa4pXXCd1sfTPTSmCqvB0n4fJ9ERq6
-NwfgGDcGdoRdpeU3b/Ds/oExzz1WJgxKFvlQQdG+RAgqq2Md0VU8Q4sqXx1WvoWo
-ovTEZQ1sSxE/KcO39hNVPHcNC2QRQECzTciVkN3+00ISudPBDKCk81khLJFjZHS5
-a8UB+IUVEblR6xoy8Ez1MR7o6/PLgGnTCX0lM7BmhBMUVOIKg1wFVNNbS5zqHesQ
-exQaZoA4Qx5W58pVpfeP0ZZxtNhEOU73dyvfOXuxAEz5uCEZd2czbDYZWpZZPY4=
-=HRD5
+iQEcBAEBCAAGBQJTdOFbAAoJEA2sAkrWKOU2K6wH+wRbkjyXaV4xYrlgp6zY+wWl
+WAxLOR+akBCcIXZ7dmMXssX8AE/I91PTL/u8ngavjIcmU2ND+JnOO7nI9T9c58m0
+MXfu6WeHsjgg9yOMKAtXfD41U395yjBT1MtGmNaxAPJcXZoSp8II/QYTVQzKfLvB
+Ntyx38QPCVJ8O180liGVJ/d904cVtAJu/4XGb/+89qZ7S06aK2qAGeTT1nNp3HmH
+KkhyV8kDjyL6L6iJSoBAxfQGp6LZK3R2ull4UyPwTr142Ohisp1QzIjRRs4ZypLN
+g4Nl6e8UllAoaqzZLi77vriRUSrpog/eTnw3HC8HQwXqVtc5sgmji3hFclqgpFs=
+=WbF+
 -----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.16-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.16-fix-path-builds.patch
new file mode 100644
index 000000000000..d61408544501
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.16-fix-path-builds.patch
@@ -0,0 +1,208 @@
+diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example	2014-04-06 16:28:11.000000000 +0200
++++ b/docs/conf/inspircd.conf.example	2014-05-15 14:27:09.739916165 +0200
+@@ -412,11 +412,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/examples/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/examples/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -426,7 +426,8 @@
+ #   motd - displayed on connect and when a user executes /MOTD
+ #   rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
++<files motd="/etc/inspircd/motd.txt.example"
++       rules="/etc/inspircd/rules.txt.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -472,7 +473,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -953,7 +954,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/examples/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+ 
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -965,10 +966,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/examples/modules/unrealircd.conf.example">
++#<include file="/etc/inspircd/modules/unrealircd.conf.example">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/examples/modules/charybdis.conf.example">
++#<include file="/etc/inspircd/modules/charybdis.conf.example">
+ 
+ 
+ #########################################################################
+diff -Nuar a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk	2014-04-06 16:28:11.000000000 +0200
++++ b/make/template/main.mk	2014-05-15 14:31:36.029914669 +0200
+@@ -34,7 +34,7 @@
+ SYSTEM = @SYSTEM@
+ BUILDPATH = @BUILD_DIR@
+ SOCKETENGINE = @SOCKETENGINE@
+-CXXFLAGS = -pipe -fPIC -DPIC
++MYCXXFLAGS = -pipe -fPIC -DPIC
+ LDLIBS = -pthread -lstdc++
+ LDFLAGS = 
+ CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
+@@ -51,9 +51,9 @@
+ INSTMODE_LIB = 0644
+ 
+ @IFEQ $(CC) icc
+-  CXXFLAGS += -Wshadow
++  MYCXXFLAGS += -Wshadow
+ @ELSE
+-  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
++  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
+ @ENDIF
+ 
+ 
+@@ -75,41 +75,41 @@
+ 	INSTALL = ginstall
+ @ENDIF
+ @IFEQ $(SYSTEM) darwin
+-  CXXFLAGS += -DDARWIN -frtti
++  MYCXXFLAGS += -DDARWIN -frtti
+   LDLIBS += -ldl
+   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
+   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
+ @ENDIF
+ @IFEQ $(SYSTEM) interix
+-  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
++  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+ 
+-@IFNDEF D
+-  D=0
++@IFNDEF DEBUGLEVEL
++  DEBUGLEVEL=0
+ @ENDIF
+ 
+ DBGOK=0
+-@IFEQ $(D) 0
+-  CXXFLAGS += -O2
++@IFEQ $(DEBUGLEVEL) 0
++  MYCXXFLAGS += -O2
+ @IFEQ $(CC) gcc
+-    CXXFLAGS += -g1
++    MYCXXFLAGS += -g1
+ @ENDIF
+   HEADER = std-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
+-  CXXFLAGS += -O0 -g3 -Werror
++@IFEQ $(DEBUGLEVEL) 1
++  MYCXXFLAGS += -O0 -g3 -Werror
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
+-  CXXFLAGS += -O2 -g3
++@IFEQ $(DEBUGLEVEL) 2
++  MYCXXFLAGS += -O2 -g3
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+ FOOTER = finishmessage
+ 
+-CXXFLAGS += -Iinclude
++MYCXXFLAGS += -Iinclude
+ 
+ @GNU_ONLY MAKEFLAGS += --no-print-directory
+ 
+@@ -128,10 +128,11 @@
+ @ENDIF
+ 
+ @IFDEF PURE_STATIC
+-  CXXFLAGS += -DPURE_STATIC
++  MYCXXFLAGS += -DPURE_STATIC
+ @ENDIF
+ 
+-@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
++MYCXXFLAGS += $(CXXFLAGS)
++@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
+ @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
+ 
+ # Default target
+@@ -144,10 +145,10 @@
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+@@ -222,8 +223,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)
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+-	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ 	@-$(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 @@
+ @ENDIF
+ 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+-	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
+@@ -246,7 +247,7 @@
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)
+ 
+ @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-04-06 16:28:11.000000000 +0200
++++ b/make/unit-cc.pl	2014-05-15 14:31:58.389914544 +0200
+@@ -97,7 +97,7 @@
+ 	my $libs = '';
+ 	my $binary = $ENV{RUNCC};
+ 	if ($do_compile) {
+-		$flags = $ENV{CXXFLAGS};
++		$flags = $ENV{MYCXXFLAGS};
+ 		$flags =~ s/ -pedantic// if nopedantic($file);
+ 		$flags .= ' ' . getcompilerflags($file);
+ 
diff --git a/net-irc/inspircd/files/inspircd-2.0.16-init b/net-irc/inspircd/files/inspircd-2.0.16-init
new file mode 100644
index 000000000000..20159e04bfec
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.16-init
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.16-init,v 1.1 2014/05/15 15:45:35 nimiux Exp $
+
+extra_commands="rehash version"
+
+depend() {
+	need net
+	provide ircd
+}
+
+start() {
+	ebegin "Starting InspIRCd"
+	checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd
+	start-stop-daemon --start --quiet --user inspircd \
+		--exec /usr/bin/inspircd -- \
+		--config /etc/inspircd/inspircd.conf \
+		--logfile /var/log/inspircd/ircd.log
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping InspIRCd"
+	start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
+	eend $?
+}
+
+rehash() {
+	ebegin "Rehashing InspIRCd"
+	/usr/lib/inspircd/inspircd.launcher/inspircd rehash
+	eend $?
+}
+
+version() {
+	ebegin "Retrieve InspIRCd version"
+	/usr/lib/inspircd/inspircd.launcher/inspircd version
+	eend $?
+}
diff --git a/net-irc/inspircd/inspircd-2.0.16.ebuild b/net-irc/inspircd/inspircd-2.0.16.ebuild
new file mode 100644
index 000000000000..381614312179
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.16.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.16.ebuild,v 1.1 2014/05/15 15:45:35 nimiux Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs user
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://inspircd.github.com/"
+SRC_URI="http://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
+
+RDEPEND="
+	dev-lang/perl
+	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 )
+	pcre? ( dev-libs/libpcre )
+	sqlite? ( >=dev-db/sqlite-3.0 )
+	tre? ( dev-libs/tre )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+
+	epatch "${FILESDIR}/${P}-fix-path-builds.patch"
+}
+
+src_configure() {
+	local extras=""
+	local essl="--enable-openssl"
+	local egnutls="--enable-gnutls"
+	local dipv6="--disable-ipv6"
+
+	use geoip && extras="${extras}m_geoip.cpp,"
+	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+	use ipv6 && dipv6=""
+	use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
+	use mysql && extras="${extras}m_mysql.cpp,"
+	use pcre && extras="${extras}m_regex_pcre.cpp,"
+	use posix && extras="${extras}m_regex_posix.cpp,"
+	use postgres && extras="${extras}m_pgsql.cpp,"
+	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+	use tre && extras="${extras}m_regex_tre.cpp,"
+
+	use !ssl && essl=""
+	use !gnutls && egnutls=""
+
+	if [ -n "${extras}" ]; then
+		./configure --disable-interactive --enable-extras=${extras}
+	fi
+
+	./configure \
+		--with-cc="$(tc-getCXX)" \
+		--disable-interactive \
+		--prefix="/usr/$(get_libdir)/${PN}" \
+		--config-dir="/etc/${PN}" \
+		--data-dir="/var/lib/${PN}/data" \
+		--log-dir="/var/log/${PN}" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		${essl} ${egnutls} ${dipv6} || die
+}
+
+src_compile() {
+	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTUID=${PN} \
+		BINPATH="${D}/usr/bin" \
+		BASE="${D}/usr/$(get_libdir)/${PN}/inspircd.launcher" \
+		MODPATH="${D}/usr/$(get_libdir)/${PN}/modules/" \
+		CONPATH="${D}/etc/${PN}" install
+
+	insinto "/usr/include/${PN}"
+	doins include/*
+
+	diropts -o"${PN}" -g"${PN}" -m0700
+	dodir "/var/lib/${PN}"
+	dodir "/var/lib/${PN}/data"
+
+	newinitd "${FILESDIR}/${P}-init" "${PN}"
+	keepdir "/var/log/${PN}"/
+}
+
+pkg_postinst() {
+	elog "Before starting ${PN} the first time, you should create"
+	elog "the /etc/${PN}/${PN}.conf file."
+	elog "You can find example configuration files under /etc/${PN}"
+	elog "Read the ${PN}.conf.example file carefully before "
+	elog "(re)starting the service."
+	elog
+}