[patch] ebuild.patch

diff (text/plain), 2.74 KB, created by Agostino Sarubbo on 2011-11-11 13:20:21 UTC

--- vsftpd-2.3.4.ebuild	2011-05-18 17:31:20.000000000 +0200
+++ vsftpd-2.3.4-r1.ebuild	2011-11-11 14:14:26.129509381 +0100
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.4.ebuild,v 1.7 2011/05/18 15:25:43 jer Exp $
 
+EAPI=4
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
@@ -22,10 +24,7 @@
 	selinux? ( sec-policy/selinux-ftpd )
 	xinetd? ( sys-apps/xinetd )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# as-needed patch. Bug #335977
 	epatch "${FILESDIR}/${PN}-2.3.2-as-needed.patch"
 
@@ -45,46 +44,48 @@
 
 	# Ensure that we don't link against libcap unless asked
 	if ! use caps ; then
-		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
 		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
 	fi
 
 	# Let portage control stripping
-	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+	emake \
+		CFLAGS="${CFLAGS}" \
+		CC="$(tc-getCC)"
 }
 
 src_install() {
 	into /usr
-	doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
-	dosbin vsftpd || die "disbin failed"
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd
 
 	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
 		README README.security REWARD SIZE \
-		SPEED TODO TUNING || die "dodoc failed"
-	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
+		SPEED TODO TUNING
+	newdoc vsftpd.conf vsftpd.conf.example
 
 	docinto security
-	dodoc SECURITY/* || die "dodoc failed"
+	dodoc SECURITY/*
 
 	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/* || die "doins faileD"
+	doins -r EXAMPLE/*
 
 	insinto /etc/vsftpd
-	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
+	newins vsftpd.conf vsftpd.conf.example
 
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
 
 	if use xinetd ; then
 		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
 	fi
 
-	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd
 
 	keepdir /usr/share/vsftpd/empty
 }
@@ -93,7 +94,7 @@
 	# If we use xinetd, then we set listen=NO
 	# so that our default config works under xinetd - fixes #78347
 	if use xinetd ; then
-		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example || die
 	fi
 }