ssmtp-2.61-r1 is p.masked to adopt the new mailwrapper scheme

Package-Manager: portage-2.0.51.19

5 files changed, 85 insertions, 50 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index 4e7a9a42699a..f2b8b4aba2fd 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.25 2005/03/15 01:46:19 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.26 2005/04/25 20:36:38 ferdy Exp $
+
+*ssmtp-2.61-r1 (25 Apr 2005)
+
+  25 Apr 2005; Fernando J. Pereda <ferdy@gentoo.org> files/mailer.conf,
+  +ssmtp-2.61-r1.ebuild:
+  2.61-r1 uses the new mailer eclass
 
   14 Mar 2005; Hardave Riar <hardave@gentoo.org> ssmtp-2.61.ebuild:
   Stable on mips, bug #82380.
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index ec9ee5c5ea2c..7925c536a27d 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -3,20 +3,22 @@ Hash: SHA1
 
 MD5 604b3dbd0fe5a39d79a5d2527c11c756 ssmtp-2.61.ebuild 3129
 MD5 9de583fa64169fdefb15dcfc3f6ad294 ssmtp-2.60.7-r1.ebuild 2851
-MD5 a5a42c1f4ef0b3d737f608236f794454 ChangeLog 8193
+MD5 42ebb24f724a17dc38624efc92604980 ChangeLog 8356
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 095a09f1d05ecea6c3b97959f6b7a316 ssmtp-2.60.9.ebuild 3124
+MD5 383ad68ebe7c0d1fed7b44545fce066b ssmtp-2.61-r1.ebuild 1923
 MD5 5208fda9912caf3afd94108e6276167e files/ssmtp-2.60.7-logfile.patch 1256
+MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61-r1 66
 MD5 15fdd106696fc8ccfb1b170da88df2ce files/digest-ssmtp-2.61 66
 MD5 026bfafb0efdf0d7eb5e0b4164a35f7d files/digest-ssmtp-2.60.9 63
 MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277
 MD5 f466deeaec0316507961656f37af7000 files/ssmtp-2.60.4-md5.patch 1509
 MD5 c833680953ba9941d33fc14dda62532b files/digest-ssmtp-2.60.7-r1 63
-MD5 dcdea1d356b76c170296921577f29378 files/mailer.conf 1488
+MD5 bcf2e5652cff099f6a6fd410a127c900 files/mailer.conf 349
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCNj3sM+I1L6GK/u4RAs2GAJ4o9BY3/egRGXvmj1dheGYdFSbIlQCfY1Z5
-M5lH/B7L9LXMGV/D5uZnKgw=
-=SKam
+iD8DBQFCbVTyViELBEf1JB0RAtUKAJ9eu96/EqkIHxv5fFAdhhgNlOXM7gCfYuPR
+QIlXYsHl80zSDtpbrMDZ7wo=
+=QdBs
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.61-r1 b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r1
new file mode 100644
index 000000000000..92e3d236c0e0
--- /dev/null
+++ b/mail-mta/ssmtp/files/digest-ssmtp-2.61-r1
@@ -0,0 +1 @@
+MD5 957e6fff08625fe34f4fc33d0925bbc9 ssmtp_2.61.orig.tar.gz 53341
diff --git a/mail-mta/ssmtp/files/mailer.conf b/mail-mta/ssmtp/files/mailer.conf
index 80de20c1396e..dd7498d5e008 100644
--- a/mail-mta/ssmtp/files/mailer.conf
+++ b/mail-mta/ssmtp/files/mailer.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/files/mailer.conf,v 1.3 2004/07/18 03:31:06 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/files/mailer.conf,v 1.4 2005/04/25 20:36:38 ferdy Exp $
 # $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
 
 # Execute the "real" sendmail program from ssmtp, 
@@ -8,45 +8,3 @@ sendmail	/usr/sbin/ssmtp
 send-mail	/usr/sbin/ssmtp
 mailq		/usr/sbin/ssmtp
 newaliases	/usr/sbin/ssmtp
