erase oldies

(Portage version: 2.0.51.19)

14 files changed, 19 insertions, 595 deletions

diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 983e3167e989..cbcbe513ecf2 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -2,7 +2,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Copyright 2003-2004 DataCore GmbH
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.14 2005/05/01 17:22:58 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/ChangeLog,v 1.15 2005/06/12 16:35:50 mrness Exp $
+
+  12 Jun 2005; Alin Nastac <mrness@gentoo.org>
+  -files/patches-0.96.4/opaque-ready.patch,
+  -files/patches-0.96.4/ospf_refcount.patch,
+  -files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2,
+  -files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2,
+  -quagga-0.96.4-r6.ebuild, -quagga-0.96.5.ebuild, -quagga-0.97.1.ebuild,
+  -quagga-0.97.2.ebuild:
+  Remove obsolete versions.
 
   01 May 2005; Michael Hanselmann <hansmi@gentoo.org> quagga-0.98.2.ebuild:
   Stable on ppc.
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 7d160a622fc6..3c7029f97a82 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -1,29 +1,17 @@
-MD5 b70056f75c93d332c335c74f4e52ce2b quagga-0.96.4-r6.ebuild 3528
-MD5 ec4d382f3d6969b44a6579975ba8a6e2 quagga-0.97.1.ebuild 3957
 MD5 c35722fdaa8d7d50841908e146faf847 quagga-0.98.2.ebuild 4496
-MD5 824b354d0cf35f8b889bcb115fe4eb72 quagga-0.96.5.ebuild 3589
-MD5 8fb53c43576eb001c327062e9cc7d415 quagga-0.97.2.ebuild 3983
+MD5 01c16100e40fa218fe4337e9c402ef73 ChangeLog 6673
 MD5 f0c8f9afaf3bbefcea71ff3b6fa139c4 metadata.xml 1389
 MD5 9516803db922d13a126a5315a0a27956 quagga-0.96.5-r1.ebuild 3959
-MD5 f509004dd4cd644a29773cbe60c95683 ChangeLog 6293
-MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5 142
-MD5 898c502fc59023326048bdb4e014754f files/digest-quagga-0.97.2 142
+MD5 1a1df9fb95d48001187e1f56dc4ff5e5 files/digest-quagga-0.98.2 66
 MD5 9056b8bd752a672787eacb129ee47535 files/digest-quagga-0.96.5-r1 142
-MD5 72494598a213a5d6f441496f48aefd7b files/digest-quagga-0.96.4-r6 66
 MD5 18c1046db57ea850aabd385058522cc4 files/quagga.env 25
-MD5 9ee8920582beff3b7ffa2408666f5f2b files/digest-quagga-0.97.1 142
 MD5 7d8952055d69c80a4212194aac85c283 files/quagga.pam 1199
-MD5 1a1df9fb95d48001187e1f56dc4ff5e5 files/digest-quagga-0.98.2 66
-MD5 e70bf25e2ca5f76efb2c5704234ccc1f files/patches-0.98.2/ht-20040304-classless-bgp.patch 1581
-MD5 7da4097332468741416e156a2e5d35e4 files/patches-0.98.2/amir-connected-route.patch 6336
-MD5 6c9cdbdc237bb8d24dfd26504059464b files/patches-0.98.2/ht-20050110-0.98.0-bgp-md5.patch 14570
-MD5 4a118d93cab17b63f1d9c675f5d92fdf files/init/ospf6d 884
-MD5 2c6f6b3a64eedf1362a56fd6b3ca9c1b files/init/ripngd 885
-MD5 bfecfbc3b2f5b2748271a2838cac5a2b files/init/zebra 1143
+MD5 3f95e96aeb427fa3de7f387ff3dc6ad6 files/init/bgpd 866
 MD5 e484b94e7ebb358d11fdf3252e0b604f files/init/ripd 865
 MD5 6b7fbbe67b98a52a36684455c3866d65 files/init/ospfd 875
