jabberd14 with tunned path (more proper)

3 files changed, 25 insertions, 29 deletions

diff --git a/net-im/jabberd14/Manifest b/net-im/jabberd14/Manifest
index 3d37dba7..95b534ed 100644
--- a/net-im/jabberd14/Manifest
+++ b/net-im/jabberd14/Manifest
@@ -2,15 +2,19 @@ AUX 1.6.1.1-makefile-destdir-fix.patch 590 RMD160 d43dbc8fae4acd7fd8a1ed54ac2e55
 MD5 5fb2a4bfca3d62a4ff7a78cbdca84bc6 files/1.6.1.1-makefile-destdir-fix.patch 590
 RMD160 d43dbc8fae4acd7fd8a1ed54ac2e55253210e427 files/1.6.1.1-makefile-destdir-fix.patch 590
 SHA256 c966f047ef88308454d4796b1dce9929f2f80def159d8bc9b03eaba837c12897 files/1.6.1.1-makefile-destdir-fix.patch 590
+AUX jabberd14-1.6.1.1.init 452 RMD160 dc5d08ce5272f669a5208aaf0b5aa5acd8b039d2 SHA1 0afc2ccfb377c6150cde31258f17d92ccb4c246b SHA256 4aa3acfdb85e483ad823c32efc718e3dc7d31bf82571850f5194aca629a6a5a2
+MD5 fc51351ad90dcd29fb6f694ba2bc50e7 files/jabberd14-1.6.1.1.init 452
+RMD160 dc5d08ce5272f669a5208aaf0b5aa5acd8b039d2 files/jabberd14-1.6.1.1.init 452
+SHA256 4aa3acfdb85e483ad823c32efc718e3dc7d31bf82571850f5194aca629a6a5a2 files/jabberd14-1.6.1.1.init 452
 AUX jabberd14-1.6.1.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd14-1.6.1.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd14-1.6.1.init 554
 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd14-1.6.1.init 554
 DIST jabberd14-1.6.1.1.tar.gz 834112 RMD160 0d3df653b6362f8e580c59ae1b4c9c6467b0bee5 SHA1 8b7ba77c9e02e9de7125e898900ff0ba5d65986e SHA256 8bba7f8e8781a088679bdcf0e46348a29da45de3eec2421f73575c5a6b8ddc31
-EBUILD jabberd14-1.6.1.1.ebuild 2655 RMD160 0d40a21d73c41d64b5808837556c49917cc323ba SHA1 aba4fd83f3b553029751c7cf521f6c1bcab1c984 SHA256 9dfeacba3c7570db652b29f881dea92e061e42fa4a29ffc584bc11ffd84aeeef
-MD5 53d1f2daaf5c1d6bb849caebbc9ae9e7 jabberd14-1.6.1.1.ebuild 2655
-RMD160 0d40a21d73c41d64b5808837556c49917cc323ba jabberd14-1.6.1.1.ebuild 2655
-SHA256 9dfeacba3c7570db652b29f881dea92e061e42fa4a29ffc584bc11ffd84aeeef jabberd14-1.6.1.1.ebuild 2655
+EBUILD jabberd14-1.6.1.1.ebuild 2821 RMD160 83ed2dbf0e79aee335857cf242a9c5dbba5833b2 SHA1 3289423358015fb3cd24d66623858c89744e63c4 SHA256 139eecbe3bec86aad8d5122152c5f24122aa9d6b7be27a0252d60b21f8928601
+MD5 c25ba37b3a1ad1f05cda9a71965bd4ef jabberd14-1.6.1.1.ebuild 2821
+RMD160 83ed2dbf0e79aee335857cf242a9c5dbba5833b2 jabberd14-1.6.1.1.ebuild 2821
+SHA256 139eecbe3bec86aad8d5122152c5f24122aa9d6b7be27a0252d60b21f8928601 jabberd14-1.6.1.1.ebuild 2821
 MD5 8e3a35062353c5ccb7ae2c5b9d878807 files/digest-jabberd14-1.6.1.1 253
 RMD160 2fe6768e48ffa4580564a3e4ed3c1eba9c3c4a5f files/digest-jabberd14-1.6.1.1 253
 SHA256 e510dfa655a2be801d4537863761407cc28cb0b7b0698850119c37698bddca23 files/digest-jabberd14-1.6.1.1 253
