12 files changed, 28 insertions, 165 deletions
diff --git a/net-p2p/gnunet/ChangeLog b/net-p2p/gnunet/ChangeLog
index b89c9ed9aafe..df6bb6c4c63e 100644
--- a/net-p2p/gnunet/ChangeLog
+++ b/net-p2p/gnunet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/gnunet
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.17 2004/03/23 07:00:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/ChangeLog,v 1.18 2004/03/23 07:08:58 eradicator Exp $
+
+  22 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gnunet-0.5.4-r1.ebuild, gnunet-0.5.5.ebuild, gnunet-0.6.0.ebuild,
+  gnunet-0.6.0a.ebuild, gnunet-0.6.1a.ebuild, gnunet-0.6.1b.ebuild,
+  gnunet-0.6.1c.ebuild:
+  Updated webpage and SRC_URI to gnu locations. Removed old ebuilds.
 
 *gnunet-0.6.1c (22 Mar 2004)
 
diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 7e9eeb3486a2..488e53986f0d 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,17 +1,11 @@
-MD5 af40663d414a00003cb68ac323446328 gnunet-0.6.1a.ebuild 1184
-MD5 d570e375ccb81948470be2be31d9792b gnunet-0.5.5.ebuild 1226
-MD5 cbc06a35d72ef03f15b29ea53282c4b7 gnunet-0.6.1c.ebuild 1458
-MD5 f05eea8715e7e9a095b6caa0b929124d gnunet-0.5.4-r1.ebuild 1228
-MD5 1c0b313d8804b1deff33fd80546a1b85 gnunet-0.6.0.ebuild 1186
-MD5 091e89d035cfae47d982e274f98d13ad gnunet-0.6.0a.ebuild 1187
-MD5 7bd8371cb9f9f8a331ea69c595e9652f gnunet-0.6.1b.ebuild 1187
-MD5 a76f3d582f508b4f12374d4cb3fa4c32 ChangeLog 2895
+MD5 2d8578e511d8f07d1c294c2259712c95 gnunet-0.5.5.ebuild 1237
+MD5 0fde2be6a7b62e679b4c3a61eeea13e8 gnunet-0.6.1c.ebuild 1469
+MD5 27f23596a1fd7b506768126eb9cb6698 gnunet-0.5.4-r1.ebuild 1239
+MD5 f34c328e3b12aa9ea4c1ab1a706744fd gnunet-0.6.1b.ebuild 1198
+MD5 10013c3dabc89f277ac212d956880dfc ChangeLog 3182
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 2658ede38f1e73c88080557c4e205733 files/digest-gnunet-0.6.0a 66
-MD5 a20919e30834d0a07c9b380df9b8ee81 files/digest-gnunet-0.6.1a 67
 MD5 7497a53319c18a07e6f673a925b1bf8c files/digest-gnunet-0.6.1b 67
 MD5 99094e50a9e664c0f98757ec36e1b5fe files/digest-gnunet-0.6.1c 67
 MD5 c9f162707edf3372ba994a5d274c1280 files/digest-gnunet-0.5.5 65
-MD5 9e8613dc69495f49622a2588b1a816a8 files/digest-gnunet-0.6.0 65
 MD5 d628356df7b12ee797cbd14ac6918610 files/gnunet 947
 MD5 12b0bdd38d4a838fcc6d4e8b970870f5 files/digest-gnunet-0.5.4-r1 65
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.0 b/net-p2p/gnunet/files/digest-gnunet-0.6.0
deleted file mode 100644
index 22f7affbc71c..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ca228d22f68f46218420b5ec97a2d32 GNUnet-0.6.0.tar.bz2 898751
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.0a b/net-p2p/gnunet/files/digest-gnunet-0.6.0a
deleted file mode 100644
index bb0b5f10971e..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.6.0a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 141b4a0df8fffa564a90cb422553c828 GNUnet-0.6.0a.tar.bz2 863865
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.1a b/net-p2p/gnunet/files/digest-gnunet-0.6.1a
deleted file mode 100644
index 9accb6805d75..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.6.1a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4a82b579007afe3e1a64fa7d6a9cd028 GNUnet-0.6.1a.tar.bz2 1055361
diff --git a/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild b/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild
index 9b098a3dd9c4..e954dc49cac3 100644
--- a/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild
+++ b/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild,v 1.5 2004/03/01 06:26:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.5.4-r1.ebuild,v 1.6 2004/03/23 07:08:58 eradicator Exp $
 
 inherit libtool
 
 S="${WORKDIR}/GNUnet-${PV}"
 DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/GNUnet/"
+SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2"
+RESTRICT="nomirror"
 
 IUSE="ipv6"
 
diff --git a/net-p2p/gnunet/gnunet-0.5.5.ebuild b/net-p2p/gnunet/gnunet-0.5.5.ebuild
index 19ea2eec24a4..c77c22c49527 100644
--- a/net-p2p/gnunet/gnunet-0.5.5.ebuild
+++ b/net-p2p/gnunet/gnunet-0.5.5.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.5.5.ebuild,v 1.2 2004/03/01 06:26:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.5.5.ebuild,v 1.3 2004/03/23 07:08:58 eradicator Exp $
 
 inherit libtool
 
 S="${WORKDIR}/GNUnet-${PV}"
 DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/GNUnet/"
+SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2"
+RESTRICT="nomirror"
 
 IUSE="ipv6"
 
diff --git a/net-p2p/gnunet/gnunet-0.6.0.ebuild b/net-p2p/gnunet/gnunet-0.6.0.ebuild
deleted file mode 100644
index bd3e16f5e72d..000000000000
--- a/net-p2p/gnunet/gnunet-0.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.0.ebuild,v 1.2 2004/03/01 06:26:59 eradicator Exp $
-
-inherit libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
-
-IUSE="ipv6"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/openssl-0.9.6d
-	>=sys-libs/gdbm-1.8.0
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=dev-libs/libextractor-0.2.5"
-
-src_compile() {
-	elibtoolize
-	econf `use_enable ipv6` || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog PLATFORMS README UPDATING
-	insinto /etc
-	newins contrib/gnunet.conf.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-}
-
-pkg_postinst() {
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug"
-	einfo
-	einfo "now copy an appropriate config file from"
-	einfo "/usr/share/doc/${P}/contrib"
-	einfo "to ~/.gnunet/gnunet.conf"
-	einfo
-}
diff --git a/net-p2p/gnunet/gnunet-0.6.0a.ebuild b/net-p2p/gnunet/gnunet-0.6.0a.ebuild
deleted file mode 100644
index eb5170c2ee4e..000000000000
--- a/net-p2p/gnunet/gnunet-0.6.0a.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.0a.ebuild,v 1.2 2004/03/01 06:26:59 eradicator Exp $
-
-inherit libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
-
-IUSE="ipv6"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/openssl-0.9.6d
-	>=sys-libs/gdbm-1.8.0
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=dev-libs/libextractor-0.2.5"
-
-src_compile() {
-	elibtoolize
-	econf `use_enable ipv6` || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog PLATFORMS README UPDATING
-	insinto /etc
-	newins contrib/gnunet.conf.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-}
-
-pkg_postinst() {
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug"
-	einfo
-	einfo "now copy an appropriate config file from"
-	einfo "/usr/share/doc/${P}/contrib"
-	einfo "to ~/.gnunet/gnunet.conf"
-	einfo
-}
diff --git a/net-p2p/gnunet/gnunet-0.6.1a.ebuild b/net-p2p/gnunet/gnunet-0.6.1a.ebuild
deleted file mode 100644
index d14b2cefe299..000000000000
--- a/net-p2p/gnunet/gnunet-0.6.1a.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1a.ebuild,v 1.1 2004/01/14 23:11:54 mholzer Exp $
-
-inherit libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
-
-IUSE="ipv6"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/openssl-0.9.6d
-	>=sys-libs/gdbm-1.8.0
-	=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	>=dev-libs/libextractor-0.2.6"
-
-src_compile() {
-	elibtoolize
-	econf `use_enable ipv6` || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog PLATFORMS README UPDATING
-	insinto /etc
-	newins contrib/gnunet.conf.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-}
-
-pkg_postinst() {
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bug"
-	einfo
-	einfo "now copy an appropriate config file from"
-	einfo "/usr/share/doc/${P}/contrib"
-	einfo "to ~/.gnunet/gnunet.conf"
-	einfo
-}
diff --git a/net-p2p/gnunet/gnunet-0.6.1b.ebuild b/net-p2p/gnunet/gnunet-0.6.1b.ebuild
index c0a33a6f68ec..9a33521d95b8 100644
--- a/net-p2p/gnunet/gnunet-0.6.1b.ebuild
+++ b/net-p2p/gnunet/gnunet-0.6.1b.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1b.ebuild,v 1.1 2004/02/27 02:36:38 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1b.ebuild,v 1.2 2004/03/23 07:08:58 eradicator Exp $
 
 inherit libtool
 
 S="${WORKDIR}/GNUnet-${PV}"
 DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/GNUnet/"
+SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2"
+RESTRICT="nomirror"
 
 IUSE="ipv6"
 
diff --git a/net-p2p/gnunet/gnunet-0.6.1c.ebuild b/net-p2p/gnunet/gnunet-0.6.1c.ebuild
index 8e2aba0498ac..9466501e3a4b 100644
--- a/net-p2p/gnunet/gnunet-0.6.1c.ebuild
+++ b/net-p2p/gnunet/gnunet-0.6.1c.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1c.ebuild,v 1.1 2004/03/23 07:00:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.1c.ebuild,v 1.2 2004/03/23 07:08:58 eradicator Exp $
 
 inherit libtool
 
 S="${WORKDIR}/GNUnet-${PV}"
 DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.ovmj.org/GNUnet/"
-SRC_URI="http://www.ovmj.org/GNUnet/download/GNUnet-${PV}.tar.bz2"
+HOMEPAGE="http://www.gnu.org/software/GNUnet/"
+SRC_URI="mirror://gnu/${PN}/GNUnet-${PV}.tar.bz2"
+RESTRICT="nomirror"
 
 IUSE="ipv6 gtk crypt mysql"