Version bump (and remove 0.11 with the patch that's now merged).

Package-Manager: portage-2.1.2_rc2-r2

4 files changed, 15 insertions, 100 deletions

diff --git a/kde-misc/tork/Manifest b/kde-misc/tork/Manifest
index a9ed1fea01c0..20b616cb4b9e 100644
--- a/kde-misc/tork/Manifest
+++ b/kde-misc/tork/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX tork-0.11-external-tsocks.patch 1135 RMD160 1ea931405b6470b3009c93a78e074d8248595c1c SHA1 7a82dcd9ff26ace334a43b64036c1ba84190afb5 SHA256 dc8dd096c0b336fa71adeb1f93d359aea472cb6f5d69100d5bcc91b4559dd71e
-MD5 b3f734c3c364f34c4823171fe9825f3e files/tork-0.11-external-tsocks.patch 1135
-RMD160 1ea931405b6470b3009c93a78e074d8248595c1c files/tork-0.11-external-tsocks.patch 1135
-SHA256 dc8dd096c0b336fa71adeb1f93d359aea472cb6f5d69100d5bcc91b4559dd71e files/tork-0.11-external-tsocks.patch 1135
 DIST tork-0.10.tar.bz2 1900356 RMD160 61b4c24239d34b3a9a5519b390ae8d4f767aceaa SHA1 b5d203d7afc40c8112b9f69384ba347170e0a5df SHA256 4721123bbad9ce3a086b9f3d8ed39219cf363dbfcb8cea90c4b170f46bccff58
-DIST tork-0.11.tar.bz2 1970291 RMD160 991c50023826e2b0dd780a8806b9f02b8c5de3d0 SHA1 fad1cc3257682f57f44d149fc471505f7f714fee SHA256 7325494586577492a4b66eca01a646bfa70c86844ed9d04486abf4e84107086c
+DIST tork-0.12.tar.bz2 1974112 RMD160 c1aa08beb51f8a6be55919a5d99d66d93879899a SHA1 5ce1721d49aba0e64571131690a841259657ecb5 SHA256 ffb1e2d95098c30e723632e07e809f09d6112b958ecc917513e7c84ad741321e
 EBUILD tork-0.10.ebuild 714 RMD160 af569cf1c12588bf441eefc5ce999fcc6decd80d SHA1 498fefebf24aaadc34938f08a0d37fc5c1f6f333 SHA256 31536dea1990316bd8ea9db644dea3bf0f397056b3fb8f65b817d0eea5926a29
 MD5 71cc7e4f09518a66e1b54e7c3c59c066 tork-0.10.ebuild 714
 RMD160 af569cf1c12588bf441eefc5ce999fcc6decd80d tork-0.10.ebuild 714
 SHA256 31536dea1990316bd8ea9db644dea3bf0f397056b3fb8f65b817d0eea5926a29 tork-0.10.ebuild 714
-EBUILD tork-0.11.ebuild 830 RMD160 867a1526b5d2d78f83bbb058b07ae74b521e2f4c SHA1 cad49742be208045734bd5349d0d10d70ee2f390 SHA256 ffb3cb4ebb82156cc4f7fc341b39ad3e973f15b0d723090e50424f565dfd7b83
-MD5 51ad16c8b72f630c7b9f25687d99c2bf tork-0.11.ebuild 830
-RMD160 867a1526b5d2d78f83bbb058b07ae74b521e2f4c tork-0.11.ebuild 830
-SHA256 ffb3cb4ebb82156cc4f7fc341b39ad3e973f15b0d723090e50424f565dfd7b83 tork-0.11.ebuild 830
-MISC ChangeLog 2448 RMD160 77454847bb50ad60cdb2515ba2c0232fc377f236 SHA1 8fe10f613eacc7ba137917351be01071dfcfcc89 SHA256 fb463ad587a01a3d9a719e1ab56bfcb7b635d8d57bc11de810aff053e189fa61
-MD5 b17e79b13dfcf8e896a1d1458cfca777 ChangeLog 2448
-RMD160 77454847bb50ad60cdb2515ba2c0232fc377f236 ChangeLog 2448
-SHA256 fb463ad587a01a3d9a719e1ab56bfcb7b635d8d57bc11de810aff053e189fa61 ChangeLog 2448
+EBUILD tork-0.12.ebuild 755 RMD160 60e7ade4eca7efb86a5cc43168ad4d9c0b1eaa6a SHA1 b6b5b9a7e0fd772eb0ea17a10f8c81d2d247a5d7 SHA256 b47e29f824d08c4774cb5e62a03b8704705b9c92369f6e876f8406ace6401783
+MD5 1c70cd91f780b2d6feb8287fc2cdaa60 tork-0.12.ebuild 755
+RMD160 60e7ade4eca7efb86a5cc43168ad4d9c0b1eaa6a tork-0.12.ebuild 755
+SHA256 b47e29f824d08c4774cb5e62a03b8704705b9c92369f6e876f8406ace6401783 tork-0.12.ebuild 755
+MISC ChangeLog 2677 RMD160 f7c599486484dfea6af0af8d852506a32c5f1c1e SHA1 7cbf2c501e3a57f73a2b4c0d1604a8dca951fad2 SHA256 f7b684aa606b61922d00de82ef29c67c7a709b779071a2aa1154e44b19e64164
+MD5 531314cc450d796762f5c137987911a1 ChangeLog 2677
+RMD160 f7c599486484dfea6af0af8d852506a32c5f1c1e ChangeLog 2677
+SHA256 f7b684aa606b61922d00de82ef29c67c7a709b779071a2aa1154e44b19e64164 ChangeLog 2677
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -26,13 +22,13 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 178068131b9be9b02bba37a71e7652a0 files/digest-tork-0.10 235
 RMD160 c65610df186d519ea4b4d31c4d1e03c5aa74c8e7 files/digest-tork-0.10 235
 SHA256 f76d179e64126103c8de005a74a30088eef35bf6fee85934a2fafbd1ff2e5af6 files/digest-tork-0.10 235
-MD5 016485fc164f5f2c26b12eb21359db15 files/digest-tork-0.11 235
-RMD160 b791d0c96f5f670dba2f794ebfe3dd8f30d776b2 files/digest-tork-0.11 235
-SHA256 2236ef5b7fe958852bd916237d2e3ce996f9e32d3d357cca015b7e8fe50d60c4 files/digest-tork-0.11 235
+MD5 5f948bc6ad405aa1366cfb2fab29dd6f files/digest-tork-0.12 235
+RMD160 5ba7c91a4533ba89afc1858a2ddd3b0d636840df files/digest-tork-0.12 235
+SHA256 33dccb161e9d7fdb5bbb8905ce1dcb7c6eabbcfe4f7dc72256a475e0dfbad108 files/digest-tork-0.12 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFYvLnAiZjviIA2XgRAnVgAKDZdE7jargDXyl5sQoVCLmlZAiwXwCfUQsQ
-6lIovUD0KkJPgziaBnQwOlc=
-=pabI
+iD8DBQFFabaYAiZjviIA2XgRAlpxAJ99tusfA3QeS0VyaJkW6W0L+0ukewCfUUuK
+vSm0oxkMJRgtYHemAliVrVA=
+=45uf
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/tork/files/digest-tork-0.11 b/kde-misc/tork/files/digest-tork-0.11
deleted file mode 100644
index ebfa00863866..000000000000
--- a/kde-misc/tork/files/digest-tork-0.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 21d1a3a3b18734211fce46991b24a882 tork-0.11.tar.bz2 1970291
-RMD160 991c50023826e2b0dd780a8806b9f02b8c5de3d0 tork-0.11.tar.bz2 1970291
-SHA256 7325494586577492a4b66eca01a646bfa70c86844ed9d04486abf4e84107086c tork-0.11.tar.bz2 1970291
diff --git a/kde-misc/tork/files/tork-0.11-external-tsocks.patch b/kde-misc/tork/files/tork-0.11-external-tsocks.patch
deleted file mode 100644
index 30e60eec8553..000000000000
--- a/kde-misc/tork/files/tork-0.11-external-tsocks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: tork-0.11/configure.in.in
-===================================================================
---- tork-0.11.orig/configure.in.in
-+++ tork-0.11/configure.in.in
-@@ -251,7 +251,11 @@ AM_CONDITIONAL([EXTERNAL_GEOIP], [test "
- 
- 
- 
-+AC_ARG_WITH(external-tsocks,
-+	AC_HELP_STRING([--with-external-tsocks], [Don't build the internal copy of TSocks]))
-+AM_CONDITIONAL([EXTERNAL_TSOCKS], [test "x$with_external_tsocks" = "xyes"])
- 
-+if test "x$with_external_tsocks" != "xyes"; then
- 
- dnl Process this file with autoconf to produce a configure script.
- 
-@@ -624,3 +628,5 @@ SPECIALLIBS=${LIBS}
- AC_SUBST(SPECIALLIBS)
- LIBS=${SIMPLELIBS}
- 
-+fi
-+
-Index: tork-0.11/src/Makefile.am
-===================================================================
---- tork-0.11.orig/src/Makefile.am
-+++ tork-0.11/src/Makefile.am
-@@ -11,7 +11,12 @@ geoiplib=GeoIP-1.4.0/libGeoIP/libGeoIP.l
- geoipdir=GeoIP-1.4.0
- endif
- 
--SUBDIRS=icons about arkollon $(geoipdir) tsocks .
-+if EXTERNAL_TSOCKS
-+else
-+tsocks=tsocks
-+endif
-+
-+SUBDIRS=icons about arkollon $(geoipdir) $(tsocks) .
- 
- # set the include path for X, qt and KDE
- INCLUDES         = $(all_includes)
diff --git a/kde-misc/tork/tork-0.11.ebuild b/kde-misc/tork/tork-0.11.ebuild
deleted file mode 100644
index 23cf4e800ec8..000000000000
--- a/kde-misc/tork/tork-0.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/tork/tork-0.11.ebuild,v 1.1 2006/11/14 12:27:10 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
-	>=net-proxy/privoxy-3.0.3-r5
-	net-proxy/tsocks
-	${DEPEND}"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${P}-external-tsocks.patch"
-
-src_compile() {
-	rm -f "${S}/configure"
-
-	local myconf="--with-external-geoip --with-external-tsocks"
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-	rm -rf "${D}/usr/share/applnk"
-}