[gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/files/, net-irc/inspircd/

[Michał Górny]

commit:     3c88a4bf30a966da6a351ce485b1f20c261295d5
Author:     Wade Cline <wadecline <AT> hotmail <DOT> com>
AuthorDate: Wed Sep 19 03:39:55 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 20:07:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c88a4bf

net-irc/inspircd: Remove old version

Signed-off-by: Wade Cline <wadecline <AT> hotmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-irc/inspircd/Manifest                          |   1 -
 .../files/inspircd-2.0.23-fix-path-builds.patch    | 253 ---------------------
 net-irc/inspircd/files/inspircd-r2.initd           |  48 ----
 net-irc/inspircd/files/inspircd-r3.confd           |  33 ---
 net-irc/inspircd/files/inspircd.confd              |   5 -
 .../files/{inspircd-r3.initd => inspircd.initd}    |   0
 net-irc/inspircd/inspircd-2.0.23.ebuild            | 106 ---------
 net-irc/inspircd/inspircd-2.0.25.ebuild            |   4 +-
 net-irc/inspircd/inspircd-2.0.26.ebuild            |   4 +-
 9 files changed, 4 insertions(+), 450 deletions(-)

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index c2631dcf58b..9204c385742 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,2 @@
-DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 DIST inspircd-2.0.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a

diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
deleted file mode 100644
index debf62a15f5..00000000000
--- a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- 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.
- # 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/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
---- a/docs/conf/modules.conf.example    2016-02-28 17:38:30.492335461 -0600
-+++ b/docs/conf/modules.conf.example    2016-02-28 17:39:20.068559846 -0600
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also:                                 #
- # http://wiki.inspircd.org/Modules/censor                             #
- #
--#<include file="conf/examples/censor.conf.example">
-+#<include file="/etc/inspircd/censor.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
-@@ -778,7 +778,7 @@
- # specify below the path to the filter.conf file, or define some      #
- # <filter> tags.                                                      #
- #                                                                     #
--#<include file="conf/examples/filter.conf.example">
-+#<include file="/etc/inspircd/filter.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Gecos ban: Implements extended ban 'r', which stops anyone matching
-@@ -834,7 +834,7 @@
- #                                                                     #
- # If you specify to use the m_helpop.so module, then specify below    #
- # the path to the helpop.conf file.                                   #
--#<include file="conf/examples/inspircd.helpop-full.example">
-+#<include file="/etc/inspircd/inspircd.helpop-full.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1284,7 +1284,7 @@
- #                 Read the comment above <connect:allowmotdcolors> in #
- #                 inspircd.conf.example for details.                  #
- #                                                                     #
--#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
-+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Override module: Adds support for oper override.
-diff -Nuar a/make/template/main.mk b/make/template/main.mk
---- 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@
- 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) icpc
--  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,46 +75,46 @@
- 	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
- 
- GCC6=@GCC6@
- @IFEQ $(GCC6) true
--  CXXFLAGS += -fno-delete-null-pointer-checks
-+  MYCXXFLAGS += -fno-delete-null-pointer-checks
- @ENDIF
- 
- DBGOK=0
--@IFEQ $(D) 0
--  CXXFLAGS += -O2
-+@IFEQ $(DEBUGLEVEL) 0
-+  MYCXXFLAGS += -O2
- @IFEQ $(CC) g++
--    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
- 
-@@ -134,10 +134,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
-@@ -150,10 +151,10 @@
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -228,8 +229,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
-@@ -237,9 +238,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!          *"
-@@ -252,7 +253,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	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) {
--		$flags = $ENV{CXXFLAGS};
-+		$flags = $ENV{MYCXXFLAGS};
- 		$flags =~ s/ -pedantic// if nopedantic($file);
- 		$flags .= ' ' . getcompilerflags($file);
- 

diff --git a/net-irc/inspircd/files/inspircd-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd
deleted file mode 100644
index 653e501627e..00000000000
--- a/net-irc/inspircd/files/inspircd-r2.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"}
-INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"}
-INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"}
-INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"}
-INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"}
-INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"}
-INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"}
-INSPIRCD_OPTS=${INSPIRCD_OPTS:-""}
-
-command="/usr/bin/inspircd"
-command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\""
-start_stop_daemon_args="${INSPIRCD_SSDARGS}"
-pidfile="${INSPIRCD_PIDFILE}"
-retry="${INSPIRCD_TERMTIMEOUT}"
-
-required_files="${INSPIRCD_CONFIGFILE}"
-
-name="InspIRCd"
-
-description="InspIRCd is a modular Internet Relay Chat (IRC) server."
-
-extra_commands="version"
-extra_started_commands="rehash"
-
-depend() {
-	use dns
-	provide ircd
-}
-
-start_pre() {
-	checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")"
-}
-
-rehash() {
-	ebegin "Rehashing InspIRCd"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
-
-version() {
-	ebegin "Retrieve InspIRCd version"
-	${command} --version
-	eend $?
-}

diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd
deleted file mode 100644
index af9b3fe15e2..00000000000
--- a/net-irc/inspircd/files/inspircd-r3.confd
+++ /dev/null
@@ -1,33 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-# Location of configuration file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
-
-# File used to store the PID file. Usually you won't need to touch it.
-# If you are changing PID file do not forget to set new PID file in
-# INSPIRCD_CONFIGFILE as well.
-#
-#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid"
-
-# User to run InspIRCd as
-#
-#INSPIRCD_USER="inspircd"
-#INSPIRCD_GROUP="inspircd"
-
-# You can use this configuration option to pass additional options to the
-# start-stop-daemon, see start-stop-daemon(8) for more details.
-# Per default we start InspIRCd without any output (quiet)
-# as user $INSPIRCD_USER and wait 1000ms after we have started the service
-# to ensure that the daemon is really up and running.
-#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000"
-
-# The termination timeout (start-stop-daemon parameter "retry") ensures
-# that the service will be terminated within a given time (25 + 5 seconds
-# per default) when you are stopping the service.
-#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5"
-
-# Options to collectd
-# See `/usr/bin/inspircd --help` for more details
-#INSPIRCD_OPTS=""

diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd
index 1291f9fd552..af9b3fe15e2 100644
--- a/net-irc/inspircd/files/inspircd.confd
+++ b/net-irc/inspircd/files/inspircd.confd
@@ -5,11 +5,6 @@
 #
 #INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf"
 
-# Location of log file. Modify if you don't like the standard
-# one.
-#
-#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log"
-
 # File used to store the PID file. Usually you won't need to touch it.
 # If you are changing PID file do not forget to set new PID file in
 # INSPIRCD_CONFIGFILE as well.

diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd.initd
similarity index 100%
rename from net-irc/inspircd/files/inspircd-r3.initd
rename to net-irc/inspircd/files/inspircd.initd

diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild
deleted file mode 100644
index 78dbcfc2928..00000000000
--- a/net-irc/inspircd/inspircd-2.0.23.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 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:= )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.23-fix-path-builds.patch )
-
-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
-
-	default_src_prepare
-}
-
-src_configure() {
-	local extras=""
-
-	use geoip && extras="${extras}m_geoip.cpp,"
-	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
-	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,"
-
-	if [[ -n "${extras}" ]]; then
-		econf --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	econf \
-		--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" \
-		$(usex ipv6 '' '--disable-ipv6') \
-		$(usex gnutls '--enable-gnutls' '') \
-		$(usex ssl '--enable-openssl' '')
-}
-
-src_compile() {
-	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake INSTUID=${PN} DESTDIR="${D%/}" install
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	dodir "/var/lib/${PN}"
-	dodir "/var/lib/${PN}/data"
-
-	newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		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
-	fi
-}

diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 746628c56e7..9d65d96de88 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.ebuild
@@ -90,8 +90,8 @@ src_install() {
 	dodir "/var/lib/${PN}"
 	dodir "/var/lib/${PN}/data"
 
-	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir "/var/log/${PN}"
 

diff --git a/net-irc/inspircd/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild
index ead8598ef2c..9d97ed21f3a 100644
--- a/net-irc/inspircd/inspircd-2.0.26.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.26.ebuild
@@ -89,8 +89,8 @@ src_install() {
 
 	einstalldocs
 
-	newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
 	keepdir "/var/log/${PN}"