Version bump.

(Portage version: 2.1.4.4)

12 files changed, 73 insertions, 252 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index a9be0784eae9..648c4a541a71 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.84 2008/08/31 11:29:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.85 2008/10/12 09:08:55 mrness Exp $
+
+*freeradius-2.1.1 (12 Oct 2008)
+
+  12 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  -files/freeradius-2.0.3-check-radiusd.patch,
+  -files/freeradius-2.0.3-ssl.patch,
+  -files/freeradius-2.0.3-versionless-la-files.patch,
+  -files/freeradius-2.0.4-gnu-source.patch,
+  -files/freeradius-2.0.4-ssl.patch,
+  -files/freeradius-2.0.4-versionless-la-files.patch,
+  +files/freeradius-2.1.1-qafixes.patch, +files/freeradius-2.1.1-ssl.patch,
+  +files/freeradius-2.1.1-versionless-la-files.patch,
+  -freeradius-2.0.3.ebuild, -freeradius-2.0.4-r1.ebuild,
+  +freeradius-2.1.1.ebuild:
+  Version bump.
 
   31 Aug 2008; Alin Năstac <mrness@gentoo.org> metadata.xml:
   Update udpfromto USE flag description (#235688).
diff --git a/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch b/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch
deleted file mode 100644
index 210ddda6a5db..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.3-check-radiusd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru freeradius-server-2.0.3.orig/scripts/check-radiusd-config.in freeradius-server-2.0.3/scripts/check-radiusd-config.in
---- freeradius-server-2.0.3.orig/scripts/check-radiusd-config.in	2007-05-15 01:27:24.000000000 +0300
-+++ freeradius-server-2.0.3/scripts/check-radiusd-config.in	2008-04-13 20:38:50.000000000 +0300
-@@ -35,7 +35,7 @@
- #  Note that you might have to add a '-d raddb' to the command line
- #  options, if your database is somewhere other than /etc/raddb
- #
--$sbindir/radiusd -X -p 32768 > startup.log 2>&1 &
-+$sbindir/radiusd -X > startup.log 2>&1 &
- 
- #
- #  Remember what it's process ID was.
diff --git a/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch
deleted file mode 100644
index a948080e4d02..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.3-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:46:14.000000000 +0300
-+++ freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:46:28.000000000 +0300
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.0.3-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.3-versionless-la-files.patch
deleted file mode 100644
index 40b6fe150af0..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.3-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-server-2.0.3.orig/src/lib/Makefile freeradius-server-2.0.3/src/lib/Makefile
---- freeradius-server-2.0.3.orig/src/lib/Makefile	2008-03-17 08:28:54.000000000 +0200
-+++ freeradius-server-2.0.3/src/lib/Makefile	2008-04-13 18:45:30.000000000 +0300
-@@ -53,5 +53,3 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.3.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 15:56:10.000000000 +0200
-+++ freeradius-server-2.0.3/src/modules/rlm_eap/libeap/Makefile	2008-04-13 18:45:30.000000000 +0300
-@@ -40,5 +40,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.3.orig/src/modules/rules.mak freeradius-server-2.0.3/src/modules/rules.mak
---- freeradius-server-2.0.3.orig/src/modules/rules.mak	2008-01-10 12:12:01.000000000 +0200
-+++ freeradius-server-2.0.3/src/modules/rules.mak	2008-04-13 18:45:30.000000000 +0300
-@@ -163,6 +163,4 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch b/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch
deleted file mode 100644
index 704004cc1dcd..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.4-gnu-source.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- freeradius-server-2.0.4.orig/configure.in	2008-04-26 17:10:09.000000000 +0200
-+++ freeradius-server-2.0.4/configure.in	2008-06-13 14:18:04.000000000 +0200
-@@ -38,6 +38,9 @@
- dnl #
- dnl #############################################################
- 
-+dnl Define _GNU_SOURCE, this should be done before any feature test.
-+AC_DEFINE(_GNU_SOURCE, 1, [Define on Linux to activate all library features])
-+
- dnl Check for GNU cc
- AC_PROG_CC
- AC_PROG_CXX
diff --git a/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch b/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch
deleted file mode 100644
index 2f30e8ef563a..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.4-ssl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:58:48.000000000 +0300
-+++ freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:59:07.000000000 +0300
-@@ -9,6 +9,7 @@
- SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
- ifneq ($(OPENSSL_LIBS),)
- SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
-+LIBS		+= $(OPENSSL_LIBS)
- endif
- LT_OBJS		= $(SRCS:.c=.lo)
- INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.0.4-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.0.4-versionless-la-files.patch
deleted file mode 100644
index 8d308019264f..000000000000
--- a/net-dialup/freeradius/files/freeradius-2.0.4-versionless-la-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru freeradius-server-2.0.4.orig/src/lib/Makefile freeradius-server-2.0.4/src/lib/Makefile
---- freeradius-server-2.0.4.orig/src/lib/Makefile	2008-04-20 18:18:39.000000000 +0300
-+++ freeradius-server-2.0.4/src/lib/Makefile	2008-05-14 01:57:57.000000000 +0300
-@@ -53,5 +53,3 @@
- 	$(INSTALL) -d -m 755	$(R)$(libdir)
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile
---- freeradius-server-2.0.4.orig/src/modules/rlm_eap/libeap/Makefile	2007-11-25 15:56:10.000000000 +0200
-+++ freeradius-server-2.0.4/src/modules/rlm_eap/libeap/Makefile	2008-05-14 01:57:57.000000000 +0300
-@@ -40,5 +40,3 @@
- install: all
- 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
- 		$(R)$(libdir)/$(TARGET).la
--	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
--	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
-diff -Nru freeradius-server-2.0.4.orig/src/modules/rules.mak freeradius-server-2.0.4/src/modules/rules.mak
---- freeradius-server-2.0.4.orig/src/modules/rules.mak	2008-01-10 12:12:01.000000000 +0200
-+++ freeradius-server-2.0.4/src/modules/rules.mak	2008-05-14 01:57:57.000000000 +0300
-@@ -163,6 +163,4 @@
- 	if [ "x$(TARGET)" != "x" ]; then \
- 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
- 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
--	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
--	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
- 	fi
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch b/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch
new file mode 100644
index 000000000000..e120ae688463
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.1-qafixes.patch
@@ -0,0 +1,13 @@
+diff -Nru freeradius-server-2.1.1.orig/src/main/listen.c freeradius-server-2.1.1/src/main/listen.c
+--- freeradius-server-2.1.1.orig/src/main/listen.c	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/src/main/listen.c	2008-10-12 08:47:46.000000000 +0000
+@@ -45,6 +45,9 @@
+ #include <fcntl.h>
+ #endif
+ 
++#ifdef WITH_UDPFROMTO
++#include <freeradius-devel/udpfromto.h>
++#endif
+ 
+ /*
+  *	We'll use this below.
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch b/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch
new file mode 100644
index 000000000000..7023da15d02e
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.1-ssl.patch
@@ -0,0 +1,11 @@
+diff -Nru freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:32:40.000000000 +0000
++++ freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:33:22.000000000 +0000
+@@ -9,6 +9,7 @@
+ SRCS		= eapcommon.c eapcrypto.c eapsimlib.c fips186prf.c
+ ifneq ($(OPENSSL_LIBS),)
+ SRCS		+= cb.c eap_tls.c mppe_keys.c tls.c
++LIBS		+= $(OPENSSL_LIBS)
+ endif
+ LT_OBJS		= $(SRCS:.c=.lo)
+ INCLUDES	= eap_types.h eap_tls.h
diff --git a/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch b/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch
new file mode 100644
index 000000000000..ad5579b5ce4a
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-2.1.1-versionless-la-files.patch
@@ -0,0 +1,28 @@
+diff -Nru freeradius-server-2.1.1.orig/src/lib/Makefile freeradius-server-2.1.1/src/lib/Makefile
+--- freeradius-server-2.1.1.orig/src/lib/Makefile	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/src/lib/Makefile	2008-10-12 08:31:40.000000000 +0000
+@@ -53,5 +53,3 @@
+ 	$(INSTALL) -d -m 755	$(R)$(libdir)
+ 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
+ 		$(R)$(libdir)/$(TARGET).la
+-	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
+-	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
+diff -Nru freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-server-2.1.1.orig/src/modules/rlm_eap/libeap/Makefile	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/src/modules/rlm_eap/libeap/Makefile	2008-10-12 08:31:40.000000000 +0000
+@@ -40,5 +40,3 @@
+ install: all
+ 	$(LIBTOOL) --mode=install $(INSTALL) -c $(TARGET).la \
+ 		$(R)$(libdir)/$(TARGET).la
+-	rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la;
+-	ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la
+diff -Nru freeradius-server-2.1.1.orig/src/modules/rules.mak freeradius-server-2.1.1/src/modules/rules.mak
+--- freeradius-server-2.1.1.orig/src/modules/rules.mak	2008-09-25 08:41:26.000000000 +0000
++++ freeradius-server-2.1.1/src/modules/rules.mak	2008-10-12 08:31:40.000000000 +0000
+@@ -163,6 +163,4 @@
+ 	if [ "x$(TARGET)" != "x" ]; then \
+ 	    $(LIBTOOL) --mode=install $(INSTALL) -c \
+ 		$(TARGET).la $(R)$(libdir)/$(TARGET).la || exit $$?; \
+-	    rm -f $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la; \
+-	    ln -s $(TARGET).la $(R)$(libdir)/$(TARGET)-$(RADIUSD_VERSION).la || exit $$?; \
+ 	fi
diff --git a/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild b/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
deleted file mode 100644
index 66348e94016e..000000000000
--- a/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.4-r1.ebuild,v 1.2 2008/07/01 19:56:51 mrness Exp $
-
-WANT_AUTOMAKE="none"
-
-inherit eutils multilib autotools pam
-
-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 \
-	elibc_glibc"
-
-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? ( virtual/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"
-	use elibc_glibc && epatch "${FILESDIR}/${P}-gnu-source.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
-
-	eautoheader || die "eautoheaders failed"
-	eautoconf || die "eautoconf failed"
-}
-
-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.0.3.ebuild b/net-dialup/freeradius/freeradius-2.1.1.ebuild
index 3d42f3eeafe1..59aed7dbd3dc 100644
--- a/net-dialup/freeradius/freeradius-2.0.3.ebuild
+++ b/net-dialup/freeradius/freeradius-2.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.0.3.ebuild,v 1.3 2008/05/21 18:53:24 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-2.1.1.ebuild,v 1.1 2008/10/12 09:08:55 mrness Exp $
 
 WANT_AUTOMAKE="none"
 
-inherit eutils multilib autotools pam
+inherit eutils multilib pam
 
 DESCRIPTION="Highly configurable free RADIUS server"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${PN}-server-${PV}.tar.gz"
@@ -49,7 +49,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-versionless-la-files.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-check-radiusd.patch"
+	epatch "${FILESDIR}/${P}-qafixes.patch"
 
 	cd "${S}"
 
@@ -85,8 +85,6 @@ src_unpack() {
 		rm -rf src/modules/rlm_sql/drivers/rlm_sql_firebird
 		sed -i -e '/rlm_sql_firebird/d' src/modules/rlm_sql/stable
 	fi
-
-	eautoconf || die "eautoconf failed"
 }
 
 src_compile() {
@@ -104,7 +102,7 @@ src_compile() {
 		myconf="${myconf} --enable-heimdal-krb5"
 	fi
 
-	econf --disable-ltdl-install \
+	econf --disable-ltdl-install --with-system-libtool \
 		 --localstatedir=/var ${myconf} || die "econf failed"
 
 	make || die "make failed"
@@ -135,6 +133,6 @@ src_install() {
 
 	rm "${D}/usr/sbin/rc.radiusd"
 
-	newinitd "${FILESDIR}/radius.init" radiusd
+	newinitd "${FILESDIR}/radius.init-r1" radiusd
 	newconfd "${FILESDIR}/radius.conf" radiusd
 }