remove old test version & inter-block with cistronradius

Package-Manager: portage-2.0.51.19

5 files changed, 11 insertions, 123 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 07308d6f8c11..330999523a2c 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.28 2005/04/12 02:25:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.29 2005/04/14 19:12:59 mrness Exp $
+
+  14 Apr 2005; Alin Nastac <mrness@gentoo.org> freeradius-1.0.1.ebuild,
+  -freeradius-1.0.2-r1.ebuild, freeradius-1.0.2-r2.ebuild:
+  Remove old test version and inter-block with net-dialup/cistronradius package.
 
   12 Apr 2005; Jason Wever <weeve@gentoo.org> freeradius-1.0.2-r2.ebuild:
   Added ~sparc keyword.
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r1 b/net-dialup/freeradius/files/digest-freeradius-1.0.2-r1
deleted file mode 100644
index 54745a2d6470..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884
diff --git a/net-dialup/freeradius/freeradius-1.0.1.ebuild b/net-dialup/freeradius/freeradius-1.0.1.ebuild
index d70df8eeeaba..03f702c49a65 100644
--- a/net-dialup/freeradius/freeradius-1.0.1.ebuild
+++ b/net-dialup/freeradius/freeradius-1.0.1.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/net-dialup/freeradius/freeradius-1.0.1.ebuild,v 1.6 2005/02/28 18:06:49 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.1.ebuild,v 1.7 2005/04/14 19:12:59 mrness Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ KEYWORDS="x86 ~amd64 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/libc
+DEPEND="!net-dialup/cistronradius
+	virtual/libc
 	>=sys-libs/db-3.2
 	sys-libs/gdbm
 	snmp? ( net-analyzer/net-snmp )
diff --git a/net-dialup/freeradius/freeradius-1.0.2-r1.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r1.ebuild
deleted file mode 100644
index 110a4c2ee710..000000000000
--- a/net-dialup/freeradius/freeradius-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2-r1.ebuild,v 1.1 2005/03/13 23:05:11 mrness Exp $
-
-inherit eutils
-
-IUSE="frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl"
-
-DESCRIPTION="highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-KEYWORDS="~x86 ~amd64 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="virtual/libc
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python
-		dev-lang/perl )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
-
-	export WANT_AUTOCONF=2.1
-	autoconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if ! useq snmp; then
-		myconf="--without-snmp"
-	fi
-	if useq frascend; then
-		myconf="${myconf} --with-ascend-binary"
-	fi
-	if useq frnothreads; then
-		myconf="${myconf} --without-threads"
-	fi
-	if useq frxp; then
-		myconf="${myconf} --with-experimental-modules"
-	fi
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	# kill modules we don't use
-	if ! useq 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 ! useq ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! useq kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! useq pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--mandir=/usr/share/man \
-		--with-large-files --disable-ltdl-install --disable-static \
-		${myconf} || die
-
-	make || die
-}
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 /bin/false /var/log/radius radiusd
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	pkg_preinst
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	dodir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R=${D} install || die
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-
-	dodoc COPYRIGHT CREDITS INSTALL LICENSE README
-
-	rm ${D}/usr/sbin/rc.radiusd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/radius.init radiusd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/radius.conf radiusd
-}
-
diff --git a/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild b/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild
index 770383fde565..55a11427c0dc 100644
--- a/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild
+++ b/net-dialup/freeradius/freeradius-1.0.2-r2.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/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild,v 1.2 2005/04/12 02:25:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.2-r2.ebuild,v 1.3 2005/04/14 19:12:59 mrness Exp $
 
 inherit eutils
 
@@ -13,7 +13,8 @@ IUSE="frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/libc
+DEPEND="!net-dialup/cistronradius
+	virtual/libc
 	>=sys-libs/db-3.2
 	sys-libs/gdbm
 	snmp? ( net-analyzer/net-snmp )