-MD5 3f95e96aeb427fa3de7f387ff3dc6ad6 files/init/bgpd 866
-MD5 a08e46f6d262bc34749ee9cf9716a753 files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2 667
-MD5 a5e54af5a6268307f6d5d86e6a5a680c files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2 645
-MD5 13439f842c485b5402125d2a18158c84 files/patches-0.96.4/ospf_refcount.patch 1296
-MD5 6d870c42af2625dcc07ba4b155618ebf files/patches-0.96.4/opaque-ready.patch 2617
+MD5 bfecfbc3b2f5b2748271a2838cac5a2b files/init/zebra 1143
+MD5 4a118d93cab17b63f1d9c675f5d92fdf files/init/ospf6d 884
+MD5 2c6f6b3a64eedf1362a56fd6b3ca9c1b files/init/ripngd 885
+MD5 7da4097332468741416e156a2e5d35e4 files/patches-0.98.2/amir-connected-route.patch 6336
+MD5 6c9cdbdc237bb8d24dfd26504059464b files/patches-0.98.2/ht-20050110-0.98.0-bgp-md5.patch 14570
+MD5 e70bf25e2ca5f76efb2c5704234ccc1f files/patches-0.98.2/ht-20040304-classless-bgp.patch 1581
diff --git a/net-misc/quagga/files/digest-quagga-0.96.4-r6 b/net-misc/quagga/files/digest-quagga-0.96.4-r6
deleted file mode 100644
index bde17a662186..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.96.4-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55f5a307c453f90d7dfcc13f0dabb83d quagga-0.96.4.tar.gz 1401066
diff --git a/net-misc/quagga/files/digest-quagga-0.96.5 b/net-misc/quagga/files/digest-quagga-0.96.5
deleted file mode 100644
index 1c208a87005f..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.96.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cc84ef15cf4c2823a36097fe01775dc3 quagga-0.96.5.tar.gz 1558033
-MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/files/digest-quagga-0.97.1 b/net-misc/quagga/files/digest-quagga-0.97.1
deleted file mode 100644
index c54918cb5d72..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.97.1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ddfa09a520e9245d1aeb9b3de695882b quagga-0.97.1.tar.gz 1813974
-MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/files/digest-quagga-0.97.2 b/net-misc/quagga/files/digest-quagga-0.97.2
deleted file mode 100644
index 240f39b46e43..000000000000
--- a/net-misc/quagga/files/digest-quagga-0.97.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1609de2a1633935a1c7e8983e42acba8 quagga-0.97.2.tar.gz 1819209
-MD5 5352f366e6c7d07101d9b1684e8c6710 ht-20040525-0.96.5-bgp-md5.patch 15395
diff --git a/net-misc/quagga/files/patches-0.96.4/opaque-ready.patch b/net-misc/quagga/files/patches-0.96.4/opaque-ready.patch
deleted file mode 100644
index e2db1538c182..000000000000
--- a/net-misc/quagga/files/patches-0.96.4/opaque-ready.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- ospfd/ospf_opaque.c.orig	2003-04-04 04:44:32.000000000 +0200
-+++ ospfd/ospf_opaque.c	2004-02-02 23:58:48.171864248 +0100
-@@ -1385,10 +1385,15 @@
-     {
-       for (node = listhead (oi->opaque_lsa_self); node; nextnode (node))
-         {
-+	  /* 
-+	   * removed the test for
-+	   *   (! list_isempty (oipt->id_list))   * Handler is already active. *
-+           * because opaque cababilities ON -> OFF -> ON result in list_isempty (oipt->id_list)
-+	   * not being empty.
-+	   */
-           if ((oipt = getdata (node))  == NULL /* Something wrong? */
-           ||   oipt->t_opaque_lsa_self != NULL /* Waiting for a thread call. */
--          ||   oipt->status == PROC_SUSPEND    /* Cannot originate now. */
--          ||  ! list_isempty (oipt->id_list))  /* Handler is already active. */
-+          ||   oipt->status == PROC_SUSPEND)   /* Cannot originate now. */
-               continue;
- 
-           ospf_opaque_lsa_reoriginate_schedule ((void *) oi,
-@@ -1401,10 +1406,15 @@
-     {
-       for (node = listhead (area->opaque_lsa_self); node; nextnode (node))
-         {
-+	  /* 
-+	   * removed the test for
-+	   *   (! list_isempty (oipt->id_list))   * Handler is already active. *
-+           * because opaque cababilities ON -> OFF -> ON result in list_isempty (oipt->id_list)
-+	   * not being empty.
-+	   */
-           if ((oipt = getdata (node))  == NULL /* Something wrong? */
-           ||   oipt->t_opaque_lsa_self != NULL /* Waiting for a thread call. */
--          ||   oipt->status == PROC_SUSPEND    /* Cannot originate now. */
--          ||  ! list_isempty (oipt->id_list))  /* Handler is already active. */
-+          ||   oipt->status == PROC_SUSPEND)   /* Cannot originate now. */
-             continue;
- 
-           ospf_opaque_lsa_reoriginate_schedule ((void *) area,
-@@ -1417,10 +1427,15 @@
-     {
-       for (node = listhead (top->opaque_lsa_self); node; nextnode (node))
-         {
-+	  /* 
-+	   * removed the test for
-+	   *   (! list_isempty (oipt->id_list))   * Handler is already active. *
-+           * because opaque cababilities ON -> OFF -> ON result in list_isempty (oipt->id_list)
-+	   * not being empty.
-+	   */
-           if ((oipt = getdata (node))  == NULL /* Something wrong? */
-           ||   oipt->t_opaque_lsa_self != NULL /* Waiting for a thread call. */
--          ||   oipt->status == PROC_SUSPEND    /* Cannot originate now. */
--          ||  ! list_isempty (oipt->id_list))  /* Handler is already active. */
-+          ||   oipt->status == PROC_SUSPEND)   /* Cannot originate now. */
-             continue;
- 
-           ospf_opaque_lsa_reoriginate_schedule ((void *) top,
diff --git a/net-misc/quagga/files/patches-0.96.4/ospf_refcount.patch b/net-misc/quagga/files/patches-0.96.4/ospf_refcount.patch
deleted file mode 100644
index 08718c1808b1..000000000000
--- a/net-misc/quagga/files/patches-0.96.4/ospf_refcount.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- ospfd/ospf_lsa.c.orig	2003-10-13 11:02:40.000000000 +0200
-+++ ospfd/ospf_lsa.c	2004-03-12 17:22:20.099902466 +0100
-@@ -288,6 +288,10 @@
- struct ospf_lsa *
- ospf_lsa_lock (struct ospf_lsa *lsa)
- {
-+#ifdef DEBUG_LSA_LOCKS
-+  zlog_info("LSA: lock(lsa = %p, lsa->data = %p, lsa->id = %s, lsa->lock = %d)", lsa, lsa->data, (lsa && (lsa->data))?inet_ntoa(lsa->data->id):"undef", lsa->lock);
-+#endif /* DEBUG_LSA_LOCKS */
-+
-   lsa->lock++;
-   return lsa;
- }
-@@ -300,6 +304,20 @@
-   if (!lsa)
-     return;
-   
-+#ifdef DEBUG_LSA_LOCKS
-+  zlog_info("LSA: unlock(lsa = %p, lsa->data = %p, lsa->id = %s, lsa->lock = %d, lsa->discard = %s)", lsa, (lsa)?lsa->data:"undef", (lsa && (lsa->data))?inet_ntoa(lsa->data->id):"undef", lsa->lock, (CHECK_FLAG (lsa->flags, OSPF_LSA_DISCARD))?"true":"false");
-+#endif /* DEBUG_LSA_LOCKS */
-+
-+#ifndef ORGINAL_BEHAVIOR
-+  if (lsa->lock == 0)
-+  {
-+    int discard = (CHECK_FLAG (lsa->flags, OSPF_LSA_DISCARD));
-+
-+    zlog_info("LSA: unlock(lsa = %p, lsa->data = %p, lsa->id = %s, lsa->lock = %d, lsa->discard = %s): reference count error! unlocking not locked resource... ignoring!", lsa, lsa->data, (lsa->data)?inet_ntoa(lsa->data->id):"undef", lsa->lock, discard);
-+    return;
-+  }
-+#endif /* ! ORGINAL_BEHAVIOR */
-+
-   lsa->lock--;
- 
-   assert (lsa->lock >= 0);
diff --git a/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2 b/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2
deleted file mode 100644
index 0f42e0e01c35..000000000000
--- a/net-misc/quagga/files/patches-0.97.1/01_all_unbreak-ospfapi.patch.bz2
+++ /dev/null
diff --git a/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2 b/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2
deleted file mode 100644
index d55fa88f2a10..000000000000
--- a/net-misc/quagga/files/patches-0.97.1/02_all_unbreak-ospfapi.patch.bz2
+++ /dev/null
diff --git a/net-misc/quagga/quagga-0.96.4-r6.ebuild b/net-misc/quagga/quagga-0.96.4-r6.ebuild
deleted file mode 100644
index a1326d86c7ef..000000000000
--- a/net-misc/quagga/quagga-0.96.4-r6.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.4-r6.ebuild,v 1.9 2005/03/20 18:09:43 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
-SLOT="0"
-LICENSE="GPL-2"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz"
-IUSE="ipv6 snmp pam"
-
-DEPEND="virtual/libc
-	sys-devel/binutils
-	>=sys-libs/libcap-1.10-r3
-	!sys-apps/zebra
-	!sys-apps/zebra-ag-svn
-	!sys-apps/zebra-pj-cvs
-	!sys-apps/quagga-ag-svn-HEAD
-	!sys-apps/quagga-svn-HEAD"
-
-[ -z "${QUAGGA_GROUP_GID}" ] && QUAGGA_GROUP_GID=441
-[ -z "${QUAGGA_GROUP_NAME}" ] && QUAGGA_GROUP_NAME="quagga"
-[ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
-[ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
-[ -z "${QUAGGA_USER_SH}" ] && QUAGGA_USER_SH="/bin/false"
-[ -z "${QUAGGA_USER_HOMEDIR}" ] && QUAGGA_USER_HOMEDIR=/var/empty
-[ -z "${QUAGGA_USER_GROUPS}" ] && QUAGGA_USER_GROUPS=${QUAGGA_GROUP_NAME}
-
-pkg_preinst() {
-	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
-	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/patches-${PV}/opaque-ready.patch
-	epatch ${FILESDIR}/patches-${PV}/ospf_refcount.patch
-}
-
-src_compile() {
-	local ipv
-	local snmp
-	local pam
-
-	use ipv6 && ipv="--enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" || ipv="--disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use snmp && snmp="--enable-snmp"
-	use pam && pam="--with-libpam"
-
-	# update makefiles
-
-	export WANT_AUTOMAKE=1.7
-
-	./update-autotools || die
-
-	#
-	# ipforward detection is broken (and usersandbox will break it too)
-	# thanks to Merlin from irc://irc.freenode.net/#quagga
-	#
-	export IPFORWARD=ipforward_proc.o
-	export zebra_ipforward_path="proc"
-
-	# configure the stuff
-
-	./configure --host=${CHOST} --prefix=/usr --enable-tcp-zebra \
-	            --enable-nssa --enable-opaque-lsa --enable-ospf-te \
-		    --enable-ospf-secondary \
-		    --enable-user=${QUAGGA_USER} \
-		    --enable-group=${QUAGGA_GROUP} \
-		    --enable-vty-group=${QUAGGA_VTYGROUP} \
-		    --with-cflags="${CFLAGS}" \
-	            --enable-vtysh ${ipv} ${snmp} ${pam} \
-		    --sysconfdir=/etc/quagga \
-		    --includedir=${D}/usr/include/quagga \
-		    --libdir=${D}/usr/lib/quagga \
-			|| die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /etc/quagga || die
-	dodir /etc/quagga/sample || die
-	mv ${D}/etc/*sample* ${D}/etc/quagga/sample || die
-
-	keepdir /var/run/quagga || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra || die
-	newexe ${FILESDIR}/init/ripd ripd || die
-	newexe ${FILESDIR}/init/ospfd ospfd || die
-	newexe ${FILESDIR}/init/bgpd bgpd || die
-
-	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
-	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
-	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
-
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.96.5.ebuild b/net-misc/quagga/quagga-0.96.5.ebuild
deleted file mode 100644
index 66dbad3222dc..000000000000
--- a/net-misc/quagga/quagga-0.96.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.96.5.ebuild,v 1.3 2005/03/20 18:09:43 mrness Exp $
-
-inherit eutils
-
-MD5_PATCH="ht-20040525-0.96.5-bgp-md5.patch"
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	tcpmd5? ( http://hasso.linux.ee/quagga/$MD5_PATCH )"
-
-IUSE="ipv6 snmp pam tcpmd5"
-
-DEPEND="virtual/libc
-	sys-devel/binutils
-	>=sys-libs/libcap-1.10-r3
-	!sys-apps/zebra
-	!sys-apps/zebra-ag-svn
-	!sys-apps/zebra-pj-cvs
-	!sys-apps/quagga-ag-svn-HEAD
-	!sys-apps/quagga-svn-HEAD"
-
-[ -z "${QUAGGA_GROUP_GID}" ] && QUAGGA_GROUP_GID=441
-[ -z "${QUAGGA_GROUP_NAME}" ] && QUAGGA_GROUP_NAME="quagga"
-[ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
-[ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
-[ -z "${QUAGGA_USER_SH}" ] && QUAGGA_USER_SH="/bin/false"
-[ -z "${QUAGGA_USER_HOMEDIR}" ] && QUAGGA_USER_HOMEDIR=/var/empty
-[ -z "${QUAGGA_USER_GROUPS}" ] && QUAGGA_USER_GROUPS=${QUAGGA_GROUP_NAME}
-
-pkg_preinst() {
-	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
-	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
-}
-
-src_compile() {
-	local ipv
-	local snmp
-	local pam
-	local tcpmd5
-
-	use ipv6 && ipv="--enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" || ipv="--disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use snmp && snmp="--enable-snmp"
-	use pam && pam="--with-libpam"
-
-	use tcpmd5 && tcpmd5="--enable-tcp-md5"
-	use tcpmd5 && epatch ${DISTDIR}/$MD5_PATCH
-
-	# update makefiles
-
-	export WANT_AUTOMAKE=1.7
-
-	./update-autotools || die
-
-	#
-	# ipforward detection is broken (and usersandbox will break it too)
-	# thanks to Merlin from irc://irc.freenode.net/#quagga
-	#
-	export IPFORWARD=ipforward_proc.o
-	export zebra_ipforward_path="proc"
-
-	# configure the stuff
-
-	./configure --host=${CHOST} --prefix=/usr --enable-tcp-zebra \
-	            --enable-nssa --enable-opaque-lsa --enable-ospf-te \
-		    --enable-ospf-secondary \
-		    --enable-user=${QUAGGA_USER} \
-		    --enable-group=${QUAGGA_GROUP} \
-		    --enable-vty-group=${QUAGGA_VTYGROUP} \
-		    --with-cflags="${CFLAGS}" \
-	            --enable-vtysh ${ipv} ${snmp} ${pam} ${tcpmd5} \
-		    --sysconfdir=/etc/quagga \
-		    --enable-exampledir=${D}/etc/quagga/samples \
-		    --includedir=${D}/usr/include/quagga \
-		    --libdir=${D}/usr/lib/quagga \
-			|| die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /etc/quagga || die
-	dodir /etc/quagga/samples || die
-
-	keepdir /var/run/quagga || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra || die
-	newexe ${FILESDIR}/init/ripd ripd || die
-	newexe ${FILESDIR}/init/ospfd ospfd || die
-	newexe ${FILESDIR}/init/bgpd bgpd || die
-
-	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
-	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
-	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
-
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.97.1.ebuild b/net-misc/quagga/quagga-0.97.1.ebuild
deleted file mode 100644
index 2f77493b000a..000000000000
--- a/net-misc/quagga/quagga-0.97.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.97.1.ebuild,v 1.3 2005/03/20 18:09:43 mrness Exp $
-
-inherit eutils
-
-MD5_PATCH="ht-20040525-0.96.5-bgp-md5.patch"
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	tcpmd5? ( http://hasso.linux.ee/quagga/$MD5_PATCH )"
-
-IUSE="ipv6 snmp pam tcpmd5 ospfapi"
-
-DEPEND="virtual/libc
-	sys-devel/binutils
-	sys-apps/iproute2
-	>=sys-libs/libcap-1.10-r3
-	!sys-apps/zebra
-	!sys-apps/zebra-ag-svn
-	!sys-apps/zebra-pj-cvs
-	!sys-apps/quagga-ag-svn-HEAD
-	!sys-apps/quagga-svn-HEAD"
-
-[ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
-[ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
-[ -z "${QUAGGA_GROUP_NAME}" ] && QUAGGA_GROUP_NAME="quagga"
-[ -z "${QUAGGA_GROUP_GID}" ] && QUAGGA_GROUP_GID=441
-[ -z "${QUAGGA_VTYGROUP}" ] && QUAGGA_VTYGROUP="quagga"
-[ -z "${QUAGGA_USER_SH}" ] && QUAGGA_USER_SH="/bin/false"
-[ -z "${QUAGGA_USER_HOMEDIR}" ] && QUAGGA_USER_HOMEDIR=/var/empty
-[ -z "${QUAGGA_USER_GROUPS}" ] && QUAGGA_USER_GROUPS=${QUAGGA_GROUP_NAME}
-[ -z "${QUAGGA_STATEDIR}" ] && QUAGGA_STATEDIR=/var/run/quagga
-
-pkg_preinst() {
-	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
-	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	[ -d ${FILESDIR}/patches-${PV} ] && epatch ${FILESDIR}/patches-${PV}
-}
-
-src_compile() {
-	local ipv
-	local snmp
-	local pam
-	local tcpmd5
-	local ospfapi
-
-	use ipv6 && ipv="--enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" || ipv="--disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use snmp && snmp="--enable-snmp"
-	use pam && pam="--with-libpam"
-
-	use tcpmd5 && tcpmd5="--enable-tcp-md5"
-	use tcpmd5 && epatch ${DISTDIR}/$MD5_PATCH
-
-	use ospfapi && ospfapi="--enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-
-	# update makefiles
-
-	export WANT_AUTOMAKE=1.7
-
-	./update-autotools || die
-
-	#
-	# ipforward detection is broken (and usersandbox will break it too)
-	# thanks to Merlin from irc://irc.freenode.net/#quagga
-	#
-	export IPFORWARD=ipforward_proc.o
-	export zebra_ipforward_path="proc"
-
-	# configure the stuff
-
-	./configure --host=${CHOST} \
-		    --prefix=${D}/usr \
-		    --enable-tcp-zebra \
-	            --enable-nssa \
-		    --enable-user=${QUAGGA_USER} \
-		    --enable-group=${QUAGGA_GROUP} \
-		    --enable-vty-group=${QUAGGA_VTYGROUP} \
-		    --with-cflags="${CFLAGS}" \
-	            --enable-vtysh ${ipv} ${snmp} ${pam} ${tcpmd5} ${ospfapi} \
-		    --sysconfdir=/etc/quagga \
-		    --enable-exampledir=${D}/etc/quagga/samples \
-		    --includedir=${D}/usr/include \
-		    --localstatedir=${QUAGGA_STATEDIR} \
-		    --libdir=${D}/usr/lib/quagga \
-			|| die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /etc/quagga || die
-	dodir /etc/quagga/samples || die
-
-	keepdir /var/run/quagga || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra || die
-	newexe ${FILESDIR}/init/ripd ripd || die
-	newexe ${FILESDIR}/init/ospfd ospfd || die
-	newexe ${FILESDIR}/init/bgpd bgpd || die
-
-	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
-	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
-	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
-
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}
diff --git a/net-misc/quagga/quagga-0.97.2.ebuild b/net-misc/quagga/quagga-0.97.2.ebuild
deleted file mode 100644
index 602a0d5a2e76..000000000000
--- a/net-misc/quagga/quagga-0.97.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/quagga/quagga-0.97.2.ebuild,v 1.3 2005/03/20 18:09:43 mrness Exp $
-
-inherit eutils
-
-MD5_PATCH="ht-20040525-0.96.5-bgp-md5.patch"
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP. Includes OSPFAPI, NET-SNMP and IPV6 support."
-HOMEPAGE="http://quagga.net/"
-SRC_URI="http://www.quagga.net/download/${P}.tar.gz
-	tcpmd5? ( http://hasso.linux.ee/quagga/$MD5_PATCH )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE="ipv6 snmp pam tcpmd5 ospfapi"
-
-RDEPEND="sys-apps/iproute2
-	>=sys-libs/libcap-1.10-r3
-	!sys-apps/zebra
-	!sys-apps/zebra-ag-svn
-	!sys-apps/zebra-pj-cvs
-	!sys-apps/quagga-ag-svn-HEAD
-	!sys-apps/quagga-svn-HEAD"
-DEPEND="${RDEPEND}
-	virtual/libc
-	sys-devel/binutils"
-
-[ -z "${QUAGGA_USER_NAME}" ] && QUAGGA_USER_NAME="quagga"
-[ -z "${QUAGGA_USER_UID}" ] && QUAGGA_USER_UID=441
-[ -z "${QUAGGA_GROUP_NAME}" ] && QUAGGA_GROUP_NAME="quagga"
-[ -z "${QUAGGA_GROUP_GID}" ] && QUAGGA_GROUP_GID=441
-[ -z "${QUAGGA_VTYGROUP}" ] && QUAGGA_VTYGROUP="quagga"
-[ -z "${QUAGGA_USER_SH}" ] && QUAGGA_USER_SH="/bin/false"
-[ -z "${QUAGGA_USER_HOMEDIR}" ] && QUAGGA_USER_HOMEDIR=/var/empty
-[ -z "${QUAGGA_USER_GROUPS}" ] && QUAGGA_USER_GROUPS=${QUAGGA_GROUP_NAME}
-[ -z "${QUAGGA_STATEDIR}" ] && QUAGGA_STATEDIR=/var/run/quagga
-
-pkg_preinst() {
-	enewgroup ${QUAGGA_GROUP_NAME} ${QUAGGA_GROUP_GID}
-	enewuser ${QUAGGA_USER_NAME} ${QUAGGA_USER_UID} ${QUAGGA_USER_SH} ${QUAGGA_USER_HOMEDIR} ${QUAGGA_USER_GROUPS}
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	[ -d ${FILESDIR}/patches-${PV} ] && epatch ${FILESDIR}/patches-${PV}
-}
-
-src_compile() {
-	local ipv
-	local snmp
-	local pam
-	local tcpmd5
-	local ospfapi
-
-	use ipv6 && ipv="--enable-ipv6 --enable-ripng --enable-ospf6d --enable-rtadv" || ipv="--disable-ipv6 --disable-ripngd --disable-ospf6d"
-	use snmp && snmp="--enable-snmp"
-	use pam && pam="--with-libpam"
-
-	use tcpmd5 && tcpmd5="--enable-tcp-md5"
-	use tcpmd5 && epatch ${DISTDIR}/$MD5_PATCH
-
-	use ospfapi && ospfapi="--enable-opaque-lsa --enable-ospf-te --enable-ospfclient"
-
-	# update makefiles
-
-	export WANT_AUTOMAKE=1.7
-
-	./update-autotools || die
-
-	#
-	# ipforward detection is broken (and usersandbox will break it too)
-	# thanks to Merlin from irc://irc.freenode.net/#quagga
-	#
-	export IPFORWARD=ipforward_proc.o
-	export zebra_ipforward_path="proc"
-
-	# configure the stuff
-
-	./configure --host=${CHOST} \
-		    --prefix=${D}/usr \
-		    --enable-tcp-zebra \
-	            --enable-nssa \
-		    --enable-user=${QUAGGA_USER} \
-		    --enable-group=${QUAGGA_GROUP} \
-		    --enable-vty-group=${QUAGGA_VTYGROUP} \
-		    --with-cflags="${CFLAGS}" \
-	            --enable-vtysh ${ipv} ${snmp} ${pam} ${tcpmd5} ${ospfapi} \
-		    --sysconfdir=/etc/quagga \
-		    --enable-exampledir=${D}/etc/quagga/samples \
-		    --includedir=${D}/usr/include \
-		    --localstatedir=${QUAGGA_STATEDIR} \
-		    --libdir=${D}/usr/lib/quagga \
-			|| die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodir /etc/quagga || die
-	dodir /etc/quagga/samples || die
-
-	keepdir /var/run/quagga || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/init/zebra zebra || die
-	newexe ${FILESDIR}/init/ripd ripd || die
-	newexe ${FILESDIR}/init/ospfd ospfd || die
-	newexe ${FILESDIR}/init/bgpd bgpd || die
-
-	use ipv6 && ( newexe ${FILESDIR}/init/ripngd ripngd )
-	use ipv6 && ( newexe ${FILESDIR}/init/ospf6d ospf6d )
-}
-
-pkg_postinst() {
-	# empty dir for pid files for the new priv separation auth
-	#set proper owner/group/perms even if dir already existed
-	install -d -m0700 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/etc/quagga
-	install -d -m0755 -o ${QUAGGA_USER_NAME} -g ${QUAGGA_GROUP_NAME} ${ROOT}/var/run/quagga
-
-	einfo "Sample configuration files can be found in /etc/quagga/sample."
-	einfo "You have to create config files in /etc/quagga before"
-	einfo "starting one of the daemons."
-}