Version bump, update patch to use external GeoIP, add patch to avoid crashing, make sure the desktop file contains the correct directory.

(Portage version: 2.1.2_pre1)

5 files changed, 179 insertions, 1 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index c6fd9834b16d..9d1276c4c5b1 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-misc/tork
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.5 2006/09/02 18:41:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.6 2006/09/23 01:14:36 flameeyes Exp $
+
+*tork-0.08 (23 Sep 2006)
+
+  23 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tork-0.08-crash.patch, +files/tork-0.08-geoip.patch,
+  +tork-0.08.ebuild:
+  Version bump, update patch to use external GeoIP, add patch to avoid
+  crashing, make sure the desktop file contains the correct directory.
 
 *tork-0.07 (02 Sep 2006)
 
diff --git a/kde-misc/tork/files/digest-tork-0.08 b/kde-misc/tork/files/digest-tork-0.08
new file mode 100644
index 000000000000..ed99373c6ae8
--- /dev/null
+++ b/kde-misc/tork/files/digest-tork-0.08
@@ -0,0 +1,3 @@
+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/tork-0.08-crash.patch b/kde-misc/tork/files/tork-0.08-crash.patch
new file mode 100644
index 000000000000..ce5bae55eeda
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.08-crash.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..93100ef26563
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.08-geoip.patch
@@ -0,0 +1,115 @@
+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;
diff --git a/kde-misc/tork/tork-0.08.ebuild b/kde-misc/tork/tork-0.08.ebuild
new file mode 100644
index 000000000000..18e664db2eb4
--- /dev/null
+++ b/kde-misc/tork/tork-0.08.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.08.ebuild,v 1.1 2006/09/23 01:14:36 flameeyes Exp $
+
+inherit kde
+
+DESCRIPTION="A Tor controller for the KDE desktop"
+HOMEPAGE="http://tork.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-misc/tor
+	dev-libs/openssl
+	>=dev-libs/geoip-1.4.0
+	>=net-proxy/privoxy-3.0.3-r5"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-geoip.patch
+	${FILESDIR}/${P}-crash.patch"
+
+src_unpack() {
+	kde_src_unpack
+	rm -rf "${S}/src/GeoIP-1.4.0" "${S}/configure"
+}
+
+src_install() {
+	kde_src_install
+	rm -rf "${D}/usr/share/applnk"
+
+	echo "Categories=Qt;KDE;Network;" >> "${D}/usr/share/applications/kde/tork.desktop"
+}