fix bug #43318 (needs automake 2.1); remove old versions

7 files changed, 12 insertions, 166 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 0abb2cac1253..7f9b43709e3f 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.10 2003/12/08 10:35:22 lanius Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.11 2004/03/06 12:52:35 lanius Exp $
+
+  06 Mar 2004; Heinrich Wendel <lanius@gentoo.org> freeradius-0.8.1.ebuild,
+  freeradius-0.9.0.ebuild, freeradius-0.9.3.ebuild:
+  fix bug #43318 (needs automake 2.1); remove old versions
 
   08 Dec 2003; Heinrich Wendel <lanius@gentoo.org> freeradius-0.9.0.ebuild,
   freeradius-0.9.3.ebuild:
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 0e7635c2a592..429e6eb78097 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,10 +1,6 @@
-MD5 000cb9eedaa6f7e9c67ae21afb938c77 freeradius-0.8.1.ebuild 787
-MD5 13c598b537e179ec4cbd87e9ea6df1ad freeradius-0.9.3.ebuild 2866
-MD5 b7518318690b1e8eb26e290cee85e78f freeradius-0.9.0.ebuild 3004
-MD5 34cdad23e256aceb8d228c1d7bb5b9f4 ChangeLog 1378
+MD5 cd8f10470a146b086d29d5752007ceb0 freeradius-0.9.3.ebuild 2850
+MD5 bb45ca962f84f15034a33a7c08752031 ChangeLog 1566
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 c74e5180819ac75249b8a0a81694b47c files/digest-freeradius-0.8.1 63
-MD5 25c3511d9df84703c8b34aceb81d55d6 files/digest-freeradius-0.9.0 69
 MD5 ee618f223ec67a53ad3a6cfd399ea8eb files/digest-freeradius-0.9.3 69
 MD5 fc6693f3df5a0694610110287a28568a files/0.9/radius.conf 129
 MD5 386aaf4470ecc4b4e0c43dec2bc02ba7 files/0.9/radius.init 807
