diff options
author | Wulf Krueger <philantrop@gentoo.org> | 2007-09-27 17:23:00 +0000 |
---|---|---|
committer | Wulf Krueger <philantrop@gentoo.org> | 2007-09-27 17:23:00 +0000 |
commit | 659de45c58e8bf23953690851d09a4e830ff8630 (patch) | |
tree | 76c0e0d4e9a678aa9211962bf84983c5b16c3dbb /kde-misc/tork | |
parent | Marked ~arm and ~sh for bug #182196 (diff) | |
download | gentoo-2-659de45c58e8bf23953690851d09a4e830ff8630.tar.gz gentoo-2-659de45c58e8bf23953690851d09a4e830ff8630.tar.bz2 gentoo-2-659de45c58e8bf23953690851d09a4e830ff8630.zip |
Version bump to 0.20. Removed obsolete versions.
(Portage version: 2.1.3.9)
Diffstat (limited to 'kde-misc/tork')
-rw-r--r-- | kde-misc/tork/ChangeLog | 9 | ||||
-rw-r--r-- | kde-misc/tork/files/digest-tork-0.12 | 3 | ||||
-rw-r--r-- | kde-misc/tork/files/digest-tork-0.13 | 3 | ||||
-rw-r--r-- | kde-misc/tork/files/digest-tork-0.20 | 3 | ||||
-rw-r--r-- | kde-misc/tork/files/tork-0.20-ext_tsocks.patch | 24 | ||||
-rw-r--r-- | kde-misc/tork/tork-0.13.ebuild | 43 | ||||
-rw-r--r-- | kde-misc/tork/tork-0.20.ebuild (renamed from kde-misc/tork/tork-0.12.ebuild) | 20 |
7 files changed, 48 insertions, 57 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/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 } |