From 1fd783b7a91f48ac67e1742a6a99a12d2ef3bd99 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Tue, 4 Dec 2007 10:02:54 +0000
Subject: Don't tamper with /etc/services. Fixes bug #195120. Package-Manager:
 portage-2.1.4_rc4

---
 net-misc/ndtpd/ndtpd-3.1.5.ebuild | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'net-misc/ndtpd/ndtpd-3.1.5.ebuild')

diff --git a/net-misc/ndtpd/ndtpd-3.1.5.ebuild b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
index a0aec119b2e6..5ee24cb7b2c9 100644
--- a/net-misc/ndtpd/ndtpd-3.1.5.ebuild
+++ b/net-misc/ndtpd/ndtpd-3.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.12 2007/04/28 16:58:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ndtpd/ndtpd-3.1.5.ebuild,v 1.13 2007/12/04 10:02:54 ulm Exp $
 
 inherit eutils
 
@@ -28,8 +28,8 @@ pkg_setup() {
 src_unpack() {
 
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-eb4-gentoo.diff
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-eb4-gentoo.diff"
 }
 
 src_compile() {
@@ -44,16 +44,7 @@ src_install() {
 
 	einstall || die
 
-	if ! $(grep 2010/tcp /etc/services >/dev/null 2>&1) ; then
-		cp /etc/services ${T}/services
-		cat >>${T}/services<<-EOF
-		ndtp		2010/tcp			# Network Dictionary Transfer Protocol
-		EOF
-		insinto /etc
-		doins ${T}/services
-	fi
-
-	newinitd ${FILESDIR}/ndtpd.initd ndtpd
+	newinitd "${FILESDIR}/ndtpd.initd" ndtpd
 
 	insinto /etc
 	newins ndtpd.conf{.sample,}
-- 
cgit v1.2.3-65-gdbad