diff --git a/net-dialup/freeradius/files/digest-freeradius-0.8.1 b/net-dialup/freeradius/files/digest-freeradius-0.8.1
deleted file mode 100644
index 1ff1dc5e76df..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-0.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2693a9067a112d2c4f5dfb98a531f25d freeradius.tar.gz 1713892
diff --git a/net-dialup/freeradius/files/digest-freeradius-0.9.0 b/net-dialup/freeradius/files/digest-freeradius-0.9.0
deleted file mode 100644
index db0376de783b..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-0.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1a8b3dd4852305c9a3fc08aa7a325f5a freeradius-0.9.0.tar.gz 1793827
diff --git a/net-dialup/freeradius/freeradius-0.8.1.ebuild b/net-dialup/freeradius/freeradius-0.8.1.ebuild
deleted file mode 100644
index 2ef6e21b60b0..000000000000
--- a/net-dialup/freeradius/freeradius-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-0.8.1.ebuild,v 1.6 2003/09/08 11:43:54 msterret Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Free RADIUS server with MySQL support"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/freeradius.tar.gz"
-HOMEPAGE="http://www.freeradius.org"
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="sys-devel/gcc"
-
-src_compile() {
-	./configure --with-gnu-ld --with-snmp=no --prefix=/usr --sysconfdir=/etc --host=${CHOST} || die
-	make all || die
-}
-
-src_install() {
-	dodir /etc/raddb
-
-	make prefix=${D}/usr mandir=${D}/usr/share/man sysconfdir=${D}/etc install || die
-
-	dodoc COPYRIGHT CREDITS INSTALL LICENSE README
-}
diff --git a/net-dialup/freeradius/freeradius-0.9.0.ebuild b/net-dialup/freeradius/freeradius-0.9.0.ebuild
deleted file mode 100644
index 71b7f075d5a3..000000000000
--- a/net-dialup/freeradius/freeradius-0.9.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-0.9.0.ebuild,v 1.5 2003/12/08 10:35:22 lanius Exp $
-
-IUSE="snmp mysql postgres ldap kerberos ssl pam"
-MY_PN=${PN}-0.9.0
-S=${WORKDIR}/${MY_PN}
-DESCRIPTION="highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_PN}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="virtual/glibc
-	sys-devel/libtool
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	snmp? ( net-analyzer/ucd-snmp )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )
-	frxp? ( dev-lang/python
-			dev-lang/perl )"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack ${MY_PN}.tar.gz
-	cd ${S}
-
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if [ -z "`use snmp`" ]; then
-		myconf="--without-snmp"
-	fi
-	# rphillips: these are invalid use variables... we'll keep them commented
-	# just in case other people want to use them
-	#
-	#if [ "`use frascend`" ]; then
-	#	myconf="${myconf} --with-ascend-binary"
-	#fi
-	#if [ "`use frlargefiles`" ]; then
-	#	myconf="${myconf} --with-large-files"
-	#fi
-	#if [ "`use frnothreds`" ]; then
-	#	myconf="${myconf} --without-threads"
-	#fi
-	#if [ "`use frxp`" ]; then
-	#	myconf="${myconf} --with-experimental-modules"
-	#fi
-
-	# kill modules we don't use
-	if [ -z "`use ssl`" ]; then
-		einfo "removing rlm_eap_tls and rlm_x99_token (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_tls src/modules/rlm_x99_token
-	fi
-	if [ -z "`use ldap`" ]; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if [ -z "`use kerberos`" ]; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if [ -z "`use pam`" ]; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-
-	# experimental modules are
-	# rlm_checkval rlm_cram rlm_dictionary rlm_example rlm_passwd rlm_perl
-	# rlm_python rlm_smb rlm_sqlcounter
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-				--mandir=/usr/share/man --host=${CHOST} \
-				--with-gnu-ld --with-system-libtool --disable-ltdl-install \
-				${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	dodir /etc/raddb
-
-	make R=${D} install || die
-
-	dodoc COPYRIGHT CREDITS INSTALL LICENSE README
-
-	rm ${D}/usr/sbin/rc.radiusd
-
-	dodir /etc/init.d
-	cp ${FILESDIR}/0.9/radiusd.init ${D}/etc/init.d/radiusd
-
-	dodir /etc/conf.d
-	cp ${FILESDIR}/0.9/radiusd.conf ${D}/etc/conf.d/radiusd
-
-	keepdir /var/run/radiusd
-	keepdir /var/log/radius
-	keepdir /var/log/radius/radacct
-}
-
-pkg_postinst() {
-	einfo "You need to add an user and a group radiusd or"
-	einfo "change the radiusd.conf file to use an existing"
-	einfo "user for running radiusd."
-	einfo "Make sure that all paths radiusd needs to write"
-	einfo "to have the proper owner!"
-}
diff --git a/net-dialup/freeradius/freeradius-0.9.3.ebuild b/net-dialup/freeradius/freeradius-0.9.3.ebuild
index 4a4a6f991669..5241a63fdc62 100644
--- a/net-dialup/freeradius/freeradius-0.9.3.ebuild
+++ b/net-dialup/freeradius/freeradius-0.9.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-0.9.3.ebuild,v 1.4 2003/12/08 10:35:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-0.9.3.ebuild,v 1.5 2004/03/06 12:52:35 lanius Exp $
 
 IUSE="snmp mysql postgres ldap kerberos ssl pam"
 
@@ -13,7 +13,7 @@ KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
 
-RDEPEND="virtual/glibc
+DEPEND="virtual/glibc
 	sys-devel/libtool
 	>=sys-libs/db-3.2
 	sys-libs/gdbm
@@ -27,16 +27,12 @@ RDEPEND="virtual/glibc
 	frxp? ( dev-lang/python
 			dev-lang/perl )"
 
-DEPEND="${RDEPEND}"
-
 src_unpack() {
-
-	cd ${WORKDIR}
 	unpack ${MY_PN}.tar.gz
 	cd ${S}
 
+	export WANT_AUTOCONF=2.1
 	autoconf
-
 }
 
 src_compile() {
@@ -86,11 +82,9 @@ src_compile() {
 		${myconf} || die
 
 	make || die
-
 }
 
 src_install() {
-
 	dodir /etc/raddb
 
 	make R=${D} install || die
@@ -108,7 +102,6 @@ src_install() {
 	keepdir /var/run/radiusd
 	keepdir /var/log/radius
 	keepdir /var/log/radius/radacct
-
 }
 
 pkg_postinst() {