Version bump, #133240. Remove old vulnerable versions.

Package-Manager: portage-2.1_rc1

15 files changed, 39 insertions, 720 deletions

diff --git a/net-p2p/gnunet/Manifest b/net-p2p/gnunet/Manifest
index 02b624cdb75f..cdf8026fac0a 100644
--- a/net-p2p/gnunet/Manifest
+++ b/net-p2p/gnunet/Manifest
@@ -1,21 +1,44 @@
-MD5 ad18c3739ef802a537ca926bd2b6d631 ChangeLog 6860
-MD5 d4a748c8e3536c6691b63794f7c17639 files/digest-gnunet-0.6.2b 66
-MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b 67
-MD5 3f90482aa89d1669318f7ec7de1943a3 files/digest-gnunet-0.6.6b-r1 67
-MD5 603beec85d7bde0052ceaeb0e5aae7e8 files/digest-gnunet-0.7.0 66
-MD5 603beec85d7bde0052ceaeb0e5aae7e8 files/digest-gnunet-0.7.0-r1 66
-MD5 603beec85d7bde0052ceaeb0e5aae7e8 files/digest-gnunet-0.7.0-r2 66
-MD5 48c64a0850a88f65b0e1a80f55891db6 files/digest-gnunet-0.7.0a 67
+AUX gnunet 805 RMD160 7b464895de53b299b2ba0779e14fb7f85fe47697 SHA1 fc72f946add2a03eb1577181f43671d416e94ef8 SHA256 657e8add8f4118f6e6cb5dd32a3e43b7965ef9f465d834a971ce1d7a32282a5f size 805
 MD5 6113da0c1798ff38d8d4c1fd4c9dfbb6 files/gnunet 805
-MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-0.6.6b 794
-MD5 a38f2ed0178c5ebc09e4f5fc2c3baddd files/gnunet-0.6.6b-autotools.patch 2065
+RMD160 7b464895de53b299b2ba0779e14fb7f85fe47697 files/gnunet 805
+SHA256 657e8add8f4118f6e6cb5dd32a3e43b7965ef9f465d834a971ce1d7a32282a5f files/gnunet 805
+AUX gnunet-0.7.0d-nulludp.patch 1786 RMD160 b8c401f50cda123ad84253deb1faccbc4174577d SHA1 b7e601040e271dffa8eb4e0599bb5febea94f28c SHA256 fb30fdb2b7340448dc159dadb10f1db96742c46cdc7c00269499a54fe874baa1 size 1786
+MD5 43a498d19d58d3154e9c5661cf4a5770 files/gnunet-0.7.0d-nulludp.patch 1786
+RMD160 b8c401f50cda123ad84253deb1faccbc4174577d files/gnunet-0.7.0d-nulludp.patch 1786
+SHA256 fb30fdb2b7340448dc159dadb10f1db96742c46cdc7c00269499a54fe874baa1 files/gnunet-0.7.0d-nulludp.patch 1786
+AUX gnunet-2 794 RMD160 9b7a433a378ff48b6c1b34a8509bd7f2d788ae54 SHA1 9aede3efd80702fd33cc1b9ba2fb849426dfd0d5 SHA256 87107a50755a4f61f31311ee51359814632d8f8e87483aac482f56b5ccad594c size 794
+MD5 6ac0938893978d5f2bc22bf808bc0fe3 files/gnunet-2 794
+RMD160 9b7a433a378ff48b6c1b34a8509bd7f2d788ae54 files/gnunet-2 794
+SHA256 87107a50755a4f61f31311ee51359814632d8f8e87483aac482f56b5ccad594c files/gnunet-2 794
+AUX gnunet-download-manager.scm 13338 RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 SHA1 2132de94ddeb3dbdb0f6f0935cc5aa591b1f5ca9 SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa size 13338
 MD5 7e0bb86547b0ad5e7744374d32c124f8 files/gnunet-download-manager.scm 13338
+RMD160 a8eaa266c3cbc012fcce4a011ad410b7f0630482 files/gnunet-download-manager.scm 13338
+SHA256 a49047daf991597c869e43d300808990e3edfdf4f814a3e18b08d763fa84d7aa files/gnunet-download-manager.scm 13338
+AUX gnunet-ipv6-gentoo.patch 1891 RMD160 5cc10163fde086e3d4e4f7f2f06a51a7f669267c SHA1 54656c72c6b24d99e1803dad54f439309fe601bf SHA256 9271f7bd4c40d26b10984b4f3b077eb1c8401a9ea7e78f12dcd374b4ec2f7482 size 1891
 MD5 53aa63a0ddf902a57c6ac427560b9664 files/gnunet-ipv6-gentoo.patch 1891
