13 files changed, 51 insertions, 535 deletions
diff --git a/net-misc/bidwatcher/ChangeLog b/net-misc/bidwatcher/ChangeLog
deleted file mode 100644
index 6e4929af13dc..000000000000
--- a/net-misc/bidwatcher/ChangeLog
+++ /dev/null
@@ -1,114 +0,0 @@
-# ChangeLog for net-misc/bidwatcher
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bidwatcher/ChangeLog,v 1.30 2005/02/28 21:49:26 mholzer Exp $
-
-  28 Feb 2005; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.17.ebuild:
-  Adding curl to depend. closes 83381
-
-*bidwatcher-1.3.17 (20 Feb 2005)
-
-  20 Feb 2005; Martin Holzer <mholzer@gentoo.org> +bidwatcher-1.3.17.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.16 (12 Sep 2004)
-
-  12 Sep 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.16.ebuild:
-  Version bumped.
-
-  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bidwatcher-1.3.15.ebuild:
-  change virtual/glibc to virtual/libc
-
-  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  -bidwatcher-1.3.13.ebuild, -bidwatcher-1.3.14.ebuild:
-  clean older broken versions
-
-  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  bidwatcher-1.3.15.ebuild:
-  stablize (bug #55595)
-
-  06 May 2004; Josh Grebe <squash@gentoo.org> bidwatcher-1.3.15.ebuild:
-  Added sparc, bug 50284
-
-  25 Apr 2004; David Holm <dholm@gentoo.org> bidwatcher-1.3.15.ebuild:
-  Added to ~ppc.
-
-*bidwatcher-1.3.15 (24 Apr 2004)
-
-  24 Apr 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.15.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.14 (24 Apr 2004)
-
-  24 Apr 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.14.ebuild:
-  Version bumped.
-
-  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.13.ebuild:
-  stable as needed to work.
-
-*bidwatcher-1.3.13 (01 Mar 2004)
-
-  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.13.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.12 (29 Feb 2004)
-
-  29 Feb 2004; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.12.ebuild:
-  Version bumped. Closes 43249
-
-  19 Dec 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.11.ebuild:
-  Stable since 1.3.10 is brokne
-
-*bidwatcher-1.3.11 (17 Dec 2003)
-
-  17 Dec 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.11.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.11_rc1 (12 Dec 2003)
-
-  12 Dec 2003; Martin Holzer <mholzer@gentoo.org>
-  bidwatcher-1.3.11_rc1.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.10 (28 Jul 2003)
-
-  28 Jul 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.10.ebuild:
-  Version bumped.
-
-*bidwatcher-1.3.9 (14 Jul 2003)
-
-  14 Jul 2003; Martin Holzer <mholzer@gentoo.org> bidwatcher-1.3.9.ebuild:
-  Version bumped. closes #24464
-
-*bidwatcher-1.3.8 (18 Jun 2003)
-
-  18 Jun 2003; <msterret@gentoo.org> bidwatcher-1.3.8.ebuild:
-  version bump
-
-  18 Jun 2003; <msterret@gentoo.org> bidwatcher-1.3.7.ebuild:
-  use dohtml for html file (bug 23048); simplify ebuild, use einstall
-
-*bidwatcher-1.3.7 (25 Dec 2002)
-
-  02 Jan 2003; Martin Holzer <mholzer@gentoo.org bidwatcher-1.3.7.ebuild :
-  Makred as stable
-
-  25 Dec 2002; Martin Holzer <mholzer@gentoo.org bidwatcher-1.3.7.ebuild files/digest-bidwatcher-1.3.7 ChangeLog :
-  Version Bumped. Closees #12697.
- 
-*bidwatcher-1.3.6 (28 May 2002)
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-  15 Nov 2002; phoen][x <phoenix@gentoo.org> bidwatcher-1.3.6.ebuild,
-  files/digest-bidwatcher-1.3.6 ChangeLog :
-  Bumped bidwatcher to the newest version. This closes bug #7705.
-
-*bidwatcher-1.3.3 (28 May 2002)
-
-  6 Jul 2002; phoen][x <phoenix@gentoo.org> bidwatcher-1.3.3.ebuild :
-  Added KEYWORDS.
-
-  28 May 2002; Spider <spider@gentoo.org> ChangeLog bidwatcher-1.3.3.ebuild :
-  Initial release from bugzilla bug. modified and updated version
-  This ebuild is free target, Feel free to take over maintainance
-
diff --git a/net-misc/bidwatcher/Manifest b/net-misc/bidwatcher/Manifest
deleted file mode 100644
index 68051802a0ca..000000000000
--- a/net-misc/bidwatcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8c78b44e12cd8cc552355dae7e4c444d bidwatcher-1.3.17.ebuild 681
-MD5 a516a65322221b4309deaf8a3d98ea1f ChangeLog 3568
-MD5 272e5c1ddb5fcd46fb42c7f6d3177156 files/digest-bidwatcher-1.3.17 69
diff --git a/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild b/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild
deleted file mode 100644
index 960f26358728..000000000000
--- a/net-misc/bidwatcher/bidwatcher-1.3.17.ebuild
+++ /dev/null
@@ -1,27 +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/bidwatcher/bidwatcher-1.3.17.ebuild,v 1.2 2005/02/28 21:49:26 mholzer Exp $
-
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="eBay auction watcher and sniper agent"
-HOMEPAGE="http://bidwatcher.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*
-	>=net-misc/curl-7.11.1"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	einstall || die
-	dodoc README COPYING NEWS AUTHORS ChangeLog
-	dohtml quick_start.html
-}
diff --git a/net-misc/bidwatcher/files/digest-bidwatcher-1.3.17 b/net-misc/bidwatcher/files/digest-bidwatcher-1.3.17
deleted file mode 100644
index 1f519379b7e3..000000000000
--- a/net-misc/bidwatcher/files/digest-bidwatcher-1.3.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ea576cb86dcf36abe18436e0eba15a30 bidwatcher-1.3.17.tar.gz 193923
diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
deleted file mode 100644
index ae6a590e5357..000000000000
--- a/net-misc/freenet6/ChangeLog
+++ /dev/null
@@ -1,46 +0,0 @@
-# ChangeLog for net-misc/freenet6
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.12 2006/06/28 16:37:25 wolf31o2 Exp $
-
-  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/gentoo.sh:
-  Added a patch from Steve Egbert <s.egbert@sbcglobal.net> to fix bug #118942.
-
-  28 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> freenet6-1.0.0.ebuild:
-  Add tspc to the DESCRIPTION so it shows up in searches.  Closing bug #94283.
-
-  09 May 2006; Diego Pettenò <flameeyes@gentoo.org> freenet6-1.0.0.ebuild:
-  Add changes to build on Gentoo/*BSD (from Kiko, bug #132553) and respect
-  CC/CFLAGS/LDFLAGS.
-
-  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> freenet6-1.0.0.ebuild:
-  Stable on ppc.
-
-  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> freenet6-0.9.7.ebuild:
-  hooray for epatch!
-
-  07 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> freenet6-1.0.0.ebuild:
-  Stable on alpha.
-
-*freenet6-1.0.0 (7 Dec 2003)
-
-  07 Dec 2003; Guy Martin <gmsoft@gentoo.org> files/tspc.rc,
-  files/tspc.conf, freenet6-1.0.0.ebuild :
-  Updated version. Marking stable on x86 because old version
-  does not connect anymore. Other arches are still unstable.
-
-  11 Jun 2003; Peter Johanson <latexer@gentoo.org> files/tspc.rc:
-  missing #!/sbin/runscript
-
-  10 Jun 2003; Peter Johanson <latexer@gentoo.org> freenet6-0.9.7.ebuild,
-  files/gentoo.sh:
-  Added a gentoo.sh script which matches gentoo's placement of things. bug #21865
-
-*freenet6-0.9.7 (28 May 2003)
-
-  28 May 2003; Peter Johanson <latexer@gentoo.org> freenet6-0.9.7.ebuild,
-  files/freenet6-0.9.2.diff, files/tspc.conf, files/tspc.rc:
-  Initial import. bug#9020
-
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
deleted file mode 100644
index 968c106b221e..000000000000
--- a/net-misc/freenet6/Manifest
+++ /dev/null
@@ -1,34 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX gentoo.sh 4562 RMD160 39446e9685b3eced7fd00d1dcd0fbdb03bf7dc53 SHA1 bef8d592fd18d8336c90db1855818bc2a38d710d SHA256 a7a8ace95a1f4e70a590fd818bcb8d681ae82f7cf0030a96562ba76f8b2be2a2
-MD5 3bfb8729d0d6180fc62f05c26449d244 files/gentoo.sh 4562
-RMD160 39446e9685b3eced7fd00d1dcd0fbdb03bf7dc53 files/gentoo.sh 4562
-SHA256 a7a8ace95a1f4e70a590fd818bcb8d681ae82f7cf0030a96562ba76f8b2be2a2 files/gentoo.sh 4562
-AUX tspc.conf 1532 RMD160 87fe137a06b90007a84bbe55db6d0640aad2cc2c SHA1 6cc7bd14f05e7a20a2ce34e71e45a8ecd77c3ce9 SHA256 3fab7fad677182c2f4a60012502237e6e7fc5fb7ebd42156363a3cdfad3cf69a
-MD5 deef1b2bb4a22d01f36dbcddee29fbee files/tspc.conf 1532
-RMD160 87fe137a06b90007a84bbe55db6d0640aad2cc2c files/tspc.conf 1532
-SHA256 3fab7fad677182c2f4a60012502237e6e7fc5fb7ebd42156363a3cdfad3cf69a files/tspc.conf 1532
-AUX tspc.rc 432 RMD160 916631387a3ed7b2ecca677b187ea2461647247a SHA1 f553d69e0330aec6028b8a7a287b364f245a0deb SHA256 09c03028106d56cbb0be183554dd9be3c1603aac3e7f377f886b45c555fdd526
-MD5 1dd245fdccb36878ec96ffe243dbc46d files/tspc.rc 432
-RMD160 916631387a3ed7b2ecca677b187ea2461647247a files/tspc.rc 432
-SHA256 09c03028106d56cbb0be183554dd9be3c1603aac3e7f377f886b45c555fdd526 files/tspc.rc 432
-DIST freenet6-1.0.0.tgz 330953 RMD160 28c7cceaaea5ffe4b740d09f7dbd4aed5abac69d SHA256 0d834b55538eff2abc569aa5c7831f24525bea56354727d0f6d5933d0e5f1116
-EBUILD freenet6-1.0.0.ebuild 1631 RMD160 d1dd2890091b6d0ff86b61b1c51f5dcbc24e8327 SHA1 90086486ec3dbeac7e2a687ab2c011fa73f22377 SHA256 fbfcdd21eb7cec6d3ee100023bdf6c9a00c25af0ebb641196550f57e766ac40c
-MD5 39ba93f19b030fabb688121ff8af9e48 freenet6-1.0.0.ebuild 1631
-RMD160 d1dd2890091b6d0ff86b61b1c51f5dcbc24e8327 freenet6-1.0.0.ebuild 1631
-SHA256 fbfcdd21eb7cec6d3ee100023bdf6c9a00c25af0ebb641196550f57e766ac40c freenet6-1.0.0.ebuild 1631
-MISC ChangeLog 1804 RMD160 6b50411461f6fd66c6c048a499a32c9332a1e210 SHA1 dff8e86c8b63914466458d10059bc016e00b5ff9 SHA256 a092685aad3934af063e4b49a2bd2b8acf615f141065966b78799372ca33aa47
-MD5 abc57c6b382022716764b0dbfbbf8cd3 ChangeLog 1804
-RMD160 6b50411461f6fd66c6c048a499a32c9332a1e210 ChangeLog 1804
-SHA256 a092685aad3934af063e4b49a2bd2b8acf615f141065966b78799372ca33aa47 ChangeLog 1804
-MD5 cb720233d965392b57e29e90e0ca48ce files/digest-freenet6-1.0.0 235
-RMD160 fd997b79c7cff4e98c7349221a65ac8e9d640024 files/digest-freenet6-1.0.0 235
-SHA256 66295a2f3adc16dec752df43490e1be3b5bf94a259e6ec114afa8cd56a8e312c files/digest-freenet6-1.0.0 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEorBOkT4lNIS36YERArLHAJ4rqMwMSV8+8LkWy88RrxXNs0c2AwCghEiE
-YgtVO57D2c6rR4qMG/6+TAs=
-=v1IG
------END PGP SIGNATURE-----
diff --git a/net-misc/freenet6/files/digest-freenet6-1.0.0 b/net-misc/freenet6/files/digest-freenet6-1.0.0
deleted file mode 100644
index ac5d872da253..000000000000
--- a/net-misc/freenet6/files/digest-freenet6-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a2b4edb1d52b874587533b4cf40de1ba freenet6-1.0.0.tgz 330953
-RMD160 28c7cceaaea5ffe4b740d09f7dbd4aed5abac69d freenet6-1.0.0.tgz 330953
-SHA256 0d834b55538eff2abc569aa5c7831f24525bea56354727d0f6d5933d0e5f1116 freenet6-1.0.0.tgz 330953
diff --git a/net-misc/freenet6/files/gentoo.sh b/net-misc/freenet6/files/gentoo.sh
deleted file mode 100644
index 858b7ccab663..000000000000
--- a/net-misc/freenet6/files/gentoo.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/sh
-
-LANGUAGE=C
-
-if [ -z $TSP_VERBOSE ]; then
-   TSP_VERBOSE=0
-fi
-
-KillProcess()
-{
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
-         echo killing $*
-      fi
-   fi
-   PID=`ps axww | grep $1 | grep -v grep | awk '{ print $1;}'`
-   echo $PID
-   if [ ! -z $PID ]; then
-      kill $PID
-   fi
-}
-
-Display()
-{
-   if [ -z $TSP_VERBOSE ]; then
-      return;
-   fi
-   if [ $TSP_VERBOSE -lt $1 ]; then
-      return;
-   fi
-   shift
-   echo "$*"
-}
-
-Exec()
-{
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
-         echo $*
-      fi
-   fi
-   $* # Execute command
-   if [ $? -ne 0 ]; then
-      echo "Error while executing $1"
-      echo "   Command: $*"
-      exit 1
-   fi
-}
-
-ExecNoCheck()
-{
-   if [ ! -z $TSP_VERBOSE ]; then
-      if [ $TSP_VERBOSE -ge 2 ]; then
-         echo $*
-      fi
-   fi
-   $* # Execute command
-}
-
-# Program localization 
-
-Display 1 "--- Start of configuration script. ---"
-Display 1 "Script: " `basename $0`
-
-ifconfig=/sbin/ifconfig
-route=/sbin/route
-ipconfig=/sbin/ip
-rtadvd=/usr/sbin/radvd
-sysctl=/sbin/sysctl
-rtadvdconfigfilename=radvd.conf
-rtadvdconfigfile=/etc/$rtadvdconfigfilename
-
-if [ -z $TSP_HOME_DIR ]; then
-   echo "TSP_HOME_DIR variable not specified!;"
-   exit 1
-fi
-
-if [ ! -d $TSP_HOME_DIR ]; then
-   echo "Error : directory $TSP_HOME_DIR does not exist"
-   exit 1
-fi
-#
-
-if [ -z $TSP_HOST_TYPE ]; then
-   echo Error: TSP_HOST_TYPE not defined.
-   exit 1
-fi
-
-#change to upper case
-TSP_HOST_TYPE=`echo $TSP_HOST_TYPE | tr a-z A-Z`
-
-if [ X"${TSP_HOST_TYPE}" = X"HOST" ] || [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then
-   #
-   # Configured tunnel config (IPv6) 
-
-   Display 1 "$TSP_TUNNEL_INTERFACE setup"
-   Display 1 "Setting up link to $TSP_SERVER_ADDRESS_IPV4"
-   if [ -x $ipconfig ]; then
-     Exec $ipconfig tunnel add $TSP_TUNNEL_INTERFACE mode sit ttl 64 remote $TSP_SERVER_ADDRESS_IPV4
-   else
-     Exec $ifconfig $TSP_TUNNEL_INTERFACE tunnel ::$TSP_SERVER_ADDRESS_IPV4
-   fi
-
-   Exec $ifconfig $TSP_TUNNEL_INTERFACE up
-
-   PREF=`echo $TSP_CLIENT_ADDRESS_IPV6 | sed "s/:0*/:/g" |cut -d : -f1-2`
-   OLDADDR=`$ifconfig $TSP_TUNNEL_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"`
-   if [ ! -z $OLDADDR ]; then
-      Display 1 "Removing old IPv6 address $OLDADDR"
-      Exec $ifconfig $TSP_TUNNEL_INTERFACE inet6 del $OLDADDR
-   fi
-   Display 1 "This host is: $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN"
-   Exec $ifconfig $TSP_TUNNEL_INTERFACE add $TSP_CLIENT_ADDRESS_IPV6/$TSP_TUNNEL_PREFIXLEN
-
-   # 
-   # Default route  
-   Display 1 "Adding default route"
-   ExecNoCheck $route -A inet6 del ::/0 2>/dev/null # delete old default route
-   Exec $route -A inet6 add ::/0 dev $TSP_TUNNEL_INTERFACE
-   Exec $route -A inet6 add 2000::/3 dev $TSP_TUNNEL_INTERFACE
-fi
-
-# Router configuration if required
-if [ X"${TSP_HOST_TYPE}" = X"ROUTER" ]; then
-   Display 1 "Router configuration"
-   Display 1 "Kernel setup"
-   #Better way on linux to avoid loop with the remaining /48?
-   $route -A inet6 add $TSP_PREFIX::/$TSP_PREFIXLEN dev $TSP_HOME_INTERFACE 2>/dev/null
-   Exec $sysctl -w net.ipv6.conf.all.forwarding=1 # ipv6_forwarding enabled
-   Display 1 "Adding prefix to $TSP_HOME_INTERFACE"
-   OLDADDR=`$ifconfig $TSP_HOME_INTERFACE | grep "inet6.* $PREF" | sed -e "s/^.*inet6 addr: //" -e "s/ Scope.*\$//"`
-   if [ ! -z $OLDADDR ]; then
-      Display 1 "Removing old IPv6 address $OLDADDR"
-      Exec $ifconfig $TSP_HOME_INTERFACE inet6 del $OLDADDR
-   fi
-   Exec $ifconfig $TSP_HOME_INTERFACE add $TSP_PREFIX:1::1/64
-   # Router advertisement configuration 
-   Display 1 "Create new $rtadvdconfigfile"
-   echo "##### radvd.conf made by TSP ####" > "$rtadvdconfigfile"
-   echo "interface $TSP_HOME_INTERFACE" >> "$rtadvdconfigfile"
-   echo "{" >> "$rtadvdconfigfile"
-   echo " AdvSendAdvert on;" >> "$rtadvdconfigfile"
-   echo " prefix $TSP_PREFIX:0001::/64" >> "$rtadvdconfigfile"
-   echo " {" >> "$rtadvdconfigfile"
-   echo " AdvOnLink on;" >> "$rtadvdconfigfile"
-   echo " AdvAutonomous on;" >> "$rtadvdconfigfile"
-   echo " AdvRouterAddr on;" >> "$rtadvdconfigfile"
-   echo " };" >> "$rtadvdconfigfile"
-   echo "};" >> "$rtadvdconfigfile"
-   echo "" >> "$rtadvdconfigfile"
-   if [ -f /var/run/radvd/radvd.pid ]; then
-       /etc/init.d/radvd stop
-   fi
-   if [ -f $rtadvdconfigfile ]; then
-       /etc/init.d/radvd start
-   else
-      echo "Error : file $rtadvdconfigfile not found"
-      exit 1
-   fi
-fi
-
-Display 1 "--- End of configuration script. ---"
-
-exit 0
-
-#---------------------------------------------------------------------
diff --git a/net-misc/freenet6/files/tspc.conf b/net-misc/freenet6/files/tspc.conf
deleted file mode 100644
index 6a028a88e554..000000000000
--- a/net-misc/freenet6/files/tspc.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#-----------------------------------------------------------------------------
-# tspc.conf
-#-----------------------------------------------------------------------------
-
-#
-# tsp client version
-#
-tsp_version=1.0.1
-tsp_dir=/etc/freenet6
-
-#
-# auth_method=any|supported mechanism
-# if any is specified, the first mechanism that is supported by both the
-# server and the client will be picked. The order of precedence is the
-# mechnism list shown by the output of -h. supprted mechanism is one of
-# the token shown by th output of -h (case sensitive).
-auth_method=any
-
-#
-# client_v4=auto|1.1.1.1 (valid ip address)
-# if auto is specified, if_source or -s cmd line option must be specified.
-client_v4=auto
-
-# userid=anonymous
-# the userid can be anonymous or any alphanumeric value that is dns legal.
-userid=anonymous
-
-# passwd=
-# The passwd must be empty if userid is anonymous or an alphanumeric string
-# if userid is not anonymous.
-passwd=
-
-# template=target
-# template tells which configuration script needs to be run for interface
-# setup.
-# Normally you only need to put your osname in the value.
-# You can also use "checktunnel" if you only want the tunnel info print out.
-#template=checktunnel
-template=linux
-
-# server=FQDN
-# Freenet6 server address 
-server=tsps2.freenet6.net
-
-# retry_delay=time
-# retry tells the client to retry connection after time (seconds) in case of 
-# failure (0 = no retry)
-retry_delay=0
-
-if_tunnel=sit1
-
-# end of tspc.conf
-#-----------------------------------------------------------------------------
diff --git a/net-misc/freenet6/files/tspc.rc b/net-misc/freenet6/files/tspc.rc
deleted file mode 100644
index c93db77c1140..000000000000
--- a/net-misc/freenet6/files/tspc.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/files/tspc.rc,v 1.4 2004/07/14 23:58:39 agriffis Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Freenet6 IPv6 Client"
-	tspc -f /etc/freenet6/tspc.conf
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Freenet6 IPv6 Client"
-	kill `pidof tspc`
-	eend $?
-}
diff --git a/net-misc/freenet6/freenet6-1.0.0.ebuild b/net-misc/freenet6/freenet6-1.0.0.ebuild
deleted file mode 100644
index e7b52a5b15a0..000000000000
--- a/net-misc/freenet6/freenet6-1.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-1.0.0.ebuild,v 1.9 2006/06/28 16:32:10 wolf31o2 Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Client to configure an IPv6 tunnel to freenet6 (tspc)"
-HOMEPAGE="http://www.freenet6.net/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="VPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S="${WORKDIR}/freenet6-client-1.0"
-
-pkg_setup() {
-	case ${CHOST} in
-		*-openbsd*)					OS=openbsd ;;
-		*-freebsd* | *-dragonfly*)	OS=freebsd44 ;;
-		*-netbsd*)					OS=netbsd ;;
-		*-linux*)					OS=linux ;;
-		*)
-			die "Unknown target, please report this error after checking your CHOST."
-			;;
-	esac
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e 's:\$(CC) -c:$(CC) $(CFLAGS) -c:' \
-		-e 's:\$(CC) \$(OBJDIR):$(CC) $(LDFLAGS) $(OBJDIR):' \
-		src/Makefile
-}
-
-src_compile() {
-	emake all CC="$(tc-getCC)" target="${OS}" || die "Build Failed"
-}
-
-src_install() {
-	dosbin bin/tspc || die
-
-	insopts -m 600
-	insinto /etc/freenet6
-	doins ${FILESDIR}/tspc.conf
-	exeinto /etc/freenet6/template
-	doexe template/{${OS},checktunnel}.sh
-	doexe ${FILESDIR}/gentoo.sh
-
-	dodoc CONTRIB.txt LEGAL README
-	doman man/{man5/tspc.conf.5,man8/tspc.8}
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/tspc.rc tspc
-}
-
-pkg_postinst() {
-	einfo "The freenet6 ebuild installs an init script named 'tspc'"
-	einfo "to coincide with the name of the client binary installed"
-	einfo "To add support for a freenet6 connection at startup, do"
-	einfo ""
-	einfo "# rc-update add tspc default"
-}
diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 91bf296ae5a5..c41507ac1c4c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -19,6 +19,18 @@ RMD160 e97a4f007390bba5f4836bd11eee80b59e30a748 files/torrc.sample-0.1.0.14.patc
 SHA256 27c6a20633c453287df583ddd7922c65ae98335f9c850d0fb6b965b1038faeba files/torrc.sample-0.1.0.14.patch 1120
 AUX torrc.sample-0.1.0.16.patch 1134 RMD160 ad432e115b9610e139315f3908f4622702b84f7a SHA1 8b3f02b07c43e56ddce3b14f7a084329b332f793 SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da
 MD5 ab82c91feb4f7eceb4d1ed496a17f928 files/torrc.sample-0.1.0.16.patch 1134