-
-# Execute the "real" sendmail program from exim, 
-# named /usr/sbin/exim
-#
-#sendmail	/usr/sbin/exim
-#send-mail	/usr/sbin/exim
-#mailq		/usr/sbin/exim
-#newaliases	/usr/sbin/exim
-#rsmtp		/usr/sbin/exim
-#rmail		/usr/sbin/exim
-#mail		/usr/sbin/exim
-
-# Execute the "real" sendmail program from nullmailer
-# named /usr/sbin/sendmail.nullmailer
-#sendmail	/usr/sbin/sendmail.nullmailer
-#mailq		/usr/bin/mailq.nullmailer
-
-# Execute the "real" sendmail program from postfix, 
-# named /usr/sbin/sendmail.postfix
-#
-#sendmail	/usr/sbin/sendmail.postfix
-#send-mail	/usr/sbin/sendmail.postfix
-#mailq		/usr/sbin/sendmail.postfix
-#newaliases	/usr/sbin/sendmail.postfix
-
-# Execute the "real" sendmail program from ssmtp, 
-# named /usr/sbin/ssmtp
-#
-#sendmail	/usr/sbin/ssmtp
-#send-mail	/usr/sbin/ssmtp
-#mailq		/usr/sbin/ssmtp
-#newaliases	/usr/sbin/ssmtp
-
-# Execute the "real" sendmail program, named /usr/sbin/sendmail
-#
-#sendmail	/usr/sbin/sendmail.sendmail
-#send-mail	/usr/sbin/sendmail.sendmail
-#mailq		/usr/sbin/sendmail.sendmail
-#newaliases	/usr/sbin/sendmail.sendmail
-#hoststat	/usr/sbin/sendmail.sendmail
-#purgestat	/usr/sbin/sendmail.sendmail
-
diff --git a/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild
new file mode 100644
index 000000000000..b153ad2dc70c
--- /dev/null
+++ b/mail-mta/ssmtp/ssmtp-2.61-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 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.1 2005/04/25 20:36:38 ferdy Exp $
+
+inherit eutils mailer
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub"
+HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/"
+SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="ssl ipv6 md5sum"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )"
+
+S=${WORKDIR}/ssmtp-2.61
+
+src_compile() {
+	econf \
+		--sysconfdir=/etc/ssmtp \
+		$(use_enable ssl) \
+		$(use_enable ipv6 inet6) \
+		$(use_enable md5sum md5auth) \
+		|| die
+	make clean || die
+	make etcdir=/etc || die
+}
+
+src_install() {
+	dodir /usr/bin /usr/sbin /usr/lib
+	dosbin ssmtp
+	chmod 755 ${D}/usr/sbin/ssmtp
+
+	doman ssmtp.8
+	dodoc COPYING INSTALL README TLS CHANGELOG_OLD
+	newdoc ssmtp.lsm DESC
+
+	insinto /etc/ssmtp
+	doins ssmtp.conf revaliases
+
+	local conffile="${D}/etc/ssmtp/ssmtp.conf"
+	mv "${conffile}" "${conffile}.orig"
+
+	# Sorry about the weird indentation, I couldn't figure out a cleverer way
+	# to do this without having horribly >80 char lines.
+	sed -e "s:^hostname=:\n# Gentoo bug #47562\\
+# Commenting the following line will force ssmtp to figure\\
+# out the hostname itself.\n\\
+# hostname=:" "${conffile}.orig" \
+		> "${conffile}" \
+		|| die "sed failed"
+
+	if use mailwrapper ; then
+		dosym /usr/sbin/ssmtp /usr/bin/sendmail.ssmtp
+		dosym /usr/sbin/ssmtp /usr/bin/mailq.ssmtp
+		dosym /usr/sbin/ssmtp /usr/bin/newaliases.ssmtp
+		mailer_install_conf
+	else
+		dosym /usr/sbin/ssmtp /usr/sbin/sendmail
+		dosym /usr/sbin/ssmtp /usr/lib/sendmail
+		dosym /usr/sbin/ssmtp /usr/bin/sendmail
+		dosym /usr/sbin/ssmtp /usr/sbin/mailq
+		dosym /usr/sbin/ssmtp /usr/sbin/newaliases
+	fi
+}