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

Package-Manager: portage-2.1.4_rc9

6 files changed, 100 insertions, 11 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/Manifest b/kde-misc/tork/Manifest
index a8763cf73f70..b67e100880e4 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -2,10 +2,15 @@ AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a
 MD5 3409319ab9854ef8db2e4eab5f7b60a8 files/tork-0.20-ext_tsocks.patch 952
 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 files/tork-0.20-ext_tsocks.patch 952
 SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008 files/tork-0.20-ext_tsocks.patch 952
+AUX tork-0.24-ext_tsocks.patch 950 RMD160 6eb23007d44545f56b53a609ac328a9618aef15c SHA1 73ceb316840b35c1c9b115a0aacc0b908f5b0ea0 SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562
+MD5 af3586f4d2929a03b309914acd446d09 files/tork-0.24-ext_tsocks.patch 950
+RMD160 6eb23007d44545f56b53a609ac328a9618aef15c files/tork-0.24-ext_tsocks.patch 950
+SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562 files/tork-0.24-ext_tsocks.patch 950
 DIST tork-0.17.tar.bz2 2430102 RMD160 0622cc19557432843a1642b5d8ce5f4480f29d8f SHA1 02bc8197b7f91aba85a26e165cc304183801a5d0 SHA256 31d152067ec6d3393382c903a706446b6534baa61637e89baf8e6b9757d7473c
 DIST tork-0.20.tar.bz2 2936150 RMD160 84628f70e2627468f37a9e2a641dab01033b0702 SHA1 2d46566a2ae6d63a1112176cface132bb38373a5 SHA256 355dfd0b60fedb7ffe5c54375ffd5d2aebaeaf696b64ab46c240ba9f0e4b4ec5
 DIST tork-0.21.tar.bz2 3176551 RMD160 a964fe4708a2a39a5598eec1edcbf3bc029703c2 SHA1 6386370f0643a333dd18aea8cff22f2a554ac7d3 SHA256 4690d57c4b80971be77f95e44314af612f5dea137a8e7de9700761d1db5a2511
 DIST tork-0.23.tar.bz2 3193372 RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 SHA1 31f1e4e3da5dced0d1a4f1cfc9b7d71e5d288062 SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47
+DIST tork-0.24.tar.bz2 2604391 RMD160 68dda36b5f3c7a3481ec58bebf4be11f922dd765 SHA1 d4625994d2e7c5c28ff67644a9b46b42338be447 SHA256 01bf753be2e003b2b8e74b126b8fc0a4ed613687b0c157277412c68a68f1b787
 EBUILD tork-0.17.ebuild 1169 RMD160 95556688775ed71baa48aea2acc1c6164ec77be9 SHA1 40ea6e2d5aa0b0f5cb4ba8f6b3156dae180b8fd5 SHA256 58c2ccb7d3a77ef176780722fb0c71fa757a843cd0b505a05257cbfbf0fbba0f
 MD5 0bbc9961d70a1a022b017e6b33fc6030 tork-0.17.ebuild 1169
 RMD160 95556688775ed71baa48aea2acc1c6164ec77be9 tork-0.17.ebuild 1169
@@ -18,14 +23,18 @@ EBUILD tork-0.21.ebuild 1237 RMD160 202d6500431245d30475d00a5375ad9800431266 SHA
 MD5 5b0e8484425a43159d45315596552e82 tork-0.21.ebuild 1237
 RMD160 202d6500431245d30475d00a5375ad9800431266 tork-0.21.ebuild 1237
 SHA256 b2546ac345235c4e653525e4ec25d8eda8ef6686d22b5d312bec20059bca44da tork-0.21.ebuild 1237
