Version bump to 0.20. Removed obsolete versions.

Package-Manager: portage-2.1.3.9

8 files changed, 68 insertions, 81 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index 5b5ad3c47154..756baf4b262f 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2007/06/06 17:26:06 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.18 2007/09/27 17:23:00 philantrop Exp $
+
+*tork-0.20 (27 Sep 2007)
+
+  27 Sep 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/tork-0.20-ext_tsocks.patch, -tork-0.12.ebuild, -tork-0.13.ebuild,
+  +tork-0.20.ebuild:
+  Version bump to 0.20. Removed obsolete versions.
 
   06 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> tork-0.17.ebuild:
   Allow either libkonq OR kdebase to satisfy tork's dependencies, fixes bug
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index d5ada2be7b82..513ac4b6a88c 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -1,42 +1,38 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST tork-0.12.tar.bz2 1974112 RMD160 c1aa08beb51f8a6be55919a5d99d66d93879899a SHA1 5ce1721d49aba0e64571131690a841259657ecb5 SHA256 ffb1e2d95098c30e723632e07e809f09d6112b958ecc917513e7c84ad741321e
-DIST tork-0.13.tar.bz2 2175013 RMD160 1a2ea2bf6877b39fb128f5bb4ee39e45266a0bd2 SHA1 deaa67006f6728793a3457a0106b7d5d212dd23a SHA256 39936527f7181ef2e8c764474e7da6cd5c5c045f902031389192b9381c4e81ce
+AUX tork-0.20-ext_tsocks.patch 952 RMD160 a634072b7971a580f2b0f8ff18dbd3323d769a94 SHA1 ebfe42ae5ede7ef3c9a82ee17e77912c9b8d7c57 SHA256 fc7e000cfdd876077b2d3d0aef1f1634bc5882a384bf333bc11a0c0b7d34c008
+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
 DIST tork-0.17.tar.bz2 2430102 RMD160 0622cc19557432843a1642b5d8ce5f4480f29d8f SHA1 02bc8197b7f91aba85a26e165cc304183801a5d0 SHA256 31d152067ec6d3393382c903a706446b6534baa61637e89baf8e6b9757d7473c
-EBUILD tork-0.12.ebuild 1080 RMD160 73635f466c49d6bfb231268e3d57b1856405ad6a SHA1 a614e7203855bede6e5e840c6572c9f66f9db2ee SHA256 acddfe11ba58fb0fbf4292a4ca5ac47cb58da9c0a17913c149507a4e299ad86c
-MD5 4d71f266c87f11f568119666e8c5b350 tork-0.12.ebuild 1080
-RMD160 73635f466c49d6bfb231268e3d57b1856405ad6a tork-0.12.ebuild 1080
-SHA256 acddfe11ba58fb0fbf4292a4ca5ac47cb58da9c0a17913c149507a4e299ad86c tork-0.12.ebuild 1080
-EBUILD tork-0.13.ebuild 1090 RMD160 4a587612a71e9b357a4fe790facd2ce47b707612 SHA1 0730078e442245c1e38e7ca5dac03969ec04e053 SHA256 5d276f6a00826626eff3b831a09c80bcd7ffc9745166003f83f4ec47c2170dd4
-MD5 7c38fedcb9b1e496c605224daadc1a05 tork-0.13.ebuild 1090
-RMD160 4a587612a71e9b357a4fe790facd2ce47b707612 tork-0.13.ebuild 1090
-SHA256 5d276f6a00826626eff3b831a09c80bcd7ffc9745166003f83f4ec47c2170dd4 tork-0.13.ebuild 1090
+DIST tork-0.20.tar.bz2 2936150 RMD160 84628f70e2627468f37a9e2a641dab01033b0702 SHA1 2d46566a2ae6d63a1112176cface132bb38373a5 SHA256 355dfd0b60fedb7ffe5c54375ffd5d2aebaeaf696b64ab46c240ba9f0e4b4ec5
 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
 SHA256 58c2ccb7d3a77ef176780722fb0c71fa757a843cd0b505a05257cbfbf0fbba0f tork-0.17.ebuild 1169
