remove oldie; inter-block with freeradius and gnuradius; x86

Package-Manager: portage-2.0.51.19

5 files changed, 25 insertions, 79 deletions

diff --git a/net-dialup/gnuradius/ChangeLog b/net-dialup/gnuradius/ChangeLog
index 4eca0a653109..934e456d717b 100644
--- a/net-dialup/gnuradius/ChangeLog
+++ b/net-dialup/gnuradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/gnuradius
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/ChangeLog,v 1.2 2005/02/06 14:14:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/ChangeLog,v 1.3 2005/04/14 20:43:20 mrness Exp $
+
+  14 Apr 2005; Alin Nastac <mrness@gentoo.org> -gnuradius-1.2.ebuild,
+  gnuradius-1.3.ebuild:
+  Inter-block with cistronradius and freeradius packages. Mark stable on x86.
 
 *gnuradius-1.3 (06 Feb 2005)
 
diff --git a/net-dialup/gnuradius/Manifest b/net-dialup/gnuradius/Manifest
index 4e6224980b76..ed7ea60f4c04 100644
--- a/net-dialup/gnuradius/Manifest
+++ b/net-dialup/gnuradius/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 06fcb4f8f9d747cc613e5c6d31e6dc91 ChangeLog 511
-MD5 c316a788a8f127f8c4eab6b626443b40 gnuradius-1.2.ebuild 1481
+MD5 353b34389532adf37aa954f3a869e8b6 gnuradius-1.3.ebuild 1333
+MD5 aeb638135f689db2224ae5f33a04eb70 ChangeLog 684
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 e467239d8d8ab6e540eed8dd04c8fec5 gnuradius-1.3.ebuild 1318
-MD5 2ab0db30efa4a96f74d1e4fd3f7cd875 files/digest-gnuradius-1.2 63
 MD5 2fcc0ff6ac050e6fdc1bf8a233e9eeac files/digest-gnuradius-1.3 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCGUqDmdTrptrqvGERAntVAJ9wch7Bu/IDqGLx2jNfkaJ3Jv8KiwCfXSUO
-m9OWuqMNjvG/NPxk+zHLf48=
-=g4+b
+iD8DBQFCXtYCjiC39V7gKu0RAgGWAJ9wP/xqasWOt32KVVgfAQ0l2oSsWgCgzsYY
+a1+WLIHmpo8EnP5K7ZBoIf8=
+=LEbE
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/gnuradius/files/digest-gnuradius-1.2 b/net-dialup/gnuradius/files/digest-gnuradius-1.2
deleted file mode 100644
index a79587b67cbe..000000000000
--- a/net-dialup/gnuradius/files/digest-gnuradius-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 41efba1332ff563e1f88f2aba04d9d24 radius-1.2.tar.gz 1784097
diff --git a/net-dialup/gnuradius/gnuradius-1.2.ebuild b/net-dialup/gnuradius/gnuradius-1.2.ebuild
deleted file mode 100644
index 0b4c9d2f2209..000000000000
--- a/net-dialup/gnuradius/gnuradius-1.2.ebuild
+++ /dev/null
@@ -1,58 +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/gnuradius/gnuradius-1.2.ebuild,v 1.3 2005/02/21 02:42:05 dragonheart Exp $
-
-MY_P=radius-${PV}
-DESCRIPTION="GNU radius authentication server"
-HOMEPAGE="http://www.gnu.org/software/radius/radius.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/radius/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="guile mysql postgres odbc dbm nls snmp pam static debug"
-DEPEND="!net-dialup/freeradius
-		guile? ( >=dev-util/guile-1.4 )
-		mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql )
-		odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-		readline? ( sys-libs/readline )
-		dbm? ( sys-libs/gdbm )
-		snmp? ( net-analyzer/net-snmp )
-		pam? ( sys-libs/pam )"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	sed -i -e "1i\#ifndef RADIUS_H" -e "1i\# define RADIUS_H" include/radius.h
-	echo '#endif //RADIUS_H' >> include/radius.h
-}
-
-src_compile() {
-	local myconf=" \
-		`use_with guile` \
-		`use_with mysql` \
-		`use_with postgres` \
-		`use_with odbc` \
-		`use_with readline` \
-		`use_enable dbm` \
-		`use_enable nls` \
-		`use_enable snmp` \
-		`use_enable pam` \
-		`use_enable debug` \
-		`use_enable static` "
-
-	if useq guile; then
-		myconf="$myconf --with-client --with-server-guile"
-	fi
-
-	econf $myconf || die "configuration failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "installation failed"
-}
diff --git a/net-dialup/gnuradius/gnuradius-1.3.ebuild b/net-dialup/gnuradius/gnuradius-1.3.ebuild
index 5f30ca9f155d..4f5b53ba9539 100644
--- a/net-dialup/gnuradius/gnuradius-1.3.ebuild
+++ b/net-dialup/gnuradius/gnuradius-1.3.ebuild
@@ -1,26 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/gnuradius-1.3.ebuild,v 1.2 2005/02/21 02:42:05 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/gnuradius/gnuradius-1.3.ebuild,v 1.3 2005/04/14 20:43:20 mrness Exp $
 
 MY_P=radius-${PV}
+
 DESCRIPTION="GNU radius authentication server"
 HOMEPAGE="http://www.gnu.org/software/radius/radius.html"
 SRC_URI="ftp://ftp.gnu.org/gnu/radius/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="x86"
 IUSE="guile mysql postgres odbc dbm nls snmp pam static debug"
+
 DEPEND="!net-dialup/freeradius
-		guile? ( >=dev-util/guile-1.4 )
-		mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql )
-		odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
-		readline? ( sys-libs/readline )
-		dbm? ( sys-libs/gdbm )
-		snmp? ( net-analyzer/net-snmp )
-		pam? ( sys-libs/pam )"
+	!net-dialup/cistronradius
+	guile? ( >=dev-util/guile-1.4 )
+	mysql? ( dev-db/mysql )
+	postgres? ( dev-db/postgresql )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	readline? ( sys-libs/readline )
+	dbm? ( sys-libs/gdbm )
+	snmp? ( net-analyzer/net-snmp )
+	pam? ( sys-libs/pam )"
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {