Version bump, add dependency over tsocks (that upstream ships and builds inline), and remove old versions.

(Portage version: 2.1.2_rc1-r6)
 (Signed Manifest commit)

4 files changed, 0 insertions, 136 deletions

diff --git a/kde-misc/tork/files/digest-tork-0.08 b/kde-misc/tork/files/digest-tork-0.08
deleted file mode 100644
index ed99373c6ae8..000000000000
--- a/kde-misc/tork/files/digest-tork-0.08
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fc4049606f8a380f392a0e80c763147b tork-0.08.tar.bz2 1432911
-RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 tork-0.08.tar.bz2 1432911
-SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba tork-0.08.tar.bz2 1432911
diff --git a/kde-misc/tork/files/digest-tork-0.09 b/kde-misc/tork/files/digest-tork-0.09
deleted file mode 100644
index e4ed8ca2b5af..000000000000
--- a/kde-misc/tork/files/digest-tork-0.09
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b75508a67b29c5e5e29cb79a1e949aac tork-0.09.tar.bz2 1900835
-RMD160 67d51ac8561a0a3ac3b1b21230145baf3e046cee tork-0.09.tar.bz2 1900835
-SHA256 db5c5afcd69ba449ee734bd57827c01595c7ec077c69ab186529beca59257181 tork-0.09.tar.bz2 1900835
diff --git a/kde-misc/tork/files/tork-0.08-crash.patch b/kde-misc/tork/files/tork-0.08-crash.patch
deleted file mode 100644
index ce5bae55eeda..000000000000
--- a/kde-misc/tork/files/tork-0.08-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tork-0.08/src/torservers.ui.h
-===================================================================
---- tork-0.08.orig/src/torservers.ui.h
-+++ tork-0.08/src/torservers.ui.h
-@@ -48,6 +48,10 @@ void TorServers::init()
- 
-         int cc = (*it).section("-",0,0).toInt();
-         QString nick = (*it).section("-",1);
-+        
-+        if ( cc >= sizeof(GeoIP_country_name)/sizeof(GeoIP_country_name[0]) )
-+           continue;
-+        
-         tm = new QListViewItem(ExcludeNodes,GeoIP_country_name[cc],nick);
-         tm->setPixmap(1,QPixmap(SmallIcon("tork_" + QString(GeoIP_country_code[cc]).lower())));
-         if ((TorkConfig::excludeNodes().contains(nick)) ||
diff --git a/kde-misc/tork/files/tork-0.08-geoip.patch b/kde-misc/tork/files/tork-0.08-geoip.patch
deleted file mode 100644
index 93100ef26563..000000000000
--- a/kde-misc/tork/files/tork-0.08-geoip.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: tork-0.08/configure.in.in
-===================================================================
---- tork-0.08.orig/configure.in.in
-+++ tork-0.08/configure.in.in
-@@ -209,22 +209,3 @@ if test "$ac_cv_openssl_linker_option" !
-    LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS"
- fi
- 
--
--# - GeoIP
--
--GEOVERSION=1.4.0
--PACKAGE=GeoIP
--GEOIP_VERSION_INFO=`echo $GEOVERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
--AC_SUBST(GEOIP_VERSION_INFO)
--
--AC_ARG_WITH(city,
--[  --with-city=\"no\"   Enable/disable support for GeoIP City Edition. (yes)])
--if test "$with_city" = "no" ; then
--  echo Disabling GeoIP City Edition support
--  WITH_CITY=1
--else
--  echo Enabling GeoIP City Edition support
--  WITH_CITY=0
--fi
--AC_SUBST(WITH_CITY)
--AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no")
-Index: tork-0.08/src/Makefile.am
-===================================================================
---- tork-0.08.orig/src/Makefile.am
-+++ tork-0.08/src/Makefile.am
-@@ -4,7 +4,7 @@
- # of the other Makefile.am variables
- bin_PROGRAMS = tork
- 
--SUBDIRS=icons about arkollon GeoIP-1.4.0 .
-+SUBDIRS=icons about arkollon .
- 
- # set the include path for X, qt and KDE
- INCLUDES         = $(all_includes)
-@@ -16,7 +16,7 @@ METASOURCES = AUTO
- tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- 
- # the libraries to link against.
--tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) -L GeoIP-1.4.0/libGeoIP/libGeoIP.la
-+tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) -lGeoIP
- 
- # which sources should be compiled for tork
- tork_SOURCES = torkconfig.kcfgc main.cpp tork.cpp torkview.cpp torkview_base.ui \
-Index: tork-0.08/src/torkview.cpp
-===================================================================
---- tork-0.08.orig/src/torkview.cpp
-+++ tork-0.08/src/torkview.cpp
-@@ -30,7 +30,7 @@
- #include "portsandicons.h"
- #include "torkconfig.h"
- 
--#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-+#include "GeoIP.h"
- 
- 
- #include "kdebug.h"
-Index: tork-0.08/src/server.ui.h
-===================================================================
---- tork-0.08.orig/src/server.ui.h
-+++ tork-0.08/src/server.ui.h
-@@ -16,7 +16,7 @@
- #include <qpopupmenu.h>
- #include <kiconloader.h>
- 
--#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-+#include <GeoIP.h>
- 
- void MyServer::init()
- {
-Index: tork-0.08/src/torclient.cpp
-===================================================================
---- tork-0.08.orig/src/torclient.cpp
-+++ tork-0.08/src/torclient.cpp
-@@ -21,7 +21,7 @@
- #include <assert.h>
- #include <qfile.h>
- 
--#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-+#include <GeoIP.h>
- 
- 
- Client::Client( const QString &host, Q_UINT16 port ) 
-Index: tork-0.08/src/tork.cpp
-===================================================================
---- tork-0.08.orig/src/tork.cpp
-+++ tork-0.08/src/tork.cpp
-@@ -78,7 +78,8 @@
- #include <qhostaddress.h>
- 
- 
--#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-+
-+#include <GeoIP.h>
- 
- tork *kmain = 0L;
- 
-Index: tork-0.08/src/torservers.ui.h
-===================================================================
---- tork-0.08.orig/src/torservers.ui.h
-+++ tork-0.08/src/torservers.ui.h
-@@ -16,7 +16,7 @@
- #include <kdebug.h>
- #include <kiconloader.h>
- 
--#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
-+#include <GeoIP.h>
- 
- typedef QMap<QString, QString> codemap;
- QString ccode;