Fixed bug #397609. Removed old versions

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

9 files changed, 16 insertions, 872 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index feb1321e132d..63c1f587c00b 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.101 2012/06/14 01:43:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.102 2012/06/14 06:50:26 polynomial-c Exp $
+
+  14 Jun 2012; Lars Wendler <polynomial-c@gentoo.org> -freeradius-2.0.5.ebuild,
+  -freeradius-2.1.1.ebuild, -freeradius-2.1.3-r1.ebuild,
+  -freeradius-2.1.6.ebuild, -freeradius-2.1.7.ebuild,
+  -freeradius-2.1.10.ebuild, freeradius-2.1.11.ebuild,
+  freeradius-2.1.12.ebuild:
+  non-maintainer commit: Fixed bug #397609. Removed old versions.
 
   14 Jun 2012; Zac Medico <zmedico@gentoo.org> freeradius-2.0.5.ebuild,
   freeradius-2.1.1.ebuild, freeradius-2.1.10.ebuild, freeradius-2.1.11.ebuild,
diff --git a/net-dialup/freeradius/freeradius-2.0.5.ebuild b/net-dialup/freeradius/freeradius-2.0.5.ebuild
deleted file mode 100644
index bfdbe7460871..000000000000
--- a/net-dialup/freeradius/freeradius-2.0.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.5.ebuild,v 1.6 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI=1
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib pam user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-threads.patch"
-
-	cd "${S}"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-}
-
-src_compile() {
-	local myconf=" \
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-ltdl-install --with-system-libtool \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.1.ebuild b/net-dialup/freeradius/freeradius-2.1.1.ebuild
deleted file mode 100644
index 966f3fd2ddef..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.1.ebuild,v 1.4 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI=1
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib pam user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	sys-devel/autoconf"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-
-	cd "${S}"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-}
-
-src_compile() {
-	local myconf=" \
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-ltdl-install --with-system-libtool \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-
-	make || die "make failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.10.ebuild b/net-dialup/freeradius/freeradius-2.1.10.ebuild
deleted file mode 100644
index 14e29bb51570..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.10.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.10.ebuild,v 1.2 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-	epatch "${FILESDIR}/${P}-pkglibdir.patch"
-	epatch "${FILESDIR}/${P}-ipv6.patch"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="\
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.11.ebuild b/net-dialup/freeradius/freeradius-2.1.11.ebuild
index 4fad817364c7..78950033ac4b 100644
--- a/net-dialup/freeradius/freeradius-2.1.11.ebuild
+++ b/net-dialup/freeradius/freeradius-2.1.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.11.ebuild,v 1.5 2012/06/14 01:43:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.11.ebuild,v 1.6 2012/06/14 06:50:26 polynomial-c Exp $
 
 EAPI="4"
 
@@ -120,18 +120,16 @@ src_install() {
 	dodir /etc
 	dodir /var/log
 	dodir /var/run
-	diropts -m0750 -o root -g radiusd
+	diropts -m0750 -o root -g radius
 	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
+	diropts -m0750 -o radius -g radius
 	dodir /var/log/radius
 	keepdir /var/log/radius/radacct
 	dodir /var/run/radiusd
 	diropts
 
 	make R="${D}" install || die "make install failed"
-	sed -i -e 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    "${D}"/etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
+	chown -R root:radius "${D}"/etc/raddb
 
 	pamd_mimic_system radiusd auth account password session
 
diff --git a/net-dialup/freeradius/freeradius-2.1.12.ebuild b/net-dialup/freeradius/freeradius-2.1.12.ebuild
index ee10fb1d2fa0..4e257a42a37d 100644
--- a/net-dialup/freeradius/freeradius-2.1.12.ebuild
+++ b/net-dialup/freeradius/freeradius-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.12.ebuild,v 1.2 2012/06/14 01:43:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.12.ebuild,v 1.3 2012/06/14 06:50:26 polynomial-c Exp $
 
 EAPI="4"
 
@@ -125,18 +125,16 @@ src_install() {
 	dodir /etc
 	dodir /var/log
 	dodir /var/run
-	diropts -m0750 -o root -g radiusd
+	diropts -m0750 -o root -g radius
 	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
+	diropts -m0750 -o radius -g radius
 	dodir /var/log/radius
 	keepdir /var/log/radius/radacct
 	dodir /var/run/radiusd
 	diropts
 
 	make R="${D}" install || die "make install failed"
-	sed -i -e 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    "${D}"/etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
+	chown -R root:radius "${D}"/etc/raddb
 
 	pamd_mimic_system radiusd auth account password session
 
diff --git a/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild b/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild
deleted file mode 100644
index ce5fbcaec073..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.3-r1.ebuild,v 1.4 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-	epatch "${FILESDIR}/${P}-pkglibdir.patch"
-
-	cd "${S}"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="\
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.6.ebuild b/net-dialup/freeradius/freeradius-2.1.6.ebuild
deleted file mode 100644
index 3c8cb85f93c6..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.6.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.6.ebuild,v 1.4 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-	epatch "${FILESDIR}/${P}-pkglibdir.patch"
-	epatch "${FILESDIR}/${P}-nothreads.patch"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="\
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}
diff --git a/net-dialup/freeradius/freeradius-2.1.7.ebuild b/net-dialup/freeradius/freeradius-2.1.7.ebuild
deleted file mode 100644
index 84b1e7ee1019..000000000000
--- a/net-dialup/freeradius/freeradius-2.1.7.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.7.ebuild,v 1.3 2012/06/14 01:43:16 zmedico Exp $
-
-EAPI="2"
-
-inherit eutils multilib pam autotools libtool user
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="bindist debug edirectory firebird frascend frxp kerberos ldap mysql pam postgres snmp ssl threads +udpfromto"
-
-RDEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	>=sys-libs/db-3.2
-	sys-libs/gdbm
-	sys-libs/readline
-	net-libs/libpcap
-	dev-lang/perl
-	snmp? ( net-analyzer/net-snmp )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-server-${PV}"
-
-pkg_setup() {
-	if use edirectory && ! use ldap ; then
-		eerror "Cannot add integration with Novell's eDirectory without having LDAP support!"
-		eerror "Either you select ldap USE flag or remove edirectory"
-		die "edirectory needs ldap"
-	fi
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-qafixes.patch"
-	epatch "${FILESDIR}/${P}-pkglibdir.patch"
-	epatch "${FILESDIR}/${P}-nothreads.patch"
-
-	# kill modules we don't use
-	if ! use ssl; then
-		einfo "removing rlm_eap_{tls,ttls,ikev2,peap} modules  (no use ssl)"
-		rm -rf src/modules/rlm_eap/types/rlm_eap_{tls,ttls,ikev2,peap}
-	fi
-	if ! use ldap; then
-		einfo "removing rlm_ldap (no use ldap)"
-		rm -rf src/modules/rlm_ldap
-	fi
-	if ! use kerberos; then
-		einfo "removing rlm_krb5 (no use kerberos)"
-		rm -rf src/modules/rlm_krb5
-	fi
-	if ! use pam; then
-		einfo "removing rlm_pam (no use pam)"
-		rm -rf src/modules/rlm_pam
-	fi
-	if ! use mysql; then
-		einfo "removing rlm_sql_mysql (no use mysql)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_mysql
-		sed -i -e '/rlm_sql_mysql/d' src/modules/rlm_sql/stable
-	fi
-	if ! use postgres; then
-		einfo "removing rlm_sql_postgresql (no use postgres)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_postgresql
-		sed -i -e '/rlm_sql_postgresql/d' src/modules/rlm_sql/stable
-	fi
-	if use bindist || ! use firebird; then
-		einfo "removing rlm_sql_firebird (use bindist or no use firebird)"
-		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
-		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
-	fi
-
-	# These are needed for fixing libtool-2 related issues (#261189)
-	# Keep these lines even if you don't patch *.{in,am} files!
-	eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf="\
-		$(use_enable debug developer) \
-		$(use_with snmp) \
-		$(use_with frascend ascend-binary) \
-		$(use_with frxp experimental-modules) \
-		$(use_with udpfromto) \
-		$(use_with edirectory edir) \
-		$(use_with threads)"
-
-	# fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
-
-	econf --disable-static --disable-ltdl-install \
-		 --localstatedir=/var ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	dodir /etc
-	dodir /var/log
-	dodir /var/run
-	diropts -m0750 -o root -g radiusd
-	dodir /etc/raddb
-	diropts -m0750 -o radiusd -g radiusd
-	dodir /var/log/radius
-	keepdir /var/log/radius/radacct
-	dodir /var/run/radiusd
-	diropts
-
-	make R="${D}" install || die "make install failed"
-	dosed 's:^#user *= *nobody:user = radiusd:;s:^#group *= *nobody:group = radiusd:' \
-	    /etc/raddb/radiusd.conf
-	chown -R root:radiusd "${D}"/etc/raddb/*
-
-	pamd_mimic_system radiusd auth account password session
-
-	mv "${D}/usr/share/doc/${PN}" "${D}/usr/share/doc/${PF}"
-	prepalldocs
-	dodoc CREDITS
-
-	rm "${D}/usr/sbin/rc.radiusd"
-
-	newinitd "${FILESDIR}/radius.init-r1" radiusd
-	newconfd "${FILESDIR}/radius.conf" radiusd
-}