touchups

(Portage version: 2.1_pre4-r1)

4 files changed, 30 insertions, 30 deletions

diff --git a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
index a6db0db61a24..7bd485765cf1 100644
--- a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.9 2005/01/24 21:32:35 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.10 2006/02/10 04:50:11 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="ssl ipv6 md5sum mailwrapper"
 
 DEPEND="virtual/libc
@@ -24,19 +24,19 @@ PROVIDE="virtual/mta"
 S=${WORKDIR}/ssmtp-2.60
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/ssmtp-2.60.7-logfile.patch
-	use ssl && epatch ${FILESDIR}/starttls.diff
-	use md5sum && epatch ${FILESDIR}/ssmtp-2.60.4-md5.patch
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ssmtp-2.60.7-logfile.patch
+	use ssl && epatch "${FILESDIR}"/starttls.diff
+	use md5sum && epatch "${FILESDIR}"/ssmtp-2.60.4-md5.patch
 }
 
 src_compile() {
 	econf \
 		--sysconfdir=/etc/ssmtp \
-		`use_enable ssl` \
-		`use_enable ipv6 inet6` \
-		`use_enable md5sum md5suth` \
+		$(use_enable ssl) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable md5sum md5suth) \
 		|| die
 	make clean || die
 	make etcdir=/etc || die
@@ -44,8 +44,8 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
 	dosym /usr/sbin/sendmail /usr/bin/mailq
 	dosym /usr/sbin/sendmail /usr/bin/newaliases
 	# Removed symlink due to conflict with mailx
@@ -58,7 +58,7 @@ src_install() {
 	doman ssmtp.8
 	#removing the sendmail.8 symlink to support multiple installed mtas.
 	#dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc COPYING INSTALL README TLS CHANGELOG_OLD
+	dodoc INSTALL README TLS CHANGELOG_OLD
 	dodoc debian/{README.debian,changelog}
 	newdoc ssmtp.lsm DESC
 	insinto /etc/ssmtp
diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
index 2bfbf478eb8a..80cfe3d6ce1e 100644
--- a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.14 2005/01/24 21:32:35 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.15 2006/02/10 04:50:11 vapier Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha arm amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="ssl ipv6 md5sum mailwrapper"
 
 DEPEND="virtual/libc
@@ -36,8 +36,8 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
 	dosym /usr/sbin/sendmail /usr/bin/mailq
 	dosym /usr/sbin/sendmail /usr/bin/newaliases
 	# Removed symlink due to conflict with mailx
@@ -50,7 +50,7 @@ src_install() {
 	doman ssmtp.8
 	#removing the sendmail.8 symlink to support multiple installed mtas.
 	#dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc COPYING INSTALL README TLS CHANGELOG_OLD
+	dodoc INSTALL README TLS CHANGELOG_OLD
 	dodoc debian/{README.debian,changelog}
 	newdoc ssmtp.lsm DESC
 	insinto /etc/ssmtp
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild
index f51f0a640f65..d863b6614151 100644
--- a/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild,v 1.5 2005/10/06 22:56:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild,v 1.6 2006/02/10 04:50:11 vapier Exp $
 
 inherit eutils mailer
 
@@ -29,11 +29,11 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
 
 	doman ssmtp.8
-	dodoc COPYING INSTALL README TLS CHANGELOG_OLD
+	dodoc INSTALL README TLS CHANGELOG_OLD
 	newdoc ssmtp.lsm DESC
 
 	insinto /etc/ssmtp
diff --git a/mail-mta/ssmtp/ssmtp-2.61.ebuild b/mail-mta/ssmtp/ssmtp-2.61.ebuild
index 7dcadde6e319..401319e61a69 100644
--- a/mail-mta/ssmtp/ssmtp-2.61.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61.ebuild,v 1.14 2005/10/09 06:39:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.61.ebuild,v 1.15 2006/02/10 04:50:11 vapier Exp $
 
 inherit eutils
 
@@ -36,8 +36,8 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin /usr/sbin /usr/lib
-	dosbin ssmtp
-	chmod 755 ${D}/usr/sbin/ssmtp
+	dosbin ssmtp || die
+	fperms 755 /usr/sbin/ssmtp
 	dosym /usr/sbin/sendmail /usr/bin/mailq
 	dosym /usr/sbin/sendmail /usr/bin/newaliases
 	# Removed symlink due to conflict with mailx
@@ -50,7 +50,7 @@ src_install() {
 	doman ssmtp.8
 	#removing the sendmail.8 symlink to support multiple installed mtas.
 	#dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8
-	dodoc COPYING INSTALL README TLS CHANGELOG_OLD
+	dodoc INSTALL README TLS CHANGELOG_OLD
 	dodoc debian/{README.debian,changelog}
 	newdoc ssmtp.lsm DESC
 	insinto /etc/ssmtp