Get rid of the arts use flag, correct the split/monolithic ebuild depend order, fix bug #226319.

Package-Manager: portage-2.1.4.4

5 files changed, 14 insertions, 87 deletions

diff --git a/kde-misc/tork/ChangeLog b/kde-misc/tork/ChangeLog
index bb58e67906f4..291be1ead9bc 100644
--- a/kde-misc/tork/ChangeLog
+++ b/kde-misc/tork/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2008/04/21 15:15:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/ChangeLog,v 1.30 2008/06/30 01:38:27 carlo Exp $
+
+  30 Jun 2008; Carsten Lohrke <carlo@gentoo.org>
+  -files/tork-0.24-ext_tsocks.patch, -tork-0.26.ebuild, tork-0.27.ebuild:
+  Get rid of the arts use flag, correct the split/monolithic ebuild depend
+  order, fix bug #226319.
 
   21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/tork-0.27+gcc-4.3.patch, tork-0.27.ebuild:
diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index ba460e96dca0..732ec7473b1b 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -1,22 +1,9 @@
------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+gcc-4.3.patch 1507 RMD160 8eeb203af2c5c2a1406b5b884aeba0961f63c4a5 SHA1 687a9feb7f4fb2ee6395d6b02c8cae38afbb51dd SHA256 458cdcf82e5a4d5a6f2cf69c81d3d205731f46f886309c1593658db4c306e51e
 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
-EBUILD tork-0.27.ebuild 1414 RMD160 dd5f8653300c01ded3cbf6fcdf446834ded5ab1d SHA1 6e25f36d01ee131f62ea575c4b65287cab98fa4b SHA256 a58c518b31b4bdab63ed462962de966858ae2137c9dd94796c403ac83117ef1f
-MISC ChangeLog 5091 RMD160 476b22ac7102ce70c306c53edae7a37ecd06b380 SHA1 b542b049ea75f7b8cfef68d8045e77bef3d92e64 SHA256 ae2b825999c0944ecb455362707eb348f291ffac7e034a1274c5d89909ad796f
+EBUILD tork-0.27.ebuild 1497 RMD160 1030ff47e5508452e8e2fca2f8e4b88f2a396a50 SHA1 6cd09ecac206181d45f7333713b80b0c0db30ca1 SHA256 e8b2b275cbeae930ad2e2aff28ca1bedd33a395b49bbf5a95356f57f15d6730b
+MISC ChangeLog 5312 RMD160 17c1f08689f855b21bfb730a7939a384c591eb34 SHA1 74a79d361201d493be3e9ff6467f5342fcc65063 SHA256 4d1e9158de83b6dafa26b4c4ea8ad4c6bb56b2f3af3776d5622d4975c9155779
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgMr6AACgkQAiZjviIA2XjcWgCgin8S/mHVDLJ1yzu7oLgPArgH
-/iUAnimfKyrL9n+QzppsA8SbSFa5Ohub
-=eDxN
------END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/tork-0.24-ext_tsocks.patch b/kde-misc/tork/files/tork-0.24-ext_tsocks.patch
deleted file mode 100644
index edc1b6bf9bea..000000000000
--- a/kde-misc/tork/files/tork-0.24-ext_tsocks.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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.26.ebuild b/kde-misc/tork/tork-0.26.ebuild
deleted file mode 100644
index 46726553fe89..000000000000
--- a/kde-misc/tork/tork-0.26.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.26.ebuild,v 1.2 2008/02/18 22:56:39 ingmar 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-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}/${PN}-0.24-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
-}
diff --git a/kde-misc/tork/tork-0.27.ebuild b/kde-misc/tork/tork-0.27.ebuild
index a7f133c5b94f..a6c22b59bdb9 100644
--- a/kde-misc/tork/tork-0.27.ebuild
+++ b/kde-misc/tork/tork-0.27.ebuild
@@ -1,10 +1,12 @@
 # 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.2 2008/04/21 15:15:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.27.ebuild,v 1.3 2008/06/30 01:38:27 carlo Exp $
+
+ARTS_REQUIRED="never"
 
 inherit kde multilib
 
-DESCRIPTION="A Tor controller for the KDE desktop"
+DESCRIPTION="TorK is a powerful anonymity manager for the KDE and acts as a frontedn to Tor."
 HOMEPAGE="http://tork.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
@@ -17,7 +19,7 @@ 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* )"
+	|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )"
 
 RDEPEND="${DEPEND}
 	>=net-misc/tor-0.1.2.14
@@ -36,6 +38,7 @@ src_compile() {
 	local myconf="--with-external-geoip --with-conf=/etc/socks/tsocks.conf"
 	use gnutls && myconf="${myconf} --enable-gnutls"
 
+	rm "${S}"/configure
 	kde_src_compile
 }