diff --git a/net-im/jabberd14/files/jabberd14-1.6.1.init b/net-im/jabberd14/files/jabberd14-1.6.1.1.init
index a25ac84f..ceb7abb7 100644
--- a/net-im/jabberd14/files/jabberd14-1.6.1.init
+++ b/net-im/jabberd14/files/jabberd14-1.6.1.1.init
@@ -1,29 +1,24 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabberd-1.4.4.init,v 1.1 2006/09/27 22:31:36 nelchael Exp $
+# $Header: $
 
 depend() {
-
 	need net
 	provide jabber-server
-
 }
 
 start() {
-
 	ebegin "Starting Jabber Server"
 	start-stop-daemon --start \
 		-c jabber:jabber \
-		-x /usr/bin/jabberd -- -B -c /etc/jabber/jabberd.xml
+		-x /usr/bin/jabberd14 -- -B -c /etc/jabberd14/jabberd.xml
 	eend $?
-
 }
 
 stop() {
-
+	chown jabber:jabber -R /var/run/jabberd14
 	ebegin "Stopping Jabber Server"
-	start-stop-daemon --stop -x /usr/bin/jabberd
+	start-stop-daemon --stop -x /usr/bin/jabberd14
 	eend $?
-
 }
diff --git a/net-im/jabberd14/jabberd14-1.6.1.1.ebuild b/net-im/jabberd14/jabberd14-1.6.1.1.ebuild
index 7edf469b..259fe7d9 100644
--- a/net-im/jabberd14/jabberd14-1.6.1.1.ebuild
+++ b/net-im/jabberd14/jabberd14-1.6.1.1.ebuild
@@ -24,13 +24,11 @@ DEPEND=">=net-im/jabber-base-0.01
 	ssl? ( >=dev-libs/openssl-0.9.6i )"
 
 pkg_setup() {
-
 	if use ipv6; then
 		ewarn "Without full ipv6 support, jabberd will show the error:"
 		ewarn '   "mio unable to listen"'
 		ewarn "To fix this, emerge jabberd without the ipv6 USE flag."
 	fi
-
 }
 
 src_unpack() {
@@ -38,7 +36,6 @@ src_unpack() {
 }
 
 src_compile() {
-
 	unset LC_ALL LC_CTYPE
 
 	# Broken configure script - can't use "use_enable"
@@ -48,7 +45,7 @@ src_compile() {
 	use ssl   && myconf="${myconf} --enable-ssl"
 
 	econf \
-		--sysconfdir=/etc/jabber \
+		--sysconfdir=/etc/jabberd14 \
 		--datadir ${D}/usr/share \
 		${myconf} \
 		$(use_with mysql) \
@@ -57,32 +54,33 @@ src_compile() {
 
 	# Broken parallel build
 	emake -j1 || die "emake failed"
-
 }
 
 src_install() {
-
 	make DESTDIR="${D}" install || die "make install failed"
 
-	newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
+	mv "${D}"/usr/bin/jabberd{,14} || die
+
+	newinitd "${FILESDIR}"/${P}.init jabberd14 || die "newinitd failed"
 
 	# net-im/jabber-base provides needed directories
 	rm -rf "${D}/var"
-	mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
-	mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
+	mv "${D}/etc/jabberd14/jabber.xml" "${D}/etc/jabberd14/jabberd.xml" || die
+	mv "${D}/etc/jabberd14/jabber.xml.dist" "${D}/etc/jabberd14/jabberd.xml.dist" || die
 
 	sed -i \
-		-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
-		-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
-		-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
+		-e 's,/var/lib/spool/jabber,/var/spool/jabberd14,g' \
+		-e 's,/var/lib/log/jabber,/var/log/jabberd14,g' \
+		-e 's,/var/lib/run/jabberd,/var/run/jabberd14,g' \
 		-e 's,jabber.pid,jabberd14.pid,g' \
-		"${D}"/etc/jabber/jabberd.xml{,.dist} \
+		"${D}"/etc/jabberd14/jabberd.xml{,.dist} \
 		|| die "sed failed"
 
+	mkdir -p "${D}"/var/run/jabberd14 || die
+	chown jabber:jabber "${D}"/var/run/jabberd14
 }
 
 pkg_postinst() {
-
 	echo
 	einfo 'The various IM transports for jabber are now separate packages,'
 	einfo 'which you will need to install separately if you want them:'
@@ -96,8 +94,7 @@ pkg_postinst() {
 	ewarn 'updating the init.d script, or you will end with a "dead" server.'
 	echo
 	ewarn 'The configuration filename has changed:'
-	ewarn '   Configure your server in /etc/jabber/jabberd.xml'
+	ewarn '   Configure your server in /etc/jabberd14/jabberd.xml'
 	echo
 	ebeep
-
 }