Automatic deansification was requested by the build system but not actually required. Remove to ensure compatibility with automake 1.12; closes bug #438638 by Diego Elio "Flameeyes" Pettenò. Remove old non-stable ebuilds.

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key )

5 files changed, 38 insertions, 85 deletions

diff --git a/net-nds/tac_plus/ChangeLog b/net-nds/tac_plus/ChangeLog
index bf5f512c3d61..c6cf63fe8351 100644
--- a/net-nds/tac_plus/ChangeLog
+++ b/net-nds/tac_plus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-nds/tac_plus
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/ChangeLog,v 1.15 2012/12/09 10:27:58 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/ChangeLog,v 1.16 2013/02/28 21:31:37 chainsaw Exp $
+
+*tac_plus-4.0.4.19-r4 (28 Feb 2013)
+
+  28 Feb 2013; Tony Vroon <chainsaw@gentoo.org> -tac_plus-4.0.4.14.ebuild,
+  -tac_plus-4.0.4.15.ebuild, -tac_plus-4.0.4.19-r2.ebuild,
+  +tac_plus-4.0.4.19-r4.ebuild, +files/tac_plus-4.0.4.19-deansification.patch:
+  Automatic deansification was requested by the build system but not actually
+  required. Remove to ensure compatibility with automake 1.12; closes bug
+  #438638 by Diego Elio "Flameeyes" Pettenò. Remove old non-stable ebuilds.
 
   09 Dec 2012; Ulrich Müller <ulm@gentoo.org> tac_plus-4.0.4.14.ebuild,
   tac_plus-4.0.4.15.ebuild, tac_plus-4.0.4.19-r2.ebuild,
diff --git a/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
new file mode 100644
index 000000000000..4dbc33707263
--- /dev/null
+++ b/net-nds/tac_plus/files/tac_plus-4.0.4.19-deansification.patch
@@ -0,0 +1,11 @@
+diff -uNr tacacs+-F4.0.4.19.ORIG/configure.in tacacs+-F4.0.4.19/configure.in
+--- tacacs+-F4.0.4.19.ORIG/configure.in	2013-02-28 21:26:31.724310410 +0000
++++ tacacs+-F4.0.4.19/configure.in	2013-02-28 21:26:41.936309960 +0000
+@@ -126,7 +126,6 @@
+ 
+ # compiler specifics
+ AC_PROG_CC
+-AM_C_PROTOTYPES
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.14.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.14.ebuild
deleted file mode 100644
index 69f0ff13c48c..000000000000
--- a/net-nds/tac_plus/tac_plus-4.0.4.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 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.14.ebuild,v 1.5 2012/12/09 10:27:58 ulm 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="HPND RSA GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="debug finger tcpd skey"
-
-DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_compile() {
-	econf \
-		`use_with skey` \
-		`use_with tcpd libwrap` \
-		`use_enable finger` \
-		`use_enable debug` \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGES FAQ
-	newinitd "${FILESDIR}/tac_plus.init" tac_plus
-	newconfd "${FILESDIR}/tac_plus.confd" tac_plus
-	insinto /etc/tac_plus
-	newins "${FILESDIR}/tac_plus.conf" tac_plus.conf || die
-}
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.15.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.15.ebuild
deleted file mode 100644
index f8e8fab67d1b..000000000000
--- a/net-nds/tac_plus/tac_plus-4.0.4.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 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.15.ebuild,v 1.4 2012/12/09 10:27:58 ulm 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="HPND RSA GPL-2" # GPL-2 only for init script
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="debug finger tcpd skey"
-
-DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
-	tcpd? ( sys-apps/tcp-wrappers )"
-
-src_compile() {
-	econf \
-		`use_with skey` \
-		`use_with tcpd libwrap` \
-		`use_enable finger` \
-		`use_enable debug` \
-		|| die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc CHANGES FAQ
-	newinitd "${FILESDIR}/tac_plus.init" tac_plus
-	newconfd "${FILESDIR}/tac_plus.confd" tac_plus
-	insinto /etc/tac_plus
-	newins "${FILESDIR}/tac_plus.conf" tac_plus.conf || die
-}
diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r2.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
index 25142096185b..fedc141ac3eb 100644
--- a/net-nds/tac_plus/tac_plus-4.0.4.19-r2.ebuild
+++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r2.ebuild,v 1.4 2012/12/09 10:27:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild,v 1.1 2013/02/28 21:31:37 chainsaw Exp $
 
-EAPI=4
+EAPI=5
 
-inherit libtool autotools eutils
+inherit autotools base libtool
 
 MY_P="tacacs+-F${PV}"
 S="${WORKDIR}/${MY_P}"
@@ -15,16 +15,21 @@ SRC_URI="ftp://ftp.shrubbery.net/pub/tac_plus/${MY_P}.tar.gz"
 
 LICENSE="HPND RSA GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug finger maxsess tcpd skey static-libs"
 
 DEPEND="skey? ( >=sys-auth/skey-1.1.5-r1 )
-	tcpd? ( sys-apps/tcp-wrappers )"
+	tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/pam"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallelmake.patch
+PATCHES=(
+"${FILESDIR}/${P}-parallelmake.patch"
+"${FILESDIR}/${P}-deansification.patch"
+)
 
+src_prepare() {
+	base_src_prepare
 	AT_M4DIR="." eautoreconf
 	elibtoolize
 }
@@ -42,9 +47,11 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
+
+	use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive"
 	dodoc CHANGES FAQ
 
-	newinitd "${FILESDIR}/tac_plus.init" tac_plus
+	newinitd "${FILESDIR}/tac_plus.init2" tac_plus
 	newconfd "${FILESDIR}/tac_plus.confd2" tac_plus
 
 	insinto /etc/tac_plus