+<<<<<<< Manifest
+<<<<<<< Manifest
+RMD160 ad432e115b9610e139315f3908f4622702b84f7a files/torrc.sample-0.1.0.16.patch 1134
+SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da files/torrc.sample-0.1.0.16.patch 1134
+DIST tor-0.1.0.14.tar.gz 631723 RMD160 c9e0728c123b5f4f0131528f6cde9de473153be6 SHA256 a42b97161f05fd8a3625ab1748a2a9eb05eada1bf15b9282a64c56a1d28983c6 size 631723
+DIST tor-0.1.0.16.tar.gz 633340 RMD160 f932433aa3687d5366d10f60315bf4e580a020b4 SHA1 567fd02d5d22c571c452bc354f1c902cfb37d3f4 SHA256 5d95cc3299f302398a41cbfb3d10265e3561c8a871e217158c7cbf05c4b3478a size 633340
+DIST tor-0.1.0.17.tar.gz 634144 RMD160 d3b99e1f1ea26d73dae073ee62d3a1899905074a SHA256 33dc70a8d8f4ad20a9c9b8d476d431c713d8d94f1859b3efbaf1e178b36c2ca3 size 634144
+EBUILD tor-0.1.0.14-r1.ebuild 1283 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 SHA1 ad81f74a06cd33d4b9076a62985bacd6acae418f SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575 size 1283
+=======
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+>>>>>>> 1.105
+=======
 RMD160 ad432e115b9610e139315f3908f4622702b84f7a files/torrc.sample-0.1.0.16.patch 1134
 SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da files/torrc.sample-0.1.0.16.patch 1134
 AUX torrc.sample-0.1.1.23.patch 1138 RMD160 33c67ce315a5e41be4e68fe3bb76ca39121e5929 SHA1 760b35aca8e55010603ea8d4177706144b42e09a SHA256 df93f901e5c0d19da37fc9b5f2a8651451338851221c390d1e4961ab1f6c2226
