Drop unnessecary die

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

3 files changed, 13 insertions, 22 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 6206ec5656cb..234073889025 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.125 2011/12/16 11:14:19 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.126 2012/04/25 16:33:13 jlec Exp $
+
+  25 Apr 2012; Justin Lecher <jlec@gentoo.org> jabberd-1.4.4-r3.ebuild,
+  jabberd-1.6.1.1-r1.ebuild:
+  Drop unnessecary die
 
   16 Dec 2011; Naohiro Aota <naota@gentoo.org> jabberd-1.6.1.1-r1.ebuild:
   Add ~x86-fbsd wrt 171198
diff --git a/net-im/jabberd/jabberd-1.4.4-r3.ebuild b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
index 8277d5e24553..a4d9dc77d7bb 100644
--- a/net-im/jabberd/jabberd-1.4.4-r3.ebuild
+++ b/net-im/jabberd/jabberd-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.20 2010/06/17 21:50:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.4-r3.ebuild,v 1.21 2012/04/25 16:33:13 jlec Exp $
 
 inherit eutils
 
@@ -25,19 +25,15 @@ DEPEND="${RDEPEND}
 	!net-im/jabberd2"
 
 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() {
-
 	unpack ${A}
-
 	cd "${S}"
 
 	# Resolves bug #147342
@@ -49,11 +45,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-xdb_sql.c-rev1211.patch"
 	epatch "${FILESDIR}/${P}-genhash.c-rev1253.patch"
 	epatch "${FILESDIR}/${P}-crypt.patch"
-
 }
 
 src_compile() {
-
 	unset LC_ALL LC_CTYPE
 
 	# Broken configure script - can't use "use_enable"
@@ -66,16 +60,13 @@ src_compile() {
 		--sysconfdir=/etc/jabber \
 		${myconf} \
 		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		|| die "econf failed"
+		$(use_with postgres postgresql)
 
 	# 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"
@@ -92,11 +83,9 @@ src_install() {
 		-e 's,jabber.pid,jabberd14.pid,g' \
 		"${D}"/etc/jabber/jabberd.xml{,.dist} \
 		|| die "sed failed"
-
 }
 
 pkg_postinst() {
-
 	echo
 	elog 'The various IM transports for jabber are now separate packages,'
 	elog 'which you will need to install separately if you want them:'
@@ -112,5 +101,4 @@ pkg_postinst() {
 	ewarn '   Configure your server in /etc/jabber/jabberd.xml'
 	echo
 	ebeep
-
 }
diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index f5c08ed9d37f..e9111d725542 100644
--- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.17 2011/12/16 11:14:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.18 2012/04/25 16:33:13 jlec Exp $
 
 WANT_AUTOMAKE="1.9"
 inherit autotools eutils
@@ -49,7 +49,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-undefineddebug.patch"
 	epatch "${FILESDIR}/${P}-libtool2.2.patch"
 
-	eautoreconf || die "Reconfiguring autotools failed!"
+	eautoreconf
 }
 
 src_compile() {
@@ -60,8 +60,7 @@ src_compile() {
 		--enable-ssl \
 		$(use ipv6 && echo --enable-ipv6) \
 		$(use_with mysql) \
-		$(use_with postgres postgresql) \
-		|| die "econf failed"
+		$(use_with postgres postgresql)
 
 	emake || die "emake failed"
 }