Install init script as well

Package-Manager: portage-2.1.4_rc14

5 files changed, 21 insertions, 10 deletions

diff --git a/net-irc/charybdis/ChangeLog b/net-irc/charybdis/ChangeLog
index 27c71c8faddc..60546766d866 100644
--- a/net-irc/charybdis/ChangeLog
+++ b/net-irc/charybdis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/charybdis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.8 2008/01/08 14:24:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/ChangeLog,v 1.9 2008/01/08 21:17:01 jokey Exp $
+
+  08 Jan 2008; Markus Ullmann <jokey@gentoo.org> files/charybdis-ircd.initd,
+  charybdis-2.1.5.ebuild, charybdis-2.2.0.ebuild,
+  charybdis-2.2.1_pre20080108.ebuild:
+  Install init script as well
 
   08 Jan 2008; Markus Ullmann <jokey@gentoo.org> charybdis-2.2.0.ebuild,
   charybdis-2.2.1_pre20080108.ebuild:
diff --git a/net-irc/charybdis/charybdis-2.1.5.ebuild b/net-irc/charybdis/charybdis-2.1.5.ebuild
index 4b2d814914c8..af3618872e79 100644
--- a/net-irc/charybdis/charybdis-2.1.5.ebuild
+++ b/net-irc/charybdis/charybdis-2.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.1.5.ebuild,v 1.1 2007/09/06 13:46:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.1.5.ebuild,v 1.2 2008/01/08 21:17:01 jokey Exp $
 
 inherit eutils
 
@@ -44,5 +44,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newconfd "${FILESDIR}"/charybdis-ircd.confd charybdis-ircd
+	newinitd "${FILESDIR}"/charybdis-ircd.initd charybdis-ircd
 }
diff --git a/net-irc/charybdis/charybdis-2.2.0.ebuild b/net-irc/charybdis/charybdis-2.2.0.ebuild
index 4f99ef3ed8b6..6014de8cfe74 100644
--- a/net-irc/charybdis/charybdis-2.2.0.ebuild
+++ b/net-irc/charybdis/charybdis-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.0.ebuild,v 1.3 2008/01/08 14:24:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.0.ebuild,v 1.4 2008/01/08 21:17:01 jokey Exp $
 
 inherit eutils
 
@@ -45,5 +45,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newconfd "${FILESDIR}"/charybdis-ircd.confd charybdis-ircd
+	newinitd "${FILESDIR}"/charybdis-ircd.initd charybdis-ircd
 }
diff --git a/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild b/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
index ae30bbd599fc..a097f6ebb752 100644
--- a/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
+++ b/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild,v 1.2 2008/01/08 14:24:09 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/charybdis-2.2.1_pre20080108.ebuild,v 1.3 2008/01/08 21:17:01 jokey Exp $
 
 inherit eutils
 
@@ -45,5 +45,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newconfd "${FILESDIR}"/charybdis-ircd.confd charybdis-ircd
+	newinitd "${FILESDIR}"/charybdis-ircd.initd charybdis-ircd
 }
diff --git a/net-irc/charybdis/files/charybdis-ircd.initd b/net-irc/charybdis/files/charybdis-ircd.initd
index ae8daa7b5755..7e0b73482e7e 100644
--- a/net-irc/charybdis/files/charybdis-ircd.initd
+++ b/net-irc/charybdis/files/charybdis-ircd.initd
@@ -1,7 +1,7 @@
 #!/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/charybdis/files/charybdis-ircd.initd,v 1.1 2006/03/07 02:50:56 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/charybdis/files/charybdis-ircd.initd,v 1.2 2008/01/08 21:17:02 jokey Exp $
 
 depend() {
 	use net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting ircd-charybdis"
-	start-stop-daemon --start --quiet --chuid ${CHARYBDIS_USER} --exec /usr/bin/ircd-charybdis >/dev/null
+	start-stop-daemon --start --quiet --chuid ${CHARYBDIS_USER} --exec /usr/bin/ircd >/dev/null
 	eend $?
 }