Version bump, with external GeoIP patch.

Package-Manager: portage-2.1.1_rc1-r2

6 files changed, 201 insertions, 8 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index a104d02f1287..c6fd9834b16d 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,13 @@
 # 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.4 2006/08/31 17:49:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.5 2006/09/02 18:41:49 flameeyes Exp $
+
+*tork-0.07 (02 Sep 2006)
+
+  02 Sep 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tork-0.07-geoip.patch, +files/tork-0.07-qt335.patch,
+  +tork-0.07.ebuild:
+  Version bump, with external GeoIP patch.
 
 *tork-0.06 (31 Aug 2006)
 
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index 1abca763925c..493ee1ae03c7 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -1,9 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tork-0.07-geoip.patch 1897 RMD160 51ba0e9875ec94740c5a2194ccb3c44e8317a3b3 SHA1 d8bd0bb4c2a5276e364ae7e01d66296621a2be76 SHA256 21bfa9c3723a371b620108655fb847a9cb30ed5f0b08120f88d346cb39beabe1
+MD5 4934324c77413e8e9b79989e46a0422f files/tork-0.07-geoip.patch 1897
+RMD160 51ba0e9875ec94740c5a2194ccb3c44e8317a3b3 files/tork-0.07-geoip.patch 1897
+SHA256 21bfa9c3723a371b620108655fb847a9cb30ed5f0b08120f88d346cb39beabe1 files/tork-0.07-geoip.patch 1897
+AUX tork-0.07-qt335.patch 2539 RMD160 90e5da06c4fbe0f813cd8be601bed524e78d2330 SHA1 13318592f6b30a3b807278d8646fc3e515334d04 SHA256 5200d1d30dc55d6246a573c65f7f5c6a1aed531308b575c9c23e911a2c287ba9
+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
 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
 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
@@ -16,10 +25,14 @@ EBUILD tork-0.06.ebuild 520 RMD160 f5cf868dd978f81c1359a5e5eb295518a403d75e SHA1
 MD5 bade577429fbfb13e2c7a53da28e30c8 tork-0.06.ebuild 520
 RMD160 f5cf868dd978f81c1359a5e5eb295518a403d75e tork-0.06.ebuild 520
 SHA256 109b792f46d92b68f51e6f8ba6fd5489c5cb0c9a6be3d5c06b0363db31fb7690 tork-0.06.ebuild 520
-MISC ChangeLog 716 RMD160 6472883f6d12ba440bbeacdcfe0bf745a93ea1ee SHA1 1a3259eb0d79451ad8577baa2b2e937f97f6c4c4 SHA256 57cfc3f6839ed7c1726dd003d5f44873583fbfd4081d0a75fef748b715d1f2d6
-MD5 a4c7d57df65b06653793530d0061f0e6 ChangeLog 716
-RMD160 6472883f6d12ba440bbeacdcfe0bf745a93ea1ee ChangeLog 716
-SHA256 57cfc3f6839ed7c1726dd003d5f44873583fbfd4081d0a75fef748b715d1f2d6 ChangeLog 716
+EBUILD tork-0.07.ebuild 782 RMD160 8cf22196506b6b3d1ef1b85cf04070eee5a2556d SHA1 5e6d8a76c8bcbe31a507e08612681500bbad1a24 SHA256 5edd13692146cab7fe45b170bcea4729b993c33c7d7628dde66d782f7fc4e633
+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
 MISC metadata.xml 254 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a SHA1 899c7665ef94c737788e8a2c53bc8a3d97a1356a SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
@@ -33,10 +46,13 @@ SHA256 3c187162d9139b9bdf6a2ead0a65312ab843f882e5decca5e533803dd96ca01f files/di
 MD5 a21e9d313b38e29fdf56300f0efef0c5 files/digest-tork-0.06 232
 RMD160 03f80d93197b910f5c6f2c2e058b923f986947b0 files/digest-tork-0.06 232
 SHA256 443fbdad006aa47dbf937b979e1575621cd47e25d144adec03f7a3cad555810e files/digest-tork-0.06 232
