Remove disabled database drivers from the stable rlm_sql drivers (#171723). Autotools cleanup. More QA fixes.

(Portage version: 2.1.2.2)

4 files changed, 72 insertions, 22 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index 3bce524b129a..11359fe2a3c4 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.63 2007/03/17 09:27:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.64 2007/03/22 09:37:06 mrness Exp $
+
+*freeradius-1.1.5-r1 (22 Mar 2007)
+
+  22 Mar 2007; Alin Năstac <mrness@gentoo.org>
+  files/freeradius-1.1.5-qa-fixes.patch, -freeradius-1.1.5.ebuild,
+  +freeradius-1.1.5-r1.ebuild:
+  Remove disabled database drivers from the stable rlm_sql drivers (#171723).
+  Autotools cleanup. More QA fixes.
 
 *freeradius-1.1.5 (17 Mar 2007)
 
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.5 b/net-dialup/freeradius/files/digest-freeradius-1.1.5-r1
index cc2989f019db..cc2989f019db 100644
--- a/net-dialup/freeradius/files/digest-freeradius-1.1.5
+++ b/net-dialup/freeradius/files/digest-freeradius-1.1.5-r1
diff --git a/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch b/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch
index 9c2422cefc4f..49e809113fde 100644
--- a/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch
+++ b/net-dialup/freeradius/files/freeradius-1.1.5-qa-fixes.patch
@@ -1,3 +1,37 @@
+diff -Nru freeradius-1.1.5.orig/src/main/mainconfig.c freeradius-1.1.5/src/main/mainconfig.c
+--- freeradius-1.1.5.orig/src/main/mainconfig.c	2007-03-22 11:09:57.000000000 +0200
++++ freeradius-1.1.5/src/main/mainconfig.c	2007-03-22 11:13:26.000000000 +0200
+@@ -23,6 +23,7 @@
+ 
+ #include "autoconf.h"
+ #include "libradius.h"
++#include "ltdl.h"
+ 
+ #include <stdlib.h>
+ #include <string.h>
+@@ -1487,6 +1488,10 @@
+ /*
+  *	Free the configuration.
+  */
++extern void rl_free(void);
++extern void paircompare_builtin_free(void);
++extern void xlat_free(void);
++
+ int free_mainconfig(void)
+ {
+ 	/*
+diff -Nru freeradius-1.1.5.orig/src/modules/rlm_ldap/rlm_ldap.c freeradius-1.1.5/src/modules/rlm_ldap/rlm_ldap.c
+--- freeradius-1.1.5.orig/src/modules/rlm_ldap/rlm_ldap.c	2006-05-09 02:45:02.000000000 +0300
++++ freeradius-1.1.5/src/modules/rlm_ldap/rlm_ldap.c	2007-03-22 10:57:22.000000000 +0200
+@@ -175,6 +175,8 @@
+ #include	<string.h>
+ 
+ #include	<lber.h>
++#define LDAP_DEPRECATED 1
++#undef HAVE_LDAP_INT_TLS_CONFIG
+ #include        <ldap.h>
+ 
+ #include	<errno.h>
 diff -Nru freeradius-1.1.5.orig/src/modules/rlm_smb/smblib.c freeradius-1.1.5/src/modules/rlm_smb/smblib.c
 --- freeradius-1.1.5.orig/src/modules/rlm_smb/smblib.c	2004-02-26 21:04:35.000000000 +0200
 +++ freeradius-1.1.5/src/modules/rlm_smb/smblib.c	2007-03-17 11:13:44.000000000 +0200
diff --git a/net-dialup/freeradius/freeradius-1.1.5.ebuild b/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild
index 5e6fd0ff51d2..8567e55aa87b 100644
--- a/net-dialup/freeradius/freeradius-1.1.5.ebuild
+++ b/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.5.ebuild,v 1.1 2007/03/17 09:27:24 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.5-r1.ebuild,v 1.1 2007/03/22 09:37:06 mrness Exp $
 
-inherit eutils flag-o-matic multilib
+WANT_AUTOMAKE="none"
+
+inherit eutils multilib autotools
 
 DESCRIPTION="highly configurable free RADIUS server"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
@@ -47,26 +49,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-nostrip.patch"
 	epatch "${FILESDIR}/${P}-ssl.patch"
 	epatch "${FILESDIR}/${P}-qa-fixes.patch"
-}
-
-src_compile() {
-	autoconf || die "autoconf failed"
 
-	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` "
-
-	if useq frnothreads; then
-		myconf="${myconf} --without-threads"
-	fi
-	#fix bug #77613
-	if has_version app-crypt/heimdal; then
-		myconf="${myconf} --enable-heimdal-krb5"
-	fi
+	cd "${S}"
 
 	# kill modules we don't use
 	if ! use ssl; then
@@ -88,14 +72,38 @@ src_compile() {
 	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 firebird; then
 		einfo "removing rlm_sql_firebird (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
+
+	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) "
+
+	if useq frnothreads; then
+		myconf="${myconf} --without-threads"
+	fi
+
+	#fix bug #77613
+	if has_version app-crypt/heimdal; then
+		myconf="${myconf} --enable-heimdal-krb5"
 	fi
 
 	econf --with-large-files --disable-ltdl-install --with-pic \