Revision bump now that we have a flawless version, and remove the previous two incarnations.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

3 files changed, 9 insertions, 45 deletions

diff --git a/net-nds/tac_plus/ChangeLog b/net-nds/tac_plus/ChangeLog
index 0136299f3766..94ede2ea9e54 100644
--- a/net-nds/tac_plus/ChangeLog
+++ b/net-nds/tac_plus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/tac_plus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/ChangeLog,v 1.7 2011/06/16 15:31:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/ChangeLog,v 1.8 2011/06/16 16:00:43 chainsaw Exp $
+
+*tac_plus-4.0.4.19-r2 (16 Jun 2011)
+
+  16 Jun 2011; Tony Vroon <chainsaw@gentoo.org> -tac_plus-4.0.4.19.ebuild,
+  -tac_plus-4.0.4.19-r1.ebuild, +tac_plus-4.0.4.19-r2.ebuild:
+  Revision bump now that we have a flawless version, and remove the previous
+  two incarnations.
 
   16 Jun 2011; Jeroen Roovers <jer@gentoo.org> files/tac_plus.confd2:
   Convert line endings by Alan McKinnon (bug #371799).
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r1.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r2.ebuild
index 61d15e3cdc66..33b2e860d82d 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r1.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/tac_plus-4.0.4.19-r1.ebuild,v 1.1 2011/06/14 12:07:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/tac_plus-4.0.4.19-r2.ebuild,v 1.1 2011/06/16 16:00:43 chainsaw Exp $
 
 EAPI=4
 
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19.ebuild
deleted file mode 100644
index 0aad8387bc4e..000000000000
--- a/net-nds/tac_plus/tac_plus-4.0.4.19.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/tac_plus-4.0.4.19.ebuild,v 1.1 2011/06/06 13:27:43 chainsaw Exp $
-
-MY_P="tacacs+-F${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="An updated version of Cisco's TACACS+ server"
-HOMEPAGE="http://www.shrubbery.net/tac_plus/"
-SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="debug finger maxsess tcpd skey static-libs"
-
-DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	econf \
-		$(use_with skey) \
-		$(use_with tcpd libwrap) \
-		$(use_enable debug) \
-		$(use_enable finger) \
-		$(use_enable maxsess) \
-		$(use_enable static-libs static) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc CHANGES FAQ
-
-	newinitd "${FILESDIR}/tac_plus.init" tac_plus
-	newconfd "${FILESDIR}/tac_plus.confd2" tac_plus
-
-	insinto /etc/tac_plus
-	newins "${FILESDIR}/tac_plus.conf2" tac_plus.conf || die
-}