Update init.d script from bug 194654. Bump version according to bug 198317.

Package-Manager: portage-2.1.3.19

5 files changed, 138 insertions, 16 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 2ef2205867a2..e25bb22eb840 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.18 2007/10/05 20:29:07 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.19 2007/11/12 21:47:32 hansmi Exp $
+
+*inspircd-1.1.14 (12 Nov 2007)
+
+  12 Nov 2007; Michael Hanselmann <hansmi@gentoo.org> files/init.d_inspircd,
+  +inspircd-1.1.14.ebuild:
+  Update init.d script from bug 194654. Bump version according to bug 198317
+  with a patch from Eugene Janusov:
+  - toolchain-funcs has been removed from inherit, because not used. Not sure
+    about multilib, leaving it
+  - IUSE moved behind KEYWORDS as in docs and skel.ebuild
+  - svn isn't actually used, so all svn stuff removed
+  - trailing slash added to HOMEPAGE
+  - SRC_URI now points to the official site, because there is no new version on
+    SourceForge
+  - --disable-interactive option added for ./configure
+  - src_compile() partly rewritten and gracefully reformatted
+  - all references to the name of the package replaced with ${PN}
 
 *inspircd-1.1.13-r1 (05 Oct 2007)
 
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index d5b6ad4da979..148a14a7f36f 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,10 +1,11 @@
-AUX init.d_inspircd 720 RMD160 1cefc47b2c1a693636604b0d4ec60171143af970 SHA1 f4f0166300ccab03417322f7cc4608f298cdca21 SHA256 3972344bfd7cd112f4ca6b405592e8b4df163f062ddf586011a6cb9c1ee608c7
-MD5 efbb24f3e73264838f068ce7cdd66673 files/init.d_inspircd 720
-RMD160 1cefc47b2c1a693636604b0d4ec60171143af970 files/init.d_inspircd 720
-SHA256 3972344bfd7cd112f4ca6b405592e8b4df163f062ddf586011a6cb9c1ee608c7 files/init.d_inspircd 720
+AUX init.d_inspircd 835 RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 SHA1 83d5e24da808993f264481945c2c37911853b6d4 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780
+MD5 2a7713a4f316a31b5b2a083fc85a9165 files/init.d_inspircd 835
+RMD160 df90290dbbf1aba7e9b24cc8467798b20c571899 files/init.d_inspircd 835
+SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780 files/init.d_inspircd 835
 DIST InspIRCd-1.0.7.tar.bz2 337187 RMD160 a7387cf88f08f0e9487d25db79d88cde9e9c8283 SHA1 5c8a35b11928c6ad85d905b1bc34de096aa2cf11 SHA256 0ce029e92a0a1713de1d0665d1143295a054a8d925fa724795d709493a8b8d7f
 DIST InspIRCd-1.1.12.tar.bz2 501185 RMD160 eabaa1dc351c71978e6b5a0548fad3b17f888ede SHA1 d9128ea358fd385d92c37e039ac9d2ae80da99d1 SHA256 a904613bfe4efce901dc25a20960258322d652724ece58a45f6a6afaf6f3ca9f
 DIST InspIRCd-1.1.13.tar.bz2 502275 RMD160 a7fd87f2e5a9a7942c9f425180430b6bd9273a51 SHA1 ae3fc3ee13671a068d6085f7ff852e368bbbe568 SHA256 ab79fd03fd588e3820d70ede7339d8646ff35676f1c70266be252df7315e8e26
+DIST InspIRCd-1.1.14.tar.bz2 504766 RMD160 ee48f16b0360ef2ae397d8eb5a5c36027f47cc4d SHA1 a85bbdf5ef11ae44de69eb4df4cacc39a52e7a9e SHA256 de7c3fcf15bcab3a3bd9e41233854322022cdd1e0207fdd0f26d7e608209cf39
 EBUILD inspircd-1.0.7-r1.ebuild 3169 RMD160 fb15af7b8a61ba76ad2c767553dc644e0d2671ed SHA1 00271b5391f101caa04c4ee9870f2db10c6bc8f5 SHA256 5c5d69907141f0a8b96acda7a2f45b6a3bbba3a6735efc10e0c7b906010b31f5
 MD5 116b3e453a558a4cee00af046538f865 inspircd-1.0.7-r1.ebuild 3169
 RMD160 fb15af7b8a61ba76ad2c767553dc644e0d2671ed inspircd-1.0.7-r1.ebuild 3169
