Remove obsolete versions. Version bump, with -amd64 keyword (#119367).

(Portage version: 2.0.54)

9 files changed, 72 insertions, 180 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index f5394967ab1b..aed76ff3dfcd 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.45 2006/01/12 08:07:37 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.46 2006/01/26 19:47:22 mrness Exp $
+
+*freeradius-1.1.0 (26 Jan 2006)
+
+  26 Jan 2006; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-1.1.0-libeap-fPIC.patch,
+  +files/freeradius-1.1.0-whole-archive-gentoo.patch,
+  -freeradius-1.0.5.ebuild, -freeradius-1.0.5-r2.ebuild,
+  +freeradius-1.1.0.ebuild:
+  Remove obsolete versions. Version bump, with -amd64 keyword (#119367).
 
   12 Jan 2006; Alin Nastac <mrness@gentoo.org> files/radius.init:
   Use kill -HUP to reload configuration instead start-stop-daemon --stop
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index cee890e21131..f48ec4f3bb87 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 60ca03f858f40ada4e854b40c2d9cae3 ChangeLog 7317
-MD5 2d8c394126e7b211f44d26a4ff420f7d files/digest-freeradius-1.0.5 69
-MD5 2d8c394126e7b211f44d26a4ff420f7d files/digest-freeradius-1.0.5-r2 69
 MD5 2d8c394126e7b211f44d26a4ff420f7d files/digest-freeradius-1.0.5-r3 69
+MD5 7dc694a1ee1c374e37a40f81bcaf28a3 files/digest-freeradius-1.1.0 69
 MD5 c1ccec77b79020a074dcd62ee622c9c4 files/freeradius-1.0.5-user-password-ha1.patch 2269
 MD5 6509371cc5a50915f90a413dc54b2c10 files/freeradius-1.0.5-whole-archive-gentoo.patch 1728
+MD5 66405667b57e288296ed7fae92e0a583 files/freeradius-1.1.0-libeap-fPIC.patch 458
+MD5 ce75b2dd4a38950b23b4a529b6d6b5ae files/freeradius-1.1.0-whole-archive-gentoo.patch 1728
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 MD5 adc7e9af3a2ab37f1ab021de3e279d41 files/radius.init 1675
-MD5 439669aba4dc067fd9306916f7ae81e0 freeradius-1.0.5-r2.ebuild 4057
 MD5 9556d5bbc383fa3d1ac386208702824c freeradius-1.0.5-r3.ebuild 4118
-MD5 0e071e8f111351294241c694bdbf5b93 freeradius-1.0.5.ebuild 3760
+MD5 e258428225e51ea717bc8866bc46ac35 freeradius-1.1.0.ebuild 3847
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDxg5ajG8pv1lIUX4RAhcuAJ9KiZeAWX1mdSY3jbE6XjtnlHFmQQCeLHDN
-/Gw8AnP5pM4ISLvJh6uOdMQ=
-=UuZE
------END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.5 b/net-dialup/freeradius/files/digest-freeradius-1.0.5
deleted file mode 100644
index 00bf51d754b4..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00d06fc31e3b8279f6456d25401c81cb freeradius-1.0.5.tar.gz 2294225
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.0.5-r2 b/net-dialup/freeradius/files/digest-freeradius-1.0.5-r2
deleted file mode 100644
index 00bf51d754b4..000000000000
--- a/net-dialup/freeradius/files/digest-freeradius-1.0.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 00d06fc31e3b8279f6456d25401c81cb freeradius-1.0.5.tar.gz 2294225
diff --git a/net-dialup/freeradius/files/digest-freeradius-1.1.0 b/net-dialup/freeradius/files/digest-freeradius-1.1.0
new file mode 100644
index 000000000000..950b0f25930f
--- /dev/null
+++ b/net-dialup/freeradius/files/digest-freeradius-1.1.0
@@ -0,0 +1 @@
+MD5 e04ec8a07b8c8dc96e28ef7fdce261e7 freeradius-1.1.0.tar.gz 2351660
diff --git a/net-dialup/freeradius/files/freeradius-1.1.0-libeap-fPIC.patch b/net-dialup/freeradius/files/freeradius-1.1.0-libeap-fPIC.patch
new file mode 100644
index 000000000000..3cf2be37f8c8
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.0-libeap-fPIC.patch
@@ -0,0 +1,12 @@
+diff -Nur freeradius-1.1.0.orig/src/modules/rlm_eap/libeap/Makefile freeradius-1.1.0/src/modules/rlm_eap/libeap/Makefile
+--- freeradius-1.1.0.orig/src/modules/rlm_eap/libeap/Makefile	2003-10-29 04:49:18.000000000 +0200
++++ freeradius-1.1.0/src/modules/rlm_eap/libeap/Makefile	2006-01-18 21:35:03.058916000 +0200
+@@ -5,7 +5,7 @@
+ 
+ INCLUDES	= 
+ 
+-CFLAGS		+= -DEAPLIB -I../../../include 
++CFLAGS		+= -fPIC -DEAPLIB -I../../../include 
+ 
+ all:	static dynamic
+ 
diff --git a/net-dialup/freeradius/files/freeradius-1.1.0-whole-archive-gentoo.patch b/net-dialup/freeradius/files/freeradius-1.1.0-whole-archive-gentoo.patch
new file mode 100644
index 000000000000..cc4e4c145c38
--- /dev/null
+++ b/net-dialup/freeradius/files/freeradius-1.1.0-whole-archive-gentoo.patch
@@ -0,0 +1,36 @@
+diff -Nur freeradius-1.1.0.orig/aclocal.m4 freeradius-1.1.0/aclocal.m4
+--- freeradius-1.1.0.orig/aclocal.m4	2005-12-08 20:54:09.000000000 +0200
++++ freeradius-1.1.0/aclocal.m4	2006-01-18 20:30:42.932178750 +0200
+@@ -1421,7 +1421,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nur freeradius-1.1.0.orig/configure freeradius-1.1.0/configure
+--- freeradius-1.1.0.orig/configure	2006-01-01 18:25:01.000000000 +0200
++++ freeradius-1.1.0/configure	2006-01-18 20:30:42.936179000 +0200
+@@ -3511,7 +3511,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+ 	whole_archive_flag_spec=
+       fi
+diff -Nur freeradius-1.1.0.orig/ltconfig freeradius-1.1.0/ltconfig
+--- freeradius-1.1.0.orig/ltconfig	2003-06-24 14:03:39.000000000 +0300
++++ freeradius-1.1.0/ltconfig	2006-01-18 20:30:42.940179250 +0200
+@@ -1246,7 +1246,7 @@
+     *)
+       # ancient GNU ld didn't support --whole-archive et. al.
+       if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++        whole_archive_flag_spec="$wlarc"'--no-whole-archive'
+       else
+         whole_archive_flag_spec=
+       fi
diff --git a/net-dialup/freeradius/freeradius-1.0.5-r2.ebuild b/net-dialup/freeradius/freeradius-1.0.5-r2.ebuild
deleted file mode 100644
index 1c849e5e1b58..000000000000
--- a/net-dialup/freeradius/freeradius-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,154 +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.5-r2.ebuild,v 1.1 2005/11/01 05:28:47 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="highly configurable free RADIUS server"
-SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="edirectory frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl udpfromto"
-
-DEPEND="!net-dialup/cistronradius
-	!net-dialup/gnuradius
-	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 )"
-
-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}-whole-archive-gentoo.patch
-	if use frxp; then
-		#(bug #109003) This patch allows you to store the hash value of the 
-		#username:realm:password string instead of the clear text password.
-		#It can be found here :
-		#	http://bugs.freeradius.org/show_bug.cgi?id=287
-		epatch ${FILESDIR}/${P}-user-password-ha1.patch
-	fi
-}
-
-src_compile() {
-#	export WANT_AUTOCONF=2.1
-	autoconf
-
-	local myconf=" \
-		`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
-
-	# kill modules we don't use
-	if ! 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 ! 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
-
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--mandir=/usr/share/man \
-		--with-large-files --disable-ltdl-install --disable-static \
-		${myconf} || die
-
-	make || die
-}
-
-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
-	keepdir /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
-	chown -R root:radiusd ${D}/etc/raddb/*
-
-	[ -z "${PR}" ] || mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
-	gzip -f -9 ${D}/usr/share/doc/${PF}/{rfc/*.txt,*}
-	dodoc CREDITS
-	#Copy SQL schemas to doc dir
-	docinto sql.schemas
-	dodoc src/modules/rlm_sql/drivers/rlm_sql_*/*.sql
-
-	rm ${D}/usr/sbin/rc.radiusd
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/radius.init radiusd
-
-	insinto /etc/conf.d
-	newins ${FILESDIR}/radius.conf radiusd
-}
-
-pkg_preinst() {
-	enewgroup radiusd
-	enewuser radiusd -1 -1 /var/log/radius radiusd
-}
-
-pkg_prerm() {
-	if [ -n "`${ROOT}/etc/init.d/radiusd status | grep start`" ]; then
-		${ROOT}/etc/init.d/radiusd stop
-	fi
-}
-
-pkg_postrm() {
-	if has_version ">${CATEGORY}/${PF}" || has_version "<${CATEGORY}/${PF}" ; then
-		ewarn "If radiusd service was running, it had been stopped!"
-		echo
-		ewarn "You should update the configuration files using etc-update"
-		ewarn "and start the radiusd service again by running:"
-		einfo "    /etc/init.d/radiusd start"
-
-		ebeep
-	fi
-}
diff --git a/net-dialup/freeradius/freeradius-1.0.5.ebuild b/net-dialup/freeradius/freeradius-1.1.0.ebuild
index 16bb840a2cc6..456b271ad0ea 100644
--- a/net-dialup/freeradius/freeradius-1.0.5.ebuild
+++ b/net-dialup/freeradius/freeradius-1.1.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.0.5.ebuild,v 1.3 2005/10/13 05:06:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.0.ebuild,v 1.1 2006/01/26 19:47:22 mrness Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="highly configurable free RADIUS server"
 SRC_URI="ftp://ftp.freeradius.org/pub/radius/${P}.tar.gz"
 HOMEPAGE="http://www.freeradius.org/"
 