+MD5 2ed6de4dcca40c8e925945f78c8f58d1 files/digest-tork-0.07 235
+RMD160 0ac7c8512f8d4c7e1602b6f2f739fba07c7fc9cd files/digest-tork-0.07 235
+SHA256 3b7f17d0de3c380125f3a121d32e6ca2d5d7040df6332d6dd104039173d56739 files/digest-tork-0.07 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE9yFZAiZjviIA2XgRAlOPAJ4mR/qhb4wWZztgTqK7qtUx1cRa+gCfQr3s
-SRIpVGtl5QbNREHPw5LLgp0=
-=Ki9Y
+iD8DBQFE+dB/AiZjviIA2XgRAvSoAJ4yILZ5QtLl4dE7sY9bLe1Pa15kQACfVasQ
+UtnmRhOydaqlFRIfAIQAmuw=
+=RcdV
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/digest-tork-0.07 b/kde-misc/tork/files/digest-tork-0.07
new file mode 100644
index 000000000000..6ce74ba0b6a8
--- /dev/null
+++ b/kde-misc/tork/files/digest-tork-0.07
@@ -0,0 +1,3 @@
+MD5 ad7b4fd40e9ca1638837a3f0fd478a83 tork-0.07.tar.bz2 1435686
+RMD160 30b9128560d3167df49327b1c7c57b62855385a5 tork-0.07.tar.bz2 1435686
+SHA256 f31723df1e357a2909337b246f1db46a044b40310c3d3da1fb118fd6d603a804 tork-0.07.tar.bz2 1435686
diff --git a/kde-misc/tork/files/tork-0.07-geoip.patch b/kde-misc/tork/files/tork-0.07-geoip.patch
new file mode 100644
index 000000000000..6b681bc9f3cf
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.07-geoip.patch
@@ -0,0 +1,62 @@
+Index: tork-0.07/configure.in.in
+===================================================================
+--- tork-0.07.orig/configure.in.in
++++ tork-0.07/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.07/src/Makefile.am
+===================================================================
+--- tork-0.07.orig/src/Makefile.am
++++ tork-0.07/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.07/src/torkview.cpp
+===================================================================
+--- tork-0.07.orig/src/torkview.cpp
++++ tork-0.07/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"
diff --git a/kde-misc/tork/files/tork-0.07-qt335.patch b/kde-misc/tork/files/tork-0.07-qt335.patch
new file mode 100644
index 000000000000..91c599ed28b1
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.07-qt335.patch
@@ -0,0 +1,70 @@
+Index: tork-0.07/src/torkview_base.ui
+===================================================================
+--- tork-0.07.orig/src/torkview_base.ui
++++ tork-0.07/src/torkview_base.ui
+@@ -521,7 +521,7 @@
+ <customwidgets>
+     <customwidget>
+         <class>DndListView</class>
+-        <header location="local">/home/robert/Development/tork/src/dndlistview.h</header>
++        <header location="local">dndlistview.h</header>
+         <sizehint>
+             <width>-1</width>
+             <height>-1</height>
+@@ -593,7 +593,4 @@
+     <function access="private" specifier="non virtual">init()</function>
+ </functions>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>dndlistview.h</includehint>
+-</includehints>
+ </UI>
+Index: tork-0.07/src/firstrunwizard.ui
+===================================================================
+--- tork-0.07.orig/src/firstrunwizard.ui
++++ tork-0.07/src/firstrunwizard.ui
+@@ -673,16 +673,4 @@
+     <function access="private" specifier="non virtual">configureKonqi()</function>
+ </functions>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>kurlrequester.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>kpushbutton.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-    <includehint>kurlrequester.h</includehint>
+-    <includehint>klineedit.h</includehint>
+-    <includehint>kpushbutton.h</includehint>
+-    <includehint>kactivelabel.h</includehint>
+-</includehints>
+ </UI>
+Index: tork-0.07/src/hidsrvwizard.ui
+===================================================================
+--- tork-0.07.orig/src/hidsrvwizard.ui
++++ tork-0.07/src/hidsrvwizard.ui
+@@ -369,9 +369,4 @@
+ <customwidgets>
+ </customwidgets>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>kurlrequester.h</includehint>
+-    <includehint>kcombobox.h</includehint>
+-    <includehint>kpushbutton.h</includehint>
+-</includehints>
+ </UI>
+Index: tork-0.07/src/running.ui
+===================================================================
+--- tork-0.07.orig/src/running.ui
++++ tork-0.07/src/running.ui
+@@ -591,9 +591,4 @@
+     <function access="private" specifier="non virtual">init()</function>
+ </functions>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>kurlrequester.h</includehint>
+-    <includehint>kcombobox.h</includehint>
+-    <includehint>kpushbutton.h</includehint>
+-</includehints>
+ </UI>
diff --git a/kde-misc/tork/tork-0.07.ebuild b/kde-misc/tork/tork-0.07.ebuild
new file mode 100644
index 000000000000..9d599a007561
--- /dev/null
+++ b/kde-misc/tork/tork-0.07.ebuild
@@ -0,0 +1,35 @@
+# 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.07.ebuild,v 1.1 2006/09/02 18:41:49 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}-qt335.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"
+}