+RMD160 5cc10163fde086e3d4e4f7f2f06a51a7f669267c files/gnunet-ipv6-gentoo.patch 1891
+SHA256 9271f7bd4c40d26b10984b4f3b077eb1c8401a9ea7e78f12dcd374b4ec2f7482 files/gnunet-ipv6-gentoo.patch 1891
+DIST GNUnet-0.6.2b.tar.bz2 980714 RMD160 6bcf1f1a12b1a15c745bea1fbe0c77f450613907 SHA256 015dc02aef8ea748723829d27b76c03fe48dc685082e858a9f48bcdf493d02e4 size 980714
+DIST GNUnet-0.7.0d.tar.bz2 1371958 RMD160 b00d19a326ca0ae92641b89d3039f02782b286d6 SHA256 990c00d41cb31b52ca30e54ad833327e73f22eca602fdb374bbf1e3eebe0ee33 size 1371958
+EBUILD gnunet-0.6.2b.ebuild 1611 RMD160 7bb9e1aeb0604b9be28ab109d08960e268da94da SHA1 b76f17a8ab5433b1ab4adeec6c9963e74db5d21e SHA256 0015404fd6bafbf66c3be8f4f7e73967ed168e822d7cb3a561ef11340e339b9d size 1611
 MD5 3d78de0ed5d6b9f64a9f638fe2b94e66 gnunet-0.6.2b.ebuild 1611
