Version bump as per bug 202187. Marked 0.23 stable on amd64.

(Portage version: 2.1.4_rc9)

5 files changed, 80 insertions, 3 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index d51477df1c64..e0d51b33553b 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/tork
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.20 2007/11/19 15:16:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.21 2007/12/14 23:00:24 philantrop Exp $
+
+*tork-0.24 (14 Dec 2007)
+
+  14 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/tork-0.24-ext_tsocks.patch, tork-0.23.ebuild, +tork-0.24.ebuild:
+  Version bump as per bug 202187. Marked 0.23 stable on amd64.
 
 *tork-0.23 (19 Nov 2007)
 
diff --git a/kde-misc/tork/files/digest-tork-0.24 b/kde-misc/tork/files/digest-tork-0.24
new file mode 100644
index 000000000000..3de58cc899b2
--- /dev/null
+++ b/kde-misc/tork/files/digest-tork-0.24
@@ -0,0 +1,3 @@
+MD5 80864c7fa287dd3f141b2dad495761d3 tork-0.24.tar.bz2 2604391
+RMD160 68dda36b5f3c7a3481ec58bebf4be11f922dd765 tork-0.24.tar.bz2 2604391
+SHA256 01bf753be2e003b2b8e74b126b8fc0a4ed613687b0c157277412c68a68f1b787 tork-0.24.tar.bz2 2604391
diff --git a/kde-misc/tork/files/tork-0.24-ext_tsocks.patch b/kde-misc/tork/files/tork-0.24-ext_tsocks.patch
new file mode 100644
index 000000000000..edc1b6bf9bea
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.24-ext_tsocks.patch
@@ -0,0 +1,24 @@
+diff -Naur tork-0.24.orig/src/Makefile.am tork-0.24/src/Makefile.am
+--- tork-0.24.orig/src/Makefile.am	2007-12-08 16:44:30.000000000 +0100
++++ tork-0.24/src/Makefile.am	2007-12-14 23:26:27.000000000 +0100
+@@ -11,9 +11,9 @@
+ geoipdir=GeoIP-1.4.0
+ endif
+ 
+-tsocks=tsocks
++tsocks=-ltsocks
+ 
+-SUBDIRS=icons arkollon $(geoipdir) $(tsocks) privoxytemplates libwhich torkapplet konqplugin tor_ioslave menu .
++SUBDIRS=icons arkollon $(geoipdir) privoxytemplates libwhich torkapplet konqplugin tor_ioslave menu .
+ 
+ DISTCLEANFILES=dcoptork.kidl
+ 
+@@ -27,7 +27,7 @@
+ tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ 
+ # the libraries to link against.
+-tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) libwhich/libwhich.la
++tork_LDADD   = $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(tsocks) libwhich/libwhich.la
+ 
+ # which sources should be compiled for tork
+ tork_SOURCES = trayicon.cpp trayhoverpopup.cpp chart.cpp configdialog.cpp crashhandler.cpp crypto.cpp \
diff --git a/kde-misc/tork/tork-0.23.ebuild b/kde-misc/tork/tork-0.23.ebuild
index 2965b14caeca..d4f8a4a2b4cd 100644
--- a/kde-misc/tork/tork-0.23.ebuild
+++ b/kde-misc/tork/tork-0.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.23.ebuild,v 1.1 2007/11/19 15:16:10 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.23.ebuild,v 1.2 2007/12/14 23:00:24 philantrop Exp $
 
 inherit kde multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/openssl
diff --git a/kde-misc/tork/tork-0.24.ebuild b/kde-misc/tork/tork-0.24.ebuild
new file mode 100644
index 000000000000..8a482a6c7283
--- /dev/null
+++ b/kde-misc/tork/tork-0.24.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.24.ebuild,v 1.1 2007/12/14 23:00:24 philantrop Exp $
+
+inherit kde multilib
+
+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="dev-libs/openssl
+	>=dev-libs/geoip-1.4.0
+	|| ( kde-base/kdebase kde-base/libkonq )"
+
+RDEPEND="${DEPEND}
+	>=net-misc/tor-0.1.2.14
+	>=net-proxy/privoxy-3.0.3-r5
+	>=net-proxy/tsocks-1.8_beta5-r2"
+
+need-kde 3.5
+
+PATCHES="${FILESDIR}/${P}-ext_tsocks.patch"
+
+src_compile() {
+	# Fix desktop file
+	sed -i -e "s:^\(Categories=.*\):\1;:" "${S}/src/tork.desktop"
+
+	local myconf="--with-external-geoip --with-conf=/etc/socks/tsocks.conf"
+	kde_src_compile
+}
+
+pkg_postinst() {
+	if ! built_with_use --missing false net-proxy/tsocks tordns; then
+		ewarn "WARNING: you have net-proxy/tsocks installed without"
+		ewarn "the patch to avoid DNS leaking while using Tor."
+		ewarn "For better privacy, please emerge again net-proxy/tsocks"
+		ewarn "with the USE flag 'tordns' enabled."
+	fi
+}