net-irc/inspircd: Version bump to 2.0.3 wrt bug 327887. Updated maintainer info.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

6 files changed, 227 insertions, 6 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index ae38da018e3e..f6cca1f41caa 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/inspircd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.31 2010/11/05 11:37:38 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.32 2011/04/26 14:22:31 c1pher Exp $
+
+*inspircd-2.0.3 (26 Apr 2011)
+
+  26 Apr 2011; Dane Smith <c1pher@gentoo.org> +inspircd-2.0.3.ebuild,
+  +files/inspircd-2.0.3-fix-config.patch, +files/inspircd-2.0.3-init.d,
+  metadata.xml:
+  Version bump to 2.0.3 wrt bug 327887. Updated maintainer info to reflect
+  new maintainers / proxies. New patches for 2.0.3. Thanks Chema Alonso
+  for the work on the ebuild.
 
 *inspircd-1.2.8 (05 Nov 2010)
 
diff --git a/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch b/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch
new file mode 100644
index 000000000000..5ca12fa4d56f
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.3-fix-config.patch
@@ -0,0 +1,58 @@
+diff -Nur a/docs/inspircd.conf.example b/docs/inspircd.conf.example
+--- a/docs/inspircd.conf.example	2011-02-02 03:25:41.000000000 +0100
++++ b/docs/inspircd.conf.example	2011-04-06 22:30:03.591000071 +0200
+@@ -402,11 +402,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/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/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -416,7 +416,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/inspircd.motd.example" rules="conf/inspircd.rules.example">
++<files motd="/etc/inspircd/inspircd.motd.example"
++       rules="/etc/inspircd/inspircd.rules.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -462,7 +463,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -908,7 +909,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/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
+@@ -920,10 +921,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/modules/modules.conf.unreal">
++#<include file="/etc/inspircd/modules/modules.conf.unreal">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/modules/modules.conf.charybdis">
++#<include file="/etc/inspircd/modules/modules.conf.charybdis">
+ 
+ 
+ #########################################################################
diff --git a/net-irc/inspircd/files/inspircd-2.0.3-init.d b/net-irc/inspircd/files/inspircd-2.0.3-init.d
new file mode 100644
index 000000000000..75eb54b8e088
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.3-init.d
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.3-init.d,v 1.1 2011/04/26 14:22:31 c1pher Exp $
+
+opts="${opts} rehash"
+
+depend() {
+	need net
+	provide ircd
+}
+
+start() {
+	ebegin "Starting InspIRCd"
+	start-stop-daemon --start --quiet --chuid inspircd \
+		--exec /usr/bin/inspircd -- \
+		--config /etc/inspircd/inspircd.conf \
+		--logfile /var/log/inspircd/ircd.log &> /dev/null
+	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 &> /dev/null
+	eend $?
+}
diff --git a/net-irc/inspircd/inspircd-1.2.8.ebuild b/net-irc/inspircd/inspircd-1.2.8.ebuild
index e04acc39bcbe..c448404bece0 100644
--- a/net-irc/inspircd/inspircd-1.2.8.ebuild
+++ b/net-irc/inspircd/inspircd-1.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.2.8.ebuild,v 1.1 2010/11/05 11:37:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.2.8.ebuild,v 1.2 2011/04/26 14:22:31 c1pher Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs multilib
diff --git a/net-irc/inspircd/inspircd-2.0.3.ebuild b/net-irc/inspircd/inspircd-2.0.3.ebuild
new file mode 100644
index 000000000000..00975e621214
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.3.ebuild,v 1.1 2011/04/26 14:22:31 c1pher Exp $
+
+EAPI=2
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://www.inspircd.org/"
+SRC_URI="http://www.inspircd.org/downloads/InspIRCd-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="openssl gnutls ipv6 mysql postgres sqlite ldap"
+
+RDEPEND="
+	dev-lang/perl
+	openssl? ( dev-libs/openssl )
+	gnutls? ( net-libs/gnutls )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )
+	sqlite? ( >=dev-db/sqlite-3.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/inspircd"
+
+pkg_setup() {
+	enewgroup inspircd
+	enewuser inspircd -1 -1 -1 inspircd
+}
+
+src_prepare() {
+	# The makefile template defines variables (D and T) used by the
+	# ebuild system. Changing them to safe names.
+	local makefiletpl="${S}/make/template/main.mk"
+
+	sed -i 's/IFNDEF D/IFNDEF DEBUGLEVEL/' ${makefiletpl} || die "sed failed"
+	sed -i 's/IFDEF T/IFDEF TGT/' ${makefiletpl} || die "sed failed"
+	sed -i 's/D=0/DEBUGLEVEL=0/' ${makefiletpl} || die "sed failed"
+	sed -i 's/\$(D)/\$(DEBUGLEVEL)/' ${makefiletpl} || die "sed failed"
+	sed -i 's/\$(T)/\$(TGT)/' ${makefiletpl} || die "sed failed"
+
+	epatch "${FILESDIR}"/${P}-fix-config.patch
+}
+
+src_configure() {
+	local extras=""
+	local dipv6="--disable-ipv6"
+
+	use openssl && extras="${extras}m_ssl_openssl.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 ipv6 && dipv6=""
+
+	# allow inspircd to be built by root
+	touch .force-root-ok || die
+
+	[ ${extras} ] && ./configure --disable-interactive \
+	                             --enable-extras=${extras} \
+	              || die "configure failed"
+
+	./configure \
+		$(use_enable openssl) \
+		$(use_enable gnutls) \
+	    --disable-interactive \
+		--prefix="/usr/$(get_libdir)/inspircd" \
+		--config-dir="/etc/inspircd" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/inspircd/modules" \
+		${dipv6} || die "configure failed"
+}
+
+src_compile() {
+	append-flags -Iinclude -fPIC
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake INSTUID=inspircd \
+		BINPATH="${D}/usr/bin" \
+		BASE="${D}/usr/$(get_libdir)/inspircd/inspircd.launcher" \
+		MODPATH="${D}/usr/$(get_libdir)/inspircd/modules/" \
+		CONPATH="${D}/etc/inspircd" install || die "emake install failed"
+
+	insinto /etc/inspircd/modules
+	doins docs/modules/* || die "Installing inspircd modules failed"
+
+	insinto /etc/inspircd/aliases
+	doins docs/aliases/* || die "Installing inspircd aliases failed"
+
+	insinto /usr/include/inspircd/
+	doins include/* || die "Installing inspircd include files failed"
+
+	diropts -oinspircd -ginspircd
+	dodir "/var/run/inspircd" || die "Creating run directory failed"
+
+	newinitd "${FILESDIR}"/${P}-init.d inspircd \
+	         || die "Installing inspircd init script failed"
+	keepdir "/var/log/inspircd/"
+}
+
+pkg_postinst() {
+	elog "Before starting inspircd the first time you should create"
+	elog "the /etc/inspircd/inspircd.conf file."
+	elog "You can find an expample configuration files under /etc/inspircd."
+	elog "Read the inspircd.conf.example file carefully before starting "
+	elog "the service."
+	elog
+}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index f7411f7957c3..4b80d93859f0 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -3,8 +3,15 @@
 <pkgmetadata>
     <herd>no-herd</herd>
     <maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-    </maintainer>
+		<email>nimiux@gentoo.org</email>
+		<name>Chema Alonso</name>
+		<description>Proxy-Maintainer. Assign him the bugs.</description>
+	</maintainer>
+	<maintainer>
+		<email>c1pher@gentoo.org</email>
+		<name>Dane Smith</name>
+		<description>Proxy. CC on bugs</description>
+	</maintainer>
     <maintainer>
         <email>brain@brainbox.cc</email>
 		<name>Craig Edwards</name>