Version bump to 0.27 as per bug 213311.

Package-Manager: portage-2.1.4.4

4 files changed, 83 insertions, 12 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index 208843d1fe0a..e6b407ee0ea7 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/tork
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.27 2008/02/18 22:56:39 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.28 2008/03/29 01:18:20 philantrop Exp $
+
+*tork-0.27 (29 Mar 2008)
+
+  29 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/tork-0.27-ext_tsocks.patch, +tork-0.27.ebuild:
+  Version bump to 0.27 as per bug 213311.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> tork-0.23.ebuild,
   tork-0.26.ebuild:
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index 3127d1968943..77ddece843e8 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 SHA1 ebfe42ae5ede7ef3c9a82ee17e77912c9b8d7c57 SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008
 AUX tork-0.24-ext_tsocks.patch 950 RMD160 6eb23007d44545f56b53a609ac328a9618aef15c SHA1 73ceb316840b35c1c9b115a0aacc0b908f5b0ea0 SHA256 2278d9f33663ecb4092ccd41502a6cec732f2e0818a453efa8187e71caa20562
+AUX tork-0.27-ext_tsocks.patch 864 RMD160 fb6ca5ed7aaa9f84080e4047c42ee037c6a4ba7c SHA1 65010e9f2bc48f0e312db37ce0e4e997555a4a39 SHA256 e3b07cc403aa564e68973c1b8d98b636220139d0760c8c1379ba22d0d4ae65e8
 DIST tork-0.23.tar.bz2 3193372 RMD160 1d1d8e6a38b75db97e402262b520e84f582fb319 SHA1 31f1e4e3da5dced0d1a4f1cfc9b7d71e5d288062 SHA256 16bf30c927822a76260777ada138d528de122680629cc61d7f2406456f9ebf47
 DIST tork-0.26.tar.bz2 2663154 RMD160 b90e6b71ff7f6a5bc43498848ea8153ef415641f SHA1 230ac2f46c78ee7653c105c418b063d44ed52437 SHA256 1e348e105c03badd009bdd003d057805c9a88246a830240d7c2058fe962da4d5
+DIST tork-0.27.tar.bz2 2667940 RMD160 750ec8dbde3da8df559285384ec93cca24d6c91c SHA1 ebcdf63c622b2b9b9dfef898166e8dabdd346231 SHA256 1e866ee754dd96577a9fc68fa99fcf7140c54f12394087fe2b2a4041abfc4d4c
 EBUILD tork-0.23.ebuild 1242 RMD160 bace259d09d1ef3d5f363bf4f322e50b4f261e56 SHA1 1bf5440aa8b9354dd39db2672c2d00276144d7d3 SHA256 7f5238e3a106bd63aadb6e50f629f73e7f93723acea8c497363c312d6fc93670
 EBUILD tork-0.26.ebuild 1245 RMD160 554e3fbefcc115917ceff85fbf1c5e269f23fba4 SHA1 2468807de76f6e7f15c93c2993836a3de369a622 SHA256 c05da8ff42b72b646962384fde250a82702a762f3feeb2d08e038cd72e21f65c
-MISC ChangeLog 4767 RMD160 c857e040fa7692b315719de6bf7b9d39867d61be SHA1 5601c5c8eb3886b8a970b307008ab2afff78bd2e SHA256 9efddf787954ce7adb0816aaaa3c6a18526470e0d947728e6918fd7279d1c75b
+EBUILD tork-0.27.ebuild 1377 RMD160 1dbf89b7ac8287b05c85d172a6742a8d62f0ca98 SHA1 ce2c94a5bfd8c95eeb6852b784696c9c4e81fcb9 SHA256 8c8cc5374094a5f501f80daaa3d1c59bb2b324ae01e790cff938e4f5523f166f
+MISC ChangeLog 4951 RMD160 3b13952573bb617e6296fd5831f893ae17ee789a SHA1 897555a2193d22df45d1e605dde7b6936655d433 SHA256 2f5284289b924e50e4afd7b36dcd356296ce2ca3b3f8a1af0890b45ffa9cd25b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHugz0B18eXLOpYdkRAhvWAJ94Hqt3+Xmu4Jd33Uk5aG99LJrE8QCgpwmg
-Pm0MlxBuu1EDTFeqp3Yb6BA=
-=1g6u
------END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/tork-0.27-ext_tsocks.patch b/kde-misc/tork/files/tork-0.27-ext_tsocks.patch
new file mode 100644
index 000000000000..b36a910c2b3e
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.27-ext_tsocks.patch
@@ -0,0 +1,24 @@
+diff -Naur tork-0.27.orig/src/Makefile.am tork-0.27/src/Makefile.am
+--- tork-0.27.orig/src/Makefile.am	2008-02-12 22:16:15.000000000 +0100
++++ tork-0.27/src/Makefile.am	2008-03-29 01:45:24.000000000 +0100
+@@ -12,9 +12,9 @@
+ geoipdir=GeoIP-1.4.0
+ endif
+ 
+-tsocks=tsocks
++tsocks=-ltsocks
+ 
+-SUBDIRS=icons arkollon $(geoipdir) $(tsocks) privoxytemplates \
++SUBDIRS=icons arkollon $(geoipdir) privoxytemplates \
+ 		torkapplet konqplugin tor_ioslave menu upnp .
+ 
+ DISTCLEANFILES=dcoptork.kidl
+@@ -30,7 +30,7 @@
+ 
+ # the libraries to link against.
+ tork_LDADD   = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) \
+-               upnp/libktupnp.la $(LIBGNUTLS_LIBS)
++               $(tsocks) upnp/libktupnp.la $(LIBGNUTLS_LIBS)
+ 
+ # which sources should be compiled for tork
+ tork_SOURCES = upnpmanager.cpp trayicon.cpp trayhoverpopup.cpp chart.cpp configdialog.cpp \
diff --git a/kde-misc/tork/tork-0.27.ebuild b/kde-misc/tork/tork-0.27.ebuild
new file mode 100644
index 000000000000..a20bfdbbaa24
--- /dev/null
+++ b/kde-misc/tork/tork-0.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.27.ebuild,v 1.1 2008/03/29 01:18:20 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="gnutls"
+
+DEPEND="dev-libs/openssl
+	>=dev-libs/geoip-1.4.0
+	gnutls? ( >=net-libs/gnutls-2.2.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	|| ( =kde-base/kdebase-3.5* =kde-base/libkonq-3.5* )"
+
+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"
+	use gnutls && myconf="${myconf} --enable-gnutls"
+
+	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
+}