@@ -32,6 +44,7 @@ DIST tor-0.1.1.20.tar.gz 828833 RMD160 5d48d2954931fb28f0039f2472245abc9896316c
 DIST tor-0.1.1.22.tar.gz 841296 RMD160 db9d81225d2cecda9c3faa94f7eb9ed23ba40335 SHA1 44409da83e896154b83178bec971074e14b6dbb0 SHA256 cb15f152ccc1f939a7c0eac42411090f339e33b30563d16e0de7d3f3b84ce011
 DIST tor-0.1.1.23.tar.gz 847906 RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 SHA1 d3f0120f5a18658231127281343aafb6c06aed70 SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025
 EBUILD tor-0.1.0.14-r1.ebuild 1283 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 SHA1 ad81f74a06cd33d4b9076a62985bacd6acae418f SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575
+>>>>>>> 1.106
 MD5 2933c0659d5fd3a5b8a79681e573cfa0 tor-0.1.0.14-r1.ebuild 1283
 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 tor-0.1.0.14-r1.ebuild 1283
 SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575 tor-0.1.0.14-r1.ebuild 1283
@@ -41,6 +54,38 @@ RMD160 6c7d07e08fbae4b7df5123ecac08dfb398b860f9 tor-0.1.0.16.ebuild 4071
 SHA256 1c85d2781ce3e8d306f0d36bfdc430c81dabe4af6bc772f3e7dbc1fbbcec8ce0 tor-0.1.0.16.ebuild 4071
 EBUILD tor-0.1.0.17.ebuild 4071 RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 SHA1 26225cf5ed9aa41f76d3a3d10072c4cebb315f3b SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0
 MD5 bd342387478972c66e5aaa774c0f479e tor-0.1.0.17.ebuild 4071
