net-im/tigase-server: Live ebuilds shouldn't have KEYWORDS. Added missing die statements.

svn path=/sunrise/; revision=8376

3 files changed, 20 insertions, 14 deletions

diff --git a/net-im/tigase-server/ChangeLog b/net-im/tigase-server/ChangeLog
index c2654b011..d0a98f371 100644
--- a/net-im/tigase-server/ChangeLog
+++ b/net-im/tigase-server/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for net-im/tigase-server
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Apr 2009; Christian Ruppert <idl0r@gentoo.org>
+  tigase-server-9999_pre4.ebuild:
+  Live ebuilds shouldn't have KEYWORDS. Added missing die statements.
+
   17 Nov 2008; Mads Randstoft (mazzachre) <mads_randstoft@yahoo.dk>
   -tigase-server-9999_pre3.ebuild, +tigase-server-9999_pre4.ebuild,
   files/conf_d_tigase, files/init_d_tigase, +files/logger.patch,
diff --git a/net-im/tigase-server/Manifest b/net-im/tigase-server/Manifest
index 504dc4077..cc447b640 100644
--- a/net-im/tigase-server/Manifest
+++ b/net-im/tigase-server/Manifest
@@ -4,6 +4,6 @@ AUX default_config.patch 2706 RMD160 2caee9d6603d9cd657fc5b772e0fcab2268db47e SH
 AUX init_d_tigase 1192 RMD160 96382bd5e70a7da70ff8d116848b996466a0e509 SHA1 78b370dacb4b167d10ed493378510105429f355a SHA256 0f4b9b9605bde169ec7c99f75fecf35b764bc3a1d2e41962ed317c5241e5f806
 AUX logger.patch 1660 RMD160 f6aaa2934c800da1390dd71ca99f340b7682d0dd SHA1 29adc4c13ba821be640aa06b022559307234ffb3 SHA256 dc510ca8b4f96a7228d14f9565011ab508b1beb02dca3b260debd1b3e1437495
 AUX tigase.properties 179 RMD160 b8bc56d2a89b371848a8a6cda105b24ea2e3a262 SHA1 05b315d981c810fc96efc526118c612f73356bfd SHA256 ea9319d9e5720a6478dcbc390723e90e669504783347040c8e00c5c7e7192e92
-EBUILD tigase-server-9999_pre4.ebuild 1927 RMD160 40847c4fd339c10a17f502a93fef5fd1f5c08f29 SHA1 09d6c1b9aafbbb931d49c5a1286565190d47321f SHA256 32767097ecb53c55b4bc7cb27fc036942595f7a470ebcc0bc6e8f62b8c1978b0
-MISC ChangeLog 973 RMD160 db4df67197bed9c042e70b9d390c9c7e8de90a72 SHA1 f9e5c42f64c6a496f874a7dc6db9f58cbb77f2f8 SHA256 3568166a5a7099e8b531906bf9c1f31ccf055ddebd92e4311ff53e5b336b4417
+EBUILD tigase-server-9999_pre4.ebuild 2014 RMD160 fac01c0700291e282f942b8f065c22b91db43183 SHA1 471857626ce611fb312d035bdb9b0096d3f5ae91 SHA256 1d8417a364d5139b8b21f4c18bedf448163d4a7c782f67cd9d1e8dff992a78cd
+MISC ChangeLog 1130 RMD160 b22a7a6acda3133c230bb9b4d984e8829eb50ce6 SHA1 1de1fe934b98c4e9f7fbaa765f9bfdbe5aedb28e SHA256 e61b3bc8bd5083f8a0a33a8eb67465ea6f1bb5ee547165e2fa82fc20ceceecbd
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-im/tigase-server/tigase-server-9999_pre4.ebuild b/net-im/tigase-server/tigase-server-9999_pre4.ebuild
index 1e661f1ab..d5d29d1f4 100644
--- a/net-im/tigase-server/tigase-server-9999_pre4.ebuild
+++ b/net-im/tigase-server/tigase-server-9999_pre4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 JAVA_PKG_IUSE="doc source"
 
-ESVN_REPO_URI="https://svn.tigase.org/reps/tigase-server/trunk"
+ESVN_REPO_URI="https://svn.tigase.org/reps/${PN}/trunk"
 
 inherit subversion java-pkg-2 eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.tigase.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND=">=dev-java/ant-1.7
@@ -35,7 +35,9 @@ src_unpack() {
 	#Edit classpaths for ant to fit gentoo way
 	epatch "${FILESDIR}/classpaths.patch"
 
-	sed -i -e "s:libs=libs:xmltoolsjar=$(java-pkg_getjar tigase-xmltools tigase-xmltools.jar)\nutilsjar=$(java-pkg_getjar tigase-utils tigase-utils.jar):" build.properties || die "Failed to patch build properties with correct jar locations"
+	sed -i -e "s:libs=libs:xmltoolsjar=$(java-pkg_getjar tigase-xmltools
+	tigase-xmltools.jar)\nutilsjar=$(java-pkg_getjar tigase-utils tigase-utils.jar):" \
+		build.properties || die "Failed to patch build properties with correct jar locations"
 
 	#Make default config more gentoo'ish
 	epatch "${FILESDIR}/default_config.patch"
@@ -54,15 +56,15 @@ src_install() {
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/main/java/
 
-	newconfd "${FILESDIR}/conf_d_tigase" tigase
-	newinitd "${FILESDIR}/init_d_tigase" tigase
+	newconfd "${FILESDIR}/conf_d_tigase" tigase || die "newconfd failed"
+	newinitd "${FILESDIR}/init_d_tigase" tigase || die "newinitd failed"
 
 	insinto /etc
-	doins "${FILESDIR}/tigase.properties"
+	doins "${FILESDIR}/tigase.properties" || die "doins failed"
 
 	insinto /var/lib/tigase/certificates
 	insopts -m0600
-	doins certs/*
+	doins certs/* || die "doins failed"
 
 	dodir /var/log/tigase
 	touch "${D}/var/log/tigase/tigase.log"
@@ -77,7 +79,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	elog "Remember to change config file and conf.d file to your needs."
-	elog "Config file is default generated by server is not present."
-	elog ""
+	einfo "Remember to change config file and conf.d file to your needs."
+	einfo "Config file is default generated by server is not present."
+	einfo
 }