-MISC ChangeLog 3326 RMD160 631d6fcdcfaee2bc37741d30bf840a0d70810902 SHA1 9f5fc43dbc937bbabd08ecd91e9e013b55b81da1 SHA256 10c6cb02eaf061497f6f8a4d305243602788353024a68294349ef0bbc090fbc3
-MD5 467285cae2d1ea34c4ee5f5e68383b7a ChangeLog 3326
-RMD160 631d6fcdcfaee2bc37741d30bf840a0d70810902 ChangeLog 3326
-SHA256 10c6cb02eaf061497f6f8a4d305243602788353024a68294349ef0bbc090fbc3 ChangeLog 3326
+EBUILD tork-0.20.ebuild 1299 RMD160 05dd0fd768d243de97b000e548c55617a5cd0dff SHA1 4f5f7dd1a9ad4cbcca36e091ad14da987815f103 SHA256 bda174113377e7b1fac9db100361c74e891045f9706255d61345073249ed5260
+MD5 1d8f8ed92bd863d08c74ff61efc8091a tork-0.20.ebuild 1299
+RMD160 05dd0fd768d243de97b000e548c55617a5cd0dff tork-0.20.ebuild 1299
+SHA256 bda174113377e7b1fac9db100361c74e891045f9706255d61345073249ed5260 tork-0.20.ebuild 1299
+MISC ChangeLog 3555 RMD160 8b517ae73b37e000a6af29de10da18396cfed51e SHA1 a24ff67bb355555aea35c5299e32ceeab376ae36 SHA256 724553badf8f921bb415ebd35b02669047a82aece62aaafc53ac6d158ccc671f
+MD5 5b0e8435959f3f95a30d37dfc1b66316 ChangeLog 3555
+RMD160 8b517ae73b37e000a6af29de10da18396cfed51e ChangeLog 3555
+SHA256 724553badf8f921bb415ebd35b02669047a82aece62aaafc53ac6d158ccc671f ChangeLog 3555
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 5f948bc6ad405aa1366cfb2fab29dd6f files/digest-tork-0.12 235
-RMD160 5ba7c91a4533ba89afc1858a2ddd3b0d636840df files/digest-tork-0.12 235
-SHA256 33dccb161e9d7fdb5bbb8905ce1dcb7c6eabbcfe4f7dc72256a475e0dfbad108 files/digest-tork-0.12 235
-MD5 8e902ce42dd48e4272e86c84aee2c8d1 files/digest-tork-0.13 235
-RMD160 099b30a4e3b901b9b93ac4e0d92e7c4d24f9ba97 files/digest-tork-0.13 235
-SHA256 be4f9d8406773ed9e0db91e3009006c2816fe66a0c018bc31a4d434c30774615 files/digest-tork-0.13 235
 MD5 aab430bc814c5fa6948063829ec6dfe8 files/digest-tork-0.17 235
 RMD160 00d1258b8206709d706e9c4e41019b87a665e628 files/digest-tork-0.17 235
 SHA256 4ac8ae8a8c3520291c35e2c79c522eb710e22ad7979c72445a1fcf409f9c1053 files/digest-tork-0.17 235