-EBUILD tork-0.23.ebuild 1237 RMD160 56fe02f1ee9adb402786f04f440e054fea7597ca SHA1 c396c925817ec4c625389f8a8af046b177861dc3 SHA256 7158a9a198108ab587b65b4d7226b4c8fc47914f36f9f7cf2330a328028de0e7
-MD5 49b6733584564f5a8253b885c20e56ef tork-0.23.ebuild 1237
-RMD160 56fe02f1ee9adb402786f04f440e054fea7597ca tork-0.23.ebuild 1237
-SHA256 7158a9a198108ab587b65b4d7226b4c8fc47914f36f9f7cf2330a328028de0e7 tork-0.23.ebuild 1237
-MISC ChangeLog 3833 RMD160 dfdde3bd2ffefb37eb6686e44516bb4565beaa29 SHA1 db5cc50c8fbe6bea254faaa273f6b471a1110c95 SHA256 f5a2c5039c967ac936bf7a02d131429da71426e4163ef446cf50cf9db639681e
-MD5 d260f2bed5ddf205408cdd7ae70718d9 ChangeLog 3833
-RMD160 dfdde3bd2ffefb37eb6686e44516bb4565beaa29 ChangeLog 3833
-SHA256 f5a2c5039c967ac936bf7a02d131429da71426e4163ef446cf50cf9db639681e ChangeLog 3833
+EBUILD tork-0.23.ebuild 1236 RMD160 ff232754ccb24b14ce98f5d2adec787c541c2955 SHA1 3a86e8b4e4f9f762f06fdafd74ac6c5ec0e903fb SHA256 0db1e1424e4679dbe94b046e9dc1f1f8a17e2e33a85e305a84fb59ec06c8eba1
+MD5 68e71a14141d624d40f7c326b1974784 tork-0.23.ebuild 1236
+RMD160 ff232754ccb24b14ce98f5d2adec787c541c2955 tork-0.23.ebuild 1236
+SHA256 0db1e1424e4679dbe94b046e9dc1f1f8a17e2e33a85e305a84fb59ec06c8eba1 tork-0.23.ebuild 1236
+EBUILD tork-0.24.ebuild 1231 RMD160 2524ef576284a9faaf4b8bb5e87b5861792310de SHA1 5d5d3cc7ec5a8e8b22e93dfb5bb73d5096465e26 SHA256 e8b1c04f47f7c2a878773d12bc4edcedcfc131b743e07b446dfab3d0a606511b
+MD5 015156ba6d7f40b1d1a83e04276b6856 tork-0.24.ebuild 1231
+RMD160 2524ef576284a9faaf4b8bb5e87b5861792310de tork-0.24.ebuild 1231
+SHA256 e8b1c04f47f7c2a878773d12bc4edcedcfc131b743e07b446dfab3d0a606511b tork-0.24.ebuild 1231
+MISC ChangeLog 4052 RMD160 f84d3fa5c7799b02376021531224a1ebfb750a23 SHA1 c2604575d4ca84c988546dbc57fde60990bd9dc5 SHA256 2eabf53cd1f58208619b925ea94df275a564bf75bd3d566915884d1936c377db
+MD5 ff8366b606cab0354f0b1a2293fa3112 ChangeLog 4052
+RMD160 f84d3fa5c7799b02376021531224a1ebfb750a23 ChangeLog 4052
+SHA256 2eabf53cd1f58208619b925ea94df275a564bf75bd3d566915884d1936c377db ChangeLog 4052
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -42,3 +51,6 @@ SHA256 0e29a60872328e3722ac5f084b78e7e9cf1251f75d751f66986303f62aba92f1 files/di
 MD5 6b9c074e7e4a5f96ed7c2914f3902dc8 files/digest-tork-0.23 235
 RMD160 a01af428a73485c987193492550276d1bf3a5d3f files/digest-tork-0.23 235
 SHA256 d03c13d0c736115c25d58de842a33b74fbb1c5a26b5c2f55188dfcdac13dc5ab files/digest-tork-0.23 235
+MD5 f2d82decc3a6bf48d20f85322113bf68 files/digest-tork-0.24 235
+RMD160 852db51ded5cd7c9ffa5a019911ffb3a54727e89 files/digest-tork-0.24 235
+SHA256 afcf024a45e44df89a99a592543d0e979b9cf7ee22bcdce7535297576939d68f files/digest-tork-0.24 235
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
+}