-MD5 3f1cee68cfeffdb201bb272c3cce4d58 gnunet-0.6.6b-r1.ebuild 2498
-MD5 54bf4182ef80c96144126d4872202b60 gnunet-0.6.6b.ebuild 2391
-MD5 bfa2fa1c39467cbb467197f62ce707ce gnunet-0.7.0-r1.ebuild 2730
-MD5 6f0a68bbed8062c3398591a191e76f82 gnunet-0.7.0-r2.ebuild 3010
-MD5 e5786c00cf6fbfa84ea9e4e00b36db2f gnunet-0.7.0.ebuild 2328
-MD5 eaeccc03b422f62e8e6c984606c75766 gnunet-0.7.0a.ebuild 2999
+RMD160 7bb9e1aeb0604b9be28ab109d08960e268da94da gnunet-0.6.2b.ebuild 1611
+SHA256 0015404fd6bafbf66c3be8f4f7e73967ed168e822d7cb3a561ef11340e339b9d gnunet-0.6.2b.ebuild 1611
+EBUILD gnunet-0.7.0d.ebuild 3061 RMD160 6dcb283dc1279583ff892d6fe061cd4a13506aa7 SHA1 6b12eaebe1181c1e4cbfd494c37efa5c21f8723c SHA256 ecbdbfe6555e57afd7543116c5f4cfad0a0c47db52e67fe379ac00ef41667c42 size 3061
+MD5 611342df46ecbf80b268385b700f2c90 gnunet-0.7.0d.ebuild 3061
+RMD160 6dcb283dc1279583ff892d6fe061cd4a13506aa7 gnunet-0.7.0d.ebuild 3061
+SHA256 ecbdbfe6555e57afd7543116c5f4cfad0a0c47db52e67fe379ac00ef41667c42 gnunet-0.7.0d.ebuild 3061
+MISC ChangeLog 7288 RMD160 9c54be09358d16ff08d4150cd116e39377169432 SHA1 fe7d26edb04040be6a4acd9c3eb2fa7348da6ae1 SHA256 59618254e1db8df16d6f165f11afe86d0439629631f7fe3beb7e359201194003 size 7288
+MD5 d1df9ab296f00aea522832d02ddc1f38 ChangeLog 7288
+RMD160 9c54be09358d16ff08d4150cd116e39377169432 ChangeLog 7288
+SHA256 59618254e1db8df16d6f165f11afe86d0439629631f7fe3beb7e359201194003 ChangeLog 7288
+MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f size 160
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
+RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
+SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
+MD5 6ce9d92e8ab6a73cef4c8e29cce36c8c files/digest-gnunet-0.6.2b 244
+RMD160 bd97f84d83a7197cb229de8f774612691cd9136a files/digest-gnunet-0.6.2b 244
+SHA256 092786c4af78a5cd861245cbc788da345ddfae1568c32591307f4a510013b744 files/digest-gnunet-0.6.2b 244
+MD5 537107f4b66dea38ea029113603e8de7 files/digest-gnunet-0.7.0d 247
+RMD160 45d0ebeb08c6fa5584b247089f1d2dc6cac8737d files/digest-gnunet-0.7.0d 247
+SHA256 5a0df1570db2a84cf81a2232e7445616f6c132f41e6eb0c16849592f4c3c903e files/digest-gnunet-0.7.0d 247
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.6b b/net-p2p/gnunet/files/digest-gnunet-0.6.6b
deleted file mode 100644
index 467660b4348f..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.6.6b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc04ecf7d1e7d4ccfde62fad101a301f GNUnet-0.6.6b.tar.bz2 1291441
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1 b/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1
deleted file mode 100644
index 467660b4348f..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.6.6b-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc04ecf7d1e7d4ccfde62fad101a301f GNUnet-0.6.6b.tar.bz2 1291441
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0 b/net-p2p/gnunet/files/digest-gnunet-0.7.0
deleted file mode 100644
index 34ba0b44950e..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.7.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 182598e8769210e32d865a62743b534e GNUnet-0.7.0.tar.bz2 1302295
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1 b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1
deleted file mode 100644
index 34ba0b44950e..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 182598e8769210e32d865a62743b534e GNUnet-0.7.0.tar.bz2 1302295
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2 b/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2
deleted file mode 100644
index 34ba0b44950e..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.7.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 182598e8769210e32d865a62743b534e GNUnet-0.7.0.tar.bz2 1302295
diff --git a/net-p2p/gnunet/files/digest-gnunet-0.7.0a b/net-p2p/gnunet/files/digest-gnunet-0.7.0a
deleted file mode 100644
index 2147e15b2106..000000000000
--- a/net-p2p/gnunet/files/digest-gnunet-0.7.0a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1793fa431f8e2c8d9b1880d48f72f987 GNUnet-0.7.0a.tar.bz2 1305007
diff --git a/net-p2p/gnunet/files/gnunet-0.6.6b b/net-p2p/gnunet/files/gnunet-0.6.6b
deleted file mode 100644
index 4d2da5e7c2f9..000000000000
--- a/net-p2p/gnunet/files/gnunet-0.6.6b
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-# description:  Gnunet is an anonymous distributed secure network
-#               this server is required to connect to the network,
-#               it will open a TCP port to communicate with the
-#               GUI and an UDP port to communicate with the world.
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting GNUnet"
-	# -u username, -c path to gnunet.conf file
-	start-stop-daemon --start --quiet --background --exec /usr/bin/gnunetd \
-		-- -u gnunet -c /etc/gnunet.conf
-	eend $? "Failed to start GNUnet"
-}
-
-stop() {
-	ebegin "Stopping GNUnet"
-	killall gnunetd
-	eend $? "Failed to stop GNUnet"
-}
-
-restart() {
-        svc_stop
-        sleep 3
-        svc_start
-}
diff --git a/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch b/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch
deleted file mode 100644
index 7cf6a3e61a3c..000000000000
--- a/net-p2p/gnunet/files/gnunet-0.6.6b-autotools.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur GNUnet-0.6.6b.orig/configure.ac GNUnet-0.6.6b/configure.ac
---- GNUnet-0.6.6b.orig/configure.ac	2005-02-28 04:03:38.000000000 +0100
-+++ GNUnet-0.6.6b/configure.ac	2005-05-30 00:47:45.947668208 +0200
-@@ -235,7 +235,6 @@
-         CPPFLAGS="-I$with_extractor/include $CPPFLAGS"
-         AC_CHECK_HEADERS(extractor.h,
-           AC_CHECK_LIB([extractor], [EXTRACTOR_loadDefaultLibraries],
--            EXT_LIB_PATH="-L$with_extractor/lib $EXT_LIB_PATH"
-             extractor=1))
-         ;;
-     esac
-@@ -268,7 +267,6 @@
-     CPPFLAGS="-I$with_gdbm/include $CPPFLAGS"
-     AC_CHECK_HEADERS(gdbm.h,
-      AC_CHECK_LIB(gdbm, gdbm_open,
--      EXT_LIB_PATH="-L$with_gdbm/lib $EXT_LIB_PATH"
-       gdb=true))
-     ;;
-    esac
-@@ -291,7 +289,6 @@
-     CPPFLAGS="-I$with_tdb/include $CPPFLAGS"
-     AC_CHECK_HEADERS(tdb.h,
-      AC_CHECK_LIB(tdb, tdb_open,
--      EXT_LIB_PATH="-L$with_tdb/lib $EXT_LIB_PATH"
-       tdb=true))
-    fi
-   ],
-@@ -313,7 +310,6 @@
-     LDFLAGS="-L$with_bdb/lib $LDFLAGS"
-     CPPFLAGS="-I$with_bdb/include $CPPFLAGS"
-     AC_CHECK_HEADERS(db.h,
--      EXT_LIB_PATH="-L$with_bdb/lib $EXT_LIB_PATH"
-       bdb=true)
-    fi
-   ],
-@@ -358,7 +354,6 @@
-     LDFLAGS="-L$with_sqlite/lib $LDFLAGS"
-     CPPFLAGS="-I$with_sqlite/include $CPPFLAGS"
-     AC_CHECK_HEADERS(sqlite3.h,
--     EXT_LIB_PATH="-L$with_sqlite/lib $EXT_LIB_PATH"
-      sqlite=true)
-     ;;
-    esac
-@@ -385,11 +380,9 @@
-   [AC_MSG_RESULT("$with_mysql")
-    if test "$with_mysql" != "no"
-    then
--    LDFLAGS="-L$with_mysql/lib -L$with_mysql/lib/mysql $LDFLAGS $ZLIBS"
--    CPPFLAGS="-I$with_mysql/include $CPPFLAGS"
-+    LDFLAGS="$LDFLAGS $ZLIBS"
-     AC_CHECK_HEADERS(mysql/mysql.h,
-      AC_CHECK_LIB(mysqlclient, mysql_init,
--      EXT_LIB_PATH="-L$with_mysql/lib -L$with_mysql/lib/mysql $EXT_LIB_PATH"
-       mysql=true))
-    fi
-   ],
-@@ -397,7 +390,6 @@
-    LDFLAGS="-L/usr/lib/mysql $LDFLAGS $ZLIBS"
-    AC_CHECK_LIB(mysqlclient, mysql_init,
-     [AC_CHECK_HEADERS(mysql/mysql.h,
--      EXT_LIB_PATH="-L/usr/lib/mysql $EXT_LIB_PATH"
-       mysql=true
-      )])])
- 
diff --git a/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild b/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild
deleted file mode 100644
index 253a51606542..000000000000
--- a/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.6b-r1.ebuild,v 1.3 2005/09/05 20:03:36 weeve Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 mysql sqlite guile nls gdbm"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=x11-libs/gtk+-2.6.0
-	>=media-libs/libextractor-0.3.1
-	>=dev-libs/gmp-4.0.0
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-autotools.patch
-	libtoolize --copy --force
-	use ipv6 && epatch ${FILESDIR}/${PN}-ipv6-gentoo.patch
-}
-
-src_compile() {
-#	elibtoolize --copy --force
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	econf $(use_with gdbm) \
-		$(use_with mysql) \
-		$(use_with sqlite) \
-		$(use_enable guile) \
-		$(use_enable nls) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnunet-0.6.6b gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "If you want to run GNUnet as a user"
-	einfo "copy an appropriate config file from"
-	einfo "/usr/share/doc/${P}/contrib"
-	einfo "to ~/.gnunet/gnunet.conf"
-	einfo
-	einfo "It is also possible to run GNUnet as"
-	einfo "a system service. You can start it by"
-	einfo "running /etc/init.d/gnunet start"
-	einfo "The config file is in /etc/gnunet.conf"
-}
-
diff --git a/net-p2p/gnunet/gnunet-0.6.6b.ebuild b/net-p2p/gnunet/gnunet-0.6.6b.ebuild
deleted file mode 100644
index 14c8ab08ac58..000000000000
--- a/net-p2p/gnunet/gnunet-0.6.6b.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.6.6b.ebuild,v 1.5 2005/08/26 14:52:44 sekretarz Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 gtk mysql sqlite"
-KEYWORDS="~x86 ~ppc ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=sys-libs/gdbm-1.8.0
-	>=dev-libs/libgcrypt-1.2.0
-	gtk? ( >=x11-libs/gtk+-2.4.0 )
-	mysql? ( >=dev-db/mysql-3.23.56 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	sys-devel/gettext
-	>=media-libs/libextractor-0.3.1
-	>=dev-libs/gmp-4.0.0"
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-autotools.patch
-	libtoolize --copy --force
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf
-	use gtk || myconf="${myconf} --without-gtk"
-	use mysql && myconf="${myconf} --with-mysql"
-	use sqlite && myconf="${myconf} --with-sqlite"
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	econf ${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnunet-0.6.6b gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "If you want to run GNUnet as a user"
-	einfo "copy an appropriate config file from"
-	einfo "/usr/share/doc/${P}/contrib"
-	einfo "to ~/.gnunet/gnunet.conf"
-	einfo
-	einfo "It is also possible to run GNUnet as"
-	einfo "a system service. You can start it by"
-	einfo "running /etc/init.d/gnunet start"
-	einfo "The config file is in /etc/gnunet.conf"
-}
-
diff --git a/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild b/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild
deleted file mode 100644
index 48c451697b81..000000000000
--- a/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0-r1.ebuild,v 1.1 2005/09/27 13:16:08 mkay Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 mysql sqlite guile nls"
-KEYWORDS="~x86 ~ppc ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=media-libs/libextractor-0.5.4
-	>=dev-libs/gmp-4.0.0
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.6.10
-	sys-apps/sed
-	ncurses? ( sys-libs/ncurses )
-	mysql? ( >=dev-db/mysql-4.0.24 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )"
-
-
-pkg_setup() {
-	if ! use mysql && ! use sqlite; then
-		einfo
-		einfo "You need to specify at least one of 'mysql' or 'sqlite'"
-		einfo "USE flag in order to have properly installed gnunet"
-		einfo
-		die "Invalid USE flag set"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	! use sqlite && \
-		sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
-		contrib/config-daemon.in
-}
-
-src_compile() {
-#	elibtoolize --copy --force
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	use mysql || myconf="${myconf} --without-mysql"
-
-	econf \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		$(use_enable ncurses) \
-		$(use_enable guile) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnunet-0.7.0 gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "To configure"
-	einfo "  1) Add user(s) to the gnunet group"
-	einfo "  2) Run 'gnunet-setup' to generate your client config file"
-	einfo "  3) Run gnunet-setup -d to generate a server config file"
-	einfo "  4) Optionally copy the .gnunet/gnunetd.conf into /etc and use as a global server config file"
-	einfo
-}
-
diff --git a/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild b/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild
deleted file mode 100644
index 1bf71f8d0824..000000000000
--- a/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0-r2.ebuild,v 1.2 2005/10/02 04:20:39 weeve Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 mysql sqlite guile nls gtk"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=media-libs/libextractor-0.5.4
-	>=dev-libs/gmp-4.0.0
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.6.10 )
-	sys-apps/sed
-	ncurses? ( sys-libs/ncurses )
-	mysql? ( >=dev-db/mysql-4.0.24 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )"
-
-
-pkg_setup() {
-	if ! use mysql && ! use sqlite; then
-		einfo
-		einfo "You need to specify at least one of 'mysql' or 'sqlite'"
-		einfo "USE flag in order to have properly installed gnunet"
-		einfo
-		die "Invalid USE flag set"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# make mysql default sqstore if we do not compile sql support 
-	# (bug #107330)
-	! use sqlite && \
-		sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
-		contrib/config-daemon.in
-
-	# we do not want to built gtk support with USE=-gtk	
-	if ! use gtk ; then
-		sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac
-		autoconf || die "autoconf failed"
-		libtoolize --copy --force
-	fi
-}
-
-src_compile() {
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	use mysql || myconf="${myconf} --without-mysql"
-
-	econf \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		$(use_enable ncurses) \
-		$(use_enable guile) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnunet-0.7.0 gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "To configure"
-	einfo "  1) Add user(s) to the gnunet group"
-	einfo "  2) Run 'gnunet-setup' to generate your client config file"
-	einfo "  3) Run gnunet-setup -d to generate a server config file"
-	einfo "  4) Optionally copy the .gnunet/gnunetd.conf into /etc and use as a global server config file"
-	einfo
-}
-
diff --git a/net-p2p/gnunet/gnunet-0.7.0.ebuild b/net-p2p/gnunet/gnunet-0.7.0.ebuild
deleted file mode 100644
index 62a073b1987c..000000000000
--- a/net-p2p/gnunet/gnunet-0.7.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0.ebuild,v 1.4 2005/09/26 23:06:00 mkay Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 mysql sqlite guile nls"
-KEYWORDS="~x86 ~ppc ~amd64"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=media-libs/libextractor-0.5.4
-	>=dev-libs/gmp-4.0.0
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.6.10
-	ncurses? ( sys-libs/ncurses )
-	mysql? ( >=dev-db/mysql-4.0.24 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )"
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_compile() {
-#	elibtoolize --copy --force
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	use mysql || myconf="${myconf} --without-mysql"
-
-	econf \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		$(use_enable ncurses) \
-		$(use_enable guile) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/gnunet-0.7.0 gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "To configure"
-	einfo "  1) Add user(s) to the gnunet group"
-	einfo "  2) Run 'gnunet-setup' to generate your client config file"
-	einfo "  3) Run gnunet-setup -d to generate a server config file"
-	einfo "  4) Optionally copy the .gnunet/gnunetd.conf into /etc and use as a global server config file"
-	einfo
-}
-
diff --git a/net-p2p/gnunet/gnunet-0.7.0a.ebuild b/net-p2p/gnunet/gnunet-0.7.0a.ebuild
deleted file mode 100644
index dfb7f75412eb..000000000000
--- a/net-p2p/gnunet/gnunet-0.7.0a.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gnunet/gnunet-0.7.0a.ebuild,v 1.1 2006/01/13 13:22:45 mkay Exp $
-
-inherit eutils libtool
-
-S="${WORKDIR}/GNUnet-${PV}"
-DESCRIPTION="GNUnet is an anonymous, distributed, reputation based network."
-HOMEPAGE="http://www.gnu.org/software/GNUnet/"
-SRC_URI="mirror://gnu//${PN}/GNUnet-${PV}.tar.bz2"
-RESTRICT="nomirror"
-
-IUSE="ipv6 mysql sqlite guile nls gtk"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND=">=dev-libs/libgcrypt-1.2.0
-	>=media-libs/libextractor-0.5.4
-	>=dev-libs/gmp-4.0.0
-	sys-libs/zlib
-	gtk? ( >=x11-libs/gtk+-2.6.10 )
-	sys-apps/sed
-	ncurses? ( sys-libs/ncurses )
-	mysql? ( >=dev-db/mysql-4.0.24 )
-	sqlite? ( >=dev-db/sqlite-3.0.8 )
-	guile? ( >=dev-util/guile-1.6.0 )
-	nls? ( sys-devel/gettext )"
-
-
-pkg_setup() {
-	if ! use mysql && ! use sqlite; then
-		einfo
-		einfo "You need to specify at least one of 'mysql' or 'sqlite'"
-		einfo "USE flag in order to have properly installed gnunet"
-		einfo
-		die "Invalid USE flag set"
-	fi
-}
-
-pkg_preinst() {
-	enewgroup gnunet || die "Problem adding gnunet group"
-	enewuser gnunet -1 -1 /dev/null gnunet || die "Problem adding gnunet user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# make mysql default sqstore if we do not compile sql support 
-	# (bug #107330)
-	! use sqlite && \
-		sed -i 's:default "sqstore_sqlite":default "sqstore_mysql":' \
-		contrib/config-daemon.in
-
-	# we do not want to built gtk support with USE=-gtk	
-	if ! use gtk ; then
-		sed -i "s:AC_DEFINE_UNQUOTED..HAVE_GTK.*:true:" configure.ac
-		autoconf || die "autoconf failed"
-		libtoolize --copy --force
-	fi
-}
-
-src_compile() {
-
-	local myconf
-
-	if use ipv6; then
-		if use amd64; then
-			ewarn "ipv6 in GNUnet does not currently work with amd64 and has been disabled"
-		else
-			myconf="${myconf} --enable-ipv6"
-		fi
-	fi
-
-	use mysql || myconf="${myconf} --without-mysql"
-
-	econf \
-		$(use_with sqlite) \
-		$(use_enable nls) \
-		$(use_enable ncurses) \
-		$(use_enable guile) \
-		${myconf} || die "econf failed"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS PLATFORMS README	README.fr UPDATING
-	insinto /etc
-	newins contrib/gnunet.root gnunet.conf
-	docinto contrib
-	dodoc contrib/*
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/${P} gnunet
-	dodir /var/lib/GNUnet
-	chown gnunet:gnunet ${D}/var/lib/GNUnet
-}
-
-pkg_postinst() {
-	# make sure permissions are ok
-	chown -R gnunet:gnunet /var/lib/GNUnet
-
-	use ipv6 && ewarn "ipv6 support is -very- experimental and prone to bugs"
-	einfo
-	einfo "To configure"
-	einfo "  1) Add user(s) to the gnunet group"
-	einfo "  2) Run 'gnunet-setup' to generate your client config file"
-	einfo "  3) Run gnunet-setup -d to generate a server config file"
-	einfo "  4) Optionally copy the .gnunet/gnunetd.conf into /etc and use as a global server config file"
-	einfo
-}
-