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

(Portage version: 2.1.4.4)

4 files changed, 12 insertions, 72 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/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
 }