@@ -21,10 +22,14 @@ EBUILD inspircd-1.1.13.ebuild 2423 RMD160 c3c918a8821ed4da9043fa86ee430056ee0246
 MD5 63a2b0059ef39cf6d68452ed50c48277 inspircd-1.1.13.ebuild 2423
 RMD160 c3c918a8821ed4da9043fa86ee430056ee02469b inspircd-1.1.13.ebuild 2423
 SHA256 0ee0c39bd89eeaedf33c2f7839604db10aff0c1974c1c3b2bb907e4758b1250c inspircd-1.1.13.ebuild 2423
-MISC ChangeLog 2972 RMD160 5818c6a44acd8db9e264c4f7ac57b0b18137f909 SHA1 3bb9833aecb4e7850a6eb64f91af5934c5ca0001 SHA256 beac9b7f52df1f3b434a091f8834c7fb169897fd5a15f0ca21c4502fde554062
-MD5 fb9c348cc055367bdfbf169326601703 ChangeLog 2972
-RMD160 5818c6a44acd8db9e264c4f7ac57b0b18137f909 ChangeLog 2972
-SHA256 beac9b7f52df1f3b434a091f8834c7fb169897fd5a15f0ca21c4502fde554062 ChangeLog 2972
+EBUILD inspircd-1.1.14.ebuild 2411 RMD160 ef780d64c9c7d86a96a18903c9cd3d0e857fc195 SHA1 bc78c7d7b302c9fd4eee6b924c9dcb2f4b536007 SHA256 bcc42a4f593940f5853f65e7128471f9decda576a5318c8659b68e4db2483015
+MD5 b09caf4fd4b0a57fbf3dcfee3e2f5f85 inspircd-1.1.14.ebuild 2411
+RMD160 ef780d64c9c7d86a96a18903c9cd3d0e857fc195 inspircd-1.1.14.ebuild 2411
+SHA256 bcc42a4f593940f5853f65e7128471f9decda576a5318c8659b68e4db2483015 inspircd-1.1.14.ebuild 2411
+MISC ChangeLog 3759 RMD160 1c534a5e13a48fb169155ae627fdfe32f822bb23 SHA1 6d46aa831e3b94a7cf751cceb44cf56b4b4bd90d SHA256 89d8c9d3590e80d7231ea1533a944e7746234c72000a24e0fe1bc6bccc2faf33
+MD5 a944efd0434f5c8b9db242f14fdcb195 ChangeLog 3759
+RMD160 1c534a5e13a48fb169155ae627fdfe32f822bb23 ChangeLog 3759
+SHA256 89d8c9d3590e80d7231ea1533a944e7746234c72000a24e0fe1bc6bccc2faf33 ChangeLog 3759
 MISC metadata.xml 348 RMD160 24840ca8f3f64afe243a80d7523d76e7b2772c49 SHA1 b9354f3b162951f027637c55987e8145e5982213 SHA256 29e42121dbb3cd41656c12a37a4a28312ee5732c72d645abf0db5d19363d460c
 MD5 0adacff1bab88932bca3db730b43308a metadata.xml 348
 RMD160 24840ca8f3f64afe243a80d7523d76e7b2772c49 metadata.xml 348
@@ -41,3 +46,6 @@ SHA256 b35b9685b82ad6db3452f31cb51776ce72818ad28e5729ebff9e5e85e799079a files/di
 MD5 d0eb234143ec651eeefede31871599ea files/digest-inspircd-1.1.13-r1 250
 RMD160 240ae9e54304b72f8040dbc824d70d7117c5dd3e files/digest-inspircd-1.1.13-r1 250
 SHA256 b35b9685b82ad6db3452f31cb51776ce72818ad28e5729ebff9e5e85e799079a files/digest-inspircd-1.1.13-r1 250
+MD5 233d4b97c844cf41ecba8f893562bc89 files/digest-inspircd-1.1.14 250
+RMD160 f827384d5273e6594e92fa78a5f0eb69b6cdba72 files/digest-inspircd-1.1.14 250
+SHA256 f4e4d7eeb86de537a2100550f7f0fb710601094b7860712db6b0e7485755cc6a files/digest-inspircd-1.1.14 250
diff --git a/net-irc/inspircd/files/digest-inspircd-1.1.14 b/net-irc/inspircd/files/digest-inspircd-1.1.14
new file mode 100644
index 000000000000..2857a38d1b1b
--- /dev/null
+++ b/net-irc/inspircd/files/digest-inspircd-1.1.14
@@ -0,0 +1,3 @@
+MD5 61c438533bd023c18599991d34ba3697 InspIRCd-1.1.14.tar.bz2 504766
+RMD160 ee48f16b0360ef2ae397d8eb5a5c36027f47cc4d InspIRCd-1.1.14.tar.bz2 504766
+SHA256 de7c3fcf15bcab3a3bd9e41233854322022cdd1e0207fdd0f26d7e608209cf39 InspIRCd-1.1.14.tar.bz2 504766
diff --git a/net-irc/inspircd/files/init.d_inspircd b/net-irc/inspircd/files/init.d_inspircd
index e7c022d921b8..6a1844a8125a 100644
--- a/net-irc/inspircd/files/init.d_inspircd
+++ b/net-irc/inspircd/files/init.d_inspircd
@@ -1,31 +1,37 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/init.d_inspircd,v 1.3 2007/07/11 08:10:47 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/init.d_inspircd,v 1.4 2007/11/12 21:47:33 hansmi Exp $
 
