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

Package-Manager: portage-2.1.2_pre1

6 files changed, 202 insertions, 8 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/Manifest b/kde-misc/tork/Manifest
index 493ee1ae03c7..2fdf43f53475 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -9,10 +9,19 @@ AUX tork-0.07-qt335.patch 2539 RMD160 90e5da06c4fbe0f813cd8be601bed524e78d2330 S
 MD5 a2761c282a8894b8f893c3bdb0951657 files/tork-0.07-qt335.patch 2539
 RMD160 90e5da06c4fbe0f813cd8be601bed524e78d2330 files/tork-0.07-qt335.patch 2539
 SHA256 5200d1d30dc55d6246a573c65f7f5c6a1aed531308b575c9c23e911a2c287ba9 files/tork-0.07-qt335.patch 2539
+AUX tork-0.08-crash.patch 672 RMD160 3c1cb22e891b99383865b4f5b89f63334878d041 SHA1 dc712a87c680eeaaad3cc937237a3c8a8fff38b9 SHA256 f47fc7daa45a54386a991a7874f6ca70bb282633b9825479a570567d8e75f0a8
+MD5 2fad2f59fdc4ff0fc15f2030086e9692 files/tork-0.08-crash.patch 672
+RMD160 3c1cb22e891b99383865b4f5b89f63334878d041 files/tork-0.08-crash.patch 672
+SHA256 f47fc7daa45a54386a991a7874f6ca70bb282633b9825479a570567d8e75f0a8 files/tork-0.08-crash.patch 672
+AUX tork-0.08-geoip.patch 3233 RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 SHA1 ea850cdf6abffd0341c528ca9fdb853a31120602 SHA256 bcc1f5fd7aca40cbf9a5a1d0f194620f62c517f9065610d637480047afeb7263
+MD5 042a0102d401251148dd9928e93a7f3d files/tork-0.08-geoip.patch 3233
+RMD160 963a714068ca409486d40f6dc2c3555bdad966d5 files/tork-0.08-geoip.patch 3233
+SHA256 bcc1f5fd7aca40cbf9a5a1d0f194620f62c517f9065610d637480047afeb7263 files/tork-0.08-geoip.patch 3233
 DIST tork-0.04.tar.bz2 700046 RMD160 e421315c7cedfbedc52b418bfca5709156915369 SHA1 700c9ecec703f1c7b7109f3314d011c8e68881d9 SHA256 deb9b790e86d9618276472b762b03c2bf8c3f969e065dd41e0b0aa9ac093a870
 DIST tork-0.05.tar.bz2 719862 RMD160 2858fd4512b9c8e8ddab06fbc2acffd3a4bd1581 SHA1 008299eb77826b2597709d5d2090e02cc02f57cb SHA256 3ce2fa0a252fcc6749f434823ae3ed15e01d702231be78b72033d53fd6655366
 DIST tork-0.06.tar.bz2 754372 RMD160 d88f36978f888107c0edec53a1b4a75709f34466 SHA1 5f54e29c10f62135eee510ea751ae80463192da4 SHA256 f0d5387cee0446fe900dda1c65e30828aa0815c5dbfd49d6f4b494a1a5edf149
 DIST tork-0.07.tar.bz2 1435686 RMD160 30b9128560d3167df49327b1c7c57b62855385a5 SHA1 550aca6c571d3ef1576eedcf85879e6b465f3bb9 SHA256 f31723df1e357a2909337b246f1db46a044b40310c3d3da1fb118fd6d603a804
+DIST tork-0.08.tar.bz2 1432911 RMD160 8388ea08e57829f42a49ef88ece9031d4367f894 SHA1 66b966e8426cf433854a472398105bdedbf295af SHA256 86e4463afdc50d0b384bffca64035960342cf0d21c851b9655f80153cd9403ba
 EBUILD tork-0.04.ebuild 517 RMD160 50e91d9647c68769a1574ddd1eb56a3eb9fd8d5b SHA1 4c640455b91c35dbe6251ab34a132b656d27acfa SHA256 7ba8d467a6b5789411eb4d094ea9f790d0d751912208693b9edfab1849562fd1
 MD5 9c6ffec748c1446ed32832d49d2e3972 tork-0.04.ebuild 517
 RMD160 50e91d9647c68769a1574ddd1eb56a3eb9fd8d5b tork-0.04.ebuild 517
