Bump to use emake instead of make. Also fix #102098 and #103051 by blocking virtual/mta and providing wrapper-nbsmtp. Remove -r1

(Portage version: 2.0.51.22-r2)

6 files changed, 57 insertions, 15 deletions

diff --git a/mail-mta/nbsmtp/ChangeLog b/mail-mta/nbsmtp/ChangeLog
index eabc5988aed4..c744d1cfb0c0 100644
--- a/mail-mta/nbsmtp/ChangeLog
+++ b/mail-mta/nbsmtp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/nbsmtp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.32 2005/08/01 13:20:54 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.33 2005/08/19 22:46:57 ferdy Exp $
+
+*nbsmtp-1.00-r3 (19 Aug 2005)
+*nbsmtp-1.00-r2 (19 Aug 2005)
+
+  19 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> -nbsmtp-1.00-r1.ebuild,
+  +nbsmtp-1.00-r2.ebuild, +nbsmtp-1.00-r3.ebuild:
+  Bump to use emake instead of make. Also fix #102098 and #103051 by blocking
+  virtual/mta and providing wrapper-nbsmtp. Remove -r1
 
   01 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
   -files/nbsmtp-CRAM-MD5.diff, -nbsmtp-0.99.ebuild, -nbsmtp-0.99-r1.ebuild:
diff --git a/mail-mta/nbsmtp/Manifest b/mail-mta/nbsmtp/Manifest
index 6f42583dafee..10ab25105912 100644
--- a/mail-mta/nbsmtp/Manifest
+++ b/mail-mta/nbsmtp/Manifest
@@ -1,17 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 542c744aef06ef42eeb7a5aee6e34cdb nbsmtp-1.00.ebuild 867
 MD5 4e363e9123e29577bdc3ede1dcfc6063 nbsmtp-1.00-r1.ebuild 1329
+MD5 57b134c8d3622e00bca038e91cd8de2b nbsmtp-1.00-r3.ebuild 1307
 MD5 f195bb2c1cd972344be314981876e96e ChangeLog 5684
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
+MD5 cd5c105b720f6879ba5206933c43ab98 nbsmtp-1.00-r2.ebuild 1103
 MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00-r1 64
+MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00-r2 64
+MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00-r3 64
 MD5 02906beafefaf79dd565570de5541a06 files/mailer.conf 348
 MD5 614757dbf694f3253b5ed3865f127ba1 files/digest-nbsmtp-1.00 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7iJFViELBEf1JB0RAh+QAKCD5x1qKyruqRZjbraXaoyWHNYjDQCcCSJ4
-WbBuRTfCwcXM9HXl7xn4j7E=
-=JRpy
------END PGP SIGNATURE-----
diff --git a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r1 b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2
index 492499b41cca..492499b41cca 100644
--- a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r1
+++ b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r2
diff --git a/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3 b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3
new file mode 100644
index 000000000000..492499b41cca
--- /dev/null
+++ b/mail-mta/nbsmtp/files/digest-nbsmtp-1.00-r3
@@ -0,0 +1 @@
+MD5 0c6a200027a6f7f61f44b374261aa52f nbsmtp-1.00.tar.bz2 104090
diff --git a/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild b/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild
new file mode 100644
index 000000000000..048afc43a50c
--- /dev/null
+++ b/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r2.ebuild,v 1.1 2005/08/19 22:46:57 ferdy Exp $
+
+DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
+SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
+HOMEPAGE="http://nbsmtp.ferdyx.org"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+LICENSE="GPL-2"
+IUSE="ssl ipv6 debug"
+
+DEPEND="virtual/libc
+	ssl? ( dev-libs/openssl )
+	!virtual/mta"
+
+PROVIDE="virtual/mta"
+
+src_compile() {
+	econf $(use_enable ssl) \
+		$(use_enable debug) \
+		$(use_enable ipv6) || die
+
+	emake || die
+}
+
+src_install() {
+	dodir /usr/{{s,}bin,lib}
+	dobin nbsmtp
+	dobin scripts/nbqueue
+	dobin scripts/wrapper-nbsmtp
+	doman nbsmtprc.5 nbsmtp.8
+	dodoc INSTALL DOCS Doxyfile
+
+	dohard /usr/bin/wrapper-nbsmtp /usr/bin/sendmail
+	dohard /usr/bin/wrapper-nbsmtp /usr/sbin/sendmail
+	dohard /usr/bin/wrapper-nbsmtp /usr/lib/sendmail
+	dohard /usr/bin/wrapper-nbsmtp /usr/bin/mailq
+	dohard /usr/bin/wrapper-nbsmtp /usr/bin/newaliases
+}
diff --git a/mail-mta/nbsmtp/nbsmtp-1.00-r1.ebuild b/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild
index ff321a360679..2c139782e45e 100644
--- a/mail-mta/nbsmtp/nbsmtp-1.00-r1.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r1.ebuild,v 1.1 2005/08/01 13:17:18 ferdy Exp $
-
-inherit eutils mailer
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-1.00-r3.ebuild,v 1.1 2005/08/19 22:46:57 ferdy Exp $
 
 DESCRIPTION="Extremely simple MTA to get mail off the system to a relayhost"
 SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
@@ -22,7 +20,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		|| die
 
-	make || die
+	emake || die
 }
 
 src_install() {