finished cleanup and don't provide virtual/mta anymore (it is done in mailer.eclass)

Package-Manager: portage-2.0.51.19

5 files changed, 20 insertions, 63 deletions

diff --git a/mail-mta/nbsmtp/ChangeLog b/mail-mta/nbsmtp/ChangeLog
index 7d5920412ebf..2ad572c640b3 100644
--- a/mail-mta/nbsmtp/ChangeLog
+++ b/mail-mta/nbsmtp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.17 2005/04/25 13:49:47 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/ChangeLog,v 1.18 2005/04/25 16:35:06 ferdy Exp $
+
+  25 Apr 2005; Fernando J. Pereda <ferdy@gentoo.org> -nbsmtp-0.92.ebuild,
+  -nbsmtp-0.92-r1.ebuild, nbsmtp-0.98-r1.ebuild:
+  virtual/mta is now provided by mailer.eclass. Also be a FULL mta if
+  -mailwrapper. Finish cleanup, sorry
 
 *nbsmtp-0.98-r1 (25 Apr 2005)
 
diff --git a/mail-mta/nbsmtp/Manifest b/mail-mta/nbsmtp/Manifest
index e09ee418bbfb..34c3dd72c12a 100644
--- a/mail-mta/nbsmtp/Manifest
+++ b/mail-mta/nbsmtp/Manifest
@@ -1,11 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 75e6020925987bd1209aafa1b61ddda1 nbsmtp-0.92-r1.ebuild 622
 MD5 62a08f03f2896feac3b7547606c7ddf4 nbsmtp-0.98.ebuild 849
-MD5 66acc42e3ae505c79594b692b7f2e987 nbsmtp-0.98-r1.ebuild 1080
-MD5 6300b7bac595213cdfa914e4f8df3ffc nbsmtp-0.92.ebuild 630
-MD5 5e1a643dad3a937375df4dd7dd4ad223 ChangeLog 3551
+MD5 decbfaff18d113846791c2a7ed42a21b nbsmtp-0.98-r1.ebuild 1268
+MD5 31ea5b2be817599c155fbe615f714fa1 ChangeLog 3783
 MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
 MD5 bcbe574652394e07e31572e9a9e4ec38 files/wrapper-nbsmtp 376
 MD5 200a5cc8c73df6a5a37a3cd5c34ab0b4 files/digest-nbsmtp-0.98-r1 63
@@ -14,7 +12,7 @@ MD5 200a5cc8c73df6a5a37a3cd5c34ab0b4 files/digest-nbsmtp-0.98 63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbPWRViELBEf1JB0RAqkoAKCBXTfpgLD+qQgdU1TfDxAFzmbIiwCZAViG
-o+kChjxYmkMD+vFM/9GDPTA=
-=ofcl
+iD8DBQFCbRxUViELBEf1JB0RAkxeAJwO04UHXG7P/9szZ7DQtxQt2CU9NgCfaXVO
+1O+M4zT3OxrtpcLognR8VUM=
+=KHeI
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nbsmtp/nbsmtp-0.92-r1.ebuild b/mail-mta/nbsmtp/nbsmtp-0.92-r1.ebuild
deleted file mode 100644
index 1efdf66cdc67..000000000000
--- a/mail-mta/nbsmtp/nbsmtp-0.92-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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-0.92-r1.ebuild,v 1.3 2005/01/17 04:20:02 ticho Exp $
-
-DESCRIPTION="The No-Brainer SMTP"
-SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
-HOMEPAGE="http://nbsmtp.ferdyx.org"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~hppa"
-LICENSE="GPL-2"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	econf `use_enable ssl` || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	dobin nbsmtp
-	dodoc INSTALL DOCS COPYING
-}
diff --git a/mail-mta/nbsmtp/nbsmtp-0.92.ebuild b/mail-mta/nbsmtp/nbsmtp-0.92.ebuild
deleted file mode 100644
index 7b213c7b34d0..000000000000
--- a/mail-mta/nbsmtp/nbsmtp-0.92.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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-0.92.ebuild,v 1.5 2005/01/17 04:20:02 ticho Exp $
-
-DESCRIPTION="The No-Brainer SMTP"
-SRC_URI="http://www.gentoo-es.org/~ferdy/${P}.tar.bz2"
-HOMEPAGE="http://nbsmtp.ferdyx.org"
-
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~hppa"
-LICENSE="GPL-2"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	myconf="$(use_enable ssl)"
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install() {
-	dobin nbsmtp
-	dodoc INSTALL DOCS COPYING
-}
diff --git a/mail-mta/nbsmtp/nbsmtp-0.98-r1.ebuild b/mail-mta/nbsmtp/nbsmtp-0.98-r1.ebuild
index 8a6c983ca43f..a1e172fbf4d5 100644
--- a/mail-mta/nbsmtp/nbsmtp-0.98-r1.ebuild
+++ b/mail-mta/nbsmtp/nbsmtp-0.98-r1.ebuild
@@ -1,6 +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-0.98-r1.ebuild,v 1.1 2005/04/25 13:49:47 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nbsmtp/nbsmtp-0.98-r1.ebuild,v 1.2 2005/04/25 16:35:07 ferdy Exp $
 
 inherit mailer
 
@@ -16,8 +16,6 @@ IUSE="ssl ipv6 debug"
 DEPEND="virtual/libc
 	ssl? ( dev-libs/openssl )"
 
-PROVIDE="virtual/mta"
-
 src_compile() {
 	local myconf
 
@@ -35,11 +33,18 @@ src_install() {
 	doman nbsmtprc.5 nbsmtp.8
 	dodoc INSTALL DOCS Doxyfile
 
+	dobin ${FILESDIR}/wrapper-nbsmtp
+
 	if use mailwrapper ; then
-		dobin ${FILESDIR}/wrapper-nbsmtp
 		dohard /usr/bin/wrapper-nbsmtp /usr/bin/sendmail.nbsmtp
 		dohard /usr/bin/wrapper-nbsmtp /usr/bin/mailq.nbsmtp
 		dohard /usr/bin/wrapper-nbsmtp /usr/bin/newaliases.nbsmtp
 		mailer_install_conf
+	else
+		dohard /usr/bin/wrapper-nbsmtp /usr/bin/sendmail
+		dohard /usr/bin/wrapper-nbsmtp /usr/sbin/sendmail
+		dohard /usr/bin/wrapper-nbsmtp /usr/bin/mailq
+		dohard /usr/bin/wrapper-nbsmtp /usr/bin/newaliases
 	fi
+
 }