Small cleanup

Package-Manager: portage-2.0.51.22-r2

4 files changed, 16 insertions, 10 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 990b74669924..2a7d298d4290 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.77 2005/08/27 18:10:38 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.78 2005/08/27 23:33:45 stkn Exp $
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org>
+  asterisk-1.2.0_beta1.ebuild:
+  Small cleanup.
 
 *asterisk-1.2.0_beta1 (27 Aug 2005)
 
diff --git a/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild b/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild
index 414fa5377cde..9b5e7e7f48b9 100644
--- a/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild
+++ b/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild,v 1.1 2005/08/27 18:10:38 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.2.0_beta1.ebuild,v 1.2 2005/08/27 23:33:45 stkn Exp $
 
 inherit eutils
 
@@ -94,7 +94,7 @@ src_unpack() {
 		if ! use hardened; then
 			einfo "Enabling mmx optimization"
 			sed -i -e "s:^#\(K6OPT[\t ]\+= -DK6OPT\):\1:" \
-				Makefile || die "QA error: No substitution performed"
+				Makefile
 		else
 			ewarn "Hardened use-flag is set, not enabling mmx optimization for codec_gsm!"
 		fi
@@ -103,7 +103,7 @@ src_unpack() {
 	if ! use debug; then
 		einfo "Disabling debugging"
 		sed -i -e "s:^\(DEBUG=\):#\1:" \
-			Makefile || die "QA error: No substitution performed"
+			Makefile
 	fi
 
 	#
diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 3ac44eb28581..93c3309759bf 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.59 2005/08/27 18:01:30 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.60 2005/08/27 23:31:39 stkn Exp $
+
+  28 Aug 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.2.0_beta1.ebuild:
+  Small cleanup.
 
 *zaptel-1.2.0_beta1 (27 Aug 2005)
 
diff --git a/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild b/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild
index 7fb80b678c3e..f1bbc71d8b2e 100644
--- a/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild
+++ b/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild,v 1.1 2005/08/27 18:01:30 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.2.0_beta1.ebuild,v 1.2 2005/08/27 23:31:39 stkn Exp $
 
 inherit toolchain-funcs eutils linux-mod
 
@@ -58,7 +58,7 @@ zconfig_disable() {
 		# match a little more than ${1} so we can use zconfig_disable
 		# to disable all echo cancellers in zconfig.h w/o calling it several times
 		sed -i -e "s:^[ \t]*#define[ \t]\+\(${1}[a-zA-Z0-9_-]*\).*:#undef \1:" \
-			${S}/zconfig.h || die "QA error: No substitution performed"
+			${S}/zconfig.h
 	fi
 
 	return $?
@@ -68,7 +68,7 @@ zconfig_enable() {
 	if grep -q "${1}" ${S}/zconfig.h; then
 		sed -i  -e "s:^/\*[ \t]*#define[ \t]\+\(${1}\).*:#define \1:" \
 			-e "s:^[ \t]*#undef[ \t]\+\(${1}\).*:#define \1:" \
-			${S}/zconfig.h || die "QA error: No substitution performed"
+			${S}/zconfig.h
 	fi
 
 	return $?
@@ -139,7 +139,6 @@ pkg_setup() {
 		ewarn "Look at the messages above, resolve the problem (or disable the use-flag) and try again"
 		echo
 
-		# no alcohol or drugs involved here
 		if [[ $result -lt 3 ]]; then
 			eerror "[$result Error(s)] Zaptel is not happy :("
 		else
@@ -164,7 +163,7 @@ src_unpack() {
 		# fix Makefile to not create device nodes for
 		# devfs enabled 2.6 kernels
 		sed -i -e 's:grep -q udevd:grep -q \"udevd\\|devfsd\":' \
-			Makefile || die "QA error: No substitution performed"
+			Makefile
 	fi
 
 	# try to apply bristuff patch