-KEYWORDS="~amd64 ~ppc ~sparc x86"
+KEYWORDS="-amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="edirectory frascend frnothreads frxp kerberos ldap mysql pam postgres snmp ssl udpfromto"
@@ -18,6 +18,7 @@ DEPEND="!net-dialup/cistronradius
 	virtual/libc
 	>=sys-libs/db-3.2
 	sys-libs/gdbm
+	dev-lang/perl
 	snmp? ( net-analyzer/net-snmp )
 	mysql? ( dev-db/mysql )
 	postgres? ( dev-db/postgresql )
@@ -25,8 +26,7 @@ DEPEND="!net-dialup/cistronradius
 	ssl? ( dev-libs/openssl )
 	ldap? ( net-nds/openldap )
 	kerberos? ( virtual/krb5 )
-	frxp? ( dev-lang/python
-		dev-lang/perl )"
+	frxp? ( dev-lang/python )"
 
 pkg_setup() {
 	if use edirectory && ! use ldap ; then
@@ -42,10 +42,10 @@ src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-whole-archive-gentoo.patch
+	epatch ${FILESDIR}/${P}-libeap-fPIC.patch #needed for rlm_eap installation on amd64
 }
 
 src_compile() {
-#	export WANT_AUTOCONF=2.1
 	autoconf
 
 	local myconf=" \
@@ -83,7 +83,7 @@ src_compile() {
 
 	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
 		--mandir=/usr/share/man \
-		--with-large-files --disable-ltdl-install --disable-static \
+		--with-large-files --disable-ltdl-install --disable-static --with-pic \
 		${myconf} || die
 
 	make || die
@@ -98,7 +98,7 @@ src_install() {
 	dodir /etc/raddb
 	diropts -m0750 -o radiusd -g radiusd
 	dodir /var/log/radius
-	dodir /var/log/radius/radacct
+	keepdir /var/log/radius/radacct
 	dodir /var/run/radiusd
 	diropts