+<<<<<<< Manifest
+<<<<<<< Manifest
+RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 tor-0.1.0.17.ebuild 4071
+SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0 tor-0.1.0.17.ebuild 4071
+MISC ChangeLog 8681 RMD160 c6df87e2881512036a7e85932f7ee3a14f755218 SHA1 7e7447282cac5e98d37a5ecb7b79febc5d6866bf SHA256 af965b44e77727f5f9525e86396076c83863347a94e9d102f249b9efd791634e size 8681
+MD5 8726445c831f84ec008974f72fa39d18 ChangeLog 8681
+RMD160 c6df87e2881512036a7e85932f7ee3a14f755218 ChangeLog 8681
+SHA256 af965b44e77727f5f9525e86396076c83863347a94e9d102f249b9efd791634e ChangeLog 8681
+MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 size 224
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 metadata.xml 224
+SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 metadata.xml 224
+MD5 f1a1fe76e7869a462d16c17a99b2b7ed files/digest-tor-0.1.0.14-r1 238
+RMD160 566c668ec862b1325ef917bec431d6526a040492 files/digest-tor-0.1.0.14-r1 238
+SHA256 d066a6d28e9d91a244a29f73fac9ecd1301ad6ae0b6fdd91a5b1466e1f154c40 files/digest-tor-0.1.0.14-r1 238
+MD5 a32d4444318e63fd9d2f4805e8b55e2c files/digest-tor-0.1.0.16 238
+RMD160 0bba7f8d4946096dbc60ac84486251ab507571fd files/digest-tor-0.1.0.16 238
+SHA256 c65cbe8d6d599d804e8f90a05ac18b026254645b1d5ed8b634ecdb74fd28437a files/digest-tor-0.1.0.16 238
+MD5 2e626d3d0276e7f9149faf58bbc9d821 files/digest-tor-0.1.0.17 238
+RMD160 c4b4c7d265ff9db7666a82f57bedcdcb198502ba files/digest-tor-0.1.0.17 238
+SHA256 8e4641954dc5e2e53a22565e87496a49c7efa1687b88206fc82988c2ee394d3b files/digest-tor-0.1.0.17 238
+=======
+MD5 b8051faba0570d76e0d4ea9f3092f151 tor-0.1.1.20.ebuild 1295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEf0vgKRy60XGEcJIRAvDQAKCLvA2eDE1/CH4EhEZT5sQyVeYB+ACfRYCD
+vP2vmTlukA0U0xi6LbicI9E=
+=v/Qj
+-----END PGP SIGNATURE-----
+>>>>>>> 1.105
+=======
 RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 tor-0.1.0.17.ebuild 4071
 SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0 tor-0.1.0.17.ebuild 4071
 EBUILD tor-0.1.1.20.ebuild 1291 RMD160 660275cf71229c094f0f7554803b071260f9ab70 SHA1 b8ab6b8dfc16e6ac4d6d8d00c8bdc5e74263662e SHA256 d3a3ff851d53c2533bd93b7aa24802537c8490edcff7b6ab011783e6c9f3b47e