+MD5 a28543226b33451d6203d4642b851bc5 files/digest-tork-0.20 235
+RMD160 65db1b0dad165a4d6ee3a83f5082605ff82a8505 files/digest-tork-0.20 235
+SHA256 2f7d323e19c33536f882253a779b0fdd6a026d768072b6a3b733684362bcff1d files/digest-tork-0.20 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGZu41CkvF58q80IkRAtjMAJ95l77HaRfM1R5UA0CjPJwZzWtm4gCcC3Xn
-29yEJOzTtQg5pfVuoljaYaA=
-=GwER
+iD8DBQFG++cCCkvF58q80IkRAgR8AJwNW20H7JRPImCI3yED/9tJbD+DlACghsjp
+vegMWCxblPK366sgOEeM2UY=
+=QEtj
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/digest-tork-0.12 b/kde-misc/tork/files/digest-tork-0.12
deleted file mode 100644
index 9b5c4bcea65a..000000000000
--- a/kde-misc/tork/files/digest-tork-0.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4378709842eeafb71c0ce2145b25dde6 tork-0.12.tar.bz2 1974112
-RMD160 c1aa08beb51f8a6be55919a5d99d66d93879899a tork-0.12.tar.bz2 1974112
-SHA256 ffb1e2d95098c30e723632e07e809f09d6112b958ecc917513e7c84ad741321e tork-0.12.tar.bz2 1974112
diff --git a/kde-misc/tork/files/digest-tork-0.13 b/kde-misc/tork/files/digest-tork-0.13
deleted file mode 100644
index 0cd9af335bf8..000000000000
--- a/kde-misc/tork/files/digest-tork-0.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8bad3138edf2cb1ec1d8602695ef89a1 tork-0.13.tar.bz2 2175013
-RMD160 1a2ea2bf6877b39fb128f5bb4ee39e45266a0bd2 tork-0.13.tar.bz2 2175013
-SHA256 39936527f7181ef2e8c764474e7da6cd5c5c045f902031389192b9381c4e81ce tork-0.13.tar.bz2 2175013
diff --git a/kde-misc/tork/files/digest-tork-0.20 b/kde-misc/tork/files/digest-tork-0.20
new file mode 100644
index 000000000000..a95ee36cc9f1
--- /dev/null
+++ b/kde-misc/tork/files/digest-tork-0.20
@@ -0,0 +1,3 @@
+MD5 1097a315c4d63a7d045a0579e4ae6946 tork-0.20.tar.bz2 2936150
+RMD160 84628f70e2627468f37a9e2a641dab01033b0702 tork-0.20.tar.bz2 2936150
+SHA256 355dfd0b60fedb7ffe5c54375ffd5d2aebaeaf696b64ab46c240ba9f0e4b4ec5 tork-0.20.tar.bz2 2936150
diff --git a/kde-misc/tork/files/tork-0.20-ext_tsocks.patch b/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
new file mode 100644
index 000000000000..497b20cbb3fb
--- /dev/null
+++ b/kde-misc/tork/files/tork-0.20-ext_tsocks.patch
@@ -0,0 +1,24 @@
+diff -Naur tork-0.20.orig/src/Makefile.am tork-0.20/src/Makefile.am
+--- tork-0.20.orig/src/Makefile.am	2007-09-09 09:27:09.000000000 +0200
++++ tork-0.20/src/Makefile.am	2007-09-27 18:44:35.000000000 +0200
+@@ -11,9 +11,9 @@
+ geoipdir=GeoIP-1.4.0
+ endif
+ 
+-tsocks=tsocks
++tsocks=-ltsocks
+ 
+-SUBDIRS=icons about arkollon $(geoipdir) $(tsocks) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
++SUBDIRS=icons about arkollon $(geoipdir) privoxytemplates libwhich torkapplet konqplugin tor_ioslave .
+ 
+ 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.13.ebuild b/kde-misc/tork/tork-0.13.ebuild
deleted file mode 100644
index f7e26136b343..000000000000
--- a/kde-misc/tork/tork-0.13.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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.13.ebuild,v 1.2 2007/01/28 17:39:08 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="dev-libs/openssl
-	>=dev-libs/geoip-1.4.0"
-
-RDEPEND=">=net-misc/tor-0.1.2.3
-	>=net-proxy/privoxy-3.0.3-r5
-	net-proxy/tsocks
-	${DEPEND}"
-
-need-kde 3.5
-
-src_compile() {
-	local myconf="--with-external-geoip --with-external-tsocks"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	rm -rf "${D}/usr/share/applnk"
-}
-
-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
-}
diff --git a/kde-misc/tork/tork-0.12.ebuild b/kde-misc/tork/tork-0.20.ebuild
index 77989be32f88..16e2d0dc340a 100644
--- a/kde-misc/tork/tork-0.12.ebuild
+++ b/kde-misc/tork/tork-0.20.ebuild
@@ -1,8 +1,8 @@
 # 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.12.ebuild,v 1.2 2007/01/28 17:39:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.20.ebuild,v 1.1 2007/09/27 17:23:00 philantrop Exp $
 
-inherit kde
+inherit kde multilib
 
 DESCRIPTION="A Tor controller for the KDE desktop"
 HOMEPAGE="http://tork.sourceforge.net/"
@@ -14,17 +14,23 @@ KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/openssl
-	>=dev-libs/geoip-1.4.0"
+	>=dev-libs/geoip-1.4.0
+	|| ( kde-base/libkonq kde-base/kdebase )"
 
-RDEPEND="net-misc/tor
+RDEPEND="${DEPEND}
+	>=net-misc/tor-0.1.2.14
 	>=net-proxy/privoxy-3.0.3-r5
-	net-proxy/tsocks
-	${DEPEND}"
+	>=net-proxy/tsocks-1.8_beta5-r2"
 
 need-kde 3.5
 
+PATCHES="${FILESDIR}/${P}-ext_tsocks.patch"
+
 src_compile() {
-	local myconf="--with-external-geoip --with-external-tsocks"
+	# 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
 }