@@ -29,10 +38,14 @@ EBUILD tork-0.07.ebuild 782 RMD160 8cf22196506b6b3d1ef1b85cf04070eee5a2556d SHA1
 MD5 caae71c8c40fd5ed969d1fcf59f8e128 tork-0.07.ebuild 782
 RMD160 8cf22196506b6b3d1ef1b85cf04070eee5a2556d tork-0.07.ebuild 782
 SHA256 5edd13692146cab7fe45b170bcea4729b993c33c7d7628dde66d782f7fc4e633 tork-0.07.ebuild 782
-MISC ChangeLog 922 RMD160 14c613510e2412d3e216a673592cf60a9378fa1a SHA1 8b85be276e7f15a2f065eeadc2db5cfe37456645 SHA256 b117cde712e20cadab7e907b560bf515e03d6e928974a9cc4263114b508d4d7b
-MD5 1775df4a1c3a8ef34ec56a0437cde7a3 ChangeLog 922
-RMD160 14c613510e2412d3e216a673592cf60a9378fa1a ChangeLog 922
-SHA256 b117cde712e20cadab7e907b560bf515e03d6e928974a9cc4263114b508d4d7b ChangeLog 922
+EBUILD tork-0.08.ebuild 868 RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 SHA1 2e584e6e816d8c7b0b198bf22e7cd79b762833d6 SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74
+MD5 b86a9bd84a12cf2e260456cfd8522740 tork-0.08.ebuild 868
+RMD160 9f8771ca61bdcccb8deefa7b9b076247f62dddc4 tork-0.08.ebuild 868
+SHA256 4fd586a33fa7d8ce33f9e8e1d4b2da39bb8596c7ce2af480de26867d17deaa74 tork-0.08.ebuild 868
+MISC ChangeLog 1227 RMD160 16af74d6ebf57e9c918ae1faf5ab3afc0747bdf2 SHA1 f9011dc9d1a7f2f43d29c3e672a2e54518f89b2e SHA256 c77af6b4a1d9203c0cd28ce51dd84ce1df530d5d6eac8931f4cd50508758c083
+MD5 943d093b764e8a5c12c89f6e1f068301 ChangeLog 1227
+RMD160 16af74d6ebf57e9c918ae1faf5ab3afc0747bdf2 ChangeLog 1227
+SHA256 c77af6b4a1d9203c0cd28ce51dd84ce1df530d5d6eac8931f4cd50508758c083 ChangeLog 1227
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -49,10 +62,13 @@ SHA256 443fbdad006aa47dbf937b979e1575621cd47e25d144adec03f7a3cad555810e files/di
 MD5 2ed6de4dcca40c8e925945f78c8f58d1 files/digest-tork-0.07 235
 RMD160 0ac7c8512f8d4c7e1602b6f2f739fba07c7fc9cd files/digest-tork-0.07 235
 SHA256 3b7f17d0de3c380125f3a121d32e6ca2d5d7040df6332d6dd104039173d56739 files/digest-tork-0.07 235
+MD5 47a17fbd8e2f4a707aa660ce2229e3fc files/digest-tork-0.08 235
+RMD160 fca00763dd9a5cebf4e15badb320b090a00d09e7 files/digest-tork-0.08 235
+SHA256 240b6de97513e840056fed9eb4be6f8b2328d71e01947cead636dcb952f9bfa0 files/digest-tork-0.08 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE+dB/AiZjviIA2XgRAvSoAJ4yILZ5QtLl4dE7sY9bLe1Pa15kQACfVasQ
-UtnmRhOydaqlFRIfAIQAmuw=
-=RcdV
+iD8DBQFFFIqEAiZjviIA2XgRAgZLAJ4vjlk2O4yDKBrlW+1NHg79+GUWPACeOONc
+zP3IKPGRHqnuyGq34GMq83I=
+=3sYH
 -----END PGP SIGNATURE-----
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"
+}