@@ -75,6 +120,9 @@ SHA256 8e4641954dc5e2e53a22565e87496a49c7efa1687b88206fc82988c2ee394d3b files/di
 MD5 3da01d426b0c73fc172cd02bb898f399 files/digest-tor-0.1.1.20 238
 RMD160 1b7ef397f0fef11bdbecf43d81a0476b7810407a files/digest-tor-0.1.1.20 238
 SHA256 d0a7e086a2314cb9a86a0795d747c3182a3ec1027a3839c1729aef5bfdae5d09 files/digest-tor-0.1.1.20 238
+<<<<<<< Manifest
+>>>>>>> 1.106
+=======
 MD5 fb046c5c5aabaacbeae6ef9d7d7ef599 files/digest-tor-0.1.1.22 238
 RMD160 b24a11378ec15e5d148f34b33fdcca0f816895ae files/digest-tor-0.1.1.22 238
 SHA256 f1b174508a7c00fd54bbae228356872d4eee632345bcf67c144fd6b4dd2b302b files/digest-tor-0.1.1.22 238
@@ -88,3 +136,4 @@ iD8DBQFE7PLi8zY1VwezZiERAmiUAJwIaF5kWnD3CH5K4Q3nd64pl8zw9gCeJyXD
 W9WIaNrY/MtJ8YIs9XQS0j4=
 =gNCv
 -----END PGP SIGNATURE-----
+>>>>>>> 1.108
diff --git a/net-misc/tor/files/digest-tor-0.1.0.16 b/net-misc/tor/files/digest-tor-0.1.0.16
index 1d50918eec49..b6aad944248d 100644
--- a/net-misc/tor/files/digest-tor-0.1.0.16
+++ b/net-misc/tor/files/digest-tor-0.1.0.16
@@ -1 +1,3 @@
 MD5 13631507b8eeee5d6e8fd245dc3eef4f tor-0.1.0.16.tar.gz 633340
+RMD160 f932433aa3687d5366d10f60315bf4e580a020b4 tor-0.1.0.16.tar.gz 633340
+SHA256 5d95cc3299f302398a41cbfb3d10265e3561c8a871e217158c7cbf05c4b3478a tor-0.1.0.16.tar.gz 633340