-opts="${opts} rehash"
+opts="${opts} rehash version"
 
 depend() {
 	need net
-    provide ircd
+	provide ircd
 }
 
 start() {
 	ebegin "Starting InspIRCd"
 	start-stop-daemon --start --quiet --chuid inspircd \
-        --exec /usr/bin/inspircd -- \
-        --logfile /var/log/inspircd/ircd.log &>/dev/null
+		--exec /usr/bin/inspircd -- \
+		--logfile /var/log/inspircd/ircd.log &> /dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping InspIRCd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/inspircd/ircd.pid
+	start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
 	eend $?
 }
 
 rehash() {
 	ebegin "Rehashing InspIRCd"
-	kill -s SIGHUP $(</var/run/inspircd/ircd.pid)
+	/usr/lib/inspircd/inspircd.launcher/inspircd rehash &> /dev/null
+	eend $?
+}
+
+version() {
+	ebegin "Retrieve InspIRCd version"
+	/usr/lib/inspircd/inspircd.launcher/inspircd version
 	eend $?
 }
diff --git a/net-irc/inspircd/inspircd-1.1.14.ebuild b/net-irc/inspircd/inspircd-1.1.14.ebuild
new file mode 100644
index 000000000000..0dde2843be35
--- /dev/null
+++ b/net-irc/inspircd/inspircd-1.1.14.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-1.1.14.ebuild,v 1.1 2007/11/12 21:47:32 hansmi Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="InspIRCd - The Modular C++ IRC Daemon"
+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="gnutls ipv6 openssl kernel_linux"
+
+DEPEND="
+	>=sys-devel/gcc-3.3.0
+	>=dev-lang/perl-5.8
+	openssl? ( >=dev-libs/openssl-0.9.7d )
+	gnutls? ( >=net-libs/gnutls-1.3.0 )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	ebegin "Creating inspircd user and group"
+	enewgroup inspircd
+	enewuser inspircd -1 -1 -1 inspircd
+	eend ${?}
+}
+
+src_compile() {
+	local myconf="
+		--disable-interactive
+		--enable-epoll"
+
+	# ./configure doesn't know --disable-gnutls, -ipv6 and -openssl options,
+	# so should be used only --enable-like.
+	use gnutls  && myconf="${myconf} $(use_enable gnutls)"
+	use ipv6    && myconf="${myconf} $(use_enable ipv6) --enable-remote-ipv6"
+	use openssl && myconf="${myconf} $(use_enable openssl)"
+
+	./configure \
+		--prefix="/usr" \
+		--binary-dir="/usr/bin" \
+		--config-dir="/etc/${PN}" \
+		--library-dir="/usr/$(get_libdir)/${PN}" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		${myconf} || die "configure failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# the inspircd buildsystem does not create these, it's configure script
+	# does. so, we have to at this point to make sure they are there.
+	dodir /etc/${PN}
+	dodir /usr/include/${PN}
+	dodir /usr/$(get_libdir)/${PN}
+	dodir /usr/$(get_libdir)/${PN}/modules
+	dodir /var/log/${PN}
+
+	emake install \
+		BASE="${D}"/usr/$(get_libdir)/${PN}/inspircd.launcher \
+		BINPATH="${D}"/usr/bin \
+		CONPATH="${D}"/etc/${PN} \
+		LIBPATH="${D}"/usr/$(get_libdir)/${PN}/ \
+		MODPATH="${D}"/usr/$(get_libdir)/${PN}/modules/ \
+
+	insinto /usr/include/inspircd/
+	doins "${S}"/include/*
+
+	newinitd "${FILESDIR}"/init.d_inspircd inspircd
+}
+
+pkg_postinst() {
+	chown -R inspircd:inspircd "${ROOT}"/etc/${PN}
+	chmod 700 "${ROOT}"/etc/${PN}
+
+	chown -R inspircd:inspircd "${ROOT}"/var/log/${PN}
+	chmod 750 "${ROOT}"/var/log/${PN}
+
+	chown -R inspircd:inspircd "${ROOT}"/usr/$(get_libdir)/${PN}
+	chmod -R 755 "${ROOT}"/usr/$(get_libdir)/${PN}
+
+	chmod -R 755 "${ROOT}"/usr/bin/inspircd
+}